diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
index d445abe7e743b2ec5d46d42f8f149c000e3c7997..6b310b355fce987ab0996e05a5f80148e4a6feb4 100644
--- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml
@@ -2,27 +2,20 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<hbox flex="1" id="browser">
-  <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
-    <box id="sidebar-header" align="center">
-      <toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">
-        <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
-        <label id="sidebar-title" crop="end" control="sidebar"/>
-        <image id="sidebar-switcher-arrow"/>
-      </toolbarbutton>
-      <image id="sidebar-throbber"/>
-      <spacer id="sidebar-spacer"/>
-      <toolbarbutton id="sidebar-close" class="close-icon tabbable" data-l10n-id="sidebar-close-button" oncommand="SidebarUI.hide();"/>
-    </box>
-    <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
-  </vbox>
-  <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
+<vbox id="browser">
   <vbox id="appcontent" flex="1">
+
+    <html:div id="zen-appcontent-navbar-container"></html:div>
+
     <!-- gNotificationBox will be added here lazily. -->
-    <tabbox id="tabbrowser-tabbox"
+    <hbox id="zen-tabbox-wrapper" flex="1">
+#include zen-sidebar-panel.inc.xhtml
+
+      <tabbox id="tabbrowser-tabbox"
             flex="1" tabcontainer="tabbrowser-tabs">
       <tabpanels id="tabbrowser-tabpanels"
                   flex="1" selectedIndex="0"/>
-    </tabbox>
+      </tabbox>
+    </hbox>
   </vbox>
-</hbox>
+</vbox>