diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index afcb1ccc9..48052b53b 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index d445abe7e743b2ec5d46d42f8f149c000e3c7997..0da9a11cb6d5f0c40025a2b71fd6fd4524e3e0b3 100644
+index d445abe7e743b2ec5d46d42f8f149c000e3c7997..c45459f1ae13190c5a508def867159d52cc6c1e1 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -2,22 +2,13 @@
+@@ -2,22 +2,11 @@
  # 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/.
  
@@ -22,8 +22,6 @@ index d445abe7e743b2ec5d46d42f8f149c000e3c7997..0da9a11cb6d5f0c40025a2b71fd6fd45
 -  </vbox>
 -  <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
 +<vbox id="browser">
-+#include navigator-toolbox.inc.xhtml
-+
    <vbox id="appcontent" flex="1">
 +
 +#include zen-browser-box-ui.inc.xhtml
@@ -31,7 +29,7 @@ index d445abe7e743b2ec5d46d42f8f149c000e3c7997..0da9a11cb6d5f0c40025a2b71fd6fd45
      <!-- gNotificationBox will be added here lazily. -->
      <tabbox id="tabbrowser-tabbox"
              flex="1" tabcontainer="tabbrowser-tabs">
-@@ -25,4 +16,4 @@
+@@ -25,4 +14,4 @@
                    flex="1" selectedIndex="0"/>
      </tabbox>
    </vbox>
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index 181bfa0cc..14046392c 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,13 +1,11 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index b4886fb5f74568b4c09eb620be9efb74e39c599c..31496c51584b789895a83ba35be9d6828862c759 100644
+index b4886fb5f74568b4c09eb620be9efb74e39c599c..b4a6bb5e06db8b097457c490d369ad9e2ae66454 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -163,9 +163,10 @@
-     </vbox>
-   </html:template>
+@@ -165,7 +165,10 @@
+ 
+ #include navigator-toolbox.inc.xhtml
  
--#include navigator-toolbox.inc.xhtml
--
 -#include browser-box.inc.xhtml
 +  <hbox flex="1">
 +    #include zen-sidebar-box.inc.xhtml
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index b4459eb39..06f0e3e79 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index dce7bacdb3678a95dc97085390a7e6102090ffb2..a49f7baf69b653f4c87d081fae2b8517574867e7 100644
+index dce7bacdb3678a95dc97085390a7e6102090ffb2..5e3c40b384e4643b6865c4fab3d0bcea4c179d0c 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -30,8 +30,6 @@
@@ -11,480 +11,20 @@ index dce7bacdb3678a95dc97085390a7e6102090ffb2..a49f7baf69b653f4c87d081fae2b8517
        <hbox flex="1" align="end" class="toolbar-items">
          <toolbartabstop/>
          <hbox id="TabsToolbar-customization-target" flex="1">
-@@ -107,476 +105,6 @@
+@@ -107,6 +105,7 @@
  
    </vbox>
  
--  <toolbar id="nav-bar"
--           class="browser-toolbar"
--           data-l10n-id="navbar-accessible"
--           fullscreentoolbar="true" mode="icons" customizable="true"
--           customizationtarget="nav-bar-customization-target"
--           overflowable="true"
--           default-overflowbutton="nav-bar-overflow-button"
--           default-overflowtarget="widget-overflow-list"
--           default-overflowpanel="widget-overflow"
--           addon-webext-overflowbutton="unified-extensions-button"
--           addon-webext-overflowtarget="overflowed-extensions-list"
--           context="toolbar-context-menu">
--
--    <toolbartabstop/>
--
--    <hbox id="nav-bar-customization-target" flex="1">
--      <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
--                     data-l10n-id="toolbar-button-back-2"
--                     removable="false" overflows="false"
--                     keepbroadcastattributeswhencustomizing="true"
--                     command="Browser:BackOrBackDuplicate"
--                     onclick="checkForMiddleClick(this, event);"
--                     tooltip="back-button-tooltip"
--                     context="backForwardMenu"/>
--      <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
--                     data-l10n-id="toolbar-button-forward-2"
--                     removable="false" overflows="false"
--                     keepbroadcastattributeswhencustomizing="true"
--                     command="Browser:ForwardOrForwardDuplicate"
--                     onclick="checkForMiddleClick(this, event);"
--                     tooltip="forward-button-tooltip"
--                     context="backForwardMenu"/>
--      <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
--                   data-l10n-id="toolbar-button-stop-reload"
--                   removable="true" overflows="false">
--        <toolbarbutton id="reload-button" class="toolbarbutton-1"
--                       data-l10n-id="toolbar-button-reload"
--                       command="Browser:ReloadOrDuplicate"
--                       onclick="checkForMiddleClick(this, event);"
--                       tooltip="dynamic-shortcut-tooltip">
--          <box class="toolbarbutton-animatable-box">
--            <image class="toolbarbutton-animatable-image"/>
--          </box>
--        </toolbarbutton>
--        <toolbarbutton id="stop-button" class="toolbarbutton-1"
--                       data-l10n-id="toolbar-button-stop"
--                       command="Browser:Stop"
--                       tooltip="dynamic-shortcut-tooltip">
--          <box class="toolbarbutton-animatable-box">
--            <image class="toolbarbutton-animatable-image"/>
--          </box>
--        </toolbarbutton>
--      </toolbaritem>
--      <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
--      <toolbaritem id="urlbar-container"
--                   removable="false"
--                   class="chromeclass-location" overflows="false">
--        <toolbartabstop/>
--        <hbox id="urlbar" flex="1"
--              context=""
--              focused="true"
--              pageproxystate="invalid">
--          <hbox id="urlbar-background"/>
--          <hbox id="urlbar-input-container"
--                flex="1"
--                pageproxystate="invalid">
--            <box id="remote-control-box"
--                 align="center"
--                 collapsed="true">
--                <image id="remote-control-icon"/>
--            </box>
--            <box id="urlbar-search-button"
--                 class="chromeclass-toolbar-additional"/>
--            <!-- Use onclick instead of normal popup= syntax since the popup
--                 code fires onmousedown, and hence eats our favicon drag events. -->
--            <box id="tracking-protection-icon-container" align="center"
--                 role="button"
--                 onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
--                 onkeypress="gProtectionsHandler.handleProtectionsButtonEvent(event);"
--                 onmouseover="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
--                 onfocus="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
--                 tooltip="tracking-protection-icon-tooltip">
--              <box id="tracking-protection-icon-box">
--                <image id="tracking-protection-icon"/>
--              </box>
--              <tooltip id="tracking-protection-icon-tooltip">
--                <description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
--              </tooltip>
--            </box>
--            <box id="identity-box"
--                 pageproxystate="invalid"
--                 ondragstart="gIdentityHandler.onDragStart(event);">
--              <box id="identity-icon-box"
--                   role="button"
--                   align="center"
--                   data-l10n-id="urlbar-identity-button"
--                   class="identity-box-button"
--                   onclick="gIdentityHandler.handleIdentityButtonEvent(event); PageProxyClickHandler(event);"
--                   onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
--                <image id="identity-icon"/>
--                <label id="identity-icon-label" class="plain" crop="center" flex="1"/>
--              </box>
--              <box id="identity-permission-box"
--                   data-l10n-id="urlbar-permissions-granted"
--                   role="button"
--                   align="center"
--                   class="identity-box-button"
--                   onclick="gPermissionPanel.handleIdentityButtonEvent(event); PageProxyClickHandler(event);"
--                   onkeypress="gPermissionPanel.handleIdentityButtonEvent(event);">
--                <image id="permissions-granted-icon"/>
--                <box style="pointer-events: none;">
--                    <image class="sharing-icon" id="webrtc-sharing-icon"/>
--                    <image class="sharing-icon geo-icon" id="geo-sharing-icon"/>
--                    <image class="sharing-icon xr-icon" id="xr-sharing-icon"/>
--                </box>
--                <box id="blocked-permissions-container" align="center">
--                  <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
--                        data-l10n-id="urlbar-geolocation-blocked"/>
--                  <image data-permission-id="xr" class="blocked-permission-icon xr-icon" role="button"
--                        data-l10n-id="urlbar-xr-blocked"/>
--                  <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button"
--                        data-l10n-id="urlbar-web-notifications-blocked"/>
--                  <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
--                        data-l10n-id="urlbar-camera-blocked"/>
--                  <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
--                        data-l10n-id="urlbar-microphone-blocked"/>
--                  <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
--                        data-l10n-id="urlbar-screen-blocked"/>
--                  <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
--                        data-l10n-id="urlbar-persistent-storage-blocked"/>
--                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
--                        data-l10n-id="urlbar-popup-blocked"/>
--                  <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"
--                        data-l10n-id="urlbar-autoplay-media-blocked"/>
--                  <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
--                        data-l10n-id="urlbar-canvas-blocked"/>
--                  <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
--                        data-l10n-id="urlbar-midi-blocked"/>
--                  <image data-permission-id="install" class="blocked-permission-icon install-icon" role="button"
--                        data-l10n-id="urlbar-install-blocked"/>
--                  <!-- A speaker icon for blocked speaker selection is not
--                       shown because, without text, this may be interpreted as
--                       active or blocked audio. -->
--                </box>
--              </box>
--              <box id="notification-popup-box"
--                   class="anchor-root"
--                   hidden="true"
--                   align="center">
--                <image id="default-notification-icon" class="notification-anchor-icon" role="button"
--                       data-l10n-id="urlbar-default-notification-anchor"/>
--                <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
--                       data-l10n-id="urlbar-geolocation-notification-anchor"/>
--                <image id="xr-notification-icon" class="notification-anchor-icon xr-icon" role="button"
--                       data-l10n-id="urlbar-xr-notification-anchor"/>
--                <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
--                       data-l10n-id="urlbar-autoplay-notification-anchor"/>
--                <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
--                       data-l10n-id="urlbar-addons-notification-anchor"/>
--                <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
--                       data-l10n-id="urlbar-canvas-notification-anchor"/>
--                <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
--                       data-l10n-id="urlbar-indexed-db-notification-anchor"/>
--                <image id="password-notification-icon" class="notification-anchor-icon" role="button"
--                       data-l10n-id="urlbar-password-notification-anchor"/>
--                <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
--                       data-l10n-id="urlbar-web-notification-anchor"/>
--                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
--                       data-l10n-id="urlbar-web-rtc-share-devices-notification-anchor"/>
--                <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
--                       data-l10n-id="urlbar-web-rtc-share-microphone-notification-anchor"/>
--                <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
--                       data-l10n-id="urlbar-web-rtc-share-screen-notification-anchor"/>
--                <image id="webRTC-shareSpeaker-notification-icon" class="notification-anchor-icon speaker-icon" role="button"
--                       data-l10n-id="urlbar-web-rtc-share-speaker-notification-anchor"/>
--                <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
--                       data-l10n-id="urlbar-services-notification-anchor"/>
--                <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
--                       data-l10n-id="urlbar-eme-notification-anchor"/>
--                <image id="persistent-storage-notification-icon" class="notification-anchor-icon persistent-storage-icon" role="button"
--                       data-l10n-id="urlbar-persistent-storage-notification-anchor"/>
--                <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
--                       data-l10n-id="urlbar-midi-notification-anchor"/>
--                <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
--                       data-l10n-id="urlbar-web-authn-anchor"/>
--                <image id="identity-credential-notification-icon" class="notification-anchor-icon" role="button"
--                      data-l10n-id="identity-credential-urlbar-anchor"/>
--                <image id="storage-access-notification-icon" class="notification-anchor-icon storage-access-icon" role="button"
--                       data-l10n-id="urlbar-storage-access-anchor"/>
--              </box>
--            </box>
--            <box id="urlbar-label-box" align="center">
--              <label id="urlbar-label-switchtab" class="urlbar-label" data-l10n-id="urlbar-switch-to-tab"/>
--              <label id="urlbar-label-extension" class="urlbar-label" data-l10n-id="urlbar-extension"/>
--              <label id="urlbar-label-search-mode" class="urlbar-label"/>
--            </box>
--            <html:div id="urlbar-search-mode-indicator">
--              <html:span id="urlbar-search-mode-indicator-title"/>
--              <html:div id="urlbar-search-mode-indicator-close"
--                     class="close-button"
--                     role="button"
--                     aria-labelledby="urlbar-search-mode-indicator-close urlbar-search-mode-indicator-title"
--                     data-l10n-id="urlbar-search-mode-indicator-close"/>
--            </html:div>
--            <moz-input-box tooltip="aHTMLTooltip"
--                           class="urlbar-input-box"
--                           flex="1"
--                           role="combobox"
--                           aria-owns="urlbar-results">
--              <html:input id="urlbar-scheme"
--                          required="required"/>
--              <html:input id="urlbar-input"
--                          anonid="input"
--                          aria-controls="urlbar-results"
--                          aria-autocomplete="both"
--                          inputmode="mozAwesomebar"
--                          data-l10n-id="urlbar-placeholder"
--                          data-l10n-attrs="placeholder"/>
--            </moz-input-box>
--            <image id="urlbar-go-button"
--                   class="urlbar-icon"
--                   role="button"
--                   keyNav="false"
--                   onclick="gURLBar.handleCommand(event);"
--                   data-l10n-id="urlbar-go-button"/>
--            <hbox id="page-action-buttons" context="pageActionContextMenu" align="center">
--              <toolbartabstop/>
--              <hbox id="contextual-feature-recommendation" role="button" hidden="true">
--                <hbox id="cfr-label-container">
--                  <label id="cfr-label"/>
--                </hbox>
--                <hbox id="cfr-button"
--                      role="presentation"
--                      class="urlbar-page-action">
--                  <image class="urlbar-icon"/>
--                </hbox>
--              </hbox>
--              <hbox id="userContext-icons" hidden="true">
--                <label id="userContext-label"/>
--                <image id="userContext-indicator"/>
--              </hbox>
--              <hbox id="reader-mode-button"
--                    class="urlbar-page-action"
--                    role="button"
--                    data-l10n-id="reader-view-enter-button"
--                    hidden="true"
--                    tooltip="dynamic-shortcut-tooltip"
--                    onclick="AboutReaderParent.buttonClick(event);">
--                <image id="reader-mode-button-icon"
--                       class="urlbar-icon"/>
--              </hbox>
--              <hbox id="picture-in-picture-button"
--                    class="urlbar-page-action"
--                    role="button"
--                    hidden="true"
--                    onclick="PictureInPicture.toggleUrlbar(event)">
--                <image id="picture-in-picture-button-icon"
--                       class="urlbar-icon"/>
--              </hbox>
--              <hbox id="translations-button"
--                    class="urlbar-page-action"
--                    role="button"
--                    data-l10n-id="urlbar-translations-button2"
--                    hidden="true"
--                    onclick="TranslationsPanel.open(event);"
--                    onkeypress="TranslationsPanel.open(event);">
--                <image class="urlbar-icon" id="translations-button-icon" />
--                <image class="urlbar-icon" id="translations-button-circle-arrows" />
--                <html:span id="translations-button-locale" aria-hidden="true" />
--              </hbox>
--              <hbox id="shopping-sidebar-button"
--                  class="urlbar-page-action"
--                  role="button"
--                  data-l10n-id="shopping-sidebar-open-button2"
--                  hidden="true"
--                  onclick="ShoppingSidebarParent.urlbarButtonClick(event);">
--                <image id="shopping-sidebar-button-icon"
--                       class="urlbar-icon"/>
--              </hbox>
--              <toolbarbutton id="urlbar-zoom-button"
--                     onclick="FullZoom.resetFromURLBar(event);"
--                     tooltip="dynamic-shortcut-tooltip"
--                     hidden="true"/>
--              <hbox id="pageActionButton"
--                    class="urlbar-page-action"
--                    role="button"
--                    data-l10n-id="urlbar-page-action-button"
--                    onmousedown="BrowserPageActions.mainButtonClicked(event);"
--                    onkeypress="BrowserPageActions.mainButtonClicked(event);">
--                <image class="urlbar-icon"/>
--              </hbox>
--              <hbox id="star-button-box"
--                    hidden="true"
--                    role="button"
--                    class="urlbar-page-action"
--                    onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
--                <image id="star-button"
--                       class="urlbar-icon"/>
--              </hbox>
--            </hbox>
--          </hbox>
--        </hbox>
--        <toolbartabstop/>
--      </toolbaritem>
--
--      <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
--
--      <toolbarbutton id="downloads-button"
--                     class="toolbarbutton-1 chromeclass-toolbar-additional"
--                     delegatesanchor="true"
--                     badged="true"
--                     key="key_openDownloads"
--                     onmousedown="DownloadsIndicatorView.onCommand(event);"
--                     onkeypress="DownloadsIndicatorView.onCommand(event);"
--                     ondrop="DownloadsIndicatorView.onDrop(event);"
--                     ondragover="DownloadsIndicatorView.onDragOver(event);"
--                     ondragenter="DownloadsIndicatorView.onDragOver(event);"
--                     data-l10n-id="navbar-downloads"
--                     removable="true"
--                     overflows="false"
--                     cui-areatype="toolbar"
--                     hidden="true"
--                     tooltip="dynamic-shortcut-tooltip">
--        <box id="downloads-indicator-anchor"
--               consumeanchor="downloads-button">
--          <image id="downloads-indicator-icon"/>
--        </box>
--        <box class="toolbarbutton-animatable-box" id="downloads-indicator-progress-outer">
--          <box id="downloads-indicator-progress-inner"/>
--        </box>
--        <box class="toolbarbutton-animatable-box" id="downloads-indicator-start-box">
--          <image class="toolbarbutton-animatable-image" id="downloads-indicator-start-image"/>
--        </box>
--        <box class="toolbarbutton-animatable-box" id="downloads-indicator-finish-box">
--          <image class="toolbarbutton-animatable-image" id="downloads-indicator-finish-image"/>
--        </box>
--      </toolbarbutton>
--
--      <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
--                     badged="true"
--                     delegatesanchor="true"
--                     onmousedown="gSync.toggleAccountPanel(this, event)"
--                     onkeypress="gSync.toggleAccountPanel(this, event)"
--                     consumeanchor="fxa-toolbar-menu-button"
--                     closemenu="none"
--                     data-l10n-id="toolbar-button-account"
--                     cui-areatype="toolbar"
--                     removable="true">
--                     <vbox>
--                      <image id="fxa-avatar-image"/>
--                     </vbox>
--      </toolbarbutton>
--
--      <toolbarbutton id="unified-extensions-button"
--                     class="toolbarbutton-1 chromeclass-toolbar-additional"
--                     delegatesanchor="true"
--                     data-l10n-id="unified-extensions-button"
--                     hidden="true"
--                     onkeypress="gUnifiedExtensions.togglePanel(event)"
--                     onmousedown="gUnifiedExtensions.togglePanel(event)"
--                     overflows="false"
--                     removable="false"/>
--    </hbox>
--
--    <toolbarbutton id="nav-bar-overflow-button"
--                   class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
--                   delegatesanchor="true"
--                   skipintoolbarset="true"
--                   data-l10n-id="navbar-overflow">
--      <box class="toolbarbutton-animatable-box">
--        <image class="toolbarbutton-animatable-image"/>
--      </box>
--    </toolbarbutton>
--
--    <toolbaritem id="PanelUI-button"
--                 removable="false">
--      <toolbarbutton id="ion-button"
--                     class="toolbarbutton-1"
--                     delegatesanchor="true"
--                     hidden="true"
--                     badged="true"
--                     tooltiptext="Ion"
--                     onmousedown="switchToTabHavingURI('about:ion', true);"
--                     onkeypress="switchToTabHavingURI('about:ion', true);"/>
--      <toolbarbutton id="whats-new-menu-button"
--                     class="toolbarbutton-1"
--                     delegatesanchor="true"
--                     hidden="true"
--                     badged="true"
--                     onmousedown="PanelUI.showSubView('PanelUI-whatsNew', this, event);"
--                     onkeypress="PanelUI.showSubView('PanelUI-whatsNew', this, event);"/>
--      <toolbarbutton id="PanelUI-menu-button"
--                     class="toolbarbutton-1"
--                     delegatesanchor="true"
--                     badged="true"
--                     consumeanchor="PanelUI-button"
--                     data-l10n-id="appmenu-menu-button-closed2"/>
--    </toolbaritem>
--  </toolbar>
--
--  <toolbar id="PersonalToolbar"
--           mode="icons"
--           class="browser-toolbar chromeclass-directories"
--           context="toolbar-context-menu"
--           data-l10n-id="bookmarks-toolbar"
--           data-l10n-attrs="toolbarname"
--           customizable="true">
--    <toolbartabstop skipintoolbarset="true"/>
--
--    <hbox id="personal-toolbar-empty" skipintoolbarset="true" removable="false" hidden="true">
--      <description id="personal-toolbar-empty-description"
--                   data-l10n-id="bookmarks-toolbar-empty-message"
--                   onclick="BookmarkingUI.openLibraryIfLinkClicked(event);"
--                   onkeydown="BookmarkingUI.openLibraryIfLinkClicked(event);">
--        <html:a data-l10n-name="manage-bookmarks" class="text-link" tabindex="0"/>
--      </description>
--    </hbox>
--
--    <toolbaritem id="personal-bookmarks"
--                 data-l10n-id="bookmarks-toolbar-placeholder"
--                 cui-areatype="toolbar"
--                 removable="true">
--      <toolbarbutton id="bookmarks-toolbar-placeholder"
--                     class="bookmark-item"
--                     data-l10n-id="bookmarks-toolbar-placeholder-button"/>
--      <toolbarbutton id="bookmarks-toolbar-button"
--                     class="toolbarbutton-1"
--                     delegatesanchor="true"
--                     flex="1"
--                     data-l10n-id="bookmarks-toolbar-placeholder-button"
--                     oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/>
--      <hbox flex="1"
--            id="PlacesToolbar"
--            context="placesContext"
--            onmouseup="BookmarksEventHandler.onMouseUp(event);"
--            onclick="BookmarksEventHandler.onClick(event, this._placesView);"
--            oncommand="BookmarksEventHandler.onCommand(event);"
--            tooltip="bhTooltip"
--            popupsinherittooltip="true">
--        <hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true">
--          <image id="PlacesToolbarDropIndicator"
--                  collapsed="true"/>
--        </hbox>
--        <scrollbox orient="horizontal"
--                    id="PlacesToolbarItems"
--                    flex="1"/>
--        <toolbarbutton type="menu"
--                        id="PlacesChevron"
--                        class="toolbarbutton-1"
--                        delegatesanchor="true"
--                        collapsed="true"
--                        data-l10n-id="bookmarks-toolbar-chevron">
--          <menupopup id="PlacesChevronPopup"
--                      is="places-popup"
--                      placespopup="true"
--                      class="toolbar-menupopup"
--                      tooltip="bhTooltip" popupsinherittooltip="true"
--                      context="placesContext"
--                      onpopupshowing="document.getElementById('PlacesToolbar')
--                                              ._placesView._onChevronPopupShowing(event);"/>
--        </toolbarbutton>
--      </hbox>
--    </toolbaritem>
--  </toolbar>
--
--  <html:template id="tab-notification-deck-template">
--    <html:named-deck id="tab-notification-deck"></html:named-deck>
--  </html:template>
--
++#if 0
+   <toolbar id="nav-bar"
+            class="browser-toolbar"
+            data-l10n-id="navbar-accessible"
+@@ -575,7 +574,7 @@
+   <html:template id="tab-notification-deck-template">
+     <html:named-deck id="tab-notification-deck"></html:named-deck>
+   </html:template>
 -
++#endif
+ 
    <html:template id="BrowserToolbarPalette">
      <toolbarbutton id="import-button"
-                    class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index c78c8fea6..4e3321473 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -127,3 +127,9 @@ toolbar .toolbarbutton-1 {
   animation: zen-jello-animation 0.2s ease-in-out;
   animation-delay: 0.1s;
 }
+
+/* Toolbars customization */
+
+#TabsToolbar-customization-target {
+  
+}
diff --git a/src/browser/themes/shared/zen-panel-ui.css b/src/browser/themes/shared/zen-panel-ui.css
index d043c9181..18563c30e 100644
--- a/src/browser/themes/shared/zen-panel-ui.css
+++ b/src/browser/themes/shared/zen-panel-ui.css
@@ -6,10 +6,9 @@
 #PanelUI-zen-profiles-header {
   width: -moz-available;
   height: 100px;
-  border-radius: var(--panel-border-radius);
+  border-radius: 7px;
   background: var(--zen-main-browser-background);
   margin: 5px;
-  box-shadow: var(--zen-sidebar-box-shadow) !important;
   position: relative;
 }
 
diff --git a/src/browser/themes/shared/zen-sidebar.css b/src/browser/themes/shared/zen-sidebar.css
index c4b6c71d9..846dbb04d 100644
--- a/src/browser/themes/shared/zen-sidebar.css
+++ b/src/browser/themes/shared/zen-sidebar.css
@@ -5,10 +5,12 @@
 
 #sidebar-box {
   margin: var(--zen-appcontent-separator-from-window) !important;
-  border-radius: var(--zen-panel-radius) !important;
+  border-radius: 0 15px 15px 0 !important;
   box-shadow: var(--zen-sidebar-box-shadow) !important;
   overflow: hidden;
   transition: .2s;
+  border: 1px solid var(--zen-dialog-border-color);
+  margin-left: 0 !important;
 }
 
 #sidebar-splitter {
diff --git a/src/toolkit/content/zen-xul.css b/src/toolkit/content/zen-xul.css
index 5c78b9376..657b17a0b 100644
--- a/src/toolkit/content/zen-xul.css
+++ b/src/toolkit/content/zen-xul.css
@@ -3,7 +3,7 @@
 
 :root {
   --zen-main-browser-background: light-dark(#ddd, #4a4a4a); 
-  --zen-appcontent-separator-from-window: 10px;
+  --zen-appcontent-separator-from-window: 7px;
 }
 
 toolbox#navigator-toolbox, 
@@ -23,6 +23,7 @@ html#main-window > body {
   border-radius: var(--zen-panel-radius);
   overflow: hidden;
   box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+  border: 1px solid var(--zen-dialog-border-color);
   margin: var(--zen-appcontent-separator-from-window);
   margin-top: 0;
 }
diff --git a/src/toolkit/themes/shared/zen-global-shared.css b/src/toolkit/themes/shared/zen-global-shared.css
index 76b5c4895..44f886863 100644
--- a/src/toolkit/themes/shared/zen-global-shared.css
+++ b/src/toolkit/themes/shared/zen-global-shared.css
@@ -2,7 +2,7 @@
 :root {
   --zen-dialog-background: Field;
   --zen-dialog-border-color: rgba(0,0,0,.2);
-  --zen-panel-radius: 7px;
+  --zen-panel-radius: 15px;
 
   --arrowpanel-background: var(--zen-dialog-background) !important;
   --arrowpanel-border-color: var(--zen-dialog-border-color) !important;