diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 0b250d9369..49414aee16 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -359,6 +359,7 @@ em.link-option {
 .sidebar-section h6 {
   text-transform: uppercase;
   color: #8d99a6;
+  font-size: 10px;
 }
 .sidebar-section h6 .label {
   font-size: 12px;
diff --git a/frappe/public/js/frappe/form/form_sidebar.html b/frappe/public/js/frappe/form/form_sidebar.html
index e2ed53f762..461f8929f2 100644
--- a/frappe/public/js/frappe/form/form_sidebar.html
+++ b/frappe/public/js/frappe/form/form_sidebar.html
@@ -19,7 +19,8 @@
 		</h6>
         <div class="assign-list"></div>
         <div>
-			<a class="text-muted h6 add-assignment">{%= __("Assign") %}</a>
+			<a class="grey h6 add-assignment">{%= __("Assign") %}
+                <span class="octicon octicon-plus h6"></span></a>
         </div>
 	</div>
 	<div class="sidebar-section form-attachments">
@@ -28,7 +29,8 @@
 		</h6>
         <div class="attachment-list"></div>
         <div>
-			<a class="text-muted h6 add-attachment">{%= __("Add Attachment") %}</a>
+			<a class="grey h6 add-attachment">{%= __("Attach a file") %}
+                <span class="octicon octicon-plus h6"></span></a>
 
             <br><span class="small text-muted">
                 {%= __("Drag and drop to attach") %}</span>
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 5b891eedc0..70fd416453 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -47,14 +47,14 @@ frappe.views.ListSidebar = Class.extend({
 	},
 	render_stat: function(field, stat) {
 		var me = this;
-		var show_tags =  '<a class="list-tag-preview small" style="margin-left: 7px;">'
-			+ '<span class="small">' + __("Edit") +'</span></a>';
+		var show_tags =  '<a class="list-tag-preview" style="margin-left: 7px;">'
+			+ '<span class="octicon octicon-pencil" style="font-size: 12px;"></span></a>';
 
 		if(!stat || !stat.length) {
 			if(field==='_user_tags') {
 				$('<div class="sidebar-section">\
-					<h5 class="text-muted">\
-						</i> '+__('Tags')+show_tags+'</h5>\
+					<h6>\
+						</i> '+__('Tags')+show_tags+'</h6>\
 					<div class="side-panel-body">\
 						<div class="text-muted small"><i>'+__('No records tagged.')+'</i><br>'
 						+'</div>\
@@ -69,7 +69,7 @@ frappe.views.ListSidebar = Class.extend({
 
 		// grid
 		var $w = $('<div class="sidebar-section">\
-			<h5 class="text-muted">'+ __(label) +'</h5>\
+			<h6>'+ __(label) +'</h6>\
 			<div class="side-panel-body">\
 			</div>\
 		</div>');
diff --git a/frappe/public/js/frappe/views/container.js b/frappe/public/js/frappe/views/container.js
index 9b7ba3f177..58640ab484 100644
--- a/frappe/public/js/frappe/views/container.js
+++ b/frappe/public/js/frappe/views/container.js
@@ -87,11 +87,12 @@ frappe.views.Container = Class.extend({
 		}
 
 		if(breadcrumbs.module && breadcrumbs.module != "Desk") {
-			if(breadcrumbs.module==="Core") breadcrumbs.module = "Setup";
+			if(in_list(["Core", "Email", "Custom"], breadcrumbs.module))
+				breadcrumbs.module = "Setup";
 			divider();
 			var module_info = frappe.get_module(breadcrumbs.module),
-				icon = module_info.icon,
-				label = module_info.label;
+				icon = module_info && module_info.icon,
+				label = module_info ? module_info.label : breadcrumbs.module;
 			if(icon) {
 				icon = '<span class="'+icon+' text-muted"></span> '
 			}
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 677f859ca7..7474859d0e 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -429,6 +429,7 @@ em.link-option {
 .sidebar-section h6 {
 	text-transform: uppercase;
 	color: @text-muted;
+	font-size: 10px;
 }
 
 .sidebar-section h6 .label {