diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs
index 3952fa39055..c42164678f2 100644
--- a/app/assets/javascripts/discourse/templates/components/user-menu.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-menu.hbs
@@ -1,12 +1,27 @@
 {{#menu-panel visible=visible}}
-  <ul class='menu-links-header'>
-    <li>{{#link-to 'userActivity.bookmarks' currentUser}}<i class='fa fa-bookmark'></i> {{i18n 'user.bookmarks'}}{{/link-to}}</li>
-    {{#if allowAnon}}
-      <li><a href {{action 'toggleAnon'}}><i class='fa fa-user-secret'></i> {{#if isAnon}}{{i18n 'switch_from_anon'}}{{else}}{{i18n 'switch_to_anon'}}{{/if}}</a></li>
-    {{/if}}
-
+  <div class='menu-links-header'>
+  <ul class='menu-links-row'>
     <li>{{#link-to 'user' currentUser class="user-activity-link" }}<i class='fa fa-user'></i> {{i18n 'user.profile'}}{{/link-to}}</li>
+
+      {{#if allowAnon}}
+        {{#if isAnon}}
+        <li>
+        <a href {{action 'toggleAnon'}}>{{i18n 'switch_from_anon'}}</a>
+        </li>
+        {{/if}}
+    {{/if}}
+    <li class='glyphs'>
+    <a href="{{currentUser.path}}/activity/bookmarks" title="{{i18n 'user.bookmarks'}}" aria-label="{{i18n 'user.bookmarks'}}"><i class='fa fa-bookmark'></i></a>
+    <a href="{{currentUser.path}}/messages" title="{{i18n 'user.private_messages'}}" aria-label="{{i18n 'user.private_messages'}}"><i class='fa fa-envelope'></i></a>
+      {{#if allowAnon}}
+        {{#unless isAnon}}
+        <a href {{action 'toggleAnon'}} title="{{i18n 'switch_to_anon'}}" aria-label="{{i18n 'switch_to_anon'}}"><i class='fa fa-user-secret'></i></a>
+        {{/unless}}
+      {{/if}}
+      <a href="{{currentUser.path}}/preferences" title="{{i18n 'user.preferences'}}" aria-label="{{i18n 'user.preferences'}}"><i class='fa fa-gear'></i></a>
+    </li>
   </ul>
+  </div>
 
   <div class='notifications'>
     {{#conditional-loading-spinner condition=loadingNotifications containerClass="spinner-container"}}
@@ -22,5 +37,6 @@
         </ul>
       {{/if}}
     {{/conditional-loading-spinner}}
+    {{plugin-outlet "user-menu-bottom"}}
   </div>
 {{/menu-panel}}
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index fe224891e43..36871792ca6 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -218,27 +218,38 @@
   }
 }
 
-ul.menu-links-header {
+div.menu-links-header {
   width: 100%;
   display: table;
-  table-layout: fixed;
-  li:hover {
+  border-collapse: separate;
+  border-spacing: 0 0.5em;
+  .menu-links-row {
+    display: table-row;
+  }
+  a:hover {
     background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
   }
+  a {
+    padding: 0.5em;
+  }
   li {
     display: table-cell;
     width: auto;
     text-align: center;
-    padding: 0.5em 0;
   }
   li:first-child {
     text-align: left;
-    padding-left: 0.5em;
   }
 
   li:last-child {
     text-align: right;
-    padding-right: 0.5em;
+  }
+
+  a {
+    font-size: 1.1em;
+  }
+  .fa-user {
+    margin-right: 0.2em;
   }
 }