diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index dc8f4455b..5eb4995c3 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -7,16 +7,21 @@ template(name="header")
   if currentUser
     #header-quick-access(class=currentBoard.colorClass)
       if isMiniScreen
-        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
+        span
+          a(href="{{pathFor 'home'}}")
+            span.fa.fa-home
 
+        ul
           if currentList
             each currentBoard.lists
               li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
                 a.js-select-list
                   = title
+          else
+            each currentUser.starredBoards
+              li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
+                a(href="{{pathFor 'board' id=_id slug=slug}}")
+                  = title
         #header-new-board-icon
       else
         //-
@@ -32,18 +37,16 @@ template(name="header")
               img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0")
           unless currentSetting.customTopLeftCornerLogoImageUrl
             img(src="{{pathFor '/logo-header.png'}}" alt="")
+        span
+          a(href="{{pathFor 'home'}}")
+            span.fa.fa-home
+            | {{_ 'all-boards'}}
         ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
-              | {{_ 'all-boards'}}
-          li.separator -
           //li
           //  a(href="{{pathFor 'public'}}")
           //    span.fa.fa-globe
           //    | {{_ 'public'}}
           each currentUser.starredBoards
-            li.separator -
             li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
               a(href="{{pathFor 'board' id=_id slug=slug}}")
                 = title
diff --git a/client/components/main/header.styl b/client/components/main/header.styl
index d80938613..8e02f8fc1 100644
--- a/client/components/main/header.styl
+++ b/client/components/main/header.styl
@@ -100,6 +100,7 @@
   font-size: 12px
   display: flex
   z-index: 21
+  padding: 10px 0px
 
   #header-user-bar,
   #header-new-board-icon,
@@ -114,15 +115,22 @@
 
   ul
     transition: opacity 0.2s
-    margin: 4px 0 0 5px
-    overflow: hidden
+    overflow-x: auto
+    overflow-y: hidden
+    white-space: nowrap
+    padding: 10px
+    margin: -10px
 
     li
-      display: block
-      float: left
+      display: inline
       width: auto
       color: darken(white, 15%)
-      padding: 2px 5px 0
+      padding: 12px 0px
+      margin: -10px 0px
+
+      a
+        padding: 12px 10px
+        margin: -10px 0px
 
       &.current
         color: darken(white, 5%)
@@ -186,37 +194,31 @@
   #header-quick-access
     transition: background-color 0.4s
     width: 100%
-    padding: 10px 0px
     z-index: 30
 
     ul
       width: calc(100% - 60px)
-      overflow: ellipsis
-      padding: 10px
-      margin: -10px
+      margin-right: 10px
 
       li
         height: 100%
-        padding: 12px 0px
-        margin: -10px 0px
 
         a
           height: 100%
-          padding: 12px 10px
-          margin: -10px 0px
 
-        .fa-home
+    span
+      .fa-home
           font-size: 26px
           margin-top: -2px
+          margin-right: 20px
 
     #header-new-board-icon
       display: none
 
     #header-user-bar
-      position: absolute
       right: 0px
       padding: 10px
-      margin: -10px 0 -10px -10px
+      margin: -8px 0 -10px -10px
 
 .announcement .viewer
   display: inline-block