diff --git a/src/build/moz-configure/init-configure.patch b/src/build/moz-configure/init-configure.patch
deleted file mode 100644
index 8733040aa..000000000
--- a/src/build/moz-configure/init-configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
-index 9bf4bb29a40045da21909dc1a2a49dbca5d6ac3e..bb594ec0a0e00760763bb3f6313e9cf576f2c4b7 100644
---- a/build/moz.configure/init.configure
-+++ b/build/moz.configure/init.configure
-@@ -1101,7 +1101,8 @@ def milestone(build_env, build_project, version_path, as_milestone, _):
- 
-     is_nightly = is_release_or_beta = None
- 
--    if "a1" in milestone:
-+    is_nightly = True
-+    if "t" in milestone:
-         is_nightly = True
-     elif "a" not in milestone:
-         is_release_or_beta = True
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 8e17e3d85..8aee8398a 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -277,10 +277,6 @@ var gZenUIManager = {
         await new Promise((resolve) => setTimeout(resolve, 10));
 
         document.getElementById('Browser:OpenLocation').doCommand();
-
-        // Wait for URL bar to be ready
-        await new Promise((resolve) => setTimeout(resolve, 10));
-
         gURLBar.search(this._lastSearch || '');
       } catch (e) {
         console.error('Error opening location in new tab:', e);
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index ceadf30dd..68a6adf3e 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -5,16 +5,6 @@
  */
 /* All overrides for compact mode go here */
 
-:root {
-  --zen-compact-mode-offset: 0.1px;
-
-  @media not (-moz-platform: macos) { 
-    &[sizemode='maximized'][zen-right-side='true'] {
-      --zen-compact-mode-offset: 1px;
-    }
-  }
-}
-
 :root[zen-compact-mode='true']:not([customizing]):not([inDOMFullscreen='true']) {
 %include ../tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
   @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
@@ -54,11 +44,15 @@
 
       #navigator-toolbox {
         --zen-toolbox-max-width: 48px !important;
-        --zen-compact-float: var(--zen-element-separation);
+        --zen-compact-float: max(var(--zen-element-separation), 4px);
 
         /* Initial padding for when we are animating */
         padding: 0 0 0 var(--zen-toolbox-padding) !important;
 
+        & #urlbar {
+          visibility: visible;
+        }
+
         &:not([animate='true']) {
           position: fixed;
           z-index: 10;
@@ -69,7 +63,6 @@
           top: 0;
           bottom: var(--zen-element-separation);
           padding: 0 var(--zen-compact-float) !important;
-          visibility: hidden;
 
           :root[zen-single-toolbar='true'] & {
             top: calc(var(--zen-element-separation) / 2);
@@ -125,6 +118,8 @@
         outline-offset: -1px;
         min-width: var(--zen-toolbox-min-width);
         box-shadow: var(--zen-big-shadow);
+        transition: visibility 0.15s; /* Same as the toolbox */
+        visibility: hidden;
 
         :root[zen-sidebar-expanded='true'] & {
           width: calc(var(--zen-sidebar-width) + var(--zen-toolbox-padding));
@@ -144,11 +139,6 @@
           * https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_display/Containing_block#identifying_the_containing_block */
         }
 
-        & #urlbar[open][zen-floating-urlbar='true'] {
-          transition: left 0.05s ease;
-          visibility: visible;
-        }
-
         &::before {
           content: '';
           position: absolute;
@@ -175,8 +165,6 @@
       #navigator-toolbox:has(
           *:is([panelopen='true'], [open='true'], #urlbar:focus-within):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)
         ) {
-        visibility: visible;
-
         &:not([animate='true']) {
           --zen-compact-mode-func: linear(
             0 0%,
@@ -291,6 +279,11 @@
             right var(--zen-compact-mode-time) var(--zen-compact-mode-func);
 
           &:not([supress-primary-adjustment='true']) {
+            & #titlebar {
+              transition: none;
+              visibility: visible;
+            }
+
             left: calc(var(--zen-element-separation) / -2);
             :root[zen-right-side='true'] & {
               right: calc(var(--zen-element-separation) / -2);