diff --git a/frappe/desk/page/modules/modules.js b/frappe/desk/page/modules/modules.js
index d0af0cd48b..5409617db3 100644
--- a/frappe/desk/page/modules/modules.js
+++ b/frappe/desk/page/modules/modules.js
@@ -103,7 +103,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
 							item.route = 'Form/' + item.doctype;
 						} else {
 							item.route="List/" + item.doctype
-							item.style = 'text-decoration: underline;';
+							//item.style = 'font-weight: 500;';
 						}
 						// item.style = 'font-weight: bold;';
 					}
diff --git a/frappe/public/css/desktop.css b/frappe/public/css/desktop.css
index 417dd81c4d..cea1e2c528 100644
--- a/frappe/public/css/desktop.css
+++ b/frappe/public/css/desktop.css
@@ -178,3 +178,10 @@ body[data-route="desktop"] .navbar-default {
 .desktop-list-item h4 {
   display: inline-block;
 }
+.navbar-set-desktop-icons {
+  display: none;
+}
+body[data-route=""] .navbar-set-desktop-icons,
+body[data-route="desktop"] .navbar-set-desktop-icons {
+  display: block;
+}
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 01dc3f29d2..e1e540d7cb 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -24,6 +24,8 @@
 	                <span class="text-ellipsis toolbar-user-fullname">{%= frappe.user.full_name() %}</span>
 	                <b class="caret"></b></a>
 					<ul class="dropdown-menu" id="toolbar-user" role="menu">
+	                    <li class="navbar-set-desktop-icons"><a href="#modules_setup">
+	                        {%= __("Set Desktop Icons") %}</a></li>
 	                    <li><a href="#Form/User/{%= encodeURIComponent(user) %}">
 	                        {%= __("My Settings") %}</a></li>
 	    				<li><a href="#" onclick="return frappe.ui.toolbar.clear_cache();">
diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 9fe2692470..23e94d628d 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -224,3 +224,12 @@ body[data-route=""] .navbar-default, body[data-route="desktop"] .navbar-default
 		display: inline-block;
 	}
 }
+
+.navbar-set-desktop-icons {
+	display: none;
+}
+
+body[data-route=""] .navbar-set-desktop-icons,
+body[data-route="desktop"] .navbar-set-desktop-icons {
+	display: block;
+}