diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 78b7c6d4..6b062277 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -173,7 +173,11 @@ pref('zen.essentials.enabled', true);
 pref('zen.workspaces.container-specific-essentials-enabled', false);
 
 // Zen Watermark
+#ifdef MOZILLA_OFFICIAL
 pref('zen.watermark.enabled', true, sticky);
+#else
+pref('zen.watermark.enabled', false, sticky);
+#endif
 
 // Smooth scrolling
 pref('apz.overscroll.enabled', true); // not DEFAULT on Linux
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 32c8f406..325d1a92 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -131,9 +131,10 @@ var gZenVerticalTabsManager = {
     this._toolbarOriginalParent = document.getElementById('nav-bar').parentElement;
 
     gZenCompactModeManager.addEventListener(updateEvent);
-    this._updateEvent();
     this.initRightSideOrderContextMenu();
 
+    window.addEventListener('DOMContentLoaded', updateEvent, { once: true });
+
     const tabs = document.getElementById('tabbrowser-tabs');
 
     XPCOMUtils.defineLazyPreferenceGetter(this, 'canOpenTabOnMiddleClick', 'zen.tabs.newtab-on-middle-click', true);
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 35833da9..d9b29dc3 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -20,6 +20,9 @@
   min-width: 45%;
   --urlbar-container-height: 55px !important;
   --urlbar-margin-inline: 10px !important;
+  position: fixed;
+
+  top: calc(var(--zen-toolbar-height) * 4);
   left: 50%;
   transform: translateX(-50%);
 
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 6388bc76..b860c08d 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -492,7 +492,7 @@
         // Return as a proper data URL
         return `data:${faviconData.mimeType};base64,${base64String}`;
       } catch (ex) {
-        console.error("Failed to get favicon:", ex);
+     // console.error("Failed to get favicon:", ex);
         return null;
       }
     }
@@ -577,4 +577,4 @@
   }
 
   window.gZenPinnedTabManager = new ZenPinnedTabManager();
-}
\ No newline at end of file
+}