diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index afcd3683a..a5b90029f 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,12 +1,10 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index b0308911446dd6fc549401371a85faa6341f8338..3942a0b45308b110685c34e8a9367d7c5d40d8c4 100644
+index 16559b2c0e3aef391b43e09281aee24007feb0bd..2579cea92a55fabb73fdd130c3706af08c3fd849 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -18,12 +18,18 @@
-     <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
+@@ -21,11 +21,15 @@
    </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. -->
@@ -18,6 +16,5 @@ index b0308911446dd6fc549401371a85faa6341f8338..3942a0b45308b110685c34e8a9367d7c
                    flex="1" selectedIndex="0"/>
      </tabbox>
 +  </hbox>
-+  </vbox>
    </vbox>
  </hbox>
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index e83405a8d..84b9ade53 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 0a67afa81ff5e10dcbfb53149f7ed9109de084ac..bdcce262b5fc18767efd1054fd724b97c42471e4 100644
+index 390a1300a1213af2b411ba09c67e3c25750ee6c3..7c80c54dd43b5414bf5ea9101d53431c0b4a140b 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -32,10 +32,11 @@
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 894ce976c..b600cb2cf 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c992624170bde0e63 100644
+index 3b97732d8035f07a2308f76f235702c70a5fa388..fea1a6424de65c15db895ce3cf95e699fbf3952c 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
-@@ -538,19 +538,36 @@
+@@ -552,19 +552,36 @@
        }
        dt.setDragImage(toDrag, dragImageOffset, dragImageOffset);
  
@@ -40,7 +40,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
          movingTabs: (tab.multiselected ? gBrowser.selectedTabs : [tab]).filter(
            t => t.pinned == tab.pinned
          ),
-@@ -637,21 +654,30 @@
+@@ -651,21 +668,30 @@
          }
        }
  
@@ -76,7 +76,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            ];
          }
          newMargin = pixelsToScroll > 0 ? maxMargin : minMargin;
-@@ -661,29 +687,38 @@
+@@ -675,29 +701,38 @@
          if (newIndex == children.length) {
            let tabRect = this._getVisibleTabs().at(-1).getBoundingClientRect();
            if (RTL_UI) {
@@ -121,7 +121,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
        var dt = event.dataTransfer;
        var dropEffect = dt.dropEffect;
        var draggedTab;
-@@ -740,7 +775,7 @@
+@@ -754,7 +789,7 @@
            incrementDropIndex = false;
          }
  
@@ -130,7 +130,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            for (let tab of movingTabs) {
              tab.toggleAttribute("tabdrop-samewindow", true);
              tab.style.transform = "translateX(" + newTranslateX + "px)";
-@@ -1126,10 +1161,13 @@
+@@ -1144,10 +1179,13 @@
      }
  
      _initializeArrowScrollbox() {
@@ -144,7 +144,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            // Ignore underflow events:
            // - from nested scrollable elements
            // - for vertical orientation
-@@ -1492,19 +1530,30 @@
+@@ -1510,19 +1548,30 @@
          }
        }
  
@@ -184,7 +184,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
  
        let pinned = draggedTab.pinned;
        let numPinned = gBrowser._numPinnedTabs;
-@@ -1513,36 +1562,39 @@
+@@ -1531,36 +1580,39 @@
          pinned ? numPinned : undefined
        );
  
@@ -235,7 +235,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
        }
  
        draggedTab._dragData.translateX = translateX;
-@@ -1575,11 +1627,11 @@
+@@ -1593,11 +1645,11 @@
          if (tabs[mid] == draggedTab && ++mid > high) {
            break;
          }
@@ -249,7 +249,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            tabCenter
          ) {
            low = mid + 1;
-@@ -1602,16 +1654,16 @@
+@@ -1620,16 +1672,16 @@
        for (let tab of tabs) {
          if (tab != draggedTab) {
            let shift = getTabShift(tab, newIndex);
@@ -269,7 +269,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
          }
          return 0;
        }
-@@ -1683,9 +1735,9 @@
+@@ -1701,9 +1753,9 @@
  
        // Slide the relevant tabs to their new position.
        for (let t of this._getVisibleTabs()) {
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 593c6080b..8a2fc9813 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -472,7 +472,7 @@ panelmultiview {
 
 @media (-moz-bool-pref: "zen.view.compact") {
   #navigator-toolbox,
-  #zen-appcontent-navbar-container {
+  #zen-appcontent-navbar-container #PersonalToolbar {
     position: absolute;
     z-index: 1;
     overflow: hidden;
@@ -485,7 +485,7 @@ panelmultiview {
     height: 100%;
   }
 
-  #zen-appcontent-navbar-container {
+  #zen-appcontent-navbar-container #PersonalToolbar {
     min-height: 0;
     height: 1px;
     width: 100%;
@@ -498,8 +498,8 @@ panelmultiview {
     opacity: 1;
   }
 
-  #zen-appcontent-navbar-container:hover,
-  #zen-appcontent-navbar-container:has([open="true"]) {
+  #zen-appcontent-navbar-container #PersonalToolbar:hover,
+  #zen-appcontent-navbar-container #PersonalToolbar:has([open="true"]) {
     height: unset;
     background: var(--zen-themed-toolbar-bg) !important;
     overflow: visible;
diff --git a/src/browser/themes/shared/zen-sidebar.css b/src/browser/themes/shared/zen-sidebar.css
index 0d6ccad14..8856281aa 100644
--- a/src/browser/themes/shared/zen-sidebar.css
+++ b/src/browser/themes/shared/zen-sidebar.css
@@ -163,7 +163,6 @@
   display: flex;
   flex-direction: column;
   padding: 0 3px;
-  height: 100%;
   position: relative;
   background: transparent !important;
   align-items: center;