diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index e0ec70127d..586df6c2ca 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -137,22 +137,6 @@
    "no_copy": 1, 
    "permlevel": 0
   }, 
-  {
-   "fieldname": "background_image", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "label": "Background Image", 
-   "no_copy": 1, 
-   "permlevel": 0
-  }, 
-  {
-   "default": "Fill Screen", 
-   "fieldname": "background_style", 
-   "fieldtype": "Select", 
-   "label": "Background Style", 
-   "options": "Fill Screen\nTile", 
-   "permlevel": 0
-  }, 
   {
    "fieldname": "cb21", 
    "fieldtype": "Column Break", 
@@ -463,7 +447,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 5, 
- "modified": "2015-01-07 15:54:30.153456", 
+ "modified": "2015-01-08 14:54:46.298736", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "User", 
diff --git a/frappe/desk/page/messages/messages_main.html b/frappe/desk/page/messages/messages_main.html
index 5aaac85dfd..adbc339912 100644
--- a/frappe/desk/page/messages/messages_main.html
+++ b/frappe/desk/page/messages/messages_main.html
@@ -1,6 +1,6 @@
 <div class="message-box">
     <div class="media timeline-head">
-    	<span class="pull-left avatar avatar-small">
+    	<span class="pull-left avatar avatar-medium">
     		<img class="media-object" src="{%= frappe.user.image() %}">
     	</span>
     	<div class="media-body">
diff --git a/frappe/public/css/avatar.css b/frappe/public/css/avatar.css
index fbd579824a..5974554036 100644
--- a/frappe/public/css/avatar.css
+++ b/frappe/public/css/avatar.css
@@ -1,9 +1,7 @@
 .avatar {
 	display: inline-block;
 	vertical-align: middle;
-	border-radius: 4px;
 	overflow: hidden;
-	border: 1px solid transparent;
 	width: 50px;
 	height: 50px;
 }
@@ -11,6 +9,7 @@
 .avatar img {
 	width: 100%;
 	height: auto;
+	border-radius: 4px;
 }
 
 .avatar-empty {
@@ -23,6 +22,12 @@
 	height: 24px;
 }
 
+.avatar-medium {
+	margin-right: 5px;
+	width: 36px;
+	height: 36px;
+}
+
 .avatar-large {
 	margin-right: 10px;
 	width: 72px;
diff --git a/frappe/public/js/frappe/form/footer/comments.js b/frappe/public/js/frappe/form/footer/comments.js
index 96bf2aafaa..8ecd0ff664 100644
--- a/frappe/public/js/frappe/form/footer/comments.js
+++ b/frappe/public/js/frappe/form/footer/comments.js
@@ -113,7 +113,7 @@ frappe.ui.form.Comments = Class.extend({
 		$(frappe.render_template("timeline_item", {data:c}))
 			.appendTo(me.list)
 			.on("click", ".close", function() {
-				var name = $(this).parents(".comment:first").attr("data-name");
+				var name = $(this).parents(".timeline-item:first").attr("data-name");
 				me.delete_comment(name);
 				return false;
 			});
diff --git a/frappe/public/js/frappe/form/footer/timeline.html b/frappe/public/js/frappe/form/footer/timeline.html
index 973e3508d3..68dcb237f6 100644
--- a/frappe/public/js/frappe/form/footer/timeline.html
+++ b/frappe/public/js/frappe/form/footer/timeline.html
@@ -1,6 +1,6 @@
 <div class="timeline">
     <div class="media timeline-head">
-    	<span class="pull-left avatar avatar-small">
+    	<span class="pull-left avatar avatar-medium">
     		<img class="media-object" src="{%= image %}">
     	</span>
     	<div class="media-body">
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index 405119d4c6..a18e14f22f 100644
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -1,5 +1,5 @@
 <div class="media timeline-item" data-name="{%= data.name %}">
-	<span class="pull-left avatar avatar-small">
+	<span class="pull-left avatar avatar-medium">
 		<img class="media-object" src="{%= data.image %}">
 	</span>
 	<div class="media-body">
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index f9770153a1..f81696ad6f 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -17,6 +17,8 @@ frappe.upload = {
 		if(!opts.btn) {
 			opts.btn = $('<button class="btn btn-default btn-sm">' + __("Attach")
 				+ '</div>').appendTo($upload);
+		} else {
+			$(opts.btn).unbind("click");
 		}
 
 		// get the first file