diff --git a/guacamole/src/main/webapp/app/navigation/services/userPageService.js b/guacamole/src/main/webapp/app/navigation/services/userPageService.js
index fbd8b9fd7..2ff396d56 100644
--- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js
+++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js
@@ -268,14 +268,16 @@ angular.module('navigation').factory('userPageService', ['$injector',
         
         var pages = [];
 
+        // Get home page and settings pages
+        var homePage = generateHomePage(rootGroup);
+        var settingsPages = generateSettingsPages(permissions);
+
         // Only include the home page in the list of main pages if the user
         // can navigate elsewhere.
-        var homePage = generateHomePage(rootGroup);
-        if (homePage === SYSTEM_HOME_PAGE)
+        if (homePage === SYSTEM_HOME_PAGE || settingsPages.length)
             pages.push(homePage);
 
         // Add generic link to the first-available settings page
-        var settingsPages = generateSettingsPages(permissions);
         if (settingsPages.length) {
             pages.push(new Page(
                 'USER_MENU.ACTION_MANAGE_SETTINGS',
diff --git a/guacamole/src/main/webapp/app/navigation/styles/user-menu.css b/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
index b8d162157..b2a649233 100644
--- a/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
+++ b/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
@@ -164,11 +164,19 @@
 }
 
 .user-menu .options li a {
+
     display: block;
     cursor: pointer;
     color: black;
     text-decoration: none;
     padding: 0.75em;
+
+    background-repeat: no-repeat;
+    background-size: 1em;
+    background-position: 0.75em center;
+    padding-left: 2.5em;
+    background-image: url('images/protocol-icons/guac-monitor.png');
+
 }
 
 .user-menu .options li a:hover {
@@ -182,18 +190,6 @@
     opacity: 0.25;
 }
 
-.user-menu .options li a.home,
-.user-menu .options li a.manage-users,
-.user-menu .options li a.manage-connections,
-.user-menu .options li a.manage-sessions,
-.user-menu .options li a.change-password,
-.user-menu .options li a.logout {
-    background-repeat: no-repeat;
-    background-size: 1em;
-    background-position: 0.75em center;
-    padding-left: 2.5em;
-}
-
 .user-menu .options li a[href="#/"] {
     background-image: url('images/action-icons/guac-home-dark.png');
 }