diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
index fc19910726f2925505f6e71add034c82af36b63e..a0830b01feef88bc727edef453f5add123fdfc10 100644
--- a/browser/base/content/navigator-toolbox.inc.xhtml
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -32,10 +32,11 @@
 
       <hbox class="titlebar-spacer" type="pre-tabs"/>
 
-      <hbox flex="1" align="end" class="toolbar-items">
+      <hbox flex="1" align="start" class="toolbar-items">
         <toolbartabstop/>
         <hbox id="TabsToolbar-customization-target" flex="1">
           <toolbarbutton id="firefox-view-button"
+                         hidden="true"
                          class="toolbarbutton-1 chromeclass-toolbar-additional"
                          data-l10n-id="toolbar-button-firefox-view-2"
                          role="button"
@@ -50,21 +51,24 @@
                 aria-multiselectable="true"
                 setfocus="false"
                 tooltip="tabbrowser-tab-tooltip"
+                orient="vertical"
                 stopwatchid="FX_TAB_CLICK_MS">
             <hbox class="tab-drop-indicator" hidden="true"/>
 # If the name (tabbrowser-arrowscrollbox) or structure of this changes
 # significantly, there is an optimization in
 # DisplayPortUtils::MaybeCreateDisplayPortInFirstScrollFrameEncountered based
 # the current structure that we may want to revisit.
-            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
+            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="vertical" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
               <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
               <hbox id="tabbrowser-arrowscrollbox-periphery">
                 <toolbartabstop/>
+
                 <toolbarbutton id="tabs-newtab-button"
                                class="toolbarbutton-1"
                                command="cmd_newNavigatorTab"
                                onclick="gBrowser.handleNewTabMiddleClick(this, event);"
                                tooltip="dynamic-shortcut-tooltip"/>
+
                 <spacer class="closing-tabs-spacer" style="width: 0;"/>
               </hbox>
             </arrowscrollbox>
@@ -101,7 +105,10 @@
         <label data-l10n-id="private-browsing-indicator-label"></label>
       </hbox>
 
+#if 0
 #include titlebar-items.inc.xhtml
+#endif
+#include zen-sidebar-icons.inc.xhtml
 
     </toolbar>
 
@@ -447,6 +454,7 @@
 
       <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
                      badged="true"
+                     hidden="true"
                      delegatesanchor="true"
                      onmousedown="gSync.toggleAccountPanel(this, event)"
                      onkeypress="gSync.toggleAccountPanel(this, event)"
@@ -505,6 +513,9 @@
                      consumeanchor="PanelUI-button"
                      data-l10n-id="appmenu-menu-button-closed2"/>
     </toolbaritem>
+
+#include titlebar-items.inc.xhtml
+
   </toolbar>
 
   <toolbar id="PersonalToolbar"
@@ -576,7 +587,6 @@
     <html:named-deck id="tab-notification-deck"></html:named-deck>
   </html:template>
 
-
   <html:template id="BrowserToolbarPalette">
     <toolbarbutton id="import-button"
                    class="toolbarbutton-1 chromeclass-toolbar-additional"