diff --git a/assets/app/styles/_navbar-alt.less b/assets/app/styles/_navbar-alt.less
index fc3d8a28e7a0..f18c2eda6643 100644
--- a/assets/app/styles/_navbar-alt.less
+++ b/assets/app/styles/_navbar-alt.less
@@ -114,7 +114,10 @@
     cursor: pointer;
     line-height: 1;
     max-height: (@navbar-pf-alt-height - @navbar-pf-alt-border-width); // to keep Firefox from oversizing icons
-    padding: 21px 14px;
+    padding-left: 14px;
+    padding-right: 14px;
+    padding-top: @navbar-padding-vertical;
+    padding-bottom: @navbar-padding-vertical;
     position: relative;
     color: @navbar-pf-alt-color;
     margin-right: 0;
@@ -122,11 +125,11 @@
     .username, .status-issue {
       display: inline-block;
       font-weight: 300;
+      line-height: 1;
       max-width: 100px;
       padding: 0 2px;
       position: relative;
       top: -2px;
-      vertical-align: bottom;
     }
     &:hover, &:focus {
       background-color: transparent;
@@ -146,7 +149,6 @@
       height: 12px;
     }
     .status-icon {
-      font-size: 18px;
       padding-right: 2px;
     }
   }
@@ -161,6 +163,13 @@
   }
 }
 
+@media (min-width: @screen-sm-min) {
+  .navbar-pf-alt .nav-item-iconic {
+    display: block;
+    padding: 21px 14px;
+  }
+}
+
 // System status
 .navbar-pf-alt {
   .system-status-mobile {
diff --git a/assets/app/views/directives/header/_navbar-utility.html b/assets/app/views/directives/header/_navbar-utility.html
index 4ef3c1141791..1a37adc29bab 100644
--- a/assets/app/views/directives/header/_navbar-utility.html
+++ b/assets/app/views/directives/header/_navbar-utility.html
@@ -34,11 +34,10 @@
   <li
     extension-point
     extension-name="nav-system-status"
-    extension-types="dom"
-    style="padding: 21px 14px;"></li><!-- TODO: rip out inline styles!! -->
+    extension-types="dom"></li>
 
   <li uib-dropdown>
-    <a uib-dropdown-toggle class="nav-item-iconic" id="dropdownMenu1">
+    <a uib-dropdown-toggle class="nav-item-iconic" id="dropdownMenu1" href="#">
       <span title="Help" class="fa pficon-help" aria-hidden="true"></span>
       <span class="sr-only">Help</span>
       <span class="caret" aria-hidden="true"></span>
diff --git a/assets/app/views/directives/header/default-header.html b/assets/app/views/directives/header/default-header.html
index eedad109883c..95fa1c2a0e90 100644
--- a/assets/app/views/directives/header/default-header.html
+++ b/assets/app/views/directives/header/default-header.html
@@ -19,10 +19,11 @@
 
     <navbar-utility class="collapse navbar-collapse"></navbar-utility>
 
-    <div
+    <div row
       extension-point
       extension-name="nav-system-status-mobile"
-      extension-types="dom"></div>
+      extension-types="dom"
+      class="navbar-flex-btn"></div>
 
   </div>
 </nav>
diff --git a/assets/app/views/directives/header/project-header.html b/assets/app/views/directives/header/project-header.html
index e53a4045bb1e..c50b8d501f8e 100644
--- a/assets/app/views/directives/header/project-header.html
+++ b/assets/app/views/directives/header/project-header.html
@@ -25,10 +25,11 @@
         </a>
       </div>
 
-      <div
+      <div row
         extension-point
         extension-name="nav-system-status-mobile"
-        extension-types="dom"></div>
+        extension-types="dom"
+        class="navbar-flex-btn"></div>
 
     </div>
   </div> <!-- /navbar-project-menu -->