diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index ef571b721..d659102a9 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -107,6 +107,7 @@ pref('zen.view.compact.toolbar-flash-popup.duration', 800);
 pref('zen.view.compact.toolbar-hide-after-hover.duration', 1000);
 pref('zen.view.compact.color-toolbar', true);
 pref('zen.view.compact.color-sidebar', true);
+pref('zen.view.use-deprecated-urlbar', false);
 
 #ifdef XP_MACOSX
 // Disable for macos in the meantime until @HarryHeres finds a solution for hight DPI screens
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index d9fb326ec..182bebbc5 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -392,7 +392,7 @@ var gZenVerticalTabsManager = {
             navBar.append(windowButtons);
           }
         } else { // not windows styled buttons
-          if (isRightSide) {
+          if (isRightSide || !isSidebarExpanded) {
             navBar.prepend(windowButtons);
           } else {
             topButtons.prepend(windowButtons);
diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 72dadc79b..acc0f28ce 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -19,6 +19,15 @@
         display: none !important;
       }
 
+
+      #zen-sidebar-top-buttons:has(#zen-sidebar-top-buttons-customization-target:empty) {
+        max-height: 0 !important;
+        min-height: 0 !important;
+        opacity: 0;
+        overflow: hidden;
+        pointer-events: none;
+      }
+
       #navigator-toolbox {
         --zen-toolbox-max-width: 54px !important;
         --zen-compact-float: calc(var(--zen-element-separation) - 1px);
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 27eaecd14..fa9a526d3 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -164,15 +164,6 @@
     &[should-hide='true'] {
 %include vertical-tabs-topbar.inc.css
     }
-
-    :root[zen-window-buttons-reversed='true'] & {
-      &:has(#PersonalToolbar[collapsed="true"]) {
-        opacity: 0;
-        & > * {
-          display: none;
-        }
-      }
-    }
   }
 }
 
@@ -335,14 +326,6 @@
   }
 }
 
-:root:not([customizing]) #zen-sidebar-top-buttons:has(#zen-sidebar-top-buttons-customization-target:empty) {
-  max-height: 0 !important;
-  min-height: 0 !important;
-  opacity: 0;
-  overflow: hidden;
-  pointer-events: none;
-}
-
 #vertical-pinned-tabs-container {
   padding-inline-end: 0 !important;
   display: flex !important;
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 3be4c11ad..d2968958b 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -337,39 +337,41 @@ button.popup-notification-dropmarker {
   }
 }
 
-#urlbar[open] {
-  z-index: 1000;
-  min-width: 45vw;
-  max-width: 45vw;
-  top: 0 !important;
-  --urlbar-container-height: 55px !important;
-  --urlbar-margin-inline: 10px !important;
-  font-size: 1.1em;
+@media not (-moz-bool-pref: 'zen.view.use-deprecated-urlbar') {
+  #urlbar[open] {
+    z-index: 1000;
+    min-width: 45vw;
+    max-width: 45vw;
+    top: 0 !important;
+    --urlbar-container-height: 55px !important;
+    --urlbar-margin-inline: 10px !important;
+    font-size: 1.1em;
 
-  & #urlbar-background {
-    /* We cant have a transparent background with a backdrop-filter because on normal websites,
-      the backdrop woudn't work, we would need to apply a clip-path to the site and that's not recommended
-      due to performance issues */
-    background-color: var(--zen-branding-bg) !important;
-    box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1) !important;
-    outline: 1px solid light-dark(rgba(20, 20, 20, 0.2), rgba(235, 235, 235, 0.2)) !important;
-    outline-offset: -1px !important;
-  }
+    & #urlbar-background {
+      /* We cant have a transparent background with a backdrop-filter because on normal websites,
+        the backdrop woudn't work, we would need to apply a clip-path to the site and that's not recommended
+        due to performance issues */
+      background-color: var(--zen-branding-bg) !important;
+      box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1) !important;
+      outline: 1px solid light-dark(rgba(20, 20, 20, 0.2), rgba(235, 235, 235, 0.2)) !important;
+      outline-offset: -1px !important;
+    }
 
-  & #identity-box {
-    margin-right: var(--urlbar-margin-inline);
-  }
+    & #identity-box {
+      margin-right: var(--urlbar-margin-inline);
+    }
 
-  :root[zen-right-side='true'] & {
-    right: 0;
-  }
-  position: absolute;
+    :root[zen-right-side='true'] & {
+      right: 0;
+    }
+    position: absolute;
 
-  top: calc(var(--zen-toolbar-height) * 2) !important;
-  left: 28vw;
+    top: calc(var(--zen-toolbar-height) * 2) !important;
+    left: 28vw;
 
-  #urlbar-container:has(&) {
-    border-radius: 10px;
-    background: var(--toolbarbutton-hover-background);
+    #urlbar-container:has(&) {
+      border-radius: 10px;
+      background: var(--toolbarbutton-hover-background);
+    }
   }
 }