diff --git a/website/public/css/global-modules.styl b/website/public/css/global-modules.styl
index e209b6406e..5374bb1cfe 100644
--- a/website/public/css/global-modules.styl
+++ b/website/public/css/global-modules.styl
@@ -98,7 +98,7 @@ $hrpg-button-toggle
   border-radius: 0.382em !important
   > a:first-of-type
     border-radius: 0.382em 0em 0em 0.382em !important
-  > a:nth-of-type(2)
+  > a:last-of-type
     border-radius: 0em 0.382em 0.382em 0em !important
 // Input + Button
 $hrpg-button-with-input
diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade
index 54469e5ca5..5cbea6e7c0 100644
--- a/website/views/options/social/index.jade
+++ b/website/views/options/social/index.jade
@@ -91,9 +91,9 @@ script(type='text/ng-template', id='partials/options.social.html')
   ul.options-menu
     li(ng-class="{ active: $state.includes('options.social.inbox') }")
       a(ui-sref='options.social.inbox')
-        =env.t("inbox")
-        |  
         span.badge.badge-danger(ng-if='user.inbox.newMessages') {{user.inbox.newMessages}}
+        |  
+        =env.t("inbox")
     li(ng-class="{ active: $state.includes('options.social.tavern') }")
       a(ui-sref='options.social.tavern')
         =env.t('tavern')
diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade
index 1f65b21898..b7f7cd3ce0 100644
--- a/website/views/shared/header/menu.jade
+++ b/website/views/shared/header/menu.jade
@@ -26,9 +26,9 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
             ul.toolbar-submenu
               li
                 a(ui-sref='options.social.inbox')
-                  =env.t("inbox")
-                  |  
                   span.badge.badge-danger(ng-if='user.inbox.newMessages') {{user.inbox.newMessages}}
+                  |  
+                  =env.t("inbox")
               li
                 a(ui-sref='options.social.tavern')=env.t('tavern')
               li
@@ -95,18 +95,19 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
             li
               a(ui-sref='options.profile.profile')=env.t('profile') 
       li.toolbar-button-dropdown
+        a(ui-sref='options.social.inbox', ng-if='user.inbox.newMessages')
+          span.badge.badge-danger {{user.inbox.newMessages}}
         a(ui-sref='options.social.tavern')
           span=env.t('social')
-          span.badge.badge-danger(ng-if='user.inbox.newMessages') {{user.inbox.newMessages}}
         a(ng-click='expandMenu("social")', ng-class='{active: _expandedMenu == "social"}')
           span ☰
         div(ng-if='_expandedMenu == "social"')
           ul.toolbar-submenu(ng-click='expandMenu(null)')
             li
               a(ui-sref='options.social.inbox')
-                =env.t("inbox")
-                |  
                 span.badge.badge-danger(ng-if='user.inbox.newMessages') {{user.inbox.newMessages}}
+                |  
+                =env.t("inbox")
             li
               a(ui-sref='options.social.tavern')=env.t('tavern')
             li