From 47181da49e18f8822ae95566c227c986106f0520 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sat, 27 Sep 2025 19:04:59 +0200
Subject: [PATCH 001/111] feat: Improved startup performance and flashes,
 p=#10588, c=common, tabs, workspaces

---
 src/zen/ZenComponents.manifest          | 30 +++++++++
 src/zen/common/ZenStartup.mjs           | 36 +++++------
 src/zen/moz.build                       |  4 ++
 src/zen/tabs/zen-tabs/vertical-tabs.css |  4 +-
 src/zen/workspaces/ZenWorkspaces.mjs    | 84 ++++++++++++-------------
 5 files changed, 91 insertions(+), 67 deletions(-)
 create mode 100644 src/zen/ZenComponents.manifest

diff --git a/src/zen/ZenComponents.manifest b/src/zen/ZenComponents.manifest
new file mode 100644
index 000000000..bb5094206
--- /dev/null
+++ b/src/zen/ZenComponents.manifest
@@ -0,0 +1,30 @@
+# nsBrowserGlue.js
+
+# This component must restrict its registration for the app-startup category
+# to the specific list of apps that use it so it doesn't get loaded in xpcshell.
+# Thus we restrict it to these apps:
+#
+#   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+#
+# The first rule of running code during startup is: don't.
+# 
+# We take performance very seriously and ideally your component/feature should
+# initialize only when needed.
+# 
+# If you have established that you really must run code during startup,
+# available entrypoints are:
+# 
+# - registering a `browser-idle-startup` category entry for your JS module (or
+#   even a "best effort" user idle task, see `BrowserGlue.sys.mjs`)
+# - registering a `browser-window-delayed-startup` category entry for your JS
+#   module. **Note that this is invoked for each browser window.**
+# - registering a `browser-before-ui-startup` category entry if you really really
+#   need to. This will run code before the first browser window appears on the
+#   screen and make Firefox seem slow, so please don't do it unless absolutely
+#   necessary.
+
+#ifdef XP_UNIX
+  #ifndef XP_MACOSX
+    #define UNIX_BUT_NOT_MAC
+  #endif
+#endif
diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
index 3fa3d061c..ad4c4e775 100644
--- a/src/zen/common/ZenStartup.mjs
+++ b/src/zen/common/ZenStartup.mjs
@@ -2,22 +2,25 @@
 // 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/.
 {
-  var gZenStartup = new (class {
+  class ZenStartupManager {
     #watermarkIgnoreElements = ['zen-toast-container'];
     #hasInitializedLayout = false;
 
     isReady = false;
 
-    async init() {
-      // important: We do this to ensure that some firefox components
-      // are initialized before we start our own initialization.
-      // please, do not remove this line and if you do, make sure to
-      // test the startup process.
-      await new Promise((resolve) => setTimeout(resolve, 0));
-      this.openWatermark();
-      this.#initBrowserBackground();
-      this.#changeSidebarLocation();
-      this.#zenInitBrowserLayout();
+    constructor() {
+      gZenWorkspaces.init();
+
+      window.addEventListener(
+        'MozBeforeInitialXULLayout',
+        () => {
+          this.openWatermark();
+          this.#zenInitBrowserLayout();
+          this.#initBrowserBackground();
+          this.#changeSidebarLocation();
+        },
+        { once: true }
+      );
     }
 
     #initBrowserBackground() {
@@ -57,7 +60,6 @@
           document.getElementById('zen-appcontent-wrapper').prepend(deckTemplate);
         }
 
-        gZenWorkspaces.init();
         setTimeout(() => {
           gZenUIManager.init();
           this.#checkForWelcomePage();
@@ -223,13 +225,7 @@
         });
       });
     }
-  })();
+  }
 
-  window.addEventListener(
-    'MozBeforeInitialXULLayout',
-    () => {
-      gZenStartup.init();
-    },
-    { once: true }
-  );
+  window.gZenStartup = new ZenStartupManager();
 }
diff --git a/src/zen/moz.build b/src/zen/moz.build
index 56782122f..ac8965447 100644
--- a/src/zen/moz.build
+++ b/src/zen/moz.build
@@ -10,3 +10,7 @@ DIRS += [
     "urlbar",
     "toolkit",
 ]
+
+EXTRA_PP_COMPONENTS += [
+    "ZenComponents.manifest",
+]
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 0012ebfd6..1a7cb15e6 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -418,13 +418,13 @@
   overflow-y: auto;
   height: 100%;
 
-  :root[zen-workspace-id][zen-sidebar-expanded='true'] & {
+  :root[zen-sidebar-expanded='true'] & {
     margin-left: calc(-1 * var(--zen-toolbox-padding));
     width: calc(100% + var(--zen-toolbox-padding) * 2);
   }
 }
 
-:root[zen-workspace-id] #pinned-tabs-container {
+#pinned-tabs-container {
   display: none;
 }
 
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index ea881aeff..1fb1476c9 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -51,7 +51,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized]);
   }
 
-  async init() {
+  init() {
     // Initialize tab selection state
     this._tabSelectionState = {
       inProgress: false,
@@ -118,12 +118,8 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     this.popupOpenHandler = this._popupOpenHandler.bind(this);
 
     window.addEventListener('resize', this.onWindowResize.bind(this));
-    this.addPopupListeners();
 
-    await this.#waitForPromises();
-    await this._workspaces();
-
-    await this.afterLoadInit();
+    this.afterLoadInit();
   }
 
   log(...args) {
@@ -136,11 +132,13 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     if (!this._hasInitializedTabsStrip) {
       await this.delayedStartup();
     }
-    this._initializeWorkspaceTabContextMenus();
+    this.#initializeWorkspaceTabContextMenus();
     await this.initializeWorkspaces();
     await this.promiseSectionsInitialized;
 
     // Non UI related initializations
+    this.addPopupListeners();
+
     if (
       Services.prefs.getBoolPref('zen.workspaces.swipe-actions', false) &&
       this.workspaceEnabled &&
@@ -311,6 +309,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   }
 
   async _createDefaultWorkspaceIfNeeded() {
+    await this.#waitForPromises();
     const workspaces = await this._workspaces();
     if (!workspaces.workspaces.length) {
       await this.createAndSaveWorkspace('Space', null, true);
@@ -401,46 +400,42 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   async initializeTabsStripSections() {
     await SessionStore.promiseInitialized;
     await SessionStore.promiseAllWindowsRestored;
+    await gZenSessionStore.promiseInitialized;
     const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
     perifery.setAttribute('hidden', 'true');
-    await new Promise((resolve) => {
-      setTimeout(async () => {
-        const tabs = gBrowser.tabContainer.allTabs;
-        const workspaces = await this._workspaces();
-        for (const workspace of workspaces.workspaces) {
-          await this._createWorkspaceTabsSection(workspace, tabs);
-        }
-        if (tabs.length) {
-          const defaultSelectedContainer = this.workspaceElement(
-            this.activeWorkspace
-          )?.querySelector('.zen-workspace-normal-tabs-section');
-          const pinnedContainer = this.workspaceElement(this.activeWorkspace).querySelector(
-            '.zen-workspace-pinned-tabs-section'
-          );
-          // New profile with no workspaces does not have a default selected container
-          if (defaultSelectedContainer) {
-            for (const tab of tabs) {
-              if (tab.hasAttribute('zen-essential')) {
-                this.getEssentialsSection(tab).appendChild(tab);
-                continue;
-              } else if (tab.pinned) {
-                pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
-                continue;
-              }
-              // before to the last child (perifery)
-              defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
-            }
+    const tabs = gBrowser.tabContainer.allTabs;
+    const workspaces = await this._workspaces();
+    for (const workspace of workspaces.workspaces) {
+      await this._createWorkspaceTabsSection(workspace, tabs);
+    }
+    if (tabs.length) {
+      const defaultSelectedContainer = this.workspaceElement(this.activeWorkspace)?.querySelector(
+        '.zen-workspace-normal-tabs-section'
+      );
+      const pinnedContainer = this.workspaceElement(this.activeWorkspace).querySelector(
+        '.zen-workspace-pinned-tabs-section'
+      );
+      // New profile with no workspaces does not have a default selected container
+      if (defaultSelectedContainer) {
+        for (const tab of tabs) {
+          if (tab.hasAttribute('zen-essential')) {
+            this.getEssentialsSection(tab).appendChild(tab);
+            continue;
+          } else if (tab.pinned) {
+            pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
+            continue;
           }
-          gBrowser.tabContainer._invalidateCachedTabs();
+          // before to the last child (perifery)
+          defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
         }
-        perifery.setAttribute('hidden', 'true');
-        this._hasInitializedTabsStrip = true;
-        this.registerPinnedResizeObserver();
-        this._fixIndicatorsNames(workspaces);
-        this._resolveSectionsInitialized();
-        resolve();
-      }, 0);
-    });
+      }
+      gBrowser.tabContainer._invalidateCachedTabs();
+    }
+    perifery.setAttribute('hidden', 'true');
+    this._hasInitializedTabsStrip = true;
+    this.registerPinnedResizeObserver();
+    this._fixIndicatorsNames(workspaces);
+    this._resolveSectionsInitialized();
   }
 
   getEssentialsSection(container = 0) {
@@ -920,7 +915,6 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   async initializeWorkspaces() {
     let activeWorkspace = await this.getActiveWorkspace();
     this.activeWorkspace = activeWorkspace?.uuid;
-    await gZenSessionStore.promiseInitialized;
     try {
       if (activeWorkspace) {
         window.gZenThemePicker = new nsZenThemePicker();
@@ -2660,7 +2654,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     await this.changeWorkspace(nextWorkspace, { whileScrolling });
   }
 
-  _initializeWorkspaceTabContextMenus() {
+  #initializeWorkspaceTabContextMenus() {
     if (this.privateWindowOrDisabled) {
       const commandsToDisable = [
         'cmd_zenOpenFolderCreation',

From b1d6e0eb219abeaa35facecbed175880486b28d9 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 28 Sep 2025 00:59:00 +0200
Subject: [PATCH 002/111] feat: Small tweaks to the command bar animations,
 b=no-bug, c=common

---
 .../urlbar/UrlbarProvidersManager-sys-mjs.patch    | 12 ++++++++++++
 src/zen/common/ZenUIManager.mjs                    |  2 +-
 src/zen/common/styles/zen-animations.css           |  9 +++++++--
 src/zen/common/styles/zen-omnibox.css              |  9 +++++----
 src/zen/urlbar/ZenUBActionsProvider.sys.mjs        | 14 ++++++++++----
 src/zen/urlbar/ZenUBGlobalActions.sys.mjs          | 10 +++++-----
 src/zen/urlbar/ZenUBResultsLearner.sys.mjs         |  2 +-
 7 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch

diff --git a/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
new file mode 100644
index 000000000..45f6b46e9
--- /dev/null
+++ b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
+index 555273f6ea1efd77aa3062b9910bbfe28568775d..5c4a46c926913ab592f5e12908b8817410abe6b6 100644
+--- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
++++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
+@@ -716,6 +716,7 @@ export class Query {
+     if (
+       result.heuristic &&
+       this.context.searchMode &&
++      !(this.context.searchMode.source === lazy.UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS && result.payload?.zenAction) &&
+       (!this.context.trimmedSearchString ||
+         (!this.context.searchMode.engineName && !result.autofill))
+     ) {
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index cf6e04202..dc3d44ba8 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -260,7 +260,7 @@ var gZenUIManager = {
             gURLBar.removeAttribute('animate-searchmode');
             delete this._animatingSearchModeTimeout;
           });
-        }, 700);
+        }, 1000);
       }
     }
   },
diff --git a/src/zen/common/styles/zen-animations.css b/src/zen/common/styles/zen-animations.css
index 5d3c6d091..efdc0b6df 100644
--- a/src/zen/common/styles/zen-animations.css
+++ b/src/zen/common/styles/zen-animations.css
@@ -103,10 +103,15 @@
 /* Mark: URL Bar */
 @keyframes zen-urlbar-searchmode {
   0% {
-    box-shadow: 0 0 20px color-mix(in srgb, var(--zen-primary-color), var(--toolbox-textcolor) 20%);
+    box-shadow: 0 0 20px
+      color-mix(
+        in srgb,
+        color-mix(in srgb, var(--zen-primary-color), var(--toolbox-textcolor) 20%),
+        light-dark(rgba(0, 0, 0, 0.3), transparent) 50%
+      );
   }
 
   100% {
-    box-shadow: 0 0 300px color-mix(in srgb, var(--zen-primary-color), transparent 100%);
+    box-shadow: 0 0 250px color-mix(in srgb, var(--zen-primary-color), transparent 100%);
   }
 }
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 1b6db9023..421641b4f 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -172,8 +172,8 @@
 
   & .urlbar-background {
     --zen-urlbar-background-base: light-dark(
-      white,
-      color-mix(in srgb, hsl(0, 0%, 1%), var(--zen-colors-primary) 25%)
+      #fbfbfb,
+      color-mix(in srgb, hsl(0, 0%, 1%), var(--zen-colors-primary) 30%)
     );
     @media -moz-pref('zen.theme.acrylic-elements') {
       --zen-urlbar-background-transparent: color-mix(
@@ -186,7 +186,7 @@
       --zen-urlbar-background-transparent,
       var(--zen-urlbar-background-base)
     ) !important;
-    box-shadow: 0px 0px 90px -10px light-dark(rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.75)) !important;
+    box-shadow: 0px 30px 140px -15px light-dark(rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.6)) !important;
     backdrop-filter: none !important;
     outline: 0.5px solid light-dark(rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.2)) !important;
     outline-offset: var(--zen-urlbar-outline-offset) !important;
@@ -208,7 +208,7 @@
     height: 100%;
     border-radius: inherit;
     pointer-events: none;
-    animation: zen-urlbar-searchmode ease-out 0.7s forwards;
+    animation: zen-urlbar-searchmode ease-out 1s forwards;
   }
 }
 
@@ -678,4 +678,5 @@
 
 #urlbar-search-mode-indicator-title {
   font-weight: 600;
+  padding: 0px;
 }
diff --git a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
index d8ba00fe4..898aa9373 100644
--- a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
+++ b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
@@ -15,7 +15,7 @@ const DYNAMIC_TYPE_NAME = 'zen-actions';
 const MAX_RECENT_ACTIONS = 5;
 
 const MINIMUM_QUERY_SCORE = 92;
-const MINIMUM_PREFIXED_QUERY_SCORE = 50;
+const MINIMUM_PREFIXED_QUERY_SCORE = 30;
 
 ChromeUtils.defineESModuleGetters(lazy, {
   UrlbarResult: 'resource:///modules/UrlbarResult.sys.mjs',
@@ -242,15 +242,15 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
     }
 
     const ownerGlobal = lazy.BrowserWindowTracker.getTopWindow();
-    const finalResults = [];
+    let finalResults = [];
     for (const action of actionsResults) {
       const [payload, payloadHighlights] = lazy.UrlbarResult.payloadAndSimpleHighlights([], {
         suggestion: action.label,
         title: action.label,
-        query: queryContext.searchString,
         zenCommand: action.command,
         dynamicType: DYNAMIC_TYPE_NAME,
         zenAction: true,
+        query: isPrefixed ? action.label.trimStart() : queryContext.searchString,
         icon: action.icon,
         shortcutContent: ownerGlobal.gZenKeyboardShortcutsManager.getShortcutDisplayFromCommand(
           action.command
@@ -265,7 +265,7 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
         payload,
         payloadHighlights
       );
-      if (zenUrlbarResultsLearner.shouldPrioritize(action.commandId)) {
+      if (zenUrlbarResultsLearner.shouldPrioritize(action.commandId) && !isPrefixed) {
         result.heuristic = true;
       } else {
         result.suggestedIndex = zenUrlbarResultsLearner.getDeprioritizeIndex(action.commandId);
@@ -278,8 +278,14 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
       }
       finalResults.push(result);
     }
+    let i = 0;
     zenUrlbarResultsLearner.sortCommandsByPriority(finalResults).forEach((result) => {
+      if (isPrefixed && i === 0 && query.length > 1) {
+        result.heuristic = true;
+        delete result.suggestedIndex;
+      }
       addCallback(this, result);
+      i++;
     });
   }
 
diff --git a/src/zen/urlbar/ZenUBGlobalActions.sys.mjs b/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
index ba5a88abe..8418e14be 100644
--- a/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
+++ b/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
@@ -37,16 +37,16 @@ const globalActionsTemplate = [
     command: (window) => window.openPreferences(),
     icon: 'chrome://browser/skin/zen-icons/settings.svg',
   },
-  {
-    label: 'Open New Window',
-    command: 'cmd_newNavigator',
-    icon: 'chrome://browser/skin/zen-icons/window.svg',
-  },
   {
     label: 'Open Private Window',
     command: 'Tools:PrivateBrowsing',
     icon: 'chrome://browser/skin/zen-icons/private-window.svg',
   },
+  {
+    label: 'Open New Window',
+    command: 'cmd_newNavigator',
+    icon: 'chrome://browser/skin/zen-icons/window.svg',
+  },
   {
     label: 'Pin Tab',
     command: 'cmd_zenTogglePinTab',
diff --git a/src/zen/urlbar/ZenUBResultsLearner.sys.mjs b/src/zen/urlbar/ZenUBResultsLearner.sys.mjs
index 99165f85f..73f78facb 100644
--- a/src/zen/urlbar/ZenUBResultsLearner.sys.mjs
+++ b/src/zen/urlbar/ZenUBResultsLearner.sys.mjs
@@ -7,7 +7,7 @@ import { XPCOMUtils } from 'resource://gre/modules/XPCOMUtils.sys.mjs';
 const lazy = {};
 
 const DEFAULT_DB_DATA = '{}';
-const DEPRIORITIZE_MAX = -4;
+const DEPRIORITIZE_MAX = -5;
 const PRIORITIZE_MAX = 5;
 
 XPCOMUtils.defineLazyPreferenceGetter(

From 3146ec1c3be963fec045b4f97d12fc187214076b Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 28 Sep 2025 13:44:14 +0200
Subject: [PATCH 003/111] fix: Fixed toolbar bg not showing until hover,
 b=closes #10595, c=compact-mode, workspaces

---
 src/zen/compact-mode/zen-compact-mode.css | 6 +++---
 src/zen/workspaces/zen-workspaces.css     | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 4f8f6aaa4..235cf8a78 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -322,6 +322,9 @@
       }
 
       & #zen-appcontent-navbar-wrapper {
+                  & .zen-toolbar-background {
+            display: flex;
+          }
         --zen-compact-toolbar-offset: 5px;
         position: absolute;
         top: calc(-1 * var(--zen-toolbar-height) + 1px);
@@ -360,9 +363,6 @@
         ) {
         & #zen-appcontent-navbar-container {
           visibility: visible !important;
-          & .zen-toolbar-background {
-            display: flex;
-          }
         }
         border-top-width: 0px;
 
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index a37da3d66..da2e8116c 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -48,6 +48,10 @@
 
       &:is(img) {
         padding: 6px;
+
+        :root:not([zen-sidebar-expanded='true']) & {
+          padding: 10px;
+        }
       }
    
       &[no-icon='true'] {

From 88f26d8829ed1241f087fa88176d966276b78359 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 28 Sep 2025 16:06:17 +0200
Subject: [PATCH 004/111] =?UTF-8?q?Revert=20"feat:=20Improved=20startup=20?=
 =?UTF-8?q?performance=20and=20flashes,=20p=3D#10588,=20c=3Dcommon,=20t?=
 =?UTF-8?q?=E2=80=A6"=20(#10604)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/zen/ZenComponents.manifest          | 30 ---------
 src/zen/common/ZenStartup.mjs           | 36 ++++++-----
 src/zen/moz.build                       |  4 --
 src/zen/tabs/zen-tabs/vertical-tabs.css |  4 +-
 src/zen/workspaces/ZenWorkspaces.mjs    | 86 +++++++++++++------------
 5 files changed, 68 insertions(+), 92 deletions(-)
 delete mode 100644 src/zen/ZenComponents.manifest

diff --git a/src/zen/ZenComponents.manifest b/src/zen/ZenComponents.manifest
deleted file mode 100644
index bb5094206..000000000
--- a/src/zen/ZenComponents.manifest
+++ /dev/null
@@ -1,30 +0,0 @@
-# nsBrowserGlue.js
-
-# This component must restrict its registration for the app-startup category
-# to the specific list of apps that use it so it doesn't get loaded in xpcshell.
-# Thus we restrict it to these apps:
-#
-#   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-#
-# The first rule of running code during startup is: don't.
-# 
-# We take performance very seriously and ideally your component/feature should
-# initialize only when needed.
-# 
-# If you have established that you really must run code during startup,
-# available entrypoints are:
-# 
-# - registering a `browser-idle-startup` category entry for your JS module (or
-#   even a "best effort" user idle task, see `BrowserGlue.sys.mjs`)
-# - registering a `browser-window-delayed-startup` category entry for your JS
-#   module. **Note that this is invoked for each browser window.**
-# - registering a `browser-before-ui-startup` category entry if you really really
-#   need to. This will run code before the first browser window appears on the
-#   screen and make Firefox seem slow, so please don't do it unless absolutely
-#   necessary.
-
-#ifdef XP_UNIX
-  #ifndef XP_MACOSX
-    #define UNIX_BUT_NOT_MAC
-  #endif
-#endif
diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
index ad4c4e775..3fa3d061c 100644
--- a/src/zen/common/ZenStartup.mjs
+++ b/src/zen/common/ZenStartup.mjs
@@ -2,25 +2,22 @@
 // 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/.
 {
-  class ZenStartupManager {
+  var gZenStartup = new (class {
     #watermarkIgnoreElements = ['zen-toast-container'];
     #hasInitializedLayout = false;
 
     isReady = false;
 
-    constructor() {
-      gZenWorkspaces.init();
-
-      window.addEventListener(
-        'MozBeforeInitialXULLayout',
-        () => {
-          this.openWatermark();
-          this.#zenInitBrowserLayout();
-          this.#initBrowserBackground();
-          this.#changeSidebarLocation();
-        },
-        { once: true }
-      );
+    async init() {
+      // important: We do this to ensure that some firefox components
+      // are initialized before we start our own initialization.
+      // please, do not remove this line and if you do, make sure to
+      // test the startup process.
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      this.openWatermark();
+      this.#initBrowserBackground();
+      this.#changeSidebarLocation();
+      this.#zenInitBrowserLayout();
     }
 
     #initBrowserBackground() {
@@ -60,6 +57,7 @@
           document.getElementById('zen-appcontent-wrapper').prepend(deckTemplate);
         }
 
+        gZenWorkspaces.init();
         setTimeout(() => {
           gZenUIManager.init();
           this.#checkForWelcomePage();
@@ -225,7 +223,13 @@
         });
       });
     }
-  }
+  })();
 
-  window.gZenStartup = new ZenStartupManager();
+  window.addEventListener(
+    'MozBeforeInitialXULLayout',
+    () => {
+      gZenStartup.init();
+    },
+    { once: true }
+  );
 }
diff --git a/src/zen/moz.build b/src/zen/moz.build
index ac8965447..56782122f 100644
--- a/src/zen/moz.build
+++ b/src/zen/moz.build
@@ -10,7 +10,3 @@ DIRS += [
     "urlbar",
     "toolkit",
 ]
-
-EXTRA_PP_COMPONENTS += [
-    "ZenComponents.manifest",
-]
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 1a7cb15e6..0012ebfd6 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -418,13 +418,13 @@
   overflow-y: auto;
   height: 100%;
 
-  :root[zen-sidebar-expanded='true'] & {
+  :root[zen-workspace-id][zen-sidebar-expanded='true'] & {
     margin-left: calc(-1 * var(--zen-toolbox-padding));
     width: calc(100% + var(--zen-toolbox-padding) * 2);
   }
 }
 
-#pinned-tabs-container {
+:root[zen-workspace-id] #pinned-tabs-container {
   display: none;
 }
 
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 1fb1476c9..ea881aeff 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -51,7 +51,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized]);
   }
 
-  init() {
+  async init() {
     // Initialize tab selection state
     this._tabSelectionState = {
       inProgress: false,
@@ -118,8 +118,12 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     this.popupOpenHandler = this._popupOpenHandler.bind(this);
 
     window.addEventListener('resize', this.onWindowResize.bind(this));
+    this.addPopupListeners();
 
-    this.afterLoadInit();
+    await this.#waitForPromises();
+    await this._workspaces();
+
+    await this.afterLoadInit();
   }
 
   log(...args) {
@@ -132,13 +136,11 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     if (!this._hasInitializedTabsStrip) {
       await this.delayedStartup();
     }
-    this.#initializeWorkspaceTabContextMenus();
+    this._initializeWorkspaceTabContextMenus();
     await this.initializeWorkspaces();
     await this.promiseSectionsInitialized;
 
     // Non UI related initializations
-    this.addPopupListeners();
-
     if (
       Services.prefs.getBoolPref('zen.workspaces.swipe-actions', false) &&
       this.workspaceEnabled &&
@@ -309,7 +311,6 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   }
 
   async _createDefaultWorkspaceIfNeeded() {
-    await this.#waitForPromises();
     const workspaces = await this._workspaces();
     if (!workspaces.workspaces.length) {
       await this.createAndSaveWorkspace('Space', null, true);
@@ -400,42 +401,46 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   async initializeTabsStripSections() {
     await SessionStore.promiseInitialized;
     await SessionStore.promiseAllWindowsRestored;
-    await gZenSessionStore.promiseInitialized;
     const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
     perifery.setAttribute('hidden', 'true');
-    const tabs = gBrowser.tabContainer.allTabs;
-    const workspaces = await this._workspaces();
-    for (const workspace of workspaces.workspaces) {
-      await this._createWorkspaceTabsSection(workspace, tabs);
-    }
-    if (tabs.length) {
-      const defaultSelectedContainer = this.workspaceElement(this.activeWorkspace)?.querySelector(
-        '.zen-workspace-normal-tabs-section'
-      );
-      const pinnedContainer = this.workspaceElement(this.activeWorkspace).querySelector(
-        '.zen-workspace-pinned-tabs-section'
-      );
-      // New profile with no workspaces does not have a default selected container
-      if (defaultSelectedContainer) {
-        for (const tab of tabs) {
-          if (tab.hasAttribute('zen-essential')) {
-            this.getEssentialsSection(tab).appendChild(tab);
-            continue;
-          } else if (tab.pinned) {
-            pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
-            continue;
-          }
-          // before to the last child (perifery)
-          defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
+    await new Promise((resolve) => {
+      setTimeout(async () => {
+        const tabs = gBrowser.tabContainer.allTabs;
+        const workspaces = await this._workspaces();
+        for (const workspace of workspaces.workspaces) {
+          await this._createWorkspaceTabsSection(workspace, tabs);
         }
-      }
-      gBrowser.tabContainer._invalidateCachedTabs();
-    }
-    perifery.setAttribute('hidden', 'true');
-    this._hasInitializedTabsStrip = true;
-    this.registerPinnedResizeObserver();
-    this._fixIndicatorsNames(workspaces);
-    this._resolveSectionsInitialized();
+        if (tabs.length) {
+          const defaultSelectedContainer = this.workspaceElement(
+            this.activeWorkspace
+          )?.querySelector('.zen-workspace-normal-tabs-section');
+          const pinnedContainer = this.workspaceElement(this.activeWorkspace).querySelector(
+            '.zen-workspace-pinned-tabs-section'
+          );
+          // New profile with no workspaces does not have a default selected container
+          if (defaultSelectedContainer) {
+            for (const tab of tabs) {
+              if (tab.hasAttribute('zen-essential')) {
+                this.getEssentialsSection(tab).appendChild(tab);
+                continue;
+              } else if (tab.pinned) {
+                pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
+                continue;
+              }
+              // before to the last child (perifery)
+              defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
+            }
+          }
+          gBrowser.tabContainer._invalidateCachedTabs();
+        }
+        perifery.setAttribute('hidden', 'true');
+        this._hasInitializedTabsStrip = true;
+        this.registerPinnedResizeObserver();
+        this._fixIndicatorsNames(workspaces);
+        this._resolveSectionsInitialized();
+        resolve();
+      }, 0);
+    });
   }
 
   getEssentialsSection(container = 0) {
@@ -915,6 +920,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   async initializeWorkspaces() {
     let activeWorkspace = await this.getActiveWorkspace();
     this.activeWorkspace = activeWorkspace?.uuid;
+    await gZenSessionStore.promiseInitialized;
     try {
       if (activeWorkspace) {
         window.gZenThemePicker = new nsZenThemePicker();
@@ -2654,7 +2660,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     await this.changeWorkspace(nextWorkspace, { whileScrolling });
   }
 
-  #initializeWorkspaceTabContextMenus() {
+  _initializeWorkspaceTabContextMenus() {
     if (this.privateWindowOrDisabled) {
       const commandsToDisable = [
         'cmd_zenOpenFolderCreation',

From 9a1c466368fbe353376e89bac77cc8f6465151d7 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 28 Sep 2025 16:06:56 +0200
Subject: [PATCH 005/111] New Crowdin updates (#10591)

---
 locales/ca/browser/browser/zen-general.ftl    |  2 +-
 locales/fr/browser/browser/zen-general.ftl    |  2 +-
 locales/id/browser/browser/zen-general.ftl    |  2 +-
 locales/ko/browser/browser/zen-general.ftl    |  2 +-
 locales/uk/browser/browser/zen-general.ftl    |  2 +-
 .../browser/preferences/zen-preferences.ftl   | 30 ++++++-------
 locales/zh-TW/browser/browser/zen-folders.ftl | 22 +++++-----
 locales/zh-TW/browser/browser/zen-general.ftl | 22 +++++-----
 .../zh-TW/browser/browser/zen-split-view.ftl  |  8 ++--
 .../browser/browser/zen-vertical-tabs.ftl     |  4 +-
 locales/zh-TW/browser/browser/zen-welcome.ftl | 42 +++++++++----------
 .../zh-TW/browser/browser/zen-workspaces.ftl  | 18 ++++----
 12 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 431a5b481..3e179f989 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -48,4 +48,4 @@ zen-icons-picker-emoji =
     .label = Emojis
 zen-icons-picker-svg = 
     .label = Icones
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Accions
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 9da276624..ac5901c12 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -4,7 +4,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Réinitialiser l’onglet épinglé
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Ajouter aux Essentials ({ $num } / 12 emplacements remplis)
+    .label = Ajouter aux Essentials ({ $num }/12 emplacements occupés)
     .accesskey = E
 tab-context-zen-remove-essential = 
     .label = Retirer des Essentials
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 95b79faf8..1cf6f1395 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -48,4 +48,4 @@ zen-icons-picker-emoji =
     .label = Emoji
 zen-icons-picker-svg = 
     .label = Ikon
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Aksi
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index ed8d73e31..113315eb6 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -48,4 +48,4 @@ zen-icons-picker-emoji =
     .label = 이모티콘
 zen-icons-picker-svg = 
     .label = 아이콘
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = 액션
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 0b319fc20..64539a461 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -48,4 +48,4 @@ zen-icons-picker-emoji =
     .label = Емоджі
 zen-icons-picker-svg = 
     .label = Значки
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Дії
diff --git a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
index db2022b65..a82e95d1a 100644
--- a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
@@ -27,7 +27,7 @@ zen-glance-trigger-shift-click =
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + 左鍵
 zen-glance-trigger-mantain-click = 
-    .label = 長按（即將上線！）
+    .label = 長按（即將推出！）
 zen-look-and-feel-compact-view-header = 在緊湊模式下顯示
 zen-look-and-feel-compact-view-description = 只顯示你需要用的工具欄！
 zen-look-and-feel-compact-view-enabled = 
@@ -92,12 +92,12 @@ zen-vertical-tabs-expand-tabs-header = 如何擴展分頁
 zen-vertical-tabs-expand-tabs-description = 選擇要如何擴展側邊欄中的分頁
 zen-theme-marketplace-header = Zen 模組
 zen-theme-disable-all-enabled = 
-    .title = 啟用所有主題
+    .title = 啟用所有模組
 zen-theme-disable-all-disabled = 
-    .title = 停用所有主題
-zen-theme-marketplace-description = 從商店尋找並安裝主題。
+    .title = 停用所有模組
+zen-theme-marketplace-description = 從商店尋找並安裝模組。
 zen-theme-marketplace-remove-button = 
-    .label = 移除主題
+    .label = 移除模組
 zen-theme-marketplace-check-for-updates-button = 
     .label = 檢查更新
 zen-theme-marketplace-import-button = 
@@ -114,15 +114,15 @@ zen-theme-marketplace-toggle-enabled-button =
     .title = 關閉佈景主題
 zen-theme-marketplace-toggle-disabled-button = 
     .title = 啟用佈景主題
-zen-theme-marketplace-remove-confirmation = 您確定要移除此模組?
+zen-theme-marketplace-remove-confirmation = 您確定要移除此模組？
 zen-theme-marketplace-close-modal = 關閉
 zen-theme-marketplace-theme-header-title = 
     .title = CSS 選擇器：{ $name }
 zen-theme-marketplace-dropdown-default-label = 
     .label = 無
 zen-theme-marketplace-input-default-placeholder = 
-    .placeholder = 請輸入
-pane-zen-marketplace-title = Zen 模式
+    .placeholder = 請輸入...
+pane-zen-marketplace-title = Zen 模組
 zen-themes-auto-update = 
     .label = 啟動時自動更新已安裝模組
 zen-settings-workspaces-force-container-tabs-to-workspace = 
@@ -150,12 +150,12 @@ pane-zen-CKS-title = 快捷鍵
 category-zen-CKS = 
     .tooltiptext = { pane-zen-CKS-title }
 pane-settings-CKS-title = { -brand-short-name } 快捷鍵
-zen-settings-CKS-header = 自定義你的快捷鍵
-zen-settings-CKS-description = 依據你的愛好來更改預設的快捷鍵以近一步改善你的瀏覽體驗
+zen-settings-CKS-header = 自定義您的快捷鍵
+zen-settings-CKS-description = 依據您的愛好來更改預設的快捷鍵以近一步改善你的瀏覽體驗
 zen-settings-CKS-disable-firefox = 
     .label = 停用 { -brand-short-name } 的預設快捷鍵
 zen-settings-CKS-duplicate-shortcut = 
-    .label = 重複的快捷鍵
+    .label = 複製快捷鍵
 zen-settings-CKS-reset-shortcuts = 
     .label = 重設為預設值
 zenCKSOption-group-other = 其它
@@ -173,13 +173,13 @@ zenCKSOption-group-devTools = 開發人員工具
 zen-key-quick-restart = 快速重啟
 zen-window-new-shortcut = 開新視窗
 zen-tab-new-shortcut = 開新分頁
-zen-key-redo = 重做
+zen-key-redo = 取消復原
 zen-restore-last-closed-tab-shortcut = 復原上次關閉的分頁
 zen-location-open-shortcut = 選取網址列
 zen-location-open-shortcut-alt = 選取網址列（備用）
 zen-key-undo-close-window = 還原已關閉視窗
 zen-text-action-undo-shortcut = 復原
-zen-text-action-redo-shortcut = 取消「復原」
+zen-text-action-redo-shortcut = 取消復原
 zen-text-action-cut-shortcut = 剪下
 zen-text-action-copy-shortcut = 複製
 zen-text-action-copy-url-shortcut = 複製目前網址
@@ -219,9 +219,9 @@ zen-history-show-all-shortcut = 顯示所有歷史
 zen-key-enter-full-screen = 進入全畫面模式
 zen-key-exit-full-screen = 離開全畫面模式
 zen-ai-chatbot-sidebar-shortcut = 開啟 AI 聊天側邊欄
-zen-key-inspector-mac = 開啟檢測器(Mac)
+zen-key-inspector-mac = 開啟檢測器 (Mac)
 zen-toggle-sidebar-shortcut = 開啟 Firefox 側邊欄
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-toggle-pin-tab-shortcut = 切換釘選分頁
 zen-reader-mode-toggle-shortcut-other = 切換閱讀模式
 zen-picture-in-picture-toggle-shortcut = 切換子母畫面
 zen-nav-reload-shortcut-2 = 重新整理
diff --git a/locales/zh-TW/browser/browser/zen-folders.ftl b/locales/zh-TW/browser/browser/zen-folders.ftl
index f29a2b1a5..629509b69 100644
--- a/locales/zh-TW/browser/browser/zen-folders.ftl
+++ b/locales/zh-TW/browser/browser/zen-folders.ftl
@@ -1,21 +1,21 @@
 zen-folders-search-placeholder = 
-    .placeholder = Search { $folder-name }...
+    .placeholder = 搜尋 { $folder-name }...
 zen-folders-panel-rename-folder = 
-    .label = Rename Folder
+    .label = 重新命名分頁夾
 zen-folders-panel-unpack-folder = 
-    .label = Unpack Folder
+    .label = 解散分頁夾
 zen-folders-new-subfolder = 
-    .label = New Subfolder
+    .label = 新增子分頁夾
 zen-folders-panel-delete-folder = 
-    .label = Delete Folder
+    .label = 刪除分頁夾
 zen-folders-panel-convert-folder-to-space = 
-    .label = Convert folder to Space
+    .label = 將分頁夾轉換為工作區
 zen-folders-panel-change-folder-space = 
-    .label = Change Space...
+    .label = 變更工作區...
 zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
+    .label = 變更圖示
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = 卸載此分頁夾中所有分頁
 zen-folders-unload-folder = 
-    .label = Unload All Tabs
-zen-folders-search-no-results = 沒有找到搜尋的分頁 🤔
+    .label = 卸載所有分頁
+zen-folders-search-no-results = 找不到符合搜尋的分頁 🤔
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index 529088d05..d76f6d1dd 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -1,5 +1,5 @@
 zen-panel-ui-current-profile-text = 當前設定檔
-unified-extensions-description = 擴充功能用於為 { -brand-short-name } 帶來更多功能。
+unified-extensions-description = 擴充功能可為 { -brand-short-name } 帶來更多額外功能。
 tab-context-zen-reset-pinned-tab = 
     .label = 重置釘選的分頁
     .accesskey = R
@@ -12,25 +12,25 @@ tab-context-zen-remove-essential =
 tab-context-zen-replace-pinned-url-with-current = 
     .label = 將釘選的網址換成目前的網址
     .accesskey = C
-zen-themes-corrupted = 你的 { -brand-short-name } 模組文件已損壞，它們已重置為預設佈景主題。
+zen-themes-corrupted = 你的 { -brand-short-name } 模組文件已損壞，它們已重設為預設主題。
 zen-shortcuts-corrupted = 你的 { -brand-short-name } 快捷文件已損壞。它們已被重設為預設值。
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = 新的 URL 欄已啟用，你不再需要新增新分頁。<br/><br/>馬上打開新分頁來看看新的 URL 欄！
-zen-disable = 禁用
+zen-disable = 停用
 pictureinpicture-minimize-btn = 
-    .aria-label = Minimize
-    .tooltip = Minimize
+    .aria-label = 最小化
+    .tooltip = 最小化
 zen-panel-ui-gradient-generator-custom-color = 自訂顏色
-zen-panel-ui-gradient-generator-saved-message = 漸層儲存成功！
+zen-panel-ui-gradient-generator-saved-message = 已成功儲存漸層！
 zen-copy-current-url-confirmation = 網址已複製到剪貼簿。
 zen-general-cancel-label = 
     .label = 取消
 zen-general-confirm = 
     .label = 確認
 zen-pinned-tab-replaced = 釘選分頁網址已替換為當前當前網址。
-zen-tabs-renamed = 分頁重新命名成功！
-zen-background-tab-opened-toast = New background tab opened!
-zen-workspace-renamed-toast = Workspace has been successfully renamed!
+zen-tabs-renamed = 已成功重新命名分頁！
+zen-background-tab-opened-toast = 已在背景開啟新分頁！
+zen-workspace-renamed-toast = 已成功重新命名工作區！
 zen-library-sidebar-workspaces = 
     .label = 工作區
 zen-library-sidebar-mods = 
@@ -45,5 +45,5 @@ zen-singletoolbar-urlbar-placeholder-with-name =
 zen-icons-picker-emoji = 
     .label = 表情符號
 zen-icons-picker-svg = 
-    .label = Icons
-urlbar-search-mode-zen_actions = Actions
+    .label = 圖示
+urlbar-search-mode-zen_actions = 操作
diff --git a/locales/zh-TW/browser/browser/zen-split-view.ftl b/locales/zh-TW/browser/browser/zen-split-view.ftl
index 3c6a616de..d7701d89a 100644
--- a/locales/zh-TW/browser/browser/zen-split-view.ftl
+++ b/locales/zh-TW/browser/browser/zen-split-view.ftl
@@ -10,7 +10,7 @@ zen-split-link =
     .accesskey = S
 zen-split-view-modifier-header = 分割畫面
 zen-split-view-modifier-activate-reallocation = 
-    .label = 啟用重新分配
-zen-split-view-modifier-enabled-toast = 分割畫面重新排列已開啟。
-zen-split-view-modifier-enabled-toast-description = 拖曳畫面以重新排列。按 Esc 鍵退出
-zen-split-view-modifier-disabled-toast = 分割畫面重新排列已關閉
+    .label = 啟用重新排列
+zen-split-view-modifier-enabled-toast = 已開啟分割畫面重新排列功能。
+zen-split-view-modifier-enabled-toast-description = 拖曳畫面以重新排列。按 Esc 鍵退出。
+zen-split-view-modifier-disabled-toast = 已關閉分割畫面重新排列功能。
diff --git a/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl b/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
index d8a81f797..d2ed844a0 100644
--- a/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
@@ -15,12 +15,12 @@ zen-toolbar-context-compact-mode-hide-both =
     .label = 兩者皆隱藏
     .accesskey = H
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = 新增分頁夾
     .accesskey = N
 sidebar-zen-expand = 
     .label = 展開側邊欄
 sidebar-zen-create-new = 
-    .label = Create New...
+    .label = 新增...
 tabbrowser-unload-tab-button = 
     .tooltiptext =
         { $tabCount ->
diff --git a/locales/zh-TW/browser/browser/zen-welcome.ftl b/locales/zh-TW/browser/browser/zen-welcome.ftl
index 9b2818248..c572eb13e 100644
--- a/locales/zh-TW/browser/browser/zen-welcome.ftl
+++ b/locales/zh-TW/browser/browser/zen-welcome.ftl
@@ -2,26 +2,26 @@
 # 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/.
 
-zen-welcome-title-line1 = Welcome to
-zen-welcome-title-line2 = a calmer internet
-zen-welcome-import-title = A Fresh Start, Same Bookmarks
-zen-welcome-import-description-1 = Your bookmarks, history, and passwords are like a trail of breadcrumbs through the internet—don’t leave them behind!
+zen-welcome-title-line1 = 歡迎使用
+zen-welcome-title-line2 = 更寧靜的網路體驗
+zen-welcome-import-title = 全新開始，書籤依舊
+zen-welcome-import-description-1 = 您的書籤、歷史記錄和密碼，是您網路足跡的珍貴紀錄——別把它們遺忘了！
 zen-welcome-import-description-2 = 輕鬆匯入其他瀏覽器的資料，無縫接續瀏覽體驗。
-zen-welcome-import-button = Import now
-zen-welcome-set-default-browser = Set { -brand-short-name } as your default browser
-zen-welcome-dont-set-default-browser = DON’T set { -brand-short-name } as your default browser
-zen-welcome-initial-essentials-title = Your Key Tabs, Always Within Reach
-zen-welcome-initial-essentials-description-1 = Keep your most important tabs easily accessible and always at hand, no matter how many you open.
-zen-welcome-initial-essentials-description-2 = Essential tabs are always visible, no matter what workspace you are in.
-zen-welcome-workspace-colors-title = Your Workspaces, Your Colors
-zen-welcome-workspace-colors-description = Personalize your browser by giving each workspace its own unique color identity.
+zen-welcome-import-button = 立即匯入
+zen-welcome-set-default-browser = 將 { -brand-short-name } 設為您的預設瀏覽器
+zen-welcome-dont-set-default-browser = 不要將 { -brand-short-name } 設為您的預設瀏覽器
+zen-welcome-initial-essentials-title = 重要分頁，隨手可及
+zen-welcome-initial-essentials-description-1 = 無論開啟多少分頁，最重要的分頁將永遠顯示，讓您輕鬆存取。
+zen-welcome-initial-essentials-description-2 = 無論您在哪個工作區，Essential 分頁會永遠顯示。
+zen-welcome-workspace-colors-title = 您的工作區，您的色彩
+zen-welcome-workspace-colors-description = 為每個工作區賦予獨特的色彩，打造個人化瀏覽器。
 zen-welcome-start-browsing-title =
-    All set?<br/>
-    Let’s get rolling!
-zen-welcome-start-browsing-description-1 = You’re all set up and ready to go. Click the button below to start browsing with { -brand-short-name }.
-zen-welcome-start-browsing = Dive in!
-zen-welcome-default-search-title = Your Default Search Engine
-zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
-zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
-zen-welcome-finished = Your Zen has been set up correctly!
+    準備好了嗎？<br/>
+    馬上開始體驗吧！
+zen-welcome-start-browsing-description-1 = 您已完成所有設定並準備就緒。點擊下方按鈕，開始使用 { -brand-short-name } 瀏覽網路吧。
+zen-welcome-start-browsing = 立即開始！
+zen-welcome-default-search-title = 您的預設搜尋引擎
+zen-welcome-default-search-description = 選擇您的預設搜尋引擎，您可以隨時更改它！
+zen-welcome-skip-button = 跳過
+zen-welcome-next-action = 下一步
+zen-welcome-finished = 您的 Zen 瀏覽器已成功設定！
diff --git a/locales/zh-TW/browser/browser/zen-workspaces.ftl b/locales/zh-TW/browser/browser/zen-workspaces.ftl
index 92fbccf9f..97f59f0a6 100644
--- a/locales/zh-TW/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-TW/browser/browser/zen-workspaces.ftl
@@ -1,8 +1,8 @@
 zen-panel-ui-workspaces-text = 工作區
 zen-panel-ui-workspaces-create = 
-    .label = 創建工作區
+    .label = 建立工作區
 zen-panel-ui-folder-create = 
-    .label = Create Folder
+    .label = 建立分頁夾
 zen-panel-ui-new-empty-split = 
     .label = New Split
 zen-workspaces-panel-context-delete = 
@@ -13,7 +13,7 @@ zen-workspaces-panel-change-name =
 zen-workspaces-panel-change-icon = 
     .label = 變更圖示
 zen-workspaces-panel-context-default-profile = 
-    .label = Set Profile
+    .label = 設定設定檔
 zen-workspaces-how-to-reorder-title = 如何排序工作區
 zen-workspaces-how-to-reorder-desc = 拖曳側邊欄底部工作區圖示以重新排序
 zen-workspaces-change-theme = 
@@ -25,7 +25,7 @@ zen-workspaces-panel-context-edit =
     .label = 編輯工作區
     .accesskey = E
 context-zen-change-workspace-tab = 
-    .label = 將分頁（含多個）移至工作區
+    .label = 將分頁移至工作區
     .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
     .value = 選擇工作區
@@ -45,9 +45,9 @@ zen-workspace-creation-name =
     .placeholder = 工作區名稱
 zen-workspaces-panel-context-reorder = 
     .label = 排序工作區
-zen-workspace-creation-profile = Profile
-    .tooltiptext = Profiles are used to separate cookies and site data between spaces.
-zen-workspace-creation-header = 創建工作區
-zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
+zen-workspace-creation-profile = 設定檔
+    .tooltiptext = 設定檔用於隔離不同工作區的 Cookie 和網站資料。
+zen-workspace-creation-header = 建立工作區
+zen-workspace-creation-label = 工作區用於組織您的分頁與工作階段。
 zen-workspaces-delete-workspace-title = 刪除工作區？
-zen-workspaces-delete-workspace-body = 你確定要刪除 { $name } 嗎？該動作無法物復原。
+zen-workspaces-delete-workspace-body = 您確定要刪除 { $name } 嗎？此操錯無法復原。

From cc8dfc693bbff8cf101c0edca49a24612438fb16 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Sun, 28 Sep 2025 16:06:59 +0200
Subject: [PATCH 006/111] fix: zen.source builds missing dotfiles (#10599)

---
 .github/workflows/build.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8aecf8450..d5574e6db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -265,10 +265,7 @@ jobs:
         run: npm run import -- --verbose
 
       - name: Compress
-        run: |
-          cd engine
-          tar --use-compress-program=zstd -hcf ../zen.source.tar.zst *
-          cd ..
+        run: tar --use-compress-program=zstd -hcf zen.source.tar.zst -C engine .
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

From a091751e097ed509825e71b7b14fe3aa2a14b206 Mon Sep 17 00:00:00 2001
From: Bernhard Kaindl <bernhardkaindl7@gmail.com>
Date: Sun, 28 Sep 2025 16:10:18 +0200
Subject: [PATCH 007/111] urlbar.yaml: Fix network.IDN_show_punycode to show
 international characters as designed (#10600)

Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 prefs/urlbar.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/prefs/urlbar.yaml b/prefs/urlbar.yaml
index 72472cae9..e47a3274b 100644
--- a/prefs/urlbar.yaml
+++ b/prefs/urlbar.yaml
@@ -53,9 +53,6 @@
 - name: browser.formfill.enable
   value: false
 
-- name: network.IDN_show_punycode
-  value: true
-
 - name: browser.urlbar.suggest.topsites
   value: true
   locked: true

From 028b7d35db81ecd66d3a4a2a1a406eff6f718a3b Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 28 Sep 2025 16:12:40 +0200
Subject: [PATCH 008/111] chore: lint project, b=no-bug, c=compact-mode

---
 src/zen/compact-mode/zen-compact-mode.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 235cf8a78..38741c81a 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -322,9 +322,9 @@
       }
 
       & #zen-appcontent-navbar-wrapper {
-                  & .zen-toolbar-background {
-            display: flex;
-          }
+        & .zen-toolbar-background {
+          display: flex;
+        }
         --zen-compact-toolbar-offset: 5px;
         position: absolute;
         top: calc(-1 * var(--zen-toolbar-height) + 1px);

From bc5e4eb48f03fadc1bf8021e84c5b761a8e0a551 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Sun, 28 Sep 2025 17:48:01 +0200
Subject: [PATCH 009/111] fix: zen.source ignore VCS data, p=#10606

---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d5574e6db..994f631b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -265,7 +265,12 @@ jobs:
         run: npm run import -- --verbose
 
       - name: Compress
-        run: tar --use-compress-program=zstd -hcf zen.source.tar.zst -C engine .
+        run: |
+          tar \
+            --exclude-vcs \
+            --use-compress-program=zstd \
+            -hcf zen.source.tar.zst \
+            -C engine .
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

From d9bc654fc7d8b9ac615ee174b94339782f8af6c1 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.dev>
Date: Sun, 28 Sep 2025 21:03:59 +0200
Subject: [PATCH 010/111] fix: zen.source missing vsc from nested modules that
 are checksummed (#10607)

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 994f631b7..d67c60651 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -267,7 +267,7 @@ jobs:
       - name: Compress
         run: |
           tar \
-            --exclude-vcs \
+            --exclude='./.git' \
             --use-compress-program=zstd \
             -hcf zen.source.tar.zst \
             -C engine .

From e59c73ae53e8b7f0150ea98fbc42ed32ffc790f9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 28 Sep 2025 21:52:50 +0200
Subject: [PATCH 011/111] fix: Fixed workspace icons resizing on overflow,
 b=closes #10596, c=workspaces

---
 src/zen/workspaces/ZenWorkspaces.mjs  | 1 +
 src/zen/workspaces/zen-workspaces.css | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 1fb1476c9..57d71c904 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2996,6 +2996,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
 
   onWindowResize(event = undefined) {
     if (!(!event || event.target === window)) return;
+    gZenUIManager.updateTabsToolbar();
     // Check if workspace icons overflow the parent container
     const parent = this.workspaceIcons;
     if (!parent || this._processingResize) {
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index da2e8116c..023c107ba 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -47,11 +47,7 @@
       line-height: 0;
 
       &:is(img) {
-        padding: 6px;
-
-        :root:not([zen-sidebar-expanded='true']) & {
-          padding: 10px;
-        }
+        width: 14px;
       }
    
       &[no-icon='true'] {

From 32944f1548f29c60286c77ed1874b4d9cbbe1b19 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 29 Sep 2025 10:43:22 +0200
Subject: [PATCH 012/111] fix: Fixed bookmarks not hiding when opening folders,
 b=closes #10612, c=common

---
 .../components/urlbar/UrlbarController-sys-mjs.patch        | 4 ++--
 src/zen/common/ZenUIManager.mjs                             | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
index cd90f6116..3ebb104ae 100644
--- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
-index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..81f2944b939ac0963c129f86aab0b55817349401 100644
+index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..cc4ea61914a316451fa54b01a5c8c6a305e4038a 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
 @@ -434,6 +434,8 @@ export class UrlbarController {
              });
            }
            event.preventDefault();
-+        } else {
++        } else if (!this.input.value && !(event.ctrlKey || event.altKey || event.shiftKey)) {
 +          this.browserWindow.gZenUIManager.enableCommandsMode(event);
          }
          break;
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index dc3d44ba8..c98f8fdca 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -215,8 +215,10 @@ var gZenUIManager = {
         !el.contains(showEvent.explicitOriginalTarget) ||
         (showEvent.explicitOriginalTarget instanceof Element &&
           showEvent.explicitOriginalTarget?.closest('panel')) ||
-        // See bug #7590: Ignore menupopup elements opening
-        showEvent.explicitOriginalTarget.tagName === 'menupopup'
+        // See bug #7590: Ignore menupopup elements opening.
+        // Also see #10612 for the exclusion of the zen-appcontent-navbar-wrapper
+        (showEvent.explicitOriginalTarget.tagName === 'menupopup' &&
+          el.id !== 'zen-appcontent-navbar-wrapper')
       ) {
         continue;
       }

From 2abba4d2668111f44565e4d6d480b4900a77e644 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 29 Sep 2025 10:57:19 +0200
Subject: [PATCH 013/111] fix: Fixed empty tabs appearing on the 'all tabs'
 panel, b=closes #10610, c=common

---
 .../components/tabbrowser/TabsList-sys-mjs.patch    | 13 +++++++++++++
 src/zen/common/styles/zen-single-components.css     |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/browser/components/tabbrowser/TabsList-sys-mjs.patch

diff --git a/src/browser/components/tabbrowser/TabsList-sys-mjs.patch b/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
new file mode 100644
index 000000000..d511f3c1d
--- /dev/null
+++ b/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/components/tabbrowser/TabsList.sys.mjs b/browser/components/tabbrowser/TabsList.sys.mjs
+index 97990af166b63cae4b0343c77da5084850890504..b58d20eb3db82867030292625d45277afce1bbea 100644
+--- a/browser/components/tabbrowser/TabsList.sys.mjs
++++ b/browser/components/tabbrowser/TabsList.sys.mjs
+@@ -87,7 +87,7 @@ class TabsListBase {
+     /** @type {function(MozTabbrowserTab):boolean} */
+     this.filterFn = onlyHiddenTabs
+       ? tab => filterFn(tab) && tab.hidden
+-      : filterFn;
++      : tab =>  !tab.hasAttribute("zen-empty-tab") && filterFn(tab);
+     /** @type {Element} */
+     this.containerNode = containerNode;
+     /** @type {Element|null} */
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 43b149493..8bdaa80c0 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -43,7 +43,8 @@ body > #confetti {
 }
 
 /* Firefox View */
-#firefox-view-button {
+#firefox-view-button,
+#wrapper-firefox-view-button {
   display: none !important;
 }
 

From 1ebe5286f90ec7985110deca54bf1838fa02bc71 Mon Sep 17 00:00:00 2001
From: mr-cheffy <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 1 Oct 2025 02:40:32 +0000
Subject: [PATCH 014/111] docs: Update monthly issue metrics, b=(no bug),
 c={docs}

---
 .../2025_2025-09-01..2025-09-30.md            | 280 ++++++++++++++++++
 1 file changed, 280 insertions(+)
 create mode 100644 docs/issue-metrics/2025_2025-09-01..2025-09-30.md

diff --git a/docs/issue-metrics/2025_2025-09-01..2025-09-30.md b/docs/issue-metrics/2025_2025-09-01..2025-09-30.md
new file mode 100644
index 000000000..e7a494c53
--- /dev/null
+++ b/docs/issue-metrics/2025_2025-09-01..2025-09-30.md
@@ -0,0 +1,280 @@
+# Issue Metrics
+
+| Metric | Average | Median | 90th percentile |
+| --- | --- | --- | ---: |
+| Time to first response | 17:16:35 | 3:11:05 | 1 day, 7:58:23 |
+| Time to close | 1 day, 8:59:53 | 8:32:05 | 3 days, 14:43:34 |
+
+| Metric | Count |
+| --- | ---: |
+| Number of items that remain open | 123 |
+| Number of items closed | 139 |
+| Total number of items created | 262 |
+
+| Title | URL | Time to first response | Time to close |
+| --- | --- | --- | --- |
+| Auto PIP not working upon tab switch | https://github.com/zen-browser/desktop/issues/10645 | None | None |
+| URL bar Opening on the left side of the browser when clicked on new tab | https://github.com/zen-browser/desktop/issues/10642 | None | None |
+| Browser opens on wrong monitor on macOS | https://github.com/zen-browser/desktop/issues/10639 | None | None |
+| All tabs are lost after each update | https://github.com/zen-browser/desktop/issues/10638 | 2:25:57 | None |
+| Sidebar expands independently | https://github.com/zen-browser/desktop/issues/10637 | 2:21:31 | None |
+| Onboarding broken (tiny window) on flatpak version | https://github.com/zen-browser/desktop/issues/10635 | None | None |
+| Bitwarden extension not synching (self hosted) | https://github.com/zen-browser/desktop/issues/10634 | None | None |
+| Zen completely freezes when clicking on "New Tab" | https://github.com/zen-browser/desktop/issues/10632 | None | None |
+| Zen Browser URL Bar: Search Engine Highlight Rectangle Looks Broken in Input Mode | https://github.com/zen-browser/desktop/issues/10630 | 9:01:57 | 9:01:57 |
+| Url bar doesn't fully appear | https://github.com/zen-browser/desktop/issues/10629 | 1:51:21 | 9:11:03 |
+| 1Password Autofill/Universal Autofill feature fails silently | https://github.com/zen-browser/desktop/issues/10627 | None | None |
+| Moxfield Bug | https://github.com/zen-browser/desktop/issues/10626 | 16:58:48 | 16:58:48 |
+| Tabs are not restored on Startup | https://github.com/zen-browser/desktop/issues/10625 | 0:03:14 | None |
+| Zen uses `$HOME/.mozilla/native-messaging-hosts/` instead of `$HOME/.zen/native-messaging-hosts/` | https://github.com/zen-browser/desktop/issues/10622 | None | None |
+| No video with supported format and MIME type found | https://github.com/zen-browser/desktop/issues/10620 | 4:38:39 | 4:38:39 |
+| Youtube window size | https://github.com/zen-browser/desktop/issues/10619 | None | None |
+| Webpage UI elements glitching and not fully rendering | https://github.com/zen-browser/desktop/issues/10615 | None | None |
+| bookmarks toolbar failed to collapse automatically in single toolbar mode + compact mode | https://github.com/zen-browser/desktop/issues/10612 | None | 8:56:43 |
+| Closing "New Tab" in the "List all tabs" toolbar widget causes zen to not exit cleanly | https://github.com/zen-browser/desktop/issues/10610 | 1:45:50 | 12:56:07 |
+| Opening link in new tab switches focus to new tab instead of staying on current tab | https://github.com/zen-browser/desktop/issues/10609 | 2:14:04 | 13:39:31 |
+| Webpage flickering/glitching during normal browsing | https://github.com/zen-browser/desktop/issues/10605 | None | None |
+| Essentials Get jumbled when reopening the browser | https://github.com/zen-browser/desktop/issues/10602 | 0:19:34 | 0:45:36 |
+| Entering ecom in URL bar shows compact mode as first suggestion. | https://github.com/zen-browser/desktop/issues/10601 | 6:27:16 | 6:27:16 |
+| Loads of empty windows opening on startup and mysterious tray icon | https://github.com/zen-browser/desktop/issues/10598 | None | None |
+| URLbar becomes invisible after bookmarking a tab. | https://github.com/zen-browser/desktop/issues/10597 | None | None |
+| Workspace icons too small with narrow sidebar | https://github.com/zen-browser/desktop/issues/10596 | None | 8:06:55 |
+| Top toolbar has no background in compact mode after changing space until the URL bar is hovered | https://github.com/zen-browser/desktop/issues/10595 | None | 1:45:30 |
+| Video controls going under the screen when in fullscreen using Zen in fullscreen mode | https://github.com/zen-browser/desktop/issues/10594 | None | None |
+| Multiple instances of Zen for each tab | https://github.com/zen-browser/desktop/issues/10593 | 4:55:51 | 4:55:51 |
+| Tabs Disappear | https://github.com/zen-browser/desktop/issues/10592 | None | 6:02:25 |
+| Cannot upgrade from `1.15.5b` to `1.16.1b` | https://github.com/zen-browser/desktop/issues/10590 | None | None |
+| New windows come up with ~200 copies of the same link in the pinned tab of some workspaces | https://github.com/zen-browser/desktop/issues/10589 | None | 15:51:30 |
+| on_TabGroupsCollapse is hiding currently open tabs | https://github.com/zen-browser/desktop/issues/10587 | 18:18:04 | 18:18:04 |
+| websites don't properly go fullscreen in split view on Wayland and windows | https://github.com/zen-browser/desktop/issues/10586 | None | 21:23:38 |
+| Active tabs and URLs not prioritized in URL bar over extensions | https://github.com/zen-browser/desktop/issues/10582 | 8:32:05 | 8:32:05 |
+| Always floating URL bar does not float on new tab with replace-newtab disabled | https://github.com/zen-browser/desktop/issues/10581 | None | None |
+| URL bar not respecting browser.urlbar.maxRichResults setting | https://github.com/zen-browser/desktop/issues/10580 | 0:11:00 | None |
+| "Zoom" Icon is missing in the Application Menu | https://github.com/zen-browser/desktop/issues/10578 | 1 day, 2:23:42 | None |
+| Search/New Tab Popup Misplaced in Compact Mode (Hidden Vertical Tab Bar) | https://github.com/zen-browser/desktop/issues/10576 | 0:50:41 | 1:38:50 |
+| Essentials Tab | https://github.com/zen-browser/desktop/issues/10575 | 2:40:40 | 5:34:25 |
+| Udemy - problem with movies | https://github.com/zen-browser/desktop/issues/10571 | 1:11:04 | 1:11:04 |
+| Fully lost all data | https://github.com/zen-browser/desktop/issues/10568 | 9:29:58 | 10:31:54 |
+| Flatpak fails to launch on Fedora 42 (clone() failure EPERM) | https://github.com/zen-browser/desktop/issues/10567 | 1:22:23 | 3:40:35 |
+| The top bar in compact mode is not controlled by the theme, it appears white | https://github.com/zen-browser/desktop/issues/10566 | 1:47:24 | 1:47:24 |
+| Pinned extension render bug: pinned extensions are floating on the web page | https://github.com/zen-browser/desktop/issues/10565 | None | None |
+| Home link not appearing | https://github.com/zen-browser/desktop/issues/10563 | 0:42:18 | 2:59:02 |
+| Connection to "incoming.telemetry.mozilla.org" on startup. | https://github.com/zen-browser/desktop/issues/10560 | 3:29:10 | 21:14:29 |
+| Command bar actions not work if they are not translated to selected language | https://github.com/zen-browser/desktop/issues/10559 | None | 4:06:26 |
+| the address bar does not respect the color theme when compact mode is enabled | https://github.com/zen-browser/desktop/issues/10557 | 0:14:27 | 0:14:27 |
+| Browser crashing on media playback as of 1.16.1b on Nvidia Wayland (VA-API) | https://github.com/zen-browser/desktop/issues/10555 | 0:14:09 | None |
+| Split View preview effect still remains after using the Escape key | https://github.com/zen-browser/desktop/issues/10554 | 3:49:15 | 1 day, 0:27:29 |
+| Spotify is not working | https://github.com/zen-browser/desktop/issues/10553 | 1:42:55 | 1:42:55 |
+| Command bar features doesn't work with other langage than english | https://github.com/zen-browser/desktop/issues/10551 | None | 0:01:48 |
+| Nested CSS transform breaks backdrop blur | https://github.com/zen-browser/desktop/issues/10550 | 0:55:22 | 1:22:05 |
+| (MINOR) URL bar: custom search engine name has uneven background fill than its icon | https://github.com/zen-browser/desktop/issues/10546 | None | None |
+| Special unicode characters (Chinese, Korean, Japanese, etc.) are not showing | https://github.com/zen-browser/desktop/issues/10545 | 3:45:25 | None |
+| Computer hard freezes when zen is open with performance intensive tasks going in the background | https://github.com/zen-browser/desktop/issues/10544 | None | None |
+| 软件开启使用一会后，右上角关闭按钮失效 | https://github.com/zen-browser/desktop/issues/10543 | 5:28:33 | 5:28:33 |
+| Bookmark menu shows up in wrong place, and its entries' context menu has weird layout problem | https://github.com/zen-browser/desktop/issues/10542 | None | None |
+| Find bar changes into plain white bar when "X" is clicked | https://github.com/zen-browser/desktop/issues/10541 | 8:22:04 | 10:27:21 |
+| browser.tabs.closeWindowWithLastTab doesn't work anymore on v1.16.1b | https://github.com/zen-browser/desktop/issues/10540 | 10:59:55 | None |
+| Some UI Elements are Missing On Some Sites | https://github.com/zen-browser/desktop/issues/10538 | 2:19:13 | 3 days, 22:36:11 |
+| Browser Freeze on Passkey Call&CallBack Failure | https://github.com/zen-browser/desktop/issues/10533 | None | None |
+| Wrong sidebar color in compact mode | https://github.com/zen-browser/desktop/issues/10532 | 0:48:09 | 1 day, 17:09:58 |
+| Playing Audio icon inconsistent on tabs not focused on linux | https://github.com/zen-browser/desktop/issues/10531 | None | 21:06:12 |
+| Missing "Edit Theme" button in the right click menu | https://github.com/zen-browser/desktop/issues/10530 | 0:56:54 | 1 day, 17:21:25 |
+| Stars are shown all over all websites | https://github.com/zen-browser/desktop/issues/10529 | 18:59:14 | None |
+| v1.16b not available on flathub | https://github.com/zen-browser/desktop/issues/10528 | 3:10:02 | 5:21:21 |
+| Firefox-Zen browser name inconsistency in error page | https://github.com/zen-browser/desktop/issues/10527 | None | None |
+| Highlight mini window doesn't close automatically | https://github.com/zen-browser/desktop/issues/10526 | None | None |
+| Zen Browser maximized window overlaps with Windows taskbar area | https://github.com/zen-browser/desktop/issues/10525 | None | 0:37:13 |
+| Spotify Skipping 7 Songs | https://github.com/zen-browser/desktop/issues/10524 | 2:57:34 | 2:57:34 |
+| McAfee notifactions from Zen Browser | https://github.com/zen-browser/desktop/issues/10522 | None | 0:24:17 |
+| Zen Browser crashes occasionally when I download a file | https://github.com/zen-browser/desktop/issues/10520 | 13:03:32 | None |
+| (SERIOUS BUG DONT IGNORE) Split tab bug report | https://github.com/zen-browser/desktop/issues/10519 | None | 0:01:36 |
+| tab spliting issue | https://github.com/zen-browser/desktop/issues/10517 | None | 0:51:11 |
+| Rounded window borders cause choppy scrolling. | https://github.com/zen-browser/desktop/issues/10516 | None | None |
+| Closing the last tab cannot automatically create a new tab | https://github.com/zen-browser/desktop/issues/10515 | 14:08:09 | 14:08:09 |
+| Pinned tabs always load from cache. | https://github.com/zen-browser/desktop/issues/10514 | 1:49:05 | None |
+| Command Bar works only in english language | https://github.com/zen-browser/desktop/issues/10509 | 0:10:10 | 0:10:10 |
+| Pop up windows don't close properly | https://github.com/zen-browser/desktop/issues/10506 | None | None |
+| When accessing Alibaba Cloud DataWorks using the Zen browser, it will report Path Not Found: /page/errorbrowser, or Not Online? | https://github.com/zen-browser/desktop/issues/10503 | 10:29:49 | 10:30:28 |
+| Floating url bar not appering where it is suposed to | https://github.com/zen-browser/desktop/issues/10502 | 3:09:03 | 11:51:16 |
+| Split tabs are not aligned with other tabs | https://github.com/zen-browser/desktop/issues/10501 | 0:15:04 | 2 days, 14:12:29 |
+| Microsoft Entra Platform SSO on MacOS | https://github.com/zen-browser/desktop/issues/10498 | 2 days, 12:29:33 | None |
+| Dragging a split panel to the sidebar opens search for panel id | https://github.com/zen-browser/desktop/issues/10495 | 0:42:53 | None |
+| After closing all tabs, cmd / ctrl + W does not close the window | https://github.com/zen-browser/desktop/issues/10493 | 1:22:58 | 1:22:58 |
+| Youtube lags when adblocker is installed. [Seemingly fixed] | https://github.com/zen-browser/desktop/issues/10492 | 4:34:01 | 4:34:01 |
+| URL Bar mispositioning | https://github.com/zen-browser/desktop/issues/10490 | 0:35:10 | 2:15:20 |
+| Fullscreen F11 | https://github.com/zen-browser/desktop/issues/10489 | 21:42:02 | 3 days, 20:34:06 |
+| Combined tabs are not shown properly in the navigation menu | https://github.com/zen-browser/desktop/issues/10488 | 0:41:09 | None |
+| Translucent color codes do not appear translucent in toolbar themes | https://github.com/zen-browser/desktop/issues/10487 | 6:19:55 | None |
+| Discord always requires me to log in after closing Zen | https://github.com/zen-browser/desktop/issues/10482 | 7 days, 13:26:09 | None |
+| 1.16b crashes a lot on Windows 11 | https://github.com/zen-browser/desktop/issues/10481 | 0:19:54 | None |
+| There is bug on perplexity.ai | https://github.com/zen-browser/desktop/issues/10480 | 2:16:15 | 1 day, 10:27:53 |
+| Theme bug when Zen not focused. | https://github.com/zen-browser/desktop/issues/10479 | 2:39:03 | None |
+| Hiding top bar in collapsed bar mode is white | https://github.com/zen-browser/desktop/issues/10478 | 12:23:32 | 7 days, 4:09:44 |
+| URL preview in split screen always appears on focused window | https://github.com/zen-browser/desktop/issues/10477 | 1:20:54 | None |
+| After the update, all loose tabs disappeared!!! | https://github.com/zen-browser/desktop/issues/10476 | None | None |
+| Compact Mode Url position | https://github.com/zen-browser/desktop/issues/10475 | 2:15:11 | 4:17:47 |
+| Zen captures all touchpad input and no other applications receive it, even if they're in the foreground (including desktop) | https://github.com/zen-browser/desktop/issues/10474 | None | None |
+| Toolbar 'Edit Theme' features broken | https://github.com/zen-browser/desktop/issues/10473 | None | 12:09:50 |
+| Camera / Microphone Permissions | https://github.com/zen-browser/desktop/issues/10471 | 0:09:35 | None |
+| Cannot drag sidebar tabs | https://github.com/zen-browser/desktop/issues/10466 | 7 days, 19:48:26 | None |
+| tool bar not responsive | https://github.com/zen-browser/desktop/issues/10465 | None | None |
+| Zen adaptive history doesn't work (auto-suggestions don't change ranks) | https://github.com/zen-browser/desktop/issues/10464 | 6:38:12 | None |
+| Udemy Videos not playing(some DRM issue) | https://github.com/zen-browser/desktop/issues/10462 | 0:26:28 | 0:26:28 |
+| Clicking a link to open to a new tab from a page in a folder opens outside of the folder instead of staying inside it | https://github.com/zen-browser/desktop/issues/10461 | 1:22:00 | 1:36:41 |
+| bookmark tool bar on full screen mode | https://github.com/zen-browser/desktop/issues/10460 | 7:11:57 | None |
+| Compact mode: hide tab not work | https://github.com/zen-browser/desktop/issues/10459 | 7:21:59 | 7:26:31 |
+| Error Building on mac, suggested fix as well | https://github.com/zen-browser/desktop/issues/10458 | None | None |
+| Clicking on a duplicated tab of an essential tab causes switching to the last workspace | https://github.com/zen-browser/desktop/issues/10457 | 2 days, 11:37:42 | None |
+| Very long opening times | https://github.com/zen-browser/desktop/issues/10456 | 1 day, 12:13:47 | None |
+| Browser window doesn't close when closing last tab | https://github.com/zen-browser/desktop/issues/10455 | None | 22:08:46 |
+| Passkeys not supported | https://github.com/zen-browser/desktop/issues/10454 | 2:29:55 | 2 days, 8:28:48 |
+| Focus Bitwader | https://github.com/zen-browser/desktop/issues/10447 | 1 day, 6:48:09 | 1 day, 6:48:09 |
+| Unable to change workspace name | https://github.com/zen-browser/desktop/issues/10446 | None | None |
+| Udemy video's don't play in Zen. | https://github.com/zen-browser/desktop/issues/10443 | 0:52:31 | 1 day, 21:47:45 |
+| SoundCloud audio stops when joining Discord voice in browser | https://github.com/zen-browser/desktop/issues/10441 | None | None |
+| Calling browser.search.search (from webextensions API) opens glance window instead of new tab. | https://github.com/zen-browser/desktop/issues/10439 | 1:36:27 | None |
+| Side bar expands when you remove pinned extension. | https://github.com/zen-browser/desktop/issues/10438 | 1 day, 2:34:08 | None |
+| Compact mode X Bookmarks on Zen startup / Closing all pages | https://github.com/zen-browser/desktop/issues/10436 | 0:10:16 | None |
+| Zen using more resources while using adblocking dns then ublock. | https://github.com/zen-browser/desktop/issues/10435 | 4:22:57 | 2 days, 3:07:53 |
+| WebRender crashes and switches to Software rendering | https://github.com/zen-browser/desktop/issues/10432 | 5:25:30 | None |
+| When there are 2 rows of essentials, essentials can only be moved up, not down | https://github.com/zen-browser/desktop/issues/10428 | 1:54:32 | 8 days, 4:33:00 |
+| moz-extension page doesnt load for distill web monitor | https://github.com/zen-browser/desktop/issues/10427 | None | None |
+| Sidebar incorrectly overlapping with address bar | https://github.com/zen-browser/desktop/issues/10426 | None | None |
+| Unexpected window pops when aborting bitwarden validation | https://github.com/zen-browser/desktop/issues/10419 | 0:47:28 | 1:04:53 |
+| Redundant `margin-left` on `#sidebar-box` when zen tabs are on the right | https://github.com/zen-browser/desktop/issues/10415 | None | 5:41:18 |
+| Toolbar cannot be automatically hidden in the compact mode | https://github.com/zen-browser/desktop/issues/10414 | 6:26:39 | None |
+| Closing and then reopening the last tab that's part of a split screen (3+ split screen tabs) breaks the split screen | https://github.com/zen-browser/desktop/issues/10413 | None | 14:22:44 |
+| Opening links from external apps creates a new window but doesn’t redirect to the target URL | https://github.com/zen-browser/desktop/issues/10409 | None | None |
+| No Youtube Live Chat | https://github.com/zen-browser/desktop/issues/10408 | 0:14:57 | None |
+| Pinned tab is not focused when closing child tab; focus snaps to last pin instead of owner | https://github.com/zen-browser/desktop/issues/10407 | 1:28:19 | 1:28:19 |
+| Huge CPU usage and RAM comsumption when idle | https://github.com/zen-browser/desktop/issues/10406 | 3:24:27 | None |
+| Browsing history reset itself unexpectedly | https://github.com/zen-browser/desktop/issues/10403 | None | None |
+| Opening new background tab(Middle mouse click) from within folder opens new tab outside folder | https://github.com/zen-browser/desktop/issues/10399 | 4:44:58 | 7:04:02 |
+| Icons for webpages in the Essentials tab don't load on startup. | https://github.com/zen-browser/desktop/issues/10398 | None | 0:03:42 |
+| Can't sign in to any Google services, says cookies are disabled | https://github.com/zen-browser/desktop/issues/10397 | 1:28:00 | 1 day, 6:18:57 |
+| Zen crashes on Fedora Linux | https://github.com/zen-browser/desktop/issues/10395 | 0:53:47 | 1 day, 7:05:12 |
+| Audio bugs on Google Meet | https://github.com/zen-browser/desktop/issues/10394 | 15:13:01 | None |
+| Pinned split screen tabs still not preserved when opening a new window (issue #8583 remains unresolved) | https://github.com/zen-browser/desktop/issues/10388 | None | None |
+| A cursor appears when I click on the screen | https://github.com/zen-browser/desktop/issues/10387 | 1:39:24 | 4:27:59 |
+| Custom set images that you upload yourself for Firefox Home new tab wallpapers have been broken for a while. | https://github.com/zen-browser/desktop/issues/10384 | 15:32:44 | 3 days, 14:22:59 |
+| Scrolling lag when looking at preview (glance) of a webpage when using mouse input | https://github.com/zen-browser/desktop/issues/10382 | None | 3:43:58 |
+| Apple's accout verification Not Working | https://github.com/zen-browser/desktop/issues/10381 | None | 1 day, 22:20:39 |
+| Find bar doesn't go away | https://github.com/zen-browser/desktop/issues/10380 | 4:16:03 | 4:16:08 |
+| Cookies, data, history, and all tabs close and are deleted on every browser restart, despite turning off the settings to do so. | https://github.com/zen-browser/desktop/issues/10377 | None | None |
+| Windows Navigation Icons not Showing Up on Zen | https://github.com/zen-browser/desktop/issues/10374 | None | None |
+| 无法打开部分网站，显示安全问题或超时 | https://github.com/zen-browser/desktop/issues/10372 | 0:12:19 | 0:12:19 |
+| Merci App extension not working - Login not working | https://github.com/zen-browser/desktop/issues/10370 | 3:56:26 | 6:10:52 |
+| Compact mode tabs overlay stays fixed on top of bookmarks bar | https://github.com/zen-browser/desktop/issues/10369 | None | 4:13:01 |
+| Browsing history reset itself unexpectedly | https://github.com/zen-browser/desktop/issues/10367 | 9:50:29 | 2 days, 10:39:26 |
+| Choppy animation while hovering on top bar area in single toolbar compact mode with google doc file open | https://github.com/zen-browser/desktop/issues/10366 | 0:45:17 | None |
+| Logged me out of everything after Restart | https://github.com/zen-browser/desktop/issues/10365 | 0:06:34 | None |
+| Discord fails at uploading and playing media | https://github.com/zen-browser/desktop/issues/10364 | 1:35:04 | 17:56:18 |
+| Pinned tabs inconsisntely dissapear and reappear in the sidebar | https://github.com/zen-browser/desktop/issues/10363 | 2:23:29 | None |
+| 1Password no longer allowing touch ID on latest release | https://github.com/zen-browser/desktop/issues/10362 | 2:03:43 | 21:35:42 |
+| [Linux: Flatpak] Can't open certain local-network URLs | https://github.com/zen-browser/desktop/issues/10360 | 4 days, 15:35:37 | None |
+| Discord WebApp Issue with Audio | https://github.com/zen-browser/desktop/issues/10358 | None | 5:03:34 |
+| Apple Security Blocked | https://github.com/zen-browser/desktop/issues/10354 | None | None |
+| Always Blank Screen - although It's working and loading Pages | https://github.com/zen-browser/desktop/issues/10353 | 0:21:31 | 8 days, 17:02:49 |
+| Tabs are lost then a workspace deletion is synced | https://github.com/zen-browser/desktop/issues/10345 | None | None |
+| Fix | https://github.com/zen-browser/desktop/issues/10344 | 8:18:05 | 1 day, 9:23:10 |
+| 1px white border on the top of the window which wasnt there before | https://github.com/zen-browser/desktop/issues/10342 | 2 days, 0:57:48 | None |
+| zen browser isn't closing correctly | https://github.com/zen-browser/desktop/issues/10337 | 8:28:03 | 17:42:22 |
+| Fix Multiple Tabs/Containers in Split View in Sidebar | https://github.com/zen-browser/desktop/issues/10335 | None | None |
+| Fresh install: "Essentials" are grayed out for some sites | https://github.com/zen-browser/desktop/issues/10333 | 0:17:20 | 2:38:34 |
+| Unticking 'Open Previous Tabs on Startup' messes with pinened folders | https://github.com/zen-browser/desktop/issues/10331 | None | None |
+| Can't open Connection secure (certificate) 'page' anymore | https://github.com/zen-browser/desktop/issues/10330 | 1:25:14 | 4:54:22 |
+| Some favicons of pins / essentials disappear when restarting without `Open previous windows and tabs` | https://github.com/zen-browser/desktop/issues/10329 | 3:12:08 | None |
+| X Spaces breaks when Mic is requested | https://github.com/zen-browser/desktop/issues/10328 | 12 days, 16:06:32 | None |
+| Tabs on Right , have Weird White Container that come out of nowhere | https://github.com/zen-browser/desktop/issues/10327 | None | 0:50:40 |
+| Multiacccount containers + Mozilla sync deletes all custom containers | https://github.com/zen-browser/desktop/issues/10324 | None | None |
+| Cannot open Links from Thunderbird emails in Zen browser | https://github.com/zen-browser/desktop/issues/10323 | 2 days, 7:50:34 | None |
+| As long as the Baidu search engine exists in the search engine, the Baidu search engine in the quick search interface is at the top, regardless of whether it is checked or not. | https://github.com/zen-browser/desktop/issues/10322 | 1 day, 0:23:30 | None |
+| Your tab just crashed | https://github.com/zen-browser/desktop/issues/10321 | None | None |
+| Can not import bookmarks from FF | https://github.com/zen-browser/desktop/issues/10320 | None | None |
+| Separate accounts across workspaces; should workspaces have different cookies and site data? | https://github.com/zen-browser/desktop/issues/10319 | 0:20:35 | None |
+| folder names are a different font size | https://github.com/zen-browser/desktop/issues/10318 | 2:06:09 | 3 days, 16:05:52 |
+| zen.view.experimental-no-window-controls stopped working | https://github.com/zen-browser/desktop/issues/10317 | 7:18:21 | 13:06:50 |
+| Images get corrupted when uploading on Zen Browser (Flatpak + AUR, Linux + Wayland + NVIDIA) | https://github.com/zen-browser/desktop/issues/10316 | None | 4:13:56 |
+| Popout Tab extensions not working | https://github.com/zen-browser/desktop/issues/10315 | None | None |
+| Zen Browser freezing after waking from suspend | https://github.com/zen-browser/desktop/issues/10314 | 1 day, 7:54:39 | None |
+| compact mode not working | https://github.com/zen-browser/desktop/issues/10313 | 3:21:50 | 12:27:20 |
+| libnotify not used in Flatpak | https://github.com/zen-browser/desktop/issues/10310 | 19:30:48 | 19:30:48 |
+| Essentials Tab order reset everytime I restart Zen Browser | https://github.com/zen-browser/desktop/issues/10309 | 1:24:30 | None |
+| [ux]first keydown on fill bar is plain focus, enforce type wwhat to typeout what. on chatgpt.com | https://github.com/zen-browser/desktop/issues/10308 | 4:52:52 | 4:52:52 |
+| Copying URL using shortcut when in reader mode does not work as expected | https://github.com/zen-browser/desktop/issues/10303 | 0:04:42 | None |
+| Reopening Closed Tabs (Ctrl+Shift+T) Duplicates Essentials/Pinned, Causing Loss on Next Session If The Dupes Were Closed | https://github.com/zen-browser/desktop/issues/10302 | 4 days, 23:41:33 | None |
+| Tabs within Folders in Workspaces switch back to the default workspace | https://github.com/zen-browser/desktop/issues/10299 | None | None |
+| Can't clear the cookies and site data due to a UI bug | https://github.com/zen-browser/desktop/issues/10298 | 6:00:32 | 6:00:32 |
+| Cannot move pinned tab to the top of normal tabs | https://github.com/zen-browser/desktop/issues/10295 | None | None |
+| Mouse cursor position can have an undesirable effect on the tab switcher | https://github.com/zen-browser/desktop/issues/10292 | 2:12:31 | 2:29:10 |
+| Essential tabs and Pinned tabs (including the ones inside a folder) do not load on startup | https://github.com/zen-browser/desktop/issues/10291 | 2:47:15 | None |
+| Browser doesn't launch after update | https://github.com/zen-browser/desktop/issues/10290 | 4:30:50 | None |
+| Double-click on sidebar no longer opens a new tab after recent Zen update | https://github.com/zen-browser/desktop/issues/10289 | 12:03:10 | 12:03:10 |
+| ArchLinux AUR: Quellen für ‚zen-browser-bin-1.15.4b-1‘ konnten nicht heruntergeladen werden | https://github.com/zen-browser/desktop/issues/10288 | 2:39:09 | 2:39:09 |
+| Ctrl+Shift+T after reopening Zen mixes tabs from multiple workspaces | https://github.com/zen-browser/desktop/issues/10286 | None | 4 days, 6:16:17 |
+| Keyboard Input Delay While Typing on Monaco Editors | https://github.com/zen-browser/desktop/issues/10285 | 1 day, 6:25:04 | None |
+| the top close maximize minimize are shwoing up and not going according to the theme and its just very bugged | https://github.com/zen-browser/desktop/issues/10284 | 5:13:41 | 6:27:09 |
+| New Tab opens in new window. | https://github.com/zen-browser/desktop/issues/10283 | 0:29:33 | None |
+| Can only open in safe mode. 1.15.5b | https://github.com/zen-browser/desktop/issues/10282 | 2:10:07 | 3:33:03 |
+| Copy to Cliboard button in the url bar not working | https://github.com/zen-browser/desktop/issues/10281 | 2 days, 6:09:05 | 20 days, 2:34:28 |
+| After the 1.15.4b update, the automatic hiding of the top and tab is not working | https://github.com/zen-browser/desktop/issues/10280 | 4:35:52 | 16:55:08 |
+| Cannot move window when holding down left mouse button on sidebar | https://github.com/zen-browser/desktop/issues/10278 | 3 days, 19:54:46 | 3 days, 21:15:09 |
+| Sidebar always visible in compact mode after right-clicking container icon when opening a new tab | https://github.com/zen-browser/desktop/issues/10276 | 1:53:46 | None |
+| zen cannot play youtube livestreams | https://github.com/zen-browser/desktop/issues/10274 | 5:07:19 | None |
+| Compact sidebar pops up when opening menus in menubar | https://github.com/zen-browser/desktop/issues/10273 | None | None |
+| Newest Update — weird Bookmarks behavior | https://github.com/zen-browser/desktop/issues/10272 | None | 0:34:25 |
+| Double-clicking no longer opens a new tab. | https://github.com/zen-browser/desktop/issues/10270 | 1:23:48 | 2:13:30 |
+| Theme is inconsistent with and without focus | https://github.com/zen-browser/desktop/issues/10268 | None | None |
+| Tabs inside folder goes invisible when closing folder | https://github.com/zen-browser/desktop/issues/10267 | 10:34:08 | 11:05:06 |
+| Essentials/Pinned tabs are removed with middle click | https://github.com/zen-browser/desktop/issues/10266 | 2:33:21 | 11:29:40 |
+| Creating split window by dragging pinned Essentials icon removes the Essential icon | https://github.com/zen-browser/desktop/issues/10264 | None | None |
+| Macos: extention pop-ups open up at a different desktop in fullscreen | https://github.com/zen-browser/desktop/issues/10260 | None | None |
+| Split tabs can't be moved to new workspace | https://github.com/zen-browser/desktop/issues/10256 | None | 11:32:53 |
+| Google account not shared between spaces — must re-add to sign in to Figma | https://github.com/zen-browser/desktop/issues/10255 | 8:43:21 | None |
+| Split tabs context menu does not show when selecting already split tabs | https://github.com/zen-browser/desktop/issues/10254 | 1 day, 8:31:56 | None |
+| Netflix Error F7121-1331 | https://github.com/zen-browser/desktop/issues/10251 | 2:31:38 | 0:02:34 |
+| Gradient themes get cut off if using vertical taskbar on W10 | https://github.com/zen-browser/desktop/issues/10250 | 20 days, 21:52:53 | None |
+| White/Transparent search bar and bookmarks | https://github.com/zen-browser/desktop/issues/10247 | 11:15:56 | 1 day, 14:35:40 |
+| Pin tabs duplication | https://github.com/zen-browser/desktop/issues/10246 | 13:43:00 | 13:43:00 |
+| Zen window transparency only works when window is maximized | https://github.com/zen-browser/desktop/issues/10243 | None | None |
+| Cursor rapid flickering on random places within the browser window when graphic tablet is used | https://github.com/zen-browser/desktop/issues/10242 | 21:55:18 | 21:57:24 |
+| MIssing last second(s) in certain audios | https://github.com/zen-browser/desktop/issues/10240 | None | None |
+| Issue with Transparency Effect in background in Zen Browser | https://github.com/zen-browser/desktop/issues/10239 | 3:36:39 | 18 days, 3:00:45 |
+| Zen icon does not load even apon restart. | https://github.com/zen-browser/desktop/issues/10238 | 1 day, 7:03:03 | 1 day, 7:03:03 |
+| Discord login page does not load | https://github.com/zen-browser/desktop/issues/10234 | None | None |
+| Native window title doesn't show Page title(document.title) when tab is pinned and renamed, shows only profile name and app name | https://github.com/zen-browser/desktop/issues/10232 | None | None |
+| Enabling "Always use private browsing mode" results in totally black UI | https://github.com/zen-browser/desktop/issues/10231 | None | None |
+| After newest Update there is now a ugly white Border around the Hidden Compact Sidebar | https://github.com/zen-browser/desktop/issues/10230 | 1 day, 13:55:29 | 2 days, 20:51:00 |
+| File manager not opening in Arch linux | https://github.com/zen-browser/desktop/issues/10226 | 0:12:51 | None |
+| Default color back to orange | https://github.com/zen-browser/desktop/issues/10225 | 0:07:41 | 3:10:01 |
+| NAVEGADOR CONSUMINDO 12 GIGAS? CARALHOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO | https://github.com/zen-browser/desktop/issues/10224 | None | 0:24:57 |
+| gemini style bug | https://github.com/zen-browser/desktop/issues/10222 | 1:32:02 | 1:04:01 |
+| Zen Browser opens on the last used virtual desktop instead of the current one | https://github.com/zen-browser/desktop/issues/10221 | 2:07:09 | None |
+| Tabs having weird behaviour when moving them form one window to the other | https://github.com/zen-browser/desktop/issues/10220 | None | None |
+| Web pages in the workspace cannot be synced | https://github.com/zen-browser/desktop/issues/10219 | 5 days, 0:56:10 | 5 days, 6:23:07 |
+| Swipe workspaces gesture freezes on "Mute Tab" icon hover | https://github.com/zen-browser/desktop/issues/10217 | None | None |
+| Sub-folders of Tabs, Dump Tabs when moved in a Folder List | https://github.com/zen-browser/desktop/issues/10216 | 2 days, 13:52:56 | 4 days, 22:25:16 |
+| Labels rendering bug | https://github.com/zen-browser/desktop/issues/10215 | 11:10:14 | 3 days, 22:48:16 |
+| Browser doesn't allow completion of TOTP number on Paypal site | https://github.com/zen-browser/desktop/issues/10214 | None | None |
+| Unable to use Option+Cmd+ArrowLeft or Option+Cmd+ArrowRight to change spaces. | https://github.com/zen-browser/desktop/issues/10211 | 14:39:09 | 15:34:26 |
+| The Workspace Icon can't be hided anymore | https://github.com/zen-browser/desktop/issues/10209 | 1:41:32 | 1:41:32 |
+| Tabs move into Folders | https://github.com/zen-browser/desktop/issues/10208 | 0:24:03 | 7:25:32 |
+| Native select low contrast theme | https://github.com/zen-browser/desktop/issues/10207 | None | None |
+| Trackpad zooming on PDF no longer working | https://github.com/zen-browser/desktop/issues/10205 | None | None |
+| Can’t add tab to Essentials | https://github.com/zen-browser/desktop/issues/10204 | 1:15:16 | 8:15:36 |
+| Zen browser can't go through system proxies on Linux | https://github.com/zen-browser/desktop/issues/10203 | None | None |
+| The Browser's adressbar is not visible because it blends into the current viewed page. | https://github.com/zen-browser/desktop/issues/10202 | 0:13:50 | 2 days, 23:44:36 |
+| Wrong favicon instead of cached icons bug is back | https://github.com/zen-browser/desktop/issues/10199 | 1 day, 6:59:45 | 2 days, 21:44:37 |
+| iCloud not working | https://github.com/zen-browser/desktop/issues/10192 | 6:18:44 | 11:56:51 |
+| Truncated folder name in the search inside folders feature | https://github.com/zen-browser/desktop/issues/10189 | 2:31:02 | None |
+| Missing translations in the search inside folders feature | https://github.com/zen-browser/desktop/issues/10188 | 2:16:01 | 2:16:01 |
+| New "floadting" tab bar window covers bookmark bar | https://github.com/zen-browser/desktop/issues/10186 | 6:07:17 | 16:21:43 |
+| Revert 1.15.3b!!!! | https://github.com/zen-browser/desktop/issues/10185 | 1:12:24 | 1:03:18 |
+| "New Tab Below" menu item when right clicking on a tab no longer shows after upgrading from 1.14.11b | https://github.com/zen-browser/desktop/issues/10184 | None | 2:40:19 |
+| Multiple bugs with new folder Feature | https://github.com/zen-browser/desktop/issues/10182 | 1:37:43 | None |
+| New window bug - unpinned tabs disappear, folders expand | https://github.com/zen-browser/desktop/issues/10180 | 2:22:55 | 2:22:55 |
+| Essentials not syncing across all spaces in same container | https://github.com/zen-browser/desktop/issues/10179 | 3:37:37 | 24 days, 5:11:42 |
+| Macos Universal download installer | https://github.com/zen-browser/desktop/issues/10175 | 7:10:27 | 7:10:27 |
+
+_This report was generated with the [Issue Metrics Action](https://github.com/github/issue-metrics)_
+Search query used to find these items: `repo:zen-browser/desktop is:issue created:2025-09-01..2025-09-30`

From 428b61d6d41215bb0fbdfae5dd5f6cc43003cacd Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:41:55 +0200
Subject: [PATCH 015/111] New Crowdin updates (#10611)

---
 locales/de/browser/browser/zen-general.ftl    | 2 +-
 locales/ga-IE/browser/browser/zen-general.ftl | 2 +-
 locales/pt-PT/browser/browser/zen-general.ftl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 775af62d7..211ee89a7 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -48,4 +48,4 @@ zen-icons-picker-emoji =
     .label = Emojis
 zen-icons-picker-svg = 
     .label = Symbole
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Aktionen
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 27bd04d9c..eaa94e10a 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -48,4 +48,4 @@ zen-icons-picker-emoji =
     .label = Emojis
 zen-icons-picker-svg = 
     .label = Deilbhíní
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Gníomhartha
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 3416a8c96..4963234ac 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -48,4 +48,4 @@ zen-icons-picker-emoji =
     .label = Emojis
 zen-icons-picker-svg = 
     .label = Ícones
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Ações

From 58a939f2ad332238ee8a00ed11145f6a9baa7102 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:42:23 +0200
Subject: [PATCH 016/111] chore: Re-enable updater service, p=#10654, c=configs

---
 configs/windows/mozconfig                       |  3 ---
 src/browser/installer/package-manifest-in.patch | 14 ++------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 408d8884e..0e725a01e 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -22,9 +22,6 @@ if test "$ZEN_CROSS_COMPILING"; then
   fi
 fi
 
-ac_add_options --disable-maintenance-service
-ac_add_options --disable-bits-download
-
 if test "$SURFER_COMPAT" = "x86_64"; then
 
   ac_add_options --target=x86_64-pc-windows-msvc
diff --git a/src/browser/installer/package-manifest-in.patch b/src/browser/installer/package-manifest-in.patch
index 7cc6a9526..8634232ff 100644
--- a/src/browser/installer/package-manifest-in.patch
+++ b/src/browser/installer/package-manifest-in.patch
@@ -1,18 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644
+index 70f268914f1078ef45e86d295f4bb2ce179a05e0..9eb138023bc9de6211a3e814b0525da612156a78 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so
- ; [MaintenanceService]
- ;
- #ifdef MOZ_MAINTENANCE_SERVICE
--@BINPATH@/maintenanceservice.exe
--@BINPATH@/maintenanceservice_installer.exe
-+;@BINPATH@/maintenanceservice.exe
-+;@BINPATH@/maintenanceservice_installer.exe
- #endif
- 
- ; [Crash Reporter]
+@@ -369,9 +369,9 @@ bin/libfreebl_64int_3.so
  ;
  #ifdef MOZ_CRASHREPORTER
  #ifdef XP_MACOSX

From a8712f9aba28bdc47d2106b6bf9c099d3abe6999 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 1 Oct 2025 15:48:48 +0200
Subject: [PATCH 017/111] fix: Fixed urlbar being stuck on the screen, b=closes
 #10650, c=common

---
 src/zen/common/styles/zen-omnibox.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 421641b4f..377688fc0 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -155,8 +155,11 @@
   order: 2 !important;
 }
 
-#urlbar[breakout-extend='true'] {
+#urlbar[breakout] {
   position: fixed;
+}
+
+#urlbar[breakout-extend='true'] {
   z-index: 2;
 
   & .urlbar-input-container {

From 1300ae2521ea059285c34459ce6c722f9481d5b0 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 1 Oct 2025 16:26:34 +0200
Subject: [PATCH 018/111] fix: Updated to Firefox `143.0.3`, b=no-bug, c=l10n

---
 README.md                                 | 4 ++--
 build/firefox-cache/l10n-last-commit-hash | 2 +-
 surfer.json                               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3a81ce9d6..60a55aa73 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `143.0.1`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 143.0.1`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `143.0.3`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 143.0.3`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index e2d858a12..b24de145e 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-1b0467f0c46520bbed6648f6583a9ba6710d76cb
\ No newline at end of file
+c8042c4961ad61678121d8ce9ca2d17cc85fefbe
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index f408413bf..8c0d54fe0 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "143.0.1",
-    "candidate": "143.0.1"
+    "version": "143.0.3",
+    "candidate": "143.0.3"
   },
   "buildOptions": {
     "generateBranding": true

From 9887871d01b0382906686cc015b8f3e4f85685d2 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 1 Oct 2025 19:13:41 +0200
Subject: [PATCH 019/111] fix: Fixed compact mode twitching with raycast,
 b=closes #10637, c=tabs, common

---
 .../tabbrowser/content/tabs-js.patch          | 42 +++++++++----------
 src/zen/common/ZenHasPolyfill.mjs             |  6 ++-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 3f0fd1ff9..2fa8caa1f 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536322388ea 100644
+index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221fb51207c6 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -44,6 +44,9 @@
@@ -361,7 +361,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
      #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
 -      let arrowScrollbox = tab.closest("arrowscrollbox");
 +      let arrowScrollbox = this.arrowScrollbox;
-       if (arrowScrollbox.overflowing) {
+       if (arrowScrollbox?.overflowing) {
          arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
        }
 @@ -2288,6 +2343,16 @@
@@ -410,9 +410,9 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
        translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX);
        translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
  
-@@ -2743,13 +2810,18 @@
- 
+@@ -2744,13 +2811,18 @@
        this.#clearDragOverGroupingTimer();
+       this.#clearPinnedDropIndicatorTimer();
  
 -      let isPinned = draggedTab.pinned;
 -      let numPinned = gBrowser.pinnedTabCount;
@@ -433,7 +433,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
  
        if (this.#rtlMode) {
          tabs.reverse();
-@@ -2760,7 +2832,7 @@
+@@ -2761,7 +2833,7 @@
        let screenAxis = this.verticalMode ? "screenY" : "screenX";
        let size = this.verticalMode ? "height" : "width";
        let translateAxis = this.verticalMode ? "translateY" : "translateX";
@@ -442,7 +442,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
        let tabSize = this.verticalMode ? tabHeight : tabWidth;
        let translateX = event.screenX - dragData.screenX;
        let translateY = event.screenY - dragData.screenY;
-@@ -2776,6 +2848,12 @@
+@@ -2777,6 +2849,12 @@
        );
        let lastMovingTab = movingTabs.at(-1);
        let firstMovingTab = movingTabs[0];
@@ -455,7 +455,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
        let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
        let lastMovingTabScreen = endEdge(lastMovingTab);
        let firstMovingTabScreen = firstMovingTab[screenAxis];
-@@ -2790,6 +2868,11 @@
+@@ -2791,6 +2869,11 @@
        let endBound = this.#rtlMode
          ? endEdge(this) - lastMovingTabScreen
          : periphery[screenAxis] - 1 - lastMovingTabScreen;
@@ -467,7 +467,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
        translate = Math.min(Math.max(translate, startBound), endBound);
  
        // Center the tab under the cursor if the tab is not under the cursor while dragging
-@@ -2979,6 +3062,8 @@
+@@ -2980,6 +3063,8 @@
        };
  
        let dropElement = getOverlappedElement();
@@ -476,7 +476,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
  
        let newDropElementIndex;
        if (dropElement) {
-@@ -3060,7 +3145,7 @@
+@@ -3061,7 +3146,7 @@
            ? Services.prefs.getIntPref(
                "browser.tabs.dragDrop.moveOverThresholdPercent"
              ) / 100
@@ -485,7 +485,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
          moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
          let shouldMoveOver = overlapPercent > moveOverThreshold;
          if (logicalForward && shouldMoveOver) {
-@@ -3093,6 +3178,7 @@
+@@ -3094,6 +3179,7 @@
          // If dragging a group over another group, don't make it look like it is
          // possible to drop the dragged group inside the other group.
          if (
@@ -493,7 +493,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
            isTabGroupLabel(draggedTab) &&
            dropElement?.group &&
            (!dropElement.group.collapsed ||
-@@ -3119,20 +3205,13 @@
+@@ -3120,20 +3206,13 @@
          let isOutOfBounds = isPinned
            ? dropElement.elementIndex >= numPinned
            : dropElement.elementIndex < numPinned;
@@ -518,7 +518,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
          let groupingDelay = Services.prefs.getIntPref(
            "browser.tabs.dragDrop.createGroup.delayMS"
          );
-@@ -3140,6 +3219,7 @@
+@@ -3141,6 +3220,7 @@
          // When dragging tab(s) over an ungrouped tab, signal to the user
          // that dropping the tab(s) will create a new tab group.
          let shouldCreateGroupOnDrop =
@@ -526,7 +526,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
            !movingTabsSet.has(dropElement) &&
            isTab(dropElement) &&
            !dropElement?.group &&
-@@ -3148,6 +3228,7 @@
+@@ -3149,6 +3229,7 @@
          // When dragging tab(s) over a collapsed tab group label, signal to the
          // user that dropping the tab(s) will add them to the group.
          let shouldDropIntoCollapsedTabGroup =
@@ -534,7 +534,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
            isTabGroupLabel(dropElement) &&
            dropElement.group.collapsed &&
            overlapPercent > dragOverGroupingThreshold;
-@@ -3192,19 +3273,14 @@
+@@ -3193,19 +3274,14 @@
              dropElement = dropElementGroup;
              colorCode = undefined;
            } else if (isTabGroupLabel(dropElement)) {
@@ -562,7 +562,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
            }
            this.#setDragOverGroupColor(colorCode);
            this.toggleAttribute("movingtab-addToGroup", colorCode);
-@@ -3223,11 +3299,11 @@
+@@ -3224,11 +3300,11 @@
        dragData.dropElement = dropElement;
        dragData.dropBefore = dropBefore;
        dragData.animDropElementIndex = newDropElementIndex;
@@ -576,7 +576,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
            continue;
          }
  
-@@ -3346,12 +3422,14 @@
+@@ -3350,12 +3426,14 @@
        element?.removeAttribute("dragover-groupTarget");
      }
  
@@ -593,7 +593,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
  
        for (let item of this.ariaFocusableItems) {
          this.#resetGroupTarget(item);
-@@ -3394,16 +3472,15 @@
+@@ -3402,16 +3480,15 @@
          tab.style.left = "";
          tab.style.top = "";
          tab.style.maxWidth = "";
@@ -612,7 +612,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
        }
        let periphery = draggedTabDocument.getElementById(
          "tabbrowser-arrowscrollbox-periphery"
-@@ -3475,7 +3552,7 @@
+@@ -3483,7 +3560,7 @@
          let postTransitionCleanup = () => {
            movingTab._moveTogetherSelectedTabsData.animate = false;
          };
@@ -621,7 +621,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
            postTransitionCleanup();
          } else {
            let onTransitionEnd = transitionendEvent => {
-@@ -3639,7 +3716,7 @@
+@@ -3647,7 +3724,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -630,7 +630,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
          return;
        }
  
-@@ -3748,7 +3825,10 @@
+@@ -3756,7 +3833,10 @@
      #getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
@@ -642,7 +642,7 @@ index c7557dad38db9ef02b981c46de9595df77cb67db..f45ecacd23179f06a436d5f3d372b536
            break;
          }
          target = target.parentNode;
-@@ -3765,6 +3845,9 @@
+@@ -3773,6 +3853,9 @@
            return null;
          }
        }
diff --git a/src/zen/common/ZenHasPolyfill.mjs b/src/zen/common/ZenHasPolyfill.mjs
index b7e6b2c60..1f50dc4f2 100644
--- a/src/zen/common/ZenHasPolyfill.mjs
+++ b/src/zen/common/ZenHasPolyfill.mjs
@@ -15,7 +15,11 @@
     observeSelectorExistence(element, descendantSelectors, stateAttribute, attributeFilter = []) {
       const updateState = () => {
         const exists = descendantSelectors.some(({ selector }) => {
-          return element.querySelector(selector);
+          let selected = element.querySelector(selector);
+          if (selected?.tagName?.toLowerCase() === 'menu') {
+            return null;
+          }
+          return selected;
         });
         const { exists: shouldExist = true } = descendantSelectors;
         if (exists === shouldExist) {

From bb9b7b74aaca023cf4d1c7f0e1742ebf59e5dfe3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 1 Oct 2025 21:52:26 +0200
Subject: [PATCH 020/111] feat: Improved space edit button sizings, b=no-bug,
 c=workspaces

---
 src/zen/workspaces/zen-workspaces.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index 023c107ba..5ac09c7c2 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -237,7 +237,10 @@
     --toolbarbutton-inner-padding: 6px;
 
     & image {
-      border-radius: calc(var(--border-radius-medium) - 4px);
+      border-radius: calc(var(--border-radius-medium) - 4px) !important;
+      width: 26px;
+      height: 26px;
+      margin-right: -1px;
     }
 
     :root[zen-renaming-tab='true'] & {

From 69a0ddd03c1710079b53d2f0a6828d1d70ec0a57 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 1 Oct 2025 22:17:42 +0200
Subject: [PATCH 021/111] fix: Fix compact mode native radius and separtion for
 windows, b=no-bug, c=compact-mode

---
 src/browser/themes/windows/browser-css.patch | 5 +++--
 src/zen/compact-mode/zen-compact-mode.css    | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch
index 098bd9c63..5b064a7bb 100644
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index 4485369284ee762bc8b35afb84fec0874a831fff..7096e2e5d50cda99b62a2aa7118fea6371e76b85 100644
+index 4485369284ee762bc8b35afb84fec0874a831fff..6a1ad15f657437aa4ef98fda63ae921a378f7310 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
 @@ -31,7 +31,6 @@
@@ -10,13 +10,14 @@ index 4485369284ee762bc8b35afb84fec0874a831fff..7096e2e5d50cda99b62a2aa7118fea63
      }
  
      /* Using a semitransparent background preserves the tinting from the backdrop.
-@@ -60,14 +59,12 @@
+@@ -60,14 +59,13 @@
  }
  
  /* This is needed for Windows 10, see bug 1961257 */
 -@media (-moz-windows-accent-color-in-titlebar) {
 -  :root[customtitlebar][sizemode="normal"] #navigator-toolbox {
 +  :root[customtitlebar][sizemode="normal"] #browser {
++    --zen-sidebar-compact-top-offset: 1px;
      border-top: 0.5px solid ActiveBorder;
      &:-moz-window-inactive {
        border-top-color: InactiveBorder;
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 38741c81a..af798fa33 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -29,7 +29,7 @@
   &,
   &::before,
   &::after {
-    border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4 - var(--zen-compact-mode-no-padding-radius-fix, 0px));
+    border-radius: calc(var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px));
   }
 }
 
@@ -97,7 +97,10 @@
           bottom: var(--zen-compact-float);
           padding: 0 var(--zen-compact-float) !important;
           :root[zen-single-toolbar='true'] & {
-            top: calc(var(--zen-compact-float) / 2);
+            /* We add an extra offset since windows users have a border top
+             * in the window in order to compensate how windows renders the
+             * titlebar */ 
+            top: calc(var(--zen-compact-float) / 2 + var(--zen-sidebar-compact-top-offset, 0px));
             height: calc(100% - var(--zen-compact-float));
           }
           :root:not([zen-single-toolbar='true']) & {

From 2c31564f5de93d918e902ebd3b11595ddef1d7c2 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 1 Oct 2025 23:45:22 +0200
Subject: [PATCH 022/111] Revert "chore: Re-enable updater service, p=#10654,
 c=configs", p=#10660

---
 configs/windows/mozconfig                       |  3 +++
 src/browser/installer/package-manifest-in.patch | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 0e725a01e..408d8884e 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -22,6 +22,9 @@ if test "$ZEN_CROSS_COMPILING"; then
   fi
 fi
 
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-bits-download
+
 if test "$SURFER_COMPAT" = "x86_64"; then
 
   ac_add_options --target=x86_64-pc-windows-msvc
diff --git a/src/browser/installer/package-manifest-in.patch b/src/browser/installer/package-manifest-in.patch
index 8634232ff..7cc6a9526 100644
--- a/src/browser/installer/package-manifest-in.patch
+++ b/src/browser/installer/package-manifest-in.patch
@@ -1,8 +1,18 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 70f268914f1078ef45e86d295f4bb2ce179a05e0..9eb138023bc9de6211a3e814b0525da612156a78 100644
+index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -369,9 +369,9 @@ bin/libfreebl_64int_3.so
+@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so
+ ; [MaintenanceService]
+ ;
+ #ifdef MOZ_MAINTENANCE_SERVICE
+-@BINPATH@/maintenanceservice.exe
+-@BINPATH@/maintenanceservice_installer.exe
++;@BINPATH@/maintenanceservice.exe
++;@BINPATH@/maintenanceservice_installer.exe
+ #endif
+ 
+ ; [Crash Reporter]
  ;
  #ifdef MOZ_CRASHREPORTER
  #ifdef XP_MACOSX

From 4f4b1cc140a5ba47a04035f07e0c46aa80979f4a Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 1 Oct 2025 23:45:34 +0200
Subject: [PATCH 023/111] chore: Bump version, b=no-bug, c=no-component

---
 surfer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/surfer.json b/surfer.json
index 8c0d54fe0..a98050d72 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.16.2b",
+        "displayVersion": "1.16.3b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 236abce07b853c0bfa59b30577253e5251f3204d Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 2 Oct 2025 01:02:14 +0200
Subject: [PATCH 024/111] feat: Add more delay when the mouse leaves the
 urlbar, b=no-bug, c=compact-mode

---
 src/zen/compact-mode/ZenCompactMode.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index e0b76019a..0606498ff 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -661,7 +661,7 @@ var gZenCompactModeManager = {
           requestAnimationFrame(() => {
             delete this._hasHoveredUrlbar;
           });
-        }, 0);
+        }, 10);
       }, 0);
     });
   },

From 283108dc28a9ae3624318f16b69c7faccf9586b5 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 2 Oct 2025 10:39:45 +0200
Subject: [PATCH 025/111] feat: Improve windows signing CI tool, b=no-bug,
 c=no-component

---
 build/winsign/sign.ps1 | 4 +++-
 package.json           | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index 1e06067b6..17aa67f9d 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -35,7 +35,9 @@ Start-Job -Name "SurferInit" -ScriptBlock {
     param($PWD)
     cd $PWD
     npm run import -- --verbose
-    npm run surfer -- ci --brand release
+    $surferJson = Get-Content surfer.json | ConvertFrom-Json
+    $version = $surferJson.brands.release.release.displayVersion
+    npm run ci -- $version
 } -Verbose -ArgumentList $PWD -Debug
 
 echo "Downloading artifacts info"
diff --git a/package.json b/package.json
index ea0542817..8844e4840 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,8 @@
     "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
     "lc": "surfer license-check",
     "lc:fix": "surfer license-check --fix",
-    "use-moz-src": "cd engine && ./mach use-moz-src"
+    "use-moz-src": "cd engine && ./mach use-moz-src",
+    "ci": "surfer ci --brand release --display-version"
   },
   "repository": {
     "type": "git",

From a4fa3159ca2707cad874612c61295c0748171447 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 2 Oct 2025 19:41:47 +0200
Subject: [PATCH 026/111] fix: Fixed essentials disappearing when switching
 spaces, b=no-bug, c=workspaces

---
 src/zen/workspaces/ZenWorkspaces.mjs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index bef9d0354..66562e902 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2494,12 +2494,13 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
       }
       for (const workspaceId of workspacesIds) {
         const workspaceElement = this.workspaceElement(workspaceId);
-        if (!workspaceElement) {
+        const workspaceObject = this.getWorkspaceFromId(workspaceId);
+        if (!workspaceElement || !workspaceObject) {
+          console.warn('Workspace element or object not found for id', workspaceId);
           continue;
         }
         const arrowScrollbox = workspaceElement.tabsContainer;
         const pinnedContainer = workspaceElement.pinnedTabsContainer;
-        const workspaceObject = this.getWorkspaceFromId(workspaceId);
         const essentialContainer = this.getEssentialsSection(workspaceObject.containerTabId);
         const essentialNumChildren = essentialContainer.children.length;
         let essentialHackType = 0;

From a576912e03dbb94eb786fd0b5d30e808b077e6d9 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 2 Oct 2025 23:43:04 +0200
Subject: [PATCH 027/111] fix: Fixed empty split ksb for windows, b=no-bug,
 c=kbs

---
 src/zen/kbs/ZenKeyboardShortcuts.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index 38d26448a..dcb61e09c 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -1084,7 +1084,7 @@ class nsZenKeyboardShortcutsVersioner {
       data.push(
         new KeyShortcut(
           'zen-new-empty-split-view',
-          AppConstants.platform == 'linux' ? '*' : '+',
+          AppConstants.platform == 'macosx' ? '+' : '*',
           '',
           ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
           nsKeyShortcutModifiers.fromObject({ accel: true, shift: true }),

From cbcce8d4e311a1e24d314475ecb856a677885872 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 3 Oct 2025 07:55:33 +0200
Subject: [PATCH 028/111] New Crowdin updates (#10670)

* New translations zen-preferences.ftl (Greek)

* New translations zen-preferences.ftl (Russian)

* New translations zen-workspaces.ftl (Russian)

* New translations zen-general.ftl (Russian)

* New translations zen-vertical-tabs.ftl (Russian)

* New translations zen-folders.ftl (Russian)
---
 .../browser/preferences/zen-preferences.ftl   |  4 ++--
 .../browser/preferences/zen-preferences.ftl   | 10 ++++-----
 locales/ru/browser/browser/zen-folders.ftl    | 22 +++++++++----------
 locales/ru/browser/browser/zen-general.ftl    |  6 ++---
 .../ru/browser/browser/zen-vertical-tabs.ftl  |  4 ++--
 locales/ru/browser/browser/zen-workspaces.ftl |  6 ++---
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl
index 4cd0d53c6..2cc362acc 100644
--- a/locales/el/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/el/browser/browser/preferences/zen-preferences.ftl
@@ -43,9 +43,9 @@ pane-settings-workspaces-title = Χώροι Εργασίας
 zen-tabs-unloader-enabled = 
     .label = Ενεργοποίηση Εκφορτωτή Καρτέλας
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Χρήση παρασκηνίου με θέμα για συμπαγή γραμμή εργαλειών
 zen-workspace-continue-where-left-off = 
-    .label = Συνεχεία από εκεί που σταματήσατε
+    .label = Συνέχεια από εκεί που σταματήσατε
 pane-zen-pinned-tab-manager-title = Καρφιτσωμένες Καρτέλες
 zen-pinned-tab-manager-header = Γενικές ρυθμίσεις για καρφιτσωμένες καρτέλες
 zen-pinned-tab-manager-description = Διαχείριση πρόσθετης συμπεριφοράς καρφιτσωμένων καρτελών
diff --git a/locales/ru/browser/browser/preferences/zen-preferences.ftl b/locales/ru/browser/browser/preferences/zen-preferences.ftl
index c32b2b44a..3fdd81e85 100644
--- a/locales/ru/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ru/browser/browser/preferences/zen-preferences.ftl
@@ -43,7 +43,7 @@ pane-settings-workspaces-title = Рабочие пространства
 zen-tabs-unloader-enabled = 
     .label = Включить выгрузку вкладок
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Использовать цвета темы для фона компактной панели инструментов
 zen-workspace-continue-where-left-off = 
     .label = Продолжить с того места, где вы остановились
 pane-zen-pinned-tab-manager-title = Закреплённые вкладки
@@ -195,7 +195,7 @@ zen-picture-in-picture-toggle-shortcut-mac = Переключить изобра
 zen-picture-in-picture-toggle-shortcut-mac-alt = Переключить изображение в картинке (Mac Alt)
 zen-page-source-shortcut-safari = Просмотр исходного кода страницы (Safari)
 zen-nav-stop-shortcut = Остановить загрузку
-zen-history-sidebar-shortcut = Show History Sidebar
+zen-history-sidebar-shortcut = Показать боковую панель истории
 zen-window-minimize-shortcut = Свернуть окно
 zen-help-shortcut = Открыть справку
 zen-preferences-shortcut = Открыть настройки
@@ -221,7 +221,7 @@ zen-key-exit-full-screen = Выйти из полноэкранного режи
 zen-ai-chatbot-sidebar-shortcut = Переключить боковую панель ИИ чат-бота
 zen-key-inspector-mac = Переключить инспектор (Mac)
 zen-toggle-sidebar-shortcut = Переключить боковую панель Firefox
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-toggle-pin-tab-shortcut = Переключить закрепление вкладки
 zen-reader-mode-toggle-shortcut-other = Переключить режим чтения
 zen-picture-in-picture-toggle-shortcut = Переключить изображение в картинке
 zen-nav-reload-shortcut-2 = Обновить страницу
@@ -255,7 +255,7 @@ zen-close-tab-shortcut = Закрыть вкладку
 zen-compact-mode-shortcut-show-sidebar = Включить/выключить плавающую боковую панель
 zen-compact-mode-shortcut-show-toolbar = Инструменты плавающей панели
 zen-compact-mode-shortcut-toggle = Компактный режим
-zen-glance-expand = Expand Glance
+zen-glance-expand = Раскрыть предпросмотр
 zen-workspace-shortcut-switch-1 = Переключиться на пространство 1
 zen-workspace-shortcut-switch-2 = Переключиться на пространство 2
 zen-workspace-shortcut-switch-3 = Переключиться на пространство 3
@@ -274,7 +274,7 @@ zen-split-view-shortcut-grid = Переключить разделение се
 zen-split-view-shortcut-vertical = Вертикальный режим разделения
 zen-split-view-shortcut-horizontal = Горизонтальное разделение
 zen-split-view-shortcut-unsplit = Закрыть раздельный вид
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Новая разделённая вкладка
 zen-key-select-tab-1 = Выбрать вкладку #1
 zen-key-select-tab-2 = Выбрать вкладку #2
 zen-key-select-tab-3 = Выбрать вкладку #3
diff --git a/locales/ru/browser/browser/zen-folders.ftl b/locales/ru/browser/browser/zen-folders.ftl
index e3976b196..c673b1acb 100644
--- a/locales/ru/browser/browser/zen-folders.ftl
+++ b/locales/ru/browser/browser/zen-folders.ftl
@@ -1,21 +1,21 @@
 zen-folders-search-placeholder = 
-    .placeholder = Искать { $folder-name }…
+    .placeholder = Искать в { $folder-name }...
 zen-folders-panel-rename-folder = 
-    .label = Rename Folder
+    .label = Переименовать папку
 zen-folders-panel-unpack-folder = 
-    .label = Unpack Folder
+    .label = Распаковать папку
 zen-folders-new-subfolder = 
-    .label = New Subfolder
+    .label = Новая подпапка
 zen-folders-panel-delete-folder = 
-    .label = Delete Folder
+    .label = Удалить папку
 zen-folders-panel-convert-folder-to-space = 
-    .label = Convert folder to Space
+    .label = Конвертировать папку в пространство
 zen-folders-panel-change-folder-space = 
-    .label = Change Space...
+    .label = Переместить в пространство...
 zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
+    .label = Изменить значок
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = Выгрузить все активные вкладки в этой папке
 zen-folders-unload-folder = 
-    .label = Unload All Tabs
-zen-folders-search-no-results = No tabs matching that search 🤔
+    .label = Выгрузить все вкладки
+zen-folders-search-no-results = Ничего не найдено 🤔
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index b877ebc45..6c80884b7 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -45,7 +45,7 @@ zen-close-label = Закрыть
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Найти...
 zen-icons-picker-emoji = 
-    .label = Emojis
+    .label = Эмодзи
 zen-icons-picker-svg = 
-    .label = Icons
-urlbar-search-mode-zen_actions = Actions
+    .label = Иконки
+urlbar-search-mode-zen_actions = Действия
diff --git a/locales/ru/browser/browser/zen-vertical-tabs.ftl b/locales/ru/browser/browser/zen-vertical-tabs.ftl
index 8267a2e54..757a0d602 100644
--- a/locales/ru/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ru/browser/browser/zen-vertical-tabs.ftl
@@ -8,14 +8,14 @@ zen-toolbar-context-compact-mode-enable =
     .label = Включить компактный вид
     .accesskey = D
 zen-toolbar-context-compact-mode-just-tabs = 
-    .label = Hide sidebar
+    .label = Скрыть боковую панель
 zen-toolbar-context-compact-mode-just-toolbar = 
     .label = Скрыть панель инструментов
 zen-toolbar-context-compact-mode-hide-both = 
     .label = Скрыть оба
     .accesskey = Н
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = Новая папка
     .accesskey = N
 sidebar-zen-expand = 
     .label = Развернуть боковую панель
diff --git a/locales/ru/browser/browser/zen-workspaces.ftl b/locales/ru/browser/browser/zen-workspaces.ftl
index 1d638845f..ff1c4cb31 100644
--- a/locales/ru/browser/browser/zen-workspaces.ftl
+++ b/locales/ru/browser/browser/zen-workspaces.ftl
@@ -2,9 +2,9 @@ zen-panel-ui-workspaces-text = Рабочие пространства
 zen-panel-ui-workspaces-create = 
     .label = Создать пространство
 zen-panel-ui-folder-create = 
-    .label = Create Folder
+    .label = Создать папку
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Новая разделённая вкладка
 zen-workspaces-panel-context-delete = 
     .label = Удалить пространство
     .accesskey = D
@@ -50,4 +50,4 @@ zen-workspace-creation-profile = Профиль
 zen-workspace-creation-header = Создать пространство
 zen-workspace-creation-label = Пространства используются для организации ваших вкладок и сеансов.
 zen-workspaces-delete-workspace-title = Удалить пространство?
-zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+zen-workspaces-delete-workspace-body = Вы уверены, что хотите удалить { $name }? Это действие необратимо.

From 9b3ef6da897b1ee2e9adc6abb10f9b4ba45445c8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 4 Oct 2025 04:39:44 +0200
Subject: [PATCH 029/111] chore: Updated Firefox `143.0.4`, b=no-bug, c=l10n

---
 README.md                                 | 4 ++--
 build/firefox-cache/l10n-last-commit-hash | 2 +-
 surfer.json                               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 60a55aa73..58bc8315f 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `143.0.3`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 143.0.3`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `143.0.4`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 143.0.4`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index b24de145e..671337a45 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-c8042c4961ad61678121d8ce9ca2d17cc85fefbe
\ No newline at end of file
+5cbf54e3cfaf4cfb375088d7e11702e8974b238f
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index a98050d72..e643dbd5b 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "143.0.3",
-    "candidate": "143.0.3"
+    "version": "143.0.4",
+    "candidate": "143.0.4"
   },
   "buildOptions": {
     "generateBranding": true

From e3409236239569770d096f4fbe5de101f9332506 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 5 Oct 2025 00:28:32 +0200
Subject: [PATCH 030/111] feat: Increased the width and height of toolbar
 buttons, b=no-bug, c=common, workspaces

---
 src/zen/common/styles/zen-single-components.css | 9 +++++----
 src/zen/workspaces/ZenWorkspaceIcons.mjs        | 2 +-
 src/zen/workspaces/ZenWorkspaces.mjs            | 2 +-
 src/zen/workspaces/zen-workspaces.css           | 7 ++++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 8bdaa80c0..9e6ccd661 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -177,15 +177,16 @@ body > #confetti {
   #zen-sidebar-foot-buttons & {
     --tab-border-radius: 6px;
     --toolbarbutton-border-radius: var(--tab-border-radius);
-    --toolbarbutton-inner-padding: 5px;
+    --toolbarbutton-inner-padding: 6px;
     --toolbarbutton-outer-padding: 2px;
   }
 
   transition:
     background-color 0.1s,
-    scale 0.2s;
-  &:active {
-    transform: scale(0.98);
+    transform 0.2s;
+
+  &:active:hover {
+    transform: scale(0.95);
   }
 }
 
diff --git a/src/zen/workspaces/ZenWorkspaceIcons.mjs b/src/zen/workspaces/ZenWorkspaceIcons.mjs
index 3d67718c9..1d48a5f10 100644
--- a/src/zen/workspaces/ZenWorkspaceIcons.mjs
+++ b/src/zen/workspaces/ZenWorkspaceIcons.mjs
@@ -99,7 +99,7 @@
 
     #createWorkspaceIcon(workspace) {
       const button = document.createXULElement('toolbarbutton');
-      button.setAttribute('class', 'subviewbutton');
+      button.setAttribute('class', 'subviewbutton toolbarbutton-1');
       button.setAttribute('tooltiptext', workspace.name);
       button.setAttribute('zen-workspace-id', workspace.uuid);
       button.setAttribute('context', 'zenWorkspaceMoreActions');
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 66562e902..708ac626e 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -3018,7 +3018,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
       parent.removeAttribute('icons-overflow');
       return;
     }
-    const maxButtonSize = 26; // IMPORTANT: This should match the CSS size of the icons
+    const maxButtonSize = 28; // IMPORTANT: This should match the CSS size of the icons
     const minButtonSize = 15;
     const separation = 3; // Space between icons
 
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index 5ac09c7c2..ad5c61c6c 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -33,8 +33,8 @@
 
   & toolbarbutton {
     margin: 0;
-    max-width: 26px;
-    height: 26px;
+    max-width: 28px;
+    height: 28px;
     display: flex;
     justify-content: center;
     padding: 0 !important;
@@ -63,7 +63,8 @@
     transition:
       filter 0.2s,
       opacity 0.2s,
-      width 0.1s;
+      width 0.1s,
+      transform 0.2s;
 
     &[active='true'],
     &:hover,

From 3ac31a96a6295d2afe224d0aada0c3566763005c Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 5 Oct 2025 18:56:41 +0200
Subject: [PATCH 031/111] feat: New site data popup, p=#10651

---
 locales/en-US/browser/browser/zen-general.ftl |  24 +
 .../browser/browser/zen-vertical-tabs.ftl     |  11 -
 prefs/compact-mode.yaml                       |   6 -
 prefs/folders.yaml                            |   2 +-
 prefs/zen-urlbar.yaml                         |   3 +
 .../base/content/browser-addons-js.patch      |  37 +-
 .../base/content/browser-pageActions-js.patch |  12 +
 .../base/content/navigator-toolbox-js.patch   |  38 +-
 .../base/content/zen-commands.inc.xhtml       |   5 +-
 .../base/content/zen-panels/popups.inc        |   9 +
 .../base/content/zen-panels/site-data.inc     |  87 +++
 .../base/content/zen-popupset.inc.xhtml       |   1 +
 .../CustomizableUI-sys-mjs.patch              |  11 +-
 .../components/preferences/zen-settings.js    |  42 --
 .../preferences/zenLooksAndFeel.inc.xhtml     |  37 --
 .../shared/preferences/zen-preferences.css    |  32 -
 src/browser/themes/shared/zen-icons/icons.css |  92 ++-
 .../shared/zen-icons/lin/security-broken.svg  |   2 +-
 src/zen/common/ZenCustomizableUI.sys.mjs      |  16 +-
 src/zen/common/ZenUIManager.mjs               |  46 +-
 .../common/styles/zen-browser-container.css   |   8 +-
 src/zen/common/styles/zen-omnibox.css         |  76 ++-
 src/zen/common/styles/zen-popup.css           |  15 +-
 .../common/styles/zen-single-components.css   | 276 +++++++++
 src/zen/common/zen-sets.js                    |  13 +-
 src/zen/compact-mode/ZenCompactMode.mjs       | 104 +---
 src/zen/compact-mode/zen-compact-mode.css     | 578 ++++++++----------
 src/zen/kbs/ZenKeyboardShortcuts.mjs          |  50 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css       |  11 +-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       | 426 +++++++++++++
 src/zen/urlbar/moz.build                      |   1 +
 src/zen/workspaces/zen-workspaces.css         |   1 +
 src/zen/zen.globals.js                        |   2 +
 33 files changed, 1393 insertions(+), 681 deletions(-)
 create mode 100644 src/browser/base/content/browser-pageActions-js.patch
 create mode 100644 src/browser/base/content/zen-panels/site-data.inc
 create mode 100644 src/zen/urlbar/ZenSiteDataPanel.sys.mjs

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 708bc05d9..77f8a014b 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -49,6 +49,9 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods =
     .label = Mods
 
+zen-toggle-compact-mode-button =
+    .tooltiptext = Toggle Compact Mode
+
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
@@ -64,3 +67,24 @@ zen-icons-picker-svg =
   .label = Icons
 
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+
+zen-generic-manage = Manage
+zen-generic-more = More
+
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension =
+    .label = Extension
+zen-site-data-security-info-secure =
+    .label = Secure
+zen-site-data-security-info-not-secure =
+    .label = Not Secure
+
+zen-site-data-manage-addons =
+    .label = Manage Extensions
+zen-site-data-get-addons =
+    .label = Add Extensions
+zen-site-data-site-settings =
+    .label = All Site Settings
\ No newline at end of file
diff --git a/locales/en-US/browser/browser/zen-vertical-tabs.ftl b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
index 63fd3ef6d..3b4975bb6 100644
--- a/locales/en-US/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
@@ -3,20 +3,9 @@ zen-toolbar-context-tabs-right =
     .label = Tabs on the right
     .accesskey = R
 
-zen-toolbar-context-compact-mode =
-    .label = Compact mode
-    .accesskey = C
-
 zen-toolbar-context-compact-mode-enable =
     .label = Enable compact mode
     .accesskey = D
-zen-toolbar-context-compact-mode-just-tabs =
-    .label = Hide sidebar
-zen-toolbar-context-compact-mode-just-toolbar =
-    .label = Hide toolbar
-zen-toolbar-context-compact-mode-hide-both =
-    .label = Hide both
-    .accesskey = H
 zen-toolbar-context-new-folder =
     .label = New Folder
     .accesskey = N
diff --git a/prefs/compact-mode.yaml b/prefs/compact-mode.yaml
index f48e2d8cd..8e8003411 100644
--- a/prefs/compact-mode.yaml
+++ b/prefs/compact-mode.yaml
@@ -2,12 +2,6 @@
 # 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/.
 
-- name: zen.view.compact.hide-tabbar
-  value: true
-
-- name: zen.view.compact.hide-toolbar
-  value: false
-
 - name: zen.view.compact.toolbar-flash-popup
   value: false
 
diff --git a/prefs/folders.yaml b/prefs/folders.yaml
index b1e98dcf5..7a8edc5ca 100644
--- a/prefs/folders.yaml
+++ b/prefs/folders.yaml
@@ -6,7 +6,7 @@
   value: true
 
 - name: zen.folders.search.hover-delay
-  value: 1000 # ms
+  value: 900 # ms
 
 - name: zen.folders.max-subfolders
   value: 5
diff --git a/prefs/zen-urlbar.yaml b/prefs/zen-urlbar.yaml
index b9b0533d4..97be59be9 100644
--- a/prefs/zen-urlbar.yaml
+++ b/prefs/zen-urlbar.yaml
@@ -8,6 +8,9 @@
 - name: zen.urlbar.show-protections-icon
   value: false
 
+- name: zen.urlbar.show-contextual-id
+  value: false
+
 - name: zen.urlbar.behavior
   value: floating-on-type
 
diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch
index 318539af9..71135dc45 100644
--- a/src/browser/base/content/browser-addons-js.patch
+++ b/src/browser/base/content/browser-addons-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index d7542a38a0242dd9c9c6390171d59992d75a0c19..d20e5a9fa42c88c7ba28fac1ef13dd693f1f1135 100644
+index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b543b413441 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
 @@ -1064,7 +1064,7 @@ var gXPInstallObserver = {
@@ -20,7 +20,38 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..d20e5a9fa42c88c7ba28fac1ef13dd69
        },
      };
  
-@@ -2608,7 +2608,7 @@ var gUnifiedExtensions = {
+@@ -2205,7 +2205,7 @@ var gUnifiedExtensions = {
+   // If the new ID is not added in NOTIFICATION_IDS, consider handling the case
+   // in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file.
+   getPopupAnchorID(aBrowser, aWindow) {
+-    const anchorID = "unified-extensions-button";
++    const anchorID = "zen-site-data-icon-button";
+     const attr = anchorID + "popupnotificationanchor";
+ 
+     if (!aBrowser[attr]) {
+@@ -2216,7 +2216,7 @@ var gUnifiedExtensions = {
+         anchorID
+         // Anchor on the toolbar icon to position the popup right below the
+         // button.
+-      ).firstElementChild;
++      );
+     }
+ 
+     return anchorID;
+@@ -2509,11 +2509,7 @@ var gUnifiedExtensions = {
+     // Lazy load the unified-extensions-panel panel the first time we need to
+     // display it.
+     if (!this._panel) {
+-      let template = document.getElementById(
+-        "unified-extensions-panel-template"
+-      );
+-      template.replaceWith(template.content);
+-      this._panel = document.getElementById("unified-extensions-panel");
++      this._panel = document.getElementById("zen-unified-site-data-panel");
+       let customizationArea = this._panel.querySelector(
+         "#unified-extensions-area"
+       );
+@@ -2608,7 +2604,7 @@ var gUnifiedExtensions = {
          this.recordButtonTelemetry(reason || "extensions_panel_showing");
          this.ensureButtonShownBeforeAttachingPanel(panel);
          PanelMultiView.openPopup(panel, this._button, {
@@ -29,7 +60,7 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..d20e5a9fa42c88c7ba28fac1ef13dd69
            triggerEvent: aEvent,
          });
        }
-@@ -2795,18 +2795,20 @@ var gUnifiedExtensions = {
+@@ -2795,18 +2791,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  
diff --git a/src/browser/base/content/browser-pageActions-js.patch b/src/browser/base/content/browser-pageActions-js.patch
new file mode 100644
index 000000000..197789f45
--- /dev/null
+++ b/src/browser/base/content/browser-pageActions-js.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js
+index 00da33bc11189db17b6a2e656acb3a778531197c..9571155baccad9a886cbe9c7bf0bd76a135331c4 100644
+--- a/browser/base/content/browser-pageActions.js
++++ b/browser/base/content/browser-pageActions.js
+@@ -451,6 +451,7 @@ var BrowserPageActions = {
+       ),
+       document.getElementById(this.mainButtonNode.id),
+       document.getElementById("identity-icon"),
++      document.getElementById("zen-site-data-icon-button"),
+     ];
+     for (let node of potentialAnchorNodes) {
+       if (node && !node.hidden) {
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index e775bcd15..167525ff8 100644
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 413bad2a62058a1c434d6a44e927e44eb397289d..b621c586e679bb8686fe9a5e6743512e71604425 100644
+index 413bad2a62058a1c434d6a44e927e44eb397289d..472eab5d3bca2bc665920707a71105167cbe75ec 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -8,7 +8,7 @@
@@ -11,6 +11,24 @@ index 413bad2a62058a1c434d6a44e927e44eb397289d..b621c586e679bb8686fe9a5e6743512e
      const widgetOverflow = document.getElementById("widget-overflow");
  
      function onPopupShowing(event) {
+@@ -110,7 +110,7 @@ document.addEventListener(
+         #pageActionButton,
+         #downloads-button,
+         #fxa-toolbar-menu-button,
+-        #unified-extensions-button,
++        #zen-site-data-icon-button,
+         #library-button
+         `);
+       if (!element) {
+@@ -138,7 +138,7 @@ document.addEventListener(
+           gSync.toggleAccountPanel(element, event);
+           break;
+ 
+-        case "unified-extensions-button":
++        case "zen-site-data-icon-button":
+           gUnifiedExtensions.togglePanel(event);
+           break;
+ 
 @@ -187,6 +187,7 @@ document.addEventListener(
          #reload-button ,
          #urlbar-go-button,
@@ -27,3 +45,21 @@ index 413bad2a62058a1c434d6a44e927e44eb397289d..b621c586e679bb8686fe9a5e6743512e
            gBrowser.handleNewTabMiddleClick(element, event);
            break;
  
+@@ -317,7 +319,7 @@ document.addEventListener(
+         #pageActionButton,
+         #downloads-button,
+         #fxa-toolbar-menu-button,
+-        #unified-extensions-button,
++        #zen-site-data-icon-button,
+         #library-button
+       `);
+       if (!element) {
+@@ -396,7 +398,7 @@ document.addEventListener(
+           gSync.toggleAccountPanel(element, event);
+           break;
+ 
+-        case "unified-extensions-button":
++        case "zen-site-data-icon-button":
+           gUnifiedExtensions.togglePanel(event);
+           break;
+ 
diff --git a/src/browser/base/content/zen-commands.inc.xhtml b/src/browser/base/content/zen-commands.inc.xhtml
index aad8b0c74..25db87158 100644
--- a/src/browser/base/content/zen-commands.inc.xhtml
+++ b/src/browser/base/content/zen-commands.inc.xhtml
@@ -5,10 +5,7 @@
 <commandset id="zenCommandSet">
   <command id="cmd_zenCompactModeToggle" />
   <command id="cmd_zenCompactModeShowSidebar" />
-  <command id="cmd_zenCompactModeShowToolbar" />
-  <command id="cmd_zenCompactModeHideSidebar" />
-  <command id="cmd_zenCompactModeHideToolbar" />
-  <command id="cmd_zenCompactModeHideBoth" />
+  <command id="cmd_toggleCompactModeIgnoreHover" />
 
   <command id="cmd_zenWorkspaceForward" />
   <command id="cmd_zenWorkspaceBackward" />
diff --git a/src/browser/base/content/zen-panels/popups.inc b/src/browser/base/content/zen-panels/popups.inc
index 955609aa4..cdada5655 100644
--- a/src/browser/base/content/zen-panels/popups.inc
+++ b/src/browser/base/content/zen-panels/popups.inc
@@ -49,3 +49,12 @@
   <menuitem id="context_zenFolderUnpack" data-l10n-id="zen-folders-panel-unpack-folder"/>
   <menuitem id="context_zenFolderDelete" data-l10n-id="zen-folders-panel-delete-folder"/>
 </menupopup>
+
+<menupopup id="zenSiteDataActions">
+  <menuitem id="context_zenClearSiteData" data-l10n-id="identity-clear-site-data"/>
+  <menuseparator />
+  <menuitem command="Tools:Addons" data-l10n-id="zen-site-data-manage-addons"/>
+  <menuitem id="context_zenOpenGetAddons" data-l10n-id="zen-site-data-get-addons"/>
+  <menuseparator />
+  <menuitem id="context_zenOpenSiteSettings" data-l10n-id="zen-site-data-site-settings"/>
+</menupopup>
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
new file mode 100644
index 000000000..e5a774b88
--- /dev/null
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -0,0 +1,87 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+<panel id="zen-unified-site-data-panel"
+        role="group"
+        type="arrow"
+        noautofocus="true"
+        position="bottomright topright">
+  <panelmultiview mainViewId="unified-extensions-view">
+# We'll keep the view with this name/id in order to prevent
+# any sort of future issues we may have if firefox decides
+# to change the functionality of this view
+    <panelview id="unified-extensions-view"
+                class="cui-widget-panelview"
+                mainview-with-header="true">
+      <hbox id="zen-site-data-header">
+        <toolbarbutton id="zen-site-data-header-share"
+                        data-l10n-id="zen-site-data-share"
+                        flex="1"
+                        closemenu="none" />
+        <toolbarbutton id="zen-site-data-header-reader-mode"
+                        command="View:ReaderView"
+                        flex="1" />
+        <toolbarbutton id="zen-site-data-header-screenshot"
+                        command="Browser:Screenshot"
+                        flex="1" />
+        <toolbarbutton id="zen-site-data-header-bookmark"
+                        command="Browser:AddBookmarkAs"
+                        flex="1" />
+      </hbox>
+      <vbox class="zen-site-data-section">
+        <hbox class="zen-site-data-section-header">
+          <label data-l10n-id="unified-extensions-header-title" flex="1" />
+          <label data-l10n-id="zen-generic-manage" id="zen-site-data-manage-addons" />
+        </hbox>
+        <hbox class="panel-subview-body" context="unified-extensions-context-menu" id="zen-site-data-addons">
+          <html:div id="unified-extensions-messages-container">
+            <!-- messages will be inserted here -->
+          </html:div>
+
+          <vbox id="overflowed-extensions-list">
+            <!-- overflowed extension buttons from the nav-bar will go here -->
+          </vbox>
+
+          <vbox id="unified-extensions-area">
+            <!-- default area for extension browser action buttons -->
+          </vbox>
+
+          <vbox class="unified-extensions-list">
+            <!-- active visible extensions go here -->
+          </vbox>
+
+          <vbox id="zen-site-data-new-addon-button-container">
+            <toolbarbutton id="zen-site-data-new-addon-button"
+                  class="subviewbutton toolbarbutton-1" />
+          </vbox>
+        </hbox>
+
+# Keep this button on the DOM even though we hide it for ever,
+# again, to keep firefox happy if they decide to change functionality
+# for this specific button / id
+        <toolbarbutton id="unified-extensions-manage-extensions"
+                        class="subviewbutton panel-subview-footer-button unified-extensions-manage-extensions"
+                        data-l10n-id="unified-extensions-manage-extensions" 
+                        hidden="true" />
+      </vbox>
+      <vbox class="zen-site-data-section">
+        <hbox class="zen-site-data-section-header">
+          <label data-l10n-id="zen-site-data-settings" flex="1" />
+          <label data-l10n-id="zen-generic-more" id="zen-site-data-settings-more" />
+        </hbox>
+        <vbox id="zen-site-data-settings-list">
+          <!-- settings will be inserted here -->
+        </vbox>
+      </vbox>
+      <hbox id="zen-site-data-footer">
+        <toolbarbutton id="zen-site-data-security-info" 
+                       class="subviewbutton zen-interactive-button" />
+        <toolbarbutton id="zen-site-data-actions"
+                       class="subviewbutton zen-interactive-button"
+                       closemenu="none"
+                       context="zenSiteDataActions" />
+      </hbox>
+    </panelview>
+  </panelmultiview>
+</panel>
\ No newline at end of file
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index 3a812435a..e58a85c4c 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -5,5 +5,6 @@
 #include zen-panels/gradient-generator.inc
 #include zen-panels/emojis-picker.inc
 #include zen-panels/folders-search.inc
+#include zen-panels/site-data.inc
 
 #include zen-panels/popups.inc
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index 396dbf5a9..4635de61c 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 4f62449d670701c77c681ae36e00bae8bf2f636c..132c77e396cb259181ed13ca8ff784e0ade05e3b 100644
+index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4d74ede4e 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -10,6 +10,15 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..132c77e396cb259181ed13ca8ff784e0
    HomePage: "resource:///modules/HomePage.sys.mjs",
    PanelMultiView:
      "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs",
+@@ -323,7 +324,7 @@ var CustomizableUIInternal = {
+       {
+         type: CustomizableUI.TYPE_PANEL,
+         defaultPlacements: [],
+-        anchor: "unified-extensions-button",
++        anchor: "zen-site-data-icon-button",
+       },
+       false
+     );
 @@ -333,19 +334,14 @@ var CustomizableUIInternal = {
        "back-button",
        "forward-button",
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index a93ba5b46..b37ba5dcb 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -648,8 +648,6 @@ var gZenLooksAndFeel = {
         Services.prefs.removeObserver(pref, this);
       }
     });
-    this.setCompactModeStyle();
-
     this.applySidebarLayout();
   },
 
@@ -696,41 +694,6 @@ var gZenLooksAndFeel = {
       });
     }
   },
-
-  setCompactModeStyle() {
-    const chooser = document.getElementById('zen-compact-mode-styles-form');
-    const radios = [...chooser.querySelectorAll('input')];
-
-    let value = '';
-    if (
-      Services.prefs.getBoolPref('zen.view.compact.hide-tabbar', false) &&
-      Services.prefs.getBoolPref('zen.view.compact.hide-toolbar', false)
-    ) {
-      value = 'both';
-    } else {
-      value = Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ? 'left' : 'top';
-    }
-    chooser.querySelector(`[value='${value}']`).checked = true;
-    for (let radio of radios) {
-      radio.addEventListener('change', (e) => {
-        let value = e.target.value;
-        switch (value) {
-          case 'left':
-            Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
-            Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', false);
-            break;
-          case 'top':
-            Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', false);
-            Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
-            break;
-          default:
-            Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
-            Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
-            break;
-        }
-      });
-    }
-  },
 };
 
 /* eslint-disable no-unused-vars */
@@ -1075,11 +1038,6 @@ var gZenCKSSettings = {
 };
 
 Preferences.addAll([
-  {
-    id: 'zen.view.compact.hide-toolbar',
-    type: 'bool',
-    default: false,
-  },
   {
     id: 'zen.view.compact.toolbar-flash-popup',
     type: 'bool',
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 6af7b0a5c..259fff79e 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -56,43 +56,6 @@
       <label><html:h2 data-l10n-id="zen-look-and-feel-compact-view-header"/></label>
       <description class="description-deemphasized" data-l10n-id="zen-look-and-feel-compact-view-description" />
 
-        <html:div id="ZenCompactModeStyle">
-            <form xmlns="http://www.w3.org/1999/xhtml" autocomplete="off" id="zen-compact-mode-styles-form">
-                  <label class="web-appearance-choice">
-                        <div class="web-appearance-choice-image-container">
-                            <div class="zen-compact-mode-styles-browser-wrapper" left="">
-                                <div></div>
-                            </div>
-                        </div>
-                        <div class="web-appearance-choice-footer">
-                        <input type="radio" name="web-appearance" value="left" data-l10n-id="preferences-web-appearance-choice-input-auto"
-                        /><span data-l10n-id="zen-compact-mode-styles-left" />
-                  </div>
-                  </label>
-                        <label class="web-appearance-choice">
-                        <div class="web-appearance-choice-image-container">
-                            <div class="zen-compact-mode-styles-browser-wrapper" top="">
-                                <div></div>
-                            </div>
-                        </div>
-                        <div class="web-appearance-choice-footer">
-                        <input type="radio" name="web-appearance" value="top" data-l10n-id="preferences-web-appearance-choice-input-light"
-                        /><span data-l10n-id="zen-compact-mode-styles-top" />
-                  </div>
-                  </label>
-                        <label class="web-appearance-choice">
-                        <div class="web-appearance-choice-image-container">
-                            <div class="zen-compact-mode-styles-browser-wrapper" both="">
-                                <div></div>
-                            </div>
-                        </div>
-                        <div class="web-appearance-choice-footer">
-                        <input type="radio" name="web-appearance" value="both" data-l10n-id="preferences-web-appearance-choice-input-dark"
-                        /><span data-l10n-id="zen-compact-mode-styles-both" />
-                  </div>
-                  </label>
-            </form>
-      </html:div>
       <vbox class="indent">
             <checkbox id="zenLooksAndFeelEnableToolbarFlashPopup"
                       data-l10n-id="zen-look-and-feel-compact-toolbar-flash-popup"
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index f5274d2a9..622ff2781 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -156,38 +156,6 @@ groupbox h2 {
   margin-bottom: 15px;
 }
 
-#zen-compact-mode-styles-form {
-  display: flex;
-  justify-content: space-between;
-  gap: var(--space-large);
-  margin-top: 5px;
-
-  & .web-appearance-choice-image-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    padding: 20px 0;
-
-    background: color-mix(in srgb, var(--zen-colors-tertiary) 50%, transparent 50%);
-  }
-}
-
-@media -moz-pref('zen.view.use-single-toolbar') {
-  #zen-compact-mode-styles-form {
-    display: none;
-  }
-}
-
-#zen-expand-tabbar-strat {
-  display: flex;
-  flex-direction: column;
-}
-
-#zen-expand-tabbar-strat > hbox {
-  margin-top: 10px;
-}
-
 #category-zen-looks > .category-icon {
   list-style-image: url('chrome://browser/skin/customize.svg');
 }
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index fec5a4d24..8dff5e399 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -54,7 +54,8 @@
 }
 
 #sidebar-button:-moz-locale-dir(ltr):not([positionend]),
-#sidebar-button:-moz-locale-dir(rtl)[positionend] {
+#sidebar-button:-moz-locale-dir(rtl)[positionend],
+#zen-toggle-compact-mode {
   list-style-image: url('chrome://browser/skin/sidebars.svg') !important;
 }
 
@@ -74,7 +75,8 @@
 }
 
 #appMenu-zoom-controls,
-#PanelUI-zen-gradient-generator-color-add {
+#PanelUI-zen-gradient-generator-color-add,
+#zen-site-data-new-addon-button {
   list-style-image: url('plus.svg') !important;
 }
 
@@ -213,7 +215,8 @@
 .search-setting-button > .button-box > .button-icon,
 #appMenu-settings-button,
 #PanelUI-zen-profiles-managePrfs,
-.unified-extensions-item-open-menu.subviewbutton {
+.unified-extensions-item-open-menu.subviewbutton,
+.zen-site-data-permission-icon {
   list-style-image: url('settings.svg') !important;
 }
 
@@ -263,6 +266,7 @@
 }
 
 #bookmarks-menu-button,
+#zen-site-data-header-bookmark,
 #appMenu-bookmarks-button,
 #sidebar-switcher-bookmarks,
 #appMenu-library-bookmarks-button,
@@ -407,7 +411,8 @@
   list-style-image: url('customize.svg') !important;
 }
 
-#zen-copy-current-url-button {
+#zen-copy-current-url-button,
+#zen-site-data-header-share {
   list-style-image: url('share.svg');
 }
 
@@ -466,8 +471,20 @@
 }
 
 /* permissions */
-#permissions-granted-icon {
-  list-style-image: url('permissions.svg') !important;
+#identity-permission-box,
+#identity-box:not([pageproxystate='invalid']) #identity-icon-box,
+#identity-box[pageproxystate='invalid'] #zen-site-data-icon-button {
+  display: none !important;
+}
+
+#zen-site-data-icon-button {
+  padding: 0 6px;
+
+  & image {
+    list-style-image: url('permissions.svg');
+    -moz-context-properties: fill, fill-opacity;
+    pointer-events: none;
+  }
 }
 
 .geo-icon {
@@ -495,7 +512,8 @@
   list-style-image: url('desktop-notification-blocked.svg') !important;
 }
 
-.camera-icon {
+.camera-icon,
+#zen-site-data-header-screenshot {
   list-style-image: url('camera.svg') !important;
 }
 
@@ -558,7 +576,8 @@
   list-style-image: url('midi.svg') !important;
 }
 
-.install-icon {
+.install-icon,
+.zen-permission-extension-icon {
   list-style-image: url('extension.svg') !important;
 }
 
@@ -598,7 +617,8 @@
   background-image: url('stop-to-reload.svg') !important;
 }
 
-#reader-mode-button > .urlbar-icon {
+#reader-mode-button > .urlbar-icon,
+#zen-site-data-header-reader-mode {
   list-style-image: url('reader-mode.svg') !important;
 }
 
@@ -811,3 +831,57 @@
   -moz-context-properties: fill;
   fill: currentColor;
 }
+
+#zen-site-data-security-info {
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  appearance: none;
+  border-radius: 4px;
+  padding: 5px;
+
+  &[identity='secure'] {
+    list-style-image: url('security.svg');
+  }
+
+  &[identity='not-secure'] {
+    list-style-image: url('security-broken.svg');
+  }
+
+  &[identity='extension'] {
+    list-style-image: url('extension.svg');
+  }
+
+  &:not([identity='secure']) * {
+    color: light-dark(var(--color-red-70), var(--color-red-30));
+  }
+
+  & .toolbarbutton-text {
+    padding-inline-start: 4px !important;
+  }
+
+  & .toolbarbutton-icon {
+    width: 16px;
+  }
+
+  & > * {
+    opacity: 0.8;
+  }
+}
+
+#zen-site-data-actions {
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  appearance: none;
+  width: 26px;
+  height: 26px;
+  border-radius: 99px;
+  margin-left: auto !important;
+  list-style-image: url('menu.svg');
+  justify-content: center;
+  align-items: center;
+  padding: 0;
+
+  & label {
+    display: none;
+  }
+}
diff --git a/src/browser/themes/shared/zen-icons/lin/security-broken.svg b/src/browser/themes/shared/zen-icons/lin/security-broken.svg
index 06097d2ea..86396585e 100644
--- a/src/browser/themes/shared/zen-icons/lin/security-broken.svg
+++ b/src/browser/themes/shared/zen-icons/lin/security-broken.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10" data-color="color-2"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="context-fill" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index 04304dec0..329eb2e8f 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -67,6 +67,10 @@ export var ZenCustomizableUI = new (class {
         addon-webext-overflowtarget="overflowed-extensions-list"
         mode="icons">
         <hbox id="zen-sidebar-top-buttons-customization-target" class="customization-target" flex="1">
+          <toolbarbutton id="zen-toggle-compact-mode"
+            class="toolbarbutton-1"
+            command="cmd_toggleCompactModeIgnoreHover"
+            data-l10n-id="zen-toggle-compact-mode-button" />
           <html:div id="zen-sidebar-top-buttons-separator" skipintoolbarset="true" overflows="false"></html:div>
         </hbox>
       </toolbar>
@@ -106,12 +110,20 @@ export var ZenCustomizableUI = new (class {
 
   _initCreateNewButton(window) {
     const button = window.document.getElementById('zen-create-new-button');
-    button.addEventListener('command', () => {
+    button.addEventListener('command', (event) => {
       if (button.hasAttribute('open')) {
         return;
       }
       const popup = window.document.getElementById('zenCreateNewPopup');
-      popup.openPopup(button, 'before_start');
+      popup.openPopup(
+        button,
+        'before_start',
+        0,
+        0,
+        true /* isContextMenu */,
+        false /* attributesOverride */,
+        event
+      );
     });
   }
 
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index c98f8fdca..a23c0cf0a 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -1,6 +1,11 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // 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/.
+
+ChromeUtils.defineESModuleGetters(this, {
+  nsZenSiteDataPanel: 'resource:///modules/ZenSiteDataPanel.sys.mjs',
+});
+
 var gZenUIManager = {
   _popupTrackingElements: [],
   _hoverPausedForExpand: false,
@@ -14,19 +19,6 @@ var gZenUIManager = {
   init() {
     document.addEventListener('popupshowing', this.onPopupShowing.bind(this));
     document.addEventListener('popuphidden', this.onPopupHidden.bind(this));
-    XPCOMUtils.defineLazyPreferenceGetter(
-      this,
-      'contentElementSeparation',
-      'zen.theme.content-element-separation',
-      0
-    );
-    XPCOMUtils.defineLazyPreferenceGetter(this, 'urlbarWaitToClear', 'zen.urlbar.wait-to-clear', 0);
-    XPCOMUtils.defineLazyPreferenceGetter(
-      this,
-      'urlbarShowDomainOnly',
-      'zen.urlbar.show-domain-only-in-sidebar',
-      true
-    );
 
     document.addEventListener('mousedown', this.handleMouseDown.bind(this), true);
 
@@ -44,6 +36,8 @@ var gZenUIManager = {
       return document.getElementById('zen-toast-container');
     });
 
+    window.gZenSiteDataPanel = new nsZenSiteDataPanel(window);
+
     gURLBar._zenTrimURL = this.urlbarTrim.bind(this);
 
     new ResizeObserver(
@@ -596,6 +590,26 @@ var gZenUIManager = {
   },
 };
 
+XPCOMUtils.defineLazyPreferenceGetter(
+  gZenUIManager,
+  'contentElementSeparation',
+  'zen.theme.content-element-separation',
+  0
+);
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  gZenUIManager,
+  'urlbarWaitToClear',
+  'zen.urlbar.wait-to-clear',
+  0
+);
+XPCOMUtils.defineLazyPreferenceGetter(
+  gZenUIManager,
+  'urlbarShowDomainOnly',
+  'zen.urlbar.show-domain-only-in-sidebar',
+  true
+);
+
 var gZenVerticalTabsManager = {
   init() {
     this._multiWindowFeature = new nsZenMultiWindowFeature();
@@ -1034,6 +1048,11 @@ var gZenVerticalTabsManager = {
       ) {
         topButtons.prepend(windowButtons);
       }
+
+      if (!isSingleToolbar && isCompactMode) {
+        navBar.prepend(topButtons);
+      }
+
       // Case: single toolbar, compact mode, right side and windows styled buttons
       if (isSingleToolbar && isCompactMode && isRightSide && this.isWindowsStyledButtons) {
         topButtons.prepend(windowButtons);
@@ -1072,7 +1091,6 @@ var gZenVerticalTabsManager = {
         appContentNavbarContaienr.append(windowButtons);
       }
 
-      gZenCompactModeManager.updateCompactModeContext(isSingleToolbar);
       this.recalculateURLBarHeight();
 
       // Always move the splitter next to the sidebar
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index 1407dbe83..62045e7b0 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -17,7 +17,13 @@
       }
 
       & browser[type='content'] {
-        background: light-dark(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
+        &:not([transparent='true']) {
+          background: light-dark(rgb(255, 255, 255), rgb(32, 32, 32));
+        }
+
+        &[transparent='true'] {
+          background: light-dark(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
+        }
       }
 
       @media not -moz-pref('layout.css.prefers-color-scheme.content-override', 2) {
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 377688fc0..5b245f5f9 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -120,6 +120,21 @@
       border-radius: 10px !important;
     }
   }
+
+  .identity-box-button {
+    opacity: 0;
+    transition:
+      opacity 0.2s,
+      visibility 0.2s;
+    visibility: collapse;
+
+    #navigator-toolbox:hover &,
+    &[open],
+    #identity-box[pageproxystate='invalid'] & {
+      opacity: 1;
+      visibility: visible;
+    }
+  }
 }
 
 .urlbar-page-action,
@@ -220,24 +235,14 @@
 }
 
 :root[zen-single-toolbar='true'] {
-  --urlbar-icon-border-radius: 10px !important;
+  --urlbar-icon-border-radius: 8px !important;
 
-  .urlbar-page-action:not([open]):not(#identity-permission-box),
+  .urlbar-page-action:not([open]):not([showing]):not(#identity-permission-box),
   #tracking-protection-icon-container {
     display: none;
   }
 
-  #identity-box:not([pageproxystate='invalid']):not(.notSecure) #identity-icon-box:not([open]) {
-    margin-inline-start: calc(-8px - 2 * var(--urlbar-icon-padding));
-    transform: translateX(100%);
-    opacity: 0;
-
-    :root:not([supress-primary-adjustment]) & {
-      transition: all 0.1s ease;
-    }
-  }
-
-  #identity-permission-box > *:not(#permissions-granted-icon) {
+  #identity-permission-box > *:not(#zen-site-data-icon-button) {
     visibility: collapse;
   }
 
@@ -245,25 +250,7 @@
     display: none;
   }
 
-  #urlbar[open]
-    :is(#tracking-protection-icon-container, .urlbar-page-action, .identity-box-button):not(
-      [hidden]
-    ):not(#identity-permission-box),
-  #urlbar:hover #identity-icon-box {
-    opacity: 1 !important;
-    margin-inline-start: 0 !important;
-    transform: none !important;
-    display: flex;
-    #urlbar:not(:hover) & {
-      transition: none;
-    }
-  }
-
-  #urlbar:not([open]) #userContext-icons {
-    margin-inline: 0;
-  }
-
-  #urlbar:not([open]) {
+  #urlbar:not([breakout-extend='true']) {
     #identity-box:not([pageproxystate='invalid']) {
       order: 2;
     }
@@ -335,10 +322,6 @@
 }
 
 @container urlbar-container (width < 350px) {
-  #userContext-icons {
-    transition: all 0.1s ease;
-  }
-
   #userContext-label {
     display: none;
   }
@@ -346,12 +329,6 @@
   #userContext-indicator {
     margin-inline-end: 4px;
   }
-
-  #urlbar:hover:not([breakout-extend='true']) #userContext-icons {
-    margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding)) !important;
-    opacity: 0;
-    pointer-events: none;
-  }
 }
 
 #notification-popup-box {
@@ -683,3 +660,18 @@
   font-weight: 600;
   padding: 0px;
 }
+
+/* These are buttons that we dont need to be
+ * displayed anymore, since now zen displays
+ * them into a single, unified button */
+#reader-mode-button,
+#urlbar-go-button,
+#star-button-box {
+  display: none !important;
+}
+
+@media not -moz-pref('zen.urlbar.show-contextual-id') {
+  #userContext-icons {
+    display: none !important;
+  }
+}
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index 5eceee4eb..31058262f 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -31,7 +31,6 @@
   --uc-autocomplete-panel-separator-margin-vertical: 4px;
 
   --uc-permission-itemcontainer-padding-block: 8px;
-  --uc-permission-item-margin-block: 4px;
   --uc-permission-item-padding-inline: 16px;
   --zen-panel-separator-width: 1px;
 }
@@ -228,12 +227,8 @@ panel {
 
 .permission-popup-permission-item,
 #permission-popup-storage-access-permission-list-header {
-  margin-block: var(--uc-permission-item-margin-block);
-}
-
-.permission-popup-permission-label,
-.permission-popup-permission-header-label {
-  margin-inline-start: var(--uc-arrowpanel-menuicon-margin-inline);
+  padding-block: 4px;
+  margin-block: 0px;
 }
 
 #editBookmarkPanel > #editBookmarkHeaderSeparator,
@@ -241,12 +236,6 @@ panel {
   margin-inline: 0;
 }
 
-#identity-popup-mainView > toolbarseparator:first-child,
-#unified-extensions-view > toolbarseparator:first-child {
-  display: none;
-  opacity: 0;
-}
-
 menupopup,
 panel {
   box-shadow: none;
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 9e6ccd661..9e893f546 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -190,6 +190,21 @@ body > #confetti {
   }
 }
 
+.zen-interactive-button {
+  background: color-mix(in srgb, currentColor 6%, transparent) !important;
+  transition:
+    background-color 0.12s ease-in-out,
+    transform 0.12s ease-in-out;
+
+  &:hover {
+    background-color: color-mix(in srgb, currentColor 10%, transparent) !important;
+  }
+
+  &:active:hover {
+    transform: scale(0.95);
+  }
+}
+
 /** Update animation */
 
 #zen-update-animation {
@@ -262,3 +277,264 @@ body > #confetti {
 #customization-container {
   --toolbar-bgcolor: var(--zen-dialog-background);
 }
+
+/* Site Data popup */
+
+#zen-unified-site-data-panel {
+  --panel-padding: 0px;
+  --panel-width: 228px;
+  --menu-panel-width-wide: calc(var(--panel-width) - var(--panel-padding) * 2);
+  --uei-icon-size: 14px;
+  --arrowpanel-menuitem-border-radius: 10px;
+}
+
+#unified-extensions-messages-container {
+  display: none;
+}
+
+#zen-site-data-addons {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  overflow: visible;
+
+  .unified-extensions-item-name,
+  .unified-extensions-item-message,
+  .unified-extensions-item-message-hover,
+  .unified-extensions-item-message-hover-menu-button,
+  .unified-extensions-item-menu-button {
+    display: none;
+  }
+
+  #overflowed-extensions-list,
+  #unified-extensions-area,
+  .unified-extensions-list,
+  #zen-site-data-new-addon-button-container {
+    display: contents;
+
+    &:empty {
+      display: none;
+    }
+
+    & > * {
+      background-color: color-mix(in srgb, currentcolor 6%, transparent);
+      width: 46px;
+      height: 34px;
+      margin: 0;
+      justify-content: center;
+      align-items: center;
+      border-radius: 6px;
+      transition:
+        background-color 0.1s ease-in-out,
+        transform 0.12s ease-in-out;
+
+      & toolbarbutton {
+        background: transparent !important;
+      }
+
+      & .toolbarbutton-badge-stack {
+        margin: 0;
+      }
+
+      &:hover {
+        transform: scale(1.05);
+      }
+
+      &:active:hover {
+        transform: scale(0.95);
+        background-color: color-mix(in srgb, currentcolor 10%, transparent);
+      }
+    }
+  }
+}
+
+.zen-site-data-section {
+  gap: 6px;
+  padding: 8px;
+}
+
+.zen-site-data-section-header {
+  font-weight: 500;
+  font-size: small;
+
+  & label {
+    margin: 0;
+  }
+
+  & > label:nth-child(2) {
+    font-weight: 400;
+    font-size: smaller;
+    transition: opacity 0.15s ease-in-out;
+    opacity: 0;
+    padding: 0px 4px;
+
+    .zen-site-data-section:hover & {
+      opacity: 0.8;
+    }
+  }
+}
+
+#zen-site-data-new-addon-button .toolbarbutton-text {
+  display: none;
+}
+
+.permission-popup-permission-item {
+  gap: 8px;
+  overflow: hidden;
+  align-items: center;
+}
+
+.permission-popup-permission-label {
+  margin: 0px;
+  font-weight: 500;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.permission-popup-permission-icon {
+  fill: var(--button-primary-color);
+  padding: 8px;
+  width: 34px;
+  height: 34px;
+  overflow: visible;
+  position: relative;
+  appearance: none;
+
+  & label {
+    display: none;
+  }
+
+  & image {
+    -moz-context-properties: fill;
+    z-index: 1;
+  }
+
+  &::before {
+    content: '';
+    position: absolute;
+    inset: 1px;
+    border-radius: 99px;
+    width: 32px;
+    height: 32px;
+    background: var(--button-primary-bgcolor);
+    opacity: 0.6;
+    transition:
+      transform 0.12s ease-in-out,
+      opacity 0.12s ease-in-out;
+  }
+
+  .permission-popup-permission-item:hover &::before {
+    transform: scale(1.05);
+  }
+
+  .permission-popup-permission-item:active:hover &::before {
+    transform: scale(0.95);
+  }
+
+  .permission-popup-permission-item[state='allow'] &::before {
+    opacity: 1;
+  }
+}
+
+.zen-permission-popup-permission-state-label {
+  opacity: 0.8;
+  font-size: smaller;
+  font-weight: 400;
+  margin: 0;
+}
+
+#identity-box {
+  opacity: 0.6;
+}
+
+#zen-site-data-footer {
+  border-top: 1px solid color-mix(in srgb, currentColor 6%, transparent);
+  padding-top: 8px;
+  margin: 2px 8px 8px 8px;
+
+  & toolbarbutton {
+    margin: 0;
+  }
+}
+
+#unified-extensions-button:not([showing]) {
+  display: none !important;
+}
+
+#zen-site-data-header {
+  gap: 6px;
+  align-items: center;
+  padding: 8px;
+  padding-bottom: 0;
+
+  & toolbarbutton {
+    margin: 0;
+    appearance: none;
+    -moz-context-properties: fill;
+    fill: currentColor;
+    color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
+    padding: 8px 0px;
+    position: relative;
+
+    &[disabled] {
+      opacity: 0.5;
+      pointer-events: none;
+    }
+
+    & .toolbarbutton-text {
+      display: none;
+    }
+
+    & image {
+      width: 18px;
+      pointer-events: none;
+      z-index: 1;
+    }
+
+    &::before {
+      content: '';
+      position: absolute;
+      inset: 1px;
+      background: linear-gradient(
+        to bottom,
+        color-mix(
+          in srgb,
+          light-dark(rgba(255, 255, 255, 1), rgba(0, 0, 0, 0.3)) 15%,
+          transparent 100%
+        ),
+        color-mix(
+          in srgb,
+          light-dark(rgba(255, 255, 255, 0.8), rgba(0, 0, 0, 0.8)) 100%,
+          transparent 100%
+        )
+      );
+      transition: transform 0.12s ease-in-out;
+      box-shadow: 0px 2px 3px 1px rgba(0, 0, 0, 0.1);
+      border-radius: 6px;
+      --base-border-color: light-dark(rgba(0, 0, 0, 0.3), rgba(255, 255, 255, 0.1));
+      border: 1px solid;
+      border-top-color: light-dark(var(--base-border-color), rgba(255, 255, 255, 0.12));
+      border-left-color: light-dark(var(--base-border-color), transparent);
+      border-right-color: light-dark(var(--base-border-color), transparent);
+      border-bottom-color: light-dark(var(--base-border-color), rgba(0, 0, 0, 0.12));
+      will-change: transform;
+    }
+
+    &.active {
+      color: var(--button-primary-color);
+
+      &::before {
+        background: var(--button-primary-bgcolor);
+      }
+    }
+
+    &:hover::before {
+      transform: scale(1.03);
+    }
+
+    &:active:hover::before {
+      transform: scale(0.97);
+    }
+  }
+}
diff --git a/src/zen/common/zen-sets.js b/src/zen/common/zen-sets.js
index 5d8316589..4609d2e76 100644
--- a/src/zen/common/zen-sets.js
+++ b/src/zen/common/zen-sets.js
@@ -17,17 +17,8 @@ document.addEventListener(
           case 'cmd_zenCompactModeShowSidebar':
             gZenCompactModeManager.toggleSidebar();
             break;
-          case 'cmd_zenCompactModeHideSidebar':
-            gZenCompactModeManager.hideSidebar();
-            break;
-          case 'cmd_zenCompactModeHideToolbar':
-            gZenCompactModeManager.hideToolbar();
-            break;
-          case 'cmd_zenCompactModeHideBoth':
-            gZenCompactModeManager.hideBoth();
-            break;
-          case 'cmd_zenCompactModeShowToolbar':
-            gZenCompactModeManager.toggleToolbar();
+          case 'cmd_toggleCompactModeIgnoreHover':
+            gZenCompactModeManager.toggle(true);
             break;
           case 'cmd_zenWorkspaceForward':
             gZenWorkspaces.changeWorkspaceShortcut();
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 0606498ff..619e5e051 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -115,6 +115,7 @@ var gZenCompactModeManager = {
         // We wont do anything with it anyway, so we remove it
         delete this._wasInCompactMode;
       }
+      delete this._ignoreNextHover;
       // We dont want the user to be able to spam the button
       return;
     }
@@ -173,47 +174,12 @@ var gZenCompactModeManager = {
 
   addContextMenu() {
     const fragment = window.MozXULElement.parseXULToFragment(`
-      <menu id="zen-context-menu-compact-mode" data-l10n-id="zen-toolbar-context-compact-mode">
-        <menupopup>
-          <menuitem id="zen-context-menu-compact-mode-toggle" data-l10n-id="zen-toolbar-context-compact-mode-enable" type="checkbox" command="cmd_zenCompactModeToggle"/>
-          <menuseparator/>
-          <menuitem id="zen-context-menu-compact-mode-hide-sidebar" data-l10n-id="zen-toolbar-context-compact-mode-just-tabs" type="radio" command="cmd_zenCompactModeHideSidebar"/>
-          <menuitem id="zen-context-menu-compact-mode-hide-toolbar" data-l10n-id="zen-toolbar-context-compact-mode-just-toolbar" type="radio" command="cmd_zenCompactModeHideToolbar"/>
-          <menuitem id="zen-context-menu-compact-mode-hide-both" data-l10n-id="zen-toolbar-context-compact-mode-hide-both" type="radio" command="cmd_zenCompactModeHideBoth"/>
-        </menupopup>
-      </menu>
+      <menuitem id="zen-context-menu-compact-mode-toggle" data-l10n-id="zen-toolbar-context-compact-mode-enable" type="checkbox" command="cmd_zenCompactModeToggle"/>
     `);
     document.getElementById('viewToolbarsMenuSeparator').before(fragment);
     this.updateContextMenu();
   },
 
-  updateCompactModeContext(isSingleToolbar) {
-    const menuitem = document.getElementById('zen-context-menu-compact-mode-toggle');
-    const menu = document.getElementById('zen-context-menu-compact-mode');
-    if (isSingleToolbar) {
-      menu.setAttribute('hidden', 'true');
-      menu.before(menuitem);
-    } else {
-      menu.removeAttribute('hidden');
-      menu.querySelector('menupopup').prepend(menuitem);
-    }
-  },
-
-  hideSidebar() {
-    Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
-    Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', false);
-  },
-
-  hideToolbar() {
-    Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
-    Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', false);
-  },
-
-  hideBoth() {
-    Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
-    Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
-  },
-
   addEventListener(callback) {
     this._evenListeners.push(callback);
   },
@@ -281,13 +247,6 @@ var gZenCompactModeManager = {
     return sidebarWidth;
   },
 
-  get canHideSidebar() {
-    return (
-      Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
-      gZenVerticalTabsManager._hasSetSingleToolbar
-    );
-  },
-
   animateCompactMode() {
     // Get the splitter width before hiding it (we need to hide it before animating on right)
     document.documentElement.setAttribute('zen-compact-animating', 'true');
@@ -297,7 +256,6 @@ var gZenCompactModeManager = {
         .getElementById('zen-sidebar-splitter')
         .getBoundingClientRect().width;
       const isCompactMode = this.preference;
-      const canHideSidebar = this.canHideSidebar;
       let canAnimate =
         lazyCompactMode.COMPACT_MODE_CAN_ANIMATE_SIDEBAR && !this.isSidebarPotentiallyOpen();
       if (typeof this._wasInCompactMode !== 'undefined') {
@@ -308,6 +266,9 @@ var gZenCompactModeManager = {
       if (canAnimate) {
         this.sidebar.setAttribute('animate', 'true');
       }
+      if (this._ignoreNextHover) {
+        this.sidebar.removeAttribute('zen-has-hover');
+      }
       this.sidebar.style.removeProperty('margin-right');
       this.sidebar.style.removeProperty('margin-left');
       this.sidebar.style.removeProperty('transform');
@@ -325,7 +286,7 @@ var gZenCompactModeManager = {
           resolve();
           return;
         }
-        if (canHideSidebar && isCompactMode) {
+        if (isCompactMode) {
           if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
             sidebarWidth -= 0.5 * splitterWidth;
             if (elementSeparation < splitterWidth) {
@@ -335,20 +296,19 @@ var gZenCompactModeManager = {
           } else {
             sidebarWidth -= elementSeparation;
           }
-          this.sidebar.style.marginRight = '0px';
-          this.sidebar.style.marginLeft = '0px';
+          this.sidebar.removeAttribute('zen-has-hover');
           gZenUIManager.motion
             .animate(
               this.sidebar,
               {
-                marginRight: this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0,
-                marginLeft: this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`,
+                marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
+                marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
               },
               {
                 ease: 'easeIn',
                 type: 'spring',
                 bounce: 0,
-                duration: 0.15,
+                duration: 0.12,
               }
             )
             .then(() => {
@@ -365,6 +325,12 @@ var gZenCompactModeManager = {
                 this._ignoreNextResize = true;
 
                 setTimeout(() => {
+                  if (this._ignoreNextHover) {
+                    setTimeout(() => {
+                      delete this._ignoreNextHover;
+                    });
+                  }
+
                   this.sidebar.style.removeProperty('margin-right');
                   this.sidebar.style.removeProperty('margin-left');
                   this.sidebar.style.removeProperty('transition');
@@ -375,11 +341,12 @@ var gZenCompactModeManager = {
                   titlebar.style.removeProperty('transition');
 
                   gURLBar.textbox.style.removeProperty('visibility');
+
                   resolve();
                 });
               });
             });
-        } else if (canHideSidebar && !isCompactMode) {
+        } else {
           document.getElementById('browser').style.overflow = 'clip';
           if (this.sidebarIsOnRight) {
             this.sidebar.style.marginRight = `-${sidebarWidth}px`;
@@ -399,7 +366,7 @@ var gZenCompactModeManager = {
                 ease: 'easeOut',
                 type: 'spring',
                 bounce: 0,
-                duration: 0.15,
+                duration: 0.12,
               }
             )
             .then(() => {
@@ -415,9 +382,6 @@ var gZenCompactModeManager = {
                 resolve();
               });
             });
-        } else {
-          this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
-          document.documentElement.removeAttribute('zen-compact-animating');
         }
       });
     });
@@ -427,15 +391,6 @@ var gZenCompactModeManager = {
     document
       .getElementById('zen-context-menu-compact-mode-toggle')
       .setAttribute('checked', this.preference);
-
-    const hideTabBar = Services.prefs.getBoolPref('zen.view.compact.hide-tabbar', false);
-    const hideToolbar = Services.prefs.getBoolPref('zen.view.compact.hide-toolbar', false);
-    const hideBoth = hideTabBar && hideToolbar;
-
-    const idName = 'zen-context-menu-compact-mode-hide-';
-    document.getElementById(idName + 'sidebar').setAttribute('checked', !hideBoth && hideTabBar);
-    document.getElementById(idName + 'toolbar').setAttribute('checked', !hideBoth && hideToolbar);
-    document.getElementById(idName + 'both').setAttribute('checked', hideBoth);
   },
 
   _removeOpenStateOnUnifiedExtensions() {
@@ -448,7 +403,9 @@ var gZenCompactModeManager = {
     }
   },
 
-  toggle() {
+  toggle(ignoreHover = false) {
+    // Only ignore the next hover when we are enabling compact mode
+    this._ignoreNextHover = ignoreHover && !this.preference;
     return (this.preference = !this.preference);
   },
 
@@ -551,7 +508,8 @@ var gZenCompactModeManager = {
           window.requestAnimationFrame(() => {
             if (
               document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
-              this._hasHoveredUrlbar
+              this._hasHoveredUrlbar ||
+              this._ignoreNextHover
             ) {
               return;
             }
@@ -596,7 +554,8 @@ var gZenCompactModeManager = {
             event.explicitOriginalTarget.closest('#urlbar[zen-floating-urlbar]') ||
             (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' &&
               gZenVerticalTabsManager._hasSetSingleToolbar) ||
-            this._hasHoveredUrlbar
+            this._hasHoveredUrlbar ||
+            this._ignoreNextHover
           ) {
             return;
           }
@@ -682,11 +641,6 @@ var gZenCompactModeManager = {
     else return bBox.left - error < x && x < bBox.right + error;
   },
 
-  toggleToolbar() {
-    let toolbar = document.getElementById('zen-appcontent-navbar-wrapper');
-    toolbar.toggleAttribute('zen-user-show');
-  },
-
   _clearAllHoverStates() {
     // Clear hover attributes from all hoverable elements
     for (let entry of this.hoverableElements) {
@@ -699,6 +653,9 @@ var gZenCompactModeManager = {
   },
 
   isSidebarPotentiallyOpen() {
+    if (this._ignoreNextHover) {
+      this.sidebar.removeAttribute('zen-has-hover');
+    }
     return (
       this.sidebar.hasAttribute('zen-user-show') ||
       this.sidebar.hasAttribute('zen-has-hover') ||
@@ -713,8 +670,7 @@ var gZenCompactModeManager = {
       !this.isSidebarPotentiallyOpen() &&
       this._canShowBackgroundTabToast &&
       !gZenGlanceManager._animating &&
-      !this._nextTimeWillBeActive &&
-      this.canHideSidebar
+      !this._nextTimeWillBeActive
     ) {
       gZenUIManager.showToast('zen-background-tab-opened-toast', {
         button: {
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index af798fa33..0a2dda72a 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -20,7 +20,7 @@
 
   &::before,
   &::after {
-    outline: 1px solid rgba(255, 255, 255, .15);
+    outline: 1px solid rgba(255, 255, 255, 0.15);
     outline-offset: -1px;
     background-attachment: fixed !important;
     background-size: 100vw 100vh !important;
@@ -29,7 +29,9 @@
   &,
   &::before,
   &::after {
-    border-radius: calc(var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px));
+    border-radius: calc(
+      var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px)
+    );
   }
 }
 
@@ -40,366 +42,272 @@
     visibility: visible;
   }
 
-  @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
-    &:not([zen-compact-animating]) {
-      & #zen-sidebar-splitter {
-        display: none !important;
+  &:not([zen-compact-animating]) {
+    & #zen-sidebar-splitter {
+      display: none !important;
+    }
+
+    #zen-tabbox-wrapper {
+      /* Remove extra 1px of margine we have to add to the tabbox */
+      margin-left: var(--zen-element-separation) !important;
+      margin-right: var(--zen-element-separation) !important;
+    }
+
+    #zen-appcontent-wrapper {
+      & #tabbrowser-tabbox {
+        margin-left: 0 !important;
+      }
+    }
+
+    #zen-sidebar-splitter {
+      display: none !important;
+    }
+
+    #zen-sidebar-top-buttons-customization-target {
+      padding-inline-start: calc(
+        var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)
+      ) !important;
+    }
+
+    &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-wrapper #nav-bar {
+      margin-left: var(--zen-element-separation) !important;
+    }
+
+    &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-wrapper #nav-bar {
+      margin-right: var(--zen-element-separation) !important;
+      margin-left: calc(var(--zen-element-separation) - 3px) !important;
+    }
+
+    #navigator-toolbox {
+      --zen-toolbox-max-width: 74px !important;
+      --zen-compact-float: var(--zen-element-separation);
+      :root[zen-no-padding='true'] & {
+        --zen-compact-float: 10px;
+        --zen-compact-mode-no-padding-radius-fix: 2px;
       }
 
-      #zen-tabbox-wrapper {
-        /* Remove extra 1px of margine we have to add to the tabbox */
-        margin-left: var(--zen-element-separation) !important;
-        margin-right: var(--zen-element-separation) !important;
-      }
+      /* Initial padding for when we are animating */
+      padding: 0 0 0 var(--zen-toolbox-padding) !important;
 
-      #zen-appcontent-wrapper {
-        & #tabbrowser-tabbox {
-          margin-left: 0 !important;
+      &:not([animate='true']) {
+        position: fixed;
+        z-index: 10;
+        transition:
+          left 0.15s ease,
+          right 0.15s ease,
+          visibility 0.15s ease;
+        bottom: var(--zen-compact-float);
+        padding: 0 var(--zen-compact-float) !important;
+
+        :root[zen-single-toolbar='true'] & {
+          /* We add an extra offset since windows users have a border top
+            * in the window in order to compensate how windows renders the
+            * titlebar */
+          top: calc(var(--zen-compact-float) / 2 + var(--zen-sidebar-compact-top-offset, 0px));
+          height: calc(100% - var(--zen-compact-float));
+        }
+
+        :root:not([zen-single-toolbar='true']) & {
+          bottom: calc(var(--zen-compact-float) / 2);
+          height: calc(100% - var(--zen-toolbar-height));
+        }
+
+        & #zen-sidebar-top-buttons {
+          margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
         }
       }
 
-      #zen-sidebar-splitter {
-        display: none !important;
+      &:not([zen-right-side='true']) #nav-bar {
+        margin-left: 0 !important;
+      }
+    }
+
+    &:not([zen-right-side='true']) #navigator-toolbox {
+      left: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
+    }
+
+    &:not([zen-sidebar-expanded='true']) .zen-essentials-container {
+      padding: 0;
+    }
+
+    &[zen-right-side='true'] {
+      & #navigator-toolbox:not([animate='true']) {
+        right: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
       }
 
-      #zen-sidebar-top-buttons-customization-target {
-        padding-inline-start: calc(var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)) !important;
+      & .browserSidebarContainer {
+        margin-left: 0 !important;
+        margin-right: 0 !important;
+      }
+    }
+
+    #navigator-toolbox:not([animate='true']) #titlebar {
+      padding: var(--zen-toolbox-padding) !important;
+      :root:not([zen-sidebar-expanded='true']) & {
+        padding: var(--zen-toolbox-padding) 0 !important;
+        max-width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding) * 2);
+        width: var(--zen-sidebar-width);
+      }
+      position: relative;
+      min-width: var(--zen-toolbox-min-width);
+      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));
       }
 
-      &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-wrapper #nav-bar {
-        margin-left: var(--zen-element-separation) !important;
+      & .zen-toolbar-background {
+        display: flex;
       }
+    }
 
-      &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-wrapper #nav-bar {
-        margin-right: var(--zen-element-separation) !important;
-        margin-left: calc(var(--zen-element-separation) - 3px) !important;
-      }
+    #navigator-toolbox[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
+    #navigator-toolbox[zen-user-show],
+    #navigator-toolbox[zen-has-empty-tab],
+    #navigator-toolbox[flash-popup],
+    #navigator-toolbox[has-popup-menu],
+    #navigator-toolbox[movingtab],
+    &[zen-renaming-tab='true'] #navigator-toolbox,
+    #navigator-toolbox[zen-compact-mode-active] {
+      &:not([animate='true']) {
+        --zen-compact-mode-func: linear(
+          0 0%,
+          0.002748 1%,
+          0.010544 2%,
+          0.022757 3%,
+          0.038804 4%,
+          0.058151 5%,
+          0.080308 6%,
+          0.104828 7.000000000000001%,
+          0.131301 8%,
+          0.159358 9%,
+          0.188662 10%,
+          0.21891 11%,
+          0.249828 12%,
+          0.281172 13%,
+          0.312724 14.000000000000002%,
+          0.344288 15%,
+          0.375693 16%,
+          0.40679 17%,
+          0.437447 18%,
+          0.467549 19%,
+          0.497 20%,
+          0.525718 21%,
+          0.553633 22%,
+          0.580688 23%,
+          0.60684 24%,
+          0.632052 25%,
+          0.656298 26%,
+          0.679562 27%,
+          0.701831 28.000000000000004%,
+          0.723104 28.999999999999996%,
+          0.743381 30%,
+          0.76267 31%,
+          0.780983 32%,
+          0.798335 33%,
+          0.814744 34%,
+          0.830233 35%,
+          0.844826 36%,
+          0.858549 37%,
+          0.87143 38%,
+          0.883498 39%,
+          0.894782 40%,
+          0.905314 41%,
+          0.915125 42%,
+          0.924247 43%,
+          0.93271 44%,
+          0.940547 45%,
+          0.947787 46%,
+          0.954463 47%,
+          0.960603 48%,
+          0.966239 49%,
+          0.971397 50%,
+          0.976106 51%,
+          0.980394 52%,
+          0.984286 53%,
+          0.987808 54%,
+          0.990984 55.00000000000001%,
+          0.993837 56.00000000000001%,
+          0.99639 56.99999999999999%,
+          0.998664 57.99999999999999%,
+          1.000679 59%,
+          1.002456 60%,
+          1.004011 61%,
+          1.005363 62%,
+          1.006528 63%,
+          1.007522 64%,
+          1.008359 65%,
+          1.009054 66%,
+          1.009618 67%,
+          1.010065 68%,
+          1.010405 69%,
+          1.010649 70%,
+          1.010808 71%,
+          1.01089 72%,
+          1.010904 73%,
+          1.010857 74%,
+          1.010757 75%,
+          1.010611 76%,
+          1.010425 77%,
+          1.010205 78%,
+          1.009955 79%,
+          1.009681 80%,
+          1.009387 81%,
+          1.009077 82%,
+          1.008754 83%,
+          1.008422 84%,
+          1.008083 85%,
+          1.00774 86%,
+          1.007396 87%,
+          1.007052 88%,
+          1.00671 89%,
+          1.006372 90%,
+          1.00604 91%,
+          1.005713 92%,
+          1.005394 93%,
+          1.005083 94%,
+          1.004782 95%,
+          1.004489 96%,
+          1.004207 97%,
+          1.003935 98%,
+          1.003674 99%,
+          1.003423 100%
+        );
+        --zen-compact-mode-time: 0.25s;
+        transition:
+          left var(--zen-compact-mode-time) var(--zen-compact-mode-func),
+          right var(--zen-compact-mode-time) var(--zen-compact-mode-func);
 
-      #navigator-toolbox {
-        --zen-toolbox-max-width: 74px !important;
-        --zen-compact-float: var(--zen-element-separation);
-        :root[zen-no-padding='true'] & {
-          --zen-compact-float: 10px;
-          --zen-compact-mode-no-padding-radius-fix: 2px;
-        }
-
-        /* Initial padding for when we are animating */
-        padding: 0 0 0 var(--zen-toolbox-padding) !important;
-
-        &:not([animate='true']) {
-          position: fixed;
-          z-index: 10;
-          transition:
-            left 0.15s ease,
-            right 0.15s ease,
-            visibility 0.15s ease;
-          top: 0;
-          bottom: var(--zen-compact-float);
-          padding: 0 var(--zen-compact-float) !important;
-          :root[zen-single-toolbar='true'] & {
-            /* We add an extra offset since windows users have a border top
-             * in the window in order to compensate how windows renders the
-             * titlebar */ 
-            top: calc(var(--zen-compact-float) / 2 + var(--zen-sidebar-compact-top-offset, 0px));
-            height: calc(100% - var(--zen-compact-float));
+        :root:not([supress-primary-adjustment='true']) & {
+          & #titlebar {
+            transition: none;
+            visibility: visible;
           }
-          :root:not([zen-single-toolbar='true']) & {
-            top: calc(var(--zen-compact-float) / -2);
-            height: calc(100% - var(--zen-toolbar-height));
-            @media -moz-pref('zen.view.compact.hide-toolbar') {
-              height: 100%;
-            }
-          }
-          & #zen-sidebar-top-buttons {
-            margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
-          }
-        }
 
-        &:not([zen-right-side='true']) #nav-bar {
-          margin-left: 0 !important;
-        }
-      }
-
-      &:not([zen-right-side='true']) #navigator-toolbox {
-        left: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
-      }
-
-      /* When we have multiple toolbars and the top-toolbar is NOT being hidden,
-       * we need to adjust the top-padding of the toolbox to account for the
-       * extra toolbar height. */
-      @media not -moz-pref('zen.view.compact.hide-toolbar') {
-        &:not([zen-single-toolbar='true']) {
-          #navigator-toolbox:not([animate='true']) {
-            margin-top: var(--zen-toolbar-height) !important;
-          }
-        }
-      }
-
-      &:not([zen-sidebar-expanded='true']) .zen-essentials-container {
-        padding: 0;
-      }
-
-      &[zen-right-side='true'] {
-        & #navigator-toolbox:not([animate='true']) {
-          right: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
-        }
-
-        & .browserSidebarContainer {
-          margin-left: 0 !important;
-          margin-right: 0 !important;
-        }
-      }
-
-      #navigator-toolbox:not([animate='true']) #titlebar {
-        padding: var(--zen-toolbox-padding) !important;
-        :root:not([zen-sidebar-expanded='true']) & {
-          padding: var(--zen-toolbox-padding) 0 !important;
-          max-width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding) * 2);
-          width: var(--zen-sidebar-width);
-        }
-        position: relative;
-        min-width: var(--zen-toolbox-min-width);
-        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));
-        }
-
-        & .zen-toolbar-background {
-          display: flex;
-        }
-      }
-
-      #navigator-toolbox[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
-      #navigator-toolbox[zen-user-show],
-      #navigator-toolbox[zen-has-empty-tab],
-      #navigator-toolbox[flash-popup],
-      #navigator-toolbox[has-popup-menu],
-      #navigator-toolbox[movingtab],
-      &[zen-renaming-tab='true'] #navigator-toolbox,
-      #navigator-toolbox[zen-compact-mode-active] {
-        &:not([animate='true']) {
-          --zen-compact-mode-func: linear(
-            0 0%,
-            0.002748 1%,
-            0.010544 2%,
-            0.022757 3%,
-            0.038804 4%,
-            0.058151 5%,
-            0.080308 6%,
-            0.104828 7.000000000000001%,
-            0.131301 8%,
-            0.159358 9%,
-            0.188662 10%,
-            0.21891 11%,
-            0.249828 12%,
-            0.281172 13%,
-            0.312724 14.000000000000002%,
-            0.344288 15%,
-            0.375693 16%,
-            0.40679 17%,
-            0.437447 18%,
-            0.467549 19%,
-            0.497 20%,
-            0.525718 21%,
-            0.553633 22%,
-            0.580688 23%,
-            0.60684 24%,
-            0.632052 25%,
-            0.656298 26%,
-            0.679562 27%,
-            0.701831 28.000000000000004%,
-            0.723104 28.999999999999996%,
-            0.743381 30%,
-            0.76267 31%,
-            0.780983 32%,
-            0.798335 33%,
-            0.814744 34%,
-            0.830233 35%,
-            0.844826 36%,
-            0.858549 37%,
-            0.87143 38%,
-            0.883498 39%,
-            0.894782 40%,
-            0.905314 41%,
-            0.915125 42%,
-            0.924247 43%,
-            0.93271 44%,
-            0.940547 45%,
-            0.947787 46%,
-            0.954463 47%,
-            0.960603 48%,
-            0.966239 49%,
-            0.971397 50%,
-            0.976106 51%,
-            0.980394 52%,
-            0.984286 53%,
-            0.987808 54%,
-            0.990984 55.00000000000001%,
-            0.993837 56.00000000000001%,
-            0.99639 56.99999999999999%,
-            0.998664 57.99999999999999%,
-            1.000679 59%,
-            1.002456 60%,
-            1.004011 61%,
-            1.005363 62%,
-            1.006528 63%,
-            1.007522 64%,
-            1.008359 65%,
-            1.009054 66%,
-            1.009618 67%,
-            1.010065 68%,
-            1.010405 69%,
-            1.010649 70%,
-            1.010808 71%,
-            1.01089 72%,
-            1.010904 73%,
-            1.010857 74%,
-            1.010757 75%,
-            1.010611 76%,
-            1.010425 77%,
-            1.010205 78%,
-            1.009955 79%,
-            1.009681 80%,
-            1.009387 81%,
-            1.009077 82%,
-            1.008754 83%,
-            1.008422 84%,
-            1.008083 85%,
-            1.00774 86%,
-            1.007396 87%,
-            1.007052 88%,
-            1.00671 89%,
-            1.006372 90%,
-            1.00604 91%,
-            1.005713 92%,
-            1.005394 93%,
-            1.005083 94%,
-            1.004782 95%,
-            1.004489 96%,
-            1.004207 97%,
-            1.003935 98%,
-            1.003674 99%,
-            1.003423 100%
-          );
-          --zen-compact-mode-time: 0.25s;
-          transition:
-            left var(--zen-compact-mode-time) var(--zen-compact-mode-func),
-            right var(--zen-compact-mode-time) var(--zen-compact-mode-func);
-
-          :root:not([supress-primary-adjustment='true']) & {
-            & #titlebar {
-              transition: none;
-              visibility: visible;
-            }
-
-            left: calc(var(--zen-compact-float) / -2);
-            :root[zen-right-side='true'] & {
-              right: calc(var(--zen-compact-float) / -2);
-              left: auto;
-            }          
+          left: calc(var(--zen-compact-float) / -2);
+          :root[zen-right-side='true'] & {
+            right: calc(var(--zen-compact-float) / -2);
+            left: auto;
           }
         }
       }
     }
   }
 
-  @media -moz-pref('zen.view.compact.hide-toolbar') {
-    &:not([zen-single-toolbar='true']) {
-      & #navigator-toolbox {
-        top: 0;
-      }
-
-      & #navigator-toolbox {
-        --zen-toolbox-top-align: var(--zen-element-separation);
-      }
-
-      & #titlebar,
-      & #zen-appcontent-wrapper {
-        margin-top: var(--zen-element-separation) !important;
-      }
-
-      & #zen-appcontent-wrapper {
-        z-index: 3 !important;
-      }
-
-      & #zen-appcontent-navbar-wrapper {
-        & .zen-toolbar-background {
-          display: flex;
-        }
-        --zen-compact-toolbar-offset: 5px;
-        position: absolute;
-        top: calc(-1 * var(--zen-toolbar-height) + 1px);
-        left: 0;
-        z-index: 20;
-        transition: all 0.15s ease;
-        width: 100%;
-
-        max-height: var(--zen-toolbar-height);
-        overflow: hidden;
-
-        & #urlbar:not([breakout-extend='true']) {
-          opacity: 0 !important;
-        }
-
-        & #zen-appcontent-navbar-container {
-          visibility: hidden;
-
-          box-shadow: var(--zen-big-shadow);
-          border-bottom-left-radius: var(--zen-border-radius);
-          border-bottom-right-radius: var(--zen-border-radius);
-          :root:not([sizemode='maximized']) & {
-            border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
-            border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
-          }
-          transition: all 0.15s ease;
-          width: 100%;
-        }
-      }
-
-      & #zen-appcontent-navbar-wrapper[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
-      & #zen-appcontent-navbar-wrapper[zen-user-show],
-      & #zen-appcontent-navbar-wrapper[has-popup-menu],
-      & #zen-appcontent-navbar-wrapper:has(
-          *:is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(.zen-compact-mode-ignore)
-        ) {
-        & #zen-appcontent-navbar-container {
-          visibility: visible !important;
-        }
-        border-top-width: 0px;
-
-        top: -1px;
-        overflow: initial;
-        max-height: unset;
-
-        & #urlbar {
-          opacity: 1 !important;
-        }
-
-        & #urlbar[breakout-extend='true']:not([zen-floating-urlbar='true']) {
-          top: 2px !important;
-          opacity: 1;
-        }
-      }
+  &:not([zen-single-toolbar='true']) #zen-sidebar-top-buttons {
+    max-width: fit-content;
+    :root[zen-right-side='true'] & {
+      order: 999;
     }
   }
 }
 
 /* Fix for https://github.com/zen-browser/desktop/issues/7615 */
 :root[zen-compact-mode='true']:not([customizing])[inDOMFullscreen='true'] {
-  @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
-    &:not([zen-compact-animating]) {
-      #navigator-toolbox {
-        opacity: 0;
-      }
-    }
-  }
-  @media -moz-pref('zen.view.compact.hide-toolbar') {
-    &:not([zen-single-toolbar='true']) {
-      & #zen-appcontent-navbar-wrapper {
-        opacity: 0;
-      }
+  &:not([zen-compact-animating]) {
+    #navigator-toolbox {
+      opacity: 0;
     }
   }
 }
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index dcb61e09c..ad7a7c5f4 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -302,7 +302,6 @@ class KeyShortcut {
   #disabled = false;
   #reserved = false;
   #internal = false;
-  #shouldBeEmpty = false;
 
   constructor(
     id,
@@ -404,16 +403,11 @@ class KeyShortcut {
   }
 
   set shouldBeEmpty(value) {
-    this.#shouldBeEmpty = value;
     if (value) {
       this.clearKeybind();
     }
   }
 
-  get shouldBeEmpty() {
-    return this.#shouldBeEmpty;
-  }
-
   toXHTMLElement(window) {
     let key = window.document.createXULElement('key');
     return this.replaceWithChild(key);
@@ -691,17 +685,6 @@ class nsZenKeyboardShortcutsLoader {
         'zen-compact-mode-shortcut-show-sidebar'
       )
     );
-    newShortcutList.push(
-      new KeyShortcut(
-        'zen-compact-mode-show-toolbar',
-        'T',
-        '',
-        ZEN_COMPACT_MODE_SHORTCUTS_GROUP,
-        nsKeyShortcutModifiers.fromObject({ accel: true, alt: true }),
-        'cmd_zenCompactModeShowToolbar',
-        'zen-compact-mode-shortcut-show-toolbar'
-      )
-    );
 
     // Workspace shortcuts
     for (let i = 10; i > 0; i--) {
@@ -816,7 +799,7 @@ class nsZenKeyboardShortcutsLoader {
 }
 
 class nsZenKeyboardShortcutsVersioner {
-  static LATEST_KBS_VERSION = 11;
+  static LATEST_KBS_VERSION = 12;
 
   constructor() {}
 
@@ -865,7 +848,7 @@ class nsZenKeyboardShortcutsVersioner {
       return newData;
     }
 
-    console.error('Unknown keyboar shortcuts version');
+    console.error('Unknown keyboard shortcuts version');
     this.version = 0;
     return this.migrateIfNeeded(data);
   }
@@ -884,17 +867,6 @@ class nsZenKeyboardShortcutsVersioner {
     // Apply migrations and ensure defaults exist
     let out = this.fillDefaultIfNotPresent(this.migrateIfNeeded(data));
 
-    // Hard-remove deprecated or conflicting defaults regardless of version
-    // - Remove the built-in "Open File" keybinding; menu item remains available
-    // - Remove default "Bookmark All Tabs" keybinding (Ctrl+Shift+D) to avoid conflict
-    // - Remove "Stop" keybinding to avoid conflict with Firefox's built-in binding
-    const shouldBeEmptyShortcuts = ['openFileKb', 'bookmarkAllTabsKb', 'key_stop'];
-    for (let shortcut of out) {
-      if (shouldBeEmptyShortcuts.includes(shortcut.getID?.())) {
-        shortcut.shouldBeEmpty = true;
-      }
-    }
-
     return out;
   }
 
@@ -1024,7 +996,6 @@ class nsZenKeyboardShortcutsVersioner {
           const commandMap = {
             'zen-compact-mode-toggle': 'cmd_zenCompactModeToggle',
             'zen-compact-mode-show-sidebar': 'cmd_zenCompactModeShowSidebar',
-            'zen-compact-mode-show-toolbar': 'cmd_zenCompactModeShowToolbar',
             'zen-workspace-forward': 'cmd_zenWorkspaceForward',
             'zen-workspace-backward': 'cmd_zenWorkspaceBackward',
             'zen-split-view-grid': 'cmd_zenSplitViewGrid',
@@ -1093,6 +1064,23 @@ class nsZenKeyboardShortcutsVersioner {
         )
       );
     }
+
+    if (version < 12) {
+      // Hard-remove deprecated or conflicting defaults regardless of version
+      // - Remove the built-in "Open File" keybinding; menu item remains available
+      // - Remove default "Bookmark All Tabs" keybinding (Ctrl+Shift+D) to avoid conflict
+      // - Remove "Stop" keybinding to avoid conflict with Firefox's built-in binding
+      const shouldBeEmptyShortcuts = ['openFileKb', 'bookmarkAllTabsKb', 'key_stop'];
+      for (let shortcut of data) {
+        if (shouldBeEmptyShortcuts.includes(shortcut.getID?.())) {
+          shortcut.shouldBeEmpty = true;
+        }
+      }
+
+      // Also remove zen-compact-mode-show-toolbar
+      data = data.filter((shortcut) => shortcut.getID() != 'zen-compact-mode-show-toolbar');
+    }
+
     return data;
   }
 }
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 0012ebfd6..c75b7896d 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -60,12 +60,6 @@
 
     &:root[zen-right-side='true'] #zen-sidebar-top-buttons .titlebar-buttonbox-container {
       margin-right: calc(-1 * var(--zen-toolbox-padding));
-      margin-top: -10px;
-      height: calc(4px + var(--zen-toolbar-height)) !important;
-
-      & .titlebar-button {
-        align-items: end;
-      }
     }
   }
 
@@ -723,7 +717,6 @@
 
   & #zen-sidebar-top-buttons-customization-target {
     flex-direction: column;
-    padding-top: var(--zen-element-separation);
   }
 
   & #zen-sidebar-foot-buttons {
@@ -972,15 +965,13 @@
   :root[zen-sidebar-expanded='true'] & {
     --toolbarbutton-inner-padding: var(--zen-toolbar-button-inner-padding) !important;
   }
+
   :root[zen-single-toolbar='true'] & {
     --toolbarbutton-inner-padding: calc(var(--zen-toolbar-button-inner-padding) - 2px) !important;
 
     & #PanelUI-button {
       order: -2;
     }
-    & #unified-extensions-button {
-      order: -1;
-    }
   }
 
   & #zen-sidebar-top-buttons-customization-target {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
new file mode 100644
index 000000000..aebbfc657
--- /dev/null
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -0,0 +1,426 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+export class nsZenSiteDataPanel {
+  #iconMap = {
+    install: 'extension',
+  };
+
+  constructor(window) {
+    this.window = window;
+    this.document = window.document;
+
+    this.panel = this.document.getElementById('zen-unified-site-data-panel');
+    this.#init();
+  }
+
+  #init() {
+    // Add a new button to the urlbar popup
+    const button = this.window.MozXULElement.parseXULToFragment(`
+      <box id="zen-site-data-icon-button" role="button" align="center" class="identity-box-button" delegatesanchor="true">
+        <image />
+      </box>
+    `);
+    this.anchor = button.querySelector('#zen-site-data-icon-button');
+    this.document.getElementById('identity-icon-box').after(button);
+    this.window.gUnifiedExtensions._button = this.anchor;
+
+    this.document
+      .getElementById('nav-bar')
+      .setAttribute('addon-webext-overflowbutton', 'zen-site-data-icon-button');
+
+    // Remove the old permissions dialog
+    this.document.getElementById('unified-extensions-panel-template').remove();
+
+    this.#initEventListeners();
+  }
+
+  #initEventListeners() {
+    this.panel.addEventListener('popupshowing', this);
+    this.document.getElementById('zen-site-data-manage-addons').addEventListener('click', this);
+    this.document.getElementById('zen-site-data-settings-more').addEventListener('click', this);
+    const kCommandIDs = [
+      'zen-site-data-header-share',
+      'zen-site-data-header-bookmark',
+      'zen-site-data-security-info',
+      'zen-site-data-actions',
+      'zen-site-data-new-addon-button',
+    ];
+
+    for (let id of kCommandIDs) {
+      this.document.getElementById(id).addEventListener('command', this);
+    }
+
+    this.#initContextMenuEventListener();
+  }
+
+  #initContextMenuEventListener() {
+    const kCommands = {
+      context_zenClearSiteData: (event) => {
+        this.window.gIdentityHandler.clearSiteData(event);
+      },
+      context_zenOpenGetAddons: () => {
+        this.#openGetAddons();
+      },
+      context_zenOpenSiteSettings: () => {
+        const { BrowserCommands } = this.window;
+        BrowserCommands.pageInfo(null, 'permTab');
+      },
+    };
+
+    for (let [id, handler] of Object.entries(kCommands)) {
+      this.document.getElementById(id).addEventListener('command', handler);
+    }
+  }
+
+  #preparePanel() {
+    this.#setSitePermissions();
+    this.#setSiteSecurityInfo();
+    this.#setSiteHeader();
+  }
+
+  #setSiteHeader() {
+    {
+      const button = this.document.getElementById('zen-site-data-header-reader-mode');
+      const urlbarButton = this.window.document.getElementById('reader-mode-button');
+      const isActive = urlbarButton?.hasAttribute('readeractive');
+      const isVisible = !urlbarButton?.hidden || isActive;
+
+      button.disabled = !isVisible;
+      if (isActive) {
+        button.classList.add('active');
+      } else {
+        button.classList.remove('active');
+      }
+      this.document.l10n.setAttributes(button, urlbarButton?.getAttribute('data-l10n-id'));
+    }
+    {
+      const button = this.document.getElementById('zen-site-data-header-bookmark');
+      const isPageBookmarked = this.window.BookmarkingUI.star?.hasAttribute('starred');
+
+      if (isPageBookmarked) {
+        button.classList.add('active');
+      } else {
+        button.classList.remove('active');
+      }
+    }
+    {
+      const button = this.document.getElementById('zen-site-data-header-share');
+      if (
+        this.window.gBrowser.currentURI.schemeIs('http') ||
+        this.window.gBrowser.currentURI.schemeIs('https')
+      ) {
+        button.removeAttribute('disabled');
+      } else {
+        button.setAttribute('disabled', 'true');
+      }
+    }
+  }
+
+  #setSiteSecurityInfo() {
+    const { gIdentityHandler } = this.window;
+    const button = this.document.getElementById('zen-site-data-security-info');
+
+    if (gIdentityHandler._isSecureInternalUI) {
+      button.parentNode.hidden = true;
+      return;
+    }
+
+    let identity;
+    if (gIdentityHandler._pageExtensionPolicy) {
+      this.document.l10n.setAttributes(button, 'zen-site-data-security-info-extension');
+      identity = 'extension';
+    } else if (gIdentityHandler._uriHasHost && gIdentityHandler._isSecureConnection) {
+      this.document.l10n.setAttributes(button, 'zen-site-data-security-info-secure');
+      identity = 'secure';
+    } else {
+      this.document.l10n.setAttributes(button, 'zen-site-data-security-info-not-secure');
+      identity = 'not-secure';
+    }
+
+    button.parentNode.hidden = false;
+    button.setAttribute('identity', identity);
+  }
+
+  #setSitePermissions() {
+    const { gBrowser, SitePermissions } = this.window;
+    const list = this.document.getElementById('zen-site-data-settings-list');
+    const section = list.closest('.zen-site-data-section');
+
+    // show permission icons
+    let permissions = SitePermissions.getAllPermissionDetailsForBrowser(gBrowser.selectedBrowser);
+
+    // Don't display origin-keyed 3rdPartyStorage permissions that are covered by
+    // site-keyed 3rdPartyFrameStorage permissions.
+    let thirdPartyStorageSites = new Set(
+      permissions
+        .map(function (permission) {
+          let [id, key] = permission.id.split(SitePermissions.PERM_KEY_DELIMITER);
+          if (id == '3rdPartyFrameStorage') {
+            return key;
+          }
+          return null;
+        })
+        .filter(function (key) {
+          return key != null;
+        })
+    );
+    permissions = permissions.filter(function (permission) {
+      let [id, key] = permission.id.split(SitePermissions.PERM_KEY_DELIMITER);
+      if (id != '3rdPartyStorage') {
+        return true;
+      }
+      try {
+        let origin = Services.io.newURI(key);
+        let site = Services.eTLD.getSite(origin);
+        return !thirdPartyStorageSites.has(site);
+      } catch {
+        return false;
+      }
+    });
+
+    this._sharingState = gBrowser.selectedTab._sharingState;
+
+    if (this._sharingState?.geo) {
+      let geoPermission = permissions.find((perm) => perm.id === 'geo');
+      if (!geoPermission) {
+        permissions.push({
+          id: 'geo',
+          state: SitePermissions.ALLOW,
+          scope: SitePermissions.SCOPE_REQUEST,
+          sharingState: true,
+        });
+      }
+    }
+
+    if (this._sharingState?.xr) {
+      let xrPermission = permissions.find((perm) => perm.id === 'xr');
+      if (!xrPermission) {
+        permissions.push({
+          id: 'xr',
+          state: SitePermissions.ALLOW,
+          scope: SitePermissions.SCOPE_REQUEST,
+          sharingState: true,
+        });
+      }
+    }
+
+    if (this._sharingState?.webRTC) {
+      let webrtcState = this._sharingState.webRTC;
+      // If WebRTC device or screen are in use, we need to find
+      // the associated ALLOW permission item to set the sharingState field.
+      for (let id of ['camera', 'microphone', 'screen']) {
+        if (webrtcState[id]) {
+          let found = false;
+          for (let permission of permissions) {
+            let [permId] = permission.id.split(SitePermissions.PERM_KEY_DELIMITER);
+            if (permId != id || permission.state != SitePermissions.ALLOW) {
+              continue;
+            }
+            found = true;
+          }
+          if (!found) {
+            // If the ALLOW permission item we were looking for doesn't exist,
+            // the user has temporarily allowed sharing and we need to add
+            // an item in the permissions array to reflect this.
+            permissions.push({
+              id,
+              state: SitePermissions.ALLOW,
+              scope: SitePermissions.SCOPE_REQUEST,
+              sharingState: webrtcState[id],
+            });
+          }
+        }
+      }
+    }
+
+    list.innerHTML = '';
+    for (let permission of permissions) {
+      let [id, key] = permission.id.split(SitePermissions.PERM_KEY_DELIMITER);
+
+      if (id == 'storage-access') {
+        // Ignore storage access permissions here, they are made visible inside
+        // the Content Blocking UI.
+        continue;
+      }
+
+      if (permission.state == SitePermissions.PROMPT) {
+        // We don't display "ask" permissions in the site data panel.
+        continue;
+      }
+
+      let item = this.#createPermissionItem(id, key, permission);
+      if (item) {
+        list.appendChild(item);
+      }
+    }
+
+    section.hidden = list.childElementCount == 0;
+  }
+
+  #getPermissionStateLabelId(permission) {
+    const { SitePermissions } = this.window;
+    switch (permission.state) {
+      // There should only be these types being displayed in the panel.
+      case SitePermissions.ALLOW:
+        return 'zen-site-data-setting-allow';
+      case SitePermissions.BLOCK:
+      case SitePermissions.AUTOPLAY_BLOCKED_ALL:
+        return 'zen-site-data-setting-block';
+      default:
+        return null;
+    }
+  }
+
+  #createPermissionItem(id, key, permission) {
+    const { SitePermissions } = this.window;
+
+    // Create a permission item for the site data panel.
+    let container = this.document.createXULElement('hbox');
+    const idNoSuffix = permission.id;
+    container.classList.add(
+      'permission-popup-permission-item',
+      `permission-popup-permission-item-${idNoSuffix}`
+    );
+    container.setAttribute('align', 'center');
+    container.setAttribute('role', 'group');
+
+    container.setAttribute('state', permission.state == SitePermissions.ALLOW ? 'allow' : 'block');
+
+    let img = this.document.createXULElement('toolbarbutton');
+    img.classList.add('permission-popup-permission-icon', 'zen-site-data-permission-icon');
+    if (this.#iconMap[id]) {
+      img.classList.add(`zen-permission-${this.#iconMap[id]}-icon`);
+    }
+
+    let labelContainer = this.document.createXULElement('vbox');
+    labelContainer.setAttribute('flex', '1');
+    labelContainer.setAttribute('align', 'start');
+    labelContainer.classList.add('permission-popup-permission-label-container');
+    labelContainer._permission = permission;
+    labelContainer.addEventListener('click', this);
+
+    let nameLabel = this.document.createXULElement('label');
+    nameLabel.setAttribute('flex', '1');
+    nameLabel.setAttribute('class', 'permission-popup-permission-label');
+    let label = SitePermissions.getPermissionLabel(permission.id);
+    if (label === null) {
+      return null;
+    }
+    nameLabel.textContent = label;
+    labelContainer.appendChild(nameLabel);
+
+    let stateLabel = this.document.createXULElement('label');
+    stateLabel.setAttribute('class', 'zen-permission-popup-permission-state-label');
+    stateLabel.setAttribute('data-l10n-id', this.#getPermissionStateLabelId(permission));
+    labelContainer.appendChild(stateLabel);
+
+    container.appendChild(img);
+    container.appendChild(labelContainer);
+
+    return container;
+  }
+
+  #openGetAddons() {
+    const { switchToTabHavingURI } = this.window;
+    let amoUrl = Services.urlFormatter.formatURLPref('extensions.getAddons.link.url');
+    switchToTabHavingURI(amoUrl, true);
+  }
+
+  #onCommandEvent(event) {
+    const id = event.target.id;
+    switch (id) {
+      case 'zen-site-data-new-addon-button': {
+        this.#openGetAddons();
+        break;
+      }
+      case 'zen-site-data-security-info': {
+        this.window.displaySecurityInfo();
+        break;
+      }
+      case 'zen-site-data-actions': {
+        const button = this.document.getElementById('zen-site-data-actions');
+        const popup = this.document.getElementById('zenSiteDataActions');
+        popup.openPopup(
+          button,
+          'after_start',
+          0,
+          0,
+          /* context menu */ true,
+          false,
+          this.window.event
+        );
+        break;
+      }
+      case 'zen-site-data-header-bookmark': {
+        this.window.BookmarkingUI.onStarCommand(event);
+        break;
+      }
+    }
+  }
+
+  #onPermissionClick(label) {
+    const { SitePermissions, gBrowser } = this.window;
+    const permission = label._permission;
+
+    let newState;
+    switch (permission.state) {
+      case SitePermissions.ALLOW:
+        newState = SitePermissions.BLOCK;
+        break;
+      case SitePermissions.BLOCK:
+      case SitePermissions.AUTOPLAY_BLOCKED_ALL:
+        newState = SitePermissions.ALLOW;
+        break;
+      default:
+        return;
+    }
+
+    SitePermissions.setForPrincipal(gBrowser.contentPrincipal, permission.id, newState);
+
+    label.parentNode.setAttribute('state', newState == SitePermissions.ALLOW ? 'allow' : 'block');
+    label
+      .querySelector('.zen-permission-popup-permission-state-label')
+      .setAttribute('data-l10n-id', this.#getPermissionStateLabelId({ state: newState }));
+    label._permission.state = newState;
+  }
+
+  #onClickEvent(event) {
+    const id = event.target.id;
+    switch (id) {
+      case 'zen-site-data-manage-addons': {
+        const { BrowserAddonUI } = this.window;
+        BrowserAddonUI.openAddonsMgr('addons://list/extension');
+        break;
+      }
+      case 'zen-site-data-settings-more': {
+        const { BrowserCommands } = this.window;
+        BrowserCommands.pageInfo(null, 'permTab');
+        break;
+      }
+      default: {
+        const label = event.target.closest('.permission-popup-permission-label-container');
+        if (label?._permission) {
+          this.#onPermissionClick(label);
+        }
+        break;
+      }
+    }
+  }
+
+  handleEvent(event) {
+    const type = event.type;
+    switch (type) {
+      case 'click':
+        this.#onClickEvent(event);
+        break;
+      case 'command':
+        this.#onCommandEvent(event);
+        break;
+      case 'popupshowing':
+        this.#preparePanel();
+        break;
+    }
+  }
+}
diff --git a/src/zen/urlbar/moz.build b/src/zen/urlbar/moz.build
index 1e331db90..f321a86bb 100644
--- a/src/zen/urlbar/moz.build
+++ b/src/zen/urlbar/moz.build
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
+  "ZenSiteDataPanel.sys.mjs",
   "ZenUBActionsProvider.sys.mjs",
   "ZenUBGlobalActions.sys.mjs",
   "ZenUBProvider.sys.mjs",
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index ad5c61c6c..d38f0fab6 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -153,6 +153,7 @@
 
 /* Mark workspaces indicator */
 .zen-current-workspace-indicator {
+  margin-top: 1px;
   padding: calc(2px + var(--tab-inline-padding) + var(--zen-toolbox-padding));
   font-weight: 500;
   position: relative;
diff --git a/src/zen/zen.globals.js b/src/zen/zen.globals.js
index c8dc0987f..a225ca767 100644
--- a/src/zen/zen.globals.js
+++ b/src/zen/zen.globals.js
@@ -7,6 +7,8 @@ export default [
   'nsZenDOMOperatedFeature',
   'nsZenPreloadedFeature',
 
+  'nsZenSiteDataPanel',
+
   'ZenThemeModifier',
   'ZenHasPolyfill',
 

From f273cd8fd14d947de6586abb3e6ad91a03f14058 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 5 Oct 2025 18:57:35 +0200
Subject: [PATCH 032/111] chore: Refactor glance animtions, p=#10690

---
 .../flatpak/app.zen_browser.zen.yml.template  |    2 +-
 .../browser/preferences/zen-preferences.ftl   |    2 -
 prefs/glance.yaml                             |    3 -
 scripts/run_tests.py                          |   12 +-
 .../preferences/zenLooksAndFeel.inc.xhtml     |    1 -
 .../common/styles/zen-browser-container.css   |    4 +-
 src/zen/glance/ZenGlanceManager.mjs           | 1560 +++++++++++++----
 src/zen/glance/actors/ZenGlanceChild.sys.mjs  |   78 +-
 src/zen/glance/actors/ZenGlanceParent.sys.mjs |   36 +-
 src/zen/glance/zen-glance.css                 |   35 +-
 src/zen/split-view/ZenViewSplitter.mjs        |    5 +-
 src/zen/tests/glance/browser.toml             |    1 +
 .../glance/browser_glance_close_select.js     |   36 +
 src/zen/tests/ignorePrefs.json                |    8 +
 14 files changed, 1322 insertions(+), 461 deletions(-)
 create mode 100644 src/zen/tests/glance/browser_glance_close_select.js

diff --git a/build/flatpak/app.zen_browser.zen.yml.template b/build/flatpak/app.zen_browser.zen.yml.template
index d18329c46..821b0f1e6 100644
--- a/build/flatpak/app.zen_browser.zen.yml.template
+++ b/build/flatpak/app.zen_browser.zen.yml.template
@@ -7,7 +7,7 @@ base-version: '24.08'
 add-extensions:
   org.freedesktop.Platform.ffmpeg-full:
     directory: lib/ffmpeg
-    version: '24.08'
+    version: '24.08.26'
     add-ld-path: .
   app.zen_browser.zen.systemconfig:
     directory: etc/zen
diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
index 5ab322e34..1c2d18229 100644
--- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
@@ -33,8 +33,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click =
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click =
-    .label = Hold Click (Coming Soon!)
 
 zen-look-and-feel-compact-view-header = Show in compact view
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
diff --git a/prefs/glance.yaml b/prefs/glance.yaml
index cae4738d2..49125fe30 100644
--- a/prefs/glance.yaml
+++ b/prefs/glance.yaml
@@ -8,9 +8,6 @@
 - name: zen.glance.enable-contextmenu-search
   value: true
 
-- name: zen.glance.hold-duration
-  value: 300 # in ms
-
 - name: zen.glance.open-essential-external-links
   value: true
 
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index a4adecd7c..90a7995a8 100644
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -6,6 +6,7 @@ import os
 import sys
 import json
 from pathlib import Path
+from typing import Any
 
 IGNORE_PREFS_FILE_IN = os.path.join(
     'src', 'zen', 'tests', 'ignorePrefs.json'
@@ -15,6 +16,15 @@ IGNORE_PREFS_FILE_OUT = os.path.join(
 )
 
 
+class JSONWithCommentsDecoder(json.JSONDecoder):
+  def __init__(self, **kw):
+    super().__init__(**kw)
+
+  def decode(self, s: str) -> Any:
+    s = '\n'.join(l for l in s.split('\n') if not l.lstrip(' ').startswith('//'))
+    return super().decode(s)
+
+
 def copy_ignore_prefs():
   print("Copying ignorePrefs.json from src/zen/tests to engine/testing/mochitest...")
   # if there are prefs that dont exist on output file, copy them from input file
@@ -22,7 +32,7 @@ def copy_ignore_prefs():
   with open(IGNORE_PREFS_FILE_OUT, 'r') as f:
     all_prefs = json.load(f)
     with open(IGNORE_PREFS_FILE_IN, 'r') as f_in:
-      new_prefs = json.load(f_in)
+      new_prefs = json.load(f_in, cls=JSONWithCommentsDecoder)
       all_prefs.extend(p for p in new_prefs if p not in all_prefs)
   with open(IGNORE_PREFS_FILE_OUT, 'w') as f_out:
     json.dump(all_prefs, f_out, indent=2)
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 259fff79e..068db06b6 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -87,7 +87,6 @@
 #ifdef XP_MACOSX
                         <menuitem data-l10n-id="zen-glance-trigger-meta-click" value="meta"/>
 #endif
-                        <menuitem data-l10n-id="zen-glance-trigger-mantain-click" value="mantain" disabled="true"/>
                   </menupopup>
             </menulist>
         </hbox>
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index 62045e7b0..ea34f8434 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -8,12 +8,12 @@
   #tabbrowser-tabpanels[dragging-split='true'] {
     width: -moz-available;
     position: relative;
-    overflow: clip;
 
     &.browserSidebarContainer {
-      :root:not([zen-no-padding='true']) & {
+      :root:not([zen-no-padding='true']) &:not(.zen-glance-overlay) {
         border-radius: var(--zen-native-inner-radius);
         box-shadow: var(--zen-big-shadow);
+        overflow: clip;
       }
 
       & browser[type='content'] {
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index bccffa314..de653c244 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -1,312 +1,788 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // 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/.
+
 {
+  /**
+   * Manages the Zen Glance feature - a preview overlay system for tabs
+   * Allows users to preview content without fully opening new tabs
+   */
   class nsZenGlanceManager extends nsZenDOMOperatedFeature {
+    // Animation state
     _animating = false;
     _lazyPref = {};
 
+    // Glance management
     #glances = new Map();
     #currentGlanceID = null;
-
     #confirmationTimeout = null;
 
+    // Animation flags
+    animatingOpen = false;
+    animatingFullOpen = false;
+    closingGlance = false;
+    #duringOpening = false;
+    #ignoreClose = false;
+
+    // Arc animation configuration
+    #ARC_CONFIG = Object.freeze({
+      ARC_STEPS: 40, // Increased for smoother bounce
+      MAX_ARC_HEIGHT: 30,
+      ARC_HEIGHT_RATIO: 0.2, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
+    });
+
     init() {
+      this.#setupEventListeners();
+      this.#setupPreferences();
+      this.#setupObservers();
+    }
+
+    #setupEventListeners() {
       window.addEventListener('TabClose', this.onTabClose.bind(this));
       window.addEventListener('TabSelect', this.onLocationChange.bind(this));
 
+      document
+        .getElementById('tabbrowser-tabpanels')
+        .addEventListener('click', this.onOverlayClick.bind(this));
+    }
+
+    #setupPreferences() {
       XPCOMUtils.defineLazyPreferenceGetter(
         this._lazyPref,
         'SHOULD_OPEN_EXTERNAL_TABS_IN_GLANCE',
         'zen.glance.open-essential-external-links',
         false
       );
+    }
 
-      document
-        .getElementById('tabbrowser-tabpanels')
-        .addEventListener('click', this.onOverlayClick.bind(this));
+    #setupObservers() {
       Services.obs.addObserver(this, 'quit-application-requested');
     }
 
+    /**
+     * Handle main command set events for glance operations
+     * @param {Event} event - The command event
+     */
     handleMainCommandSet(event) {
       const command = event.target;
-      switch (command.id) {
-        case 'cmd_zenGlanceClose':
-          this.closeGlance({ onTabClose: true });
-          break;
-        case 'cmd_zenGlanceExpand':
-          this.fullyOpenGlance();
-          break;
-        case 'cmd_zenGlanceSplit':
-          this.splitGlance();
-          break;
+      const commandHandlers = {
+        cmd_zenGlanceClose: () => this.closeGlance({ onTabClose: true }),
+        cmd_zenGlanceExpand: () => this.fullyOpenGlance(),
+        cmd_zenGlanceSplit: () => this.splitGlance(),
+      };
+
+      const handler = commandHandlers[command.id];
+      if (handler) {
+        handler();
       }
     }
 
+    /**
+     * Get the current glance browser element
+     * @returns {Browser} The current browser or null
+     */
     get #currentBrowser() {
       return this.#glances.get(this.#currentGlanceID)?.browser;
     }
 
+    /**
+     * Get the current glance tab element
+     * @returns {Tab} The current tab or null
+     */
     get #currentTab() {
       return this.#glances.get(this.#currentGlanceID)?.tab;
     }
 
+    /**
+     * Get the current glance parent tab element
+     * @returns {Tab} The parent tab or null
+     */
     get #currentParentTab() {
       return this.#glances.get(this.#currentGlanceID)?.parentTab;
     }
 
+    /**
+     * Handle clicks on the glance overlay
+     * @param {Event} event - The click event
+     */
     onOverlayClick(event) {
-      if (event.target === this.overlay && event.originalTarget !== this.contentWrapper) {
+      const isOverlayClick = event.target === this.overlay;
+      const isNotContentClick = event.originalTarget !== this.contentWrapper;
+
+      if (isOverlayClick && isNotContentClick) {
         this.closeGlance({ onTabClose: true });
       }
     }
 
+    /**
+     * Handle application observer notifications
+     * @param {Object} subject - The subject of the notification
+     * @param {string} topic - The topic of the notification
+     */
     observe(subject, topic) {
-      switch (topic) {
-        case 'quit-application-requested':
-          this.onUnload();
-          break;
+      if (topic === 'quit-application-requested') {
+        this.onUnload();
       }
     }
 
+    /**
+     * Clean up all glances when the application is unloading
+     */
     onUnload() {
-      // clear everything
-      /* eslint-disable no-unused-vars */
-      for (let [id, glance] of this.#glances) {
+      for (const [, glance] of this.#glances) {
         gBrowser.removeTab(glance.tab, { animate: false });
       }
+      this.#glances.clear();
     }
 
+    /**
+     * Create a new browser element for a glance
+     * @param {string} url - The URL to load
+     * @param {Tab} currentTab - The current tab
+     * @param {Tab} existingTab - Optional existing tab to reuse
+     * @returns {Browser} The created browser element
+     */
     createBrowserElement(url, currentTab, existingTab = null) {
-      const newTabOptions = {
+      const newTabOptions = this.#createTabOptions(currentTab);
+      const newUUID = gZenUIManager.generateUuidv4();
+
+      currentTab._selected = true;
+      const newTab =
+        existingTab ?? gBrowser.addTrustedTab(Services.io.newURI(url).spec, newTabOptions);
+
+      this.#configureNewTab(newTab, currentTab, newUUID);
+      this.#registerGlance(newTab, currentTab, newUUID);
+
+      gBrowser.selectedTab = newTab;
+      return this.#currentBrowser;
+    }
+
+    /**
+     * Create tab options for a new glance tab
+     * @param {Tab} currentTab - The current tab
+     * @returns {Object} Tab options
+     */
+    #createTabOptions(currentTab) {
+      return {
         userContextId: currentTab.getAttribute('usercontextid') || '',
         skipBackgroundNotify: true,
         insertTab: true,
         skipLoad: false,
       };
-      currentTab._selected = true;
-      const newUUID = gZenUIManager.generateUuidv4();
-      const newTab =
-        existingTab ?? gBrowser.addTrustedTab(Services.io.newURI(url).spec, newTabOptions);
+    }
+
+    /**
+     * Configure a new tab for glance usage
+     * @param {Tab} newTab - The new tab to configure
+     * @param {Tab} currentTab - The current tab
+     * @param {string} glanceId - The glance ID
+     */
+    #configureNewTab(newTab, currentTab, glanceId) {
       if (currentTab.hasAttribute('zenDefaultUserContextId')) {
         newTab.setAttribute('zenDefaultUserContextId', true);
       }
+
       currentTab.querySelector('.tab-content').appendChild(newTab);
       newTab.setAttribute('zen-glance-tab', true);
-      newTab.setAttribute('glance-id', newUUID);
-      currentTab.setAttribute('glance-id', newUUID);
-      this.#glances.set(newUUID, {
+      newTab.setAttribute('glance-id', glanceId);
+      currentTab.setAttribute('glance-id', glanceId);
+    }
+
+    /**
+     * Register a new glance in the glances map
+     * @param {Tab} newTab - The new tab
+     * @param {Tab} currentTab - The current tab
+     * @param {string} glanceId - The glance ID
+     */
+    #registerGlance(newTab, currentTab, glanceId) {
+      this.#glances.set(glanceId, {
         tab: newTab,
         parentTab: currentTab,
         browser: newTab.linkedBrowser,
       });
-      this.#currentGlanceID = newUUID;
-      gBrowser.selectedTab = newTab;
-      return this.#currentBrowser;
+      this.#currentGlanceID = glanceId;
     }
 
+    /**
+     * Fill overlay references from a browser element
+     * @param {Browser} browser - The browser element
+     */
     fillOverlay(browser) {
       this.overlay = browser.closest('.browserSidebarContainer');
       this.browserWrapper = browser.closest('.browserContainer');
       this.contentWrapper = browser.closest('.browserStack');
     }
 
+    /**
+     * Create new overlay buttons with animation
+     * @returns {DocumentFragment} The cloned button template
+     */
     #createNewOverlayButtons() {
-      const newButtons = document
-        .getElementById('zen-glance-sidebar-template')
-        .content.cloneNode(true);
+      const template = document.getElementById('zen-glance-sidebar-template');
+      const newButtons = template.content.cloneNode(true);
       const container = newButtons.querySelector('.zen-glance-sidebar-container');
+
+      this.#animateOverlayButtons(container);
+      return newButtons;
+    }
+
+    /**
+     * Animate the overlay buttons entrance
+     * @param {Element} container - The button container
+     */
+    #animateOverlayButtons(container) {
       container.style.opacity = 0;
+
+      const xOffset = gZenVerticalTabsManager._prefsRightSide ? 20 : -20;
+
       gZenUIManager.motion.animate(
         container,
         {
           opacity: [0, 1],
+          x: [xOffset, 0],
         },
         {
-          duration: 0.2,
+          duration: 0.3,
           type: 'spring',
-          delay: 0.05,
+          delay: 0.15,
+          bounce: 0,
         }
       );
-      return newButtons;
     }
 
+    /**
+     * Open a glance overlay with the specified data
+     * @param {Object} data - Glance data including URL, position, and dimensions
+     * @param {Tab} existingTab - Optional existing tab to reuse
+     * @param {Tab} ownerTab - The tab that owns this glance
+     * @returns {Promise<Tab>} Promise that resolves to the glance tab
+     */
     openGlance(data, existingTab = null, ownerTab = null) {
       if (this.#currentBrowser) {
         return;
       }
+
       if (gBrowser.selectedTab === this.#currentParentTab) {
         gBrowser.selectedTab = this.#currentTab;
         return;
       }
-      this.animatingOpen = true;
-      this._animating = true;
-
-      const initialX = data.clientX;
-      const initialY = data.clientY;
-      const initialWidth = data.width;
-      const initialHeight = data.height;
-
-      this.browserWrapper?.removeAttribute('animate');
-      this.browserWrapper?.removeAttribute('has-finished-animation');
-      this.overlay?.removeAttribute('post-fade-out');
 
+      this.#setAnimationState(true);
       const currentTab = ownerTab ?? gBrowser.selectedTab;
-
       const browserElement = this.createBrowserElement(data.url, currentTab, existingTab);
 
       this.fillOverlay(browserElement);
-
       this.overlay.classList.add('zen-glance-overlay');
 
+      return this.#animateGlanceOpening(data, browserElement);
+    }
+
+    /**
+     * Set animation state flags
+     * @param {boolean} isAnimating - Whether animations are active
+     */
+    #setAnimationState(isAnimating) {
+      this.animatingOpen = isAnimating;
+      this._animating = isAnimating;
+    }
+
+    /**
+     * Animate the glance opening process
+     * @param {Object} data - Glance data
+     * @param {Browser} browserElement - The browser element
+     * @returns {Promise<Tab>} Promise that resolves to the glance tab
+     */
+    #animateGlanceOpening(data, browserElement) {
       return new Promise((resolve) => {
         window.requestAnimationFrame(() => {
-          this.quickOpenGlance();
-          const newButtons = this.#createNewOverlayButtons();
-          this.browserWrapper.appendChild(newButtons);
-
-          // Performance: backdrop-filter blur on Windows significantly impacts scroll smoothness
-          // in the Glance preview (particularly for wheel scrolling). Avoid applying it on Windows.
-          const parentSidebarContainer = this.#currentParentTab.linkedBrowser.closest(
-            '.browserSidebarContainer'
-          );
-          gZenUIManager.motion.animate(
-            parentSidebarContainer,
-            {
-              scale: [1, 0.98],
-              opacity: [1, 0.6],
-            },
-            {
-              duration: 0.4,
-              type: 'spring',
-              bounce: 0.2,
-            }
-          );
-          this.overlay.removeAttribute('fade-out');
-          this.browserWrapper.setAttribute('animate', true);
-          const top = initialY + initialHeight / 2;
-          const left = initialX + initialWidth / 2;
-          this.browserWrapper.style.top = `${top}px`;
-          this.browserWrapper.style.left = `${left}px`;
-          this.browserWrapper.style.width = `${initialWidth}px`;
-          this.browserWrapper.style.height = `${initialHeight}px`;
-          this.browserWrapper.style.opacity = 0.8;
-          this.#glances.get(this.#currentGlanceID).originalPosition = {
-            top: this.browserWrapper.style.top,
-            left: this.browserWrapper.style.left,
-            width: this.browserWrapper.style.width,
-            height: this.browserWrapper.style.height,
-          };
-          this.browserWrapper.style.transform = 'translate(-50%, -50%)';
-          this.overlay.style.overflow = 'visible';
-          gZenUIManager.motion
-            .animate(
-              this.browserWrapper,
-              {
-                top: '50%',
-                left: '50%',
-                width: '85%',
-                height: '100%',
-                opacity: 1,
-              },
-              {
-                duration: 0.3,
-                type: 'spring',
-                bounce: 0.2,
-              }
-            )
-            .then(() => {
-              gBrowser.tabContainer._invalidateCachedTabs();
-              this.overlay.style.removeProperty('overflow');
-              this.browserWrapper.removeAttribute('animate');
-              this.browserWrapper.setAttribute('has-finished-animation', true);
-              this._animating = false;
-              this.animatingOpen = false;
-              this.#currentTab.dispatchEvent(new Event('GlanceOpen', { bubbles: true }));
-              resolve(this.#currentTab);
-            });
+          this.#prepareGlanceAnimation(data, browserElement);
+          this.#executeGlanceAnimation(data, browserElement, resolve);
         });
       });
     }
 
-    _clearContainerStyles(container) {
+    /**
+     * Prepare the glance for animation
+     * @param {Object} data - Glance data
+     * @param {Browser} browserElement - The browser element
+     */
+    #prepareGlanceAnimation(data, browserElement) {
+      this.quickOpenGlance();
+      const newButtons = this.#createNewOverlayButtons();
+      this.browserWrapper.appendChild(newButtons);
+
+      this.#animateParentBackground();
+      this.#setupGlancePositioning(data);
+      this.#configureBrowserElement(browserElement);
+    }
+
+    /**
+     * Animate the parent background
+     */
+    #animateParentBackground() {
+      const parentSidebarContainer = this.#currentParentTab.linkedBrowser.closest(
+        '.browserSidebarContainer'
+      );
+
+      gZenUIManager.motion.animate(
+        parentSidebarContainer,
+        {
+          scale: [1, 0.98],
+          opacity: [1, 0.6],
+        },
+        {
+          duration: 0.3,
+          type: 'spring',
+          bounce: 0.2,
+        }
+      );
+    }
+
+    /**
+     * Set up glance positioning
+     * @param {Object} data - Glance data with position and dimensions
+     */
+    #setupGlancePositioning(data) {
+      const { clientX, clientY, width, height } = data;
+      const top = clientY + height / 2;
+      const left = clientX + width / 2;
+
+      this.overlay.removeAttribute('fade-out');
+      this.browserWrapper.setAttribute('animate', true);
+      this.browserWrapper.style.top = `${top}px`;
+      this.browserWrapper.style.left = `${left}px`;
+      this.browserWrapper.style.width = `${width}px`;
+      this.browserWrapper.style.height = `${height}px`;
+
+      this.#storeOriginalPosition();
+      this.overlay.style.overflow = 'visible';
+    }
+
+    /**
+     * Store the original position for later restoration
+     */
+    #storeOriginalPosition() {
+      this.#glances.get(this.#currentGlanceID).originalPosition = {
+        top: this.browserWrapper.style.top,
+        left: this.browserWrapper.style.left,
+        width: this.browserWrapper.style.width,
+        height: this.browserWrapper.style.height,
+      };
+    }
+
+    /**
+     * Handle element preview if provided
+     * @param {Object} data - Glance data
+     * @returns {Element|null} The preview element or null
+     */
+    #handleElementPreview(data) {
+      if (!data.elementData) {
+        return null;
+      }
+
+      const imageDataElement = document.createXULElement('image');
+      imageDataElement.setAttribute('src', data.elementData);
+      imageDataElement.classList.add('zen-glance-element-preview');
+      this.browserWrapper.prepend(imageDataElement);
+      this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
+
+      return imageDataElement;
+    }
+
+    /**
+     * Configure browser element for animation
+     * @param {Browser} browserElement - The browser element
+     */
+    #configureBrowserElement(browserElement) {
+      const rect = window.windowUtils.getBoundsWithoutFlushing(this.browserWrapper.parentElement);
+      const minWidth = rect.width * 0.85;
+      const minHeight = rect.height * 0.85;
+
+      browserElement.style.minWidth = `${minWidth}px`;
+      browserElement.style.minHeight = `${minHeight}px`;
+    }
+
+    /**
+     * Get the transform origin for the animation
+     * @param {Object} data - Glance data with position and dimensions
+     * @returns {string} The transform origin CSS value
+     */
+    #getTransformOrigin(data) {
+      const { clientX, clientY, width, height } = data;
+      const parentRect = window.windowUtils.getBoundsWithoutFlushing(
+        this.browserWrapper.parentElement
+      );
+      const xPercent = ((clientX + width / 2 - parentRect.left) / parentRect.width) * 100;
+      const yPercent = ((clientY + height / 2 - parentRect.top) / parentRect.height) * 100;
+
+      const xOrigin = xPercent < 33 ? 'left' : xPercent > 66 ? 'right' : 'center';
+      const yOrigin = yPercent < 33 ? 'top' : yPercent > 66 ? 'bottom' : 'center';
+
+      return `${xOrigin} ${yOrigin}`;
+    }
+
+    /**
+     * Execute the main glance animation
+     * @param {Object} data - Glance data
+     * @param {Browser} browserElement - The browser element
+     * @param {Function} resolve - Promise resolve function
+     */
+    #executeGlanceAnimation(data, browserElement, resolve) {
+      const imageDataElement = this.#handleElementPreview(data);
+
+      // Create curved animation sequence
+      const arcSequence = this.#createGlanceArcSequence(data, 'opening');
+      const transformOrigin = this.#getTransformOrigin(data);
+
+      this.browserWrapper.style.transformOrigin = transformOrigin;
+      gZenUIManager.motion
+        .animate(this.browserWrapper, arcSequence, {
+          duration: gZenUIManager.testingEnabled ? 0 : 0.4,
+          ease: 'easeInOut',
+        })
+        .then(() => {
+          this.#finalizeGlanceOpening(imageDataElement, browserElement, resolve);
+        });
+    }
+
+    /**
+     * Create arc animation sequence for glance animations
+     * @param {Object} data - Glance data with position and dimensions
+     * @param {string} direction - 'opening' or 'closing'
+     * @returns {Object} Animation sequence object
+     */
+    #createGlanceArcSequence(data, direction) {
+      const { clientX, clientY, width, height } = data;
+
+      // Calculate start and end positions based on direction
+      let startPosition, endPosition;
+
+      const tabPanelsRect = window.windowUtils.getBoundsWithoutFlushing(gBrowser.tabpanels);
+
+      const widthPercent = 0.85;
+      if (direction === 'opening') {
+        startPosition = {
+          x: clientX + width / 2,
+          y: clientY + height / 2,
+          width: width,
+          height: height,
+        };
+        endPosition = {
+          x: tabPanelsRect.width / 2,
+          y: tabPanelsRect.height / 2,
+          width: tabPanelsRect.width * widthPercent,
+          height: tabPanelsRect.height,
+        };
+      } else {
+        // closing
+        startPosition = {
+          x: tabPanelsRect.width / 2,
+          y: tabPanelsRect.height / 2,
+          width: tabPanelsRect.width * widthPercent,
+          height: tabPanelsRect.height,
+        };
+        endPosition = {
+          x: clientX + width / 2,
+          y: clientY + height / 2,
+          width: width,
+          height: height,
+        };
+      }
+
+      // Calculate distance and arc parameters
+      const distance = this.#calculateDistance(startPosition, endPosition);
+      const { arcHeight, shouldArcDownward } = this.#calculateOptimalArc(
+        startPosition,
+        endPosition,
+        distance
+      );
+
+      const sequence = {
+        top: [],
+        left: [],
+        width: [],
+        height: [],
+        transform: [],
+      };
+
+      const steps = this.#ARC_CONFIG.ARC_STEPS;
+      const arcDirection = shouldArcDownward ? 1 : -1;
+
+      function easeInOutQuad(t) {
+        return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
+      }
+
+      function easeOutCubic(t) {
+        return 1 - Math.pow(1 - t, 6);
+      }
+
+      // First, create the main animation steps
+      for (let i = 0; i <= steps; i++) {
+        const progress = i / steps;
+        const eased = direction === 'opening' ? easeInOutQuad(progress) : easeOutCubic(progress);
+
+        // Calculate size interpolation
+        const currentWidth =
+          startPosition.width + (endPosition.width - startPosition.width) * eased;
+        const currentHeight =
+          startPosition.height + (endPosition.height - startPosition.height) * eased;
+
+        // Calculate position on arc
+        const distanceX = endPosition.x - startPosition.x;
+        const distanceY = endPosition.y - startPosition.y;
+
+        const x = startPosition.x + distanceX * eased;
+        const y =
+          startPosition.y +
+          distanceY * eased +
+          arcDirection * arcHeight * (1 - (2 * eased - 1) ** 2);
+
+        sequence.transform.push(`translate(-50%, -50%) scale(1)`);
+        sequence.top.push(`${y}px`);
+        sequence.left.push(`${x}px`);
+        sequence.width.push(`${currentWidth}px`);
+        sequence.height.push(`${currentHeight}px`);
+      }
+
+      let scale = 1;
+      const bounceSteps = 40;
+      if (direction === 'opening') {
+        for (let i = 0; i < bounceSteps; i++) {
+          const progress = i / bounceSteps;
+          // Scale up slightly then back to normal
+          scale = 1 + 0.006 * Math.sin(progress * Math.PI);
+          // If we are at the last step, ensure scale is exactly 1
+          if (i === bounceSteps - 1) {
+            scale = 1;
+          }
+          sequence.transform.push(`translate(-50%, -50%) scale(${scale})`);
+          sequence.top.push(sequence.top[sequence.top.length - 1]);
+          sequence.left.push(sequence.left[sequence.left.length - 1]);
+          sequence.width.push(sequence.width[sequence.width.length - 1]);
+          sequence.height.push(sequence.height[sequence.height.length - 1]);
+        }
+      }
+
+      return sequence;
+    }
+
+    /**
+     * Calculate distance between two positions
+     * @param {Object} start - Start position
+     * @param {Object} end - End position
+     * @returns {number} Distance
+     */
+    #calculateDistance(start, end) {
+      const distanceX = end.x - start.x;
+      const distanceY = end.y - start.y;
+      return Math.sqrt(distanceX * distanceX + distanceY * distanceY);
+    }
+
+    /**
+     * Calculate optimal arc parameters
+     * @param {Object} startPosition - Start position
+     * @param {Object} endPosition - End position
+     * @param {number} distance - Distance between positions
+     * @returns {Object} Arc parameters
+     */
+    #calculateOptimalArc(startPosition, endPosition, distance) {
+      // Calculate available space for the arc
+      const availableTopSpace = Math.min(startPosition.y, endPosition.y);
+      const viewportHeight = window.innerHeight;
+      const availableBottomSpace = viewportHeight - Math.max(startPosition.y, endPosition.y);
+
+      // Determine if we should arc downward or upward based on available space
+      const shouldArcDownward = availableBottomSpace > availableTopSpace;
+
+      // Use the space in the direction we're arcing
+      const availableSpace = shouldArcDownward ? availableBottomSpace : availableTopSpace;
+
+      // Limit arc height to a percentage of the available space
+      const arcHeight = Math.min(
+        distance * this.#ARC_CONFIG.ARC_HEIGHT_RATIO,
+        this.#ARC_CONFIG.MAX_ARC_HEIGHT,
+        availableSpace * 0.6
+      );
+
+      return { arcHeight, shouldArcDownward };
+    }
+
+    /**
+     * Finalize the glance opening process
+     * @param {Element|null} imageDataElement - The preview element
+     * @param {Browser} browserElement - The browser element
+     * @param {Function} resolve - Promise resolve function
+     */
+    #finalizeGlanceOpening(imageDataElement, browserElement, resolve) {
+      if (imageDataElement) {
+        imageDataElement.remove();
+      }
+
+      this.browserWrapper.style.transformOrigin = '';
+
+      browserElement.style.minWidth = '';
+      browserElement.style.minHeight = '';
+
+      gBrowser.tabContainer._invalidateCachedTabs();
+      this.overlay.style.removeProperty('overflow');
+      this.browserWrapper.removeAttribute('animate');
+      this.browserWrapper.setAttribute('has-finished-animation', true);
+
+      this.#setAnimationState(false);
+      this.#currentTab.dispatchEvent(new Event('GlanceOpen', { bubbles: true }));
+      resolve(this.#currentTab);
+    }
+
+    /**
+     * Clear container styles while preserving inset
+     * @param {Element} container - The container element
+     */
+    #clearContainerStyles(container) {
       const inset = container.style.inset;
       container.removeAttribute('style');
       container.style.inset = inset;
     }
 
+    /**
+     * Close the current glance
+     * @param {Object} options - Close options
+     * @param {boolean} options.noAnimation - Skip animation
+     * @param {boolean} options.onTabClose - Called during tab close
+     * @param {string} options.setNewID - Set new glance ID
+     * @param {boolean} options.hasFocused - Has focus confirmation
+     * @param {boolean} options.skipPermitUnload - Skip unload permission check
+     * @returns {Promise|undefined} Promise if animated, undefined if immediate
+     */
     closeGlance({
       noAnimation = false,
       onTabClose = false,
       setNewID = null,
-      isDifferent = false,
       hasFocused = false,
       skipPermitUnload = false,
     } = {}) {
-      if (
-        (this._animating && !onTabClose) ||
-        !this.#currentBrowser ||
-        (this.animatingOpen && !onTabClose) ||
-        this._duringOpening
-      ) {
+      if (!this.#canCloseGlance(onTabClose)) {
         return;
       }
 
-      if (!skipPermitUnload) {
-        let { permitUnload } = this.#currentBrowser.permitUnload();
-        if (!permitUnload) {
-          return;
-        }
+      if (!skipPermitUnload && !this.#checkPermitUnload()) {
+        return;
       }
 
       const browserSidebarContainer = this.#currentParentTab?.linkedBrowser?.closest(
         '.browserSidebarContainer'
       );
       const sidebarButtons = this.browserWrapper.querySelector('.zen-glance-sidebar-container');
+
+      if (this.#handleConfirmationTimeout(onTabClose, hasFocused, sidebarButtons)) {
+        return;
+      }
+
+      this.browserWrapper.removeAttribute('has-finished-animation');
+
+      if (noAnimation) {
+        this.#clearContainerStyles(browserSidebarContainer);
+        this.quickCloseGlance({ closeCurrentTab: false });
+        return;
+      }
+
+      return this.#animateGlanceClosing(
+        onTabClose,
+        browserSidebarContainer,
+        sidebarButtons,
+        setNewID
+      );
+    }
+
+    /**
+     * Check if glance can be closed
+     * @param {boolean} onTabClose - Whether this is called during tab close
+     * @returns {boolean} True if can close
+     */
+    #canCloseGlance(onTabClose) {
+      return !(
+        (this._animating && !onTabClose) ||
+        !this.#currentBrowser ||
+        (this.animatingOpen && !onTabClose) ||
+        this._duringOpening
+      );
+    }
+
+    /**
+     * Check if unload is permitted
+     * @returns {boolean} True if unload is permitted
+     */
+    #checkPermitUnload() {
+      const { permitUnload } = this.#currentBrowser.permitUnload();
+      return permitUnload;
+    }
+
+    /**
+     * Handle confirmation timeout for focused close
+     * @param {boolean} onTabClose - Whether this is called during tab close
+     * @param {boolean} hasFocused - Has focus confirmation
+     * @param {Element} sidebarButtons - The sidebar buttons element
+     * @returns {boolean} True if should return early
+     */
+    #handleConfirmationTimeout(onTabClose, hasFocused, sidebarButtons) {
       if (onTabClose && hasFocused && !this.#confirmationTimeout && sidebarButtons) {
-        const cancelButton = sidebarButtons?.querySelector('.zen-glance-sidebar-close');
+        const cancelButton = sidebarButtons.querySelector('.zen-glance-sidebar-close');
         cancelButton.setAttribute('waitconfirmation', true);
         this.#confirmationTimeout = setTimeout(() => {
           cancelButton.removeAttribute('waitconfirmation');
           this.#confirmationTimeout = null;
         }, 3000);
-        return;
-      }
-
-      this.browserWrapper.removeAttribute('has-finished-animation');
-      if (noAnimation) {
-        this._clearContainerStyles(browserSidebarContainer);
-        this.quickCloseGlance({ closeCurrentTab: false });
-        return;
+        return true;
       }
+      return false;
+    }
 
+    /**
+     * Animate the glance closing process
+     * @param {boolean} onTabClose - Whether this is called during tab close
+     * @param {Element} browserSidebarContainer - The sidebar container
+     * @param {Element} sidebarButtons - The sidebar buttons
+     * @param {string} setNewID - New glance ID to set
+     * @returns {Promise} Promise that resolves when closing is complete
+     */
+    #animateGlanceClosing(onTabClose, browserSidebarContainer, sidebarButtons, setNewID) {
       this.closingGlance = true;
       this._animating = true;
 
       gBrowser.moveTabAfter(this.#currentTab, this.#currentParentTab);
 
-      let quikcCloseZen = false;
-      if (onTabClose) {
-        // Create new tab if no more ex
-        if (gBrowser.tabs.length === 1) {
-          BrowserCommands.openTab();
-          return;
-        }
+      if (onTabClose && gBrowser.tabs.length === 1) {
+        BrowserCommands.openTab();
+        return;
       }
 
-      // do NOT touch here, I don't know what it does, but it works...
+      this.#prepareGlanceForClosing();
+      this.#animateSidebarButtons(sidebarButtons);
+      this.#animateParentBackgroundClose(browserSidebarContainer);
+
+      return this.#executeClosingAnimation(setNewID, onTabClose);
+    }
+
+    /**
+     * Prepare glance for closing
+     */
+    #prepareGlanceForClosing() {
+      // Critical: This line must not be touched - it works for unknown reasons
       this.#currentTab.style.display = 'none';
       this.overlay.setAttribute('fade-out', true);
       this.overlay.style.pointerEvents = 'none';
       this.quickCloseGlance({ justAnimateParent: true, clearID: false });
-      const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
+    }
+
+    /**
+     * Animate sidebar buttons out
+     * @param {Element} sidebarButtons - The sidebar buttons element
+     */
+    #animateSidebarButtons(sidebarButtons) {
       if (sidebarButtons) {
         gZenUIManager.motion
           .animate(
             sidebarButtons,
-            {
-              opacity: [1, 0],
-            },
+            { opacity: [1, 0] },
             {
               duration: 0.2,
               type: 'spring',
@@ -317,6 +793,13 @@
             sidebarButtons.remove();
           });
       }
+    }
+
+    /**
+     * Animate parent background restoration
+     * @param {Element} browserSidebarContainer - The sidebar container
+     */
+    #animateParentBackgroundClose(browserSidebarContainer) {
       gZenUIManager.motion
         .animate(
           browserSidebarContainer,
@@ -325,102 +808,199 @@
             opacity: [0.6, 1],
           },
           {
-            duration: 0.4,
+            duration: 0.3,
             type: 'spring',
-            bounce: 0.2,
+            bounce: 0,
           }
         )
         .then(() => {
-          this._clearContainerStyles(browserSidebarContainer);
+          this.#clearContainerStyles(browserSidebarContainer);
         });
+
       this.browserWrapper.style.opacity = 1;
+    }
+
+    /**
+     * Execute the main closing animation
+     * @param {string} setNewID - New glance ID to set
+     * @param {boolean} onTabClose - Whether this is called during tab close
+     * @returns {Promise} Promise that resolves when complete
+     */
+    #executeClosingAnimation(setNewID, onTabClose) {
       return new Promise((resolve) => {
+        const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
+        const elementImageData = this.#glances.get(this.#currentGlanceID).elementImageData;
+
+        this.#addElementPreview(elementImageData);
+
+        // Create curved closing animation sequence
+        const closingData = this.#createClosingDataFromOriginalPosition(originalPosition);
+        const arcSequence = this.#createGlanceArcSequence(closingData, 'closing');
+
         gZenUIManager.motion
-          .animate(
-            this.browserWrapper,
-            {
-              ...originalPosition,
-              opacity: 0,
-            },
-            { type: 'spring', bounce: 0, duration: 0.5, easing: 'ease-in' }
-          )
+          .animate(this.browserWrapper, arcSequence, { duration: 0.4, ease: 'easeOut' })
           .then(() => {
-            this.browserWrapper.removeAttribute('animate');
-            if (!this.#currentParentTab) {
-              return;
+            // Remove element preview after closing animation
+            const elementPreview = this.browserWrapper.querySelector('.zen-glance-element-preview');
+            if (elementPreview) {
+              elementPreview.remove();
             }
-
-            if (!onTabClose || quikcCloseZen) {
-              this.quickCloseGlance({ clearID: false });
-            }
-            this.overlay.removeAttribute('fade-out');
-            this.browserWrapper.removeAttribute('animate');
-
-            const lastCurrentTab = this.#currentTab;
-
-            this.overlay.classList.remove('zen-glance-overlay');
-            gBrowser
-              ._getSwitcher()
-              .setTabStateNoAction(lastCurrentTab, gBrowser.AsyncTabSwitcher.STATE_UNLOADED);
-
-            if (!onTabClose) {
-              this.#currentParentTab._visuallySelected = false;
-            }
-
-            if (
-              this.#currentParentTab.linkedBrowser &&
-              !this.#currentParentTab.hasAttribute('split-view')
-            ) {
-              this.#currentParentTab.linkedBrowser.zenModeActive = false;
-            }
-
-            // reset everything
-            this.browserWrapper = null;
-            this.overlay = null;
-            this.contentWrapper = null;
-
-            lastCurrentTab.removeAttribute('zen-glance-tab');
-            lastCurrentTab._closingGlance = true;
-
-            if (!isDifferent) {
-              gBrowser.selectedTab = this.#currentParentTab;
-            }
-            this._ignoreClose = true;
-            lastCurrentTab.dispatchEvent(new Event('GlanceClose', { bubbles: true }));
-            gBrowser.removeTab(lastCurrentTab, { animate: true, skipPermitUnload: true });
-            gBrowser.tabContainer._invalidateCachedTabs();
-
-            this.#currentParentTab.removeAttribute('glance-id');
-
-            this.#glances.delete(this.#currentGlanceID);
-            this.#currentGlanceID = setNewID;
-
-            this._duringOpening = false;
-
-            this._animating = false;
-            this.closingGlance = false;
-
-            if (this.#currentGlanceID) {
-              this.quickOpenGlance();
-            }
-
-            resolve();
+            this.#finalizeGlanceClosing(setNewID, resolve, onTabClose);
           });
       });
     }
 
-    quickOpenGlance() {
-      if (!this.#currentBrowser || this._duringOpening) {
+    /**
+     * Create closing data from original position for arc animation
+     * @param {Object} originalPosition - Original position object
+     * @returns {Object} Closing data object
+     */
+    #createClosingDataFromOriginalPosition(originalPosition) {
+      // Parse the original position values
+      const top = parseFloat(originalPosition.top) || 0;
+      const left = parseFloat(originalPosition.left) || 0;
+      const width = parseFloat(originalPosition.width) || 0;
+      const height = parseFloat(originalPosition.height) || 0;
+
+      return {
+        clientX: left - width / 2,
+        clientY: top - height / 2,
+        width: width,
+        height: height,
+      };
+    }
+
+    /**
+     * Add element preview if available
+     * @param {string} elementImageData - The element image data
+     */
+    #addElementPreview(elementImageData) {
+      if (elementImageData) {
+        const imageDataElement = document.createXULElement('image');
+        imageDataElement.setAttribute('src', elementImageData);
+        imageDataElement.classList.add('zen-glance-element-preview');
+        this.browserWrapper.prepend(imageDataElement);
+      }
+    }
+
+    /**
+     * Finalize the glance closing process
+     * @param {string} setNewID - New glance ID to set
+     * @param {Function} resolve - Promise resolve function
+     * @param {boolean} onTabClose - Whether this is called during tab close
+     */
+    #finalizeGlanceClosing(setNewID, resolve, onTabClose) {
+      this.browserWrapper.removeAttribute('animate');
+
+      if (!this.#currentParentTab) {
         return;
       }
-      this._duringOpening = true;
 
+      if (!onTabClose) {
+        this.quickCloseGlance({ clearID: false });
+      }
+      this.browserWrapper.style.display = 'none';
+      this.overlay.removeAttribute('fade-out');
+      this.browserWrapper.removeAttribute('animate');
+
+      const lastCurrentTab = this.#currentTab;
+      this.#cleanupGlanceElements(lastCurrentTab);
+      this.#resetGlanceState(setNewID);
+
+      this.#setAnimationState(false);
+      this.closingGlance = false;
+
+      if (this.#currentGlanceID) {
+        this.quickOpenGlance();
+      }
+
+      resolve();
+    }
+
+    /**
+     * Clean up glance DOM elements
+     * @param {Tab} lastCurrentTab - The tab being closed
+     */
+    #cleanupGlanceElements(lastCurrentTab) {
+      this.overlay.classList.remove('zen-glance-overlay');
+      gBrowser
+        ._getSwitcher()
+        .setTabStateNoAction(lastCurrentTab, gBrowser.AsyncTabSwitcher.STATE_UNLOADED);
+
+      if (!this.#currentParentTab.selected) {
+        this.#currentParentTab._visuallySelected = false;
+      }
+
+      if (gBrowser.selectedTab === lastCurrentTab) {
+        gBrowser.selectedTab = this.#currentParentTab;
+      }
+
+      if (
+        this.#currentParentTab.linkedBrowser &&
+        !this.#currentParentTab.hasAttribute('split-view')
+      ) {
+        this.#currentParentTab.linkedBrowser.zenModeActive = false;
+      }
+
+      // Reset overlay references
+      this.browserWrapper = null;
+      this.overlay = null;
+      this.contentWrapper = null;
+
+      lastCurrentTab.removeAttribute('zen-glance-tab');
+      lastCurrentTab._closingGlance = true;
+
+      this.#ignoreClose = true;
+      lastCurrentTab.dispatchEvent(new Event('GlanceClose', { bubbles: true }));
+      gBrowser.removeTab(lastCurrentTab, { animate: true, skipPermitUnload: true });
+      gBrowser.tabContainer._invalidateCachedTabs();
+    }
+
+    /**
+     * Reset glance state
+     * @param {string} setNewID - New glance ID to set
+     */
+    #resetGlanceState(setNewID) {
+      this.#currentParentTab.removeAttribute('glance-id');
+      this.#glances.delete(this.#currentGlanceID);
+      this.#currentGlanceID = setNewID;
+      this._duringOpening = false;
+    }
+
+    /**
+     * Quickly open glance without animation
+     */
+    quickOpenGlance() {
+      if (!this.#currentBrowser || this.#duringOpening) {
+        return;
+      }
+
+      this.#duringOpening = true;
+      this.#configureGlanceElements();
+      this.#setGlanceStates();
+      this.#duringOpening = false;
+    }
+
+    /**
+     * Configure glance DOM elements
+     */
+    #configureGlanceElements() {
       const parentBrowserContainer = this.#currentParentTab.linkedBrowser.closest(
         '.browserSidebarContainer'
       );
+
       parentBrowserContainer.classList.add('zen-glance-background');
       parentBrowserContainer.classList.remove('zen-glance-overlay');
       parentBrowserContainer.classList.add('deck-selected');
+
+      this.overlay.classList.add('deck-selected');
+      this.overlay.classList.add('zen-glance-overlay');
+    }
+
+    /**
+     * Set glance browser and tab states
+     */
+    #setGlanceStates() {
       this.#currentParentTab.linkedBrowser.zenModeActive = true;
       this.#currentParentTab.linkedBrowser.docShellIsActive = true;
       this.#currentBrowser.zenModeActive = true;
@@ -428,13 +1008,16 @@
       this.#currentBrowser.setAttribute('zen-glance-selected', true);
       this.fillOverlay(this.#currentBrowser);
       this.#currentParentTab._visuallySelected = true;
-
-      this.overlay.classList.add('deck-selected');
-      this.overlay.classList.add('zen-glance-overlay');
-
-      this._duringOpening = false;
     }
 
+    /**
+     * Quickly close glance without animation
+     * @param {Object} options - Close options
+     * @param {boolean} options.closeCurrentTab - Close current tab
+     * @param {boolean} options.closeParentTab - Close parent tab
+     * @param {boolean} options.justAnimateParent - Only animate parent
+     * @param {boolean} options.clearID - Clear current glance ID
+     */
     quickCloseGlance({
       closeCurrentTab = true,
       closeParentTab = true,
@@ -445,127 +1028,217 @@
       const browserContainer = this.#currentParentTab.linkedBrowser.closest(
         '.browserSidebarContainer'
       );
-      if (parentHasBrowser) {
-        browserContainer.classList.remove('zen-glance-background');
-      }
+
+      this.#removeParentBackground(parentHasBrowser, browserContainer);
+
       if (!justAnimateParent && this.overlay) {
-        if (parentHasBrowser && !this.#currentParentTab.hasAttribute('split-view')) {
-          if (closeParentTab) {
-            browserContainer.classList.remove('deck-selected');
-          }
-          this.#currentParentTab.linkedBrowser.zenModeActive = false;
-        }
-        this.#currentBrowser.zenModeActive = false;
-        if (closeParentTab && parentHasBrowser) {
-          this.#currentParentTab.linkedBrowser.docShellIsActive = false;
-        }
-        if (closeCurrentTab) {
-          this.#currentBrowser.docShellIsActive = false;
-          this.overlay.classList.remove('deck-selected');
-          this.#currentTab._selected = false;
-        }
-        if (!this.#currentParentTab._visuallySelected && closeParentTab) {
-          this.#currentParentTab._visuallySelected = false;
-        }
-        this.#currentBrowser.removeAttribute('zen-glance-selected');
-        this.overlay.classList.remove('zen-glance-overlay');
+        this.#resetGlanceStates(
+          closeCurrentTab,
+          closeParentTab,
+          parentHasBrowser,
+          browserContainer
+        );
       }
+
       if (clearID) {
         this.#currentGlanceID = null;
       }
     }
 
+    /**
+     * Remove parent background styling
+     * @param {boolean} parentHasBrowser - Whether parent has browser
+     * @param {Element} browserContainer - The browser container
+     */
+    #removeParentBackground(parentHasBrowser, browserContainer) {
+      if (parentHasBrowser) {
+        browserContainer.classList.remove('zen-glance-background');
+      }
+    }
+
+    /**
+     * Reset glance states
+     * @param {boolean} closeCurrentTab - Whether to close current tab
+     * @param {boolean} closeParentTab - Whether to close parent tab
+     * @param {boolean} parentHasBrowser - Whether parent has browser
+     * @param {Element} browserContainer - The browser container
+     */
+    #resetGlanceStates(closeCurrentTab, closeParentTab, parentHasBrowser, browserContainer) {
+      if (parentHasBrowser && !this.#currentParentTab.hasAttribute('split-view')) {
+        if (closeParentTab) {
+          browserContainer.classList.remove('deck-selected');
+        }
+        this.#currentParentTab.linkedBrowser.zenModeActive = false;
+      }
+
+      this.#currentBrowser.zenModeActive = false;
+
+      if (closeParentTab && parentHasBrowser) {
+        this.#currentParentTab.linkedBrowser.docShellIsActive = false;
+      }
+
+      if (closeCurrentTab) {
+        this.#currentBrowser.docShellIsActive = false;
+        this.overlay.classList.remove('deck-selected');
+        this.#currentTab._selected = false;
+      }
+
+      if (!this.#currentParentTab._visuallySelected && closeParentTab) {
+        this.#currentParentTab._visuallySelected = false;
+      }
+
+      this.#currentBrowser.removeAttribute('zen-glance-selected');
+      this.overlay.classList.remove('zen-glance-overlay');
+    }
+
+    /**
+     * Open glance on location change if not animating
+     */
     onLocationChangeOpenGlance() {
       if (!this.animatingOpen) {
         this.quickOpenGlance();
       }
     }
 
-    // note: must be sync to avoid timing issues
+    /**
+     * Handle location change events
+     * Note: Must be sync to avoid timing issues
+     * @param {Event} event - The location change event
+     */
     onLocationChange(event) {
       const tab = event.target;
+
       if (this.animatingFullOpen || this.closingGlance) {
         return;
       }
-      if (this._duringOpening || !tab.hasAttribute('glance-id')) {
-        if (this.#currentGlanceID && !this._duringOpening) {
+
+      if (this.#duringOpening || !tab.hasAttribute('glance-id')) {
+        if (this.#currentGlanceID && !this.#duringOpening) {
           this.quickCloseGlance();
         }
         return;
       }
+
       if (this.#currentGlanceID && this.#currentGlanceID !== tab.getAttribute('glance-id')) {
         this.quickCloseGlance();
       }
+
       this.#currentGlanceID = tab.getAttribute('glance-id');
+
       if (gBrowser.selectedTab === this.#currentParentTab && this.#currentBrowser) {
-        const curTab = this.#currentTab;
-        const prevTab = event.detail.previousTab;
-        setTimeout(() => {
-          gBrowser.selectedTab = curTab;
-          if (prevTab?.linkedBrowser) {
-            prevTab.linkedBrowser
-              .closest('.browserSidebarContainer')
-              .classList.remove('deck-selected');
-          }
-        }, 0);
+        this.#handleParentTabSelection(event);
       } else if (gBrowser.selectedTab === this.#currentTab) {
         setTimeout(this.onLocationChangeOpenGlance.bind(this), 0);
       }
     }
 
+    /**
+     * Handle parent tab selection
+     * @param {Event} event - The location change event
+     */
+    #handleParentTabSelection(event) {
+      const curTab = this.#currentTab;
+      const prevTab = event.detail.previousTab;
+
+      setTimeout(() => {
+        gBrowser.selectedTab = curTab;
+        if (prevTab?.linkedBrowser) {
+          prevTab.linkedBrowser
+            .closest('.browserSidebarContainer')
+            .classList.remove('deck-selected');
+        }
+      }, 0);
+    }
+
+    /**
+     * Handle tab close events
+     * @param {Event} event - The tab close event
+     */
     onTabClose(event) {
       if (event.target === this.#currentParentTab) {
         this.closeGlance({ onTabClose: true });
       }
     }
 
+    /**
+     * Manage tab close for glance tabs
+     * @param {Tab} tab - The tab being closed
+     * @returns {boolean} Whether to continue with tab close
+     */
     manageTabClose(tab) {
-      if (tab.hasAttribute('glance-id')) {
-        const oldGlanceID = this.#currentGlanceID;
-        const newGlanceID = tab.getAttribute('glance-id');
-        this.#currentGlanceID = newGlanceID;
-        const isDifferent = newGlanceID !== oldGlanceID;
-        if (this._ignoreClose) {
-          this._ignoreClose = false;
-          return false;
-        }
-        this.closeGlance({
-          onTabClose: true,
-          setNewID: isDifferent ? oldGlanceID : null,
-          isDifferent,
-        });
-        // only keep continueing tab close if we are not on the currently selected tab
-        return !isDifferent;
+      if (!tab.hasAttribute('glance-id')) {
+        return false;
       }
-      return false;
+
+      const oldGlanceID = this.#currentGlanceID;
+      const newGlanceID = tab.getAttribute('glance-id');
+      this.#currentGlanceID = newGlanceID;
+      const isDifferent = newGlanceID !== oldGlanceID;
+
+      if (this.#ignoreClose) {
+        this.#ignoreClose = false;
+        return false;
+      }
+
+      this.closeGlance({
+        onTabClose: true,
+        setNewID: isDifferent ? oldGlanceID : null,
+      });
+
+      // Only continue tab close if we are not on the currently selected tab
+      return !isDifferent;
     }
 
+    /**
+     * Check if two tabs have different domains
+     * @param {Tab} tab1 - First tab
+     * @param {nsIURI} url2 - Second URL
+     * @returns {boolean} True if domains differ
+     */
     tabDomainsDiffer(tab1, url2) {
       try {
         if (!tab1) {
           return true;
         }
-        let url1 = tab1.linkedBrowser.currentURI.spec;
+
+        const url1 = tab1.linkedBrowser.currentURI.spec;
         if (url1.startsWith('about:')) {
           return true;
         }
-        // https://github.com/zen-browser/desktop/issues/7173: Only glance up links that are http(s) or file
+
+        // Only glance up links that are http(s) or file
+        // https://github.com/zen-browser/desktop/issues/7173
         const url2Spec = url2.spec;
-        if (
-          !url2Spec.startsWith('http') &&
-          !url2Spec.startsWith('https') &&
-          !url2Spec.startsWith('file')
-        ) {
+        if (!this.#isValidGlanceUrl(url2Spec)) {
           return false;
         }
+
         return Services.io.newURI(url1).host !== url2.host;
       } catch {
         return true;
       }
     }
 
+    /**
+     * Check if URL is valid for glance
+     * @param {string} urlSpec - The URL spec
+     * @returns {boolean} True if valid
+     */
+    #isValidGlanceUrl(urlSpec) {
+      return (
+        urlSpec.startsWith('http') || urlSpec.startsWith('https') || urlSpec.startsWith('file')
+      );
+    }
+
+    /**
+     * Check if a tab should be opened in glance
+     * @param {Tab} tab - The tab to check
+     * @param {nsIURI} uri - The URI to check
+     * @returns {boolean} True if should open in glance
+     */
     shouldOpenTabInGlance(tab, uri) {
-      let owner = tab.owner;
+      const owner = tab.owner;
+
       return (
         owner &&
         owner.pinned &&
@@ -576,86 +1249,138 @@
       );
     }
 
+    /**
+     * Handle tab open events
+     * @param {Browser} browser - The browser element
+     * @param {nsIURI} uri - The URI being opened
+     */
     onTabOpen(browser, uri) {
-      let tab = gBrowser.getTabForBrowser(browser);
+      const tab = gBrowser.getTabForBrowser(browser);
       if (!tab) {
         return;
       }
+
       try {
         if (this.shouldOpenTabInGlance(tab, uri)) {
-          const browserRect = gBrowser.tabbox.getBoundingClientRect();
-          this.openGlance(
-            {
-              url: undefined,
-              ...(gZenUIManager._lastClickPosition || {
-                clientX: browserRect.width / 2,
-                clientY: browserRect.height / 2,
-              }),
-              width: 0,
-              height: 0,
-            },
-            tab,
-            tab.owner
-          );
+          this.#openGlanceForTab(tab);
         }
       } catch (e) {
-        console.error(e);
+        console.error('Error opening glance for tab:', e);
       }
     }
 
+    /**
+     * Open glance for a specific tab
+     * @param {Tab} tab - The tab to open glance for
+     */
+    #openGlanceForTab(tab) {
+      const browserRect = window.windowUtils.getBoundsWithoutFlushing(gBrowser.tabbox);
+      const clickPosition = gZenUIManager._lastClickPosition || {
+        clientX: browserRect.width / 2,
+        clientY: browserRect.height / 2,
+      };
+
+      this.openGlance(
+        {
+          url: undefined,
+          ...clickPosition,
+          width: 0,
+          height: 0,
+        },
+        tab,
+        tab.owner
+      );
+    }
+
+    /**
+     * Finish opening glance and clean up
+     */
     finishOpeningGlance() {
       gBrowser.tabContainer._invalidateCachedTabs();
       gZenWorkspaces.updateTabsContainers();
       this.overlay.classList.remove('zen-glance-overlay');
-      this._clearContainerStyles(this.browserWrapper);
+      this.#clearContainerStyles(this.browserWrapper);
       this.animatingFullOpen = false;
       this.closeGlance({ noAnimation: true, skipPermitUnload: true });
       this.#glances.delete(this.#currentGlanceID);
     }
 
+    /**
+     * Fully open glance (convert to regular tab)
+     * @param {Object} options - Options for full opening
+     * @param {boolean} options.forSplit - Whether this is for split view
+     */
     async fullyOpenGlance({ forSplit = false } = {}) {
-      // If there is no active glance, do nothing
       if (!this.#currentGlanceID || !this.#currentTab) {
         return;
       }
+
       this.animatingFullOpen = true;
       this.#currentTab.setAttribute('zen-dont-split-glance', true);
 
+      this.#handleZenFolderPinning();
+      gBrowser.moveTabAfter(this.#currentTab, this.#currentParentTab);
+
+      const browserRect = window.windowUtils.getBoundsWithoutFlushing(this.browserWrapper);
+      this.#prepareTabForFullOpen();
+
+      const sidebarButtons = this.browserWrapper.querySelector('.zen-glance-sidebar-container');
+      if (sidebarButtons) {
+        sidebarButtons.remove();
+      }
+
+      if (forSplit) {
+        this.finishOpeningGlance();
+        return;
+      }
+
+      if (gReduceMotion) {
+        gZenViewSplitter.deactivateCurrentSplitView();
+        this.finishOpeningGlance();
+        return;
+      }
+
+      await this.#animateFullOpen(browserRect);
+      this.finishOpeningGlance();
+    }
+
+    /**
+     * Handle Zen folder pinning if applicable
+     */
+    #handleZenFolderPinning() {
       const isZenFolder = this.#currentParentTab?.group?.isZenFolder;
       if (Services.prefs.getBoolPref('zen.folders.owned-tabs-in-folder') && isZenFolder) {
         gBrowser.pinTab(this.#currentTab);
       }
+    }
 
-      gBrowser.moveTabAfter(this.#currentTab, this.#currentParentTab);
-
-      const browserRect = window.windowUtils.getBoundsWithoutFlushing(this.browserWrapper);
+    /**
+     * Prepare tab for full opening
+     */
+    #prepareTabForFullOpen() {
       this.#currentTab.removeAttribute('zen-glance-tab');
-      this._clearContainerStyles(this.browserWrapper);
+      this.#clearContainerStyles(this.browserWrapper);
       this.#currentTab.removeAttribute('glance-id');
       this.#currentParentTab.removeAttribute('glance-id');
       gBrowser.selectedTab = this.#currentTab;
+
       this.#currentParentTab.linkedBrowser
         .closest('.browserSidebarContainer')
         .classList.remove('zen-glance-background');
       this.#currentParentTab._visuallySelected = false;
       gBrowser.TabStateFlusher.flush(this.#currentTab.linkedBrowser);
-      const sidebarButtons = this.browserWrapper.querySelector('.zen-glance-sidebar-container');
-      if (sidebarButtons) {
-        sidebarButtons.remove();
-      }
-      if (forSplit) {
-        this.finishOpeningGlance();
-        return;
-      }
-      if (gReduceMotion || forSplit) {
-        gZenViewSplitter.deactivateCurrentSplitView();
-        this.finishOpeningGlance();
-        return;
-      }
-      // Write the styles early to avoid flickering
+    }
+
+    /**
+     * Animate the full opening process
+     * @param {Object} browserRect - The browser rectangle
+     */
+    async #animateFullOpen(browserRect) {
+      // Write styles early to avoid flickering
       this.browserWrapper.style.opacity = 1;
       this.browserWrapper.style.width = `${browserRect.width}px`;
       this.browserWrapper.style.height = `${browserRect.height}px`;
+
       await gZenUIManager.motion.animate(
         this.browserWrapper,
         {
@@ -668,67 +1393,114 @@
           bounce: 0,
         }
       );
+
       this.browserWrapper.style.width = '';
       this.browserWrapper.style.height = '';
       this.browserWrapper.style.opacity = '';
       gZenViewSplitter.deactivateCurrentSplitView({ removeDeckSelected: true });
-      this.finishOpeningGlance();
     }
 
+    /**
+     * Open glance for bookmark activation
+     * @param {Event} event - The bookmark click event
+     * @returns {boolean} False to prevent default behavior
+     */
     openGlanceForBookmark(event) {
       const activationMethod = Services.prefs.getStringPref('zen.glance.activation-method', 'ctrl');
 
-      if (activationMethod === 'ctrl' && !event.ctrlKey) {
-        return;
-      } else if (activationMethod === 'alt' && !event.altKey) {
-        return;
-      } else if (activationMethod === 'shift' && !event.shiftKey) {
-        return;
-      } else if (activationMethod === 'meta' && !event.metaKey) {
-        return;
-      } else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
+      if (!this.#isActivationKeyPressed(event, activationMethod)) {
         return;
       }
 
       event.preventDefault();
       event.stopPropagation();
 
-      const rect = event.target.getBoundingClientRect();
-      const data = {
+      const data = this.#createGlanceDataFromBookmark(event);
+      this.openGlance(data);
+
+      return false;
+    }
+
+    /**
+     * Check if the correct activation key is pressed
+     * @param {Event} event - The event
+     * @param {string} activationMethod - The activation method
+     * @returns {boolean} True if key is pressed
+     */
+    #isActivationKeyPressed(event, activationMethod) {
+      const keyMap = {
+        ctrl: event.ctrlKey,
+        alt: event.altKey,
+        shift: event.shiftKey,
+        meta: event.metaKey,
+      };
+
+      return keyMap[activationMethod] || false;
+    }
+
+    /**
+     * Create glance data from bookmark event
+     * @param {Event} event - The bookmark event
+     * @returns {Object} Glance data object
+     */
+    #createGlanceDataFromBookmark(event) {
+      const rect = window.windowUtils.getBoundsWithoutFlushing(event.target);
+      return {
         url: event.target._placesNode.uri,
         clientX: rect.left,
         clientY: rect.top,
         width: rect.width,
         height: rect.height,
       };
-
-      this.openGlance(data);
-
-      return false;
     }
 
+    /**
+     * Get the focused tab based on direction
+     * @param {number} aDir - Direction (-1 for parent, 1 for current)
+     * @returns {Tab} The focused tab
+     */
     getFocusedTab(aDir) {
       return aDir < 0 ? this.#currentParentTab : this.#currentTab;
     }
 
+    /**
+     * Split the current glance into a split view
+     */
     async splitGlance() {
-      if (this.#currentGlanceID) {
-        const currentTab = this.#currentTab;
-        const currentParentTab = this.#currentParentTab;
+      if (!this.#currentGlanceID) {
+        return;
+      }
 
-        const isZenFolder = currentParentTab?.group?.isZenFolder;
-        if (Services.prefs.getBoolPref('zen.folders.owned-tabs-in-folder') && isZenFolder) {
-          gBrowser.pinTab(currentTab);
-        }
-        await this.fullyOpenGlance({ forSplit: true });
-        gZenViewSplitter.splitTabs([currentTab, currentParentTab], 'vsep', 1);
-        const browserContainer = currentTab.linkedBrowser?.closest('.browserSidebarContainer');
-        if (!gReduceMotion && browserContainer) {
-          gZenViewSplitter.animateBrowserDrop(browserContainer);
-        }
+      const currentTab = this.#currentTab;
+      const currentParentTab = this.#currentParentTab;
+
+      this.#handleZenFolderPinningForSplit(currentParentTab);
+      await this.fullyOpenGlance({ forSplit: true });
+
+      gZenViewSplitter.splitTabs([currentTab, currentParentTab], 'vsep', 1);
+
+      const browserContainer = currentTab.linkedBrowser?.closest('.browserSidebarContainer');
+      if (!gReduceMotion && browserContainer) {
+        gZenViewSplitter.animateBrowserDrop(browserContainer);
       }
     }
 
+    /**
+     * Handle Zen folder pinning for split view
+     * @param {Tab} parentTab - The parent tab
+     */
+    #handleZenFolderPinningForSplit(parentTab) {
+      const isZenFolder = parentTab?.group?.isZenFolder;
+      if (Services.prefs.getBoolPref('zen.folders.owned-tabs-in-folder') && isZenFolder) {
+        gBrowser.pinTab(this.#currentTab);
+      }
+    }
+
+    /**
+     * Get the tab or its glance parent
+     * @param {Tab} tab - The tab to check
+     * @returns {Tab} The tab or its parent
+     */
     getTabOrGlanceParent(tab) {
       if (tab?.hasAttribute('glance-id') && this.#glances) {
         const parentTab = this.#glances.get(tab.getAttribute('glance-id'))?.parentTab;
@@ -739,52 +1511,89 @@
       return tab;
     }
 
+    /**
+     * Check if deck should remain selected
+     * @param {Element} currentPanel - Current panel
+     * @param {Element} oldPanel - Previous panel
+     * @returns {boolean} True if deck should remain selected
+     */
     shouldShowDeckSelected(currentPanel, oldPanel) {
-      // Dont remove if it's a glance background and current panel corresponds to a glance
       const currentBrowser = currentPanel?.querySelector('browser');
       const oldBrowser = oldPanel?.querySelector('browser');
+
       if (!currentBrowser || !oldBrowser) {
         return false;
       }
+
       const currentTab = gBrowser.getTabForBrowser(currentBrowser);
       const oldTab = gBrowser.getTabForBrowser(oldBrowser);
-      if (currentTab && oldTab) {
-        const currentGlanceID = currentTab.getAttribute('glance-id');
-        const oldGlanceID = oldTab.getAttribute('glance-id');
-        if (currentGlanceID && oldGlanceID) {
-          return (
-            currentGlanceID === oldGlanceID && oldPanel.classList.contains('zen-glance-background')
-          );
-        }
+
+      if (!currentTab || !oldTab) {
+        return false;
       }
+
+      const currentGlanceID = currentTab.getAttribute('glance-id');
+      const oldGlanceID = oldTab.getAttribute('glance-id');
+
+      if (currentGlanceID && oldGlanceID) {
+        return (
+          currentGlanceID === oldGlanceID && oldPanel.classList.contains('zen-glance-background')
+        );
+      }
+
       return false;
     }
 
+    /**
+     * Handle search select command
+     * @param {string} where - Where to open the search result
+     */
     onSearchSelectCommand(where) {
-      // Check if Glance is globally enabled and specifically enabled for contextmenu/search
-      if (
-        !Services.prefs.getBoolPref('zen.glance.enabled', false) ||
-        !Services.prefs.getBoolPref('zen.glance.enable-contextmenu-search', true)
-      ) {
+      if (!this.#isGlanceEnabledForSearch()) {
         return;
       }
+
       if (where !== 'tab') {
         return;
       }
+
       const currentTab = gBrowser.selectedTab;
       const parentTab = currentTab.owner;
+
       if (!parentTab || parentTab.hasAttribute('glance-id')) {
         return;
       }
-      // Open a new glance if the current tab is a glance tab
-      const browserRect = gBrowser.tabbox.getBoundingClientRect();
+
+      this.#openGlanceForSearch(currentTab, parentTab);
+    }
+
+    /**
+     * Check if glance is enabled for search
+     * @returns {boolean} True if enabled
+     */
+    #isGlanceEnabledForSearch() {
+      return (
+        Services.prefs.getBoolPref('zen.glance.enabled', false) &&
+        Services.prefs.getBoolPref('zen.glance.enable-contextmenu-search', true)
+      );
+    }
+
+    /**
+     * Open glance for search result
+     * @param {Tab} currentTab - Current tab
+     * @param {Tab} parentTab - Parent tab
+     */
+    #openGlanceForSearch(currentTab, parentTab) {
+      const browserRect = window.windowUtils.getBoundsWithoutFlushing(gBrowser.tabbox);
+      const clickPosition = gZenUIManager._lastClickPosition || {
+        clientX: browserRect.width / 2,
+        clientY: browserRect.height / 2,
+      };
+
       this.openGlance(
         {
           url: undefined,
-          ...(gZenUIManager._lastClickPosition || {
-            clientX: browserRect.width / 2,
-            clientY: browserRect.height / 2,
-          }),
+          ...clickPosition,
           width: 0,
           height: 0,
         },
@@ -796,6 +1605,9 @@
 
   window.gZenGlanceManager = new nsZenGlanceManager();
 
+  /**
+   * Register window actors for glance functionality
+   */
   function registerWindowActors() {
     gZenActorsManager.addJSWindowActor('ZenGlance', {
       parent: {
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index c1cb21a6e..d78805321 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -2,11 +2,10 @@
 // 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/.
 export class ZenGlanceChild extends JSWindowActorChild {
+  #activationMethod;
+
   constructor() {
     super();
-
-    this.mouseUpListener = this.handleMouseUp.bind(this);
-    this.mouseDownListener = this.handleMouseDown.bind(this);
     this.clickListener = this.handleClick.bind(this);
   }
 
@@ -22,51 +21,34 @@ export class ZenGlanceChild extends JSWindowActorChild {
     }
   }
 
-  async getActivationMethod() {
-    if (this._activationMethod === undefined) {
-      this._activationMethod = await this.sendQuery('ZenGlance:GetActivationMethod');
-    }
-    return this._activationMethod;
-  }
-
-  async getHoverActivationDelay() {
-    if (this._hoverActivationDelay === undefined) {
-      this._hoverActivationDelay = await this.sendQuery('ZenGlance:GetHoverActivationDelay');
-    }
-    return this._hoverActivationDelay;
+  async #initActivationMethod() {
+    this.#activationMethod = await this.sendQuery('ZenGlance:GetActivationMethod');
   }
 
   async initiateGlance() {
     this.mouseIsDown = false;
-    const activationMethod = await this.getActivationMethod();
-    if (activationMethod === 'mantain') {
-      this.contentWindow.addEventListener('mousedown', this.mouseDownListener);
-      this.contentWindow.addEventListener('mouseup', this.mouseUpListener);
-
-      this.contentWindow.document.removeEventListener('click', this.clickListener);
-    } else if (
-      activationMethod === 'ctrl' ||
-      activationMethod === 'alt' ||
-      activationMethod === 'shift'
-    ) {
-      this.contentWindow.document.addEventListener('click', this.clickListener, { capture: true });
-
-      this.contentWindow.removeEventListener('mousedown', this.mouseDownListener);
-      this.contentWindow.removeEventListener('mouseup', this.mouseUpListener);
-    }
+    await this.#initActivationMethod();
+    this.contentWindow.document.addEventListener('click', this.clickListener, { capture: true });
   }
 
   ensureOnlyKeyModifiers(event) {
     return !(event.ctrlKey ^ event.altKey ^ event.shiftKey ^ event.metaKey);
   }
 
-  openGlance(target) {
+  openGlance(target, originalTarget) {
     let url = target.href;
     // Add domain to relative URLs
     if (!url.match(/^(?:[a-z]+:)?\/\//i)) {
       url = this.contentWindow.location.origin + url;
     }
-    const rect = target.getBoundingClientRect();
+    // Get the largest element we can get. If the `A` element
+    // is a parent of the original target, use the anchor element,
+    // otherwise use the original target.
+    let rect = originalTarget.getBoundingClientRect();
+    const anchorRect = target.getBoundingClientRect();
+    if (anchorRect.width * anchorRect.height > rect.width * rect.height) {
+      rect = anchorRect;
+    }
     this.sendAsyncMessage('ZenGlance:OpenGlance', {
       url,
       clientX: rect.left,
@@ -76,35 +58,11 @@ export class ZenGlanceChild extends JSWindowActorChild {
     });
   }
 
-  handleMouseUp(event) {
-    if (this.hasClicked) {
-      event.preventDefault();
-      event.stopPropagation();
-      this.hasClicked = false;
-    }
-    this.mouseIsDown = null;
-  }
-
-  async handleMouseDown(event) {
-    const target = event.target.closest('A');
-    if (!target) {
-      return;
-    }
-    this.mouseIsDown = target;
-    const hoverActivationDelay = await this.getHoverActivationDelay();
-    this.contentWindow.setTimeout(() => {
-      if (this.mouseIsDown === target) {
-        this.hasClicked = true;
-        this.openGlance(target);
-      }
-    }, hoverActivationDelay);
-  }
-
   handleClick(event) {
     if (this.ensureOnlyKeyModifiers(event) || event.button !== 0 || event.defaultPrevented) {
       return;
     }
-    const activationMethod = this._activationMethod;
+    const activationMethod = this.#activationMethod;
     if (activationMethod === 'ctrl' && !event.ctrlKey) {
       return;
     } else if (activationMethod === 'alt' && !event.altKey) {
@@ -113,8 +71,6 @@ export class ZenGlanceChild extends JSWindowActorChild {
       return;
     } else if (activationMethod === 'meta' && !event.metaKey) {
       return;
-    } else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
-      return;
     }
     // get closest A element
     const target = event.target.closest('A');
@@ -122,7 +78,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
       event.preventDefault();
       event.stopPropagation();
 
-      this.openGlance(target);
+      this.openGlance(target, event.originalTarget || event.target);
     }
   }
 
diff --git a/src/zen/glance/actors/ZenGlanceParent.sys.mjs b/src/zen/glance/actors/ZenGlanceParent.sys.mjs
index b6d5c9b12..0939cd47a 100644
--- a/src/zen/glance/actors/ZenGlanceParent.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceParent.sys.mjs
@@ -11,9 +11,6 @@ export class ZenGlanceParent extends JSWindowActorParent {
       case 'ZenGlance:GetActivationMethod': {
         return Services.prefs.getStringPref('zen.glance.activation-method', 'ctrl');
       }
-      case 'ZenGlance:GetHoverActivationDelay': {
-        return Services.prefs.getIntPref('zen.glance.hold-duration', 500);
-      }
       case 'ZenGlance:OpenGlance': {
         this.openGlance(this.browsingContext.topChromeWindow, message.data);
         break;
@@ -31,7 +28,38 @@ export class ZenGlanceParent extends JSWindowActorParent {
     }
   }
 
-  openGlance(window, data) {
+  #imageBitmapToBase64(imageBitmap) {
+    // 1. Create a canvas with the same size as the ImageBitmap
+    const canvas = this.browsingContext.topChromeWindow.document.createElement('canvas');
+    canvas.width = imageBitmap.width;
+    canvas.height = imageBitmap.height;
+
+    // 2. Draw the ImageBitmap onto the canvas
+    const ctx = canvas.getContext('2d');
+    ctx.drawImage(imageBitmap, 0, 0);
+
+    // 3. Convert the canvas content to a Base64 string (PNG by default)
+    const base64String = canvas.toDataURL('image/png');
+    return base64String;
+  }
+
+  async openGlance(window, data) {
+    const win = this.browsingContext.topChromeWindow;
+    const tabPanels = win.gBrowser.tabpanels;
+    // Make the rect relative to the tabpanels. We dont do it directly on the
+    // content process since it does not take into account scroll. This way, we can
+    // be sure that the coordinates are correct.
+    const tabPanelsRect = tabPanels.getBoundingClientRect();
+    const rect = new DOMRect(
+      data.clientX + tabPanelsRect.left,
+      data.clientY + tabPanelsRect.top,
+      data.width,
+      data.height
+    );
+    const elementData = await this.#imageBitmapToBase64(
+      await win.browsingContext.currentWindowGlobal.drawSnapshot(rect, 1, 'transparent', true)
+    );
+    data.elementData = elementData;
     window.gZenGlanceManager.openGlance(data);
   }
 }
diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css
index f59f20b79..55bb59932 100644
--- a/src/zen/glance/zen-glance.css
+++ b/src/zen/glance/zen-glance.css
@@ -14,11 +14,11 @@
   gap: 12px;
   max-width: 56px;
 
-  :root[zen-right-side='true'] & {
+  :root:not([zen-right-side='true']) & {
     left: 100%;
   }
 
-  :root:not([zen-right-side='true']) & {
+  :root[zen-right-side='true'] & {
     right: 100%;
   }
 
@@ -99,7 +99,7 @@
 }
 
 .browserSidebarContainer.zen-glance-background,
-.browserSidebarContainer.zen-glance-overlay .browserContainer {
+.browserSidebarContainer.zen-glance-overlay .browserContainer:not([fade-out='true']) {
   border-radius: var(--zen-native-inner-radius);
   box-shadow: var(--zen-big-shadow);
 }
@@ -116,14 +116,19 @@
   }
 
   & .browserContainer {
-    background: light-dark(rgb(255, 255, 255), rgb(32, 32, 32));
+    transform: translate(-50%, -50%);
     position: fixed;
-    opacity: 0;
     top: 0;
     left: 0;
     flex: unset !important;
     /* Promote to its own layer during transitions to reduce jank */
-    will-change: transform, opacity, top, left, width, height;
+    will-change: transform, top, left;
+    width: 85%;
+    height: 100%;
+
+    &:not([has-finished-animation='true']) #statuspanel {
+      display: none;
+    }
 
     &[has-finished-animation='true'] {
       position: relative !important;
@@ -140,10 +145,15 @@
     }
 
     & browser {
+      background: light-dark(rgb(255, 255, 255), rgb(32, 32, 32)) !important;
       width: 100%;
       height: 100%;
       opacity: 1;
-      transition: opacity 0.2s ease-in-out;
+      transition: opacity 0.08s;
+
+      @starting-style {
+        opacity: 0;
+      }
     }
 
     &[animate='true'] {
@@ -153,8 +163,17 @@
 
   &[fade-out='true'] {
     & browser {
-      transition: opacity 0.2s ease;
+      transition: opacity 0.25s ease-in-out;
       opacity: 0;
     }
   }
 }
+
+.zen-glance-element-preview {
+  position: absolute;
+  pointer-events: none;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
+  border-radius: var(--zen-native-inner-radius);
+}
diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs
index 2dd3c6424..9e8436691 100644
--- a/src/zen/split-view/ZenViewSplitter.mjs
+++ b/src/zen/split-view/ZenViewSplitter.mjs
@@ -958,10 +958,7 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
    * @returns {Element} The tab browser panel.
    */
   get tabBrowserPanel() {
-    if (!this._tabBrowserPanel) {
-      this._tabBrowserPanel = document.getElementById('tabbrowser-tabpanels');
-    }
-    return this._tabBrowserPanel;
+    return gBrowser.tabpanels;
   }
 
   get splitViewActive() {
diff --git a/src/zen/tests/glance/browser.toml b/src/zen/tests/glance/browser.toml
index 7f231bbff..6098fbf07 100644
--- a/src/zen/tests/glance/browser.toml
+++ b/src/zen/tests/glance/browser.toml
@@ -13,3 +13,4 @@ support-files = [
 ["browser_glance_next_tab.js"]
 ["browser_glance_prev_tab.js"]
 ["browser_glance_select_parent.js"]
+["browser_glance_close_select.js"]
diff --git a/src/zen/tests/glance/browser_glance_close_select.js b/src/zen/tests/glance/browser_glance_close_select.js
new file mode 100644
index 000000000..e073ec53a
--- /dev/null
+++ b/src/zen/tests/glance/browser_glance_close_select.js
@@ -0,0 +1,36 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+async function openAndCloseGlance() {
+  await openGlanceOnTab(async (glanceTab) => {
+    ok(
+      glanceTab.hasAttribute('zen-glance-tab'),
+      'The glance tab should have the zen-glance-tab attribute'
+    );
+  });
+}
+
+add_task(async function test_Glance_Close_No_Tabs() {
+  const currentTab = gBrowser.selectedTab;
+  await openAndCloseGlance();
+  Assert.equal(gBrowser.selectedTab, currentTab, 'The original tab should be selected');
+  ok(currentTab.selected, 'The original tab should be visually selected');
+});
+
+add_task(async function test_Glance_Close_With_Next_Tab() {
+  const originalTab = gBrowser.selectedTab;
+  await BrowserTestUtils.withNewTab(
+    { url: 'http://example.com', gBrowser, waitForLoad: false },
+    async function () {
+      const selectedTab = gBrowser.selectedTab;
+      Assert.notEqual(selectedTab, originalTab, 'A new tab should be selected');
+      await openAndCloseGlance();
+      Assert.equal(gBrowser.selectedTab, selectedTab, 'The new tab should still be selected');
+      ok(selectedTab.selected, 'The new tab should be visually selected');
+
+      gBrowser.selectedTab = originalTab;
+    }
+  );
+});
diff --git a/src/zen/tests/ignorePrefs.json b/src/zen/tests/ignorePrefs.json
index 25c2cf37a..b7244e654 100644
--- a/src/zen/tests/ignorePrefs.json
+++ b/src/zen/tests/ignorePrefs.json
@@ -1,6 +1,14 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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/.
+//
+// This file lists preferences that are ignored when running mochitests.
+// Add here any preference that is not relevant for testing Zen Modus.
+// This prevents unnecessary test re-runs when these preferences are changed.
 [
   "zen.mods.updated-value-observer",
   "zen.mods.last-update",
   "zen.view.compact.enable-at-startup",
+  "zen.urlbar.suggestions-learner",
   "browser.newtabpage.activity-stream.trendingSearch.defaultSearchEngine"
 ]

From 2dd185288d2e5bfa3840989078bca3f5dd2c07b9 Mon Sep 17 00:00:00 2001
From: alightsoulmate <2314297572@qq.com>
Date: Mon, 6 Oct 2025 01:00:19 +0800
Subject: [PATCH 033/111] Fix: Unexpected Spelling in Theme Configuration Page,
 p=#10696

Co-authored-by: Mr. M <mr.m@tuta.com>
---
 prefs/theme.yaml                            |  2 +-
 src/zen/common/ZenUIMigration.sys.mjs       | 10 +++++++++-
 src/zen/workspaces/ZenGradientGenerator.mjs |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/prefs/theme.yaml b/prefs/theme.yaml
index d4b51666d..2a654d17b 100644
--- a/prefs/theme.yaml
+++ b/prefs/theme.yaml
@@ -26,7 +26,7 @@
 - name: zen.theme.disable-lightweight
   value: true
 
-- name: zen.theme.use-sysyem-colors
+- name: zen.theme.use-system-colors
   value: false
 
 - name: zen.theme.hide-tab-throbber
diff --git a/src/zen/common/ZenUIMigration.sys.mjs b/src/zen/common/ZenUIMigration.sys.mjs
index 18c3f6ca5..52fba005d 100644
--- a/src/zen/common/ZenUIMigration.sys.mjs
+++ b/src/zen/common/ZenUIMigration.sys.mjs
@@ -6,7 +6,7 @@ const { AppConstants } = ChromeUtils.importESModule('resource://gre/modules/AppC
 
 class nsZenUIMigration {
   PREF_NAME = 'zen.ui.migration.version';
-  MIGRATION_VERSION = 3;
+  MIGRATION_VERSION = 4;
 
   init(isNewProfile) {
     if (!isNewProfile) {
@@ -77,6 +77,14 @@ class nsZenUIMigration {
       Services.prefs.setStringPref('zen.theme.accent-color', '#ffb787');
     }
   }
+
+  _migrateV4() {
+    // Fix spelling mistake in preference name
+    Services.prefs.setBoolPref(
+      'zen.theme.use-system-colors',
+      Services.prefs.getBoolPref('zen.theme.use-sysyem-colors', false)
+    );
+  }
 }
 
 export var gZenUIMigration = new nsZenUIMigration();
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index fdb6661da..f08aee8ee 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -1192,7 +1192,7 @@
     }
 
     shouldBeDarkMode(accentColor) {
-      if (Services.prefs.getBoolPref('zen.theme.use-sysyem-colors')) {
+      if (Services.prefs.getBoolPref('zen.theme.use-system-colors')) {
         return this.isDarkMode;
       }
 

From 0feb6ac3f96766a562c4a94dca49357d01f20441 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 5 Oct 2025 19:14:15 +0200
Subject: [PATCH 034/111] fix: Fixed omnibox not appearing on fullscreen,
 b=closes #5229, c=common

---
 .../urlbar/UrlbarInput-sys-mjs.patch          | 58 ++++++++++++-------
 src/zen/common/styles/zen-omnibox.css         |  2 +
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 91f5a08ac..59089ed3a 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079774eed27 100644
+index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e235161f625 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -74,6 +74,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -75,11 +75,25 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      }
  
      if (isCanonized) {
-@@ -2205,6 +2237,12 @@ export class UrlbarInput {
+@@ -2191,6 +2223,13 @@ export class UrlbarInput {
+     await this.#updateLayoutBreakoutDimensions();
+   }
+ 
++  get zenUrlbarBehavior() {
++    if (this.document.documentElement.hasAttribute("inDOMFullscreen")) {
++      return "float";
++    }
++    return lazy.ZEN_URLBAR_BEHAVIOR;
++  }
++
+   startLayoutExtend() {
+     if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
+       // Do not expand if the Urlbar does not support being expanded or it is
+@@ -2205,6 +2244,12 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
-+    if (lazy.ZEN_URLBAR_BEHAVIOR == 'float' || (lazy.ZEN_URLBAR_BEHAVIOR == 'floating-on-type' && !this.focusedViaMousedown)) {
++    if (this.zenUrlbarBehavior == 'float' || (this.zenUrlbarBehavior == 'floating-on-type' && !this.focusedViaMousedown)) {
 +      this.setAttribute("zen-floating-urlbar", "true");
 +      this.window.gZenUIManager.onFloatingURLBarOpen();
 +    } else {
@@ -88,7 +102,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2224,6 +2262,24 @@ export class UrlbarInput {
+@@ -2224,6 +2269,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -113,7 +127,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2553,7 +2609,7 @@ export class UrlbarInput {
+@@ -2553,7 +2616,7 @@ export class UrlbarInput {
  
          this.textbox.parentNode.style.setProperty(
            "--urlbar-container-height",
@@ -122,7 +136,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -2986,6 +3042,7 @@ export class UrlbarInput {
+@@ -2986,6 +3049,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -130,7 +144,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3087,7 +3144,7 @@ export class UrlbarInput {
+@@ -3087,7 +3151,7 @@ export class UrlbarInput {
     */
    _trimValue(val) {
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -139,7 +153,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3303,6 +3360,7 @@ export class UrlbarInput {
+@@ -3303,6 +3367,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -147,7 +161,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      // No point in setting these because we'll handleRevert() a few rows below.
      if (openUILinkWhere == "current") {
        // Make sure URL is formatted properly (don't show punycode).
-@@ -3455,6 +3513,10 @@ export class UrlbarInput {
+@@ -3455,6 +3520,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -158,7 +172,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3462,6 +3524,9 @@ export class UrlbarInput {
+@@ -3462,6 +3531,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -168,7 +182,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      return where;
    }
  
-@@ -3719,6 +3784,7 @@ export class UrlbarInput {
+@@ -3719,6 +3791,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -176,7 +190,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
  
        this._suppressStartQuery = false;
      });
-@@ -3726,7 +3792,6 @@ export class UrlbarInput {
+@@ -3726,7 +3799,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -184,7 +198,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3836,7 +3901,11 @@ export class UrlbarInput {
+@@ -3836,7 +3908,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -197,7 +211,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      this._searchModeIndicatorTitle.textContent = "";
      this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
  
-@@ -4130,6 +4199,7 @@ export class UrlbarInput {
+@@ -4130,6 +4206,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -205,7 +219,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4241,6 +4311,11 @@ export class UrlbarInput {
+@@ -4241,6 +4318,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -217,7 +231,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4311,7 +4386,7 @@ export class UrlbarInput {
+@@ -4311,7 +4393,7 @@ export class UrlbarInput {
        }
      }
  
@@ -226,7 +240,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4351,9 +4426,16 @@ export class UrlbarInput {
+@@ -4351,9 +4433,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -235,16 +249,16 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
        case this.textbox: {
          this._mousedownOnUrlbarDescendant = true;
 +        const isProbablyFloating =
-+          (lazy.ZEN_URLBAR_BEHAVIOR == "floating-on-type" &&
++          (this.zenUrlbarBehavior == "floating-on-type" &&
 +          this.hasAttribute("breakout-extend") && !this.focusedViaMousedown) ||
-+          (lazy.ZEN_URLBAR_BEHAVIOR == "float") || this.window.gZenVerticalTabsManager._hasSetSingleToolbar;
++          (this.zenUrlbarBehavior == "float") || this.window.gZenVerticalTabsManager._hasSetSingleToolbar;
 +        if (event.type != "click" && isProbablyFloating || event.type == "click" && !isProbablyFloating) {
 +          return true;
 +        }
  
          if (
            event.target != this.inputField &&
-@@ -4364,6 +4446,10 @@ export class UrlbarInput {
+@@ -4364,6 +4453,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -255,7 +269,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4399,7 +4485,7 @@ export class UrlbarInput {
+@@ -4399,7 +4492,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
@@ -264,7 +278,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..1dc520f63b240cccda7be074346d2079
            break;
          }
  
-@@ -4716,7 +4802,7 @@ export class UrlbarInput {
+@@ -4716,7 +4809,7 @@ export class UrlbarInput {
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 377688fc0..13c9acc24 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -29,6 +29,8 @@
 
   &[breakout-extend='true'] {
     --urlbar-container-padding: 0px;
+    /* See issue https://github.com/zen-browser/desktop/issues/5229 */
+    visibility: visible;
   }
 
   :root[zen-single-toolbar='true'] &[breakout-extend='true'],

From 9bf8bd97b2e47b38436185443bf649ba4f1ca5e1 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 5 Oct 2025 23:45:32 +0200
Subject: [PATCH 035/111] feat: Always show new site data popup, b=no-bug,
 c=glance

---
 .../base/content/browser-addons-js.patch      | 25 +++++++++++++------
 .../base/content/zen-panels/site-data.inc     |  3 +--
 src/browser/themes/shared/zen-icons/icons.css |  5 ++++
 src/zen/glance/zen-glance.css                 | 22 +++++++++-------
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       | 17 +++++++++++++
 5 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch
index 71135dc45..0264323c8 100644
--- a/src/browser/base/content/browser-addons-js.patch
+++ b/src/browser/base/content/browser-addons-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b543b413441 100644
+index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..29864ab59819271b7319b273c08bdc2736d40c93 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
-@@ -1064,7 +1064,7 @@ var gXPInstallObserver = {
+@@ -1071,7 +1071,7 @@ var gXPInstallObserver = {
        persistent: true,
        hideClose: true,
        popupOptions: {
@@ -11,7 +11,7 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b54
        },
      };
  
-@@ -1273,7 +1273,7 @@ var gXPInstallObserver = {
+@@ -1280,7 +1280,7 @@ var gXPInstallObserver = {
        hideClose: true,
        timeout: Date.now() + 30000,
        popupOptions: {
@@ -20,7 +20,7 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b54
        },
      };
  
-@@ -2205,7 +2205,7 @@ var gUnifiedExtensions = {
+@@ -2212,7 +2212,7 @@ var gUnifiedExtensions = {
    // If the new ID is not added in NOTIFICATION_IDS, consider handling the case
    // in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file.
    getPopupAnchorID(aBrowser, aWindow) {
@@ -29,7 +29,7 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b54
      const attr = anchorID + "popupnotificationanchor";
  
      if (!aBrowser[attr]) {
-@@ -2216,7 +2216,7 @@ var gUnifiedExtensions = {
+@@ -2223,7 +2223,7 @@ var gUnifiedExtensions = {
          anchorID
          // Anchor on the toolbar icon to position the popup right below the
          // button.
@@ -38,7 +38,7 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b54
      }
  
      return anchorID;
-@@ -2509,11 +2509,7 @@ var gUnifiedExtensions = {
+@@ -2516,11 +2516,7 @@ var gUnifiedExtensions = {
      // Lazy load the unified-extensions-panel panel the first time we need to
      // display it.
      if (!this._panel) {
@@ -51,7 +51,16 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b54
        let customizationArea = this._panel.querySelector(
          "#unified-extensions-area"
        );
-@@ -2608,7 +2604,7 @@ var gUnifiedExtensions = {
+@@ -2570,7 +2566,7 @@ var gUnifiedExtensions = {
+ 
+         // The button should directly open `about:addons` when the user does not
+         // have any active extensions listed in the unified extensions panel.
+-        if (!this.hasExtensionsInPanel()) {
++        if (!this.hasExtensionsInPanel() && false) {
+           let viewID;
+           if (
+             Services.prefs.getBoolPref("extensions.getAddons.showPane", true) &&
+@@ -2615,7 +2611,7 @@ var gUnifiedExtensions = {
          this.recordButtonTelemetry(reason || "extensions_panel_showing");
          this.ensureButtonShownBeforeAttachingPanel(panel);
          PanelMultiView.openPopup(panel, this._button, {
@@ -60,7 +69,7 @@ index d7542a38a0242dd9c9c6390171d59992d75a0c19..baa5d84c26f7e74c779bc7e1a2b83b54
            triggerEvent: aEvent,
          });
        }
-@@ -2795,18 +2791,20 @@ var gUnifiedExtensions = {
+@@ -2802,18 +2798,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index e5a774b88..dab190c80 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -17,8 +17,7 @@
       <hbox id="zen-site-data-header">
         <toolbarbutton id="zen-site-data-header-share"
                         data-l10n-id="zen-site-data-share"
-                        flex="1"
-                        closemenu="none" />
+                        flex="1" />
         <toolbarbutton id="zen-site-data-header-reader-mode"
                         command="View:ReaderView"
                         flex="1" />
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 8dff5e399..d9fb761ec 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -471,6 +471,11 @@
 }
 
 /* permissions */
+
+#zen-site-data-icon-button {
+  display: flex !important;
+}
+
 #identity-permission-box,
 #identity-box:not([pageproxystate='invalid']) #identity-icon-box,
 #identity-box[pageproxystate='invalid'] #zen-site-data-icon-button {
diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css
index 55bb59932..81dbd5445 100644
--- a/src/zen/glance/zen-glance.css
+++ b/src/zen/glance/zen-glance.css
@@ -98,10 +98,13 @@
   --zen-element-separation: 6px;
 }
 
+.browserSidebarContainer.zen-glance-background {
+  box-shadow: var(--zen-big-shadow);
+}
+
 .browserSidebarContainer.zen-glance-background,
 .browserSidebarContainer.zen-glance-overlay .browserContainer:not([fade-out='true']) {
   border-radius: var(--zen-native-inner-radius);
-  box-shadow: var(--zen-big-shadow);
 }
 
 .browserSidebarContainer.zen-glance-overlay {
@@ -142,12 +145,7 @@
     & .browserStack {
       border-radius: var(--zen-native-inner-radius);
       overflow: hidden;
-    }
-
-    & browser {
-      background: light-dark(rgb(255, 255, 255), rgb(32, 32, 32)) !important;
-      width: 100%;
-      height: 100%;
+      box-shadow: var(--zen-big-shadow);
       opacity: 1;
       transition: opacity 0.08s;
 
@@ -156,14 +154,20 @@
       }
     }
 
+    & browser {
+      background: light-dark(rgb(255, 255, 255), rgb(32, 32, 32)) !important;
+      width: 100%;
+      height: 100%;
+    }
+
     &[animate='true'] {
       position: absolute;
     }
   }
 
   &[fade-out='true'] {
-    & browser {
-      transition: opacity 0.25s ease-in-out;
+    & .browserStack {
+      transition: opacity 0.2s ease-in-out;
       opacity: 0;
     }
   }
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index aebbfc657..129842c8b 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -357,6 +357,23 @@ export class nsZenSiteDataPanel {
         this.window.BookmarkingUI.onStarCommand(event);
         break;
       }
+      case 'zen-site-data-header-share': {
+        if (Services.zen.canShare()) {
+          const buttonRect = event.target.getBoundingClientRect();
+          const currentUrl = this.window.gBrowser.currentURI;
+          Services.zen.share(
+            currentUrl,
+            '',
+            '',
+            buttonRect.left,
+            this.window.innerHeight - buttonRect.bottom,
+            buttonRect.width,
+            buttonRect.height
+          );
+        } else {
+          this.window.gZenCommonActions.copyCurrentURLToClipboard();
+        }
+      }
     }
   }
 

From d6ac283388290c419a779c0cc49fe5b51234ae41 Mon Sep 17 00:00:00 2001
From: atharva kamble <60008419+athkdev@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:55:29 -0400
Subject: [PATCH 036/111] feat: Unload a workspace context menu, p=#10688

Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 .../en-US/browser/browser/zen-workspaces.ftl  |  3 +++
 .../base/content/zen-commands.inc.xhtml       |  1 +
 .../base/content/zen-panels/popups.inc        |  1 +
 src/zen/common/zen-sets.js                    |  4 ++++
 src/zen/workspaces/ZenWorkspaces.mjs          | 20 +++++++++++++++++++
 5 files changed, 29 insertions(+)

diff --git a/locales/en-US/browser/browser/zen-workspaces.ftl b/locales/en-US/browser/browser/zen-workspaces.ftl
index 5b6452475..0933f225c 100644
--- a/locales/en-US/browser/browser/zen-workspaces.ftl
+++ b/locales/en-US/browser/browser/zen-workspaces.ftl
@@ -23,6 +23,9 @@ zen-workspaces-panel-change-icon =
 zen-workspaces-panel-context-default-profile =
     .label = Set Profile
 
+zen-workspaces-panel-unload =
+    .label = Unload Space
+
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 
diff --git a/src/browser/base/content/zen-commands.inc.xhtml b/src/browser/base/content/zen-commands.inc.xhtml
index 25db87158..d1cbacd7a 100644
--- a/src/browser/base/content/zen-commands.inc.xhtml
+++ b/src/browser/base/content/zen-commands.inc.xhtml
@@ -39,6 +39,7 @@
   <command id="cmd_contextZenRemoveFromEssentials" />
 
   <command id="cmd_zenCtxDeleteWorkspace" />
+  <command id="cmd_zenUnloadWorkspace" />
   <command id="cmd_zenChangeWorkspaceName" />
   <command id="cmd_zenChangeWorkspaceIcon" />
   <command id="cmd_zenReorderWorkspaces" />
diff --git a/src/browser/base/content/zen-panels/popups.inc b/src/browser/base/content/zen-panels/popups.inc
index cdada5655..d94f76ae0 100644
--- a/src/browser/base/content/zen-panels/popups.inc
+++ b/src/browser/base/content/zen-panels/popups.inc
@@ -25,6 +25,7 @@
     hide-if-usercontext-disabled="true">
     <menupopup />
   </menu>
+  <menuitem id="context_zenUnloadWorkspace" data-l10n-id="zen-workspaces-panel-unload" command="cmd_zenUnloadWorkspace"/>
   <menuseparator id="context_zenWorkspacesSeparator"/>
   <menuseparator/>
   <menuitem id="context_zenReorderWorkspaces" data-l10n-id="zen-workspaces-panel-context-reorder" command="cmd_zenReorderWorkspaces"/>
diff --git a/src/zen/common/zen-sets.js b/src/zen/common/zen-sets.js
index 4609d2e76..e9ca4b8bc 100644
--- a/src/zen/common/zen-sets.js
+++ b/src/zen/common/zen-sets.js
@@ -122,6 +122,10 @@ document.addEventListener(
             }
             break;
           }
+          case 'cmd_zenUnloadWorkspace': {
+            gZenWorkspaces.unloadWorkspace();
+            break;
+          }
           default:
             gZenGlanceManager.handleMainCommandSet(event);
             if (event.target.id.startsWith('cmd_zenWorkspaceSwitch')) {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 708ac626e..41e983f70 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1479,6 +1479,26 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     });
   }
 
+  async unloadWorkspace() {
+    const workspaceId = this.#contextMenuData?.workspaceId || this.activeWorkspace;
+
+    const tabsToUnload = this.allStoredTabs.filter(
+      (tab) =>
+        tab.getAttribute('zen-workspace-id') === workspaceId &&
+        !tab.hasAttribute('zen-empty-tab') &&
+        !tab.hasAttribute('zen-essential') &&
+        !tab.hasAttribute('pending')
+    );
+
+    if (tabsToUnload.length === 0) {
+      return;
+    }
+
+    this.log('Unloading workspace', workspaceId);
+
+    await gBrowser.explicitUnloadTabs(tabsToUnload);  // TODO: unit test this
+  }
+
   moveTabToWorkspace(tab, workspaceID) {
     return this.moveTabsToWorkspace([tab], workspaceID);
   }

From 0a8fe6d7baa20d7d0b1b87400d1022a72938cfc4 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Mon, 6 Oct 2025 00:22:53 +0200
Subject: [PATCH 037/111] feat: Move the site data button to the end, b=no-bug,
 c=common

---
 src/zen/common/styles/zen-omnibox.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index b9af5bc35..5349e8b57 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -254,7 +254,7 @@
 
   #urlbar:not([breakout-extend='true']) {
     #identity-box:not([pageproxystate='invalid']) {
-      order: 2;
+      order: 9;
     }
   }
 

From 856d6f523a9b4865316fa60f074548ee26fed607 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Mon, 6 Oct 2025 00:46:34 +0200
Subject: [PATCH 038/111] fix: Fixed collapsed sidebar in compact mode not
 showing tabs, b=no-bug, c=glance, tabs, workspaces

---
 src/zen/glance/ZenGlanceManager.mjs     | 3 +++
 src/zen/tabs/zen-tabs/vertical-tabs.css | 7 ++-----
 src/zen/workspaces/ZenWorkspaces.mjs    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index de653c244..949844619 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -623,6 +623,9 @@
       browserElement.style.minWidth = '';
       browserElement.style.minHeight = '';
 
+      this.browserWrapper.style.height = '100%';
+      this.browserWrapper.style.width = '85%';
+
       gBrowser.tabContainer._invalidateCachedTabs();
       this.overlay.style.removeProperty('overflow');
       this.browserWrapper.removeAttribute('animate');
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index c75b7896d..809401417 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -20,7 +20,8 @@
   width: 100%;
 }
 
-#pinned-drop-indicator {
+#pinned-drop-indicator,
+#drag-to-pin-promo-card {
   /* We dont use this firefox feature */
   display: none !important;
 }
@@ -62,10 +63,6 @@
       margin-right: calc(-1 * var(--zen-toolbox-padding));
     }
   }
-
-  #tabbrowser-arrowscrollbox {
-    min-height: fit-content !important;
-  }
 }
 
 :root[zen-window-buttons-reversed='true'] .titlebar-buttonbox-container {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 41e983f70..96a28a1c6 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1496,7 +1496,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
 
     this.log('Unloading workspace', workspaceId);
 
-    await gBrowser.explicitUnloadTabs(tabsToUnload);  // TODO: unit test this
+    await gBrowser.explicitUnloadTabs(tabsToUnload); // TODO: unit test this
   }
 
   moveTabToWorkspace(tab, workspaceID) {

From d0fb8aea03fb5ae6811d064608bf96d4ea55cc5f Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Mon, 6 Oct 2025 01:05:48 +0200
Subject: [PATCH 039/111] feat: Increase the size of toolbar buttons, b=no-bug,
 c=common, workspaces

---
 src/zen/common/styles/zen-single-components.css | 2 +-
 src/zen/workspaces/ZenWorkspaces.mjs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 9e893f546..02169605c 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -177,7 +177,7 @@ body > #confetti {
   #zen-sidebar-foot-buttons & {
     --tab-border-radius: 6px;
     --toolbarbutton-border-radius: var(--tab-border-radius);
-    --toolbarbutton-inner-padding: 6px;
+    --toolbarbutton-inner-padding: 7px;
     --toolbarbutton-outer-padding: 2px;
   }
 
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 96a28a1c6..e2a0c31c4 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -3038,7 +3038,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
       parent.removeAttribute('icons-overflow');
       return;
     }
-    const maxButtonSize = 28; // IMPORTANT: This should match the CSS size of the icons
+    const maxButtonSize = 30; // IMPORTANT: This should match the CSS size of the icons
     const minButtonSize = 15;
     const separation = 3; // Space between icons
 

From 9f42abf789d7faaf2b4bbfde89a22aa8aafc71cd Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 7 Oct 2025 01:06:16 +0200
Subject: [PATCH 040/111] feat: Restore top toolbar compact mode, b=no-bug,
 c=tabs, compact-mode, common

---
 .../browser/preferences/zen-preferences.ftl   |   6 +-
 locales/en-US/browser/browser/zen-general.ftl |   1 +
 .../browser/browser/zen-vertical-tabs.ftl     |   8 +
 prefs/compact-mode.yaml                       |   6 +
 .../base/content/zen-panels/site-data.inc     |   3 +-
 src/browser/themes/shared/zen-icons/icons.css |   2 +-
 src/zen/common/ZenCustomizableUI.sys.mjs      |   3 +-
 src/zen/common/ZenUIManager.mjs               |   3 +-
 src/zen/common/styles/zen-browser-ui.css      |   7 +
 src/zen/common/styles/zen-theme.css           |   4 +
 src/zen/compact-mode/ZenCompactMode.mjs       |  74 ++++-
 src/zen/compact-mode/sidebar.inc.css          | 265 ++++++++++++++++
 src/zen/compact-mode/toolbar.inc.css          |  84 ++++++
 src/zen/compact-mode/zen-compact-mode.css     | 282 ++----------------
 src/zen/tabs/zen-tabs/vertical-tabs.css       |  13 +-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       |   5 +
 16 files changed, 481 insertions(+), 285 deletions(-)
 create mode 100644 src/zen/compact-mode/sidebar.inc.css
 create mode 100644 src/zen/compact-mode/toolbar.inc.css

diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
index 1c2d18229..6d400ca0e 100644
--- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
@@ -8,9 +8,9 @@ zen-warning-language = Changing the default language could make it easier for We
 zen-vertical-tabs-layout-header = Browser Layout
 zen-vertical-tabs-layout-description = Choose the layout that suits you best
 
-zen-layout-single-toolbar = Single toolbar
-zen-layout-multiple-toolbar = Multiple toolbars
-zen-layout-collapsed-toolbar = Collapsed toolbar
+zen-layout-single-toolbar = Only Sidebar
+zen-layout-multiple-toolbar = Sidebar and Top Toolbar
+zen-layout-collapsed-toolbar = Collapsed Sidebar
 
 sync-currently-syncing-workspaces = Workspaces
 sync-engine-workspaces =
diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 77f8a014b..4772e428b 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -50,6 +50,7 @@ zen-library-sidebar-mods =
     .label = Mods
 
 zen-toggle-compact-mode-button =
+    .label = Compact Mode
     .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
diff --git a/locales/en-US/browser/browser/zen-vertical-tabs.ftl b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
index 3b4975bb6..55e88d913 100644
--- a/locales/en-US/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
@@ -6,6 +6,14 @@ zen-toolbar-context-tabs-right =
 zen-toolbar-context-compact-mode-enable =
     .label = Enable compact mode
     .accesskey = D
+zen-toolbar-context-compact-mode-just-tabs =
+    .label = Hide sidebar
+zen-toolbar-context-compact-mode-just-toolbar =
+    .label = Hide toolbar
+zen-toolbar-context-compact-mode-hide-both =
+    .label = Hide both
+    .accesskey = H
+
 zen-toolbar-context-new-folder =
     .label = New Folder
     .accesskey = N
diff --git a/prefs/compact-mode.yaml b/prefs/compact-mode.yaml
index 8e8003411..f48e2d8cd 100644
--- a/prefs/compact-mode.yaml
+++ b/prefs/compact-mode.yaml
@@ -2,6 +2,12 @@
 # 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/.
 
+- name: zen.view.compact.hide-tabbar
+  value: true
+
+- name: zen.view.compact.hide-toolbar
+  value: false
+
 - name: zen.view.compact.toolbar-flash-popup
   value: false
 
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index dab190c80..e5a774b88 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -17,7 +17,8 @@
       <hbox id="zen-site-data-header">
         <toolbarbutton id="zen-site-data-header-share"
                         data-l10n-id="zen-site-data-share"
-                        flex="1" />
+                        flex="1"
+                        closemenu="none" />
         <toolbarbutton id="zen-site-data-header-reader-mode"
                         command="View:ReaderView"
                         flex="1" />
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index d9fb761ec..7e1db475b 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -56,7 +56,7 @@
 #sidebar-button:-moz-locale-dir(ltr):not([positionend]),
 #sidebar-button:-moz-locale-dir(rtl)[positionend],
 #zen-toggle-compact-mode {
-  list-style-image: url('chrome://browser/skin/sidebars.svg') !important;
+  list-style-image: url('sidebar.svg') !important;
 }
 
 #downloads-button,
diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index 329eb2e8f..d667fd39c 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -70,7 +70,8 @@ export var ZenCustomizableUI = new (class {
           <toolbarbutton id="zen-toggle-compact-mode"
             class="toolbarbutton-1"
             command="cmd_toggleCompactModeIgnoreHover"
-            data-l10n-id="zen-toggle-compact-mode-button" />
+            data-l10n-id="zen-toggle-compact-mode-button"
+            removable="true" />
           <html:div id="zen-sidebar-top-buttons-separator" skipintoolbarset="true" overflows="false"></html:div>
         </hbox>
       </toolbar>
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index a23c0cf0a..dd54457be 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -1049,7 +1049,7 @@ var gZenVerticalTabsManager = {
         topButtons.prepend(windowButtons);
       }
 
-      if (!isSingleToolbar && isCompactMode) {
+      if ((!isSingleToolbar && isCompactMode) || !isSidebarExpanded) {
         navBar.prepend(topButtons);
       }
 
@@ -1091,6 +1091,7 @@ var gZenVerticalTabsManager = {
         appContentNavbarContaienr.append(windowButtons);
       }
 
+      gZenCompactModeManager.updateCompactModeContext(isSingleToolbar);
       this.recalculateURLBarHeight();
 
       // Always move the splitter next to the sidebar
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index c542eccd4..43bd6ab0a 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -311,3 +311,10 @@
     opacity: 1;
   }
 }
+
+#zen-appcontent-navbar-wrapper #zen-sidebar-top-buttons {
+  max-width: fit-content;
+  :root[zen-right-side='true'] & {
+    order: 999;
+  }
+}
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index dbae226d9..40118cbff 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -210,6 +210,10 @@
 
   --zen-workspace-indicator-height: 46px;
 
+  &:not([zen-sidebar-expanded='true']) {
+    --zen-workspace-indicator-height: 38px;
+  }
+
   --toolbar-field-color: var(--toolbox-textcolor) !important;
 
   &[zen-private-window='true'] {
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 619e5e051..021981169 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -174,12 +174,60 @@ var gZenCompactModeManager = {
 
   addContextMenu() {
     const fragment = window.MozXULElement.parseXULToFragment(`
-      <menuitem id="zen-context-menu-compact-mode-toggle" data-l10n-id="zen-toolbar-context-compact-mode-enable" type="checkbox" command="cmd_zenCompactModeToggle"/>
+      <menu id="zen-context-menu-compact-mode" data-l10n-id="zen-toolbar-context-compact-mode">
+        <menupopup>
+          <menuitem id="zen-context-menu-compact-mode-toggle" data-l10n-id="zen-toolbar-context-compact-mode-enable" type="checkbox" command="cmd_zenCompactModeToggle"/>
+          <menuseparator/>
+          <menuitem id="zen-context-menu-compact-mode-hide-sidebar" data-l10n-id="zen-toolbar-context-compact-mode-just-tabs" type="radio" />
+          <menuitem id="zen-context-menu-compact-mode-hide-toolbar" data-l10n-id="zen-toolbar-context-compact-mode-just-toolbar" type="radio" />
+          <menuitem id="zen-context-menu-compact-mode-hide-both" data-l10n-id="zen-toolbar-context-compact-mode-hide-both" type="radio" />
+        </menupopup>
+      </menu>
     `);
+
+    const idToAction = {
+      'zen-context-menu-compact-mode-hide-sidebar': this.hideSidebar.bind(this),
+      'zen-context-menu-compact-mode-hide-toolbar': this.hideToolbar.bind(this),
+      'zen-context-menu-compact-mode-hide-both': this.hideBoth.bind(this),
+    };
+
+    for (let menuitem of fragment.querySelectorAll('menuitem')) {
+      if (menuitem.id in idToAction) {
+        menuitem.addEventListener('command', idToAction[menuitem.id]);
+      }
+    }
+
     document.getElementById('viewToolbarsMenuSeparator').before(fragment);
     this.updateContextMenu();
   },
 
+  updateCompactModeContext(isSingleToolbar) {
+    const menuitem = document.getElementById('zen-context-menu-compact-mode-toggle');
+    const menu = document.getElementById('zen-context-menu-compact-mode');
+    if (isSingleToolbar) {
+      menu.setAttribute('hidden', 'true');
+      menu.before(menuitem);
+    } else {
+      menu.removeAttribute('hidden');
+      menu.querySelector('menupopup').prepend(menuitem);
+    }
+  },
+
+  hideSidebar() {
+    Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
+    Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', false);
+  },
+
+  hideToolbar() {
+    Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
+    Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', false);
+  },
+
+  hideBoth() {
+    Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
+    Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
+  },
+
   addEventListener(callback) {
     this._evenListeners.push(callback);
   },
@@ -247,6 +295,13 @@ var gZenCompactModeManager = {
     return sidebarWidth;
   },
 
+  get canHideSidebar() {
+    return (
+      Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
+      gZenVerticalTabsManager._hasSetSingleToolbar
+    );
+  },
+
   animateCompactMode() {
     // Get the splitter width before hiding it (we need to hide it before animating on right)
     document.documentElement.setAttribute('zen-compact-animating', 'true');
@@ -256,6 +311,7 @@ var gZenCompactModeManager = {
         .getElementById('zen-sidebar-splitter')
         .getBoundingClientRect().width;
       const isCompactMode = this.preference;
+      const canHideSidebar = this.canHideSidebar;
       let canAnimate =
         lazyCompactMode.COMPACT_MODE_CAN_ANIMATE_SIDEBAR && !this.isSidebarPotentiallyOpen();
       if (typeof this._wasInCompactMode !== 'undefined') {
@@ -286,7 +342,7 @@ var gZenCompactModeManager = {
           resolve();
           return;
         }
-        if (isCompactMode) {
+        if (canHideSidebar && isCompactMode) {
           if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
             sidebarWidth -= 0.5 * splitterWidth;
             if (elementSeparation < splitterWidth) {
@@ -346,7 +402,7 @@ var gZenCompactModeManager = {
                 });
               });
             });
-        } else {
+        } else if (canHideSidebar && !isCompactMode) {
           document.getElementById('browser').style.overflow = 'clip';
           if (this.sidebarIsOnRight) {
             this.sidebar.style.marginRight = `-${sidebarWidth}px`;
@@ -382,6 +438,9 @@ var gZenCompactModeManager = {
                 resolve();
               });
             });
+        } else {
+          this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
+          document.documentElement.removeAttribute('zen-compact-animating');
         }
       });
     });
@@ -391,6 +450,15 @@ var gZenCompactModeManager = {
     document
       .getElementById('zen-context-menu-compact-mode-toggle')
       .setAttribute('checked', this.preference);
+
+    const hideTabBar = Services.prefs.getBoolPref('zen.view.compact.hide-tabbar', false);
+    const hideToolbar = Services.prefs.getBoolPref('zen.view.compact.hide-toolbar', false);
+    const hideBoth = hideTabBar && hideToolbar;
+
+    const idName = 'zen-context-menu-compact-mode-hide-';
+    document.getElementById(idName + 'sidebar').setAttribute('checked', !hideBoth && hideTabBar);
+    document.getElementById(idName + 'toolbar').setAttribute('checked', !hideBoth && hideToolbar);
+    document.getElementById(idName + 'both').setAttribute('checked', hideBoth);
   },
 
   _removeOpenStateOnUnifiedExtensions() {
diff --git a/src/zen/compact-mode/sidebar.inc.css b/src/zen/compact-mode/sidebar.inc.css
new file mode 100644
index 000000000..b5f72008f
--- /dev/null
+++ b/src/zen/compact-mode/sidebar.inc.css
@@ -0,0 +1,265 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/.
+ */
+
+&:not([zen-compact-animating]) {
+  & #zen-sidebar-splitter {
+    display: none !important;
+  }
+
+  #zen-tabbox-wrapper {
+    /* Remove extra 1px of margine we have to add to the tabbox */
+    margin-left: var(--zen-element-separation) !important;
+    margin-right: var(--zen-element-separation) !important;
+  }
+
+  #zen-appcontent-wrapper {
+    & #tabbrowser-tabbox {
+      margin-left: 0 !important;
+    }
+  }
+
+  #zen-sidebar-splitter {
+    display: none !important;
+  }
+
+  #zen-sidebar-top-buttons-customization-target {
+    padding-inline-start: calc(
+      var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)
+    ) !important;
+  }
+
+  &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-wrapper #nav-bar {
+    margin-right: var(--zen-element-separation) !important;
+    margin-left: calc(var(--zen-element-separation) - 3px) !important;
+  }
+
+  #navigator-toolbox {
+    --zen-toolbox-max-width: 74px !important;
+    --zen-compact-float: var(--zen-element-separation);
+    :root[zen-no-padding='true'] & {
+      --zen-compact-float: 10px;
+      --zen-compact-mode-no-padding-radius-fix: 2px;
+    }
+
+    /* Initial padding for when we are animating */
+    padding: 0 0 0 var(--zen-toolbox-padding) !important;
+
+    &:not([animate='true']) {
+      position: fixed;
+      z-index: 10;
+      transition:
+        left 0.15s ease,
+        right 0.15s ease,
+        visibility 0.15s ease;
+      bottom: var(--zen-compact-float);
+      padding: 0 var(--zen-compact-float) !important;
+      :root[zen-single-toolbar='true'] & {
+        /* We add an extra offset since windows users have a border top
+             * in the window in order to compensate how windows renders the
+             * titlebar */
+        top: calc(var(--zen-compact-float) / 2 + var(--zen-sidebar-compact-top-offset, 0px));
+        height: calc(100% - var(--zen-compact-float));
+      }
+      :root:not([zen-single-toolbar='true']) & {
+        bottom: calc(var(--zen-compact-float) / 2);
+        height: calc(100% - var(--zen-toolbar-height));
+        @media -moz-pref('zen.view.compact.hide-toolbar') {
+          height: 100%;
+        }
+      }
+      & #zen-sidebar-top-buttons {
+        margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
+      }
+    }
+
+    &:not([zen-right-side='true']) #nav-bar {
+      margin-left: 0 !important;
+    }
+  }
+
+  &:not([zen-right-side='true']) #navigator-toolbox {
+    left: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
+  }
+
+  /* When we have multiple toolbars and the top-toolbar is NOT being hidden,
+       * we need to adjust the top-padding of the toolbox to account for the
+       * extra toolbar height. */
+  @media not -moz-pref('zen.view.compact.hide-toolbar') {
+    &:not([zen-single-toolbar='true']) {
+      #navigator-toolbox:not([animate='true']) {
+        margin-top: var(--zen-toolbar-height) !important;
+      }
+    }
+  }
+
+  &:not([zen-sidebar-expanded='true']) .zen-essentials-container {
+    padding: 0;
+  }
+
+  &[zen-right-side='true'] {
+    & #navigator-toolbox:not([animate='true']) {
+      right: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
+    }
+
+    & .browserSidebarContainer {
+      margin-left: 0 !important;
+      margin-right: 0 !important;
+    }
+  }
+
+  #navigator-toolbox:not([animate='true']) #titlebar {
+    padding: var(--zen-toolbox-padding) !important;
+    :root:not([zen-sidebar-expanded='true']) & {
+      padding: var(--zen-toolbox-padding) 0 !important;
+      max-width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding) * 2);
+      width: var(--zen-sidebar-width);
+    }
+    position: relative;
+    min-width: var(--zen-toolbox-min-width);
+    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));
+    }
+
+    & .zen-toolbar-background {
+      display: flex;
+    }
+  }
+
+  #navigator-toolbox[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
+  #navigator-toolbox[zen-user-show],
+  #navigator-toolbox[zen-has-empty-tab],
+  #navigator-toolbox[flash-popup],
+  #navigator-toolbox[has-popup-menu],
+  #navigator-toolbox[movingtab],
+  &[zen-renaming-tab='true'] #navigator-toolbox,
+  #navigator-toolbox[zen-compact-mode-active] {
+    &:not([animate='true']) {
+      --zen-compact-mode-func: linear(
+        0 0%,
+        0.002748 1%,
+        0.010544 2%,
+        0.022757 3%,
+        0.038804 4%,
+        0.058151 5%,
+        0.080308 6%,
+        0.104828 7.000000000000001%,
+        0.131301 8%,
+        0.159358 9%,
+        0.188662 10%,
+        0.21891 11%,
+        0.249828 12%,
+        0.281172 13%,
+        0.312724 14.000000000000002%,
+        0.344288 15%,
+        0.375693 16%,
+        0.40679 17%,
+        0.437447 18%,
+        0.467549 19%,
+        0.497 20%,
+        0.525718 21%,
+        0.553633 22%,
+        0.580688 23%,
+        0.60684 24%,
+        0.632052 25%,
+        0.656298 26%,
+        0.679562 27%,
+        0.701831 28.000000000000004%,
+        0.723104 28.999999999999996%,
+        0.743381 30%,
+        0.76267 31%,
+        0.780983 32%,
+        0.798335 33%,
+        0.814744 34%,
+        0.830233 35%,
+        0.844826 36%,
+        0.858549 37%,
+        0.87143 38%,
+        0.883498 39%,
+        0.894782 40%,
+        0.905314 41%,
+        0.915125 42%,
+        0.924247 43%,
+        0.93271 44%,
+        0.940547 45%,
+        0.947787 46%,
+        0.954463 47%,
+        0.960603 48%,
+        0.966239 49%,
+        0.971397 50%,
+        0.976106 51%,
+        0.980394 52%,
+        0.984286 53%,
+        0.987808 54%,
+        0.990984 55.00000000000001%,
+        0.993837 56.00000000000001%,
+        0.99639 56.99999999999999%,
+        0.998664 57.99999999999999%,
+        1.000679 59%,
+        1.002456 60%,
+        1.004011 61%,
+        1.005363 62%,
+        1.006528 63%,
+        1.007522 64%,
+        1.008359 65%,
+        1.009054 66%,
+        1.009618 67%,
+        1.010065 68%,
+        1.010405 69%,
+        1.010649 70%,
+        1.010808 71%,
+        1.01089 72%,
+        1.010904 73%,
+        1.010857 74%,
+        1.010757 75%,
+        1.010611 76%,
+        1.010425 77%,
+        1.010205 78%,
+        1.009955 79%,
+        1.009681 80%,
+        1.009387 81%,
+        1.009077 82%,
+        1.008754 83%,
+        1.008422 84%,
+        1.008083 85%,
+        1.00774 86%,
+        1.007396 87%,
+        1.007052 88%,
+        1.00671 89%,
+        1.006372 90%,
+        1.00604 91%,
+        1.005713 92%,
+        1.005394 93%,
+        1.005083 94%,
+        1.004782 95%,
+        1.004489 96%,
+        1.004207 97%,
+        1.003935 98%,
+        1.003674 99%,
+        1.003423 100%
+      );
+      --zen-compact-mode-time: 0.25s;
+      transition:
+        left var(--zen-compact-mode-time) var(--zen-compact-mode-func),
+        right var(--zen-compact-mode-time) var(--zen-compact-mode-func);
+
+      :root:not([supress-primary-adjustment='true']) & {
+        & #titlebar {
+          transition: none;
+          visibility: visible;
+        }
+
+        left: calc(var(--zen-compact-float) / -2);
+        :root[zen-right-side='true'] & {
+          right: calc(var(--zen-compact-float) / -2);
+          left: auto;
+        }
+      }
+    }
+  }
+}
diff --git a/src/zen/compact-mode/toolbar.inc.css b/src/zen/compact-mode/toolbar.inc.css
new file mode 100644
index 000000000..f58134b53
--- /dev/null
+++ b/src/zen/compact-mode/toolbar.inc.css
@@ -0,0 +1,84 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/.
+ */
+
+&:not([zen-single-toolbar='true']) {
+  & #navigator-toolbox {
+    --zen-toolbox-top-align: var(--zen-element-separation);
+  }
+
+  & #titlebar,
+  & #zen-appcontent-wrapper {
+    margin-top: var(--zen-element-separation) !important;
+  }
+
+  & #zen-appcontent-wrapper {
+    z-index: 3 !important;
+  }
+
+  & #zen-appcontent-navbar-wrapper {
+    & .zen-toolbar-background {
+      display: flex;
+    }
+    --zen-compact-toolbar-offset: 5px;
+    position: absolute;
+    top: calc(-1 * var(--zen-toolbar-height) + 1px);
+    left: 0;
+    z-index: 20;
+    transition: all 0.15s ease;
+    width: 100%;
+
+    max-height: var(--zen-toolbar-height);
+    overflow: hidden;
+
+    & #urlbar:not([breakout-extend='true']) {
+      opacity: 0 !important;
+    }
+
+    & #zen-appcontent-navbar-container {
+      visibility: hidden;
+
+      box-shadow: var(--zen-big-shadow);
+      border-bottom-left-radius: var(--zen-border-radius);
+      border-bottom-right-radius: var(--zen-border-radius);
+      :root:not([sizemode='maximized']) & {
+        border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
+        border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
+      }
+      transition: all 0.15s ease;
+      width: 100%;
+    }
+  }
+
+  &
+    #zen-appcontent-navbar-wrapper[zen-has-hover]:not(
+      :has(#urlbar[zen-floating-urlbar='true']:hover)
+    ),
+  & #zen-appcontent-navbar-wrapper[has-popup-menu],
+  &
+    #zen-appcontent-navbar-wrapper:has(
+      *:is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(
+          #urlbar[zen-floating-urlbar='true']
+        ):not(.zen-compact-mode-ignore)
+    ) {
+    & #zen-appcontent-navbar-container {
+      visibility: visible !important;
+    }
+    border-top-width: 0px;
+
+    top: -1px;
+    overflow: initial;
+    max-height: unset;
+
+    & #urlbar {
+      opacity: 1 !important;
+    }
+
+    & #urlbar[breakout-extend='true']:not([zen-floating-urlbar='true']) {
+      top: 2px !important;
+      opacity: 1;
+    }
+  }
+}
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 0a2dda72a..342514d03 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -20,7 +20,7 @@
 
   &::before,
   &::after {
-    outline: 1px solid rgba(255, 255, 255, 0.15);
+    outline: 1px solid rgba(255, 255, 255, .15);
     outline-offset: -1px;
     background-attachment: fixed !important;
     background-size: 100vw 100vh !important;
@@ -29,285 +29,41 @@
   &,
   &::before,
   &::after {
-    border-radius: calc(
-      var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px)
-    );
+    border-radius: calc(var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px));
   }
 }
 
 :root[zen-compact-mode='true']:not([customizing]):not([inDOMFullscreen='true']) {
+
 %include ../tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
 
   & #urlbar {
     visibility: visible;
   }
 
-  &:not([zen-compact-animating]) {
-    & #zen-sidebar-splitter {
-      display: none !important;
-    }
-
-    #zen-tabbox-wrapper {
-      /* Remove extra 1px of margine we have to add to the tabbox */
-      margin-left: var(--zen-element-separation) !important;
-      margin-right: var(--zen-element-separation) !important;
-    }
-
-    #zen-appcontent-wrapper {
-      & #tabbrowser-tabbox {
-        margin-left: 0 !important;
-      }
-    }
-
-    #zen-sidebar-splitter {
-      display: none !important;
-    }
-
-    #zen-sidebar-top-buttons-customization-target {
-      padding-inline-start: calc(
-        var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)
-      ) !important;
-    }
-
-    &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-wrapper #nav-bar {
-      margin-left: var(--zen-element-separation) !important;
-    }
-
-    &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-wrapper #nav-bar {
-      margin-right: var(--zen-element-separation) !important;
-      margin-left: calc(var(--zen-element-separation) - 3px) !important;
-    }
-
-    #navigator-toolbox {
-      --zen-toolbox-max-width: 74px !important;
-      --zen-compact-float: var(--zen-element-separation);
-      :root[zen-no-padding='true'] & {
-        --zen-compact-float: 10px;
-        --zen-compact-mode-no-padding-radius-fix: 2px;
-      }
-
-      /* Initial padding for when we are animating */
-      padding: 0 0 0 var(--zen-toolbox-padding) !important;
-
-      &:not([animate='true']) {
-        position: fixed;
-        z-index: 10;
-        transition:
-          left 0.15s ease,
-          right 0.15s ease,
-          visibility 0.15s ease;
-        bottom: var(--zen-compact-float);
-        padding: 0 var(--zen-compact-float) !important;
-
-        :root[zen-single-toolbar='true'] & {
-          /* We add an extra offset since windows users have a border top
-            * in the window in order to compensate how windows renders the
-            * titlebar */
-          top: calc(var(--zen-compact-float) / 2 + var(--zen-sidebar-compact-top-offset, 0px));
-          height: calc(100% - var(--zen-compact-float));
-        }
-
-        :root:not([zen-single-toolbar='true']) & {
-          bottom: calc(var(--zen-compact-float) / 2);
-          height: calc(100% - var(--zen-toolbar-height));
-        }
-
-        & #zen-sidebar-top-buttons {
-          margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
-        }
-      }
-
-      &:not([zen-right-side='true']) #nav-bar {
-        margin-left: 0 !important;
-      }
-    }
-
-    &:not([zen-right-side='true']) #navigator-toolbox {
-      left: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
-    }
-
-    &:not([zen-sidebar-expanded='true']) .zen-essentials-container {
-      padding: 0;
-    }
-
-    &[zen-right-side='true'] {
-      & #navigator-toolbox:not([animate='true']) {
-        right: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
-      }
-
-      & .browserSidebarContainer {
-        margin-left: 0 !important;
-        margin-right: 0 !important;
-      }
-    }
-
-    #navigator-toolbox:not([animate='true']) #titlebar {
-      padding: var(--zen-toolbox-padding) !important;
-      :root:not([zen-sidebar-expanded='true']) & {
-        padding: var(--zen-toolbox-padding) 0 !important;
-        max-width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding) * 2);
-        width: var(--zen-sidebar-width);
-      }
-      position: relative;
-      min-width: var(--zen-toolbox-min-width);
-      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));
-      }
-
-      & .zen-toolbar-background {
-        display: flex;
-      }
-    }
-
-    #navigator-toolbox[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
-    #navigator-toolbox[zen-user-show],
-    #navigator-toolbox[zen-has-empty-tab],
-    #navigator-toolbox[flash-popup],
-    #navigator-toolbox[has-popup-menu],
-    #navigator-toolbox[movingtab],
-    &[zen-renaming-tab='true'] #navigator-toolbox,
-    #navigator-toolbox[zen-compact-mode-active] {
-      &:not([animate='true']) {
-        --zen-compact-mode-func: linear(
-          0 0%,
-          0.002748 1%,
-          0.010544 2%,
-          0.022757 3%,
-          0.038804 4%,
-          0.058151 5%,
-          0.080308 6%,
-          0.104828 7.000000000000001%,
-          0.131301 8%,
-          0.159358 9%,
-          0.188662 10%,
-          0.21891 11%,
-          0.249828 12%,
-          0.281172 13%,
-          0.312724 14.000000000000002%,
-          0.344288 15%,
-          0.375693 16%,
-          0.40679 17%,
-          0.437447 18%,
-          0.467549 19%,
-          0.497 20%,
-          0.525718 21%,
-          0.553633 22%,
-          0.580688 23%,
-          0.60684 24%,
-          0.632052 25%,
-          0.656298 26%,
-          0.679562 27%,
-          0.701831 28.000000000000004%,
-          0.723104 28.999999999999996%,
-          0.743381 30%,
-          0.76267 31%,
-          0.780983 32%,
-          0.798335 33%,
-          0.814744 34%,
-          0.830233 35%,
-          0.844826 36%,
-          0.858549 37%,
-          0.87143 38%,
-          0.883498 39%,
-          0.894782 40%,
-          0.905314 41%,
-          0.915125 42%,
-          0.924247 43%,
-          0.93271 44%,
-          0.940547 45%,
-          0.947787 46%,
-          0.954463 47%,
-          0.960603 48%,
-          0.966239 49%,
-          0.971397 50%,
-          0.976106 51%,
-          0.980394 52%,
-          0.984286 53%,
-          0.987808 54%,
-          0.990984 55.00000000000001%,
-          0.993837 56.00000000000001%,
-          0.99639 56.99999999999999%,
-          0.998664 57.99999999999999%,
-          1.000679 59%,
-          1.002456 60%,
-          1.004011 61%,
-          1.005363 62%,
-          1.006528 63%,
-          1.007522 64%,
-          1.008359 65%,
-          1.009054 66%,
-          1.009618 67%,
-          1.010065 68%,
-          1.010405 69%,
-          1.010649 70%,
-          1.010808 71%,
-          1.01089 72%,
-          1.010904 73%,
-          1.010857 74%,
-          1.010757 75%,
-          1.010611 76%,
-          1.010425 77%,
-          1.010205 78%,
-          1.009955 79%,
-          1.009681 80%,
-          1.009387 81%,
-          1.009077 82%,
-          1.008754 83%,
-          1.008422 84%,
-          1.008083 85%,
-          1.00774 86%,
-          1.007396 87%,
-          1.007052 88%,
-          1.00671 89%,
-          1.006372 90%,
-          1.00604 91%,
-          1.005713 92%,
-          1.005394 93%,
-          1.005083 94%,
-          1.004782 95%,
-          1.004489 96%,
-          1.004207 97%,
-          1.003935 98%,
-          1.003674 99%,
-          1.003423 100%
-        );
-        --zen-compact-mode-time: 0.25s;
-        transition:
-          left var(--zen-compact-mode-time) var(--zen-compact-mode-func),
-          right var(--zen-compact-mode-time) var(--zen-compact-mode-func);
-
-        :root:not([supress-primary-adjustment='true']) & {
-          & #titlebar {
-            transition: none;
-            visibility: visible;
-          }
-
-          left: calc(var(--zen-compact-float) / -2);
-          :root[zen-right-side='true'] & {
-            right: calc(var(--zen-compact-float) / -2);
-            left: auto;
-          }
-        }
-      }
-    }
+  @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
+%include sidebar.inc.css
   }
 
-  &:not([zen-single-toolbar='true']) #zen-sidebar-top-buttons {
-    max-width: fit-content;
-    :root[zen-right-side='true'] & {
-      order: 999;
-    }
+  @media -moz-pref('zen.view.compact.hide-toolbar') {
+%include toolbar.inc.css
   }
 }
 
 /* Fix for https://github.com/zen-browser/desktop/issues/7615 */
 :root[zen-compact-mode='true']:not([customizing])[inDOMFullscreen='true'] {
-  &:not([zen-compact-animating]) {
-    #navigator-toolbox {
-      opacity: 0;
+  @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
+    &:not([zen-compact-animating]) {
+      #navigator-toolbox {
+        opacity: 0;
+      }
+    }
+  }
+  @media -moz-pref('zen.view.compact.hide-toolbar') {
+    &:not([zen-single-toolbar='true']) {
+      & #zen-appcontent-navbar-wrapper {
+        opacity: 0;
+      }
     }
   }
 }
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 809401417..fb4af924f 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -124,10 +124,6 @@
   }
 }
 
-:root:not([zen-single-toolbar='true']) #tabbrowser-tabs {
-  margin-top: -2px;
-}
-
 /* ==========================================================================
    Pinned Tabs Separator
    ========================================================================== */
@@ -708,7 +704,6 @@
 
   & #titlebar {
     display: grid;
-    grid-template-rows: auto 1fr;
     overflow: clip;
   }
 
@@ -975,14 +970,8 @@
     height: 100%;
     align-items: center;
 
-    :root:not([zen-sidebar-expanded='true']):not([zen-right-side='true']) {
-      padding-inline-start: var(--zen-toolbox-padding);
-    }
     #nav-bar & {
-      padding-inline-start: var(--toolbarbutton-outer-padding);
-    }
-    :root[zen-right-side='true']:not([zen-window-buttons-reversed='true']) {
-      padding-inline-end: var(--zen-toolbox-padding);
+      padding-inline-end: var(--toolbarbutton-outer-padding);
     }
 
     :root:not([zen-sidebar-expanded='true']) & toolbarspring {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 129842c8b..c42bd84d0 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -2,6 +2,8 @@
  * 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/. */
 
+import { AppConstants } from 'resource://gre/modules/AppConstants.sys.mjs';
+
 export class nsZenSiteDataPanel {
   #iconMap = {
     install: 'extension',
@@ -373,6 +375,9 @@ export class nsZenSiteDataPanel {
         } else {
           this.window.gZenCommonActions.copyCurrentURLToClipboard();
         }
+        if (AppConstants.platform !== 'macosx') {
+          this.panel.hidePopup();
+        }
       }
     }
   }

From c2951d0a0fb81a01aa31a01ade3d1a022d8e5f19 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 7 Oct 2025 01:21:52 +0200
Subject: [PATCH 041/111] fix: Add debug info when an invalid folder is trying
 to restore, b=no-bug, c=common, folders

---
 prefs/view.yaml                    |  3 +++
 src/zen/common/zenThemeModifier.js |  3 ++-
 src/zen/folders/ZenFolders.mjs     | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/prefs/view.yaml b/prefs/view.yaml
index cfdd2ae4d..ff34b01d0 100644
--- a/prefs/view.yaml
+++ b/prefs/view.yaml
@@ -51,3 +51,6 @@
 
 - name: zen.view.context-menu.refresh
   value: false
+
+- name: zen.view.borderless-fullscreen
+  value: true
diff --git a/src/zen/common/zenThemeModifier.js b/src/zen/common/zenThemeModifier.js
index 4c940536d..acd7899d8 100644
--- a/src/zen/common/zenThemeModifier.js
+++ b/src/zen/common/zenThemeModifier.js
@@ -96,7 +96,8 @@ var ZenThemeModifier = {
     if (
       window.fullScreen &&
       window.gZenCompactModeManager?.preference &&
-      !document.getElementById('tabbrowser-tabbox')?.hasAttribute('zen-split-view')
+      !document.getElementById('tabbrowser-tabbox')?.hasAttribute('zen-split-view') &&
+      Services.prefs.getBoolPref('zen.view.borderless-fullscreen', true)
     ) {
       separation = 0;
     }
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index ba57639df..a3c91abf0 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1615,11 +1615,6 @@
           const parentWorkingData = tabFolderWorkingData.get(stateData.parentId);
           if (parentWorkingData && parentWorkingData.node) {
             switch (stateData?.prevSiblingInfo?.type) {
-              case 'group': {
-                const folder = document.getElementById(stateData.prevSiblingInfo.id);
-                folder.after(node);
-                break;
-              }
               case 'tab': {
                 const tab = parentWorkingData.node.querySelector(
                   `[zen-pin-id="${stateData.prevSiblingInfo.id}"]`
@@ -1627,6 +1622,18 @@
                 tab.after(node);
                 break;
               }
+              case 'group': {
+                const folder = document.getElementById(stateData.prevSiblingInfo.id);
+                if (folder) {
+                  folder.after(node);
+                  break;
+                }
+                // If we didn't find the group, we should debug it and continue to default case.
+                console.warn(
+                  `Zen Folders: Could not find previous sibling group with id ${stateData.prevSiblingInfo.id} while restoring session.`
+                );
+                // @eslint-disable-next-line no-fallthrough
+              }
               default: {
                 // Should insert after zen-empty-tab
                 const start =

From 289058c25d47b27d7cda19000c2a58afba5413b2 Mon Sep 17 00:00:00 2001
From: reizumi <reizumichan@protonmail.com>
Date: Tue, 7 Oct 2025 23:59:11 +0800
Subject: [PATCH 042/111] style: update sidebar icon (#10718)

---
 src/browser/themes/shared/zen-icons/icons.css             | 4 ++++
 src/browser/themes/shared/zen-icons/jar.inc.mn            | 3 +++
 src/browser/themes/shared/zen-icons/lin/sidebar-right.svg | 5 +++++
 src/browser/themes/shared/zen-icons/lin/sidebar.svg       | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/browser/themes/shared/zen-icons/lin/sidebar-right.svg

diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 7e1db475b..e5c7002bd 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -57,6 +57,10 @@
 #sidebar-button:-moz-locale-dir(rtl)[positionend],
 #zen-toggle-compact-mode {
   list-style-image: url('sidebar.svg') !important;
+
+  :root[zen-right-side='true'] & {
+    list-style-image: url('sidebar-right.svg') !important;
+  }
 }
 
 #downloads-button,
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index f9e705850..c71a81e50 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -118,6 +118,7 @@
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
 *  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
+*  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/lin/sidebar-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/lin/sidebar.svg) 
 *  skin/classic/browser/zen-icons/source-code.svg                      (../shared/zen-icons/lin/source-code.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
@@ -259,6 +260,7 @@
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
 *  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
+*  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/lin/sidebar-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/lin/sidebar.svg) 
 *  skin/classic/browser/zen-icons/source-code.svg                      (../shared/zen-icons/lin/source-code.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
@@ -400,6 +402,7 @@
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
 *  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
+*  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/lin/sidebar-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/lin/sidebar.svg) 
 *  skin/classic/browser/zen-icons/source-code.svg                      (../shared/zen-icons/lin/source-code.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
diff --git a/src/browser/themes/shared/zen-icons/lin/sidebar-right.svg b/src/browser/themes/shared/zen-icons/lin/sidebar-right.svg
new file mode 100644
index 000000000..d25f84075
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/sidebar-right.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="9.75" y1="2.75" x2="9.75" y2="15.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></rect><line x1="13.75" y1="6.25" x2="12.25" y2="6.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><line x1="13.75" y1="9" x2="12.25" y2="9" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><line x1="13.75" y1="11.75" x2="12.25" y2="11.75" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/sidebar.svg b/src/browser/themes/shared/zen-icons/lin/sidebar.svg
index bd468826a..9f0aa3571 100644
--- a/src/browser/themes/shared/zen-icons/lin/sidebar.svg
+++ b/src/browser/themes/shared/zen-icons/lin/sidebar.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="3.25" width="14.5" height="11.5" rx="2" ry="2"></rect><rect x="4.75" y="6.25" width="2" height="5.5" fill="currentColor" data-color="color-2"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="8.25" y1="2.75" x2="8.25" y2="15.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></rect><line x1="4.25" y1="6.25" x2="5.75" y2="6.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><line x1="4.25" y1="9" x2="5.75" y2="9" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><line x1="4.25" y1="11.75" x2="5.75" y2="11.75" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line></g></svg>

From 2dc98fa7f7f56b0487c613083f3fea54c2b01eb1 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 7 Oct 2025 23:06:47 +0200
Subject: [PATCH 043/111] chore: Updated to Firefox `144.0`, p=#10725, c=l10n,
 tabs, media, common, tests, workspaces

---
 README.md                                     |   2 +-
 build/firefox-cache/l10n-last-commit-hash     |   2 +-
 src/Cargo-lock.patch                          |   4 +-
 src/Cargo-toml.patch                          |   4 +-
 src/browser/actors/WebRTCParent-sys-mjs.patch |   2 +-
 .../base/content/browser-commands-js.patch    |   2 +-
 .../browser-fullScreenAndPointerLock-js.patch |   2 +-
 .../base/content/browser-init-js.patch        |  14 +-
 src/browser/base/content/browser-js.patch     |   6 +-
 .../base/content/browser-places-js.patch      |   2 +-
 src/browser/base/content/browser-xhtml.patch  |   8 +-
 .../content/main-popupset-inc-xhtml.patch     |   4 +-
 .../content/navigator-toolbox-inc-xhtml.patch |   2 +-
 .../base/content/nsContextMenu-sys-mjs.patch  |   4 +-
 src/browser/base/moz-build.patch              |   4 +-
 .../BrowserContentHandler-sys-mjs.patch       |   2 +-
 .../components/BrowserGlue-sys-mjs.patch      |   6 +-
 .../content/identityPanel-inc-xhtml.patch     |   2 +-
 .../CustomizableUI-sys-mjs.patch              |  48 +-
 .../extensions/parent/ext-browser-js.patch    |   8 +-
 .../content/browserPlacesViews-js.patch       |   2 +-
 .../components/preferences/jar-mn.patch       |   4 +-
 .../preferences/main-inc-xhtml.patch          |   6 +-
 .../components/preferences/main-js.patch      |   4 +-
 .../preferences/preferences-js.patch          |   2 +-
 .../preferences/preferences-xhtml.patch       |  14 +-
 .../screenshots/overlay/overlay-css.patch     |   6 +-
 .../search/SearchUIUtils-sys-mjs.patch        |   4 +-
 .../sessionstore/SessionStore-sys-mjs.patch   |  18 +-
 .../sidebar/browser-sidebar-js.patch          |   2 +-
 .../tabbrowser/TabsList-sys-mjs.patch         |   2 +-
 .../tabbrowser/content/tab-js.patch           |  14 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 150 ++---
 .../tabbrowser/content/tabgroup-js.patch      |  39 +-
 .../tabbrowser/content/tabs-js.patch          | 148 +++--
 .../urlbar/UrlbarController-sys-mjs.patch     |   4 +-
 .../urlbar/UrlbarInput-sys-mjs.patch          |  72 +--
 .../urlbar/UrlbarMuxerStandard-sys-mjs.patch  |   8 +-
 .../urlbar/UrlbarPrefs-sys-mjs.patch          |   4 +-
 .../urlbar/UrlbarProviderPlaces-sys-mjs.patch |  12 +-
 .../UrlbarProvidersManager-sys-mjs.patch      |   4 +-
 .../urlbar/UrlbarUtils-sys-mjs.patch          |  18 +-
 .../urlbar/UrlbarValueFormatter-sys-mjs.patch |   2 +-
 .../urlbar/UrlbarView-sys-mjs.patch           |  10 +-
 .../newtab/lib/ActivityStream-sys-mjs.patch   |   4 +-
 .../installer/package-manifest-in.patch       |   4 +-
 .../themes/BuiltInThemeConfig-sys-mjs.patch   |  16 -
 src/browser/themes/linux/browser-css.patch    |   2 +-
 src/browser/themes/osx/browser-css.patch      |   2 +-
 .../themes/shared/browser-shared-css.patch    |   6 +-
 src/browser/themes/shared/jar-inc-mn.patch    |   4 +-
 .../shared/tabbrowser/content-area-css.patch  |   2 +-
 .../themes/shared/tabbrowser/tabs-css.patch   |  16 +-
 .../themes/shared/toolbarbuttons-css.patch    |   6 +-
 .../themes/shared/urlbar-searchbar-css.patch  |   6 +-
 .../themes/shared/urlbarView-css.patch        |   2 +-
 src/browser/themes/windows/browser-css.patch  |   2 +-
 src/build/moz-build.patch                     |   4 +-
 .../actors/animation-type-longhand-js.patch   |   4 +-
 .../startup/DevToolsStartup-sys-mjs.patch     |   2 +-
 src/dom/base/Document-cpp.patch               |   6 +-
 src/dom/base/use_counter_metrics-yaml.patch   |   6 +-
 .../mediaelement/HTMLMediaElement-cpp.patch   |   4 +-
 .../ff142-gradient-dithering.patch            | 545 ------------------
 src/layout/generic/nsIFrame-cpp.patch         |   4 +-
 src/layout/style/nsStyleStruct-cpp.patch      |   6 +-
 src/layout/style/nsStyleStruct-h.patch        |   4 +-
 .../libpref/init/StaticPrefList-yaml.patch    |   4 +-
 src/modules/libpref/moz-build.patch           |   2 +-
 .../style/gecko/media_features-rs.patch       |   8 +-
 .../components/style/queries/feature-rs.patch |   2 +-
 .../style/queries/feature_expression-rs.patch |   2 +-
 src/testing/mochitest/browser-test-js.patch   |   2 +-
 .../downloads/DownloadList-sys-mjs.patch      |   2 +-
 .../extensions/parent/ext-downloads-js.patch  |   2 +-
 .../pictureinpicture/content/player-js.patch  |   4 +-
 .../content/player-xhtml.patch                |   2 +-
 .../widgets/browser-custom-element-mjs.patch  |   4 +-
 .../widgets/moz-toggle/moz-toggle-css.patch   |   2 +-
 src/toolkit/modules/moz-build.patch           |   4 +-
 src/toolkit/moz-configure.patch               |   2 +-
 .../extensions/AddonManager-sys-mjs.patch     |   2 +-
 .../extensions/content/aboutaddons-css.patch  |   2 +-
 .../profile/nsToolkitProfileService-cpp.patch |   6 +-
 .../themes/shared/aboutReader-css.patch       |   4 +-
 .../shared/in-content/common-shared-css.patch |   8 +-
 src/toolkit/themes/shared/menulist-css.patch  |   4 +-
 .../shared/pictureinpicture/player-css.patch  |   4 +-
 .../signing/macos/mach_commands-py.patch      |   4 +-
 src/widget/cocoa/nsCocoaWindow-mm.patch       |   4 +-
 src/xpfe/appshell/AppWindow-cpp.patch         |   4 +-
 src/zen/common/ZenStartup.mjs                 |   5 -
 src/zen/common/ZenUIManager.mjs               |   1 -
 src/zen/common/styles/zen-omnibox.css         |   4 +
 .../common/styles/zen-single-components.css   |   6 +-
 src/zen/tests/tabs/browser.toml               |   1 +
 .../tests/tabs/browser_tabs_fetch_checks.js   |  29 +
 src/zen/workspaces/ZenWorkspaces.mjs          |   2 +
 surfer.json                                   |   2 +-
 99 files changed, 464 insertions(+), 1004 deletions(-)
 delete mode 100644 src/browser/themes/BuiltInThemeConfig-sys-mjs.patch
 delete mode 100644 src/firefox-patches/ff142-gradient-dithering.patch
 create mode 100644 src/zen/tests/tabs/browser_tabs_fetch_checks.js

diff --git a/README.md b/README.md
index 58bc8315f..d61a328ca 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 ### Firefox Versions
 
 - [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `143.0.4`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 143.0.4`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 144.0`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 671337a45..12646d8ca 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-5cbf54e3cfaf4cfb375088d7e11702e8974b238f
\ No newline at end of file
+dd57c783345c5401fcdcc48e83b1fa9ce511d1cf
\ No newline at end of file
diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch
index e33677b06..0f9223905 100644
--- a/src/Cargo-lock.patch
+++ b/src/Cargo-lock.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 2ac65181b1a9561ee4760e0569dfdd621c684142..b159fd8a351ba7c6541e8994a815de8150db619f 100644
+index c079ef11880c5338c4498a0e5b3eb4cf4bfb6e02..ecd06b05381be740197c07c8cf0743dc882727f5 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -4029,8 +4029,6 @@ dependencies = [
+@@ -4069,8 +4069,6 @@ dependencies = [
  [[package]]
  name = "mime_guess"
  version = "2.0.4"
diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch
index e4b55038b..563622667 100644
--- a/src/Cargo-toml.patch
+++ b/src/Cargo-toml.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 0fdad8b956be8119f5a914b9cee01bb6520cd13d..f1414b5afd5c66c61d1585184de6b32f9918670d 100644
+index 2331ff5733d39e26c0a16301cb83d46ca970f632..777dbd5fb8546466e4a349772ccba254c7ffd691 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -218,6 +218,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
+@@ -224,6 +224,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
  # Workaround for https://github.com/rust-lang/cargo/issues/11232
  rure = { path = "third_party/rust/rure" }
  
diff --git a/src/browser/actors/WebRTCParent-sys-mjs.patch b/src/browser/actors/WebRTCParent-sys-mjs.patch
index fed9ceb84..cee359785 100644
--- a/src/browser/actors/WebRTCParent-sys-mjs.patch
+++ b/src/browser/actors/WebRTCParent-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
-index f327e1684d0966a0dcfdcdbf8cc70259b27a4504..c8f722bda4cf297f5d0a6aa22dafbe27c4218123 100644
+index 80fd2177c7112c958ff51bbf7a18ebea39e50fbf..24f62810901dc558e25ee874bd49736bd64fd358 100644
 --- a/browser/actors/WebRTCParent.sys.mjs
 +++ b/browser/actors/WebRTCParent.sys.mjs
 @@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {
diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch
index 7e98cf714..b6d37eec0 100644
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index 637e9dda83df5b490d6340367dd63077904ea056..6ffb1dc6ed1d6e58b4e8de1faca887f6b38115cb 100644
+index 74aae01ddcdc4b6460ebbe174355ca129a89010b..52dd4e6aa49929394ed6afa6b25f4ee4954b8b94 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
 @@ -317,6 +317,10 @@ var BrowserCommands = {
diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
index b71398c94..db1354d84 100644
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index d477ac782e0cb921203f8cd38da70a003ac41b39..648d0b4066b630a9b31da0bb8490f29da701dd3d 100644
+index b41449d4c4bc373a4c9cf449c0bb370bfdbc20d6..f1166929397dd39b7f44bd9cb0d62a45d67f0e1d 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
 @@ -427,10 +427,10 @@ var FullScreen = {
diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch
index 9b3a7c42d..2d21acf05 100644
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,20 +1,12 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index e4a94863c0f0810d1894475b020814b2ad32ffb3..515f61d2df5d4a593fc32d3f32e8fdec2b8f5983 100644
+index 8e63654b343e8518aa0e366a3fd3bf7e0856eafb..fe402e526ab33cdcc4baabf8685dfb03efac6003 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -191,6 +191,7 @@ var gBrowserInit = {
+@@ -198,6 +198,7 @@ var gBrowserInit = {
    },
  
    onLoad() {
 +    Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", window);
      gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
-       PopupBlockerObserver.handleEvent(e)
+       PopupAndRedirectBlockerObserver.handleEvent(e)
      );
-@@ -359,6 +360,7 @@ var gBrowserInit = {
- 
-     this._handleURIToLoad();
- 
-+    gZenWorkspaces.selectStartPage();
-     Services.obs.addObserver(gIdentityHandler, "perm-changed");
-     Services.obs.addObserver(gRemoteControl, "devtools-socket");
-     Services.obs.addObserver(gRemoteControl, "marionette-listening");
diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index afc190969..33bd7cf81 100644
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index c5b7ef2616c1dab9f42970605897e862d57ab7d0..77f0731db6c4a8d835cf8733115d27ae7782a987 100644
+index 32b67f846b9942ad3da4276bb8748fee915eb485..f77d5df7c8ef49c0366ada8b3153c5a6c676239b 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -31,6 +31,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,7 +10,7 @@ index c5b7ef2616c1dab9f42970605897e862d57ab7d0..77f0731db6c4a8d835cf8733115d27ae
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -2291,6 +2292,8 @@ var XULBrowserWindow = {
+@@ -2293,6 +2294,8 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
@@ -19,7 +19,7 @@ index c5b7ef2616c1dab9f42970605897e862d57ab7d0..77f0731db6c4a8d835cf8733115d27ae
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -5232,6 +5235,9 @@ var ConfirmationHint = {
+@@ -4782,6 +4785,9 @@ var ConfirmationHint = {
      MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
      MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");
      document.l10n.setAttributes(this._message, messageId, options.l10nArgs);
diff --git a/src/browser/base/content/browser-places-js.patch b/src/browser/base/content/browser-places-js.patch
index e7baf596a..e302f2838 100644
--- a/src/browser/base/content/browser-places-js.patch
+++ b/src/browser/base/content/browser-places-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
-index 5ba2b6a58776e2b1d70b80e8cb1533cb20caafc6..65736705968732a185e81561b2866bfbe6f3233a 100644
+index 79b4f6f8fb2f7dd8784920038784e6bb0c967e2d..1f3f4991b3ba7c00516e9708e89e8f95db25a36a 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
 @@ -252,6 +252,8 @@ var StarUI = {
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index 7b1a16f57..413da9a2a 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 7c4c05b72845dfb37c11317d011b8e7c6ba07934..856c368e4d6fe7c7d7ab468423348c844cbf1cdf 100644
+index ffddea280e2edffa2531b4b129489c2be0e2c3d2..f03db9e2db0dec06f997740337f28e76a08a3bdb 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -26,6 +26,7 @@
+@@ -19,6 +19,7 @@
          sizemode="normal"
          retargetdocumentfocus="urlbar-input"
          scrolling="false"
@@ -10,7 +10,7 @@ index 7c4c05b72845dfb37c11317d011b8e7c6ba07934..856c368e4d6fe7c7d7ab468423348c84
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -105,8 +106,10 @@
+@@ -98,8 +99,10 @@
  
    <title data-l10n-id="browser-main-window-default-title"></title>
  
@@ -21,7 +21,7 @@ index 7c4c05b72845dfb37c11317d011b8e7c6ba07934..856c368e4d6fe7c7d7ab468423348c84
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -128,9 +131,11 @@
+@@ -132,9 +135,11 @@
      </vbox>
    </html:template>
  
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index c185ae782..45cdf904f 100644
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index fc219ea3dc901fe2ed351161240700113efb8799..f25bdbf886733e2081a4dff55614809056e9885e 100644
+index 69b83857f40bab6a7298c1416989df2d929d78c1..4ac9f02eb31f58a72d4c58c239ebeadcb66d1e16 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
 @@ -208,6 +208,10 @@
@@ -21,7 +21,7 @@ index fc219ea3dc901fe2ed351161240700113efb8799..f25bdbf886733e2081a4dff556148090
      </panel>
    </html:template>
  
-@@ -613,6 +618,8 @@
+@@ -615,6 +620,8 @@
  
  #include popup-notifications.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 2297b8efd..98bcbfa15 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 8e56b24b39e9c1607e3ff208d284a9b555a91ebb..2402848ae564234ec22d5a317c43864ea1b36f29 100644
+index 328a9b052e2f758f48df1caa8165347ed0301b33..1c111abe148f2e16afa6b5f33eb118b7c02dfd69 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
diff --git a/src/browser/base/content/nsContextMenu-sys-mjs.patch b/src/browser/base/content/nsContextMenu-sys-mjs.patch
index 633a2916f..d5ddb503a 100644
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index bc71ba720ef3603e8b90d295fb16d8415ba114c4..99677f70e22258f61cc9bda31e4d8745d7ca9395 100644
+index b4fe996f9685a085c14324a35a1d51e2fed569b7..c83d5e9bf92f8f2e3d96b121ba3b758dd124393b 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1095,6 +1095,8 @@ export class nsContextMenu {
+@@ -1105,6 +1105,8 @@ export class nsContextMenu {
          !this.isSecureAboutPage()
      );
  
diff --git a/src/browser/base/moz-build.patch b/src/browser/base/moz-build.patch
index 06cd8ea3f..d4813485e 100644
--- a/src/browser/base/moz-build.patch
+++ b/src/browser/base/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/moz.build b/browser/base/moz.build
-index 2f2807a246c262298d0802a6a80abe211c99732c..089a86c9e7f69b994657f20fb2392f3dcc8646bf 100644
+index 086b462e706bb46727d0fed85b4c98debaeaf721..44a4fcb9b8181678667ee11b0443eed681dd2a43 100644
 --- a/browser/base/moz.build
 +++ b/browser/base/moz.build
-@@ -81,3 +81,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
+@@ -82,3 +82,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
  DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
  
  JAR_MANIFESTS += ["jar.mn"]
diff --git a/src/browser/components/BrowserContentHandler-sys-mjs.patch b/src/browser/components/BrowserContentHandler-sys-mjs.patch
index bfe87274f..4d2cdfa8f 100644
--- a/src/browser/components/BrowserContentHandler-sys-mjs.patch
+++ b/src/browser/components/BrowserContentHandler-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 8630614d23147365628e0cb7e9625b8f2a160588..0750869f16336452a458f27627e6fe0492aae462 100644
+index aeb53582c895d3d495dca2702da3043cf761714c..86859f25ac9c0cb20da24d1f84775f99c9092016 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
 @@ -1276,6 +1276,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch
index b7d6408ac..7d280fdcd 100644
--- a/src/browser/components/BrowserGlue-sys-mjs.patch
+++ b/src/browser/components/BrowserGlue-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index eae3ed9518ad9ce2103bb912963465c1b10ac050..ccbb04cd36fd8fd63fd8c9ebd0b51f0a5966829c 100644
+index 67b2806835baba3070f295d6b96f97077639995a..5f28e0073c893c57c1d6c37deaacf7b097351d60 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
 @@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
@@ -10,7 +10,7 @@ index eae3ed9518ad9ce2103bb912963465c1b10ac050..ccbb04cd36fd8fd63fd8c9ebd0b51f0a
    AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
    AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
    ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
-@@ -1448,7 +1449,7 @@ BrowserGlue.prototype = {
+@@ -1458,7 +1459,7 @@ BrowserGlue.prototype = {
        windowcount++;
        let tabbrowser = win.gBrowser;
        if (tabbrowser) {
@@ -19,7 +19,7 @@ index eae3ed9518ad9ce2103bb912963465c1b10ac050..ccbb04cd36fd8fd63fd8c9ebd0b51f0a
        }
      }
  
-@@ -1611,6 +1612,8 @@ BrowserGlue.prototype = {
+@@ -1623,6 +1624,8 @@ BrowserGlue.prototype = {
      } else if (profileDataVersion < APP_DATA_VERSION) {
        lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION);
      }
diff --git a/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch b/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
index 5c65723d4..27546b54d 100644
--- a/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
+++ b/src/browser/components/controlcenter/content/identityPanel-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
-index 225340c698f775a321bf5f82c0156bb0e3e2aa96..59e6613638efadfd2961999bd77b388c4529314b 100644
+index 8e23aad8ca0bb686a669b11e1d78b7906f5f38d0..cf4873cc6165b5f77091c056d7e275e0f3d36769 100644
 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
 +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
 @@ -28,7 +28,7 @@
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index 4635de61c..abfdf5f78 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4d74ede4e 100644
+index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb074aa94d 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -10,7 +10,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
    HomePage: "resource:///modules/HomePage.sys.mjs",
    PanelMultiView:
      "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs",
-@@ -323,7 +324,7 @@ var CustomizableUIInternal = {
+@@ -326,7 +327,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_PANEL,
          defaultPlacements: [],
@@ -19,7 +19,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
        },
        false
      );
-@@ -333,19 +334,14 @@ var CustomizableUIInternal = {
+@@ -336,19 +337,14 @@ var CustomizableUIInternal = {
        "back-button",
        "forward-button",
        "stop-reload-button",
@@ -40,7 +40,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
      this.registerArea(
        CustomizableUI.AREA_NAVBAR,
        {
-@@ -353,8 +349,6 @@ var CustomizableUIInternal = {
+@@ -356,8 +352,6 @@ var CustomizableUIInternal = {
          overflowable: true,
          defaultPlacements: navbarPlacements,
          verticalTabsDefaultPlacements: [
@@ -49,7 +49,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
          ],
          defaultCollapsed: false,
        },
-@@ -378,10 +372,7 @@ var CustomizableUIInternal = {
+@@ -381,10 +375,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -60,7 +60,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -463,6 +454,7 @@ var CustomizableUIInternal = {
+@@ -466,6 +457,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -68,7 +68,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1247,6 +1239,9 @@ var CustomizableUIInternal = {
+@@ -1250,6 +1242,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -78,7 +78,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1754,7 +1749,7 @@ var CustomizableUIInternal = {
+@@ -1757,7 +1752,7 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -87,7 +87,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1764,7 +1759,7 @@ var CustomizableUIInternal = {
+@@ -1767,7 +1762,7 @@ var CustomizableUIInternal = {
          // We also need to remove the panel context menu if it's there:
          this.ensureButtonContextMenu(widgetNode);
          if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
@@ -96,7 +96,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -1932,16 +1927,16 @@ var CustomizableUIInternal = {
+@@ -1935,16 +1930,16 @@ var CustomizableUIInternal = {
          elem.setAttribute("skipintoolbarset", "true");
        }
      }
@@ -116,7 +116,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
      // Handle initial state of vertical tabs.
      if (isVerticalTabs) {
        // Show the vertical tabs toolbar
-@@ -2183,6 +2178,10 @@ var CustomizableUIInternal = {
+@@ -2186,6 +2181,10 @@ var CustomizableUIInternal = {
     *   The identifier string of the area that aNode is being inserted into.
     */
    insertWidgetBefore(aNode, aNextNode, aContainer, aAreaId) {
@@ -127,7 +127,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
      this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
        this.setLocationAttributes(aNode, aAreaId);
        aContainer.insertBefore(aNode, aNextNode);
-@@ -3303,7 +3302,6 @@ var CustomizableUIInternal = {
+@@ -3306,7 +3305,6 @@ var CustomizableUIInternal = {
      if (!this.isWidgetRemovable(aWidgetId)) {
        return;
      }
@@ -135,7 +135,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
      let placements = gPlacements.get(oldPlacement.area);
      let position = placements.indexOf(aWidgetId);
      if (position != -1) {
-@@ -4538,7 +4536,7 @@ var CustomizableUIInternal = {
+@@ -4541,7 +4539,7 @@ var CustomizableUIInternal = {
     * For all registered areas, builds those areas to reflect the current
     * placement state of all widgets.
     */
@@ -144,7 +144,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -4549,7 +4547,7 @@ var CustomizableUIInternal = {
+@@ -4552,7 +4550,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -153,7 +153,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -5840,6 +5838,7 @@ export var CustomizableUI = {
+@@ -5843,6 +5841,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -161,7 +161,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -7887,11 +7886,11 @@ class OverflowableToolbar {
+@@ -7890,11 +7889,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -175,17 +175,17 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
      });
  
      lazy.log.debug(
-@@ -7901,7 +7900,8 @@ class OverflowableToolbar {
-     // If the target has min-width: 0, their children might actually overflow
-     // it, so check for both cases explicitly.
-     let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
--    let isOverflowing = Math.floor(targetContentWidth) > totalAvailWidth;
+@@ -7909,7 +7908,8 @@ class OverflowableToolbar {
+       Math.max(targetWidth, targetChildrenWidth)
+     );
+     totalAvailWidth = Math.ceil(totalAvailWidth);
+-    let isOverflowing = targetContentWidth > totalAvailWidth;
 +    if (win.gZenVerticalTabsManager._hasSetSingleToolbar && this.#toolbar.id == 'nav-bar') return { isOverflowing: false, targetContentWidth, totalAvailWidth };
-+    let isOverflowing = Math.floor(targetContentWidth) + (win.gZenVerticalTabsManager._hasSetSingleToolbar ? 0.1 : 0) > totalAvailWidth;
++    let isOverflowing = targetContentWidth + (win.gZenVerticalTabsManager._hasSetSingleToolbar ? 0.1 : 0) > totalAvailWidth;
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -7995,7 +7995,7 @@ class OverflowableToolbar {
+@@ -8003,7 +8003,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -194,7 +194,7 @@ index 4f62449d670701c77c681ae36e00bae8bf2f636c..ac542f33927f9de9040bab9cd98351a4
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8340,7 +8340,7 @@ class OverflowableToolbar {
+@@ -8348,7 +8348,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {
diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch
index 3bace1f05..68c720930 100644
--- a/src/browser/components/extensions/parent/ext-browser-js.patch
+++ b/src/browser/components/extensions/parent/ext-browser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index 0baa038232d7e0fd9942f392c48acf7ea5ba50ed..093e1c29c3538d18eb2162b4e4b23ba40c695739 100644
+index 89b0bb3b92c15b89499ffc6cf35dcee7ebb89e48..327afaea3821cdca8d7f58bfaa65c7ce3dbfa7a3 100644
 --- a/browser/components/extensions/parent/ext-browser.js
 +++ b/browser/components/extensions/parent/ext-browser.js
-@@ -351,6 +351,7 @@ class TabTracker extends TabTrackerBase {
+@@ -354,6 +354,7 @@ class TabTracker extends TabTrackerBase {
    }
  
    getId(nativeTab) {
@@ -10,7 +10,7 @@ index 0baa038232d7e0fd9942f392c48acf7ea5ba50ed..093e1c29c3538d18eb2162b4e4b23ba4
      let id = this._tabs.get(nativeTab);
      if (id) {
        return id;
-@@ -385,6 +386,7 @@ class TabTracker extends TabTrackerBase {
+@@ -388,6 +389,7 @@ class TabTracker extends TabTrackerBase {
      if (nativeTab.ownerGlobal.closed) {
        throw new Error("Cannot attach ID to a tab in a closed window.");
      }
@@ -18,7 +18,7 @@ index 0baa038232d7e0fd9942f392c48acf7ea5ba50ed..093e1c29c3538d18eb2162b4e4b23ba4
  
      this._tabs.set(nativeTab, id);
      if (nativeTab.linkedBrowser) {
-@@ -1268,6 +1270,10 @@ class TabManager extends TabManagerBase {
+@@ -1271,6 +1273,10 @@ class TabManager extends TabManagerBase {
    }
  
    canAccessTab(nativeTab) {
diff --git a/src/browser/components/places/content/browserPlacesViews-js.patch b/src/browser/components/places/content/browserPlacesViews-js.patch
index bf9dad21b..334efc46f 100644
--- a/src/browser/components/places/content/browserPlacesViews-js.patch
+++ b/src/browser/components/places/content/browserPlacesViews-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
-index 29fb3308dcc98d785a3345dee78050d633927db2..0ae28fa0618def4a146723b19a22280956a25371 100644
+index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3ed3a3058e 100644
 --- a/browser/components/places/content/browserPlacesViews.js
 +++ b/browser/components/places/content/browserPlacesViews.js
 @@ -330,12 +330,23 @@ class PlacesViewBase {
diff --git a/src/browser/components/preferences/jar-mn.patch b/src/browser/components/preferences/jar-mn.patch
index 591370981..1f1b5e52a 100644
--- a/src/browser/components/preferences/jar-mn.patch
+++ b/src/browser/components/preferences/jar-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index eac1fc65c01107cc7f1a3f3aeb1e8caac3c4a3f5..c3bd265acc924bcf26816e9e78f314c31af41f6d 100644
+index a786155d80a9f1f09d209f2da11437ee2d662739..2e422b48b452698275118d336d1b16af6a221577 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -27,3 +27,5 @@ browser.jar:
+@@ -30,3 +30,5 @@ browser.jar:
     content/browser/preferences/widgets/setting-control.mjs              (widgets/setting-control/setting-control.mjs)
     content/browser/preferences/widgets/setting-group.mjs                (widgets/setting-group/setting-group.mjs)
     content/browser/preferences/widgets/setting-group.css                (widgets/setting-group/setting-group.css)
diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch
index c3c8af6ce..234483ae9 100644
--- a/src/browser/components/preferences/main-inc-xhtml.patch
+++ b/src/browser/components/preferences/main-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index 66ce978d9b022285dea67fdb75b3c005adb05d9b..db61587570ca18403a82ea6796a756d403cc207e 100644
+index 891cf7108cf4606c99a902afa420e744b9690b87..72034b4a28e68016c04d06a2991ccebff30dd341 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
 @@ -29,6 +29,9 @@
@@ -12,7 +12,7 @@ index 66ce978d9b022285dea67fdb75b3c005adb05d9b..db61587570ca18403a82ea6796a756d4
  #ifdef XP_WIN
      <hbox id="windowsLaunchOnLoginBox" align="center" hidden="true">
        <checkbox id="windowsLaunchOnLogin"
-@@ -188,7 +191,8 @@
+@@ -189,7 +192,8 @@
  <!-- Browser layout -->
  <groupbox data-category="paneGeneral"
            data-subcategory="layout"
@@ -22,7 +22,7 @@ index 66ce978d9b022285dea67fdb75b3c005adb05d9b..db61587570ca18403a82ea6796a756d4
    <label><html:h2 data-l10n-id="browser-layout-header"/></label>
    <radiogroup id="browserLayoutRadioGroup" preference="sidebar.verticalTabs">
      <radio id="browserLayoutHorizontalTabs" data-l10n-id="browser-layout-horizontal-tabs" value="false"/>
-@@ -419,6 +423,7 @@
+@@ -420,6 +424,7 @@
                languages-customize-add.label,
              " />
    </hbox>
diff --git a/src/browser/components/preferences/main-js.patch b/src/browser/components/preferences/main-js.patch
index 7fe5eeb4e..fedbfaded 100644
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 3f578f3888684a1830d456f2a4896e8a5f6630fd..7de18a724d3953a5616577f65a8cf9a18f71893c 100644
+index 259bc260328af1b1f2b95866e7cf92dec341a4b0..3cebff51774b2542a8d4d888aa99dc10929c80be 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -424,7 +424,7 @@ function getBundleForLocales(newLocales) {
+@@ -443,7 +443,7 @@ function getBundleForLocales(newLocales) {
      ])
    );
    return new Localization(
diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch
index 9bd739668..c85a728be 100644
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index b5af9af69fd715012af5c0613e0627dd9cf9c3b7..7f86bac8cce278c5b7b7e1230230b3a27b7cf49a 100644
+index 1fb8a954f61e89736b369f5fa01bb4f89fff16ad..3030c32cb66529f14e575428654778abd312dfd8 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -117,6 +117,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
index 9a6458fdd..8e8ee9e12 100644
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 21d951a19df06da67a28f717b9f80f8f4ebf77d2..b1f998f2b3ed99b19666e81e61428587541b0da5 100644
+index 0081bb470c9b15b39441ff844680e5e91b05fb86..3e4e7c43cf0e4feffb80623491de6222bb88a64b 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
-@@ -44,6 +44,8 @@
-   <link rel="stylesheet" href="chrome://browser/skin/preferences/privacy.css" />
+@@ -45,6 +45,8 @@
    <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-group.css" />
+   <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-control.css" />
  
 +#include zen-preferences-links.xhtml
 +
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -104,6 +106,11 @@
+@@ -106,6 +108,11 @@
    <hbox flex="1">
  
      <vbox class="navigation">
@@ -23,7 +23,7 @@ index 21d951a19df06da67a28f717b9f80f8f4ebf77d2..b1f998f2b3ed99b19666e81e61428587
        <!-- category list -->
        <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
          <richlistitem id="category-general"
-@@ -116,6 +123,50 @@
+@@ -118,6 +125,50 @@
            <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
          </richlistitem>
  
@@ -74,7 +74,7 @@ index 21d951a19df06da67a28f717b9f80f8f4ebf77d2..b1f998f2b3ed99b19666e81e61428587
          <richlistitem id="category-home"
                        class="category"
                        value="paneHome"
-@@ -227,11 +278,6 @@
+@@ -229,11 +280,6 @@
                  <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
                </hbox>
              </hbox>
@@ -86,7 +86,7 @@ index 21d951a19df06da67a28f717b9f80f8f4ebf77d2..b1f998f2b3ed99b19666e81e61428587
            </hbox>
          </hbox>
          <vbox id="mainPrefPane">
-@@ -245,6 +291,10 @@
+@@ -247,6 +293,10 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml
diff --git a/src/browser/components/screenshots/overlay/overlay-css.patch b/src/browser/components/screenshots/overlay/overlay-css.patch
index 5230fd70e..9c3021460 100644
--- a/src/browser/components/screenshots/overlay/overlay-css.patch
+++ b/src/browser/components/screenshots/overlay/overlay-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/screenshots/overlay/overlay.css b/browser/components/screenshots/overlay/overlay.css
-index 037b060327d896e1ec0d087ade80df7548c8c1f7..7a158291c56df0e3b01bf7a37d04de71940d395f 100644
+index ee2740fc48e9b70fe17b0f27b60053209516dbbf..cc0270e0eb28c3e60216460b02d62111abb970de 100644
 --- a/browser/components/screenshots/overlay/overlay.css
 +++ b/browser/components/screenshots/overlay/overlay.css
-@@ -225,6 +225,9 @@
+@@ -196,6 +196,9 @@
    pointer-events: none;
    position: absolute;
    z-index: var(--screenshots-high-layer);
@@ -12,7 +12,7 @@ index 037b060327d896e1ec0d087ade80df7548c8c1f7..7a158291c56df0e3b01bf7a37d04de71
  }
  
  #top-background {
-@@ -243,7 +246,7 @@
+@@ -214,7 +217,7 @@
  }
  
  .bghighlight {
diff --git a/src/browser/components/search/SearchUIUtils-sys-mjs.patch b/src/browser/components/search/SearchUIUtils-sys-mjs.patch
index 850fac1ff..c384b1151 100644
--- a/src/browser/components/search/SearchUIUtils-sys-mjs.patch
+++ b/src/browser/components/search/SearchUIUtils-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/search/SearchUIUtils.sys.mjs b/browser/components/search/SearchUIUtils.sys.mjs
-index 6ef224ce377cf3ff511e435f3c7a5dc1de819c60..5b4c395c222c6317fd88499a1aa5307032ea13f8 100644
+index 55f90f4e802480728bbd5ef962b507183e017997..2a83f861fe6edee2b127c8d7946abcdcdbf677f5 100644
 --- a/browser/components/search/SearchUIUtils.sys.mjs
 +++ b/browser/components/search/SearchUIUtils.sys.mjs
-@@ -426,7 +426,7 @@ export var SearchUIUtils = {
+@@ -430,7 +430,7 @@ export var SearchUIUtils = {
          triggeringSearchEngine: engine.name,
        },
      });
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 08585dd50..79c5bcfcf 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb1077ea5c 100644
+index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d89fb95494 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -126,6 +126,8 @@ const TAB_EVENTS = [
@@ -11,7 +11,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
  ];
  
  const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-@@ -1898,6 +1900,8 @@ var SessionStoreInternal = {
+@@ -1904,6 +1906,8 @@ var SessionStoreInternal = {
        case "TabPinned":
        case "TabUnpinned":
        case "SwapDocShells":
@@ -20,7 +20,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
          this.saveStateDelayed(win);
          break;
        case "TabGroupCreate":
-@@ -2133,7 +2137,6 @@ var SessionStoreInternal = {
+@@ -2139,7 +2143,6 @@ var SessionStoreInternal = {
        if (closedWindowState) {
          let newWindowState;
          if (
@@ -28,7 +28,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
            !lazy.SessionStartup.willRestore()
          ) {
            // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2366,11 +2369,9 @@ var SessionStoreInternal = {
+@@ -2372,11 +2375,9 @@ var SessionStoreInternal = {
            tabbrowser.selectedTab.label;
        }
  
@@ -40,7 +40,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
  
        // Store the window's close date to figure out when each individual tab
        // was closed. This timestamp should allow re-arranging data based on how
-@@ -3355,7 +3356,7 @@ var SessionStoreInternal = {
+@@ -3361,7 +3362,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -49,7 +49,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
        return;
      }
  
-@@ -4067,6 +4068,11 @@ var SessionStoreInternal = {
+@@ -4073,6 +4074,11 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -61,7 +61,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4503,6 +4509,7 @@ var SessionStoreInternal = {
+@@ -4509,6 +4515,7 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -138,7 +138,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6349,6 +6360,25 @@ var SessionStoreInternal = {
+@@ -6348,6 +6359,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -164,7 +164,7 @@ index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..cf13724d147c8b8fc35c76d7f77601eb
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -7264,7 +7294,7 @@ var SessionStoreInternal = {
+@@ -7263,7 +7293,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
diff --git a/src/browser/components/sidebar/browser-sidebar-js.patch b/src/browser/components/sidebar/browser-sidebar-js.patch
index 4f1be7371..a04592bf8 100644
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index f62decaa3f7400787b245b3e765197f4e70dffbb..329240cf434fdbefcf145a733179bd565a814280 100644
+index c4edb5442e5243b7d9fe35e1774b2fc651903601..d58076fedafe07d3401ab1723eaa837fabbae09f 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
 @@ -779,7 +779,7 @@ var SidebarController = {
diff --git a/src/browser/components/tabbrowser/TabsList-sys-mjs.patch b/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
index d511f3c1d..5ac1788da 100644
--- a/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/TabsList.sys.mjs b/browser/components/tabbrowser/TabsList.sys.mjs
-index 97990af166b63cae4b0343c77da5084850890504..b58d20eb3db82867030292625d45277afce1bbea 100644
+index 20a543dede6bf4428c8af19c5d0589788ddd8eaa..27a378e70f5b280b720c95ba8dac2cc4e88985be 100644
 --- a/browser/components/tabbrowser/TabsList.sys.mjs
 +++ b/browser/components/tabbrowser/TabsList.sys.mjs
 @@ -87,7 +87,7 @@ class TabsListBase {
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 55459a9d4..50543e0eb 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index fd2465046407261e8c29b4cd3d56122d232e701c..108bc7eae78898bf8a84ddadbacca2d6e64a457d 100644
+index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..5b0f46642e36fd3e15d13a8dbc633c7a9751f8aa 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -31,7 +31,7 @@ index fd2465046407261e8c29b4cd3d56122d232e701c..108bc7eae78898bf8a84ddadbacca2d6
            "fadein,pinned,busy,progress,selected=visuallyselected",
          ".tab-icon-pending":
 @@ -93,9 +96,9 @@
-           "src=image,triggeringprincipal=iconloadingprincipal,requestcontextid,fadein,pinned,selected=visuallyselected,busy,crashed,sharing,pictureinpicture,pending,discarded",
+           "src=image,requestcontextid,fadein,pinned,selected=visuallyselected,busy,crashed,sharing,pictureinpicture,pending,discarded",
          ".tab-sharing-icon-overlay": "sharing,selected=visuallyselected,pinned",
          ".tab-icon-overlay":
 -          "sharing,pictureinpicture,crashed,busy,soundplaying,soundplaying-scheduledremoval,pinned,muted,blocked,selected=visuallyselected,activemedia-blocked",
@@ -101,7 +101,7 @@ index fd2465046407261e8c29b4cd3d56122d232e701c..108bc7eae78898bf8a84ddadbacca2d6
        }
        return null;
      }
-@@ -459,6 +475,8 @@
+@@ -468,6 +484,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (
          event.target.classList.contains("tab-close-button") ||
@@ -110,7 +110,7 @@ index fd2465046407261e8c29b4cd3d56122d232e701c..108bc7eae78898bf8a84ddadbacca2d6
          event.target.classList.contains("tab-icon-overlay") ||
          event.target.classList.contains("tab-audio-button")
        ) {
-@@ -513,6 +531,10 @@
+@@ -522,6 +540,10 @@
        this.style.MozUserFocus = "";
      }
  
@@ -121,7 +121,7 @@ index fd2465046407261e8c29b4cd3d56122d232e701c..108bc7eae78898bf8a84ddadbacca2d6
      on_click(event) {
        if (event.button != 0) {
          return;
-@@ -561,6 +583,7 @@
+@@ -570,6 +592,7 @@
              )
            );
          } else {
@@ -129,7 +129,7 @@ index fd2465046407261e8c29b4cd3d56122d232e701c..108bc7eae78898bf8a84ddadbacca2d6
            gBrowser.removeTab(this, {
              animate: true,
              triggeringEvent: event,
-@@ -573,6 +596,14 @@
+@@ -582,6 +605,14 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
@@ -144,7 +144,7 @@ index fd2465046407261e8c29b4cd3d56122d232e701c..108bc7eae78898bf8a84ddadbacca2d6
      }
  
      on_dblclick(event) {
-@@ -596,6 +627,8 @@
+@@ -605,6 +636,8 @@
            animate: true,
            triggeringEvent: event,
          });
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 6494a3137..11561149a 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80ed9d2317a 100644
+index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394b7dbc6a7 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -427,15 +427,64 @@
+@@ -432,15 +432,64 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -69,7 +69,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -583,6 +632,7 @@
+@@ -588,6 +637,7 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -77,22 +77,26 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -868,9 +918,13 @@
+@@ -873,13 +923,17 @@
        }
  
        this.showTab(aTab);
 +      const handled = gZenFolders.handleTabPin(aTab);
 +      if (!handled) {
 +        this.ungroupTab(aTab);
-       this.#handleTabMove(aTab, () =>
--        this.pinnedTabsContainer.appendChild(aTab)
+       this.#handleTabMove(aTab, () => {
+         let periphery = document.getElementById(
+           "pinned-tabs-container-periphery"
+         );
+         // If periphery is null, append to end
+-        this.pinnedTabsContainer.insertBefore(aTab, periphery);
 +        aTab.hasAttribute("zen-essential") ? gZenWorkspaces.getEssentialsSection(aTab).appendChild(aTab) : this.pinnedTabsContainer.insertBefore(aTab, this.pinnedTabsContainer.lastChild)
-       );
+       });
 +      }
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -883,11 +937,15 @@
+@@ -892,11 +946,15 @@
        }
  
        this.#handleTabMove(aTab, () => {
@@ -109,7 +113,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1065,6 +1123,8 @@
+@@ -1073,6 +1131,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -117,8 +121,8 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
 +      gZenPinnedTabManager.onTabIconChanged(aTab, aIconURL);
        if (
          aIconURL &&
-         !aLoadingPrincipal &&
-@@ -1075,6 +1135,9 @@
+         !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
+@@ -1082,6 +1142,9 @@
          );
          return;
        }
@@ -128,7 +132,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1333,6 +1396,7 @@
+@@ -1445,6 +1508,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -136,7 +140,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1485,6 +1549,9 @@
+@@ -1597,6 +1661,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -146,7 +150,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1808,7 +1875,8 @@
+@@ -1920,7 +1987,8 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -156,7 +160,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          return false;
        }
  
-@@ -1916,7 +1984,7 @@
+@@ -2028,7 +2096,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -165,7 +169,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2191,6 +2259,7 @@
+@@ -2303,6 +2371,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -173,7 +177,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2264,8 +2333,7 @@
+@@ -2376,8 +2445,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -183,7 +187,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          b.setAttribute("transparent", "true");
        }
  
-@@ -2430,7 +2498,7 @@
+@@ -2542,7 +2610,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -192,7 +196,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2489,8 +2557,8 @@
+@@ -2601,8 +2669,8 @@
        // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
@@ -203,7 +207,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2654,7 +2722,6 @@
+@@ -2779,7 +2847,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -211,7 +215,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -2734,6 +2801,8 @@
+@@ -2859,6 +2926,8 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -220,7 +224,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2744,6 +2813,12 @@
+@@ -2869,6 +2938,12 @@
          );
        }
  
@@ -233,7 +237,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2807,6 +2882,19 @@
+@@ -2932,6 +3007,19 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -253,7 +257,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -2815,6 +2903,7 @@
+@@ -2940,6 +3028,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -261,7 +265,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -2833,6 +2922,7 @@
+@@ -2958,6 +3047,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -269,7 +273,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          }));
  
          if (focusUrlBar) {
-@@ -2953,6 +3043,12 @@
+@@ -3078,6 +3168,12 @@
          }
        }
  
@@ -282,7 +286,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3041,10 +3137,10 @@
+@@ -3248,10 +3344,10 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -294,7 +298,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        }
  
        if (!color) {
-@@ -3065,9 +3161,14 @@
+@@ -3272,9 +3368,14 @@
          label,
          isAdoptingGroup
        );
@@ -311,7 +315,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        );
        group.addTabs(tabs);
  
-@@ -3188,7 +3289,7 @@
+@@ -3395,7 +3496,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -320,7 +324,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        );
      }
  
-@@ -3390,6 +3491,7 @@
+@@ -3597,6 +3698,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -328,7 +332,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3459,6 +3561,7 @@
+@@ -3666,6 +3768,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -336,7 +340,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          });
        }
  
-@@ -3646,7 +3749,7 @@
+@@ -3853,7 +3956,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -345,7 +349,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -3683,8 +3786,10 @@
+@@ -3890,8 +3993,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -357,7 +361,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
            if (select) {
              tabToSelect = tab;
            }
-@@ -3696,7 +3801,8 @@
+@@ -3903,7 +4008,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -367,7 +371,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3710,7 +3816,10 @@
+@@ -3917,7 +4023,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -379,7 +383,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -3755,9 +3864,23 @@
+@@ -3962,9 +4071,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -403,7 +407,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -3948,11 +4071,14 @@
+@@ -4155,11 +4278,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -419,7 +423,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3964,7 +4090,7 @@
+@@ -4171,7 +4297,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -428,7 +432,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
              tabGroup = previousTab.group;
            }
            if (
-@@ -3975,7 +4101,7 @@
+@@ -4182,7 +4308,7 @@
            ) {
              elementIndex = Infinity;
            } else if (previousTab.visible) {
@@ -437,7 +441,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4003,14 +4129,14 @@
+@@ -4210,14 +4336,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -456,7 +460,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4021,7 +4147,7 @@
+@@ -4228,7 +4354,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -465,7 +469,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
            // Place at the front of, or between tabs in, the same tab group
            this.tabContainer.insertBefore(tab, itemAfter);
-@@ -4057,6 +4183,7 @@
+@@ -4264,6 +4390,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -473,7 +477,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
  
        TabBarVisibility.update();
      }
-@@ -4346,6 +4473,9 @@
+@@ -4553,6 +4680,9 @@
          return;
        }
  
@@ -483,7 +487,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
      }
  
-@@ -4607,6 +4737,7 @@
+@@ -4814,6 +4944,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -491,7 +495,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4696,6 +4827,7 @@
+@@ -4903,6 +5034,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -499,7 +503,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        } catch (e) {
          console.error(e);
        }
-@@ -4734,6 +4866,12 @@
+@@ -4941,6 +5073,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -512,7 +516,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4748,6 +4886,9 @@
+@@ -4955,6 +5093,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -522,7 +526,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4796,7 +4937,13 @@
+@@ -5003,7 +5144,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -537,7 +541,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          return;
        }
  
-@@ -4930,7 +5077,7 @@
+@@ -5137,7 +5284,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -546,7 +550,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4954,6 +5101,7 @@
+@@ -5161,6 +5308,7 @@
  
          newTab = true;
        }
@@ -554,7 +558,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4994,13 +5142,7 @@
+@@ -5201,13 +5349,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -569,7 +573,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        } else {
          TabBarVisibility.update();
        }
-@@ -5133,6 +5275,7 @@
+@@ -5340,6 +5482,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -577,7 +581,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5345,6 +5488,7 @@
+@@ -5552,6 +5695,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -585,7 +589,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5357,13 +5501,13 @@
+@@ -5564,13 +5708,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -601,7 +605,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5379,7 +5523,7 @@
+@@ -5586,7 +5730,7 @@
        }
  
        if (tab) {
@@ -610,7 +614,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5400,7 +5544,7 @@
+@@ -5607,7 +5751,7 @@
          });
        }
  
@@ -619,7 +623,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
      }
  
      _blurTab(aTab) {
-@@ -5802,10 +5946,10 @@
+@@ -6013,10 +6157,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -632,7 +636,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5864,6 +6008,7 @@
+@@ -6075,6 +6219,7 @@
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
      replaceTabWithWindow(aTab, aOptions) {
@@ -640,7 +644,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -5997,7 +6142,7 @@
+@@ -6208,7 +6353,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -649,7 +653,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
      }
  
      /**
-@@ -6073,8 +6218,8 @@
+@@ -6284,8 +6429,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -660,7 +664,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6100,10 +6245,16 @@
+@@ -6311,10 +6456,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -679,7 +683,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6161,23 +6312,28 @@
+@@ -6372,23 +6523,28 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -714,7 +718,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        } else if (!element.pinned && targetElement && targetElement.pinned) {
          // If the caller asks to move an unpinned element next to a pinned
          // tab, move the unpinned element to be the first unpinned element
-@@ -6190,14 +6346,34 @@
+@@ -6401,14 +6557,34 @@
          //    move the tab group right before the first unpinned tab.
          // 4. Moving a tab group and the first unpinned tab is grouped:
          //    move the tab group right before the first unpinned tab's tab group.
@@ -750,7 +754,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6206,7 +6382,7 @@
+@@ -6417,7 +6593,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -759,7 +763,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6252,10 +6428,10 @@
+@@ -6489,10 +6665,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -772,7 +776,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6285,6 +6461,7 @@
+@@ -6522,6 +6698,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -780,7 +784,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6311,7 +6488,7 @@
+@@ -6548,7 +6725,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -789,7 +793,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6348,6 +6525,10 @@
+@@ -6585,6 +6762,10 @@
  
        moveActionCallback();
  
@@ -800,7 +804,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7249,7 +7430,7 @@
+@@ -7486,7 +7667,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -809,7 +813,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7264,7 +7445,6 @@
+@@ -7501,7 +7682,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -817,7 +821,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
            });
            break;
          case "TabGroupCreateByUser":
-@@ -8199,6 +8379,7 @@
+@@ -8442,6 +8622,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -825,7 +829,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9200,7 +9381,7 @@ var TabContextMenu = {
+@@ -9443,7 +9624,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -834,7 +838,7 @@ index 3204f253c23551650991d3385dd256d55892a012..7c30015ac4591fdb97426521ae87b80e
      // Build Ask Chat items
      TabContextMenu.GenAI.buildTabMenu(
        document.getElementById("context_askChat"),
-@@ -9520,6 +9701,7 @@ var TabContextMenu = {
+@@ -9763,6 +9944,7 @@ var TabContextMenu = {
          )
        );
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabgroup-js.patch b/src/browser/components/tabbrowser/content/tabgroup-js.patch
index 34d48759b..2c3e80263 100644
--- a/src/browser/components/tabbrowser/content/tabgroup-js.patch
+++ b/src/browser/components/tabbrowser/content/tabgroup-js.patch
@@ -1,24 +1,23 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e8532174e2a7cf 100644
+index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b424098ba3e7b 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
-@@ -13,10 +13,12 @@
- 
+@@ -14,11 +14,11 @@
    class MozTabbrowserTabGroup extends MozXULElement {
      static markup = `
--      <vbox class="tab-group-label-container" pack="center">
-+      <hbox class="tab-group-label-container" pack="center">
-         <label class="tab-group-label" role="button"/>
--      </vbox>
+       <vbox class="tab-group-label-container" pack="center">
+-        <vbox class="tab-group-label-hover-highlight" pack="center">
+           <label class="tab-group-label" role="button" />
+-        </vbox>
+       </vbox>
 -      <html:slot/>
-+      </hbox>
 +      <html:div class="tab-group-container">
 +        <html:div class="zen-tab-group-start"/>
 +      </html:div>
        <vbox class="tab-group-overflow-count-container" pack="center">
          <label class="tab-group-overflow-count" role="button" />
        </vbox>
-@@ -57,20 +59,36 @@
+@@ -69,20 +69,36 @@
      }
  
      connectedCallback() {
@@ -59,10 +58,10 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
  
        this._initialized = true;
        this.saveOnWindowClose = true;
-@@ -99,11 +117,14 @@
+@@ -114,11 +130,14 @@
  
-       this.#labelElement.addEventListener("mouseover", this);
-       this.#labelElement.addEventListener("mouseout", this);
+       this.#labelContainerElement.addEventListener("mouseover", this);
+       this.#labelContainerElement.addEventListener("mouseout", this);
 -      this.#labelElement.addEventListener("contextmenu", e => {
 -        e.preventDefault();
 -        gBrowser.tabGroupMenu.openEditModal(this);
@@ -79,7 +78,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
  
        this.#updateLabelAriaAttributes();
        this.#updateCollapsedAriaAttributes();
-@@ -129,6 +150,8 @@
+@@ -144,6 +163,8 @@
        // mounts after getting created by `Tabbrowser.adoptTabGroup`.
        this.#wasCreatedByAdoption = false;
      }
@@ -88,7 +87,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
  
      resetDefaultGroupName = () => {
        this.#defaultGroupName = "";
-@@ -213,7 +236,10 @@
+@@ -228,7 +249,10 @@
            }
          });
        }
@@ -100,7 +99,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
      }
  
      get color() {
-@@ -307,6 +333,9 @@
+@@ -322,6 +346,9 @@
      }
  
      set collapsed(val) {
@@ -110,7 +109,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
        if (!!val == this.collapsed) {
          return;
        }
-@@ -364,7 +393,6 @@
+@@ -399,7 +426,6 @@
            tabGroupName,
          })
          .then(result => {
@@ -118,7 +117,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
          });
      }
  
-@@ -383,7 +411,57 @@
+@@ -418,7 +444,57 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
@@ -177,7 +176,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
      }
  
      /**
-@@ -442,7 +520,6 @@
+@@ -498,7 +574,6 @@
      addTabs(tabs, metricsContext) {
        for (let tab of tabs) {
          if (tab.pinned) {
@@ -185,7 +184,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
          }
          let tabToMove =
            this.ownerGlobal === tab.ownerGlobal
-@@ -505,7 +582,7 @@
+@@ -561,7 +636,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -194,7 +193,7 @@ index c0cb11590d6dfbcf6fa49ef5e10c6d3877191d1f..cd98bd2401e4618b003c184108e85321
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -570,5 +647,6 @@
+@@ -630,5 +705,6 @@
      }
    }
  
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 2fa8caa1f..8318bbc10 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221fb51207c6 100644
+index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b19b606e9 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -44,6 +44,9 @@
@@ -12,7 +12,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
      if (isTab(element)) {
        return element;
      }
-@@ -411,7 +414,7 @@
+@@ -423,7 +426,7 @@
        // and we're not hitting the scroll buttons.
        if (
          event.button != 0 ||
@@ -21,7 +21,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;
-@@ -492,7 +495,6 @@
+@@ -504,7 +507,6 @@
              });
            }
          } else if (isTabGroupLabel(event.target)) {
@@ -29,7 +29,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          } else if (
            event.originalTarget.closest("scrollbox") &&
            !Services.prefs.getBoolPref(
-@@ -528,6 +530,9 @@
+@@ -540,6 +542,9 @@
      }
  
      on_keydown(event) {
@@ -39,7 +39,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        let { altKey, shiftKey } = event;
        let [accel, nonAccel] =
          AppConstants.platform == "macosx"
-@@ -765,7 +770,7 @@
+@@ -777,7 +782,7 @@
        if (this.#isContainerVerticalPinnedGrid(tab)) {
          // In expanded vertical mode, the max number of pinned tabs per row is dynamic
          // Set this before adjusting dragged tab's position
@@ -48,7 +48,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          let tabsPerRow = 0;
          let position = RTL_UI
            ? window.windowUtils.getBoundsWithoutFlushing(
-@@ -930,7 +935,7 @@
+@@ -942,7 +947,7 @@
        let dropEffect = this.getDropEffectForTabDrag(event);
        let isMovingInTabStrip = !fromTabList && dropEffect == "move";
        let collapseTabGroupDuringDrag =
@@ -57,7 +57,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
  
        tab._dragData = {
          offsetX: this.verticalMode
-@@ -940,7 +945,7 @@
+@@ -952,7 +957,7 @@
            ? event.screenY - window.screenY - tabOffset
            : event.screenY - window.screenY,
          scrollPos:
@@ -66,7 +66,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
              ? this.pinnedTabsContainer.scrollPosition
              : this.arrowScrollbox.scrollPosition,
          screenX: event.screenX,
-@@ -969,6 +974,7 @@
+@@ -981,6 +986,7 @@
  
            if (collapseTabGroupDuringDrag) {
              tab.group.collapsed = true;
@@ -74,7 +74,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            }
          }
        }
-@@ -1015,6 +1021,10 @@
+@@ -1027,6 +1033,10 @@
        }
  
        let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -85,7 +85,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        if (
          (dropEffect == "move" || dropEffect == "copy") &&
          document == draggedTab.ownerDocument &&
-@@ -1196,6 +1206,18 @@
+@@ -1208,6 +1218,18 @@
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
@@ -104,7 +104,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        if (draggedTab && dropEffect == "copy") {
          let duplicatedDraggedTab;
          let duplicatedTabs = [];
-@@ -1220,8 +1242,9 @@
+@@ -1232,8 +1254,9 @@
          let translateOffsetY = oldTranslateY % tabHeight;
          let newTranslateX = oldTranslateX - translateOffsetX;
          let newTranslateY = oldTranslateY - translateOffsetY;
@@ -116,7 +116,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
  
          if (this.#isContainerVerticalPinnedGrid(draggedTab)) {
            // Update both translate axis for pinned vertical expanded tabs
-@@ -1237,8 +1260,8 @@
+@@ -1249,8 +1272,8 @@
            }
          } else {
            let tabs = this.ariaFocusableItems.slice(
@@ -127,7 +127,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            );
            let size = this.verticalMode ? "height" : "width";
            let screenAxis = this.verticalMode ? "screenY" : "screenX";
-@@ -1287,11 +1310,13 @@
+@@ -1299,11 +1322,13 @@
            this.dragToPinPromoCard,
          ];
          let shouldPin =
@@ -141,7 +141,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            isTab(draggedTab) &&
            draggedTab.pinned &&
            this.arrowScrollbox.contains(event.target);
-@@ -1309,6 +1334,7 @@
+@@ -1321,6 +1346,7 @@
              (oldTranslateY && oldTranslateY != newTranslateY);
          } else if (this.verticalMode) {
            shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
@@ -149,7 +149,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          } else {
            shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
          }
-@@ -1503,6 +1529,7 @@
+@@ -1515,6 +1541,7 @@
  
            let nextItem = this.ariaFocusableItems[newIndex];
            let tabGroup = isTab(nextItem) && nextItem.group;
@@ -157,7 +157,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            gBrowser.loadTabs(urls, {
              inBackground,
              replace,
-@@ -1541,6 +1568,17 @@
+@@ -1553,6 +1580,17 @@
        }
        this.#resetTabsAfterDrop(draggedTab.ownerDocument);
  
@@ -175,7 +175,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
-@@ -1707,7 +1745,6 @@
+@@ -1719,7 +1757,6 @@
  
        this.toggleAttribute("overflow", true);
        this._updateCloseButtons();
@@ -183,7 +183,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
  
        document
          .getElementById("tab-preview-panel")
-@@ -1765,7 +1802,7 @@
+@@ -1777,7 +1814,7 @@
      }
  
      get newTabButton() {
@@ -192,7 +192,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
      }
  
      get verticalMode() {
-@@ -1781,6 +1818,7 @@
+@@ -1793,6 +1830,7 @@
      }
  
      get overflowing() {
@@ -200,28 +200,25 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        return this.hasAttribute("overflow");
      }
  
-@@ -1789,31 +1827,51 @@
-       if (this.#allTabs) {
-         return this.#allTabs;
+@@ -1806,29 +1844,54 @@
+       if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
+         pinnedChildren.pop();
        }
--      // Remove temporary periphery element added at drag start.
--      let pinnedChildren = Array.from(this.pinnedTabsContainer.children);
--      if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
--        pinnedChildren.pop();
--      }
 -      let unpinnedChildren = Array.from(this.arrowScrollbox.children);
--      // remove arrowScrollbox periphery element.
--      unpinnedChildren.pop();
--
-+      let children = gZenWorkspaces.tabboxChildren;
-+      children.pop(); 
-       // explode tab groups
++      let unpinnedChildren = gZenWorkspaces.tabboxChildren;
+       // remove arrowScrollbox periphery element.
+       unpinnedChildren.pop();
+ 
+       // explode tab groups and split view wrappers
        // Iterate backwards over the array to preserve indices while we modify
        // things in place
 -      for (let i = unpinnedChildren.length - 1; i >= 0; i--) {
--        if (unpinnedChildren[i].tagName == "tab-group") {
+-        if (
+-          unpinnedChildren[i].tagName == "tab-group" ||
+-          unpinnedChildren[i].tagName == "tab-split-view-wrapper"
+-        ) {
 -          unpinnedChildren.splice(i, 1, ...unpinnedChildren[i].tabs);
-+      const pinnedTabs = [...gZenWorkspaces.getCurrentEssentialsContainer().children, ...this.pinnedTabsContainer.children];
++      const pinnedTabs = [...gZenWorkspaces.getCurrentEssentialsContainer().children, ...pinnedChildren];
 +      const expandTabs = (tabs) => {
 +        for (let i = tabs.length - 1; i >= 0; i--) {
 +          const tab = tabs[i];
@@ -231,15 +228,13 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
 +            // add the tabs in the group to the list
 +            tabs.splice(i, 0, ...tab.tabs);
 +          }
-         }
-       }
--
--      this.#allTabs = [...pinnedChildren, ...unpinnedChildren];
++        }
++      };
 +      expandTabs(pinnedTabs);
-+      expandTabs(children);
++      expandTabs(unpinnedChildren);
 +      const allTabs = [
 +        ...pinnedTabs,
-+        ...children,
++        ...unpinnedChildren,
 +      ];
 +      const lastPinnedTabIdx = pinnedTabs.length - 1;
 +      let i = 0;
@@ -254,21 +249,23 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
 +          // remove the separator from the list
 +          allTabs.splice(i, 1);
 +          i--;
-+        }
+         }
 +        i++;
-+      }
+       }
+-
+-      this.#allTabs = [...pinnedChildren, ...unpinnedChildren];
 +      this.#allTabs = allTabs;
        return this.#allTabs;
      }
  
      get allGroups() {
--      let children = Array.from(this.arrowScrollbox.children);
+       let children = Array.from(this.arrowScrollbox.children);
 -      return children.filter(node => node.tagName == "tab-group");
 +      return gZenWorkspaces.allTabGroups;
      }
  
      /**
-@@ -1880,29 +1938,23 @@
+@@ -1895,29 +1958,23 @@
  
        let elementIndex = 0;
  
@@ -307,7 +304,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          }
        }
  
-@@ -1914,6 +1966,7 @@
+@@ -1929,6 +1986,7 @@
      _invalidateCachedTabs() {
        this.#allTabs = null;
        this._invalidateCachedVisibleTabs();
@@ -315,7 +312,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
      }
  
      _invalidateCachedVisibleTabs() {
-@@ -1929,8 +1982,8 @@
+@@ -1944,8 +2002,8 @@
      #isContainerVerticalPinnedGrid(tab) {
        return (
          this.verticalMode &&
@@ -326,7 +323,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          !this.expandOnHover
        );
      }
-@@ -1946,7 +1999,7 @@
+@@ -1961,7 +2019,7 @@
  
        if (node == null) {
          // We have a container for non-tab elements at the end of the scrollbox.
@@ -335,7 +332,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        }
  
        node.before(tab);
-@@ -2041,7 +2094,7 @@
+@@ -2056,7 +2114,7 @@
            // There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
            // for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
            // Attach the long click popup to all of them.
@@ -344,7 +341,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            const newTab2 = this.newTabButton;
            const newTabVertical = document.getElementById(
              "vertical-tabs-newtab-button"
-@@ -2139,8 +2192,10 @@
+@@ -2156,8 +2214,10 @@
       */
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
@@ -355,7 +352,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -2149,7 +2204,7 @@
+@@ -2166,7 +2226,7 @@
       * @param {boolean} [shouldScrollInstantly=false]
       */
      #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
@@ -364,7 +361,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        if (arrowScrollbox?.overflowing) {
          arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
        }
-@@ -2288,6 +2343,16 @@
+@@ -2305,6 +2365,16 @@
        when the tab is first selected to be dragged.
      */
      #updateTabStylesOnDrag(tab) {
@@ -381,7 +378,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        let isPinned = tab.pinned;
        let numPinned = gBrowser.pinnedTabCount;
        let allTabs = this.ariaFocusableItems;
-@@ -2540,7 +2605,7 @@
+@@ -2578,7 +2648,7 @@
          return;
        }
  
@@ -390,7 +387,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2549,6 +2614,8 @@
+@@ -2587,6 +2657,8 @@
  
        let { width: tabWidth, height: tabHeight } =
          draggedTab.getBoundingClientRect();
@@ -399,7 +396,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        let shiftSizeX = tabWidth * movingTabs.length;
        let shiftSizeY = tabHeight;
        dragData.tabWidth = tabWidth;
-@@ -2585,8 +2652,8 @@
+@@ -2623,8 +2695,8 @@
        let lastBoundX =
          lastTabInRow.screenX +
          lastTabInRow.getBoundingClientRect().width -
@@ -410,7 +407,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX);
        translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
  
-@@ -2744,13 +2811,18 @@
+@@ -2782,13 +2854,18 @@
        this.#clearDragOverGroupingTimer();
        this.#clearPinnedDropIndicatorTimer();
  
@@ -433,7 +430,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
  
        if (this.#rtlMode) {
          tabs.reverse();
-@@ -2761,7 +2833,7 @@
+@@ -2799,7 +2876,7 @@
        let screenAxis = this.verticalMode ? "screenY" : "screenX";
        let size = this.verticalMode ? "height" : "width";
        let translateAxis = this.verticalMode ? "translateY" : "translateX";
@@ -442,7 +439,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        let tabSize = this.verticalMode ? tabHeight : tabWidth;
        let translateX = event.screenX - dragData.screenX;
        let translateY = event.screenY - dragData.screenY;
-@@ -2777,6 +2849,12 @@
+@@ -2815,6 +2892,12 @@
        );
        let lastMovingTab = movingTabs.at(-1);
        let firstMovingTab = movingTabs[0];
@@ -455,7 +452,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
        let lastMovingTabScreen = endEdge(lastMovingTab);
        let firstMovingTabScreen = firstMovingTab[screenAxis];
-@@ -2791,6 +2869,11 @@
+@@ -2829,6 +2912,11 @@
        let endBound = this.#rtlMode
          ? endEdge(this) - lastMovingTabScreen
          : periphery[screenAxis] - 1 - lastMovingTabScreen;
@@ -467,7 +464,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        translate = Math.min(Math.max(translate, startBound), endBound);
  
        // Center the tab under the cursor if the tab is not under the cursor while dragging
-@@ -2980,6 +3063,8 @@
+@@ -3018,6 +3106,8 @@
        };
  
        let dropElement = getOverlappedElement();
@@ -476,7 +473,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
  
        let newDropElementIndex;
        if (dropElement) {
-@@ -3061,7 +3146,7 @@
+@@ -3099,7 +3189,7 @@
            ? Services.prefs.getIntPref(
                "browser.tabs.dragDrop.moveOverThresholdPercent"
              ) / 100
@@ -485,7 +482,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
          let shouldMoveOver = overlapPercent > moveOverThreshold;
          if (logicalForward && shouldMoveOver) {
-@@ -3094,6 +3179,7 @@
+@@ -3132,6 +3222,7 @@
          // If dragging a group over another group, don't make it look like it is
          // possible to drop the dragged group inside the other group.
          if (
@@ -493,7 +490,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            isTabGroupLabel(draggedTab) &&
            dropElement?.group &&
            (!dropElement.group.collapsed ||
-@@ -3120,20 +3206,13 @@
+@@ -3158,20 +3249,13 @@
          let isOutOfBounds = isPinned
            ? dropElement.elementIndex >= numPinned
            : dropElement.elementIndex < numPinned;
@@ -518,7 +515,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          let groupingDelay = Services.prefs.getIntPref(
            "browser.tabs.dragDrop.createGroup.delayMS"
          );
-@@ -3141,6 +3220,7 @@
+@@ -3179,6 +3263,7 @@
          // When dragging tab(s) over an ungrouped tab, signal to the user
          // that dropping the tab(s) will create a new tab group.
          let shouldCreateGroupOnDrop =
@@ -526,7 +523,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            !movingTabsSet.has(dropElement) &&
            isTab(dropElement) &&
            !dropElement?.group &&
-@@ -3149,6 +3229,7 @@
+@@ -3187,6 +3272,7 @@
          // When dragging tab(s) over a collapsed tab group label, signal to the
          // user that dropping the tab(s) will add them to the group.
          let shouldDropIntoCollapsedTabGroup =
@@ -534,7 +531,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            isTabGroupLabel(dropElement) &&
            dropElement.group.collapsed &&
            overlapPercent > dragOverGroupingThreshold;
-@@ -3193,19 +3274,14 @@
+@@ -3231,19 +3317,14 @@
              dropElement = dropElementGroup;
              colorCode = undefined;
            } else if (isTabGroupLabel(dropElement)) {
@@ -562,7 +559,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            }
            this.#setDragOverGroupColor(colorCode);
            this.toggleAttribute("movingtab-addToGroup", colorCode);
-@@ -3224,11 +3300,11 @@
+@@ -3262,11 +3343,11 @@
        dragData.dropElement = dropElement;
        dragData.dropBefore = dropBefore;
        dragData.animDropElementIndex = newDropElementIndex;
@@ -576,7 +573,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            continue;
          }
  
-@@ -3350,12 +3426,14 @@
+@@ -3388,12 +3469,14 @@
        element?.removeAttribute("dragover-groupTarget");
      }
  
@@ -593,7 +590,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
  
        for (let item of this.ariaFocusableItems) {
          this.#resetGroupTarget(item);
-@@ -3402,16 +3480,15 @@
+@@ -3440,7 +3523,7 @@
          tab.style.left = "";
          tab.style.top = "";
          tab.style.maxWidth = "";
@@ -602,17 +599,16 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
        }
        for (let label of draggedTabDocument.getElementsByClassName(
          "tab-group-label-container"
-       )) {
-         label.style.width = "";
--        label.style.height = "";
+@@ -3450,7 +3533,7 @@
          label.style.left = "";
          label.style.top = "";
+         label.style.maxWidth = "";
 -        label.removeAttribute("dragtarget");
 +        label.removeAttribute("zen-dragtarget");
        }
        let periphery = draggedTabDocument.getElementById(
          "tabbrowser-arrowscrollbox-periphery"
-@@ -3483,7 +3560,7 @@
+@@ -3522,7 +3605,7 @@
          let postTransitionCleanup = () => {
            movingTab._moveTogetherSelectedTabsData.animate = false;
          };
@@ -621,7 +617,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            postTransitionCleanup();
          } else {
            let onTransitionEnd = transitionendEvent => {
-@@ -3647,7 +3724,7 @@
+@@ -3686,7 +3769,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -630,7 +626,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
          return;
        }
  
-@@ -3756,7 +3833,10 @@
+@@ -3795,7 +3878,10 @@
      #getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
@@ -642,7 +638,7 @@ index b2d54218ca51f86d4591730054d0e7e1138adb94..d2c1f7f5b68ecc531c4e9e597457221f
            break;
          }
          target = target.parentNode;
-@@ -3773,6 +3853,9 @@
+@@ -3812,6 +3898,9 @@
            return null;
          }
        }
diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
index 3ebb104ae..c12b327db 100644
--- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
-index 36e3ab4a5a153230bb488b66dda7e3e7c763ca23..cc4ea61914a316451fa54b01a5c8c6a305e4038a 100644
+index a1faf7e4278c66865f267283515f22052769928d..d76d19da5a3d4b9739faf3a673bb3ad693765ada 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -434,6 +434,8 @@ export class UrlbarController {
+@@ -441,6 +441,8 @@ export class UrlbarController {
              });
            }
            event.preventDefault();
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 59089ed3a..8793bce8c 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e235161f625 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0ce222c46 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
-@@ -74,6 +74,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
+@@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
    lazy.UrlbarUtils.getLogger({ prefix: "Input" })
  );
  
@@ -16,7 +16,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  
  const UNLIMITED_MAX_RESULTS = 99;
-@@ -355,7 +362,16 @@ export class UrlbarInput {
+@@ -437,7 +444,16 @@ export class UrlbarInput {
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
@@ -33,7 +33,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -431,6 +447,10 @@ export class UrlbarInput {
+@@ -513,6 +529,10 @@ export class UrlbarInput {
      hideSearchTerms = false,
      isSameDocument = false
    ) {
@@ -41,10 +41,10 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
 +      return;
 +    }
 +
-     // We only need to update the searchModeUI on tab switch conditionally
-     // as we only persist searchMode with ScotchBonnet enabled.
-     if (
-@@ -703,8 +723,16 @@ export class UrlbarInput {
+     if (!this.isAddressbar) {
+       throw new Error(
+         "Cannot set URI for UrlbarInput that is not an address bar"
+@@ -790,8 +810,16 @@ export class UrlbarInput {
          return;
        }
      }
@@ -62,7 +62,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
    }
  
    /**
-@@ -1116,7 +1144,11 @@ export class UrlbarInput {
+@@ -1207,7 +1235,11 @@ export class UrlbarInput {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      }
  
      if (isCanonized) {
-@@ -2191,6 +2223,13 @@ export class UrlbarInput {
+@@ -2298,6 +2330,13 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -89,7 +89,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2205,6 +2244,12 @@ export class UrlbarInput {
+@@ -2312,6 +2351,12 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -102,7 +102,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2224,6 +2269,24 @@ export class UrlbarInput {
+@@ -2331,6 +2376,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -127,7 +127,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2553,7 +2616,7 @@ export class UrlbarInput {
+@@ -2660,7 +2723,7 @@ export class UrlbarInput {
  
          this.textbox.parentNode.style.setProperty(
            "--urlbar-container-height",
@@ -136,7 +136,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -2986,6 +3049,7 @@ export class UrlbarInput {
+@@ -3093,6 +3156,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -144,24 +144,24 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3087,7 +3151,7 @@ export class UrlbarInput {
-    */
-   _trimValue(val) {
+@@ -3197,7 +3261,7 @@ export class UrlbarInput {
+       return val;
+     }
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
 -      ? lazy.BrowserUIUtils.trimURL(val)
 +      ? this._zenTrimURL(val)
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3303,6 +3367,7 @@ export class UrlbarInput {
-     resultDetails = null,
-     browser = this.window.gBrowser.selectedBrowser
-   ) {
+@@ -3407,6 +3471,7 @@ export class UrlbarInput {
+       );
+     }
+ 
 +    openUILinkWhere = this.window.gZenUIManager.getOpenUILinkWhere(url, browser, openUILinkWhere);
      // No point in setting these because we'll handleRevert() a few rows below.
      if (openUILinkWhere == "current") {
        // Make sure URL is formatted properly (don't show punycode).
-@@ -3455,6 +3520,10 @@ export class UrlbarInput {
+@@ -3608,6 +3673,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -172,7 +172,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3462,6 +3531,9 @@ export class UrlbarInput {
+@@ -3615,6 +3684,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -182,7 +182,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      return where;
    }
  
-@@ -3719,6 +3791,7 @@ export class UrlbarInput {
+@@ -3872,6 +3944,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -190,7 +190,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
  
        this._suppressStartQuery = false;
      });
-@@ -3726,7 +3799,6 @@ export class UrlbarInput {
+@@ -3879,7 +3952,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -198,7 +198,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3836,7 +3908,11 @@ export class UrlbarInput {
+@@ -3991,7 +4063,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -208,10 +208,10 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
 +        detail: { searchMode },
 +      })
 +    );
-     this._searchModeIndicatorTitle.textContent = "";
-     this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
- 
-@@ -4130,6 +4206,7 @@ export class UrlbarInput {
+     if (this._searchModeIndicatorTitle) {
+       this._searchModeIndicatorTitle.textContent = "";
+       this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
+@@ -4302,6 +4378,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -219,7 +219,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4241,6 +4318,11 @@ export class UrlbarInput {
+@@ -4413,6 +4490,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -231,7 +231,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4311,7 +4393,7 @@ export class UrlbarInput {
+@@ -4485,7 +4567,7 @@ export class UrlbarInput {
        }
      }
  
@@ -240,7 +240,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4351,9 +4433,16 @@ export class UrlbarInput {
+@@ -4525,9 +4607,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -258,7 +258,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
  
          if (
            event.target != this.inputField &&
-@@ -4364,6 +4453,10 @@ export class UrlbarInput {
+@@ -4538,6 +4627,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -269,7 +269,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4399,7 +4492,7 @@ export class UrlbarInput {
+@@ -4573,7 +4666,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
@@ -278,7 +278,7 @@ index 1c447bd31de854d1522dbcfb5d7ad557c84f1388..b63bf54956a42c63d5cadc9360545e23
            break;
          }
  
-@@ -4716,7 +4809,7 @@ export class UrlbarInput {
+@@ -4890,7 +4983,7 @@ export class UrlbarInput {
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =
diff --git a/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch b/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
index f1c290366..c737569ca 100644
--- a/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
@@ -1,16 +1,16 @@
 diff --git a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-index cdc476a3eb2ee2cb6193d215513b65ed375f6153..bc66d9651e521bda75a3bb9e7f1e4b3bb325be90 100644
+index 20be2dbbb8471aeb43a9bf77888c9858a0b61186..a9f974a78c5676d1340a3543852e4126c1d32b04 100644
 --- a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
 +++ b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-@@ -855,6 +855,7 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
+@@ -852,6 +852,7 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
      }
  
-     if (result.providerName == lazy.UrlbarProviderTabToSearch.name) {
+     if (result.providerName == "UrlbarProviderTabToSearch") {
 +      return false;
        // Discard the result if a tab-to-search result was added already.
        if (!state.canAddTabToSearch) {
          return false;
-@@ -1501,7 +1502,9 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
+@@ -1498,7 +1499,9 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
        usedLimits.maxResultCount++;
      }
  
diff --git a/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch b/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
index 2b93e360f..539445412 100644
--- a/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-index 3c179db3b310c43f8c6c06b1ecbcf5ed59feefe6..d9d2ce116ebcee8d403e165066c3a569bb952cd2 100644
+index 46ad55519aecd6c14034a9faa91c7ad8e5c1c422..e8d9c06499a2b273483edd21faf902c936462b59 100644
 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
 +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-@@ -719,6 +719,7 @@ function makeResultGroups({ showSearchSuggestionsFirst }) {
+@@ -731,6 +731,7 @@ function makeResultGroups({ showSearchSuggestionsFirst }) {
     */
    let rootGroup = {
      children: [
diff --git a/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch b/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
index df8854d91..7862a4a27 100644
--- a/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
-index ad971f090bdaba2865cf1fac2840b1f553d2630c..a9e676e43d35b617eebd5a67c8653397b7c0c6bf 100644
+index b2c3bfa6fbe83fceb019196c210baaa7b4881372..02f2c8be89f163e16c5fd29f9b7e145e16ea53ed 100644
 --- a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
-@@ -40,11 +40,13 @@ function defaultQuery(conditions = "") {
+@@ -44,11 +44,13 @@ function defaultQuery(conditions = "") {
    let query = `
       SELECT h.url, h.title, ${SQL_BOOKMARK_TAGS_FRAGMENT}, h.id, t.open_count,
              ${lazy.PAGES_FRECENCY_FIELD} AS frecency, t.userContextId,
--            h.last_visit_date, t.groupId
-+            h.last_visit_date, t.groupId, zp.url AS pinned_url, zp.title AS pinned_title
+-            h.last_visit_date, NULLIF(t.groupId, '') groupId
++            h.last_visit_date, NULLIF(t.groupId, '') groupId, zp.url AS pinned_url, zp.title AS pinned_title
       FROM moz_places h
       LEFT JOIN moz_openpages_temp t
              ON t.url = h.url
@@ -17,7 +17,7 @@ index ad971f090bdaba2865cf1fac2840b1f553d2630c..a9e676e43d35b617eebd5a67c8653397
       WHERE (
          (:switchTabsEnabled AND t.open_count > 0) OR
          ${lazy.PAGES_FRECENCY_FIELD} <> 0
-@@ -58,7 +60,7 @@ function defaultQuery(conditions = "") {
+@@ -62,7 +64,7 @@ function defaultQuery(conditions = "") {
                                :matchBehavior, :searchBehavior, NULL)
           ELSE
             AUTOCOMPLETE_MATCH(:searchString, h.url,
@@ -26,7 +26,7 @@ index ad971f090bdaba2865cf1fac2840b1f553d2630c..a9e676e43d35b617eebd5a67c8653397
                                h.visit_count, h.typed,
                                0, t.open_count,
                                :matchBehavior, :searchBehavior, NULL)
-@@ -1116,11 +1118,13 @@ Search.prototype = {
+@@ -1120,11 +1122,13 @@ Search.prototype = {
        ? lazy.PlacesUtils.toDate(lastVisitPRTime).getTime()
        : undefined;
      let tabGroup = row.getResultByName("groupId");
diff --git a/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
index 45f6b46e9..b06de00cf 100644
--- a/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-index 555273f6ea1efd77aa3062b9910bbfe28568775d..5c4a46c926913ab592f5e12908b8817410abe6b6 100644
+index ece407214669009e263b507b5236ab28da33efe9..8f22426295e2b001438918f44d2c22ed7a697c2f 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-@@ -716,6 +716,7 @@ export class Query {
+@@ -845,6 +845,7 @@ export class Query {
      if (
        result.heuristic &&
        this.context.searchMode &&
diff --git a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
index b477dc892..12bdd6dba 100644
--- a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs
-index 0bc15c02f56dd8f46a21fed02b4e21a741f27f41..40da868f68f21d8411107fb8a95e2d0b74337b51 100644
+index f38e860e46fa979b3e0c66ecd3eb88a64df60fc1..d130bbc7488ff3de926823974a1df13dc8e61fbc 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -75,6 +75,7 @@ export var UrlbarUtils = {
+@@ -74,6 +74,7 @@ export var UrlbarUtils = {
      RESTRICT_SEARCH_KEYWORD: "restrictSearchKeyword",
      SUGGESTED_INDEX: "suggestedIndex",
      TAIL_SUGGESTION: "tailSuggestion",
@@ -10,7 +10,7 @@ index 0bc15c02f56dd8f46a21fed02b4e21a741f27f41..40da868f68f21d8411107fb8a95e2d0b
    }),
  
    // Defines provider types.
-@@ -134,6 +135,7 @@ export var UrlbarUtils = {
+@@ -133,6 +134,7 @@ export var UrlbarUtils = {
      OTHER_NETWORK: 6,
      ADDON: 7,
      ACTIONS: 8,
@@ -18,12 +18,12 @@ index 0bc15c02f56dd8f46a21fed02b4e21a741f27f41..40da868f68f21d8411107fb8a95e2d0b
    }),
  
    // Per-result exposure telemetry.
-@@ -553,6 +555,8 @@ export var UrlbarUtils = {
-           return this.RESULT_GROUP.HEURISTIC_SEARCH_TIP;
-         case "HistoryUrlHeuristic":
+@@ -544,6 +546,8 @@ export var UrlbarUtils = {
+           return this.RESULT_GROUP.HEURISTIC_FALLBACK;
+         case "UrlbarProviderHistoryUrlHeuristic":
            return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;
 +        case "ZenUrlbarProviderGlobalActions":
 +          return this.RESULT_GROUP.ZEN_ACTION;
-         default:
-           if (result.providerName.startsWith("TestProvider")) {
-             return this.RESULT_GROUP.HEURISTIC_TEST;
+         case "UrlbarProviderOmnibox":
+           return this.RESULT_GROUP.HEURISTIC_OMNIBOX;
+         case "UrlbarProviderRestrictKeywordsAutofill":
diff --git a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
index fe22eed31..81ea5fc30 100644
--- a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
-index dfa91b76ad3890ceadb1b1b5d7a63b7074fbb776..6369fa1cdb242de32338bbce6debcdab2a04ca02 100644
+index 50961e4beb75012ef0ed6f261a95854712cc69d7..93bcfca9270ff34dbe6386789fdae6066457438d 100644
 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 @@ -585,6 +585,7 @@ export class UrlbarValueFormatter {
diff --git a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
index 0e0812bd7..26c99b0e8 100644
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index fdbab8806fd320f4aacec46a42c8ef953580d00c..031a615ad09274c578184b129434bbd93b49353d 100644
+index b3c7c8a995226e2cbe852d82515f9bc7077980e7..4c8611556f7f71e5f8860787ed1db9b50b9fa2e8 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -613,7 +613,7 @@ export class UrlbarView {
+@@ -620,7 +620,7 @@ export class UrlbarView {
        !this.input.value ||
        this.input.getAttribute("pageproxystate") == "valid"
      ) {
@@ -11,7 +11,7 @@ index fdbab8806fd320f4aacec46a42c8ef953580d00c..031a615ad09274c578184b129434bbd9
          // Try to reuse the cached top-sites context. If it's not cached, then
          // there will be a gap of time between when the input is focused and
          // when the view opens that can be perceived as flicker.
-@@ -2706,6 +2706,8 @@ export class UrlbarView {
+@@ -2734,6 +2734,8 @@ export class UrlbarView {
        if (row?.hasAttribute("row-selectable")) {
          row?.toggleAttribute("selected", true);
        }
@@ -20,12 +20,12 @@ index fdbab8806fd320f4aacec46a42c8ef953580d00c..031a615ad09274c578184b129434bbd9
        if (element != row) {
          row?.toggleAttribute("descendant-selected", true);
        }
-@@ -3189,7 +3191,7 @@ export class UrlbarView {
+@@ -3215,7 +3217,7 @@ export class UrlbarView {
    }
  
    #enableOrDisableRowWrap() {
 -    let wrap = getBoundsWithoutFlushing(this.input.textbox).width < 650;
 +    let wrap = false;
      this.#rows.toggleAttribute("wrap", wrap);
-     this.oneOffSearchButtons.container.toggleAttribute("wrap", wrap);
+     this.oneOffSearchButtons?.container.toggleAttribute("wrap", wrap);
    }
diff --git a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
index 608533a1e..fb2d74187 100644
--- a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
+++ b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-index 1a482b6de24468ccfec069586f374937d8ef68dd..8614beda3fdfc038092f31f11b2604d5cfb843a1 100644
+index 6207e6c8aa1e303ec151bc1e5c51c277ef776ee6..d3783a3c459c94880be1c95dc265a7d4887f67a1 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -248,7 +248,7 @@ export const PREFS_CONFIG = new Map([
+@@ -223,7 +223,7 @@ export const PREFS_CONFIG = new Map([
      "showSponsoredTopSites",
      {
        title: "Show sponsored top sites",
diff --git a/src/browser/installer/package-manifest-in.patch b/src/browser/installer/package-manifest-in.patch
index 7cc6a9526..2f18925ed 100644
--- a/src/browser/installer/package-manifest-in.patch
+++ b/src/browser/installer/package-manifest-in.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 70f268914f1078ef45e86d295f4bb2ce179a05e0..73d8ffc4457468e8a57ad2c29e4d49f45436bf00 100644
+index b884f0167e5de87a45cf523436ceaceb710d35ae..eedc80278a5c93f81ce90c0d6198924549c07fc3 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -361,17 +361,17 @@ bin/libfreebl_64int_3.so
+@@ -362,17 +362,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
diff --git a/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch
deleted file mode 100644
index ae66873e5..000000000
--- a/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs
-index 28b254d5757caf35c4ba755ef4cfed44bab5af00..660f517e0e3342970c6e30837fcf4d0adf360777 100644
---- a/browser/themes/BuiltInThemeConfig.sys.mjs
-+++ b/browser/themes/BuiltInThemeConfig.sys.mjs
-@@ -33,11 +33,4 @@ export const BuiltInThemeConfig = new Map([
-       path: "resource://builtin-themes/dark/",
-     },
-   ],
--  [
--    "firefox-alpenglow@mozilla.org",
--    {
--      version: "1.5",
--      path: "resource://builtin-themes/alpenglow/",
--    },
--  ],
- ]);
diff --git a/src/browser/themes/linux/browser-css.patch b/src/browser/themes/linux/browser-css.patch
index dfaee3e7d..81b190aaf 100644
--- a/src/browser/themes/linux/browser-css.patch
+++ b/src/browser/themes/linux/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index 9723a8199cc5b8d25bb92c46992792b8c94a3565..302f5b675abd1970e64f56a5a4592bb174f9a72a 100644
+index b0ec88f361399cea255ef8fb6c7f2b87779a8e04..c7ca01c2033f9a300caa1a1e3de9d5517d438796 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
 @@ -43,7 +43,8 @@
diff --git a/src/browser/themes/osx/browser-css.patch b/src/browser/themes/osx/browser-css.patch
index c48477643..cdaeb1877 100644
--- a/src/browser/themes/osx/browser-css.patch
+++ b/src/browser/themes/osx/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
-index c209151370225d8efade7c51aea30ce7365e5f4f..4dd5cf4a98ea010b2d347ac0ba7314ae81320e75 100644
+index b1062108c6f6174a680e9b235ee9cb2037f94924..31aac7bdee4ebb07e9de58e7c3e5e6833c94e968 100644
 --- a/browser/themes/osx/browser.css
 +++ b/browser/themes/osx/browser.css
 @@ -38,7 +38,7 @@
diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch
index b76cd554b..009a642c9 100644
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index c612e7d021122e3e4823994071cd613563d3e12e..682d7a47624460ce33e8fcb5ff9c995f3413bab2 100644
+index c77a0e6388c4061d9e6ee5f396a3e3af8867e4fe..d37e49538cd07716da5ebed823622fccde5dd69a 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -99,7 +99,7 @@ body {
+@@ -102,7 +102,7 @@ body {
    --toolbarbutton-border-radius: 4px;
    --identity-box-margin-inline: 4px;
    --urlbar-min-height: max(32px, 1.4em);
@@ -11,7 +11,7 @@ index c612e7d021122e3e4823994071cd613563d3e12e..682d7a47624460ce33e8fcb5ff9c995f
  
    /* This should be used for icons and chiclets inside the input field. It makes
       the gap around them more uniform when they are close to the field edges */
-@@ -167,8 +167,6 @@ body {
+@@ -170,8 +170,6 @@ body {
     */
    &.fullscreen-with-menubar {
      z-index: var(--browser-area-z-index-toolbox-while-animating);
diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch
index 09c2b92d2..003aa4104 100644
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,11 +1,11 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index bc47c162cd4792c7df17565014aac1c2258c6d40..21c0b7ddb04cbb828c758dad34885f91c1ddde6c 100644
+index 94036d036a64c8845c02d4ffbcf3f99b5d88576e..2ab3f060c9952f1b0c7bee3d5c3a1d7035e6736a 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
 @@ -316,3 +316,5 @@
-   skin/classic/browser/weather/night-mostly-cloudy-with-flurries.svg (../shared/weather/night-mostly-cloudy-with-flurries.svg)
  
    skin/classic/browser/illustrations/market-opt-in.svg         (../shared/illustrations/market-opt-in.svg)
+   skin/classic/browser/illustrations/yelpRealtime-opt-in.svg   (../shared/illustrations/yelpRealtime-opt-in.svg)
 +
 +#include zen-sources.inc.mn
 \ No newline at end of file
diff --git a/src/browser/themes/shared/tabbrowser/content-area-css.patch b/src/browser/themes/shared/tabbrowser/content-area-css.patch
index 9511724fd..dd1164699 100644
--- a/src/browser/themes/shared/tabbrowser/content-area-css.patch
+++ b/src/browser/themes/shared/tabbrowser/content-area-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index 44f6c942f2e4b08f784b2ff96f785e9beed01ecd..834e174186972c3297a552bbd579f0ea1261c19e 100644
+index e06addf1602dc26ff4e75a8db6251231690f3f80..86e2cd0194bb37fa140a2f93eccfdd61419a9aec 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
 @@ -276,7 +276,7 @@
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index e00e45fc2..1e127b19f 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f52d78a307 100644
+index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d85fc4c91a 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -21,7 +21,7 @@
@@ -102,7 +102,7 @@ index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f5
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1137,7 +1130,7 @@ tab-group {
+@@ -1226,7 +1219,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
@@ -111,7 +111,7 @@ index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f5
    &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -1567,7 +1560,7 @@ tab-group {
+@@ -1685,7 +1678,7 @@ tab-group {
    }
  }
  
@@ -120,7 +120,7 @@ index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f5
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -1578,7 +1571,7 @@ tab-group {
+@@ -1696,7 +1689,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -129,7 +129,7 @@ index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f5
    }
  
    &:hover {
-@@ -1602,7 +1595,7 @@ tab-group {
+@@ -1720,7 +1713,7 @@ tab-group {
   * flex container. #tabs-newtab-button is a child of the arrowscrollbox where
   * we don't want a gap (between tabs), so we have to add some margin.
   */
@@ -138,7 +138,7 @@ index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f5
    margin-block: var(--tab-block-margin);
  }
  
-@@ -1793,7 +1786,6 @@ tab-group {
+@@ -1913,7 +1906,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -146,7 +146,7 @@ index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f5
      }
  
      .tab-background {
-@@ -1833,8 +1825,8 @@ tab-group {
+@@ -1953,8 +1945,8 @@ tab-group {
        display: block;
        position: absolute;
        inset: auto;
@@ -157,7 +157,7 @@ index 07574cdd974f63b90355f069f0fbc3fa6cd61b50..c650da2adf0d1a53b05a09d1b43fa5f5
  
        &:-moz-window-inactive {
          background-image:
-@@ -1953,7 +1945,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2073,7 +2065,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  
diff --git a/src/browser/themes/shared/toolbarbuttons-css.patch b/src/browser/themes/shared/toolbarbuttons-css.patch
index 12714ef02..f4dd140a8 100644
--- a/src/browser/themes/shared/toolbarbuttons-css.patch
+++ b/src/browser/themes/shared/toolbarbuttons-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
-index e7b1c17391ffae02226015d0dd8bbe8eca29731f..938a8cb8c3d854a75fe300db2a7330d188c9ed6f 100644
+index e2b8a7cae70ed2bd3c80ee4214a09dbdb68a0d01..71320c7268d92aaa06bfa15c74bdbf02f1442745 100644
 --- a/browser/themes/shared/toolbarbuttons.css
 +++ b/browser/themes/shared/toolbarbuttons.css
-@@ -256,7 +256,7 @@ toolbar .toolbaritem-combined-buttons > separator {
+@@ -279,7 +279,7 @@ toolbar .toolbaritem-combined-buttons {
  #nav-bar-overflow-button {
    list-style-image: url("chrome://global/skin/icons/chevron.svg");
  
@@ -11,7 +11,7 @@ index e7b1c17391ffae02226015d0dd8bbe8eca29731f..938a8cb8c3d854a75fe300db2a7330d1
      display: none;
    }
  
-@@ -466,7 +466,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
+@@ -489,7 +489,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
       */
      align-items: stretch;
      > .toolbarbutton-icon {
diff --git a/src/browser/themes/shared/urlbar-searchbar-css.patch b/src/browser/themes/shared/urlbar-searchbar-css.patch
index f0608a0f6..2d75c52f7 100644
--- a/src/browser/themes/shared/urlbar-searchbar-css.patch
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index 11636a976736ba56dcc5a58081cee998bbdf58d4..0a6ca26f25511c799d8b40484b6bd1c81ceeb4e0 100644
+index 1744e627bbcfc69ccccb207ad1cbf0c262afb9be..50cc9da2076d946771fb5aca1402f1cbe6a531c8 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
 @@ -6,7 +6,7 @@
@@ -11,7 +11,7 @@ index 11636a976736ba56dcc5a58081cee998bbdf58d4..0a6ca26f25511c799d8b40484b6bd1c8
    --urlbar-margin-inline: 5px;
    --urlbar-padding-block: 4px;
  
-@@ -33,7 +33,7 @@
+@@ -48,7 +48,7 @@
  #urlbar[usertyping] > .urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
  .urlbar:is(:not([usertyping]), :not([focused])) > .urlbar-input-container > .urlbar-go-button,
  .urlbar-revert-button-container {
@@ -20,7 +20,7 @@ index 11636a976736ba56dcc5a58081cee998bbdf58d4..0a6ca26f25511c799d8b40484b6bd1c8
  }
  
  /* When rich suggestions are enabled the urlbar identity icon is given extra padding to
-@@ -307,10 +307,14 @@
+@@ -321,10 +321,14 @@
  
  .urlbar[breakout][breakout-extend] {
    height: auto;
diff --git a/src/browser/themes/shared/urlbarView-css.patch b/src/browser/themes/shared/urlbarView-css.patch
index bba5d89a9..9e692c3be 100644
--- a/src/browser/themes/shared/urlbarView-css.patch
+++ b/src/browser/themes/shared/urlbarView-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
-index 743b1bc81474378ac994ca9cfeb8f4cc6b434581..3486cebd74efa2df481d2a112e89b219bd6bb8a2 100644
+index ec849fc792572e75d12b9e7cd7e6b7f32c799fa9..17c7d442854b774817ef5b3b96e732c19bebef9d 100644
 --- a/browser/themes/shared/urlbarView.css
 +++ b/browser/themes/shared/urlbarView.css
 @@ -20,7 +20,7 @@
diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch
index 5b064a7bb..c8e03bdee 100644
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index 4485369284ee762bc8b35afb84fec0874a831fff..6a1ad15f657437aa4ef98fda63ae921a378f7310 100644
+index e1a79cd22180738d2ca16e9a6c5591499d337325..d36996359bfa4dd7d98c4f5aeb192c7b144339bb 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
 @@ -31,7 +31,6 @@
diff --git a/src/build/moz-build.patch b/src/build/moz-build.patch
index 596a09b20..7ccf4194c 100644
--- a/src/build/moz-build.patch
+++ b/src/build/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/build/moz.build b/build/moz.build
-index f7a912ec35dd089ea9a7e712765e954854f55cb3..a84534efbc7662f81573a4a80bc045e0a6d2ed3e 100644
+index 720fb1235f418fb063e88d8bbcd2eb444e84870b..ed831a4d35e006bc03aa514a6c00968a4dd19624 100644
 --- a/build/moz.build
 +++ b/build/moz.build
-@@ -89,7 +89,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+@@ -93,7 +93,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
          if CONFIG[var]:
              appini_defines[var] = True
  
diff --git a/src/devtools/server/actors/animation-type-longhand-js.patch b/src/devtools/server/actors/animation-type-longhand-js.patch
index d9872df5a..29e44807d 100644
--- a/src/devtools/server/actors/animation-type-longhand-js.patch
+++ b/src/devtools/server/actors/animation-type-longhand-js.patch
@@ -1,8 +1,8 @@
 diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
-index 17960549c60ebab9ac7c50a70cb69a6b1f8c37dd..9a9ec4539d39f20dccf449cbdcd066efee145b50 100644
+index ea27f1209ddb9b33ae044186c2b795685a0bde67..6d808a760885f0e26ff307a39d6977228359fe71 100644
 --- a/devtools/server/actors/animation-type-longhand.js
 +++ b/devtools/server/actors/animation-type-longhand.js
-@@ -343,6 +343,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
+@@ -344,6 +344,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
        "transform-origin",
        "translate",
        "-moz-window-transform",
diff --git a/src/devtools/startup/DevToolsStartup-sys-mjs.patch b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
index b9c5e983d..9f7ea1c66 100644
--- a/src/devtools/startup/DevToolsStartup-sys-mjs.patch
+++ b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs
-index 175edde2720f31c796e8ae8823e2aff17944f423..d9d4f7f5e53064b1ba07870dced2e1452fdde6b1 100644
+index 95de0614e392e00036500a5b3ef9976041f37ec6..2c842055ce1d7ffd94c8f21a82305a3a13d493e0 100644
 --- a/devtools/startup/DevToolsStartup.sys.mjs
 +++ b/devtools/startup/DevToolsStartup.sys.mjs
 @@ -816,6 +816,7 @@ DevToolsStartup.prototype = {
diff --git a/src/dom/base/Document-cpp.patch b/src/dom/base/Document-cpp.patch
index 022968aaa..37f0f667b 100644
--- a/src/dom/base/Document-cpp.patch
+++ b/src/dom/base/Document-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index 7d7a93e9e76b4957e3ac5860dfc730b7c4e6ad1d..c7c689b73c6599e9e736f73a67bb402d083964a0 100644
+index 0c2ef36f9765b6904659ac0ed4329468ca89225f..d06552e8d4ac102dd50a1afea10938ca32aeb788 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -467,6 +467,7 @@
+@@ -466,6 +466,7 @@
  #include "prtime.h"
  #include "prtypes.h"
  #include "xpcpublic.h"
@@ -10,7 +10,7 @@ index 7d7a93e9e76b4957e3ac5860dfc730b7c4e6ad1d..c7c689b73c6599e9e736f73a67bb402d
  
  // clang-format off
  #include "mozilla/Encoding.h"
-@@ -3345,6 +3346,10 @@ void Document::FillStyleSetUserAndUASheets() {
+@@ -3428,6 +3429,10 @@ void Document::FillStyleSetUserAndUASheets() {
    for (StyleSheet* sheet : *sheetService->UserStyleSheets()) {
      styleSet.AppendStyleSheet(*sheet);
    }
diff --git a/src/dom/base/use_counter_metrics-yaml.patch b/src/dom/base/use_counter_metrics-yaml.patch
index e8f250c47..eeac251f7 100644
--- a/src/dom/base/use_counter_metrics-yaml.patch
+++ b/src/dom/base/use_counter_metrics-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/base/use_counter_metrics.yaml b/dom/base/use_counter_metrics.yaml
-index adf8d1ed451a54426d92e65557801cffa2f64281..0bf810d3544e42689ad530468bfce5380a51e274 100644
+index 157d46c37d0a465f02f794eda4323f7e344c5e63..aec8b819dbcf853c2e6d5513000149449fae36fd 100644
 --- a/dom/base/use_counter_metrics.yaml
 +++ b/dom/base/use_counter_metrics.yaml
-@@ -21477,6 +21477,22 @@ use.counter.css.page:
+@@ -21154,6 +21154,22 @@ use.counter.css.page:
      send_in_pings:
        - use-counters
  
@@ -25,7 +25,7 @@ index adf8d1ed451a54426d92e65557801cffa2f64281..0bf810d3544e42689ad530468bfce538
    css_transform_origin:
      type: counter
      description: >
-@@ -33481,6 +33497,22 @@ use.counter.css.doc:
+@@ -33175,6 +33191,22 @@ use.counter.css.doc:
      send_in_pings:
        - use-counters
  
diff --git a/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
index 60236c198..da62b610d 100644
--- a/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
+++ b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
-index d46d5edc1d66c1eee8780abad444289fdc36a518..0e0d69819d9eee82add726792ec829c05551a076 100644
+index 741a8f1744f48e7db4dbda64c856efaf9f3564b0..f9a2c0878f8a923903ed8eb65cbd355d40b41715 100644
 --- a/dom/media/mediaelement/HTMLMediaElement.cpp
 +++ b/dom/media/mediaelement/HTMLMediaElement.cpp
 @@ -453,6 +453,7 @@ class HTMLMediaElement::MediaControlKeyListener final
@@ -10,7 +10,7 @@ index d46d5edc1d66c1eee8780abad444289fdc36a518..0e0d69819d9eee82add726792ec829c0
        NotifyAudibleStateChanged(mIsOwnerAudible
                                      ? MediaAudibleState::eAudible
                                      : MediaAudibleState::eInaudible);
-@@ -7034,6 +7035,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+@@ -7191,6 +7192,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
      QueueTask(std::move(runner));
      mQueueTimeUpdateRunnerTime = TimeStamp::Now();
      mLastCurrentTime = CurrentTime();
diff --git a/src/firefox-patches/ff142-gradient-dithering.patch b/src/firefox-patches/ff142-gradient-dithering.patch
deleted file mode 100644
index 26a1dbf86..000000000
--- a/src/firefox-patches/ff142-gradient-dithering.patch
+++ /dev/null
@@ -1,545 +0,0 @@
-diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src/bindings.rs
-index 578c2f80a9db..08823b7fea22 100644
---- a/gfx/webrender_bindings/src/bindings.rs
-+++ b/gfx/webrender_bindings/src/bindings.rs
-@@ -2144,12 +2144,6 @@ pub extern "C" fn wr_window_new(
-         }
-     };
- 
--    let enable_dithering = if !software && static_prefs::pref!("gfx.webrender.dithering") {
--        true
--    } else {
--        false
--    };
--
-     let opts = WebRenderOptions {
-         enable_aa: true,
-         enable_subpixel_aa,
-@@ -2204,7 +2198,6 @@ pub extern "C" fn wr_window_new(
-         reject_software_rasterizer,
-         low_quality_pinch_zoom,
-         max_shared_surface_size,
--        enable_dithering,
-         ..Default::default()
-     };
- 
-@@ -4615,11 +4608,8 @@ pub extern "C" fn wr_shaders_new(
- 
-     device.begin_frame();
- 
--    let mut options = WebRenderOptions::default();
--    options.enable_dithering = static_prefs::pref!("gfx.webrender.dithering");
--
-     let gl_type = device.gl().get_type();
--    let mut shaders = match Shaders::new(&mut device, gl_type, &options) {
-+    let mut shaders = match Shaders::new(&mut device, gl_type, &WebRenderOptions::default()) {
-         Ok(shaders) => shaders,
-         Err(e) => {
-             warn!(" Failed to create a Shaders: {:?}", e);
-diff --git a/gfx/wr/glsl-to-cxx/src/hir.rs b/gfx/wr/glsl-to-cxx/src/hir.rs
-index 626a3643e6ee..f0bb95d1df38 100644
---- a/gfx/wr/glsl-to-cxx/src/hir.rs
-+++ b/gfx/wr/glsl-to-cxx/src/hir.rs
-@@ -3964,6 +3964,14 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
-         vec![Type::new(Sampler2D), Type::new(Int), Type::new(Float), Type::new(Bool), Type::new(Bool),
-              Type::new(Vec2), Type::new(Vec2), Type::new(Float)],
-     );
-+    declare_function(
-+        state,
-+        "swgl_commitDitheredLinearGradientRGBA8",
-+        None,
-+        Type::new(Void),
-+        vec![Type::new(Sampler2D), Type::new(Int), Type::new(Float), Type::new(Bool), Type::new(Bool),
-+             Type::new(Vec2), Type::new(Vec2), Type::new(Float), Type::new(Vec4)],
-+    );
-     declare_function(
-         state,
-         "swgl_commitRadialGradientRGBA8",
-@@ -3972,6 +3980,14 @@ pub fn ast_to_hir(state: &mut State, tu: &syntax::TranslationUnit) -> Translatio
-         vec![Type::new(Sampler2D), Type::new(Int), Type::new(Float), Type::new(Bool), Type::new(Vec2),
-              Type::new(Float)],
-     );
-+    declare_function(
-+        state,
-+        "swgl_commitDitheredRadialGradientRGBA8",
-+        None,
-+        Type::new(Void),
-+        vec![Type::new(Sampler2D), Type::new(Int), Type::new(Float), Type::new(Bool), Type::new(Vec2),
-+             Type::new(Float), Type::new(Vec4)],
-+    );
-     declare_function(
-         state,
-         "swgl_commitGradientRGBA8",
-diff --git a/gfx/wr/swgl/build.rs b/gfx/wr/swgl/build.rs
-index fd6ec3fc4726..b8c9ad2ec174 100644
---- a/gfx/wr/swgl/build.rs
-+++ b/gfx/wr/swgl/build.rs
-@@ -142,6 +142,7 @@ fn main() {
-     let shader_flags = ShaderFeatureFlags::GL
-         | ShaderFeatureFlags::DUAL_SOURCE_BLENDING
-         | ShaderFeatureFlags::ADVANCED_BLEND_EQUATION
-+        | ShaderFeatureFlags::DITHERING
-         | ShaderFeatureFlags::DEBUG;
-     let mut shaders: Vec<String> = Vec::new();
-     for (name, features) in get_shader_features(shader_flags) {
-diff --git a/gfx/wr/swgl/src/swgl_ext.h b/gfx/wr/swgl/src/swgl_ext.h
-index 36b66843f63a..5a517afbe25c 100644
---- a/gfx/wr/swgl/src/swgl_ext.h
-+++ b/gfx/wr/swgl/src/swgl_ext.h
-@@ -1383,14 +1383,63 @@ static inline WideRGBA8 sampleGradient(sampler2D sampler, int address,
-   swgl_commitChunk(RGBA8, applyColor(sampleGradient(sampler, address, entry), \
-                                      packColor(swgl_OutRGBA, color)))
- 
-+static const int8_t ditherNoiseMatrix[] = {
-+    -126, 66,  -78,  114, -114, 78,   -66,  126, 2,   -62, 50,   -14,  14,
-+    -50,  62,  -2,   -94, 98,   -110, 82,   -82, 110, -98, 94,   34,   -30,
-+    18,   -46, 46,   -18, 30,   -34,  -118, 74,  -70, 122, -122, 70,   -74,
-+    118,  10,  -54,  58,  -6,   6,    -58,  54,  -10, -86, 106,  -102, 90,
-+    -90,  102, -106, 86,  42,   -22,  26,   -38, 38,  -26, 22,   -42,
-+};
-+
-+// Values in color should be in the 0..0xFF00 range so that dithering has enough
-+// overhead to avoid overflow.
-+static inline VectorType<uint16_t, 4 * 4> dither(
-+    const VectorType<uint16_t, 4 * 4>* color, ivec4_scalar fragCoord) {
-+  VectorType<uint16_t, 4 * 4> ret = *color;
-+
-+  // This isn't technically proper behaviour, but it's fast. Proper
-+  // behaviour would be to do a bounds check on every addition, or to otherwise
-+  // recreate that behaviour. Instead, we refuse to dither all 4
-+  // pixels if any channel from any one of them would underflow.
-+  auto boundsCheck = ret < 126;
-+
-+  // This is a vectorized or operation on all RGB values (ignores A)
-+  auto boundsCheckRGB = SHUFFLE(boundsCheck, boundsCheck, 0, 1, 2, 4, 5, 6, 8,
-+                                9, 10, 12, 13, 14, 0, 0, 0, 0);
-+  auto boundsCheckRGBReducedV8 =
-+      lowHalf(boundsCheckRGB) | highHalf(boundsCheckRGB);
-+  auto boundsCheckRGBReducedV4 =
-+      lowHalf(boundsCheckRGBReducedV8) | highHalf(boundsCheckRGBReducedV8);
-+  auto boundsCheckRGBReducedV2 =
-+      lowHalf(boundsCheckRGBReducedV4) | highHalf(boundsCheckRGBReducedV4);
-+  if (bit_cast<uint32_t>(boundsCheckRGBReducedV2) != 0) {
-+    return ret;
-+  }
-+
-+  const int row = (fragCoord.y & 7) * 8;
-+  int8_t n0 = ditherNoiseMatrix[row + ((fragCoord.x + 0) & 7)];
-+  int8_t n1 = ditherNoiseMatrix[row + ((fragCoord.x + 1) & 7)];
-+  int8_t n2 = ditherNoiseMatrix[row + ((fragCoord.x + 2) & 7)];
-+  int8_t n3 = ditherNoiseMatrix[row + ((fragCoord.x + 3) & 7)];
-+
-+  VectorType<uint16_t, 4 * 4> noiseVector = {
-+      uint16_t(n0), uint16_t(n0), uint16_t(n0), 0,
-+      uint16_t(n1), uint16_t(n1), uint16_t(n1), 0,
-+      uint16_t(n2), uint16_t(n2), uint16_t(n2), 0,
-+      uint16_t(n3), uint16_t(n3), uint16_t(n3), 0};
-+
-+  ret += noiseVector;
-+  return ret;
-+}
-+
- // Samples an entire span of a linear gradient by crawling the gradient table
- // and looking for consecutive stops that can be merged into a single larger
- // gradient, then interpolating between those larger gradients within the span.
--template <bool BLEND>
-+template <bool BLEND, bool DITHER>
- static bool commitLinearGradient(sampler2D sampler, int address, float size,
-                                  bool tileRepeat, bool gradientRepeat, vec2 pos,
-                                  const vec2_scalar& scaleDir, float startOffset,
--                                 uint32_t* buf, int span) {
-+                                 uint32_t* buf, int span, vec4 fragCoord) {
-   assert(sampler->format == TextureFormat::RGBA32F);
-   assert(address >= 0 && address < int(sampler->height * sampler->stride));
-   GradientStops* stops = (GradientStops*)&sampler->buf[address];
-@@ -1402,6 +1451,11 @@ static bool commitLinearGradient(sampler2D sampler, int address, float size,
-   if (!isfinite(delta)) {
-     return false;
-   }
-+
-+  // Only incremented in the case of dithering
-+  ivec4_scalar currentFragCoord =
-+      ivec4_scalar(fragCoord.x.x, fragCoord.y.x, fragCoord.z.x, fragCoord.w.x);
-+
-   // If we have a repeating brush, then the position will be modulo the [0,1)
-   // interval. Compute coefficients that can be used to quickly evaluate the
-   // distance to the interval boundary where the offset will wrap.
-@@ -1536,7 +1590,14 @@ static bool commitLinearGradient(sampler2D sampler, int address, float size,
-         // deltas.
-         int segment = min(remaining, 256 / 4);
-         for (auto* end = buf + segment * 4; buf < end; buf += 4) {
--          commit_blend_span<BLEND>(buf, bit_cast<WideRGBA8>(color >> 8));
-+          if (DITHER) {
-+            commit_blend_span<BLEND>(
-+                buf,
-+                bit_cast<WideRGBA8>(dither(&color, currentFragCoord) >> 8));
-+            currentFragCoord.x += 4;
-+          } else {
-+            commit_blend_span<BLEND>(buf, bit_cast<WideRGBA8>(color >> 8));
-+          }
-           color += deltaColor;
-         }
-         remaining -= segment;
-@@ -1569,7 +1630,20 @@ static bool commitLinearGradient(sampler2D sampler, int address, float size,
-     // will calculate a table entry for each sample, assuming the samples may
-     // have different table entries.
-     Float entry = clamp(offset * size + 1.0f, 0.0f, 1.0f + size);
--    commit_blend_span<BLEND>(buf, sampleGradient(sampler, address, entry));
-+
-+    if (DITHER) {
-+      auto gradientSample = static_cast<VectorType<uint16_t, 4 * 4>>(
-+                                sampleGradient(sampler, address, entry))
-+                            << 8;
-+      commit_blend_span<BLEND>(
-+          buf,
-+          static_cast<WideRGBA8>(
-+              dither(&gradientSample, currentFragCoord) >> 8));
-+      currentFragCoord.x += 4;
-+    } else {
-+      commit_blend_span<BLEND>(
-+          buf, static_cast<WideRGBA8>(sampleGradient(sampler, address, entry)));
-+    }
-     span -= 4;
-     buf += 4;
-     pos += posStep;
-@@ -1589,13 +1663,35 @@ static bool commitLinearGradient(sampler2D sampler, int address, float size,
-   do {                                                                       \
-     bool drawn = false;                                                      \
-     if (blend_key) {                                                         \
--      drawn = commitLinearGradient<true>(                                    \
-+      drawn = commitLinearGradient<true, false>(                             \
-+          sampler, address, size, tileRepeat, gradientRepeat, pos, scaleDir, \
-+          startOffset, swgl_OutRGBA8, swgl_SpanLength,                       \
-+          static_cast<vec4>(0x0));                                           \
-+    } else {                                                                 \
-+      drawn = commitLinearGradient<false, false>(                            \
-+          sampler, address, size, tileRepeat, gradientRepeat, pos, scaleDir, \
-+          startOffset, swgl_OutRGBA8, swgl_SpanLength,                       \
-+          static_cast<vec4>(0x0));                                           \
-+    }                                                                        \
-+    if (drawn) {                                                             \
-+      swgl_OutRGBA8 += swgl_SpanLength;                                      \
-+      swgl_SpanLength = 0;                                                   \
-+    }                                                                        \
-+  } while (0)
-+
-+#define swgl_commitDitheredLinearGradientRGBA8(                              \
-+    sampler, address, size, tileRepeat, gradientRepeat, pos, scaleDir,       \
-+    startOffset, fragCoord)                                                  \
-+  do {                                                                       \
-+    bool drawn = false;                                                      \
-+    if (blend_key) {                                                         \
-+      drawn = commitLinearGradient<true, true>(                              \
-           sampler, address, size, tileRepeat, gradientRepeat, pos, scaleDir, \
--          startOffset, swgl_OutRGBA8, swgl_SpanLength);                      \
-+          startOffset, swgl_OutRGBA8, swgl_SpanLength, fragCoord);           \
-     } else {                                                                 \
--      drawn = commitLinearGradient<false>(                                   \
-+      drawn = commitLinearGradient<false, true>(                             \
-           sampler, address, size, tileRepeat, gradientRepeat, pos, scaleDir, \
--          startOffset, swgl_OutRGBA8, swgl_SpanLength);                      \
-+          startOffset, swgl_OutRGBA8, swgl_SpanLength, fragCoord);           \
-     }                                                                        \
-     if (drawn) {                                                             \
-       swgl_OutRGBA8 += swgl_SpanLength;                                      \
-@@ -1625,10 +1721,10 @@ static ALWAYS_INLINE auto fastLength(V v) {
- // and looking for consecutive stops that can be merged into a single larger
- // gradient, then interpolating between those larger gradients within the span
- // based on the computed position relative to a radius.
--template <bool BLEND>
-+template <bool BLEND, bool DITHER>
- static bool commitRadialGradient(sampler2D sampler, int address, float size,
-                                  bool repeat, vec2 pos, float radius,
--                                 uint32_t* buf, int span) {
-+                                 uint32_t* buf, int span, vec4 fragCoord) {
-   assert(sampler->format == TextureFormat::RGBA32F);
-   assert(address >= 0 && address < int(sampler->height * sampler->stride));
-   GradientStops* stops = (GradientStops*)&sampler->buf[address];
-@@ -1658,6 +1754,11 @@ static bool commitRadialGradient(sampler2D sampler, int address, float size,
-   if (!isfinite(deltaDelta) || !isfinite(radius)) {
-     return false;
-   }
-+
-+  // Only incremented in the case of dithering
-+  ivec4_scalar currentFragCoord =
-+      ivec4_scalar(fragCoord.x.x, fragCoord.y.x, fragCoord.z.x, fragCoord.w.x);
-+
-   float invDelta, middleT, middleB;
-   if (deltaDelta > 0) {
-     invDelta = 1.0f / deltaDelta;
-@@ -1778,9 +1879,12 @@ static bool commitRadialGradient(sampler2D sampler, int address, float size,
-     // Figure out how many chunks are actually inside the merged gradient.
-     if (t + 4.0f <= endT) {
-       int inside = int(endT - t) & ~3;
--      // Convert start and end colors to BGRA and scale to 0..255 range later.
--      auto minColorF = stops[minIndex].startColor.zyxw * 255.0f;
--      auto maxColorF = stops[maxIndex].end_color().zyxw * 255.0f;
-+      // Convert start and end colors to BGRA and scale to 0..0xFF00 range (for
-+      // dithered) and 0..255 range (for non-dithered).
-+      auto minColorF =
-+          stops[minIndex].startColor.zyxw * (DITHER ? float(0xFF00) : 255.0f);
-+      auto maxColorF =
-+          stops[maxIndex].end_color().zyxw * (DITHER ? float(0xFF00) : 255.0f);
-       // Compute the change in color per change in gradient offset.
-       auto deltaColorF =
-           (maxColorF - minColorF) * (size / (maxIndex + 1 - minIndex));
-@@ -1789,18 +1893,29 @@ static bool commitRadialGradient(sampler2D sampler, int address, float size,
-       Float colorF =
-           minColorF - deltaColorF * (startRadius + (minIndex - 1) / size);
-       // Finally, walk over the span accumulating the position dot product and
--      // getting its sqrt as an offset into the color ramp. Since we're already
--      // in BGRA format and scaled to 255, we just need to round to an integer
--      // and pack down to pixel format.
-+      // getting its sqrt as an offset into the color ramp. At this point we
-+      // just need to round to an integer and pack down to an 8-bit pixel
-+      // format.
-       for (auto* end = buf + inside; buf < end; buf += 4) {
-         Float offsetG = fastSqrt<false>(dotPos);
--        commit_blend_span<BLEND>(
--            buf,
--            combine(
--                packRGBA8(round_pixel(colorF + deltaColorF * offsetG.x, 1),
--                          round_pixel(colorF + deltaColorF * offsetG.y, 1)),
--                packRGBA8(round_pixel(colorF + deltaColorF * offsetG.z, 1),
--                          round_pixel(colorF + deltaColorF * offsetG.w, 1))));
-+        if (DITHER) {
-+          auto color = combine(
-+              CONVERT(round_pixel(colorF + deltaColorF * offsetG.x, 1), U16),
-+              CONVERT(round_pixel(colorF + deltaColorF * offsetG.y, 1), U16),
-+              CONVERT(round_pixel(colorF + deltaColorF * offsetG.z, 1), U16),
-+              CONVERT(round_pixel(colorF + deltaColorF * offsetG.w, 1), U16));
-+          commit_blend_span<BLEND>(
-+              buf, static_cast<WideRGBA8>(
-+                       dither(&color, currentFragCoord) >> 8));
-+          currentFragCoord.x += 4;
-+        } else {
-+          auto color = combine(
-+              packRGBA8(round_pixel(colorF + deltaColorF * offsetG.x, 1),
-+                        round_pixel(colorF + deltaColorF * offsetG.y, 1)),
-+              packRGBA8(round_pixel(colorF + deltaColorF * offsetG.z, 1),
-+                        round_pixel(colorF + deltaColorF * offsetG.w, 1)));
-+          commit_blend_span<BLEND>(buf, color);
-+        }
-         dotPos += dotPosDelta;
-         dotPosDelta += deltaDelta2;
-       }
-@@ -1837,25 +1952,45 @@ static bool commitRadialGradient(sampler2D sampler, int address, float size,
- // swglcommitLinearGradient, but given a varying 2D position scaled to
- // gradient-space and a radius at which the distance from the origin maps to the
- // start of the gradient table.
--#define swgl_commitRadialGradientRGBA8(sampler, address, size, repeat, pos,    \
--                                       radius)                                 \
--  do {                                                                         \
--    bool drawn = false;                                                        \
--    if (blend_key) {                                                           \
--      drawn =                                                                  \
--          commitRadialGradient<true>(sampler, address, size, repeat, pos,      \
--                                     radius, swgl_OutRGBA8, swgl_SpanLength);  \
--    } else {                                                                   \
--      drawn =                                                                  \
--          commitRadialGradient<false>(sampler, address, size, repeat, pos,     \
--                                      radius, swgl_OutRGBA8, swgl_SpanLength); \
--    }                                                                          \
--    if (drawn) {                                                               \
--      swgl_OutRGBA8 += swgl_SpanLength;                                        \
--      swgl_SpanLength = 0;                                                     \
--    }                                                                          \
-+#define swgl_commitRadialGradientRGBA8(sampler, address, size, repeat, pos, \
-+                                       radius)                              \
-+  do {                                                                      \
-+    bool drawn = false;                                                     \
-+    if (blend_key) {                                                        \
-+      drawn = commitRadialGradient<true, false>(                            \
-+          sampler, address, size, repeat, pos, radius, swgl_OutRGBA8,       \
-+          swgl_SpanLength,                     \
-+          static_cast<vec4>(0x0));                                          \
-+    } else {                                                                \
-+      drawn = commitRadialGradient<false, false>(                           \
-+          sampler, address, size, repeat, pos, radius, swgl_OutRGBA8,       \
-+          swgl_SpanLength,                     \
-+          static_cast<vec4>(0x0));                                          \
-+    }                                                                       \
-+    if (drawn) {                                                            \
-+      swgl_OutRGBA8 += swgl_SpanLength;                                     \
-+      swgl_SpanLength = 0;                                                  \
-+    }                                                                       \
-   } while (0)
- 
-+#define swgl_commitDitheredRadialGradientRGBA8(                            \
-+    sampler, address, size, repeat, pos, radius, fragCoord) \
-+  do {                                                                     \
-+    bool drawn = false;                                                    \
-+    if (blend_key) {                                                       \
-+      drawn = commitRadialGradient<true, true>(                            \
-+          sampler, address, size, repeat, pos, radius, swgl_OutRGBA8,      \
-+          swgl_SpanLength, fragCoord);                      \
-+    } else {                                                               \
-+      drawn = commitRadialGradient<false, true>(                           \
-+          sampler, address, size, repeat, pos, radius, swgl_OutRGBA8,      \
-+          swgl_SpanLength, fragCoord);                      \
-+    }                                                                      \
-+    if (drawn) {                                                           \
-+      swgl_OutRGBA8 += swgl_SpanLength;                                    \
-+      swgl_SpanLength = 0;                                                 \
-+    }                                                                      \
-+  } while (0)
- // Extension to set a clip mask image to be sampled during blending. The offset
- // specifies the positioning of the clip mask image relative to the viewport
- // origin. The bounding box specifies the rectangle relative to the clip mask's
-diff --git a/gfx/wr/webrender/res/brush_linear_gradient.glsl b/gfx/wr/webrender/res/brush_linear_gradient.glsl
-index 235be4b24be8..6f923052ffb1 100644
---- a/gfx/wr/webrender/res/brush_linear_gradient.glsl
-+++ b/gfx/wr/webrender/res/brush_linear_gradient.glsl
-@@ -87,8 +87,13 @@ void swgl_drawSpanRGBA8() {
-         return;
-     }
- 
-+#ifdef WR_FEATURE_DITHERING
-+    swgl_commitDitheredLinearGradientRGBA8(sGpuBufferF, address, GRADIENT_ENTRIES, true, v_gradient_repeat.x != 0.0,
-+                                   v_pos, v_scale_dir, v_start_offset.x, gl_FragCoord);
-+#else
-     swgl_commitLinearGradientRGBA8(sGpuBufferF, address, GRADIENT_ENTRIES, true, v_gradient_repeat.x != 0.0,
-                                    v_pos, v_scale_dir, v_start_offset.x);
-+#endif
- }
- #endif
- 
-diff --git a/gfx/wr/webrender/res/cs_radial_gradient.glsl b/gfx/wr/webrender/res/cs_radial_gradient.glsl
-index 10919ac6283e..8084d8d47be1 100644
---- a/gfx/wr/webrender/res/cs_radial_gradient.glsl
-+++ b/gfx/wr/webrender/res/cs_radial_gradient.glsl
-@@ -63,8 +63,14 @@ void swgl_drawSpanRGBA8() {
-     if (address < 0) {
-         return;
-     }
-+
-+#ifdef WR_FEATURE_DITHERING
-+    swgl_commitDitheredRadialGradientRGBA8(sGpuBufferF, address, GRADIENT_ENTRIES, v_gradient_repeat.x != 0.0,
-+                                   v_pos, v_start_radius.x, gl_FragCoord);
-+#else
-     swgl_commitRadialGradientRGBA8(sGpuBufferF, address, GRADIENT_ENTRIES, v_gradient_repeat.x != 0.0,
-                                    v_pos, v_start_radius.x);
-+#endif
- }
- #endif
- 
-diff --git a/gfx/wr/webrender/res/ps_quad_radial_gradient.glsl b/gfx/wr/webrender/res/ps_quad_radial_gradient.glsl
-index 05b4dd2aa8c6..dc83f3c27742 100644
---- a/gfx/wr/webrender/res/ps_quad_radial_gradient.glsl
-+++ b/gfx/wr/webrender/res/ps_quad_radial_gradient.glsl
-@@ -73,8 +73,14 @@ void swgl_drawSpanRGBA8() {
-     if (address < 0) {
-         return;
-     }
-+
-+#ifdef WR_FEATURE_DITHERING
-+    swgl_commitDitheredRadialGradientRGBA8(sGpuBufferF, address, GRADIENT_ENTRIES, v_gradient_repeat.x != 0.0,
-+                                   v_pos, v_start_radius.x, gl_FragCoord);
-+#else
-     swgl_commitRadialGradientRGBA8(sGpuBufferF, address, GRADIENT_ENTRIES, v_gradient_repeat.x != 0.0,
-                                    v_pos, v_start_radius.x);
-+#endif
- }
- #endif
- 
-diff --git a/gfx/wr/webrender/src/renderer/init.rs b/gfx/wr/webrender/src/renderer/init.rs
-index 7c63798bc644..169d4c7a4437 100644
---- a/gfx/wr/webrender/src/renderer/init.rs
-+++ b/gfx/wr/webrender/src/renderer/init.rs
-@@ -224,7 +224,7 @@ impl Default for WebRenderOptions {
-             resource_override_path: None,
-             use_optimized_shaders: false,
-             enable_aa: true,
--            enable_dithering: false,
-+            enable_dithering: true,
-             debug_flags: DebugFlags::empty(),
-             max_recorded_profiles: 0,
-             precache_flags: ShaderPrecacheFlags::empty(),
-diff --git a/gfx/wr/webrender/src/renderer/shade.rs b/gfx/wr/webrender/src/renderer/shade.rs
-index ed38e7aa24e3..0171cb4092e1 100644
---- a/gfx/wr/webrender/src/renderer/shade.rs
-+++ b/gfx/wr/webrender/src/renderer/shade.rs
-@@ -873,14 +873,22 @@ impl Shaders {
-         let ps_quad_radial_gradient = loader.create_shader(
-             ShaderKind::Primitive,
-             "ps_quad_radial_gradient",
--            &[],
-+            if options.enable_dithering {
-+               &[DITHERING_FEATURE]
-+            } else {
-+               &[]
-+            },
-             &shader_list,
-         )?;
- 
-         let ps_quad_conic_gradient = loader.create_shader(
-             ShaderKind::Primitive,
-             "ps_quad_conic_gradient",
--            &[],
-+            if options.enable_dithering {
-+               &[DITHERING_FEATURE]
-+            } else {
-+               &[]
-+            },
-             &shader_list,
-         )?;
- 
-@@ -1032,14 +1040,22 @@ impl Shaders {
-         let cs_radial_gradient = loader.create_shader(
-             ShaderKind::Cache(VertexArrayKind::RadialGradient),
-             "cs_radial_gradient",
--            &[],
-+            if options.enable_dithering {
-+               &[DITHERING_FEATURE]
-+            } else {
-+               &[]
-+            },
-             &shader_list,
-         )?;
- 
-         let cs_conic_gradient = loader.create_shader(
-             ShaderKind::Cache(VertexArrayKind::ConicGradient),
-             "cs_conic_gradient",
--            &[],
-+            if options.enable_dithering {
-+               &[DITHERING_FEATURE]
-+            } else {
-+               &[]
-+            },
-             &shader_list,
-         )?;
- 
-diff --git a/gfx/wr/webrender_build/src/shader_features.rs b/gfx/wr/webrender_build/src/shader_features.rs
-index 72b82df00228..97247c929609 100644
---- a/gfx/wr/webrender_build/src/shader_features.rs
-+++ b/gfx/wr/webrender_build/src/shader_features.rs
-@@ -242,9 +242,9 @@ pub fn get_shader_features(flags: ShaderFeatureFlags) -> ShaderFeatures {
- 
-     shaders.insert("ps_quad_textured", vec![base_prim_features.finish()]);
- 
--    shaders.insert("ps_quad_radial_gradient", vec![base_prim_features.finish()]);
-+    shaders.insert("ps_quad_radial_gradient", vec![base_prim_features.finish(), if flags.contains(ShaderFeatureFlags::DITHERING) { "DITHERING".to_string() } else { String::new() }]);
- 
--    shaders.insert("ps_quad_conic_gradient", vec![base_prim_features.finish()]);
-+    shaders.insert("ps_quad_conic_gradient", vec![base_prim_features.finish(), if flags.contains(ShaderFeatureFlags::DITHERING) { "DITHERING".to_string() } else { String::new() }]);
- 
-     shaders.insert("ps_clear", vec![base_prim_features.finish()]);
- 
-diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index e21849fa3db4..258e12665ca8 100644
---- a/modules/libpref/init/StaticPrefList.yaml
-+++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -8007,13 +8007,6 @@
-   value: true
-   mirror: once
- 
--# Enable dithering in hardware WebRender
--- name: gfx.webrender.dithering
--  type: bool
--  rust: true
--  value: false
--  mirror: once
--
- # Use vsync events generated by hardware
- - name: gfx.work-around-driver-bugs
-   type: bool
diff --git a/src/layout/generic/nsIFrame-cpp.patch b/src/layout/generic/nsIFrame-cpp.patch
index 66f1b822d..3a9042a12 100644
--- a/src/layout/generic/nsIFrame-cpp.patch
+++ b/src/layout/generic/nsIFrame-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/generic/nsIFrame.cpp b/layout/generic/nsIFrame.cpp
-index 0fca54d43aed64e711c3470a5745a94baaed8886..17097bc8f39e7d5140afa4d91811bca2071a8ad1 100644
+index 7c8f9c8c8ea4cc43825b388e7dd655a2ef34e75f..da5f48bb2d55ae306c72b062169a9758ad10c014 100644
 --- a/layout/generic/nsIFrame.cpp
 +++ b/layout/generic/nsIFrame.cpp
-@@ -11933,6 +11933,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
+@@ -11912,6 +11912,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
    gfx::Matrix4x4 matrix = nsStyleTransformMatrix::ReadTransforms(
        uiReset->mMozWindowTransform, refBox, float(appUnitsPerDevPixel));
  
diff --git a/src/layout/style/nsStyleStruct-cpp.patch b/src/layout/style/nsStyleStruct-cpp.patch
index 677018f5d..f3c81c9a9 100644
--- a/src/layout/style/nsStyleStruct-cpp.patch
+++ b/src/layout/style/nsStyleStruct-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
-index 3fc58a635189d2160be84c3c8083e63abce611f0..7aac552365a4414229879e2dd9586f7fbd98816d 100644
+index 2413696f643246a825e184732bfba6eb33f606fd..932d3c316ee60c59b5f999e5ddd65c6acee3129d 100644
 --- a/layout/style/nsStyleStruct.cpp
 +++ b/layout/style/nsStyleStruct.cpp
-@@ -3266,6 +3266,9 @@ nsStyleUIReset::nsStyleUIReset()
+@@ -3273,6 +3273,9 @@ nsStyleUIReset::nsStyleUIReset()
        mWindowShadow(StyleWindowShadow::Auto),
        mWindowOpacity(1.0),
        mMozWindowInputRegionMargin(StyleLength::Zero()),
@@ -12,7 +12,7 @@ index 3fc58a635189d2160be84c3c8083e63abce611f0..7aac552365a4414229879e2dd9586f7f
        mTransitions(
            nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
        mTransitionTimingFunctionCount(1),
-@@ -3310,6 +3313,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
+@@ -3317,6 +3320,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
        mWindowOpacity(aSource.mWindowOpacity),
        mMozWindowInputRegionMargin(aSource.mMozWindowInputRegionMargin),
        mMozWindowTransform(aSource.mMozWindowTransform),
diff --git a/src/layout/style/nsStyleStruct-h.patch b/src/layout/style/nsStyleStruct-h.patch
index 0eeede686..1e0c4aee3 100644
--- a/src/layout/style/nsStyleStruct-h.patch
+++ b/src/layout/style/nsStyleStruct-h.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
-index 9db1b385ac12e0142921c49e6b6c2ba0fadccf95..919089fd9bc278b0c2fede4b2babe133acd4632e 100644
+index f40f005606946b1149bfb7b67d1df9be04ddaf07..64da397ceb4192aacd24c4cd9fb0efbad2d363ed 100644
 --- a/layout/style/nsStyleStruct.h
 +++ b/layout/style/nsStyleStruct.h
-@@ -2075,6 +2075,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
+@@ -2094,6 +2094,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
    // The margin of the window region that should be transparent to events.
    mozilla::StyleLength mMozWindowInputRegionMargin;
    mozilla::StyleTransform mMozWindowTransform;
diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index d46f3b54a..4156b2b27 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index a6c49438aaf3464e70bf9c75c2849a6062bd096a..2ee33493ed541b36a29f29c104d1275b80e5a20a 100644
+index 86dc55502b05eed6e4bb0a2ed489e1e8e76840cb..2c2918b2d3c76063662fe59d7fde745a36a92ab6 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -19222,6 +19215,7 @@
+@@ -19316,6 +19316,7 @@
    mirror: always
  #endif
  
diff --git a/src/modules/libpref/moz-build.patch b/src/modules/libpref/moz-build.patch
index d5fd7d0c8..f91740056 100644
--- a/src/modules/libpref/moz-build.patch
+++ b/src/modules/libpref/moz-build.patch
@@ -1,5 +1,5 @@
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
-index 68a0bd6b50b804745b052e1921f4f6120354443e..23e7d03a6796af39dc2d39733b16548e73f8b10f 100644
+index 46034d8d99ba227f85824d472933ec556f54ba81..42f7f68aba60ca9c8f85f5fe13ffb56fa542e344 100644
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
 @@ -93,6 +93,7 @@ pref_groups = [
diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch
index fd2ce91cd..eda66d696 100644
--- a/src/servo/components/style/gecko/media_features-rs.patch
+++ b/src/servo/components/style/gecko/media_features-rs.patch
@@ -1,5 +1,5 @@
 diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
-index 3d4630e2250476729d21cdcb1726a7af93f9fd75..489d1dc624bb1e7b3f7ed22a0073d3ada29846e4 100644
+index b0082951254ad592c73caaa16c5b5c57127831a9..9b3566b08aacfcf2cfbf9941b2b3ca91a31ade59 100644
 --- a/servo/components/style/gecko/media_features.rs
 +++ b/servo/components/style/gecko/media_features.rs
 @@ -13,6 +13,9 @@ use crate::values::computed::{CSSPixelLength, Context, Ratio, Resolution};
@@ -24,9 +24,9 @@ index 3d4630e2250476729d21cdcb1726a7af93f9fd75..489d1dc624bb1e7b3f7ed22a0073d3ad
 +    KleeneValue::from(unsafe { bindings::Gecko_EvalMozPrefFeature(pref.as_ptr(), &MozPrefFeatureValue::<i32>::None) })
 +}
  
- fn get_lnf_int(int_id: i32) -> i32 {
-     unsafe { bindings::Gecko_GetLookAndFeelInt(int_id) }
-@@ -641,7 +651,13 @@ macro_rules! lnf_int_feature {
+ fn eval_moz_mac_rtl(context: &Context) -> bool {
+     unsafe { bindings::Gecko_MediaFeatures_MacRTL(context.device().document()) }
+@@ -645,7 +655,13 @@ macro_rules! lnf_int_feature {
  /// to support new types in these entries and (2) ensuring that either
  /// nsPresContext::MediaFeatureValuesChanged is called when the value that
  /// would be returned by the evaluator function could change.
diff --git a/src/servo/components/style/queries/feature-rs.patch b/src/servo/components/style/queries/feature-rs.patch
index f9f6ae27e..18cb4aa09 100644
--- a/src/servo/components/style/queries/feature-rs.patch
+++ b/src/servo/components/style/queries/feature-rs.patch
@@ -1,5 +1,5 @@
 diff --git a/servo/components/style/queries/feature.rs b/servo/components/style/queries/feature.rs
-index a9a4decb178234037a6d285ddd3206bd52f214e5..18ea220a14cbb59ef3c9809cb679f8fdb5352f98 100644
+index 1414dd624e0761d269f7e3b1c64ed4bb6576a6e3..f0204c2ee3e8c3527750a26788b5fb7cdf8dfc67 100644
 --- a/servo/components/style/queries/feature.rs
 +++ b/servo/components/style/queries/feature.rs
 @@ -6,6 +6,7 @@
diff --git a/src/servo/components/style/queries/feature_expression-rs.patch b/src/servo/components/style/queries/feature_expression-rs.patch
index 1ec0d6303..8265a0588 100644
--- a/src/servo/components/style/queries/feature_expression-rs.patch
+++ b/src/servo/components/style/queries/feature_expression-rs.patch
@@ -1,5 +1,5 @@
 diff --git a/servo/components/style/queries/feature_expression.rs b/servo/components/style/queries/feature_expression.rs
-index 31ba4839aacf740eae4a753c17ee34d9e13562eb..e59bea9cd82d85ff6b195051fef595a45dff520c 100644
+index 91e1d1572cbd3682ec977f21751e067968ed8884..6e618ac765f698bf3d9ce120167a6906ae3ce5ff 100644
 --- a/servo/components/style/queries/feature_expression.rs
 +++ b/servo/components/style/queries/feature_expression.rs
 @@ -11,7 +11,7 @@ use crate::parser::{Parse, ParserContext};
diff --git a/src/testing/mochitest/browser-test-js.patch b/src/testing/mochitest/browser-test-js.patch
index 474a8f07c..ff99dd955 100644
--- a/src/testing/mochitest/browser-test-js.patch
+++ b/src/testing/mochitest/browser-test-js.patch
@@ -1,5 +1,5 @@
 diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
-index 11217c210dd8dc5f7c4bdc6043df9aeb361529c6..18c3c4d658170d0646483cd289fe8ad1f21ffae0 100644
+index 979c6a0960cb8c490b612649d0fac55cd7b7d0f7..f149f248f705484b3572ca462660932dd792e312 100644
 --- a/testing/mochitest/browser-test.js
 +++ b/testing/mochitest/browser-test.js
 @@ -440,11 +440,11 @@ Tester.prototype = {
diff --git a/src/toolkit/components/downloads/DownloadList-sys-mjs.patch b/src/toolkit/components/downloads/DownloadList-sys-mjs.patch
index ceff5a646..3a2c53041 100644
--- a/src/toolkit/components/downloads/DownloadList-sys-mjs.patch
+++ b/src/toolkit/components/downloads/DownloadList-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/components/downloads/DownloadList.sys.mjs b/toolkit/components/downloads/DownloadList.sys.mjs
-index 9ffdcd97edb31c35168a88303474fc4f5dc7c9d4..3c361101190d7f6123568535c68781c0e46fe2a9 100644
+index ef84be4cfd8194a99e2b2019360b780c700d8d42..3979c03670902ea3ae8bd344612612b20bec6176 100644
 --- a/toolkit/components/downloads/DownloadList.sys.mjs
 +++ b/toolkit/components/downloads/DownloadList.sys.mjs
 @@ -50,6 +50,7 @@ const FILE_EXTENSIONS = [
diff --git a/src/toolkit/components/extensions/parent/ext-downloads-js.patch b/src/toolkit/components/extensions/parent/ext-downloads-js.patch
index 5fdf9dbaf..81377918d 100644
--- a/src/toolkit/components/extensions/parent/ext-downloads-js.patch
+++ b/src/toolkit/components/extensions/parent/ext-downloads-js.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/components/extensions/parent/ext-downloads.js b/toolkit/components/extensions/parent/ext-downloads.js
-index 3b81d5e60a5e3006b80a2acec0b6720ccb7e5b33..5b6272986e13b48047f3bae1ec4205fc3e8012ef 100644
+index 4665c05116908133382be99ebeefd3546205750d..ba7cee3800e72f0fbd9b735c064cb6e61b4b4d28 100644
 --- a/toolkit/components/extensions/parent/ext-downloads.js
 +++ b/toolkit/components/extensions/parent/ext-downloads.js
 @@ -87,6 +87,7 @@ const FILTER_IMAGES_EXTENSIONS = [
diff --git a/src/toolkit/components/pictureinpicture/content/player-js.patch b/src/toolkit/components/pictureinpicture/content/player-js.patch
index 7ae87824f..6e461b23b 100644
--- a/src/toolkit/components/pictureinpicture/content/player-js.patch
+++ b/src/toolkit/components/pictureinpicture/content/player-js.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/components/pictureinpicture/content/player.js b/toolkit/components/pictureinpicture/content/player.js
-index 3be55670e18ed2ae1e02307304a3699d16d89aa5..477933646c3623432164be06c31ef5328f86bba6 100644
+index 8a1088b318dfd321b4e5f34819c689a10e7f87b2..8d1816b27a0c88ab41b654249ae52111129edbf5 100644
 --- a/toolkit/components/pictureinpicture/content/player.js
 +++ b/toolkit/components/pictureinpicture/content/player.js
-@@ -755,6 +755,11 @@ let Player = {
+@@ -760,6 +760,11 @@ let Player = {
          document.getElementById("large").click();
          break;
        }
diff --git a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
index ef89eff98..802143144 100644
--- a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
+++ b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/components/pictureinpicture/content/player.xhtml b/toolkit/components/pictureinpicture/content/player.xhtml
-index b38789882149c97a3263c405b783999bc60a5c71..009b7b7aa2ded0d88247c62171bfff59222a8e28 100644
+index 09c9c5000de96fcd4a9d26328408996540c2cbda..b6d93850bbfe63a4e21756c97415a6c1908dae25 100644
 --- a/toolkit/components/pictureinpicture/content/player.xhtml
 +++ b/toolkit/components/pictureinpicture/content/player.xhtml
 @@ -18,6 +18,7 @@
diff --git a/src/toolkit/content/widgets/browser-custom-element-mjs.patch b/src/toolkit/content/widgets/browser-custom-element-mjs.patch
index cb7820fe0..52362b570 100644
--- a/src/toolkit/content/widgets/browser-custom-element-mjs.patch
+++ b/src/toolkit/content/widgets/browser-custom-element-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/content/widgets/browser-custom-element.mjs b/toolkit/content/widgets/browser-custom-element.mjs
-index ef01902583d6ff1c563e9b2886f3048b127fe383..01f353f5eb4c67b2cf01a14e337a81e93358586f 100644
+index b5eb24e15cc97b004f182c35901505cb740e8571..f2dd435ba072affff3b4fdada6c360a575c22910 100644
 --- a/toolkit/content/widgets/browser-custom-element.mjs
 +++ b/toolkit/content/widgets/browser-custom-element.mjs
-@@ -482,11 +482,11 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
+@@ -483,11 +483,11 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
      if (!this.browsingContext) {
        return;
      }
diff --git a/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch b/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
index 766f3435b..305ba49e4 100644
--- a/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
+++ b/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/moz-toggle/moz-toggle.css b/toolkit/content/widgets/moz-toggle/moz-toggle.css
-index 7b9ec91bf0cfd8fda6a161995c9de57270557f6c..b1049bd2b2c03104e5b35978a9b81674d6920d53 100644
+index 49f04a3a8eedf580e9854f04014c637894181300..4e1336b4a58afaba182de87b4e670b0f0b3d607e 100644
 --- a/toolkit/content/widgets/moz-toggle/moz-toggle.css
 +++ b/toolkit/content/widgets/moz-toggle/moz-toggle.css
 @@ -6,8 +6,8 @@
diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch
index a384e5c2e..f7c21aa5f 100644
--- a/src/toolkit/modules/moz-build.patch
+++ b/src/toolkit/modules/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
-index 990244af276576d0af0b371a370287aa780f42c1..cd43715aea607fc7dbafda589e14e1462568dd61 100644
+index e43870b10c5b35165fd21b48065980060104dc52..71e3db5618c834bc4ff9d481b1e667f2b02b183e 100644
 --- a/toolkit/modules/moz.build
 +++ b/toolkit/modules/moz.build
-@@ -281,6 +281,7 @@ for var in (
+@@ -280,6 +280,7 @@ for var in (
      "DLL_SUFFIX",
      "DEBUG_JS_MODULES",
      "OMNIJAR_NAME",
diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch
index 2b4335893..7cbc4274e 100644
--- a/src/toolkit/moz-configure.patch
+++ b/src/toolkit/moz-configure.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 44b91b7bb3e0196b7f1f923c43fb8967f569cd28..907f7059cb44b990b5eb3a90d5df523075cd6ae1 100644
+index 2fdcf62bde7805e52737cb06ec67908fa40524c9..b9f9e3abeb5cf770b29e1354615184fce2162ec7 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project):
diff --git a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
index 6ed13c08c..3fd64f2b3 100644
--- a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-index f544f44cf7a73858213ddfc07c0ad693e2f56504..01293cb38ad53ff36c545ccb392071e20fe1d62b 100644
+index 2c1e187d14bae0dcc17a1fa2de768e7c949b3776..c322b770bdc1a0786d8e3bf1af618e3d3d3dd26e 100644
 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
 +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
 @@ -1227,12 +1227,12 @@ var AddonManagerInternal = {
diff --git a/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch b/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
index d35981b3b..f0290fa86 100644
--- a/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
+++ b/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/mozapps/extensions/content/aboutaddons.css b/toolkit/mozapps/extensions/content/aboutaddons.css
-index 733396c68be4f1dd9de99bd602c9f8cde8843957..e0d9489a89e366e3f6dab2a6f472c6752a8815b3 100644
+index 232fca6975de67bc0d84969204e75bad358b6bc7..4bbfb2abb9ea4812005734eb95a0bd7b8bbab7ce 100644
 --- a/toolkit/mozapps/extensions/content/aboutaddons.css
 +++ b/toolkit/mozapps/extensions/content/aboutaddons.css
 @@ -105,6 +105,13 @@ h2 {
diff --git a/src/toolkit/profile/nsToolkitProfileService-cpp.patch b/src/toolkit/profile/nsToolkitProfileService-cpp.patch
index 3df221797..c796e9ba9 100644
--- a/src/toolkit/profile/nsToolkitProfileService-cpp.patch
+++ b/src/toolkit/profile/nsToolkitProfileService-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp
-index befc1def42c9fdd33438f0485cea6d36520adf28..1d3dd61fd3dd1769a9523c95993bb31cfde7b7ab 100644
+index 1d8c95cc10d158e86254f45d8f955c8f8ce50394..3708da5d0780298589b89dbb4a03152749911dee 100644
 --- a/toolkit/profile/nsToolkitProfileService.cpp
 +++ b/toolkit/profile/nsToolkitProfileService.cpp
-@@ -82,6 +82,8 @@ using namespace mozilla;
+@@ -84,6 +84,8 @@ using namespace mozilla;
  #define INSTALL_PREFIX_LENGTH 7
  #define STORE_ID_PREF "toolkit.profiles.storeID"
  
@@ -11,7 +11,7 @@ index befc1def42c9fdd33438f0485cea6d36520adf28..1d3dd61fd3dd1769a9523c95993bb31c
  struct KeyValue {
    KeyValue(const char* aKey, const char* aValue) : key(aKey), value(aValue) {}
  
-@@ -1364,7 +1366,7 @@ nsresult nsToolkitProfileService::CreateDefaultProfile(
+@@ -1370,7 +1372,7 @@ nsresult nsToolkitProfileService::CreateDefaultProfile(
    if (mUseDevEditionProfile) {
      name.AssignLiteral(DEV_EDITION_NAME);
    } else if (mUseDedicatedProfile) {
diff --git a/src/toolkit/themes/shared/aboutReader-css.patch b/src/toolkit/themes/shared/aboutReader-css.patch
index 5b830814d..6ea618c2e 100644
--- a/src/toolkit/themes/shared/aboutReader-css.patch
+++ b/src/toolkit/themes/shared/aboutReader-css.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
-index bf425379af81f442fb0b4ad7d2921c3f06196f26..6c2cc0faade92de995b675eea2696f061dfda571 100644
+index 1eb2c44694bb4970134fb5d290e32c7053103461..8d8237029976960048cb9aceede918c9e20c523b 100644
 --- a/toolkit/themes/shared/aboutReader.css
 +++ b/toolkit/themes/shared/aboutReader.css
-@@ -1189,3 +1189,43 @@ pre code {
+@@ -1181,3 +1181,43 @@ pre code {
    display: block;
    overflow: auto;
  }
diff --git a/src/toolkit/themes/shared/in-content/common-shared-css.patch b/src/toolkit/themes/shared/in-content/common-shared-css.patch
index 70b644c55..615b9a4e5 100644
--- a/src/toolkit/themes/shared/in-content/common-shared-css.patch
+++ b/src/toolkit/themes/shared/in-content/common-shared-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
-index c45d48dc3106a2dc36f6dd704ebb2721817f016e..71291ab50b73872473190537fe2ce7a95a57aa12 100644
+index 96129498de63153704711bf7a21fb10922e80917..83f7b5ee2f15197dc42ec02ec1a73cc2bfc19a4d 100644
 --- a/toolkit/themes/shared/in-content/common-shared.css
 +++ b/toolkit/themes/shared/in-content/common-shared.css
 @@ -4,7 +4,7 @@
@@ -11,7 +11,7 @@ index c45d48dc3106a2dc36f6dd704ebb2721817f016e..71291ab50b73872473190537fe2ce7a9
  @namespace html "http://www.w3.org/1999/xhtml";
  @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
  
-@@ -69,7 +69,7 @@
+@@ -68,7 +68,7 @@
     * this in forced colors mode, as we should be using system colours then.
     */
    :root[dialogroot] {
@@ -20,7 +20,7 @@ index c45d48dc3106a2dc36f6dd704ebb2721817f016e..71291ab50b73872473190537fe2ce7a9
    }
  }
  
-@@ -708,7 +708,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
+@@ -706,7 +706,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
    fill-opacity: 1;
  }
  
@@ -29,7 +29,7 @@ index c45d48dc3106a2dc36f6dd704ebb2721817f016e..71291ab50b73872473190537fe2ce7a9
    :root {
      --in-content-sidebar-width: 118px;
    }
-@@ -1098,7 +1098,7 @@ xul|*.sidebar-footer-link {
+@@ -1096,7 +1096,7 @@ xul|*.sidebar-footer-link {
    user-select: none;
  }
  
diff --git a/src/toolkit/themes/shared/menulist-css.patch b/src/toolkit/themes/shared/menulist-css.patch
index 5fa88cb37..a8cd61158 100644
--- a/src/toolkit/themes/shared/menulist-css.patch
+++ b/src/toolkit/themes/shared/menulist-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/menulist.css b/toolkit/themes/shared/menulist.css
-index e5ac973b1ee2595e8547680465e25d537685a9e7..20f85152d783c81be5e29846353daca9ccd0c67d 100644
+index 8f9c006945e67f668075bd36ce83d5a772a9a796..08d68c015b001233548cd6c7babad17f3a638702 100644
 --- a/toolkit/themes/shared/menulist.css
 +++ b/toolkit/themes/shared/menulist.css
 @@ -53,7 +53,7 @@
@@ -9,5 +9,5 @@ index e5ac973b1ee2595e8547680465e25d537685a9e7..20f85152d783c81be5e29846353daca9
 -  background-color: var(--button-background-color);
 +  background-color: light-dark(rgba(0,0,0,.1), rgba(255,255,255,.1));
    color: var(--button-text-color);
-   border-radius: 4px;
+   border-radius: var(--border-radius-small);
    padding-block: 4px;
diff --git a/src/toolkit/themes/shared/pictureinpicture/player-css.patch b/src/toolkit/themes/shared/pictureinpicture/player-css.patch
index 475bb4de0..798902248 100644
--- a/src/toolkit/themes/shared/pictureinpicture/player-css.patch
+++ b/src/toolkit/themes/shared/pictureinpicture/player-css.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/themes/shared/pictureinpicture/player.css b/toolkit/themes/shared/pictureinpicture/player.css
-index 4a4ab15f9801d9443f3dbc131a533823be423bd9..ed487012d172c278f7d5a59ee953de4a05456019 100644
+index 33b10bebcdfe636d7ff0f61a11d5fa4664a31f78..83b53817c53f43cca3be40b490300109b4949f5b 100644
 --- a/toolkit/themes/shared/pictureinpicture/player.css
 +++ b/toolkit/themes/shared/pictureinpicture/player.css
-@@ -736,3 +736,17 @@ input:checked + .slider::before {
+@@ -738,3 +738,17 @@ input:checked + .slider::before {
      justify-self: center;
    }
  }
diff --git a/src/tools/signing/macos/mach_commands-py.patch b/src/tools/signing/macos/mach_commands-py.patch
index 73169aa91..be02e1b77 100644
--- a/src/tools/signing/macos/mach_commands-py.patch
+++ b/src/tools/signing/macos/mach_commands-py.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/signing/macos/mach_commands.py b/tools/signing/macos/mach_commands.py
-index 454a9bbc35802fbf811065e8e1ca592674016bb3..d6b0cf119664e0534a3898f72ffbcd3aade9c89d 100644
+index 721790b0d067ea1cdc6ddc9d220e423de9206d53..ca80e6f2c8bcd82eda24d03720a37a2bfdc50cfe 100644
 --- a/tools/signing/macos/mach_commands.py
 +++ b/tools/signing/macos/mach_commands.py
 @@ -37,7 +37,6 @@ from mozbuild.base import MachCommandConditions as conditions
@@ -21,7 +21,7 @@ index 454a9bbc35802fbf811065e8e1ca592674016bb3..d6b0cf119664e0534a3898f72ffbcd3a
      if use_rcodesign_arg is True:
          sign_with_rcodesign(
              command_context,
-@@ -567,7 +570,7 @@ def sign_with_rcodesign(
+@@ -608,7 +611,7 @@ def sign_with_rcodesign(
      # input path and its options are specified as standard arguments.
      ctx.log(logging.INFO, "macos-sign", {}, "Signing with rcodesign")
  
diff --git a/src/widget/cocoa/nsCocoaWindow-mm.patch b/src/widget/cocoa/nsCocoaWindow-mm.patch
index ecbe7de1e..ee8b3bc7a 100644
--- a/src/widget/cocoa/nsCocoaWindow-mm.patch
+++ b/src/widget/cocoa/nsCocoaWindow-mm.patch
@@ -1,8 +1,8 @@
 diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
-index 827dc774a429d0595028314a522722078a202edc..11ba33c2c316c0fc53053f6f8d0feab97c93bc72 100644
+index 6c80f33454503af0840af18cb88af44a006727ee..47b318814ddd57b1e73c66b576884b8e62093906 100644
 --- a/widget/cocoa/nsCocoaWindow.mm
 +++ b/widget/cocoa/nsCocoaWindow.mm
-@@ -7540,7 +7540,7 @@ static NSMutableSet* gSwizzledFrameViewClasses = nil;
+@@ -7588,7 +7588,7 @@ static NSMutableSet* gSwizzledFrameViewClasses = nil;
  
  // Returns an autoreleased NSImage.
  static NSImage* GetMenuMaskImage() {
diff --git a/src/xpfe/appshell/AppWindow-cpp.patch b/src/xpfe/appshell/AppWindow-cpp.patch
index 70df53122..61deb9ea7 100644
--- a/src/xpfe/appshell/AppWindow-cpp.patch
+++ b/src/xpfe/appshell/AppWindow-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
-index 0b7788ec179d1c1021d2e5692c652b367646d33b..f5d48ca47a899b82f9d9cb7823eeb096f542c0ea 100644
+index 64f18c991b0b9a8bf3690a54624b447f347a210e..0b00a29956cd6a750d5feadd4b2a4ceb8338410b 100644
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
-@@ -1873,7 +1873,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
+@@ -1874,7 +1874,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
      }
    }
  
diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
index 3fa3d061c..289266a2b 100644
--- a/src/zen/common/ZenStartup.mjs
+++ b/src/zen/common/ZenStartup.mjs
@@ -61,11 +61,6 @@
         setTimeout(() => {
           gZenUIManager.init();
           this.#checkForWelcomePage();
-
-          document.l10n.setAttributes(
-            document.getElementById('tabs-newtab-button'),
-            'tabs-toolbar-new-tab'
-          );
         }, 0);
       } catch (e) {
         console.error('ZenThemeModifier: Error initializing browser layout', e);
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index dd54457be..d344e543e 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -889,7 +889,6 @@ var gZenVerticalTabsManager = {
       if (typeof height !== 'undefined') {
         document.getElementById('urlbar').style.setProperty('--urlbar-height', `${height}px`);
       }
-      gURLBar.valueFormatter._formatURL();
     });
   },
 
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 5349e8b57..12e2c7cf3 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -111,6 +111,10 @@
   border-radius: 0px !important;
 }
 
+#urlbar:not([breakout-extend='true']) .urlbar-input-box {
+  font-weight: 500;
+}
+
 :root[zen-single-toolbar='true'] #urlbar:not([breakout-extend='true']) {
   & #urlbar-input {
     cursor: default;
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 02169605c..3eefbd64d 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -500,12 +500,12 @@ body > #confetti {
         to bottom,
         color-mix(
           in srgb,
-          light-dark(rgba(255, 255, 255, 1), rgba(0, 0, 0, 0.3)) 15%,
+          light-dark(rgba(255, 255, 255, 1), rgba(0, 0, 0, 0.5)) 15%,
           transparent 100%
         ),
         color-mix(
           in srgb,
-          light-dark(rgba(255, 255, 255, 0.8), rgba(0, 0, 0, 0.8)) 100%,
+          light-dark(rgba(255, 255, 255, 0.8), rgba(0, 0, 0, 0.9)) 100%,
           transparent 100%
         )
       );
@@ -514,7 +514,7 @@ body > #confetti {
       border-radius: 6px;
       --base-border-color: light-dark(rgba(0, 0, 0, 0.3), rgba(255, 255, 255, 0.1));
       border: 1px solid;
-      border-top-color: light-dark(var(--base-border-color), rgba(255, 255, 255, 0.12));
+      border-top-color: light-dark(var(--base-border-color), rgba(255, 255, 255, 0.1));
       border-left-color: light-dark(var(--base-border-color), transparent);
       border-right-color: light-dark(var(--base-border-color), transparent);
       border-bottom-color: light-dark(var(--base-border-color), rgba(0, 0, 0, 0.12));
diff --git a/src/zen/tests/tabs/browser.toml b/src/zen/tests/tabs/browser.toml
index 3d86041c6..0d6efd5dd 100644
--- a/src/zen/tests/tabs/browser.toml
+++ b/src/zen/tests/tabs/browser.toml
@@ -8,6 +8,7 @@ support-files = [
 ]
 
 ["browser_tabs_empty_checks.js"]
+["browser_tabs_fetch_checks.js"]
 ["browser_drag_drop_vertical.js"]
 tags = [
   "drag-drop",
diff --git a/src/zen/tests/tabs/browser_tabs_fetch_checks.js b/src/zen/tests/tabs/browser_tabs_fetch_checks.js
new file mode 100644
index 000000000..a223af8b0
--- /dev/null
+++ b/src/zen/tests/tabs/browser_tabs_fetch_checks.js
@@ -0,0 +1,29 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+// Each firefox update, we should run this check, even
+// if its a very "basic" one. Just to make sure that we are
+// returning tabs correctly.
+add_task(async function test_Tabs_Getter() {
+  for (let tab of gBrowser.tabs) {
+    ok(tab.tagName.toLowerCase() === 'tab', 'Each item in gBrowser.tabs is a tab element');
+  }
+  Assert.equal(
+    gBrowser.tabs.length,
+    2,
+    'There should be 2 tabs (1 empty tab + 1 about:blank tab) at startup'
+  );
+});
+
+add_task(async function test_Aria_Focusable_Tabs() {
+  for (let tab of gBrowser.tabContainer.ariaFocusableItems) {
+    ok(tab.tagName.toLowerCase() === 'tab', 'Each item in ariaFocusableItems is a tab element');
+  }
+  Assert.equal(
+    gBrowser.tabContainer.ariaFocusableItems.length,
+    2,
+    'There should be 2 focusable tabs (1 empty tab + 1 about:blank tab) at startup'
+  );
+});
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index e2a0c31c4..bbb01f5ee 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -950,6 +950,8 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     window.addEventListener('TabSelect', this.onLocationChange.bind(this));
 
     window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
+
+    await this.selectStartPage();
   }
 
   async selectStartPage() {
diff --git a/surfer.json b/surfer.json
index e643dbd5b..2614839b2 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "143.0.4",
-    "candidate": "143.0.4"
+    "candidate": "144.0"
   },
   "buildOptions": {
     "generateBranding": true

From 00a70c11a7875e73027ef39ba3f04a5f2f55fcc8 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 7 Oct 2025 23:12:10 +0200
Subject: [PATCH 044/111] fix: Fixed fullscren urlbar not focusing, b=closes
 #5229, c=common

---
 src/zen/common/styles/zen-omnibox.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 12e2c7cf3..846b60d37 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -29,6 +29,9 @@
 
   &[breakout-extend='true'] {
     --urlbar-container-padding: 0px;
+  }
+
+  :root[inDOMFullscreen] & {
     /* See issue https://github.com/zen-browser/desktop/issues/5229 */
     visibility: visible;
   }

From 0c5a2aa96dc1006d68aa8dc631a64860d28eff3c Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 8 Oct 2025 12:49:18 +0200
Subject: [PATCH 045/111] perf: Fixed performance for media controls label,
 b=no-bug, c=media

---
 src/zen/media/zen-media-controls.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/zen/media/zen-media-controls.css b/src/zen/media/zen-media-controls.css
index 54450aec8..d65e9e1b0 100644
--- a/src/zen/media/zen-media-controls.css
+++ b/src/zen/media/zen-media-controls.css
@@ -108,6 +108,10 @@
       transform: translateY(0) !important;
       pointer-events: auto;
     }
+
+    & #zen-media-info-vbox label[overflow] {
+      animation: zen-back-and-forth-text 10s infinite ease-in-out;
+    }
   }
 
   & #zen-media-focus-button::after {
@@ -255,10 +259,6 @@
     margin-left: 0;
     font-weight: 500;
     position: relative; /* For the animation */
-
-    &[overflow] {
-      animation: zen-back-and-forth-text 10s infinite ease-in-out;
-    }
   }
 }
 

From ba1a59622a318cd9cebf07bf93aed070c1d91056 Mon Sep 17 00:00:00 2001
From: Blake Gearin <hello@blakeg.me>
Date: Wed, 8 Oct 2025 04:49:40 -0600
Subject: [PATCH 046/111] feat: Add config to support more than 12 essential
 tabs, p=#10731

---
 locales/ar/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/ca/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/cs/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/cy/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/da/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/de/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/el/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/en-GB/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/en-US/browser/browser/zen-general.ftl |  4 +--
 locales/es-ES/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/et/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/fa/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/fi/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/fr/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/ga-IE/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/he/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/hu/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/id/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/is/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/it/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/ja/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/ko/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/lt/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/nl/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/nn-NO/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/pl/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/pt-BR/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/pt-PT/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/ru/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/sv-SE/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/th/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/tr/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/uk/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/vi/browser/browser/zen-general.ftl    | 26 +++++++++----------
 locales/zh-CN/browser/browser/zen-general.ftl | 26 +++++++++----------
 locales/zh-TW/browser/browser/zen-general.ftl | 26 +++++++++----------
 prefs/zen.yaml                                |  3 +++
 src/zen/tabs/ZenPinnedTabManager.mjs          | 17 +++++++++---
 38 files changed, 473 insertions(+), 461 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index f2b56be25..60ecdbc8d 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = الملف الشخصي الحالي
 unified-extensions-description = تستخدم الإضافات لجلب المزيد من الوظائف الإضافية إلى { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = إعادة تعيين علامة التبويب المثبتة
     .accesskey = ر
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = استبدال الرابط المثبت بالرابط الحالي
     .accesskey = C
 zen-themes-corrupted = ملف التعديل { -brand-short-name } الخاص بك تالف. تم إعادة تعيينه إلى السمة الافتراضية.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = لون مخصص
 zen-panel-ui-gradient-generator-saved-message = حفظ معامل التدرج بنجاح!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = إلى المزيد تعرف
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 3e179f989..491b97549 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil actual
 unified-extensions-description = Les extensions aporten funcionalitats addicionals a { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Restableix la pestanya fixada
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Afegeix als essentials ({ $num }/12 espais ocupats)
+tab-context-zen-add-essential =
+    .label = Afegeix als essentials ({ $num } / { $max } espais ocupats)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Elimina dels essencials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Substitueix l'URL fixat per l'actual
     .accesskey = C
 zen-themes-corrupted = El vostre fitxer de modificacions { -brand-short-name } està malmès. S'ha restablert al tema per defecte.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     La nova barra d'URL s'ha activat, eliminant la necessitat de noves pàgines de pestanya.<br/><br/>
     Proveu d'obrir una pestanya nova per veure la nova barra d'URL en acció!
 zen-disable = Deshabilita
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimitza
     .tooltip = Minimitza
 zen-panel-ui-gradient-generator-custom-color = Color personalitzat
 zen-panel-ui-gradient-generator-saved-message = El degradat s'ha desat correctament!
 zen-copy-current-url-confirmation = L'URL s'ha copiat al porta-retalls.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel·la
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirma
 zen-pinned-tab-replaced = L'URL de la pestanya fixada s'ha substituït per l'URL actual.
 zen-tabs-renamed = S'ha canviat el nom de la pestanya correctament!
 zen-background-tab-opened-toast = S'ha obert una nova pestanya de fons!
 zen-workspace-renamed-toast = S'ha canviat el nom de l'espai de treball correctament!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Espais
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Modificacions
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Més informació
 zen-close-label = Tanca
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Cerca...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icones
 urlbar-search-mode-zen_actions = Accions
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 425c223a7..792a6b740 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = aktuální profil
 unified-extensions-description = Rozšíření slouží k přidání dalších funkcí do prohlížeče { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Resetovat připnuté karty
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Přidat do Essentials ({ $num } / 12 zaplněných slotů)
+tab-context-zen-add-essential =
+    .label = Přidat do Essentials ({ $num } / { $max } zaplněných slotů)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Odstranit z Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Nahradit připnutou URL adresu aktuální adresou
     .accesskey = C
 zen-themes-corrupted = Váš { -brand-short-name } mods soubor je poškozen. Byl obnoven na výchozí motiv.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Nový adresní řádek je nyní zapnutý, takže už není potřeba otevírat nové karty.<br/><br/>
     Zkuste otevřít novou kartu a podívejte se, jak funguje!
 zen-disable = Zavřít
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimalizovat
     .tooltip = Minimalizovat
 zen-panel-ui-gradient-generator-custom-color = Vlastní barva
 zen-panel-ui-gradient-generator-saved-message = Gradient byl úspěšně uložen!
 zen-copy-current-url-confirmation = URL adresa byla zkopírována do schránky.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Zrušit
-zen-general-confirm = 
+zen-general-confirm =
     .label = Potvrdit
 zen-pinned-tab-replaced = Připnutá URL adresa panelu byla nahrazena aktuální URL adresou.
 zen-tabs-renamed = Panel byl úspěšně přejmenován!
 zen-background-tab-opened-toast = Nová karta na pozadí byla otevřena!
 zen-workspace-renamed-toast = Pracovní prostor byl úspěšně přejmenován!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Prostory
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Módy
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Zjistit více
 zen-close-label = Zavřít
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Hledat...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emodži
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ikony
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index a9bc98fd0..8eb07bbaa 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = proffil gweithredol
 unified-extensions-description = Mae ehangiadau'n cael ei defnyddio er mwyn ychwanegu fwy o weithrediadau i mewn i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Ailosod Tab wedi'i Binio
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Diddymu o Hanfodion
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Ailosod URL wedi'i Binio gyda'r Gyfredol
     .accesskey = C
 zen-themes-corrupted = Mae eich ffeil am y mod { -brand-short-name } wedi'i llygru. Maent wedi cael eu hailosod i'r thema rhagosodedig.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Mae'r bar URL newydd wedi'i alluogi, sydd yn dileu'r angen am dudalennau tab newydd.<br/><br/>
     Ceisiwch agor tab newydd i weld y bar URL newydd ar waith!
 zen-disable = Analluogi
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Addasu Lliw
 zen-panel-ui-gradient-generator-saved-message = Llwyddiant arbedi'r graddiant!
 zen-copy-current-url-confirmation = Mae'r URL wedi'i gopïo i'r clipfwrdd.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Mae URL y tab wedi'i binio wedi'i newid i'r URL gyfredol.
 zen-tabs-renamed = Llwyddiant ailenwi'r tab!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Cau
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index a84ebfefd..43f090a53 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = nuværende profil
 unified-extensions-description = Udvidelser bruges til at bringe ekstra funktionalitet ind i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Nulstil fastgjort fane
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Føj til Essentielle ({ $num } / 12 pladser fyldt)
+tab-context-zen-add-essential =
+    .label = Føj til Essentielle ({ $num } / { $max } pladser fyldt)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Fjern fra Essentielle
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Erstat fastgjort URL med nuværende
     .accesskey = C
 zen-themes-corrupted = Din { -brand-short-name } mods-fil er beskadiget. De er blevet nulstillet til standardtemaet.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Den nye URL-linje er aktiveret og fjerner dermed behovet for nye fanesider.<br/><br/>
     Prøv at åbne en ny fane for at se den i aktion!
 zen-disable = Deaktiver
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimer
     .tooltip = Minimer
 zen-panel-ui-gradient-generator-custom-color = Brugerdefineret Farve
 zen-panel-ui-gradient-generator-saved-message = Gradienten blev gemt!
 zen-copy-current-url-confirmation = URL'en blev kopieret til udklipsholderen.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Annuller
-zen-general-confirm = 
+zen-general-confirm =
     .label = Bekræft
 zen-pinned-tab-replaced = Den fastgjorte fane-URL blev erstattet med den aktuelle.
 zen-tabs-renamed = Fanen blev omdøbt!
 zen-background-tab-opened-toast = Ny baggrundsfane åbnet!
 zen-workspace-renamed-toast = Arbejdsområde blev omdøbt!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Rum
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Lær mere
 zen-close-label = Luk
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Søg...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ikoner
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 211ee89a7..0558e57ee 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = Aktuelles Profil
 unified-extensions-description = Erweiterungen werden verwendet, um { -brand-short-name } zusätzliche Funktionen hinzuzufügen.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Angepinnten Tab zurücksetzen
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Zu Essentials hinzufügen ({ $num } / 12 Plätze belegt)
+tab-context-zen-add-essential =
+    .label = Zu Essentials hinzufügen ({ $num } / { $max } Plätze belegt)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Aus Essentials entfernen
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Angepinnte URL durch aktuelle ersetzen
     .accesskey = C
 zen-themes-corrupted = Ihre { -brand-short-name } Mods-Datei ist beschädigt. Sie wurde auf das Standard-Design zurückgesetzt.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Die neue Adressleiste wurde aktiviert und macht neue Tab-Seiten überflüssig.<br/><br/>
     Öffnen Sie einen neuen Tab, um die neue Adressleiste in Aktion zu sehen!
 zen-disable = Deaktivieren
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimieren
     .tooltip = Minimieren
 zen-panel-ui-gradient-generator-custom-color = Benutzerdefinierte Farbe
 zen-panel-ui-gradient-generator-saved-message = Farbverlauf erfolgreich gespeichert!
 zen-copy-current-url-confirmation = Die URL wurde in die Zwischenablage kopiert.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Abbrechen
-zen-general-confirm = 
+zen-general-confirm =
     .label = Bestätigen
 zen-pinned-tab-replaced = Die URL des angepinnten Tabs wurde durch die aktuelle URL ersetzt!
 zen-tabs-renamed = Tab wurde erfolgreich umbenannt!
 zen-background-tab-opened-toast = Neuer Hintergrund-Tab geöffnet!
 zen-workspace-renamed-toast = Arbeitsbereich wurde erfolgreich umbenannt!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Arbeitsbereiche
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Mehr erfahren
 zen-close-label = Schließen
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Suchen...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Symbole
 urlbar-search-mode-zen_actions = Aktionen
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index feda1420c..ac77b2f23 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = τρέχον προφίλ
 unified-extensions-description = Οι επεκτάσεις χρησιμοποιούνται για να φέρουν περισσότερη επιπλέον λειτουργικότητα στο { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Επαναφορά Καρφιτσωμένης Καρτέλας
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Προσθήκη στα Απαραίτητα ({ $num } / 12 θέσεις γεμάτες)
+tab-context-zen-add-essential =
+    .label = Προσθήκη στα Απαραίτητα ({ $num } / { $max } θέσεις γεμάτες)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Αφαίρεση από Απαραίτητα
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Αντικατάσταση καρφιτσωμένου URL με το τρέχον
     .accesskey = C
 zen-themes-corrupted = Το αρχείο { -brand-short-name } mods είναι κατεστραμμένο. Έχει γίνει επαναφορά στο προεπιλεγμένο θέμα.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Η νέα γραμμή URL έχει ενεργοποιηθεί, αφαιρώντας την ανάγκη για σελίδες νέας καρτέλας.<br/><br/>
     Δοκιμάστε να ανοίξετε μια νέα καρτέλα για να δείτε τη νέα γραμμή URL εν δράσει!
 zen-disable = Απενεργοποίηση
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Ελαχιστοποίηση
     .tooltip = Ελαχιστοποίηση
 zen-panel-ui-gradient-generator-custom-color = Προσαρμοσμένο Χρώμα
 zen-panel-ui-gradient-generator-saved-message = Επιτυχής αποθήκευση της διαβάθμισης!
 zen-copy-current-url-confirmation = Το URL έχει αντιγραφεί στο πρόχειρο.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Ακύρωση
-zen-general-confirm = 
+zen-general-confirm =
     .label = Επιβεβαίωση
 zen-pinned-tab-replaced = Το URL της καρφιτσωμένης καρτέλας έχει αντικατασταθεί από το τρέχον URL.
 zen-tabs-renamed = Η καρτέλα μετονομάστηκε επιτυχώς!
 zen-background-tab-opened-toast = Άνοιξε νέα καρτέλα στο παρασκήνιο!
 zen-workspace-renamed-toast = Ο χώρος εργασίας μετονομάστηκε επιτυχώς!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Χώροι
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Μάθετε Περισσότερα
 zen-close-label = Κλείσιμο
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Αναζήτηση...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index f2af54421..aacbfc4da 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = Current profile
 unified-extensions-description = Extensions are used to bring more extra functionality into { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -17,33 +17,33 @@ zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = The new URL bar has been enabled, removing the need for new tab pages. Try opening a new tab to see the new URL bar in action!<br/><br/>
 zen-disable = Disable
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom colour
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 4772e428b..9eb37a583 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -6,7 +6,7 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
 tab-context-zen-remove-essential =
     .label = Remove from Essentials
@@ -88,4 +88,4 @@ zen-site-data-manage-addons =
 zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings =
-    .label = All Site Settings
\ No newline at end of file
+    .label = All Site Settings
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index 19aa9d9ee..e91032ea9 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil actual
 unified-extensions-description = Las extensiones se utilizan para agregar más funcionalidades a { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Restablecer pestaña fijada
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Añadir a esenciales ({ $num } / 12 huecos llenos)
+tab-context-zen-add-essential =
+    .label = Añadir a esenciales ({ $num } / { $max } huecos llenos)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Quitar de esenciales
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Reemplazar la URL fijada con la actual
     .accesskey = C
 zen-themes-corrupted = Su archivo de mods de { -brand-short-name } está dañado. Se ha restablecido el tema por defecto.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Se ha habilitado la nueva barra de direcciones, eliminando la necesidad de la página de nueva pestaña.<br/><br/>
     ¡Pruebe a abrir una nueva pestaña para ver la nueva barra de direcciones en acción!
 zen-disable = Deshabilitar
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimizar
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Color personalizado
 zen-panel-ui-gradient-generator-saved-message = ¡Gradiente guardado con éxito!
 zen-copy-current-url-confirmation = La URL se ha copiado al portapapeles.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancelar
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirmar
 zen-pinned-tab-replaced = La URL de la pestaña fijada se ha reemplazado por la URL actual.
 zen-tabs-renamed = ¡La pestaña se ha renombrado con éxito!
 zen-background-tab-opened-toast = ¡Nueva pestaña abierta en segundo plano!
 zen-workspace-renamed-toast = ¡El espacio de trabajo ha sido renombrado con éxito!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Espacios
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Más información
 zen-close-label = Cerrar
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Buscar...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Iconos
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index 7c4441100..4b2384185 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = praegune profiil
 unified-extensions-description = Laiendusi kasutatakse täiendava funktsionaalsuse lisamiseks { -brand-short-name }i.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Lähtesta püsikaart
     .accesskey = p
-tab-context-zen-add-essential = 
-    .label = Märgi oluliseks ({ $num } / 12 täidetud)
+tab-context-zen-add-essential =
+    .label = Märgi oluliseks ({ $num } / { $max } täidetud)
     .accesskey = o
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Eemalda olulistest
     .accesskey = o
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Asenda püsikaardi URL praegusega
     .accesskey = p
 zen-themes-corrupted = Sinu { -brand-short-name } mods-ide fail on vigane. See on nüüd lähtestatud vaikimisi teemaks.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Uus asukohariba on sisse lülitatud, mistõttu pole enam uue kaardi lehte tarvis.<br/><br/>
     Proovi avada uut kaarti, et näha uut asukohariba!
 zen-disable = Lülita välja
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimeeri
     .tooltip = Minimeeri
 zen-panel-ui-gradient-generator-custom-color = Kohandatud värv
 zen-panel-ui-gradient-generator-saved-message = Värviüleminek on edukalt salvestatud!
 zen-copy-current-url-confirmation = URL kopeeriti lõikelauale.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Tühista
-zen-general-confirm = 
+zen-general-confirm =
     .label = Kinnita
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Kaart on edukalt ümber nimetatud!
 zen-background-tab-opened-toast = Taustal avati uus kaart!
 zen-workspace-renamed-toast = Tööruum on edukalt ümber nimetatud!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Tööruumid
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods-id
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Rohkem teavet
 zen-close-label = Sulge
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Otsi...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojid
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ikoonid
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index 7a046afd4..0cf78364a 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = نمایهٔ کنونی
 unified-extensions-description = افزونه‌های در حال استفاده عملکردهای بیشتری به { -brand-short-name } می‌دهند.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 7330b9882..b2130ac7d 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = nykyinen profiili
 unified-extensions-description = Laajennuksia käytetään tuomaan enemmän ylimääräisiä toimintoja { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Nollaa Kiinnitetty Välilehti
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Poista olennaisista
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Korvaa kiinnitetty URL-osoite nykyisellä
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } modejasi tiedosto on vioittunut. Ne on palautettu oletusteemaan.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Muokattu Väri
 zen-panel-ui-gradient-generator-saved-message = Kaltevuus tallennettu onnistuneesti!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index ac5901c12..a396835a6 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = profil actuel
 unified-extensions-description = Les extensions sont utilisées pour ajouter plus de fonctionnalités à { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Réinitialiser l’onglet épinglé
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Ajouter aux Essentials ({ $num }/12 emplacements occupés)
+tab-context-zen-add-essential =
+    .label = Ajouter aux Essentials ({ $num } / { $max } emplacements occupés)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Retirer des Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Remplacer l’URL épinglée par l’actuelle
     .accesskey = C
 zen-themes-corrupted = Votre fichier de thèmes { -brand-short-name } est corrompu. Il a été réinitialisé au thème par défaut.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     La nouvelle barre d’adresse a été activée, supprimant la nécessité de nouvelles pages d’onglets.<br/><br/>
     Essayez d’ouvrir un nouvel onglet pour voir la nouvelle barre d’adresse en action !
 zen-disable = Désactiver
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimiser
     .tooltip = Minimiser
 zen-panel-ui-gradient-generator-custom-color = Couleur personnalisée
 zen-panel-ui-gradient-generator-saved-message = Le dégradé a été enregistré avec succès !
 zen-copy-current-url-confirmation = L’adresse a été copiée dans le presse-papier.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Annuler
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirmer
 zen-pinned-tab-replaced = L’adresse de l'onglet épinglé a été remplacée par l’adresse actuelle.
 zen-tabs-renamed = L’onglet a été renommé avec succès !
 zen-background-tab-opened-toast = Nouvel onglet ouvert en arrière-plan !
 zen-workspace-renamed-toast = L'espace de travail a été renommé avec succès !
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Espaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = En savoir plus
 zen-close-label = Fermer
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Rechercher...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Émojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icônes
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index eaa94e10a..a21e5633c 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = próifíl reatha
 unified-extensions-description = Úsáidtear síntí chun níos mó feidhmiúlachta breise a thabhairt isteach i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Athshocraigh an Cluaisín Prionáilte
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Cuir le Bunriachtanais ({ $num } / 12 sliotán líonta)
+tab-context-zen-add-essential =
+    .label = Cuir le Bunriachtanais ({ $num } / { $max } sliotán líonta)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Bain de na Bunriachtanais
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Cuir URL Prionáilte in ionad an URL Reatha
     .accesskey = C
 zen-themes-corrupted = Tá do chomhad mods { -brand-short-name } truaillithe. Tá siad athshocraithe chuig an téama réamhshocraithe.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Tá an barra URL nua cumasaithe, rud a fhágann nach bhfuil gá le leathanaigh cluaisín nua.<br/><br/>
     Bain triail as cluaisín nua a oscailt chun an barra URL nua i mbun oibre a fheiceáil!
 zen-disable = Díchumasaigh
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Íoslaghdaigh
     .tooltip = Íoslaghdaigh
 zen-panel-ui-gradient-generator-custom-color = Dath Saincheaptha
 zen-panel-ui-gradient-generator-saved-message = Sábháladh an grádán go rathúil!
 zen-copy-current-url-confirmation = Tá an URL cóipeáilte chuig an ghearrthaisce.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cealaigh
-zen-general-confirm = 
+zen-general-confirm =
     .label = Deimhnigh
 zen-pinned-tab-replaced = Tá URL an chluaisín phinnáilte curtha in ionad an URL reatha!
 zen-tabs-renamed = Athainmníodh an cluaisín go rathúil!
 zen-background-tab-opened-toast = Tá cluaisín cúlra nua oscailte!
 zen-workspace-renamed-toast = Athainmníodh an spás oibre go rathúil!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spásanna
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Modanna
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Foghlaim Tuilleadh
 zen-close-label = Dún
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Cuardaigh...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Deilbhíní
 urlbar-search-mode-zen_actions = Gníomhartha
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index 3522defdb..f51f9b74c 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = פרופיל נוכחי
 unified-extensions-description = הרחבות מוסיפות פונקציונליות נוספת ל{ -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = אפס כרטיסייה מוצמדת
     .accesskey = ר
-tab-context-zen-add-essential = 
-    .label = הוסף לנחוצים ({ $num } / 12 מקומות מלאים)
+tab-context-zen-add-essential =
+    .label = הוסף לנחוצים ({ $num } / { $max } מקומות מלאים)
     .accesskey = ק
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = הסר מנחוצים
     .accesskey = ר
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = החלף קישור מוצמד עם הנוכחי
     .accesskey = ב
 zen-themes-corrupted = קובץ המודים { -brand-short-name } שלך פגום. הם אופסו לנושא ברירת המחדל.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     סרגל הכתובת החדש הופעל, ומסיר את הצורך בעמודי כרטיסייה חדשה.<br/><br/>
     נסה לפתוח כרטיסייה חדשה כדי לראות את סרגל הכתובת החדש בפעולה!
 zen-disable = כבה
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = מזער
     .tooltip = מזער
 zen-panel-ui-gradient-generator-custom-color = צבע מותאם אישית
 zen-panel-ui-gradient-generator-saved-message = מיזוג הצבעים נשמר בהצלחה!
 zen-copy-current-url-confirmation = הקישור הועתק ללוח.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = ביטול
-zen-general-confirm = 
+zen-general-confirm =
     .label = אישור
 zen-pinned-tab-replaced = קישור כרטיסייה מוצמדת הוחלפה עם הקישור הנוכחי.
 zen-tabs-renamed = שם הכרטיסייה שונתה בהצלחה!
 zen-background-tab-opened-toast = לשונית נפתחה ברקע!
 zen-workspace-renamed-toast = שם הסביבת עבודה שונתה בהצלחה!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = סביבות
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = מודים
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = מידע נוסף
 zen-close-label = סגור
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = חיפוש...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = אימוג'ים
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = סמלים
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index a148fdee3..2b21c676e 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = jelenlegi profil
 unified-extensions-description = A bővítmények a { -brand-short-name }-t új funkciókkal látják el.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Kitűzött lap visszaállítása
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Felvétel az alapvetőkbe ({ $num } / 12 hely foglalt)
+tab-context-zen-add-essential =
+    .label = Felvétel az alapvetőkbe ({ $num } / { $max } hely foglalt)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Eltávolítás az alapvetőkből
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Kitűzött lap cseréje a jelenlegi URL-el
     .accesskey = C
 zen-themes-corrupted = A te { -brand-short-name } mod fájljaid károsodtak. Vissza lettek állítva az eredeti témára.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Az új URL sáv engedélyezve lett, így nincs szükség új lapokra.<br/><br/>
     Próbáljon ki egy új lapot nyitni, hogy láthassa az új URL-sávot működés közben!
 zen-disable = Kikapcsolás
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimalizálás
     .tooltip = Minimalizálás
 zen-panel-ui-gradient-generator-custom-color = Egyedi szín
 zen-panel-ui-gradient-generator-saved-message = Színátmenet sikeresen mentve!
 zen-copy-current-url-confirmation = Az URL-cím a vágólapra lett másolva.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Mégsem
-zen-general-confirm = 
+zen-general-confirm =
     .label = Megerősítés
 zen-pinned-tab-replaced = A rögzített lap URL címe helyébe az aktuális URL cím lépett!
 zen-tabs-renamed = A lap sikeresen át lett nevezve!
 zen-background-tab-opened-toast = Új lap megnyitva!
 zen-workspace-renamed-toast = A munkakörnyezet sikeresen át lett nevezve!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Környezetek
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Modok
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Tudjon meg többet
 zen-close-label = Bezárás
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Keresés...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojik
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ikonok
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 1cf6f1395..91bd473d1 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = profil saat ini
 unified-extensions-description = Ekstensi digunakan untuk menambahkan lebih banyak fungsi ekstra ke { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Kembalikan ke URL Awal
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Tambahkan ke Essentials ({ $num } / 12 slot terisi)
+tab-context-zen-add-essential =
+    .label = Tambahkan ke Essentials ({ $num } / { $max } slot terisi)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Hapus dari Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Ganti URL Sematan ke URL saat ini
     .accesskey = C
 zen-themes-corrupted = Tidak dapat memuat file tema { -brand-short-name } Anda karena rusak. File tersebut telah diatur ulang ke tema default.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Bilah URL baru telah diaktifkan, menghapus kebutuhan untuk halaman tab baru.<br/><br/>
     Coba buka tab baru untuk melihat bilah URL baru beraksi!
 zen-disable = Nonaktifkan
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimalkan
     .tooltip = Minimalkan
 zen-panel-ui-gradient-generator-custom-color = Warna Kustom
 zen-panel-ui-gradient-generator-saved-message = Berhasil menyimpan gradien!
 zen-copy-current-url-confirmation = URL telah disalin ke clipboard.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Batalkan
-zen-general-confirm = 
+zen-general-confirm =
     .label = Konfirmasi
 zen-pinned-tab-replaced = URL awal dari tab yang disematkan telah diganti dengan URL saat ini.
 zen-tabs-renamed = Tab telah berhasil diubah namanya!
 zen-background-tab-opened-toast = Tab baru telah terbuka di latar belakang!
 zen-workspace-renamed-toast = Ruang Kerja telah berhasil diubah namanya!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Ruang
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Pelajari Lebih Lanjut
 zen-close-label = Tutup
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Cari...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emoji
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ikon
 urlbar-search-mode-zen_actions = Aksi
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index 47623b075..3b9022555 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = núverandi prófíl
 unified-extensions-description = Viðbætur eru notaðar til að koma með meiri auka virkni inn í { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Endursetja Festan Flipa
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Fjarlægja frá Höfuðatriði
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Setja aftur Fest-URL með Núverandi
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } mods skráin þín er skemmd. Þeir hafa verið endurstilltir á sjálfgefið þema.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Nýja vefslóðastikan hefur verið virkjuð og fjarlægir þörfina á nýjum flipasíðum.<br/><br/>
     Prófaðu að opna nýjan flipa til að sjá nýju vefslóðastikuna í notkun!
 zen-disable = Óvirkja
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Sérsniðinn litur
 zen-panel-ui-gradient-generator-saved-message = Vistað hallann!
 zen-copy-current-url-confirmation = Slóðin hefur verið afrituð á klippiborðið.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Læra Meira
 zen-close-label = Loka
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 888c7622d..8196be8d0 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = profilo in uso
 unified-extensions-description = Le estensioni sono usate per portare più funzionalità in { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Reimposta Scheda Bloccata
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Aggiungi a Essentials ({ $num } / 12 slot riempiti)
+tab-context-zen-add-essential =
+    .label = Aggiungi a Essentials ({ $num } / { $max } slot riempiti)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Rimuovi dagli Essenziali
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Sostituisci URL fissato con quello corrente
     .accesskey = C
 zen-themes-corrupted = Il tuo file { -brand-short-name } mods è danneggiato. Sono stati reimpostati al tema predefinito.
@@ -17,33 +17,33 @@ zen-shortcuts-corrupted = Il file delle scorciatoie per { -brand-short-name } è
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = La nuova barra degli indirizzi è stata abilitata, eliminando la necessità della pagina di una nuova scheda.<br/><br/>Prova ad aprire una nuova scheda per vedere la nuova barra degli indirizzi in azione!
 zen-disable = Disabilita
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimizza
     .tooltip = Minimizza
 zen-panel-ui-gradient-generator-custom-color = Colore Personalizzato
 zen-panel-ui-gradient-generator-saved-message = Gradiente salvato con successo!
 zen-copy-current-url-confirmation = L'URL è stato copiato negli appunti.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Annulla
-zen-general-confirm = 
+zen-general-confirm =
     .label = Conferma
 zen-pinned-tab-replaced = L'URL della scheda bloccata è stato sostituito con l'URL attuale.
 zen-tabs-renamed = La scheda è stata rinominata con successo!
 zen-background-tab-opened-toast = Nuova scheda aperta in background!
 zen-workspace-renamed-toast = Il Workspace è stato rinominato con successo!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spazi
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mod
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Scopri di più
 zen-close-label = Chiudi
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Cerca...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emoji
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icone
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 59134277a..7e107d4c2 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 使用中のプロファイル
 unified-extensions-description = 拡張機能は、 { -brand-short-name } に多くの追加機能をもたらすために使用されます。
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = ピン留めされたタブをリセット
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Essentialsから削除
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = ピン留めされた URL を現在のものに置き換え
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } Modファイルが破損しています。既定のテーマにリセットされました。
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = 無効
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = カスタムカラー
 zen-panel-ui-gradient-generator-saved-message = グラデーションを正常に保存しました！
 zen-copy-current-url-confirmation = URLをクリップボードにコピーしました
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = 閉じる
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 113315eb6..9a1562043 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 현재 프로필
 unified-extensions-description = 확장 프로그램은 { -brand-short-name }에 더 많은 추가 기능을 제공하는 데 사용됩니다.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = 고정된 탭 초기화
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = 에센셜에 추가 ({ $num } / 12 개 추가됨)
+tab-context-zen-add-essential =
+    .label = 에센셜에 추가 ({ $num } / { $max } 개 추가됨)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = 에센셜에서 제거하기
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = 고정된 URL을 현재 URL로 변경
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } 모드 파일이 손상되었습니다. 기본 테마로 재설정되었습니다.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     새 탭 페이지가 필요 없는 새로운 주소 표시줄이 활성화 되었습니다.<br/><br/>
     새 탭을 열어서 새로운 URL 바를 만나보세요!
 zen-disable = 비활성화
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = 최소화
     .tooltip = 최소화
 zen-panel-ui-gradient-generator-custom-color = 커스텀 색상
 zen-panel-ui-gradient-generator-saved-message = 성공적으로 그라데이션을 저장했습니다!
 zen-copy-current-url-confirmation = URL이 복사되었습니다.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = 취소
-zen-general-confirm = 
+zen-general-confirm =
     .label = 확인
 zen-pinned-tab-replaced = 고정 URL이 현재 URL로 변경되었습니다!
 zen-tabs-renamed = 탭의 이름이 성공적으로 변경되었습니다!
 zen-background-tab-opened-toast = 새 백그라운드 탭이 열렸습니다!
 zen-workspace-renamed-toast = 워크스페이스 이름이 변경되었습니다!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = 스페이스
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = 모드
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = 더 알아보기
 zen-close-label = 닫기
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = 검색...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = 이모티콘
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = 아이콘
 urlbar-search-mode-zen_actions = 액션
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index 42606787f..0f9917e65 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = dabartinis profilis
 unified-extensions-description = Plėtiniai naudojami norint į „{ -brand-short-name }“ įtraukti daugiau papildomų funkcijų.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Atkurti prisegtą kortelę
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Įtraukti į būtiniausius ({ $num } / 12 užpildytų vietų)
+tab-context-zen-add-essential =
+    .label = Įtraukti į būtiniausius ({ $num } / { $max } užpildytų vietų)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Šalinti iš būtiniausių
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Pakeisti prisegtą URL adresą dabartiniu
     .accesskey = C
 zen-themes-corrupted = Jūsų „{ -brand-short-name }“ modifikacijos failas sugadintas. Jie buvo atkurti į numatytąją temą.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Įjungta nauja URL juosta, todėl nebereikia naujų kortelių puslapių.<br/><br/>
     Pabandykite atverti naują kortelę, kad pamatytumėte naująją URL juostą!
 zen-disable = Išjungti
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Sumažinti
     .tooltip = Sumažinti
 zen-panel-ui-gradient-generator-custom-color = Pasirinktinė spalva
 zen-panel-ui-gradient-generator-saved-message = Gradientas sėkmingai įrašytas.
 zen-copy-current-url-confirmation = URL buvo nukopijuotas į iškarpinę.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Atšaukti
-zen-general-confirm = 
+zen-general-confirm =
     .label = Patvirtinti
 zen-pinned-tab-replaced = Prisegtos kortelės URL pakeistas dabartiniu URL.
 zen-tabs-renamed = Kortelė sėkmingai pervadinta.
 zen-background-tab-opened-toast = Nauja fonos kortelė atverta.
 zen-workspace-renamed-toast = Darbo sritis sėkmingai pervadintas.
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Erdvės
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Modifikacijos
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Sužinoti daugiau
 zen-close-label = Užverti
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Ieškokite...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Jaustukai
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Piktogramos
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index eb4d83cc8..8e5ba7b49 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = huidig profiel
 unified-extensions-description = Extensies worden gebruikt om extra functionaliteit toe te voegen aan { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Vastgezette tabblad resetten
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Toevoegen aan Essentials ({ $num } / 12 plekken gevuld)
+tab-context-zen-add-essential =
+    .label = Toevoegen aan Essentials ({ $num } / { $max } plekken gevuld)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Verwijderen uit Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Vastgezette URL vervangen met huidige
     .accesskey = C
 zen-themes-corrupted = Je { -brand-short-name } mods bestand is beschadigd. Ze zijn gereset naar het standaard thema.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     De nieuwe URL-balk is ingeschakeld, waardoor nieuwe tabbladen niet meer nodig zijn.<br/><br/>
     Probeer een nieuw tabblad te openen om de nieuwe URL-balk in actie te zien!
 zen-disable = Uitschakelen
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimaliseren
     .tooltip = Minimaliseren
 zen-panel-ui-gradient-generator-custom-color = Aangepaste kleur
 zen-panel-ui-gradient-generator-saved-message = Verloop is succesvol opgeslagen!
 zen-copy-current-url-confirmation = De URL is gekopieerd naar het klembord.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Annuleren
-zen-general-confirm = 
+zen-general-confirm =
     .label = Bevestigen
 zen-pinned-tab-replaced = Vastgemaakte tabblad URL is vervangen met de huidige URL!
 zen-tabs-renamed = Tabblad is succesvol hernoemd!
 zen-background-tab-opened-toast = Nieuw achtergrondtabblad geopend!
 zen-workspace-renamed-toast = Werkruimte succesvol is hernoemd!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Ruimtes
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Meer leren
 zen-close-label = Sluiten
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Zoeken…
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 5a5206e4f..0677b61af 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = current profile
 unified-extensions-description = Extensions are used to bring more extra functionality into { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 2d71e23c4..c74068fb8 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = Aktualny profil
 unified-extensions-description = Rozszerzenia są używane do zapewnienia większej liczby dodatkowych funkcji w { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Resetuj przypiętą kartę
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Dodaj do Niezbędnych ({ $num } / 12 miejsc wypełnione)
+tab-context-zen-add-essential =
+    .label = Dodaj do Niezbędnych ({ $num } / { $max } miejsc wypełnione)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Usuń z Niezbędnych
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Zastąp przypięty adres URL aktualnym
     .accesskey = C
 zen-themes-corrupted = Twój plik modów { -brand-short-name } jest uszkodzony. Zostały one zresetowane do domyślnego stanu.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Nowy pasek adresu został aktywowany, a tym samym strona nowej karty nie jest już potrzebna.<br/><br/>
     Spróbuj otworzyć nową kartę i wypróbuj nowy pasek adresu w akcji!
 zen-disable = Deaktywuj
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Zminimalizuj
     .tooltip = Zminimalizuj
 zen-panel-ui-gradient-generator-custom-color = Niestandardowy kolor
 zen-panel-ui-gradient-generator-saved-message = Pomyślnie zapisano gradient!
 zen-copy-current-url-confirmation = Adres URL został skopiowany do schowka.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Anuluj
-zen-general-confirm = 
+zen-general-confirm =
     .label = Potwierdź
 zen-pinned-tab-replaced = URL przypiętej karty został zastąpiony bieżącym adresem.
 zen-tabs-renamed = Nazwa karty została z powodzeniem zmieniona!
 zen-background-tab-opened-toast = Nowa karta została otworzona w tle!
 zen-workspace-renamed-toast = Zmieniono nazwę Przestrzeni roboczej!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Przestrzenie
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Modyfikacje
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Dowiedz się więcej
 zen-close-label = Zamknij
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Szukaj...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 4b37157b3..dd00db284 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil atual
 unified-extensions-description = As extensões são usadas para trazer mais recursos adicionais para o { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Redefinir Guia Fixada
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Adicionar aos Essenciais ({ $num } / 12 espaços preenchidos)
+tab-context-zen-add-essential =
+    .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Remover dos Essenciais
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Substituir URL da Guia Fixada pela Atual
     .accesskey = C
 zen-themes-corrupted = Seu arquivo de modificações { -brand-short-name } está corrompido. Eles foram redefinidos para o tema padrão.
@@ -17,33 +17,33 @@ zen-shortcuts-corrupted = Seu arquivo de atalhos { -brand-short-name } está cor
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = A nova barra de URL foi ativada, removendo a necessidade de novas páginas de guia.<br/><br/>Tente abrir uma nova guia para ver a nova barra de URL em ação!
 zen-disable = Desativar
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimizar
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Cor Personalizada
 zen-panel-ui-gradient-generator-saved-message = O gradiente foi salvo com sucesso!
 zen-copy-current-url-confirmation = A URL foi copiada para a área de transferência.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancelar
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirmar
 zen-pinned-tab-replaced = A URL da guia fixada foi substituída pela URL atual!
 zen-tabs-renamed = A guia foi renomeada com sucesso!
 zen-background-tab-opened-toast = Nova guia em segundo plano aberta!
 zen-workspace-renamed-toast = A área de trabalho foi renomeada com sucesso!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Espaços
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Saiba Mais
 zen-close-label = Fechar
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Pesquisar...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ícones
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 4963234ac..059e65876 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil atual
 unified-extensions-description = As extensões são usadas para trazer funcionalidades adicionais para o { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Repor o Separador Fixado
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Adicionar aos Essenciais ({ $num }/12 espaços preenchidos)
+tab-context-zen-add-essential =
+    .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Remover dos Essenciais
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Substituir o URL Fixado pelo URL Atual
     .accesskey = C
 zen-themes-corrupted = O seu ficheiro de modificações do { -brand-short-name } está corrompido. Elas foram redefinidas como iguais às do tema padrão.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     A nova barra de URL foi ativada, removendo a necessidade de páginas de novo separador.<br/><br/>
     Experimente abrir um novo separador para ver a nova barra de URL em ação!
 zen-disable = Desativar
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimizar
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Cor personalizada
 zen-panel-ui-gradient-generator-saved-message = Gradiente guardado com sucesso!
 zen-copy-current-url-confirmation = O URL foi copiado para a área de transferência.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancelar
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirmar
 zen-pinned-tab-replaced = O URL do separador fixado foi substituído pelo URL atual.
 zen-tabs-renamed = Nome do separador alterado com sucesso!
 zen-background-tab-opened-toast = Novo separador aberto em segundo plano!
 zen-workspace-renamed-toast = Nome do espaço de trabalho alterado com sucesso!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Espaços
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Modificações
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Saber Mais
 zen-close-label = Fechar
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Pesquisar...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ícones
 urlbar-search-mode-zen_actions = Ações
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 6c80884b7..36a47e9c4 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = текущий профиль
 unified-extensions-description = Расширения дополняют функционал { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Сбросить закреплённую вкладку
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Добавить в важное ({ $num } из 12 слотов заполнено)
+tab-context-zen-add-essential =
+    .label = Добавить в важное ({ $num } из { $num } слотов заполнено)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Удалить из важного
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Заменить закреплённый адрес на текущий
     .accesskey = C
 zen-themes-corrupted = Файл дополнения { -brand-short-name } повреждён. Возвращена тема по умолчанию.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Новая адресная строка активирована, теперь нет необходимости использовать отдельные страницы для новых вкладок.<br/><br/>
     Попробуйте открыть новую вкладку, чтобы увидеть новую адресную строку в действии!
 zen-disable = Выключить
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Свернуть
     .tooltip = Свернуть
 zen-panel-ui-gradient-generator-custom-color = Пользовательский цвет
 zen-panel-ui-gradient-generator-saved-message = Градиент успешно сохранён!
 zen-copy-current-url-confirmation = Ссылка скопирована в буфер обмена.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Отменить
-zen-general-confirm = 
+zen-general-confirm =
     .label = Подтвердить
 zen-pinned-tab-replaced = Адрес закреплённой вкладки заменён на текущий адрес!
 zen-tabs-renamed = Вкладка успешно переименована!
 zen-background-tab-opened-toast = Открыта новая фоновая вкладка!
 zen-workspace-renamed-toast = Пространство успешно переименовано!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Пространства
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Моды
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Узнать больше
 zen-close-label = Закрыть
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Найти...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Эмодзи
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Иконки
 urlbar-search-mode-zen_actions = Действия
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 0ca33f23e..da4a4413f 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = nuvarande profil
 unified-extensions-description = Tillägg används för att få fler extra funktioner i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Återställ Fäst flik
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Lägg till Essentials ({ $num } / 12 platser fyllda)
+tab-context-zen-add-essential =
+    .label = Lägg till Essentials ({ $num } / { $max } platser fyllda)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Ta bort från Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Ersätt fäst fliks URL med nuvarande
     .accesskey = C
 zen-themes-corrupted = Din { -brand-short-name } modds-fil är skadad. De har återställts till standardtemat.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Inaktivera
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimera
     .tooltip = Minimera
 zen-panel-ui-gradient-generator-custom-color = Anpassad färg
 zen-panel-ui-gradient-generator-saved-message = Lyckades spara gradienten!
 zen-copy-current-url-confirmation = Länken har kopierats till urklipp.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Avbryt
-zen-general-confirm = 
+zen-general-confirm =
     .label = Bekräfta
 zen-pinned-tab-replaced = Den fästa flikens URL har ersatts med den aktuella URL!
 zen-tabs-renamed = Fliken har fått nytt namn!
 zen-background-tab-opened-toast = Ny bakgrundsflik öppnad!
 zen-workspace-renamed-toast = Arbetsytan har fått ett nytt namn!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Arbetsytor
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Läs mer
 zen-close-label = Stäng
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Sök...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Ikoner
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 5a5206e4f..0677b61af 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = current profile
 unified-extensions-description = Extensions are used to bring more extra functionality into { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 19ea2def8..cc426d665 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = mevcut profil
 unified-extensions-description = Uzantılar { -brand-short-name } daha fazla işlevsellik kazandırmak için kullanılır.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Sabitlenen Sekmeyi Sıfırla
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Temel Ögelerden Kaldır
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Sabitlenen URL'yi Mevcut ile Değiştir
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } adlı modun dosyaları hatalı. Varsayılan temaya sıfırlandılar.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Yeni sekme sayfalarına ihtiyacı kaldıran yeni URL Bar aktifleşti.<br/><br/>
     Yeni URL bar'ı görmek için yeni bir sekme açın!
 zen-disable = Devre dışı bırak
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Küçült
     .tooltip = Küçült
 zen-panel-ui-gradient-generator-custom-color = Özel Renk
 zen-panel-ui-gradient-generator-saved-message = Renkler başarıyla kaydedildi!
 zen-copy-current-url-confirmation = URL panoya kopyalandı.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Cancel
-zen-general-confirm = 
+zen-general-confirm =
     .label = Onayla
 zen-pinned-tab-replaced = Başa tutturulmuş sekme URL'si, şimdiki URL ile değiştirildi.
 zen-tabs-renamed = Sekme başarıyla yeniden adlandırıldı!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Spaces
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Daha Fazla Bilgi
 zen-close-label = Kapat
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Search...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Emojis
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 64539a461..f4fb27fb8 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = поточний профіль
 unified-extensions-description = Розширення використовуються, щоб додати більше функціональних можливостей до { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Скинути прикріплену вкладку
     .accesskey = Р
-tab-context-zen-add-essential = 
-    .label = Додати до Основного ({ $num } / 12 комірок заповнено)
+tab-context-zen-add-essential =
+    .label = Додати до Основного ({ $num } / { $max } комірок заповнено)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Вилучити з основних елементів
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Замінити закріплений URL на поточний
     .accesskey = C
 zen-themes-corrupted = Ваш файл модифікацій { -brand-short-name } пошкоджено. Вони були скинуті до типової теми.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Увімкнено новий рядок URL-адрес, що усуває потребу в нових сторінках вкладок.<br/><br/>
     Спробуйте відкрити нову вкладку, щоб побачити новий рядок URL-адреси в дії!
 zen-disable = Вимкнути
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Згорнути
     .tooltip = Згорнути
 zen-panel-ui-gradient-generator-custom-color = Власний колір
 zen-panel-ui-gradient-generator-saved-message = Градієнт успішно збережено!
 zen-copy-current-url-confirmation = URL-адресу було скопійовано до буфера обміну.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Скасувати
-zen-general-confirm = 
+zen-general-confirm =
     .label = Підтвердити
 zen-pinned-tab-replaced = URL-адресу закріпленої вкладки замінено на поточну URL-адресу.
 zen-tabs-renamed = Вкладку успішно перейменовано!
 zen-background-tab-opened-toast = Відкрито нову фонову вкладку!
 zen-workspace-renamed-toast = Робочий простір успішно перейменовано!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Простори
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Модифікації
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Дізнатися більше
 zen-close-label = Закрити
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Пошук...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Емоджі
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Значки
 urlbar-search-mode-zen_actions = Дії
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 0c73c7861..7b8cf2c71 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = hồ sơ hiện tại
 unified-extensions-description = Các tiện ích mở rộng được sử dụng để mang thêm tính năng vào { -brand-short-name }.
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = Đặt lại thẻ đã ghim
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Thêm thẻ vào thường trú (đã thêm { $num } / 12 )
+tab-context-zen-add-essential =
+    .label = Thêm thẻ vào thường trú (đã thêm { $num } / { $max } )
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = Loại ra khỏi thẻ thường trú
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = Thay thế đường dường dẫn đã gim với hiện tại
     .accesskey = C
 zen-themes-corrupted = Thư mục chủ đề { -brand-short-name } của bạn đã bị hư, chúng đã được trả về thiết kế gốc.
@@ -19,33 +19,33 @@ zen-new-urlbar-notification =
     Thanh đường dẫn mới đã được kích hoạt, loại bỏ chức năng của trang "thẻ mới". <br/><br/>
     Hãy thử tạo một thể để xem cái "mới" của thành đường dẫn!
 zen-disable = Vô hiệu hóa
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = Thu nhỏ
     .tooltip = Thu nhỏ
 zen-panel-ui-gradient-generator-custom-color = Tùy chỉnh màu sắc
 zen-panel-ui-gradient-generator-saved-message = Lưu tùy chỉnh đổ màu thành công!
 zen-copy-current-url-confirmation = Đường dẫn đã được chép vào bộ nhớ.
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = Hủy
-zen-general-confirm = 
+zen-general-confirm =
     .label = Xác nhận
 zen-pinned-tab-replaced = Đường dẫn trên thẻ gim đã được thay thể bởi đường dẫn hiện tại!
 zen-tabs-renamed = Thẻ đã được đổi tên!
 zen-background-tab-opened-toast = Một thẻ mới đã được mở dưới nền!
 zen-workspace-renamed-toast = Không gian làm việc đã được đổi tên!
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = Không gian làm việc
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = Mods
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Tìm hiểu thêm
 zen-close-label = Đóng
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = Tìm kiếm...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = Biểu cảm
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = Biểu tượng
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index 45bba9c94..f9e5c12f6 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 当前配置
 unified-extensions-description = 扩展用于为 { -brand-short-name } 带来更多额外功能。
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = 重置固定标签页
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = 添加到常驻标签页（已使用 { $num } / 12）
+tab-context-zen-add-essential =
+    .label = 添加到常驻标签页（已使用 { $num } / { $max }）
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = 从常驻标签页中移除
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = 将固定标签页的 URL 替换为当前页面 URL
     .accesskey = C
 zen-themes-corrupted = 您的 { -brand-short-name } 模组文件已损坏。它们已重置为默认主题。
@@ -17,33 +17,33 @@ zen-shortcuts-corrupted = 您的 { -brand-short-name } 快捷键文件已损坏
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = 新的 URL 栏已启用，不再需要新标签页。<br/><br/>打开一个新标签页来试试看新 URL 栏！
 zen-disable = 禁用
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = 最小化
     .tooltip = 最小化
 zen-panel-ui-gradient-generator-custom-color = 自定义颜色
 zen-panel-ui-gradient-generator-saved-message = 渐变保存成功！
 zen-copy-current-url-confirmation = 网址已复制到剪贴板。
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = 取消
-zen-general-confirm = 
+zen-general-confirm =
     .label = 确认
 zen-pinned-tab-replaced = 固定标签页的网址已更新为当前页面网址。
 zen-tabs-renamed = 标签页重命名成功！
 zen-background-tab-opened-toast = 新的后台标签页已打开 ！
 zen-workspace-renamed-toast = 工作区重命名成功！
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = 工作区
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = 模组
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = 了解更多
 zen-close-label = 关闭
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = 搜索…
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = 表情符号
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = 图标集
 urlbar-search-mode-zen_actions = Actions
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index d76f6d1dd..68948379c 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 當前設定檔
 unified-extensions-description = 擴充功能可為 { -brand-short-name } 帶來更多額外功能。
-tab-context-zen-reset-pinned-tab = 
+tab-context-zen-reset-pinned-tab =
     .label = 重置釘選的分頁
     .accesskey = R
-tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / 12 slots filled)
+tab-context-zen-add-essential =
+    .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential = 
+tab-context-zen-remove-essential =
     .label = 從 Essentials 中移除
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current = 
+tab-context-zen-replace-pinned-url-with-current =
     .label = 將釘選的網址換成目前的網址
     .accesskey = C
 zen-themes-corrupted = 你的 { -brand-short-name } 模組文件已損壞，它們已重設為預設主題。
@@ -17,33 +17,33 @@ zen-shortcuts-corrupted = 你的 { -brand-short-name } 快捷文件已損壞。
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = 新的 URL 欄已啟用，你不再需要新增新分頁。<br/><br/>馬上打開新分頁來看看新的 URL 欄！
 zen-disable = 停用
-pictureinpicture-minimize-btn = 
+pictureinpicture-minimize-btn =
     .aria-label = 最小化
     .tooltip = 最小化
 zen-panel-ui-gradient-generator-custom-color = 自訂顏色
 zen-panel-ui-gradient-generator-saved-message = 已成功儲存漸層！
 zen-copy-current-url-confirmation = 網址已複製到剪貼簿。
-zen-general-cancel-label = 
+zen-general-cancel-label =
     .label = 取消
-zen-general-confirm = 
+zen-general-confirm =
     .label = 確認
 zen-pinned-tab-replaced = 釘選分頁網址已替換為當前當前網址。
 zen-tabs-renamed = 已成功重新命名分頁！
 zen-background-tab-opened-toast = 已在背景開啟新分頁！
 zen-workspace-renamed-toast = 已成功重新命名工作區！
-zen-library-sidebar-workspaces = 
+zen-library-sidebar-workspaces =
     .label = 工作區
-zen-library-sidebar-mods = 
+zen-library-sidebar-mods =
     .label = 模組
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = 瞭解更多
 zen-close-label = 關閉
-zen-singletoolbar-urlbar-placeholder-with-name = 
+zen-singletoolbar-urlbar-placeholder-with-name =
     .placeholder = 搜尋...
-zen-icons-picker-emoji = 
+zen-icons-picker-emoji =
     .label = 表情符號
-zen-icons-picker-svg = 
+zen-icons-picker-svg =
     .label = 圖示
 urlbar-search-mode-zen_actions = 操作
diff --git a/prefs/zen.yaml b/prefs/zen.yaml
index 71744da42..469622931 100644
--- a/prefs/zen.yaml
+++ b/prefs/zen.yaml
@@ -11,6 +11,9 @@
 - name: zen.tabs.rename-tabs
   value: true
 
+- name: zen.tabs.essentials.max
+  value: 12
+
 - name: zen.tabs.show-newtab-vertical
   value: true
 
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index f6e7b44f5..a33df17d0 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -38,6 +38,12 @@
         'zen.pinned-tab-manager.close-shortcut-behavior',
         'switch'
       );
+      XPCOMUtils.defineLazyPreferenceGetter(
+        lazy,
+        'zenTabsEssentialsMax',
+        'zen.tabs.essentials.max',
+        12
+      );
       ChromeUtils.defineESModuleGetters(lazy, {
         E10SUtils: 'resource://gre/modules/E10SUtils.sys.mjs',
       });
@@ -68,8 +74,6 @@
   }
 
   class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
-    MAX_ESSENTIALS_TABS = 12;
-
     hasInitializedPins = false;
     promiseInitializedPinned = new Promise((resolve) => {
       this._resolvePinnedInitializedInternal = resolve;
@@ -140,6 +144,10 @@
       return !gZenWorkspaces.privateWindowOrDisabled;
     }
 
+    get maxEssentialTabs() {
+      return lazy.zenTabsEssentialsMax;
+    }
+
     async refreshPinnedTabs({ init = false } = {}) {
       if (!this.enabled) {
         return;
@@ -1055,7 +1063,7 @@
       const element = window.MozXULElement.parseXULToFragment(`
             <menuitem id="context_zen-add-essential"
                       data-l10n-id="tab-context-zen-add-essential"
-                      data-l10n-args='{"num": "0"}'
+                      data-l10n-args='{"num": "0", "max": "12"}'
                       hidden="true"
                       disabled="true"
                       command="cmd_contextZenAddToEssentials"/>
@@ -1081,6 +1089,7 @@
         contextTab.getAttribute('zen-essential') || !!contextTab.group;
       document.l10n.setArgs(document.getElementById('context_zen-add-essential'), {
         num: gBrowser._numZenEssentials,
+        max: this.maxEssentialTabs,
       });
       document
         .getElementById('cmd_contextZenAddToEssentials')
@@ -1404,7 +1413,7 @@
           (tab.getAttribute('usercontextid') || 0) !=
             gZenWorkspaces.getActiveWorkspaceFromCache().containerTabId &&
           gZenWorkspaces.containerSpecificEssentials
-        ) && gBrowser._numZenEssentials < this.MAX_ESSENTIALS_TABS
+        ) && gBrowser._numZenEssentials < this.maxEssentialTabs
       );
     }
 

From 94790623588ad3edba30f0ed87b76b94afd7c548 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 8 Oct 2025 12:50:30 +0200
Subject: [PATCH 047/111] feat: Reset hover ignore when not animating compact
 mode, b=no-bug, c=tabs, compact-mode

---
 locales/en-US/browser/browser/zen-vertical-tabs.ftl | 2 ++
 src/zen/compact-mode/ZenCompactMode.mjs             | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/locales/en-US/browser/browser/zen-vertical-tabs.ftl b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
index 55e88d913..1a40fa77a 100644
--- a/locales/en-US/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
@@ -3,6 +3,8 @@ zen-toolbar-context-tabs-right =
     .label = Tabs on the right
     .accesskey = R
 
+zen-toolbar-context-compact-mode =
+    .label = Compact Mode
 zen-toolbar-context-compact-mode-enable =
     .label = Enable compact mode
     .accesskey = D
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 021981169..b44816e20 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -339,6 +339,8 @@ var gZenCompactModeManager = {
           this.getAndApplySidebarWidth({});
           this._ignoreNextResize = true;
 
+          delete this._ignoreNextHover;
+
           resolve();
           return;
         }
@@ -577,7 +579,8 @@ var gZenCompactModeManager = {
             if (
               document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
               this._hasHoveredUrlbar ||
-              this._ignoreNextHover
+              this._ignoreNextHover ||
+              target.hasAttribute('zen-has-hover')
             ) {
               return;
             }

From 3b58806c8a8bac5dfe4199310899d34121f6493b Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 8 Oct 2025 13:38:16 +0200
Subject: [PATCH 048/111] fix: Fixed freezing when opening external links,
 b=bug #10666, c=workspaces

---
 src/zen/workspaces/ZenWorkspaces.mjs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index bbb01f5ee..ceac62ff7 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2563,7 +2563,9 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
         this._lastSelectedWorkspaceTabs[workspaceID] = gZenGlanceManager.getTabOrGlanceParent(tab);
         tab.removeAttribute('change-workspace');
         const workspace = this.getWorkspaceFromId(workspaceID);
-        await this.changeWorkspace(workspace);
+        setTimeout(() => {
+          this.changeWorkspace(workspace);
+        }, 0);
       }
       return;
     }

From faa820e99272f163d8b6d1009c8e112a2ba015c9 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 8 Oct 2025 14:02:41 +0200
Subject: [PATCH 049/111] fix: Fixed copact mode not hiding sometimes, b=closes
 #10414, c=compact-mode

---
 src/zen/compact-mode/ZenCompactMode.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index b44816e20..fe784cc26 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -622,7 +622,7 @@ var gZenCompactModeManager = {
           }
 
           if (
-            event.explicitOriginalTarget.closest('#urlbar[zen-floating-urlbar]') ||
+            event.explicitOriginalTarget?.closest?.('#urlbar[zen-floating-urlbar]') ||
             (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' &&
               gZenVerticalTabsManager._hasSetSingleToolbar) ||
             this._hasHoveredUrlbar ||

From cc502f6c956c0596ee0b2d90f7e3aae69dc4dc6a Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 8 Oct 2025 14:50:26 +0200
Subject: [PATCH 050/111] fix: Fixed compact mode animation not resolving on
 double toolbar, b=no-bug, c=compact-mode

---
 src/zen/compact-mode/ZenCompactMode.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index fe784cc26..58c6f4b07 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -443,6 +443,7 @@ var gZenCompactModeManager = {
         } else {
           this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
           document.documentElement.removeAttribute('zen-compact-animating');
+          resolve();
         }
       });
     });

From 4bfb815297c62ae684c63762d2fecf2823482a1e Mon Sep 17 00:00:00 2001
From: Aryan Rawlani <44131905+aryanrawlani28@users.noreply.github.com>
Date: Wed, 8 Oct 2025 21:11:25 +0530
Subject: [PATCH 051/111] =?UTF-8?q?feat:=20settings=20->=20shortcuts:=20sh?=
 =?UTF-8?q?ow=20conflicting=20shortcut=C2=A0label,=20p=3D#10735?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 .../components/preferences/zen-settings.js    | 31 ++++++++++++++-----
 src/zen/kbs/ZenKeyboardShortcuts.mjs          |  9 ++++--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
index 6d400ca0e..43f48460d 100644
--- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
@@ -89,7 +89,7 @@ zen-settings-workspaces-hide-default-container-indicator =
     .label = Hide the default container indicator in the tab bar
 
 zen-key-unsaved = Unsaved shortcut! Please save it by clicking the "Escape" key after retyping it.
-zen-key-conflict = Conflict with another shortcut
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 
 pane-zen-theme-title = Theme Settings
 
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index b37ba5dcb..553ddc109 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -973,7 +973,7 @@ var gZenCKSSettings = {
       this._latestValidKey = null;
       return;
     } else if (shortcut == 'Escape' && !modifiersActive) {
-      const hasConflicts = gZenKeyboardShortcutsManager.checkForConflicts(
+      const { hasConflicts, conflictShortcut } = gZenKeyboardShortcutsManager.checkForConflicts(
         this._latestValidKey ? this._latestValidKey : shortcut,
         this._latestModifier ? this._latestModifier : modifiers,
         this._currentActionID
@@ -986,12 +986,29 @@ var gZenCKSSettings = {
           input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
         }
         input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
-        if (hasConflicts && !input.nextElementSibling) {
-          input.after(
-            window.MozXULElement.parseXULToFragment(`
-            <label class="${ZEN_CKS_CLASS_BASE}-conflict" data-l10n-id="zen-key-conflict"></label>
-          `)
-          );
+
+        if (hasConflicts) {
+          const shortcutL10nKey =
+            zenMissingKeyboardShortcutL10n[conflictShortcut.getID()] ??
+            conflictShortcut.getL10NID();
+
+          const [group, shortcut] = await document.l10n.formatValues([
+            { id: `${ZEN_CKS_GROUP_PREFIX}-${conflictShortcut.getGroup()}` },
+            { id: shortcutL10nKey },
+          ]);
+
+          if (!input.nextElementSibling) {
+            input.after(
+              window.MozXULElement.parseXULToFragment(`
+                <label class="${ZEN_CKS_CLASS_BASE}-conflict" data-l10n-id="zen-key-conflict"></label>
+              `)
+            );
+          }
+
+          document.l10n.setAttributes(input.nextElementSibling, 'zen-key-conflict', {
+            group: group ?? '',
+            shortcut: shortcut ?? '',
+          });
         }
       } else {
         input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index ad7a7c5f4..0fb29b239 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -1343,11 +1343,16 @@ var gZenKeyboardShortcutsManager = {
         targetShortcut.getModifiers().equals(modifiers) &&
         targetShortcut.getKeyNameOrCode()?.toLowerCase() == realShortcut
       ) {
-        return true;
+        return {
+          hasConflicts: true,
+          conflictShortcut: targetShortcut,
+        };
       }
     }
 
-    return false;
+    return {
+      hasConflicts: false,
+    };
   },
 
   getShortcutFromCommand(command) {

From 1b8e492f63f348801bc3f6f8bea1ca8894dcff5c Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 8 Oct 2025 18:44:37 +0200
Subject: [PATCH 052/111] feat: Added protection toggle for the site data
 panel, b=no-bug, c=common

---
 locales/en-US/browser/browser/zen-general.ftl |   5 +
 prefs/browser.yaml                            |   1 +
 .../content/browser-siteIdentity-js.patch     |  18 ++-
 .../BrowserContentHandler-sys-mjs.patch       |  12 --
 src/browser/themes/shared/zen-icons/icons.css |   5 +-
 src/zen/common/ZenUIMigration.sys.mjs         |   6 +-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       | 127 +++++++++++++++++-
 7 files changed, 149 insertions(+), 25 deletions(-)
 delete mode 100644 src/browser/components/BrowserContentHandler-sys-mjs.patch

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 9eb37a583..37a35a77b 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -89,3 +89,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings =
     .label = All Site Settings
+
+zen-site-data-setting-site-protection = Site Protection
+
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/prefs/browser.yaml b/prefs/browser.yaml
index 30aa603e9..7c8c8dfcd 100644
--- a/prefs/browser.yaml
+++ b/prefs/browser.yaml
@@ -78,6 +78,7 @@
   value: false
 
 - name: browser.tabs.groups.hoverPreview.enabled
+  locked: true
   value: false
 
 - name: browser.tabs.closeWindowWithLastTab
diff --git a/src/browser/base/content/browser-siteIdentity-js.patch b/src/browser/base/content/browser-siteIdentity-js.patch
index 0da25c7ce..ac751474b 100644
--- a/src/browser/base/content/browser-siteIdentity-js.patch
+++ b/src/browser/base/content/browser-siteIdentity-js.patch
@@ -1,8 +1,20 @@
 diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
-index 65354e0ad3097e10de72f36e257c94472524baf7..bc9527ec9ddfab11c0839398d3f3953872ad9632 100644
+index 65354e0ad3097e10de72f36e257c94472524baf7..866cf5672f30f81a1d8e061c9af0c1af5fbb5fb2 100644
 --- a/browser/base/content/browser-siteIdentity.js
 +++ b/browser/base/content/browser-siteIdentity.js
-@@ -834,7 +834,7 @@ var gIdentityHandler = {
+@@ -453,11 +453,6 @@ var gIdentityHandler = {
+     // avoid a pretty ugly transition. Also hide it even
+     // if the update resulted in no site data, to keep the
+     // illusion that clicking the button had an effect.
+-    let hidden = new Promise(c => {
+-      this._identityPopup.addEventListener("popuphidden", c, { once: true });
+-    });
+-    PanelMultiView.hidePopup(this._identityPopup);
+-    await hidden;
+ 
+     let baseDomain = SiteDataManager.getBaseDomainFromHost(this._uri.host);
+     if (SiteDataManager.promptSiteDataRemoval(window, [baseDomain])) {
+@@ -834,7 +829,7 @@ var gIdentityHandler = {
        // This is a secure internal Firefox page.
        this._identityBox.className = "chromeUI";
        let brandBundle = document.getElementById("bundle_brand");
@@ -11,7 +23,7 @@ index 65354e0ad3097e10de72f36e257c94472524baf7..bc9527ec9ddfab11c0839398d3f39538
      } else if (this._pageExtensionPolicy) {
        // This is a WebExtension page.
        this._identityBox.className = "extensionPage";
-@@ -1163,6 +1163,12 @@ var gIdentityHandler = {
+@@ -1163,6 +1158,12 @@ var gIdentityHandler = {
        }
      }
  
diff --git a/src/browser/components/BrowserContentHandler-sys-mjs.patch b/src/browser/components/BrowserContentHandler-sys-mjs.patch
deleted file mode 100644
index 4d2cdfa8f..000000000
--- a/src/browser/components/BrowserContentHandler-sys-mjs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index aeb53582c895d3d495dca2702da3043cf761714c..86859f25ac9c0cb20da24d1f84775f99c9092016 100644
---- a/browser/components/BrowserContentHandler.sys.mjs
-+++ b/browser/components/BrowserContentHandler.sys.mjs
-@@ -1276,6 +1276,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
-       ".avif",
-       ".htm",
-       ".html",
-+      ".jxl",
-       ".pdf",
-       ".shtml",
-       ".xht",
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index e5c7002bd..0acac3084 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -327,7 +327,8 @@
 #urlbar-input-container[pageproxystate='valid']
   > #tracking-protection-icon-container
   > #tracking-protection-icon-box
-  > #tracking-protection-icon {
+  > #tracking-protection-icon,
+.zen-permission-shield-icon {
   list-style-image: url('tracking-protection.svg') !important;
 }
 
@@ -481,7 +482,7 @@
 }
 
 #identity-permission-box,
-#identity-box:not([pageproxystate='invalid']) #identity-icon-box,
+#identity-box:not([pageproxystate='invalid']) #identity-icon-box:not([open]),
 #identity-box[pageproxystate='invalid'] #zen-site-data-icon-button {
   display: none !important;
 }
diff --git a/src/zen/common/ZenUIMigration.sys.mjs b/src/zen/common/ZenUIMigration.sys.mjs
index 52fba005d..c073c59c5 100644
--- a/src/zen/common/ZenUIMigration.sys.mjs
+++ b/src/zen/common/ZenUIMigration.sys.mjs
@@ -6,7 +6,7 @@ const { AppConstants } = ChromeUtils.importESModule('resource://gre/modules/AppC
 
 class nsZenUIMigration {
   PREF_NAME = 'zen.ui.migration.version';
-  MIGRATION_VERSION = 4;
+  MIGRATION_VERSION = 5;
 
   init(isNewProfile) {
     if (!isNewProfile) {
@@ -85,6 +85,10 @@ class nsZenUIMigration {
       Services.prefs.getBoolPref('zen.theme.use-sysyem-colors', false)
     );
   }
+
+  _migrateV5() {
+    Services.prefs.setBoolPref('zen.site-data-panel.show-callout', true);
+  }
 }
 
 export var gZenUIMigration = new nsZenUIMigration();
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index c42bd84d0..4ceab2229 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -4,9 +4,16 @@
 
 import { AppConstants } from 'resource://gre/modules/AppConstants.sys.mjs';
 
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  FeatureCallout: 'resource:///modules/asrouter/FeatureCallout.sys.mjs',
+});
+
 export class nsZenSiteDataPanel {
   #iconMap = {
     install: 'extension',
+    'site-protection': 'shield',
   };
 
   constructor(window) {
@@ -25,7 +32,7 @@ export class nsZenSiteDataPanel {
       </box>
     `);
     this.anchor = button.querySelector('#zen-site-data-icon-button');
-    this.document.getElementById('identity-icon-box').after(button);
+    this.document.getElementById('identity-icon-box').before(button);
     this.window.gUnifiedExtensions._button = this.anchor;
 
     this.document
@@ -36,6 +43,7 @@ export class nsZenSiteDataPanel {
     this.document.getElementById('unified-extensions-panel-template').remove();
 
     this.#initEventListeners();
+    this.#maybeShowFeatureCallout();
   }
 
   #initEventListeners() {
@@ -159,7 +167,7 @@ export class nsZenSiteDataPanel {
       permissions
         .map(function (permission) {
           let [id, key] = permission.id.split(SitePermissions.PERM_KEY_DELIMITER);
-          if (id == '3rdPartyFrameStorage') {
+          if (id == '3rdPartyFrameStorage' || id == '3rdPartyStorage') {
             return key;
           }
           return null;
@@ -237,6 +245,20 @@ export class nsZenSiteDataPanel {
       }
     }
 
+    // Add site protection permissions if needed.
+    const { gProtectionsHandler } = this.window;
+    if (
+      gBrowser.currentURI.schemeIs('http') ||
+      gBrowser.currentURI.schemeIs('https') ||
+      gBrowser.currentURI.schemeIs('ftp')
+    ) {
+      permissions.push({
+        id: 'site-protection',
+        state: gProtectionsHandler.hasException ? SitePermissions.BLOCK : SitePermissions.ALLOW,
+        scope: SitePermissions.SCOPE_PERSISTENT,
+      });
+    }
+
     list.innerHTML = '';
     for (let permission of permissions) {
       let [id, key] = permission.id.split(SitePermissions.PERM_KEY_DELIMITER);
@@ -307,10 +329,11 @@ export class nsZenSiteDataPanel {
     nameLabel.setAttribute('flex', '1');
     nameLabel.setAttribute('class', 'permission-popup-permission-label');
     let label = SitePermissions.getPermissionLabel(permission.id);
-    if (label === null) {
-      return null;
+    if (label) {
+      nameLabel.textContent = label;
+    } else {
+      this.document.l10n.setAttributes(nameLabel, 'zen-site-data-setting-' + idNoSuffix);
     }
-    nameLabel.textContent = label;
     labelContainer.appendChild(nameLabel);
 
     let stateLabel = this.document.createXULElement('label');
@@ -338,7 +361,7 @@ export class nsZenSiteDataPanel {
         break;
       }
       case 'zen-site-data-security-info': {
-        this.window.displaySecurityInfo();
+        this.window.gIdentityHandler._openPopup(event);
         break;
       }
       case 'zen-site-data-actions': {
@@ -399,7 +422,16 @@ export class nsZenSiteDataPanel {
         return;
     }
 
-    SitePermissions.setForPrincipal(gBrowser.contentPrincipal, permission.id, newState);
+    if (permission.id === 'site-protection') {
+      const { gProtectionsHandler } = this.window;
+      if (newState === SitePermissions.BLOCK) {
+        gProtectionsHandler.disableForCurrentPage();
+      } else {
+        gProtectionsHandler.enableForCurrentPage();
+      }
+    } else {
+      SitePermissions.setForPrincipal(gBrowser.contentPrincipal, permission.id, newState);
+    }
 
     label.parentNode.setAttribute('state', newState == SitePermissions.ALLOW ? 'allow' : 'block');
     label
@@ -445,4 +477,85 @@ export class nsZenSiteDataPanel {
         break;
     }
   }
+
+  async #maybeShowFeatureCallout() {
+    const kPref = 'zen.site-data-panel.show-callout';
+    if (!Services.prefs.getBoolPref(kPref, false)) {
+      return;
+    }
+    Services.prefs.setBoolPref(kPref, false);
+    const { FeatureCallout } = lazy;
+    const { gBrowser, gZenWorkspaces } = this.window;
+    await gZenWorkspaces.promiseInitialized;
+    await new Promise((resolve) => {
+      const checkEmptyTab = () => {
+        if (!gBrowser.selectedTab.hasAttribute('zen-empty-tab')) {
+          resolve();
+          return;
+        }
+        this.window.addEventListener('TabSelect', checkEmptyTab, { once: true });
+      };
+      checkEmptyTab();
+    });
+    this.anchor.setAttribute('open', 'true');
+    const callout = new FeatureCallout({
+      win: this.window,
+      location: 'chrome',
+      context: 'chrome',
+      browser: gBrowser.selectedBrowser,
+      theme: { preset: 'chrome' },
+    });
+    this.window.setTimeout(() => {
+      callout.showFeatureCallout({
+        id: 'ZEN_EXTENSIONS_PANEL_MOVE_CALLOUT',
+        template: 'feature_callout',
+        groups: ['cfr'],
+        content: {
+          id: 'ZEN_EXTENSIONS_PANEL_MOVE_CALLOUT',
+          template: 'multistage',
+          backdrop: 'transparent',
+          transitions: false,
+          screens: [
+            {
+              id: 'ZEN_EXTENSIONS_PANEL_MOVE_CALLOUT_HORIZONTAL',
+              anchors: [
+                {
+                  selector: '#zen-site-data-icon-button',
+                  panel_position: {
+                    anchor_attachment: 'bottomcenter',
+                    callout_attachment: 'topleft',
+                  },
+                },
+                {
+                  selector: '#identity-icon-box',
+                  panel_position: {
+                    anchor_attachment: 'bottomcenter',
+                    callout_attachment: 'topleft',
+                  },
+                },
+              ],
+              content: {
+                position: 'callout',
+                width: '355px',
+                padding: 16,
+                title: {
+                  string_id: 'zen-site-data-panel-feature-callout-title',
+                },
+                subtitle: {
+                  string_id: 'zen-site-data-panel-feature-callout-subtitle',
+                },
+                dismiss_button: {
+                  action: {
+                    dismiss: true,
+                  },
+                  background: true,
+                  size: 'small',
+                },
+              },
+            },
+          ],
+        },
+      });
+    }, 500);
+  }
 }

From 76086479ed4f873a75c7812cdd5917b19c0e74ff Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 9 Oct 2025 00:26:26 +0200
Subject: [PATCH 053/111] chore: Bump twilight version, b=no-bug,
 c=no-component

---
 surfer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/surfer.json b/surfer.json
index 2614839b2..9b19fc205 100644
--- a/surfer.json
+++ b/surfer.json
@@ -39,7 +39,7 @@
       "brandShortName": "Twilight",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.16t",
+        "displayVersion": "1.17t",
         "github": {
           "repo": "zen-browser/desktop"
         }

From 0ce9704eeef326142f94c54c16a481bf46f3f28b Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 9 Oct 2025 00:27:40 +0200
Subject: [PATCH 054/111] chore: New Crowdin updates, p=#10742

* New translations zen-general.ftl (French)

* New translations zen-general.ftl (Chinese Simplified)

* New translations zen-general.ftl (Chinese Traditional)

* New translations zen-vertical-tabs.ftl (Chinese Simplified)

* New translations zen-vertical-tabs.ftl (Chinese Traditional)

* New translations zen-workspaces.ftl (French)

* New translations zen-workspaces.ftl (Chinese Simplified)

* New translations zen-workspaces.ftl (Chinese Traditional)

* New translations zen-preferences.ftl (French)

* New translations zen-preferences.ftl (Spanish)

* New translations zen-preferences.ftl (Arabic)

* New translations zen-preferences.ftl (Catalan)

* New translations zen-preferences.ftl (Czech)

* New translations zen-preferences.ftl (Danish)

* New translations zen-preferences.ftl (German)

* New translations zen-preferences.ftl (Greek)

* New translations zen-preferences.ftl (Finnish)

* New translations zen-preferences.ftl (Irish)

* New translations zen-preferences.ftl (Hebrew)

* New translations zen-preferences.ftl (Hungarian)

* New translations zen-preferences.ftl (Italian)

* New translations zen-preferences.ftl (Japanese)

* New translations zen-preferences.ftl (Korean)

* New translations zen-preferences.ftl (Lithuanian)

* New translations zen-preferences.ftl (Dutch)

* New translations zen-preferences.ftl (Polish)

* New translations zen-preferences.ftl (Portuguese)

* New translations zen-preferences.ftl (Russian)

* New translations zen-preferences.ftl (Swedish)

* New translations zen-preferences.ftl (Turkish)

* New translations zen-preferences.ftl (Ukrainian)

* New translations zen-preferences.ftl (Chinese Simplified)

* New translations zen-preferences.ftl (Chinese Traditional)

* New translations zen-preferences.ftl (Vietnamese)

* New translations zen-preferences.ftl (Icelandic)

* New translations zen-preferences.ftl (Portuguese, Brazilian)

* New translations zen-preferences.ftl (Indonesian)

* New translations zen-preferences.ftl (Persian)

* New translations zen-preferences.ftl (Thai)

* New translations zen-preferences.ftl (Norwegian Nynorsk)

* New translations zen-preferences.ftl (Estonian)

* New translations zen-preferences.ftl (English, United Kingdom)

* New translations zen-preferences.ftl (Welsh)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Arabic)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Czech)

* New translations zen-general.ftl (Danish)

* New translations zen-general.ftl (German)

* New translations zen-general.ftl (Greek)

* New translations zen-general.ftl (Finnish)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hebrew)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Italian)

* New translations zen-general.ftl (Japanese)

* New translations zen-general.ftl (Korean)

* New translations zen-general.ftl (Lithuanian)

* New translations zen-general.ftl (Dutch)

* New translations zen-general.ftl (Polish)

* New translations zen-general.ftl (Portuguese)

* New translations zen-workspaces.ftl (Spanish)

* New translations zen-workspaces.ftl (Arabic)

* New translations zen-workspaces.ftl (Catalan)

* New translations zen-workspaces.ftl (Czech)

* New translations zen-workspaces.ftl (Danish)

* New translations zen-workspaces.ftl (German)

* New translations zen-workspaces.ftl (Greek)

* New translations zen-workspaces.ftl (Finnish)

* New translations zen-workspaces.ftl (Irish)

* New translations zen-workspaces.ftl (Hebrew)

* New translations zen-workspaces.ftl (Hungarian)

* New translations zen-workspaces.ftl (Italian)

* New translations zen-workspaces.ftl (Japanese)

* New translations zen-workspaces.ftl (Korean)

* New translations zen-workspaces.ftl (Lithuanian)

* New translations zen-workspaces.ftl (Dutch)

* New translations zen-workspaces.ftl (Polish)

* New translations zen-workspaces.ftl (Portuguese)

* New translations zen-workspaces.ftl (Russian)

* New translations zen-workspaces.ftl (Swedish)

* New translations zen-workspaces.ftl (Turkish)

* New translations zen-workspaces.ftl (Ukrainian)

* New translations zen-workspaces.ftl (Vietnamese)

* New translations zen-workspaces.ftl (Icelandic)

* New translations zen-workspaces.ftl (Portuguese, Brazilian)

* New translations zen-workspaces.ftl (Indonesian)

* New translations zen-workspaces.ftl (Persian)

* New translations zen-workspaces.ftl (Thai)

* New translations zen-workspaces.ftl (Norwegian Nynorsk)

* New translations zen-workspaces.ftl (Estonian)

* New translations zen-workspaces.ftl (English, United Kingdom)

* New translations zen-workspaces.ftl (Welsh)

* New translations zen-general.ftl (Russian)

* New translations zen-general.ftl (Swedish)

* New translations zen-general.ftl (Turkish)

* New translations zen-general.ftl (Ukrainian)

* New translations zen-general.ftl (Vietnamese)

* New translations zen-general.ftl (Icelandic)

* New translations zen-general.ftl (Portuguese, Brazilian)

* New translations zen-general.ftl (Indonesian)

* New translations zen-general.ftl (Persian)

* New translations zen-general.ftl (Thai)

* New translations zen-general.ftl (Norwegian Nynorsk)

* New translations zen-general.ftl (Estonian)

* New translations zen-general.ftl (English, United Kingdom)

* New translations zen-general.ftl (Welsh)

* New translations zen-split-view.ftl (Russian)

* New translations zen-vertical-tabs.ftl (French)

* New translations zen-vertical-tabs.ftl (Spanish)

* New translations zen-vertical-tabs.ftl (Arabic)

* New translations zen-vertical-tabs.ftl (Catalan)

* New translations zen-vertical-tabs.ftl (Czech)

* New translations zen-vertical-tabs.ftl (Danish)

* New translations zen-vertical-tabs.ftl (German)

* New translations zen-vertical-tabs.ftl (Greek)

* New translations zen-vertical-tabs.ftl (Finnish)

* New translations zen-vertical-tabs.ftl (Irish)

* New translations zen-vertical-tabs.ftl (Hebrew)

* New translations zen-vertical-tabs.ftl (Hungarian)

* New translations zen-vertical-tabs.ftl (Italian)

* New translations zen-vertical-tabs.ftl (Japanese)

* New translations zen-vertical-tabs.ftl (Korean)

* New translations zen-vertical-tabs.ftl (Lithuanian)

* New translations zen-vertical-tabs.ftl (Dutch)

* New translations zen-vertical-tabs.ftl (Polish)

* New translations zen-vertical-tabs.ftl (Portuguese)

* New translations zen-vertical-tabs.ftl (Russian)

* New translations zen-vertical-tabs.ftl (Swedish)

* New translations zen-vertical-tabs.ftl (Turkish)

* New translations zen-vertical-tabs.ftl (Ukrainian)

* New translations zen-vertical-tabs.ftl (Vietnamese)

* New translations zen-vertical-tabs.ftl (Icelandic)

* New translations zen-vertical-tabs.ftl (Portuguese, Brazilian)

* New translations zen-vertical-tabs.ftl (Indonesian)

* New translations zen-vertical-tabs.ftl (Persian)

* New translations zen-vertical-tabs.ftl (Thai)

* New translations zen-vertical-tabs.ftl (Norwegian Nynorsk)

* New translations zen-vertical-tabs.ftl (Estonian)

* New translations zen-vertical-tabs.ftl (English, United Kingdom)

* New translations zen-vertical-tabs.ftl (Welsh)

* New translations zen-folders.ftl (Hebrew)

* New translations zen-folders.ftl (Italian)

* New translations zen-folders.ftl (Lithuanian)
---
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/ar/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../ar/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/ar/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  6 +-
 locales/ca/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../ca/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/ca/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  8 +--
 locales/cs/browser/browser/zen-general.ftl    | 50 +++++++++++-----
 .../cs/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/cs/browser/browser/zen-workspaces.ftl |  4 +-
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/cy/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../cy/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/cy/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/da/browser/browser/zen-general.ftl    | 50 +++++++++++-----
 .../da/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/da/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/de/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../de/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/de/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/el/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../el/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/el/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/en-GB/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../en-GB/browser/browser/zen-workspaces.ftl  |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/es-ES/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../es-ES/browser/browser/zen-workspaces.ftl  |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/et/browser/browser/zen-general.ftl    | 50 +++++++++++-----
 .../et/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/et/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/fa/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../fa/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/fa/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/fi/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../fi/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/fi/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/fr/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../fr/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/fr/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/ga-IE/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../ga-IE/browser/browser/zen-workspaces.ftl  |  2 +
 .../browser/preferences/zen-preferences.ftl   | 12 ++--
 locales/he/browser/browser/zen-folders.ftl    |  2 +-
 locales/he/browser/browser/zen-general.ftl    | 50 +++++++++++-----
 .../he/browser/browser/zen-vertical-tabs.ftl  |  3 +-
 locales/he/browser/browser/zen-workspaces.ftl |  4 +-
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/hu/browser/browser/zen-general.ftl    | 50 +++++++++++-----
 .../hu/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/hu/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/id/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../id/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/id/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/is/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../is/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/is/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   | 10 ++--
 locales/it/browser/browser/zen-folders.ftl    | 12 ++--
 locales/it/browser/browser/zen-general.ftl    | 56 +++++++++++++-----
 .../it/browser/browser/zen-vertical-tabs.ftl  |  5 +-
 locales/it/browser/browser/zen-workspaces.ftl | 14 +++--
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/ja/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../ja/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/ja/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/ko/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../ko/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/ko/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   | 12 ++--
 locales/lt/browser/browser/zen-folders.ftl    |  2 +-
 locales/lt/browser/browser/zen-general.ftl    | 50 +++++++++++-----
 .../lt/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/lt/browser/browser/zen-workspaces.ftl |  4 +-
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/nl/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../nl/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/nl/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/nn-NO/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../nn-NO/browser/browser/zen-workspaces.ftl  |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/pl/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../pl/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/pl/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/pt-BR/browser/browser/zen-general.ftl | 50 +++++++++++-----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../pt-BR/browser/browser/zen-workspaces.ftl  |  4 +-
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/pt-PT/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../pt-PT/browser/browser/zen-workspaces.ftl  |  2 +
 .../browser/preferences/zen-preferences.ftl   |  6 +-
 locales/ru/browser/browser/zen-general.ftl    | 58 +++++++++++++------
 locales/ru/browser/browser/zen-split-view.ftl |  4 +-
 .../ru/browser/browser/zen-vertical-tabs.ftl  |  5 +-
 locales/ru/browser/browser/zen-workspaces.ftl | 14 +++--
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/sv-SE/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../sv-SE/browser/browser/zen-workspaces.ftl  |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/th/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../th/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/th/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/tr/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../tr/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/tr/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/uk/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../uk/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/uk/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/vi/browser/browser/zen-general.ftl    | 48 +++++++++++----
 .../vi/browser/browser/zen-vertical-tabs.ftl  |  1 -
 locales/vi/browser/browser/zen-workspaces.ftl |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/zh-CN/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../zh-CN/browser/browser/zen-workspaces.ftl  |  2 +
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/zh-TW/browser/browser/zen-general.ftl | 48 +++++++++++----
 .../browser/browser/zen-vertical-tabs.ftl     |  1 -
 .../zh-TW/browser/browser/zen-workspaces.ftl  |  2 +
 144 files changed, 1427 insertions(+), 622 deletions(-)

diff --git a/locales/ar/browser/browser/preferences/zen-preferences.ftl b/locales/ar/browser/browser/preferences/zen-preferences.ftl
index 44b2b7635..4484acdfc 100644
--- a/locales/ar/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ar/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = المناوبة + انقر
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = النقر
 zen-look-and-feel-compact-view-header = إظهار في العرض المدمج
 zen-look-and-feel-compact-view-description = فقط إظهار أشرطة الأدوات التي تستخدمها!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = إخفاء مؤشر الحاوية الافتراضي في شريط التبويب
 zen-key-unsaved = اختصار غير محفوظ! الرجاء تأمين ذلك بالنقر على مفتاح "الهروب من الخدمة" بعد إعادة الكتابة.
-zen-key-conflict = تعارض مع اختصار آخر
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = إعدادات السمة
 zen-vertical-tabs-title = تخطيط الشريط الجانبي وعلامات التبويب
 zen-vertical-tabs-header = علامات التبويب العمودية
diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 60ecdbc8d..8f05fe270 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = الملف الشخصي الحالي
 unified-extensions-description = تستخدم الإضافات لجلب المزيد من الوظائف الإضافية إلى { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = إعادة تعيين علامة التبويب المثبتة
     .accesskey = ر
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = استبدال الرابط المثبت بالرابط الحالي
     .accesskey = C
 zen-themes-corrupted = ملف التعديل { -brand-short-name } الخاص بك تالف. تم إعادة تعيينه إلى السمة الافتراضية.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = لون مخصص
 zen-panel-ui-gradient-generator-saved-message = حفظ معامل التدرج بنجاح!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = إلى المزيد تعرف
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/ar/browser/browser/zen-vertical-tabs.ftl b/locales/ar/browser/browser/zen-vertical-tabs.ftl
index f8c18f11f..0a10972f8 100644
--- a/locales/ar/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ar/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = ر
 zen-toolbar-context-compact-mode = 
     .label = الوضع المدمج
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = تمكين الوضع المدمج
     .accesskey = D
diff --git a/locales/ar/browser/browser/zen-workspaces.ftl b/locales/ar/browser/browser/zen-workspaces.ftl
index fdba97f34..ff9f422ef 100644
--- a/locales/ar/browser/browser/zen-workspaces.ftl
+++ b/locales/ar/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl
index b439a9e5e..d399d0105 100644
--- a/locales/ca/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl
@@ -26,10 +26,8 @@ zen-glance-trigger-shift-click =
     .label = Bloc. maj. + Clic
 zen-glance-trigger-meta-click = 
     .label = Meta (Comandament) + Clic
-zen-glance-trigger-mantain-click = 
-    .label = Mantén premut el clic (pròximament!)
 zen-look-and-feel-compact-view-header = Mostra en vista compacta
-zen-look-and-feel-compact-view-description = Mostra només les barres d'eines que feu servir!
+zen-look-and-feel-compact-view-description = Mostreu només les barres d'eines que feu servir
 zen-look-and-feel-compact-view-enabled = 
     .label = Habilita el mode compacte de { -brand-short-name }
 zen-look-and-feel-compact-view-top-toolbar = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Amaga l'indicador de contenidor per defecte a la barra de pestanyes
 zen-key-unsaved = Drecera no desada! Deseu-la fent clic a la tecla «Esc» després de tornar-la a escriure.
-zen-key-conflict = Conflicte amb una altra drecera
+zen-key-conflict = Conflicte amb { $group } -> { $shortcut }
 pane-zen-theme-title = Configuració del tema
 zen-vertical-tabs-title = Disseny de la barra lateral i pestanyes
 zen-vertical-tabs-header = Pestanyes verticals
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 491b97549..054cd9340 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil actual
 unified-extensions-description = Les extensions aporten funcionalitats addicionals a { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Restableix la pestanya fixada
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Afegeix als essentials ({ $num } / { $max } espais ocupats)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Elimina dels essencials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Substitueix l'URL fixat per l'actual
     .accesskey = C
 zen-themes-corrupted = El vostre fitxer de modificacions { -brand-short-name } està malmès. S'ha restablert al tema per defecte.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     La nova barra d'URL s'ha activat, eliminant la necessitat de noves pàgines de pestanya.<br/><br/>
     Proveu d'obrir una pestanya nova per veure la nova barra d'URL en acció!
 zen-disable = Deshabilita
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimitza
     .tooltip = Minimitza
 zen-panel-ui-gradient-generator-custom-color = Color personalitzat
 zen-panel-ui-gradient-generator-saved-message = El degradat s'ha desat correctament!
 zen-copy-current-url-confirmation = L'URL s'ha copiat al porta-retalls.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel·la
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirma
 zen-pinned-tab-replaced = L'URL de la pestanya fixada s'ha substituït per l'URL actual.
 zen-tabs-renamed = S'ha canviat el nom de la pestanya correctament!
 zen-background-tab-opened-toast = S'ha obert una nova pestanya de fons!
 zen-workspace-renamed-toast = S'ha canviat el nom de l'espai de treball correctament!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Espais
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Modificacions
+zen-toggle-compact-mode-button = 
+    .label = Mode compacte
+    .tooltiptext = Commuta el mode compacte
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Més informació
 zen-close-label = Tanca
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cerca...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icones
 urlbar-search-mode-zen_actions = Accions
+zen-site-data-settings = Configuració
+zen-generic-manage = Gestiona
+zen-generic-more = Més
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Permès
+zen-site-data-setting-block = Bloquejat
+zen-site-data-security-info-extension = 
+    .label = Extensió
+zen-site-data-security-info-secure = 
+    .label = Segur
+zen-site-data-security-info-not-secure = 
+    .label = No és segur
+zen-site-data-manage-addons = 
+    .label = Gestiona les extensions
+zen-site-data-get-addons = 
+    .label = Afegeix extensions
+zen-site-data-site-settings = 
+    .label = Totes les configuracions del lloc
+zen-site-data-setting-site-protection = Protecció del lloc
+zen-site-data-panel-feature-callout-title = Una nova ubicació per a les extenions, permisos i molt més
+zen-site-data-panel-feature-callout-subtitle = Feu clic a la icona per gestionar la configuració del lloc, veure la informació de seguretat, accedir a les extensions i dur a terme accions habituals.
diff --git a/locales/ca/browser/browser/zen-vertical-tabs.ftl b/locales/ca/browser/browser/zen-vertical-tabs.ftl
index e81e1922f..8b2ed3f1d 100644
--- a/locales/ca/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ca/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Mode compacte
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Habilita el mode compacte
     .accesskey = D
diff --git a/locales/ca/browser/browser/zen-workspaces.ftl b/locales/ca/browser/browser/zen-workspaces.ftl
index 3a61d13b1..971cb7fc6 100644
--- a/locales/ca/browser/browser/zen-workspaces.ftl
+++ b/locales/ca/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Canvia la icona
 zen-workspaces-panel-context-default-profile = 
     .label = Estableix el perfil
+zen-workspaces-panel-unload = 
+    .label = Hiberna l'espai
 zen-workspaces-how-to-reorder-title = Com reordenar els espais?
 zen-workspaces-how-to-reorder-desc = Arrossegueu les icones d'espais a la part inferior de la barra lateral per reordenar-les
 zen-workspaces-change-theme = 
diff --git a/locales/cs/browser/browser/preferences/zen-preferences.ftl b/locales/cs/browser/browser/preferences/zen-preferences.ftl
index 2e710990d..764d88da9 100644
--- a/locales/cs/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cs/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Kliknutí
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Kliknutí
-zen-glance-trigger-mantain-click = 
-    .label = Dlouhé kliktnutí (Již Brzy!)
 zen-look-and-feel-compact-view-header = Zobrazit v kompaktním režimu
 zen-look-and-feel-compact-view-description = Zobrazte pouze panely nástrojů, které používáte!
 zen-look-and-feel-compact-view-enabled = 
@@ -43,7 +41,7 @@ pane-settings-workspaces-title = Pracoviště
 zen-tabs-unloader-enabled = 
     .label = Povolit uspání karet
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Použít tématické pozadí pro kompaktní panel karet
 zen-workspace-continue-where-left-off = 
     .label = Pokračovat tam, kde jste skončili
 pane-zen-pinned-tab-manager-title = Připnuté karty
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Skrýt výchozí indikátor kontejneru v panelu záložek
 zen-key-unsaved = Neuložený zástupce! Ubezpečte jej po repsaní kliknutím na klávesu "Escap".
-zen-key-conflict = Konflikt s jinou zkratkou
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Nastavení motivu
 zen-vertical-tabs-title = Boční panel a rozložení karet
 zen-vertical-tabs-header = Vertikální karty
@@ -274,7 +272,7 @@ zen-split-view-shortcut-grid = Přepnout rozdělený pohled v mřížce
 zen-split-view-shortcut-vertical = Přepnout rozdělené zobrazení vertikálně
 zen-split-view-shortcut-horizontal = Přepnout horizontální zobrazení rozdělení
 zen-split-view-shortcut-unsplit = Zavřít rozdělené zobrazení
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Nové prázdné rozdělené zobrazení
 zen-key-select-tab-1 = Vybrat první kartu
 zen-key-select-tab-2 = Vybrat druhou kartu
 zen-key-select-tab-3 = Vybrat třetí kartu
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 792a6b740..03f19c3a3 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = aktuální profil
 unified-extensions-description = Rozšíření slouží k přidání dalších funkcí do prohlížeče { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Resetovat připnuté karty
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Přidat do Essentials ({ $num } / { $max } zaplněných slotů)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Odstranit z Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Nahradit připnutou URL adresu aktuální adresou
     .accesskey = C
 zen-themes-corrupted = Váš { -brand-short-name } mods soubor je poškozen. Byl obnoven na výchozí motiv.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Nový adresní řádek je nyní zapnutý, takže už není potřeba otevírat nové karty.<br/><br/>
     Zkuste otevřít novou kartu a podívejte se, jak funguje!
 zen-disable = Zavřít
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimalizovat
     .tooltip = Minimalizovat
 zen-panel-ui-gradient-generator-custom-color = Vlastní barva
 zen-panel-ui-gradient-generator-saved-message = Gradient byl úspěšně uložen!
 zen-copy-current-url-confirmation = URL adresa byla zkopírována do schránky.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Zrušit
-zen-general-confirm =
+zen-general-confirm = 
     .label = Potvrdit
 zen-pinned-tab-replaced = Připnutá URL adresa panelu byla nahrazena aktuální URL adresou.
 zen-tabs-renamed = Panel byl úspěšně přejmenován!
 zen-background-tab-opened-toast = Nová karta na pozadí byla otevřena!
 zen-workspace-renamed-toast = Pracovní prostor byl úspěšně přejmenován!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Prostory
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Módy
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Přepnout kompaktní režim
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Zjistit více
 zen-close-label = Zavřít
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Hledat...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emodži
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ikony
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Akce
+zen-site-data-settings = Nastavení
+zen-generic-manage = Spravovat
+zen-generic-more = Více
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Povoleno
+zen-site-data-setting-block = Blokováno
+zen-site-data-security-info-extension = 
+    .label = Rozšíření
+zen-site-data-security-info-secure = 
+    .label = Bezpečné
+zen-site-data-security-info-not-secure = 
+    .label = Nezabezpečeno
+zen-site-data-manage-addons = 
+    .label = Spravovat rozšíření
+zen-site-data-get-addons = 
+    .label = Přidat rozšíření
+zen-site-data-site-settings = 
+    .label = Nastavení všech stránek
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/cs/browser/browser/zen-vertical-tabs.ftl b/locales/cs/browser/browser/zen-vertical-tabs.ftl
index 11cf7a77e..ec5f0dc50 100644
--- a/locales/cs/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/cs/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompaktní režim
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Povolit kompaktní režim
     .accesskey = D
diff --git a/locales/cs/browser/browser/zen-workspaces.ftl b/locales/cs/browser/browser/zen-workspaces.ftl
index c81cfa2b9..66a3bb7b0 100644
--- a/locales/cs/browser/browser/zen-workspaces.ftl
+++ b/locales/cs/browser/browser/zen-workspaces.ftl
@@ -4,7 +4,7 @@ zen-panel-ui-workspaces-create =
 zen-panel-ui-folder-create = 
     .label = Vytvořit složku
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Nové rozdělení
 zen-workspaces-panel-context-delete = 
     .label = Odstranit pracovní prostor
     .accesskey = D
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Změnit ikonu
 zen-workspaces-panel-context-default-profile = 
     .label = Nastavit profil
+zen-workspaces-panel-unload = 
+    .label = Uspat prostor
 zen-workspaces-how-to-reorder-title = Jak změnit pořadí prostorů
 zen-workspaces-how-to-reorder-desc = Pořadí prostorů změníte přetažením jejich ikon dole v postranním panelu
 zen-workspaces-change-theme = 
diff --git a/locales/cy/browser/browser/preferences/zen-preferences.ftl b/locales/cy/browser/browser/preferences/zen-preferences.ftl
index 081a37ecb..55ac59b49 100644
--- a/locales/cy/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cy/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Hold Click (Coming Soon!)
 zen-look-and-feel-compact-view-header = Show in compact view
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Hide the default container indicator in the tab bar
 zen-key-unsaved = Unsaved shortcut! Please save it by clicking the "Escape" key after retyping it.
-zen-key-conflict = Conflict with another shortcut
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Theme Settings
 zen-vertical-tabs-title = Sidebar and tabs layout
 zen-vertical-tabs-header = Vertical Tabs
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index 8eb07bbaa..f46b35b7b 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = proffil gweithredol
 unified-extensions-description = Mae ehangiadau'n cael ei defnyddio er mwyn ychwanegu fwy o weithrediadau i mewn i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Ailosod Tab wedi'i Binio
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Diddymu o Hanfodion
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Ailosod URL wedi'i Binio gyda'r Gyfredol
     .accesskey = C
 zen-themes-corrupted = Mae eich ffeil am y mod { -brand-short-name } wedi'i llygru. Maent wedi cael eu hailosod i'r thema rhagosodedig.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Mae'r bar URL newydd wedi'i alluogi, sydd yn dileu'r angen am dudalennau tab newydd.<br/><br/>
     Ceisiwch agor tab newydd i weld y bar URL newydd ar waith!
 zen-disable = Analluogi
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Addasu Lliw
 zen-panel-ui-gradient-generator-saved-message = Llwyddiant arbedi'r graddiant!
 zen-copy-current-url-confirmation = Mae'r URL wedi'i gopïo i'r clipfwrdd.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Mae URL y tab wedi'i binio wedi'i newid i'r URL gyfredol.
 zen-tabs-renamed = Llwyddiant ailenwi'r tab!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Cau
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/cy/browser/browser/zen-vertical-tabs.ftl b/locales/cy/browser/browser/zen-vertical-tabs.ftl
index e59cd7a78..9c71802d2 100644
--- a/locales/cy/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/cy/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Compact mode
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Enable compact mode
     .accesskey = D
diff --git a/locales/cy/browser/browser/zen-workspaces.ftl b/locales/cy/browser/browser/zen-workspaces.ftl
index 61bf79a12..452a5e9bc 100644
--- a/locales/cy/browser/browser/zen-workspaces.ftl
+++ b/locales/cy/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/da/browser/browser/preferences/zen-preferences.ftl b/locales/da/browser/browser/preferences/zen-preferences.ftl
index ebb632dcb..26e9a8e0e 100644
--- a/locales/da/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/da/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + klik
 zen-glance-trigger-meta-click = 
     .label = Meta (Kommando) + Klik
-zen-glance-trigger-mantain-click = 
-    .label = Hold klik (kommer snart!)
 zen-look-and-feel-compact-view-header = Vis i kompakt visning
 zen-look-and-feel-compact-view-description = Vis kun de værktøjslinjer, du bruger!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Skjul standardindikatoren for beholdere i fanelinjen
 zen-key-unsaved = Ikke-gemt genvej! Gem den ved at klikke på "Escape"-tasten efter at have indtastet den igen.
-zen-key-conflict = Konflikt med en anden genvej
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Temaindstillinger
 zen-vertical-tabs-title = Layout for sidepanel og faner
 zen-vertical-tabs-header = Lodrette Faner
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index 43f090a53..26d705929 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = nuværende profil
 unified-extensions-description = Udvidelser bruges til at bringe ekstra funktionalitet ind i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Nulstil fastgjort fane
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Føj til Essentielle ({ $num } / { $max } pladser fyldt)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Fjern fra Essentielle
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Erstat fastgjort URL med nuværende
     .accesskey = C
 zen-themes-corrupted = Din { -brand-short-name } mods-fil er beskadiget. De er blevet nulstillet til standardtemaet.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Den nye URL-linje er aktiveret og fjerner dermed behovet for nye fanesider.<br/><br/>
     Prøv at åbne en ny fane for at se den i aktion!
 zen-disable = Deaktiver
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimer
     .tooltip = Minimer
 zen-panel-ui-gradient-generator-custom-color = Brugerdefineret Farve
 zen-panel-ui-gradient-generator-saved-message = Gradienten blev gemt!
 zen-copy-current-url-confirmation = URL'en blev kopieret til udklipsholderen.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Annuller
-zen-general-confirm =
+zen-general-confirm = 
     .label = Bekræft
 zen-pinned-tab-replaced = Den fastgjorte fane-URL blev erstattet med den aktuelle.
 zen-tabs-renamed = Fanen blev omdøbt!
 zen-background-tab-opened-toast = Ny baggrundsfane åbnet!
 zen-workspace-renamed-toast = Arbejdsområde blev omdøbt!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Rum
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Kompakt tilstand
+    .tooltiptext = Kompakt tilstand til/fra
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Lær mere
 zen-close-label = Luk
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Søg...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ikoner
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Handlinger
+zen-site-data-settings = Indstillinger
+zen-generic-manage = Administrer
+zen-generic-more = Mere
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Tilladt
+zen-site-data-setting-block = Blokeret
+zen-site-data-security-info-extension = 
+    .label = Udvidelse
+zen-site-data-security-info-secure = 
+    .label = Sikker
+zen-site-data-security-info-not-secure = 
+    .label = Ikke sikker
+zen-site-data-manage-addons = 
+    .label = Administrer udvidelser
+zen-site-data-get-addons = 
+    .label = Tilføj udvidelser
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/da/browser/browser/zen-vertical-tabs.ftl b/locales/da/browser/browser/zen-vertical-tabs.ftl
index 18682f18b..255b40f9a 100644
--- a/locales/da/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/da/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompakt tilstand
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Aktivér kompakt tilstand
     .accesskey = D
diff --git a/locales/da/browser/browser/zen-workspaces.ftl b/locales/da/browser/browser/zen-workspaces.ftl
index 113da5c32..2dba98bab 100644
--- a/locales/da/browser/browser/zen-workspaces.ftl
+++ b/locales/da/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Skift ikon
 zen-workspaces-panel-context-default-profile = 
     .label = Indstil profil
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Sådan omarrangerer du rum
 zen-workspaces-how-to-reorder-desc = Træk rumikonerne nederst i sidepanelet for at omarrangere dem
 zen-workspaces-change-theme = 
diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index cc8ded518..53c9f5cd7 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Umschalt + Klick
 zen-glance-trigger-meta-click = 
     .label = Meta (Befehlstaste) + Klick
-zen-glance-trigger-mantain-click = 
-    .label = Klick halten (Kommt bald!)
 zen-look-and-feel-compact-view-header = In der Kompaktansicht anzeigen
 zen-look-and-feel-compact-view-description = Zeigen Sie nur die Symbolleisten an, die Sie verwenden!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Standard-Container-Anzeige in der Tab-Leiste ausblenden
 zen-key-unsaved = Nicht gespeichertes Tastenkürzel! Bitte speichern Sie es, indem Sie nach der Neueingabe die "Escape"-Taste drücken.
-zen-key-conflict = Konflikt mit einem anderen Tastenkürzel
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Design-Einstellungen
 zen-vertical-tabs-title = Seitenleiste und Tab-Layout
 zen-vertical-tabs-header = Vertikale Tabs
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 0558e57ee..30e94dbc6 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = Aktuelles Profil
 unified-extensions-description = Erweiterungen werden verwendet, um { -brand-short-name } zusätzliche Funktionen hinzuzufügen.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Angepinnten Tab zurücksetzen
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Zu Essentials hinzufügen ({ $num } / { $max } Plätze belegt)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Aus Essentials entfernen
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Angepinnte URL durch aktuelle ersetzen
     .accesskey = C
 zen-themes-corrupted = Ihre { -brand-short-name } Mods-Datei ist beschädigt. Sie wurde auf das Standard-Design zurückgesetzt.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Die neue Adressleiste wurde aktiviert und macht neue Tab-Seiten überflüssig.<br/><br/>
     Öffnen Sie einen neuen Tab, um die neue Adressleiste in Aktion zu sehen!
 zen-disable = Deaktivieren
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimieren
     .tooltip = Minimieren
 zen-panel-ui-gradient-generator-custom-color = Benutzerdefinierte Farbe
 zen-panel-ui-gradient-generator-saved-message = Farbverlauf erfolgreich gespeichert!
 zen-copy-current-url-confirmation = Die URL wurde in die Zwischenablage kopiert.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Abbrechen
-zen-general-confirm =
+zen-general-confirm = 
     .label = Bestätigen
 zen-pinned-tab-replaced = Die URL des angepinnten Tabs wurde durch die aktuelle URL ersetzt!
 zen-tabs-renamed = Tab wurde erfolgreich umbenannt!
 zen-background-tab-opened-toast = Neuer Hintergrund-Tab geöffnet!
 zen-workspace-renamed-toast = Arbeitsbereich wurde erfolgreich umbenannt!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Arbeitsbereiche
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Mehr erfahren
 zen-close-label = Schließen
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Suchen...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Symbole
 urlbar-search-mode-zen_actions = Aktionen
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/de/browser/browser/zen-vertical-tabs.ftl b/locales/de/browser/browser/zen-vertical-tabs.ftl
index 73519fce6..2c9b6bb10 100644
--- a/locales/de/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/de/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompaktmodus
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Kompaktmodus aktivieren
     .accesskey = D
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index 7d142e8de..1d69583d9 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Symbol ändern
 zen-workspaces-panel-context-default-profile = 
     .label = Profil festlegen
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Wie Arbeitsbereiche neu angeordnet werden
 zen-workspaces-how-to-reorder-desc = Ziehen Sie die Arbeitsbereich-Symbole am unteren Rand der Seitenleiste, um sie neu anzuordnen
 zen-workspaces-change-theme = 
diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl
index 2cc362acc..fc8b527a6 100644
--- a/locales/el/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/el/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Κλικ
 zen-glance-trigger-meta-click = 
     .label = Meta (Εντολή) + Κλικ
-zen-glance-trigger-mantain-click = 
-    .label = Παρατεταμένο Κλικ (Έρχεται Σύντομα!)
 zen-look-and-feel-compact-view-header = Εμφάνιση σε συμπαγή προβολή
 zen-look-and-feel-compact-view-description = Εμφάνιση μόνο των γραμμών εργαλείων που χρησιμοποιείτε!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Απόκρυψη της προκαθορισμένης ένδειξης περιέκτη στη γραμμή καρτελών
 zen-key-unsaved = Μη αποθηκευμένη συντόμευση! Παρακαλώ αποθηκεύστε την κάνοντας κλικ στο πλήκτρο "Escape" αφού την πληκτρολογήσετε.
-zen-key-conflict = Διένεξη με κάποια άλλη συντόμευση
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Ρυθμίσεις Θέματος
 zen-vertical-tabs-title = Πλευρική γραμμή και διάταξη καρτελών
 zen-vertical-tabs-header = Κατακόρυφες Καρτέλες
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index ac77b2f23..940104de5 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = τρέχον προφίλ
 unified-extensions-description = Οι επεκτάσεις χρησιμοποιούνται για να φέρουν περισσότερη επιπλέον λειτουργικότητα στο { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Επαναφορά Καρφιτσωμένης Καρτέλας
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Προσθήκη στα Απαραίτητα ({ $num } / { $max } θέσεις γεμάτες)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Αφαίρεση από Απαραίτητα
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Αντικατάσταση καρφιτσωμένου URL με το τρέχον
     .accesskey = C
 zen-themes-corrupted = Το αρχείο { -brand-short-name } mods είναι κατεστραμμένο. Έχει γίνει επαναφορά στο προεπιλεγμένο θέμα.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Η νέα γραμμή URL έχει ενεργοποιηθεί, αφαιρώντας την ανάγκη για σελίδες νέας καρτέλας.<br/><br/>
     Δοκιμάστε να ανοίξετε μια νέα καρτέλα για να δείτε τη νέα γραμμή URL εν δράσει!
 zen-disable = Απενεργοποίηση
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Ελαχιστοποίηση
     .tooltip = Ελαχιστοποίηση
 zen-panel-ui-gradient-generator-custom-color = Προσαρμοσμένο Χρώμα
 zen-panel-ui-gradient-generator-saved-message = Επιτυχής αποθήκευση της διαβάθμισης!
 zen-copy-current-url-confirmation = Το URL έχει αντιγραφεί στο πρόχειρο.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Ακύρωση
-zen-general-confirm =
+zen-general-confirm = 
     .label = Επιβεβαίωση
 zen-pinned-tab-replaced = Το URL της καρφιτσωμένης καρτέλας έχει αντικατασταθεί από το τρέχον URL.
 zen-tabs-renamed = Η καρτέλα μετονομάστηκε επιτυχώς!
 zen-background-tab-opened-toast = Άνοιξε νέα καρτέλα στο παρασκήνιο!
 zen-workspace-renamed-toast = Ο χώρος εργασίας μετονομάστηκε επιτυχώς!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Χώροι
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Μάθετε Περισσότερα
 zen-close-label = Κλείσιμο
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Αναζήτηση...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/el/browser/browser/zen-vertical-tabs.ftl b/locales/el/browser/browser/zen-vertical-tabs.ftl
index 06e8740de..20144a1b3 100644
--- a/locales/el/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/el/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Συμπαγής λειτουργία
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Ενεργοποίηση συμπαγούς λειτουργίας
     .accesskey = D
diff --git a/locales/el/browser/browser/zen-workspaces.ftl b/locales/el/browser/browser/zen-workspaces.ftl
index c08c24e79..c70cc2c30 100644
--- a/locales/el/browser/browser/zen-workspaces.ftl
+++ b/locales/el/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Αλλαγή Εικονιδίου
 zen-workspaces-panel-context-default-profile = 
     .label = Ορισμός Προφίλ
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Πώς να αναδιατάξετε τους χώρους
 zen-workspaces-how-to-reorder-desc = Σύρετε τα εικονίδια χώρου στο κάτω μέρος της πλαϊνής μπάρας για να τα αναδιατάξετε
 zen-workspaces-change-theme = 
diff --git a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
index 574d51624..f88081893 100644
--- a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Maintain click (Coming Soon!)
 zen-look-and-feel-compact-view-header = Show in compact view
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Hide the default container indicator in the tab bar
 zen-key-unsaved = Unsaved shortcut! Please save it by clicking the "Escape" key after retyping it.
-zen-key-conflict = Conflict with another shortcut
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Theme Settings
 zen-vertical-tabs-title = Sidebar and tabs layout
 zen-vertical-tabs-header = Vertical Tabs
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index aacbfc4da..5efaaabd5 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = Current profile
 unified-extensions-description = Extensions are used to bring more extra functionality into { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -17,33 +17,57 @@ zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = The new URL bar has been enabled, removing the need for new tab pages. Try opening a new tab to see the new URL bar in action!<br/><br/>
 zen-disable = Disable
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom colour
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/en-GB/browser/browser/zen-vertical-tabs.ftl b/locales/en-GB/browser/browser/zen-vertical-tabs.ftl
index aada1a48b..24d43dbfe 100644
--- a/locales/en-GB/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/en-GB/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Compact mode
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Enable compact mode
     .accesskey = D
diff --git a/locales/en-GB/browser/browser/zen-workspaces.ftl b/locales/en-GB/browser/browser/zen-workspaces.ftl
index 172313fae..299057041 100644
--- a/locales/en-GB/browser/browser/zen-workspaces.ftl
+++ b/locales/en-GB/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
index be10c1d3a..ec05a3f90 100644
--- a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Mayús + Clic
 zen-glance-trigger-meta-click = 
     .label = Meta (Comando) + Clic
-zen-glance-trigger-mantain-click = 
-    .label = Mantener pulsado el clic (¡Próximamente!)
 zen-look-and-feel-compact-view-header = Mostrar en vista compacta
 zen-look-and-feel-compact-view-description = ¡Muestre solo las barras de herramientas que usa!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Ocultar el indicador de contenedor por defecto en la barra de pestañas
 zen-key-unsaved = ¡Atajo sin guardar! Por favor guárdelo pulsando la tecla "Escape" después de reescribirlo.
-zen-key-conflict = Conflicto con otro atajo de teclado
+zen-key-conflict = Conflicto con { $group } -> { $shortcut }
 pane-zen-theme-title = Ajustes del tema
 zen-vertical-tabs-title = Diseño de la barra lateral y pestañas
 zen-vertical-tabs-header = Pestañas verticales
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index e91032ea9..a88bca030 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil actual
 unified-extensions-description = Las extensiones se utilizan para agregar más funcionalidades a { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Restablecer pestaña fijada
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Añadir a esenciales ({ $num } / { $max } huecos llenos)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Quitar de esenciales
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Reemplazar la URL fijada con la actual
     .accesskey = C
 zen-themes-corrupted = Su archivo de mods de { -brand-short-name } está dañado. Se ha restablecido el tema por defecto.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Se ha habilitado la nueva barra de direcciones, eliminando la necesidad de la página de nueva pestaña.<br/><br/>
     ¡Pruebe a abrir una nueva pestaña para ver la nueva barra de direcciones en acción!
 zen-disable = Deshabilitar
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimizar
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Color personalizado
 zen-panel-ui-gradient-generator-saved-message = ¡Gradiente guardado con éxito!
 zen-copy-current-url-confirmation = La URL se ha copiado al portapapeles.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancelar
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirmar
 zen-pinned-tab-replaced = La URL de la pestaña fijada se ha reemplazado por la URL actual.
 zen-tabs-renamed = ¡La pestaña se ha renombrado con éxito!
 zen-background-tab-opened-toast = ¡Nueva pestaña abierta en segundo plano!
 zen-workspace-renamed-toast = ¡El espacio de trabajo ha sido renombrado con éxito!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Espacios
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Modo compacto
+    .tooltiptext = Alternar modo compacto
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Más información
 zen-close-label = Cerrar
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Buscar...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Iconos
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Ajustes
+zen-generic-manage = Administrar
+zen-generic-more = Más
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Permitido
+zen-site-data-setting-block = Bloqueado
+zen-site-data-security-info-extension = 
+    .label = Extensión
+zen-site-data-security-info-secure = 
+    .label = Seguro
+zen-site-data-security-info-not-secure = 
+    .label = No seguro
+zen-site-data-manage-addons = 
+    .label = Administrar extensiones
+zen-site-data-get-addons = 
+    .label = Añadir extensión
+zen-site-data-site-settings = 
+    .label = Todas las configuraciones del sitio
+zen-site-data-setting-site-protection = Protección del sitio
+zen-site-data-panel-feature-callout-title = Un nuevo hogar para complementos, permisos y más
+zen-site-data-panel-feature-callout-subtitle = Haga clic en el icono para administrar la configuración del sitio, ver información de seguridad, acceder a extensiones, y realizar acciones comunes.
diff --git a/locales/es-ES/browser/browser/zen-vertical-tabs.ftl b/locales/es-ES/browser/browser/zen-vertical-tabs.ftl
index 9eda5b098..5e8217d50 100644
--- a/locales/es-ES/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/es-ES/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Modo compacto
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Habilitar modo compacto
     .accesskey = D
diff --git a/locales/es-ES/browser/browser/zen-workspaces.ftl b/locales/es-ES/browser/browser/zen-workspaces.ftl
index cedb5f1a3..3346d48ea 100644
--- a/locales/es-ES/browser/browser/zen-workspaces.ftl
+++ b/locales/es-ES/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Cambiar icono
 zen-workspaces-panel-context-default-profile = 
     .label = Establecer perfil
+zen-workspaces-panel-unload = 
+    .label = Suspender espacio
 zen-workspaces-how-to-reorder-title = Cómo reordenar espacios
 zen-workspaces-how-to-reorder-desc = Arrastre los iconos de los espacios en la parte inferior de la barra lateral para reordenarlos
 zen-workspaces-change-theme = 
diff --git a/locales/et/browser/browser/preferences/zen-preferences.ftl b/locales/et/browser/browser/preferences/zen-preferences.ftl
index 4cd455e74..0e89e8121 100644
--- a/locales/et/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/et/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Klõps
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Klõps
-zen-glance-trigger-mantain-click = 
-    .label = Hoia hiireklahvi all (valmib varsti!)
 zen-look-and-feel-compact-view-header = Näita kompaktses vaates
 zen-look-and-feel-compact-view-description = Näita ainult tööriistaribasid, mida aktiivselt kasutad!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Peida vaikimisi konteineri indikaator kaartide ribal
 zen-key-unsaved = Salvestamata otsetee! Salvetamiseks kasuta "Esc" klahvi pärast otsetee sisestamist.
-zen-key-conflict = Vastuolu mõne teise otseteega
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Teema sätted
 zen-vertical-tabs-title = Külgriba ja kaartide paigutus
 zen-vertical-tabs-header = Vertikaalsed kaardid
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index 4b2384185..edd366bee 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = praegune profiil
 unified-extensions-description = Laiendusi kasutatakse täiendava funktsionaalsuse lisamiseks { -brand-short-name }i.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Lähtesta püsikaart
     .accesskey = p
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Märgi oluliseks ({ $num } / { $max } täidetud)
     .accesskey = o
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Eemalda olulistest
     .accesskey = o
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Asenda püsikaardi URL praegusega
     .accesskey = p
 zen-themes-corrupted = Sinu { -brand-short-name } mods-ide fail on vigane. See on nüüd lähtestatud vaikimisi teemaks.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Uus asukohariba on sisse lülitatud, mistõttu pole enam uue kaardi lehte tarvis.<br/><br/>
     Proovi avada uut kaarti, et näha uut asukohariba!
 zen-disable = Lülita välja
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimeeri
     .tooltip = Minimeeri
 zen-panel-ui-gradient-generator-custom-color = Kohandatud värv
 zen-panel-ui-gradient-generator-saved-message = Värviüleminek on edukalt salvestatud!
 zen-copy-current-url-confirmation = URL kopeeriti lõikelauale.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Tühista
-zen-general-confirm =
+zen-general-confirm = 
     .label = Kinnita
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Kaart on edukalt ümber nimetatud!
 zen-background-tab-opened-toast = Taustal avati uus kaart!
 zen-workspace-renamed-toast = Tööruum on edukalt ümber nimetatud!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Tööruumid
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods-id
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Lülita kompaktne režiim sisse/välja
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Rohkem teavet
 zen-close-label = Sulge
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Otsi...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojid
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ikoonid
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Tegevused
+zen-site-data-settings = Sätted
+zen-generic-manage = Halda
+zen-generic-more = Rohkem
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Lubatud
+zen-site-data-setting-block = Keelatud
+zen-site-data-security-info-extension = 
+    .label = Laiendus
+zen-site-data-security-info-secure = 
+    .label = Turvaline
+zen-site-data-security-info-not-secure = 
+    .label = Ebaturvaline
+zen-site-data-manage-addons = 
+    .label = Halda laiendusi
+zen-site-data-get-addons = 
+    .label = Lisa laiendusi
+zen-site-data-site-settings = 
+    .label = Kõik saidi sätted
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/et/browser/browser/zen-vertical-tabs.ftl b/locales/et/browser/browser/zen-vertical-tabs.ftl
index d17ca9f44..30609ee0d 100644
--- a/locales/et/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/et/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = p
 zen-toolbar-context-compact-mode = 
     .label = Kompaktne režiim
-    .accesskey = K
 zen-toolbar-context-compact-mode-enable = 
     .label = Luba kompaktne režiim
     .accesskey = r
diff --git a/locales/et/browser/browser/zen-workspaces.ftl b/locales/et/browser/browser/zen-workspaces.ftl
index 8b8fed3ee..ee416e641 100644
--- a/locales/et/browser/browser/zen-workspaces.ftl
+++ b/locales/et/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Muuda ikooni
 zen-workspaces-panel-context-default-profile = 
     .label = Määra profiil
+zen-workspaces-panel-unload = 
+    .label = Tööruumi mälust eemaldamine
 zen-workspaces-how-to-reorder-title = Kuidas vahetada tööruumide järjestust
 zen-workspaces-how-to-reorder-desc = Lohista tööruumide ikoone külgriba alumises servas, et nende järjestust muuta
 zen-workspaces-change-theme = 
diff --git a/locales/fa/browser/browser/preferences/zen-preferences.ftl b/locales/fa/browser/browser/preferences/zen-preferences.ftl
index 876f14a1e..4759f937c 100644
--- a/locales/fa/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fa/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Click
 zen-look-and-feel-compact-view-header = نمایش در حالت فشرده
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Hide the default container indicator in the tab bar
 zen-key-unsaved = Unsaved shortcut! Please save it by clicking the "Escape" key after retyping it.
-zen-key-conflict = Conflict with another shortcut
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = تنظیمات پوسته
 zen-vertical-tabs-title = نوارکناری و چینش برگه‌ها
 zen-vertical-tabs-header = برگه‌های عمودی
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index 0cf78364a..28f10d3bd 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = نمایهٔ کنونی
 unified-extensions-description = افزونه‌های در حال استفاده عملکردهای بیشتری به { -brand-short-name } می‌دهند.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/fa/browser/browser/zen-vertical-tabs.ftl b/locales/fa/browser/browser/zen-vertical-tabs.ftl
index e59cd7a78..9c71802d2 100644
--- a/locales/fa/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/fa/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Compact mode
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Enable compact mode
     .accesskey = D
diff --git a/locales/fa/browser/browser/zen-workspaces.ftl b/locales/fa/browser/browser/zen-workspaces.ftl
index 9f559215c..93e3ebac9 100644
--- a/locales/fa/browser/browser/zen-workspaces.ftl
+++ b/locales/fa/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl
index 41c23f3dd..877e8753e 100644
--- a/locales/fi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + klikkaa
 zen-glance-trigger-meta-click = 
     .label = Meta (komento) + klikkaus
-zen-glance-trigger-mantain-click = 
-    .label = Pidä pohjassa klikkausta
 zen-look-and-feel-compact-view-header = Näytä kompaktissa näkymätilassa
 zen-look-and-feel-compact-view-description = Näytä vain käyttämäsi työkalupalkit!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Piilota säiliön oletusmerkkivalo välilehdessä - palkki
 zen-key-unsaved = Tallentamaton pikakuvake! Ole hyvä ja turvaa se painamalla "Escape" -näppäintä kirjoittamisen jälkeen.
-zen-key-conflict = Ristiriita toisen pikakuvakkeen kanssa
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Teeman Asetukset
 zen-vertical-tabs-title = Sivupalkin ja välilehtien asettelu
 zen-vertical-tabs-header = Pystysuorat Välilehdet
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index b2130ac7d..30cbb9baa 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = nykyinen profiili
 unified-extensions-description = Laajennuksia käytetään tuomaan enemmän ylimääräisiä toimintoja { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Nollaa Kiinnitetty Välilehti
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Poista olennaisista
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Korvaa kiinnitetty URL-osoite nykyisellä
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } modejasi tiedosto on vioittunut. Ne on palautettu oletusteemaan.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Muokattu Väri
 zen-panel-ui-gradient-generator-saved-message = Kaltevuus tallennettu onnistuneesti!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/fi/browser/browser/zen-vertical-tabs.ftl b/locales/fi/browser/browser/zen-vertical-tabs.ftl
index 1e83d63e1..4fd1556f6 100644
--- a/locales/fi/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/fi/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompakti tila
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Ota kompakti tila käyttöön
     .accesskey = D
diff --git a/locales/fi/browser/browser/zen-workspaces.ftl b/locales/fi/browser/browser/zen-workspaces.ftl
index bae229643..a4ce573ff 100644
--- a/locales/fi/browser/browser/zen-workspaces.ftl
+++ b/locales/fi/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl
index 66e352dcf..375df655d 100644
--- a/locales/fr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Maj + clic
 zen-glance-trigger-meta-click = 
     .label = Super (Command) + clic
-zen-glance-trigger-mantain-click = 
-    .label = Maintenir le clic (très bientôt !)
 zen-look-and-feel-compact-view-header = Afficher en mode compact
 zen-look-and-feel-compact-view-description = Affichez uniquement les barres d’outils que vous utilisez !
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Dans la barre d’onglets, masquer l’indicateur de conteneur par défaut
 zen-key-unsaved = Raccourci non sauvegardé ! Pour l’enregistrer, veuillez le resaisir et en appuyer sur Échap.
-zen-key-conflict = Conflit avec un autre raccourci
+zen-key-conflict = Conflits avec { $group } → { $shortcut }
 pane-zen-theme-title = Paramètres de thème
 zen-vertical-tabs-title = Disposition de la barre latérale et des onglets
 zen-vertical-tabs-header = Onglets verticaux
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index a396835a6..281f3d0c8 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = profil actuel
 unified-extensions-description = Les extensions sont utilisées pour ajouter plus de fonctionnalités à { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Réinitialiser l’onglet épinglé
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Ajouter aux Essentials ({ $num } / { $max } emplacements occupés)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Retirer des Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Remplacer l’URL épinglée par l’actuelle
     .accesskey = C
 zen-themes-corrupted = Votre fichier de thèmes { -brand-short-name } est corrompu. Il a été réinitialisé au thème par défaut.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     La nouvelle barre d’adresse a été activée, supprimant la nécessité de nouvelles pages d’onglets.<br/><br/>
     Essayez d’ouvrir un nouvel onglet pour voir la nouvelle barre d’adresse en action !
 zen-disable = Désactiver
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimiser
     .tooltip = Minimiser
 zen-panel-ui-gradient-generator-custom-color = Couleur personnalisée
 zen-panel-ui-gradient-generator-saved-message = Le dégradé a été enregistré avec succès !
 zen-copy-current-url-confirmation = L’adresse a été copiée dans le presse-papier.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Annuler
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirmer
 zen-pinned-tab-replaced = L’adresse de l'onglet épinglé a été remplacée par l’adresse actuelle.
 zen-tabs-renamed = L’onglet a été renommé avec succès !
 zen-background-tab-opened-toast = Nouvel onglet ouvert en arrière-plan !
 zen-workspace-renamed-toast = L'espace de travail a été renommé avec succès !
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Espaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Mode compact
+    .tooltiptext = Activer/Désactiver le mode compact
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = En savoir plus
 zen-close-label = Fermer
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Rechercher...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Émojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icônes
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Paramètres
+zen-generic-manage = Gérer
+zen-generic-more = Plus
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Autorisé
+zen-site-data-setting-block = Bloqué
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Sécurisé
+zen-site-data-security-info-not-secure = 
+    .label = Non sécurisé
+zen-site-data-manage-addons = 
+    .label = Gérer les extensions
+zen-site-data-get-addons = 
+    .label = Ajouter des extensions
+zen-site-data-site-settings = 
+    .label = Tous les paramètres du site
+zen-site-data-setting-site-protection = Protection du site
+zen-site-data-panel-feature-callout-title = Un nouvel endroit pour vos extensions, permissions et plus encore
+zen-site-data-panel-feature-callout-subtitle = Cliquez sur l'icône pour gérer les paramètres du site, afficher les infos de sécurité, accéder aux extensions et effectuer d'autres actions.
diff --git a/locales/fr/browser/browser/zen-vertical-tabs.ftl b/locales/fr/browser/browser/zen-vertical-tabs.ftl
index 73e82b59b..2e2f81be2 100644
--- a/locales/fr/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/fr/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Mode compact
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Activer le mode compact
     .accesskey = D
diff --git a/locales/fr/browser/browser/zen-workspaces.ftl b/locales/fr/browser/browser/zen-workspaces.ftl
index 8b4e75556..7d4a98b63 100644
--- a/locales/fr/browser/browser/zen-workspaces.ftl
+++ b/locales/fr/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Changer d'icône
 zen-workspaces-panel-context-default-profile = 
     .label = Définir le profil
+zen-workspaces-panel-unload = 
+    .label = Décharger l'espace
 zen-workspaces-how-to-reorder-title = Comment réordonner les espaces
 zen-workspaces-how-to-reorder-desc = Faites glisser les icônes d'espace en bas de la barre latérale pour les réorganiser
 zen-workspaces-change-theme = 
diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
index 6f7639c99..21c409222 100644
--- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Cliceáil
 zen-glance-trigger-meta-click = 
     .label = Meta (Ordú) + Cliceáil
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Click
 zen-look-and-feel-compact-view-header = Taispeáin i ndlúth d’amharc
 zen-look-and-feel-compact-view-description = Ná taispeáin ach na barraí uirlisí a úsáideann tú!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Folaigh an táscaire coimeádáin réamhshocraithe sa bharra cluaisíní
 zen-key-unsaved = Aicearra gan sábháil! Sábháil é trí chliceáil ar an eochair "Escape" tar éis é a athchlóscríobh.
-zen-key-conflict = Coimhlint le aicearra eile
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Socruithe Téama
 zen-vertical-tabs-title = Leagan amach barra taobh agus cluaisíní
 zen-vertical-tabs-header = Cluaisíní Ingearacha
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index a21e5633c..20de04008 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = próifíl reatha
 unified-extensions-description = Úsáidtear síntí chun níos mó feidhmiúlachta breise a thabhairt isteach i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Athshocraigh an Cluaisín Prionáilte
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Cuir le Bunriachtanais ({ $num } / { $max } sliotán líonta)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Bain de na Bunriachtanais
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Cuir URL Prionáilte in ionad an URL Reatha
     .accesskey = C
 zen-themes-corrupted = Tá do chomhad mods { -brand-short-name } truaillithe. Tá siad athshocraithe chuig an téama réamhshocraithe.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Tá an barra URL nua cumasaithe, rud a fhágann nach bhfuil gá le leathanaigh cluaisín nua.<br/><br/>
     Bain triail as cluaisín nua a oscailt chun an barra URL nua i mbun oibre a fheiceáil!
 zen-disable = Díchumasaigh
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Íoslaghdaigh
     .tooltip = Íoslaghdaigh
 zen-panel-ui-gradient-generator-custom-color = Dath Saincheaptha
 zen-panel-ui-gradient-generator-saved-message = Sábháladh an grádán go rathúil!
 zen-copy-current-url-confirmation = Tá an URL cóipeáilte chuig an ghearrthaisce.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cealaigh
-zen-general-confirm =
+zen-general-confirm = 
     .label = Deimhnigh
 zen-pinned-tab-replaced = Tá URL an chluaisín phinnáilte curtha in ionad an URL reatha!
 zen-tabs-renamed = Athainmníodh an cluaisín go rathúil!
 zen-background-tab-opened-toast = Tá cluaisín cúlra nua oscailte!
 zen-workspace-renamed-toast = Athainmníodh an spás oibre go rathúil!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spásanna
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Modanna
+zen-toggle-compact-mode-button = 
+    .label = Mód Dlúth
+    .tooltiptext = Mód Dlúth a Athrú
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Foghlaim Tuilleadh
 zen-close-label = Dún
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cuardaigh...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Deilbhíní
 urlbar-search-mode-zen_actions = Gníomhartha
+zen-site-data-settings = Socruithe
+zen-generic-manage = Bainistigh
+zen-generic-more = Tuilleadh
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Ceadaithe
+zen-site-data-setting-block = Blocáilte
+zen-site-data-security-info-extension = 
+    .label = Síneadh
+zen-site-data-security-info-secure = 
+    .label = Slán
+zen-site-data-security-info-not-secure = 
+    .label = Ní Slán
+zen-site-data-manage-addons = 
+    .label = Bainistigh Síneadh
+zen-site-data-get-addons = 
+    .label = Cuir Síneadh leis
+zen-site-data-site-settings = 
+    .label = Gach Socrú Suímh
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl b/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl
index d8d7f578c..f98223ee5 100644
--- a/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Mód dlúth
-    .accesskey = D’Athraigh Chluaisíní(s) go Spás Oibre
 zen-toolbar-context-compact-mode-enable = 
     .label = Cumasaigh mód dlúth
     .accesskey = D
diff --git a/locales/ga-IE/browser/browser/zen-workspaces.ftl b/locales/ga-IE/browser/browser/zen-workspaces.ftl
index 036a31856..33f9e1b2c 100644
--- a/locales/ga-IE/browser/browser/zen-workspaces.ftl
+++ b/locales/ga-IE/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Athraigh Deilbhín
 zen-workspaces-panel-context-default-profile = 
     .label = Socraigh Próifíl
+zen-workspaces-panel-unload = 
+    .label = Díluchtaigh Spás
 zen-workspaces-how-to-reorder-title = Conas spásanna a athordú
 zen-workspaces-how-to-reorder-desc = Tarraing na deilbhíní spáis ag bun an bharra taoibh chun iad a athordú
 zen-workspaces-change-theme = 
diff --git a/locales/he/browser/browser/preferences/zen-preferences.ftl b/locales/he/browser/browser/preferences/zen-preferences.ftl
index 02e60d27c..8081799a3 100644
--- a/locales/he/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/he/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + לחיצה
 zen-glance-trigger-meta-click = 
     .label = מטה (Command) + לחיצה
-zen-glance-trigger-mantain-click = 
-    .label = החזקת לחיצה (בקרוב!)
 zen-look-and-feel-compact-view-header = הצגה בתצוגה מכווצת
 zen-look-and-feel-compact-view-description = מראה לך רק את הסרגלים בשימוש
 zen-look-and-feel-compact-view-enabled = 
@@ -43,7 +41,7 @@ pane-settings-workspaces-title = סביבות עבודה
 zen-tabs-unloader-enabled = 
     .label = הפעלת פינוי כרטיסיות
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = שימוש ברקע עם עיצוב לסרגל מכווץ
 zen-workspace-continue-where-left-off = 
     .label = המשכה מאיפה שהפסקת
 pane-zen-pinned-tab-manager-title = כרטיסיות מוצמדות
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = הסתרת המחוון המכל המוגדר כברירת מחדל בשורת הכרטיסיות
 zen-key-unsaved = קיצור מקלדת לא נשמר! יש לשמור אותו על ידי הקשה על "Escape" לאחר הקלדה מחדש.
-zen-key-conflict = התנגשות עם קיצור מקלדת אחר
+zen-key-conflict = קונפליקט עם { $group } -> { $shortcut }
 pane-zen-theme-title = הגדרות ערכת נושא
 zen-vertical-tabs-title = סדר סרגל צד כרטיסיות
 zen-vertical-tabs-header = כרטיסיות אנכיות
@@ -221,7 +219,7 @@ zen-key-exit-full-screen = צא ממסך מלא
 zen-ai-chatbot-sidebar-shortcut = הפעל/כבה סרגל צ'אט AI צד
 zen-key-inspector-mac = הפעל/כבה בודק (Mac)
 zen-toggle-sidebar-shortcut = הפעל/כבה סרגל צד של Firefox
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-toggle-pin-tab-shortcut = הצמדת כרטיסייה
 zen-reader-mode-toggle-shortcut-other = הפעל/כבה מצב קריאה
 zen-picture-in-picture-toggle-shortcut = הפעל/כבה תמונה-בתמונה
 zen-nav-reload-shortcut-2 = רענן עמוד
@@ -255,7 +253,7 @@ zen-close-tab-shortcut = סגור כרטיסיה
 zen-compact-mode-shortcut-show-sidebar = הפעל/כבה סרגל צד מרחף
 zen-compact-mode-shortcut-show-toolbar = הפעל/כבה סרגל מרחף
 zen-compact-mode-shortcut-toggle = הפעל/כבה מצב מכווץ
-zen-glance-expand = Expand Glance
+zen-glance-expand = הרחבת מבט
 zen-workspace-shortcut-switch-1 = עבור לסביבת עבודה 1
 zen-workspace-shortcut-switch-2 = עבור לסביבת עבודה 2
 zen-workspace-shortcut-switch-3 = עבור לסביבת עבודה 3
@@ -274,7 +272,7 @@ zen-split-view-shortcut-grid = הפעל/כבה תצוגה מפוצלת רשת
 zen-split-view-shortcut-vertical = הפעל/כבה תצוגה מפוצלת אנכית
 zen-split-view-shortcut-horizontal = הפעל/כבה תצוגה מפוצלת אופקית
 zen-split-view-shortcut-unsplit = סגור תצוגה מפוצלת
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = פיצול חדש ריק
 zen-key-select-tab-1 = בחר כרטיסיה #1
 zen-key-select-tab-2 = בחר כרטיסיה #2
 zen-key-select-tab-3 = בחר כרטיסיה #3
diff --git a/locales/he/browser/browser/zen-folders.ftl b/locales/he/browser/browser/zen-folders.ftl
index 83dfd55e6..15f540fb2 100644
--- a/locales/he/browser/browser/zen-folders.ftl
+++ b/locales/he/browser/browser/zen-folders.ftl
@@ -15,7 +15,7 @@ zen-folders-panel-change-folder-space =
 zen-folders-panel-change-icon-folder = 
     .label = שינוי סמל
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = פינוי כל הפעילים בתיקייה הזו
 zen-folders-unload-folder = 
     .label = פינוי כל הכרטיסייות
 zen-folders-search-no-results = אין כרטיסיות שתואמות לחיפוש 🤔
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index f51f9b74c..a6a31bcbb 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = פרופיל נוכחי
 unified-extensions-description = הרחבות מוסיפות פונקציונליות נוספת ל{ -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = אפס כרטיסייה מוצמדת
     .accesskey = ר
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = הוסף לנחוצים ({ $num } / { $max } מקומות מלאים)
     .accesskey = ק
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = הסר מנחוצים
     .accesskey = ר
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = החלף קישור מוצמד עם הנוכחי
     .accesskey = ב
 zen-themes-corrupted = קובץ המודים { -brand-short-name } שלך פגום. הם אופסו לנושא ברירת המחדל.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     סרגל הכתובת החדש הופעל, ומסיר את הצורך בעמודי כרטיסייה חדשה.<br/><br/>
     נסה לפתוח כרטיסייה חדשה כדי לראות את סרגל הכתובת החדש בפעולה!
 zen-disable = כבה
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = מזער
     .tooltip = מזער
 zen-panel-ui-gradient-generator-custom-color = צבע מותאם אישית
 zen-panel-ui-gradient-generator-saved-message = מיזוג הצבעים נשמר בהצלחה!
 zen-copy-current-url-confirmation = הקישור הועתק ללוח.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = ביטול
-zen-general-confirm =
+zen-general-confirm = 
     .label = אישור
 zen-pinned-tab-replaced = קישור כרטיסייה מוצמדת הוחלפה עם הקישור הנוכחי.
 zen-tabs-renamed = שם הכרטיסייה שונתה בהצלחה!
 zen-background-tab-opened-toast = לשונית נפתחה ברקע!
 zen-workspace-renamed-toast = שם הסביבת עבודה שונתה בהצלחה!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = סביבות
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = מודים
+zen-toggle-compact-mode-button = 
+    .label = מצב מכווץ
+    .tooltiptext = הפעל/כבה מצב מכווץ
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = מידע נוסף
 zen-close-label = סגור
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = חיפוש...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = אימוג'ים
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = סמלים
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = פעולות
+zen-site-data-settings = הגדרות
+zen-generic-manage = ניהול
+zen-generic-more = עוד
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = אושר
+zen-site-data-setting-block = חסום
+zen-site-data-security-info-extension = 
+    .label = תוספים
+zen-site-data-security-info-secure = 
+    .label = מאובטח
+zen-site-data-security-info-not-secure = 
+    .label = לא מאובטח
+zen-site-data-manage-addons = 
+    .label = נהל תוספים
+zen-site-data-get-addons = 
+    .label = הוספת תוספים
+zen-site-data-site-settings = 
+    .label = כל הגדרות אתר
+zen-site-data-setting-site-protection = בטיחות אתר
+zen-site-data-panel-feature-callout-title = בית חדש לתוספים, הרשאות, ועוד
+zen-site-data-panel-feature-callout-subtitle = ניתן ללחוץ על הסמל כדי לנהל הגדרות אתר, לצפות במידע אבטחה, לגשת לתוספים, ולבצע פעולות נפוצות.
diff --git a/locales/he/browser/browser/zen-vertical-tabs.ftl b/locales/he/browser/browser/zen-vertical-tabs.ftl
index ca7d7e1f3..4e8e2b706 100644
--- a/locales/he/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/he/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = ר
 zen-toolbar-context-compact-mode = 
     .label = מצב מכווץ
-    .accesskey = ב
 zen-toolbar-context-compact-mode-enable = 
     .label = הפעל מצב מכווץ
     .accesskey = ג
@@ -15,7 +14,7 @@ zen-toolbar-context-compact-mode-hide-both =
     .label = הסתרת שניהם
     .accesskey = י
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = תיקייה חדשה
     .accesskey = מ
 sidebar-zen-expand = 
     .label = הרחבת סרגל צדדי
diff --git a/locales/he/browser/browser/zen-workspaces.ftl b/locales/he/browser/browser/zen-workspaces.ftl
index f6a324858..89fd0dbe7 100644
--- a/locales/he/browser/browser/zen-workspaces.ftl
+++ b/locales/he/browser/browser/zen-workspaces.ftl
@@ -4,7 +4,7 @@ zen-panel-ui-workspaces-create =
 zen-panel-ui-folder-create = 
     .label = יצירת תיקייה
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = פיצול חדש
 zen-workspaces-panel-context-delete = 
     .label = מחק סיבת עבודה
     .accesskey = ג
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = שינוי סמל
 zen-workspaces-panel-context-default-profile = 
     .label = הגדרת פרופיל
+zen-workspaces-panel-unload = 
+    .label = פינוי סיבבת עבודה
 zen-workspaces-how-to-reorder-title = איך לסדר מחדש סביבות
 zen-workspaces-how-to-reorder-desc = אפשר לסדר מחדש סביבות על ידי גרירה ושחרור של הסמלים בסרגל התחתון
 zen-workspaces-change-theme = 
diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl
index a889eb153..f79677e69 100644
--- a/locales/hu/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Kattintás
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Kattintás
-zen-glance-trigger-mantain-click = 
-    .label = Nyomva tartás (Hamarosan!)
 zen-look-and-feel-compact-view-header = Kompakt nézet
 zen-look-and-feel-compact-view-description = Csak azokat az eszköztárakat lásd amit használsz!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Alapértelmezett konténerjelző elrejtése a tabulátor sávban
 zen-key-unsaved = Nem mentett gyorsbillentyű! Mentsd meg az "Escape" gomb lenyomásával, majd újraírásával.
-zen-key-conflict = Ütközik egy másik gyorsbillentyűvel
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Téma beállítások
 zen-vertical-tabs-title = Oldalsó sáv és lapok elrendezése
 zen-vertical-tabs-header = Függőleges lapok
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 2b21c676e..ffac660ac 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = jelenlegi profil
 unified-extensions-description = A bővítmények a { -brand-short-name }-t új funkciókkal látják el.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Kitűzött lap visszaállítása
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Felvétel az alapvetőkbe ({ $num } / { $max } hely foglalt)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Eltávolítás az alapvetőkből
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Kitűzött lap cseréje a jelenlegi URL-el
     .accesskey = C
 zen-themes-corrupted = A te { -brand-short-name } mod fájljaid károsodtak. Vissza lettek állítva az eredeti témára.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Az új URL sáv engedélyezve lett, így nincs szükség új lapokra.<br/><br/>
     Próbáljon ki egy új lapot nyitni, hogy láthassa az új URL-sávot működés közben!
 zen-disable = Kikapcsolás
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimalizálás
     .tooltip = Minimalizálás
 zen-panel-ui-gradient-generator-custom-color = Egyedi szín
 zen-panel-ui-gradient-generator-saved-message = Színátmenet sikeresen mentve!
 zen-copy-current-url-confirmation = Az URL-cím a vágólapra lett másolva.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Mégsem
-zen-general-confirm =
+zen-general-confirm = 
     .label = Megerősítés
 zen-pinned-tab-replaced = A rögzített lap URL címe helyébe az aktuális URL cím lépett!
 zen-tabs-renamed = A lap sikeresen át lett nevezve!
 zen-background-tab-opened-toast = Új lap megnyitva!
 zen-workspace-renamed-toast = A munkakörnyezet sikeresen át lett nevezve!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Környezetek
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Modok
+zen-toggle-compact-mode-button = 
+    .label = Kompakt mód
+    .tooltiptext = Kompakt mód ki-/bekapcsolása
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Tudjon meg többet
 zen-close-label = Bezárás
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Keresés...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojik
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ikonok
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Műveletek
+zen-site-data-settings = Beállítások
+zen-generic-manage = Kezelés
+zen-generic-more = Több
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Engedélyezve
+zen-site-data-setting-block = Letiltva
+zen-site-data-security-info-extension = 
+    .label = Kiegészítő
+zen-site-data-security-info-secure = 
+    .label = Biztonságos
+zen-site-data-security-info-not-secure = 
+    .label = Nem biztonságos
+zen-site-data-manage-addons = 
+    .label = Kiegészítők kezelése
+zen-site-data-get-addons = 
+    .label = Kiegészítő hozzáadása
+zen-site-data-site-settings = 
+    .label = Minden webhelybeállítás
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/hu/browser/browser/zen-vertical-tabs.ftl b/locales/hu/browser/browser/zen-vertical-tabs.ftl
index f6c38a34f..138a4223c 100644
--- a/locales/hu/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/hu/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompakt mód
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Kompakt mód engedélyezése
     .accesskey = D
diff --git a/locales/hu/browser/browser/zen-workspaces.ftl b/locales/hu/browser/browser/zen-workspaces.ftl
index 13e5f5ebe..c26bc5a16 100644
--- a/locales/hu/browser/browser/zen-workspaces.ftl
+++ b/locales/hu/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Ikon módosítása
 zen-workspaces-panel-context-default-profile = 
     .label = Profil beállítása
+zen-workspaces-panel-unload = 
+    .label = Környezet ürítése
 zen-workspaces-how-to-reorder-title = Hogyan rendezhetők át a munkakörnyezetek
 zen-workspaces-how-to-reorder-desc = Húzza az oldalsáv alján lévő ikonokat az átrendezéshez
 zen-workspaces-change-theme = 
diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl
index fa3f07447..0192c9643 100644
--- a/locales/id/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/id/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Klik
 zen-glance-trigger-meta-click = 
     .label = Windows (Command) + Klik
-zen-glance-trigger-mantain-click = 
-    .label = Tahan Klik (Segera Datang!)
 zen-look-and-feel-compact-view-header = Tampilkan dalam tampilan ringkas
 zen-look-and-feel-compact-view-description = Tampilkan hanya toolbar yang Anda gunakan!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Sembunyikan indikator kontainer default di bilah tab
 zen-key-unsaved = Pintasan belum tersimpan! Simpan dengan mengklik tombol "Escape" setelah mengetik ulang.
-zen-key-conflict = Konflik dengan pintasan lain
+zen-key-conflict = Konflik dengan { $group } -> { $shortcut }
 pane-zen-theme-title = Pengaturan Tema
 zen-vertical-tabs-title = Susunan sidebar dan tab
 zen-vertical-tabs-header = Tab Vertikal
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 91bd473d1..f065c4669 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = profil saat ini
 unified-extensions-description = Ekstensi digunakan untuk menambahkan lebih banyak fungsi ekstra ke { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Kembalikan ke URL Awal
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Tambahkan ke Essentials ({ $num } / { $max } slot terisi)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Hapus dari Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Ganti URL Sematan ke URL saat ini
     .accesskey = C
 zen-themes-corrupted = Tidak dapat memuat file tema { -brand-short-name } Anda karena rusak. File tersebut telah diatur ulang ke tema default.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Bilah URL baru telah diaktifkan, menghapus kebutuhan untuk halaman tab baru.<br/><br/>
     Coba buka tab baru untuk melihat bilah URL baru beraksi!
 zen-disable = Nonaktifkan
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimalkan
     .tooltip = Minimalkan
 zen-panel-ui-gradient-generator-custom-color = Warna Kustom
 zen-panel-ui-gradient-generator-saved-message = Berhasil menyimpan gradien!
 zen-copy-current-url-confirmation = URL telah disalin ke clipboard.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Batalkan
-zen-general-confirm =
+zen-general-confirm = 
     .label = Konfirmasi
 zen-pinned-tab-replaced = URL awal dari tab yang disematkan telah diganti dengan URL saat ini.
 zen-tabs-renamed = Tab telah berhasil diubah namanya!
 zen-background-tab-opened-toast = Tab baru telah terbuka di latar belakang!
 zen-workspace-renamed-toast = Ruang Kerja telah berhasil diubah namanya!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Ruang
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Mode Ringkas
+    .tooltiptext = Aktifkan/Sembunyikan Mode Ringkas
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Pelajari Lebih Lanjut
 zen-close-label = Tutup
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cari...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emoji
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ikon
 urlbar-search-mode-zen_actions = Aksi
+zen-site-data-settings = Pengaturan
+zen-generic-manage = Kelola
+zen-generic-more = Selengkapnya
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Diizinkan
+zen-site-data-setting-block = Diblokir
+zen-site-data-security-info-extension = 
+    .label = Ekstensi
+zen-site-data-security-info-secure = 
+    .label = Aman
+zen-site-data-security-info-not-secure = 
+    .label = Tidak Aman
+zen-site-data-manage-addons = 
+    .label = Kelola Ekstensi
+zen-site-data-get-addons = 
+    .label = Tambahkan Ekstensi
+zen-site-data-site-settings = 
+    .label = Semua Pengaturan Situs
+zen-site-data-setting-site-protection = Perlindungan Situs
+zen-site-data-panel-feature-callout-title = Rumah baru untuk add-on, izin, dan lainnya
+zen-site-data-panel-feature-callout-subtitle = Klik ikon untuk mengelola pengaturan situs, melihat info keamanan, mengakses ekstensi, dan melakukan tindakan umum.
diff --git a/locales/id/browser/browser/zen-vertical-tabs.ftl b/locales/id/browser/browser/zen-vertical-tabs.ftl
index cb6626afd..2621be1e0 100644
--- a/locales/id/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/id/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Mode Ringkas
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Aktifkan Mode Ringkas
     .accesskey = D
diff --git a/locales/id/browser/browser/zen-workspaces.ftl b/locales/id/browser/browser/zen-workspaces.ftl
index f5ad9e053..084c2a0f6 100644
--- a/locales/id/browser/browser/zen-workspaces.ftl
+++ b/locales/id/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Ubah Ikon
 zen-workspaces-panel-context-default-profile = 
     .label = Atur Profil
+zen-workspaces-panel-unload = 
+    .label = Lepaskan Ruang
 zen-workspaces-how-to-reorder-title = Cara Mengurutkan Ulang Ruang
 zen-workspaces-how-to-reorder-desc = Seret ikon ruang di bagian bawah bilah sisi untuk menyusun ulang urutannya
 zen-workspaces-change-theme = 
diff --git a/locales/is/browser/browser/preferences/zen-preferences.ftl b/locales/is/browser/browser/preferences/zen-preferences.ftl
index 5874e3d6c..8a6c65792 100644
--- a/locales/is/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/is/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Click
 zen-look-and-feel-compact-view-header = Sýna í þéttri sýn
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Hide the default container indicator in the tab bar
 zen-key-unsaved = Unsaved shortcut! Please save it by clicking the "Escape" key after retyping it.
-zen-key-conflict = Conflict with another shortcut
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Theme Settings
 zen-vertical-tabs-title = Sidebar and tabs layout
 zen-vertical-tabs-header = Vertical Tabs
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index 3b9022555..be97016f6 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = núverandi prófíl
 unified-extensions-description = Viðbætur eru notaðar til að koma með meiri auka virkni inn í { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Endursetja Festan Flipa
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Fjarlægja frá Höfuðatriði
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Setja aftur Fest-URL með Núverandi
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } mods skráin þín er skemmd. Þeir hafa verið endurstilltir á sjálfgefið þema.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Nýja vefslóðastikan hefur verið virkjuð og fjarlægir þörfina á nýjum flipasíðum.<br/><br/>
     Prófaðu að opna nýjan flipa til að sjá nýju vefslóðastikuna í notkun!
 zen-disable = Óvirkja
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Sérsniðinn litur
 zen-panel-ui-gradient-generator-saved-message = Vistað hallann!
 zen-copy-current-url-confirmation = Slóðin hefur verið afrituð á klippiborðið.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Læra Meira
 zen-close-label = Loka
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/is/browser/browser/zen-vertical-tabs.ftl b/locales/is/browser/browser/zen-vertical-tabs.ftl
index e59cd7a78..9c71802d2 100644
--- a/locales/is/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/is/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Compact mode
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Enable compact mode
     .accesskey = D
diff --git a/locales/is/browser/browser/zen-workspaces.ftl b/locales/is/browser/browser/zen-workspaces.ftl
index 61bf79a12..452a5e9bc 100644
--- a/locales/is/browser/browser/zen-workspaces.ftl
+++ b/locales/is/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl
index 1bd514e52..5b2948cc3 100644
--- a/locales/it/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/it/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Maiusc + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Mantieni Clic (In Arrivo!)
 zen-look-and-feel-compact-view-header = Mostra nella vista compatta
 zen-look-and-feel-compact-view-description = Mostra solo le barre degli strumenti che utilizzi!
 zen-look-and-feel-compact-view-enabled = 
@@ -43,7 +41,7 @@ pane-settings-workspaces-title = Workspace
 zen-tabs-unloader-enabled = 
     .label = Abilita Scaricamento Scheda
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Utilizza lo sfondo a tema per la barra degli strumenti compatta
 zen-workspace-continue-where-left-off = 
     .label = Continua da dove avevi interrotto
 pane-zen-pinned-tab-manager-title = Schede Bloccate
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Nascondi l'indicatore predefinito del contenitore nella barra delle schede
 zen-key-unsaved = Scorciatoia non salvata! Si prega di proteggerla facendo clic sul tasto "Escape" dopo averlo ripetuto.
-zen-key-conflict = Conflitto con un'altra scorciatoia
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Impostazioni tema
 zen-vertical-tabs-title = Layout barra laterale e schede
 zen-vertical-tabs-header = Schede verticali
@@ -255,7 +253,7 @@ zen-close-tab-shortcut = Chiudi scheda
 zen-compact-mode-shortcut-show-sidebar = Attiva/Disattiva Barra Laterale Fluttuante
 zen-compact-mode-shortcut-show-toolbar = Attiva/Disattiva Barra Fluttuante
 zen-compact-mode-shortcut-toggle = Attiva/disattiva modalità compatta
-zen-glance-expand = Expand Glance
+zen-glance-expand = Espandi Sguardo
 zen-workspace-shortcut-switch-1 = Passa allo spazio di lavoro 1
 zen-workspace-shortcut-switch-2 = Passa allo spazio di lavoro 2
 zen-workspace-shortcut-switch-3 = Passa allo spazio di lavoro 3
@@ -274,7 +272,7 @@ zen-split-view-shortcut-grid = Attiva/Disattiva Griglia Visualizzazione Dividi
 zen-split-view-shortcut-vertical = Attiva/Disattiva Dividi Vista Verticale
 zen-split-view-shortcut-horizontal = Attiva/Disattiva Dividi Vista Orizzontale
 zen-split-view-shortcut-unsplit = Chiudi vista divisa
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Nuova vista divisa vuota
 zen-key-select-tab-1 = Seleziona Scheda #1
 zen-key-select-tab-2 = Seleziona Scheda #2
 zen-key-select-tab-3 = Seleziona Scheda #3
diff --git a/locales/it/browser/browser/zen-folders.ftl b/locales/it/browser/browser/zen-folders.ftl
index 722934b28..4d81d433e 100644
--- a/locales/it/browser/browser/zen-folders.ftl
+++ b/locales/it/browser/browser/zen-folders.ftl
@@ -1,21 +1,21 @@
 zen-folders-search-placeholder = 
     .placeholder = Cerca { $folder-name }...
 zen-folders-panel-rename-folder = 
-    .label = Rinomina Cartella
+    .label = Rinomina cartella
 zen-folders-panel-unpack-folder = 
-    .label = Scompatta Cartella
+    .label = Scompatta cartella
 zen-folders-new-subfolder = 
-    .label = Nuova Sottocartella
+    .label = Nuova sottocartella
 zen-folders-panel-delete-folder = 
-    .label = Cancella Cartella
+    .label = Cancella cartella
 zen-folders-panel-convert-folder-to-space = 
     .label = Converti la cartella in Spazio
 zen-folders-panel-change-folder-space = 
     .label = Cambia Spazio...
 zen-folders-panel-change-icon-folder = 
-    .label = Cambia Icona
+    .label = Cambia icona
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 
-    .label = Scarica tutte le Schede
+    .label = Scarica tutte le schede
 zen-folders-search-no-results = Nessuna scheda corrispondente alla ricerca 🤔
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 8196be8d0..e179c78eb 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = profilo in uso
 unified-extensions-description = Le estensioni sono usate per portare più funzionalità in { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
-    .label = Reimposta Scheda Bloccata
+tab-context-zen-reset-pinned-tab = 
+    .label = Reimposta scheda fissata
     .accesskey = R
-tab-context-zen-add-essential =
-    .label = Aggiungi a Essentials ({ $num } / { $max } slot riempiti)
+tab-context-zen-add-essential = 
+    .label = Aggiungi a Essenziali ({ $num } / { $max } slot riempiti)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Rimuovi dagli Essenziali
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Sostituisci URL fissato con quello corrente
     .accesskey = C
 zen-themes-corrupted = Il tuo file { -brand-short-name } mods è danneggiato. Sono stati reimpostati al tema predefinito.
@@ -17,33 +17,57 @@ zen-shortcuts-corrupted = Il file delle scorciatoie per { -brand-short-name } è
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = La nuova barra degli indirizzi è stata abilitata, eliminando la necessità della pagina di una nuova scheda.<br/><br/>Prova ad aprire una nuova scheda per vedere la nuova barra degli indirizzi in azione!
 zen-disable = Disabilita
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimizza
     .tooltip = Minimizza
-zen-panel-ui-gradient-generator-custom-color = Colore Personalizzato
+zen-panel-ui-gradient-generator-custom-color = Colore personalizzato
 zen-panel-ui-gradient-generator-saved-message = Gradiente salvato con successo!
 zen-copy-current-url-confirmation = L'URL è stato copiato negli appunti.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Annulla
-zen-general-confirm =
+zen-general-confirm = 
     .label = Conferma
 zen-pinned-tab-replaced = L'URL della scheda bloccata è stato sostituito con l'URL attuale.
 zen-tabs-renamed = La scheda è stata rinominata con successo!
 zen-background-tab-opened-toast = Nuova scheda aperta in background!
 zen-workspace-renamed-toast = Il Workspace è stato rinominato con successo!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spazi
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mod
+zen-toggle-compact-mode-button = 
+    .label = Modalità compatta
+    .tooltiptext = Attiva/disattiva Modalità compatta
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Scopri di più
 zen-close-label = Chiudi
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cerca...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emoji
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icone
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Azioni
+zen-site-data-settings = Impostazioni
+zen-generic-manage = Gestisci
+zen-generic-more = Altro
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Consentito
+zen-site-data-setting-block = Bloccato
+zen-site-data-security-info-extension = 
+    .label = Estensione
+zen-site-data-security-info-secure = 
+    .label = Sicuro
+zen-site-data-security-info-not-secure = 
+    .label = Non sicuro
+zen-site-data-manage-addons = 
+    .label = Gestisci estensioni
+zen-site-data-get-addons = 
+    .label = Aggiungi estensioni
+zen-site-data-site-settings = 
+    .label = Tutte le impostazioni del sito
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = Una nuova casa per componenti aggiuntivi, permessi, e altro ancora
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/it/browser/browser/zen-vertical-tabs.ftl b/locales/it/browser/browser/zen-vertical-tabs.ftl
index d7f3259a3..db92bb5f0 100644
--- a/locales/it/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/it/browser/browser/zen-vertical-tabs.ftl
@@ -3,19 +3,18 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Modalità compatta
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Abilita modalità compatta
     .accesskey = D
 zen-toolbar-context-compact-mode-just-tabs = 
     .label = Nascondi barra laterale
 zen-toolbar-context-compact-mode-just-toolbar = 
-    .label = Nascondi barra strumenti
+    .label = Nascondi barra degli strumenti
 zen-toolbar-context-compact-mode-hide-both = 
     .label = Nascondi entrambi
     .accesskey = H
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = Nuova cartella
     .accesskey = N
 sidebar-zen-expand = 
     .label = Espandi barra laterale
diff --git a/locales/it/browser/browser/zen-workspaces.ftl b/locales/it/browser/browser/zen-workspaces.ftl
index 37478dae5..aaacebfa4 100644
--- a/locales/it/browser/browser/zen-workspaces.ftl
+++ b/locales/it/browser/browser/zen-workspaces.ftl
@@ -1,4 +1,4 @@
-zen-panel-ui-workspaces-text = Workspace
+zen-panel-ui-workspaces-text = Spazi
 zen-panel-ui-workspaces-create = 
     .label = Crea Spazio
 zen-panel-ui-folder-create = 
@@ -6,7 +6,7 @@ zen-panel-ui-folder-create =
 zen-panel-ui-new-empty-split = 
     .label = New Split
 zen-workspaces-panel-context-delete = 
-    .label = Elimina lo spazio di lavoro
+    .label = Elimina lo Spazio
     .accesskey = D
 zen-workspaces-panel-change-name = 
     .label = Cambia Nome
@@ -14,21 +14,23 @@ zen-workspaces-panel-change-icon =
     .label = Cambia Icona
 zen-workspaces-panel-context-default-profile = 
     .label = Imposta Profilo
+zen-workspaces-panel-unload = 
+    .label = Scarica Spazio
 zen-workspaces-how-to-reorder-title = Come riordinare gli spazi
 zen-workspaces-how-to-reorder-desc = Trascina le icone degli spazi in fondo alla barra laterale per riordinarle
 zen-workspaces-change-theme = 
     .label = Modifica Tema
 zen-workspaces-panel-context-open = 
-    .label = Apri Workspace
+    .label = Apri Spazio
     .accesskey = O
 zen-workspaces-panel-context-edit = 
-    .label = Modifica Workspace
+    .label = Modifica Spazio
     .accesskey = E
 context-zen-change-workspace-tab = 
     .label = Metti scheda/e su uno spazio di lavoro
     .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
-    .value = Spazi di lavoro
+    .value = Spazi
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Complementare
@@ -49,5 +51,5 @@ zen-workspace-creation-profile = Profilo
     .tooltiptext = I profili vengono usati per separare i cookie e i dati dei siti tra gli spazi.
 zen-workspace-creation-header = Crea uno Spazio
 zen-workspace-creation-label = Gli Spazi sono usati per organizzare le tue schede e sessioni.
-zen-workspaces-delete-workspace-title = Delete Workspace?
+zen-workspaces-delete-workspace-title = Eliminare Spazio?
 zen-workspaces-delete-workspace-body = Sei sicuro di voler cancellare { $name }? Questa azione non può essere annullata.
diff --git a/locales/ja/browser/browser/preferences/zen-preferences.ftl b/locales/ja/browser/browser/preferences/zen-preferences.ftl
index 2c723bae5..078ac2f41 100644
--- a/locales/ja/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ja/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + クリック
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + クリック
-zen-glance-trigger-mantain-click = 
-    .label = クリックを長押し(近日公開予定)
 zen-look-and-feel-compact-view-header = コンパクトビューで表示
 zen-look-and-feel-compact-view-description = 使用しているツールバーのみを表示します！
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = タブバー内のデフォルトのコンテナインジケーターを非表示にする
 zen-key-unsaved = 未保存のショートカットです！再入力後、「エスケープ」キーをクリックして安全にしてください。
-zen-key-conflict = 他のショートカットと競合します
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = テーマ設定
 zen-vertical-tabs-title = サイドバーとタブのレイアウト
 zen-vertical-tabs-header = 垂直タブ
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 7e107d4c2..f7397ca6d 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 使用中のプロファイル
 unified-extensions-description = 拡張機能は、 { -brand-short-name } に多くの追加機能をもたらすために使用されます。
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = ピン留めされたタブをリセット
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Essentialsから削除
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = ピン留めされた URL を現在のものに置き換え
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } Modファイルが破損しています。既定のテーマにリセットされました。
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = 無効
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = カスタムカラー
 zen-panel-ui-gradient-generator-saved-message = グラデーションを正常に保存しました！
 zen-copy-current-url-confirmation = URLをクリップボードにコピーしました
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = 閉じる
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/ja/browser/browser/zen-vertical-tabs.ftl b/locales/ja/browser/browser/zen-vertical-tabs.ftl
index 846657126..278ea1494 100644
--- a/locales/ja/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ja/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = コンパクトモード
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = コンパクトモードを有効にする
     .accesskey = D
diff --git a/locales/ja/browser/browser/zen-workspaces.ftl b/locales/ja/browser/browser/zen-workspaces.ftl
index 6328c3143..28c02917b 100644
--- a/locales/ja/browser/browser/zen-workspaces.ftl
+++ b/locales/ja/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/ko/browser/browser/preferences/zen-preferences.ftl b/locales/ko/browser/browser/preferences/zen-preferences.ftl
index 616808c45..a08b26c11 100644
--- a/locales/ko/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ko/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + 클릭
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + 클릭
-zen-glance-trigger-mantain-click = 
-    .label = 길게 클릭 (Coming Soon!)
 zen-look-and-feel-compact-view-header = 사이드바 축소 모드로 보기
 zen-look-and-feel-compact-view-description = 사용하는 툴바만 보세요!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = 탭에서 기본 컨테이너 표시 숨기기
 zen-key-unsaved = 단축키가 저장되지 않았습니다! 다시 입력한 후 "Escape" 키를 눌러 저장하세요.
-zen-key-conflict = 다른 단축키와 겹침
+zen-key-conflict = { $group } -> { $shortcut }과 충돌함
 pane-zen-theme-title = 테마 설정
 zen-vertical-tabs-title = 사이드바 및 탭 레이아웃
 zen-vertical-tabs-header = 수직 탭
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 9a1562043..6b0d3fee0 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 현재 프로필
 unified-extensions-description = 확장 프로그램은 { -brand-short-name }에 더 많은 추가 기능을 제공하는 데 사용됩니다.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = 고정된 탭 초기화
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = 에센셜에 추가 ({ $num } / { $max } 개 추가됨)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = 에센셜에서 제거하기
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = 고정된 URL을 현재 URL로 변경
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } 모드 파일이 손상되었습니다. 기본 테마로 재설정되었습니다.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     새 탭 페이지가 필요 없는 새로운 주소 표시줄이 활성화 되었습니다.<br/><br/>
     새 탭을 열어서 새로운 URL 바를 만나보세요!
 zen-disable = 비활성화
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = 최소화
     .tooltip = 최소화
 zen-panel-ui-gradient-generator-custom-color = 커스텀 색상
 zen-panel-ui-gradient-generator-saved-message = 성공적으로 그라데이션을 저장했습니다!
 zen-copy-current-url-confirmation = URL이 복사되었습니다.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = 취소
-zen-general-confirm =
+zen-general-confirm = 
     .label = 확인
 zen-pinned-tab-replaced = 고정 URL이 현재 URL로 변경되었습니다!
 zen-tabs-renamed = 탭의 이름이 성공적으로 변경되었습니다!
 zen-background-tab-opened-toast = 새 백그라운드 탭이 열렸습니다!
 zen-workspace-renamed-toast = 워크스페이스 이름이 변경되었습니다!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = 스페이스
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = 모드
+zen-toggle-compact-mode-button = 
+    .label = 사이드바 축소 모드
+    .tooltiptext = 사이드바 축소 토글
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = 더 알아보기
 zen-close-label = 닫기
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = 검색...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = 이모티콘
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = 아이콘
 urlbar-search-mode-zen_actions = 액션
+zen-site-data-settings = 설정
+zen-generic-manage = 관리
+zen-generic-more = 더 보기
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = 허용됨
+zen-site-data-setting-block = 금지됨
+zen-site-data-security-info-extension = 
+    .label = 확장
+zen-site-data-security-info-secure = 
+    .label = 안전함
+zen-site-data-security-info-not-secure = 
+    .label = 안전하지 않음
+zen-site-data-manage-addons = 
+    .label = 확장 프로그램 관리
+zen-site-data-get-addons = 
+    .label = 확장 프로그램 추가
+zen-site-data-site-settings = 
+    .label = 모든 사이트 설정
+zen-site-data-setting-site-protection = 사이트 보호
+zen-site-data-panel-feature-callout-title = 애드온, 권한, 그리고 더 많은 것을 위한 새로운 곳
+zen-site-data-panel-feature-callout-subtitle = 아이콘을 클릭해 사이트 설정, 보안 정보 조회, 확장 프로그램 접근, 기타 행동을 수행할 수 있습니다.
diff --git a/locales/ko/browser/browser/zen-vertical-tabs.ftl b/locales/ko/browser/browser/zen-vertical-tabs.ftl
index 846b79e92..c25da40d4 100644
--- a/locales/ko/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ko/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = 사이드바 축소 모드
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = 사이드바 축소 모드 활성화
     .accesskey = D
diff --git a/locales/ko/browser/browser/zen-workspaces.ftl b/locales/ko/browser/browser/zen-workspaces.ftl
index 71c70f749..6e300360d 100644
--- a/locales/ko/browser/browser/zen-workspaces.ftl
+++ b/locales/ko/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = 아이콘 변경
 zen-workspaces-panel-context-default-profile = 
     .label = 프로필 설정
+zen-workspaces-panel-unload = 
+    .label = 스페이스 로드 해제
 zen-workspaces-how-to-reorder-title = 스페이스를 재정렬하는 법
 zen-workspaces-how-to-reorder-desc = 사이드바 하단의 스페이스 아이콘을 드래그해 재정렬할 수 있습니다
 zen-workspaces-change-theme = 
diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl
index b6a8bb193..43318d643 100644
--- a/locales/lt/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Lyg2 + spausti
 zen-glance-trigger-meta-click = 
     .label = Meta (Komanda) + spausti
-zen-glance-trigger-mantain-click = 
-    .label = Laikyti spustelėjus (netrukus pasirodys!)
 zen-look-and-feel-compact-view-header = Rodyti kompaktiniame rodinyje
 zen-look-and-feel-compact-view-description = Rodyti tik tas įrankių juostas, kurias naudojate!
 zen-look-and-feel-compact-view-enabled = 
@@ -43,7 +41,7 @@ pane-settings-workspaces-title = Darbo sritys
 zen-tabs-unloader-enabled = 
     .label = Įjungti kortelių iškėlyklę
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Naudoti teminį foną kompaktinei įrankių juostai
 zen-workspace-continue-where-left-off = 
     .label = Tęskite, kur baigėte
 pane-zen-pinned-tab-manager-title = Prisegtos kortelės
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Slėpti numatytojo konteinerio indikatorių kortelių juostoje
 zen-key-unsaved = Neįrašytas spartusis klavišas! Iš naujo jį įvedę, paspauskite grįžimo klavišą.
-zen-key-conflict = Konfliktas su kitu sparčiuoju klavišu
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Temų nustatymai
 zen-vertical-tabs-title = Šoninė juosta ir kortelių išdėstymas
 zen-vertical-tabs-header = Vertikalios kortelės
@@ -221,7 +219,7 @@ zen-key-exit-full-screen = Išeiti iš viso ekrano
 zen-ai-chatbot-sidebar-shortcut = Perjungti DI pokalbių roboto šoninę juostą
 zen-key-inspector-mac = Perjungti inspektoryklę („Mac“)
 zen-toggle-sidebar-shortcut = Perjungti „Firefox“ šoninę juostą
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-toggle-pin-tab-shortcut = Perjungti prisegtą kortelę
 zen-reader-mode-toggle-shortcut-other = Perjungti skaitymo režimą
 zen-picture-in-picture-toggle-shortcut = Perjungti vaizdą vaizde
 zen-nav-reload-shortcut-2 = Įkelti iš naujo puslapį
@@ -255,7 +253,7 @@ zen-close-tab-shortcut = Užverti kortelę
 zen-compact-mode-shortcut-show-sidebar = Perjungti slankančią šoninę juostą
 zen-compact-mode-shortcut-show-toolbar = Perjungti slankančią įrankių juostą
 zen-compact-mode-shortcut-toggle = Perjungti kompaktinį režimą
-zen-glance-expand = Expand Glance
+zen-glance-expand = Išskleisti greitą pažiūrėjimą
 zen-workspace-shortcut-switch-1 = Perjungti į 1 darbo sritį
 zen-workspace-shortcut-switch-2 = Perjungti į 2 darbo sritį
 zen-workspace-shortcut-switch-3 = Perjungti į 3 darbo sritį
@@ -274,7 +272,7 @@ zen-split-view-shortcut-grid = Perjungti skaidymo rodinį tinkleliu
 zen-split-view-shortcut-vertical = Perjungti skaidymo rodinį vertikaliai
 zen-split-view-shortcut-horizontal = Perjungti skaidymo rodinį horizontaliai
 zen-split-view-shortcut-unsplit = Užverti skaidymo rodinį
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Naujas tuščias skaidymo rodinys
 zen-key-select-tab-1 = Pasirinkti #1 kortelę
 zen-key-select-tab-2 = Pasirinkti #2 kortelę
 zen-key-select-tab-3 = Pasirinkti #3 kortelę
diff --git a/locales/lt/browser/browser/zen-folders.ftl b/locales/lt/browser/browser/zen-folders.ftl
index 84556ec44..2deb44013 100644
--- a/locales/lt/browser/browser/zen-folders.ftl
+++ b/locales/lt/browser/browser/zen-folders.ftl
@@ -15,7 +15,7 @@ zen-folders-panel-change-folder-space =
 zen-folders-panel-change-icon-folder = 
     .label = Keisti piktogramą
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = Iškelti aktyvias šiame aplanke
 zen-folders-unload-folder = 
     .label = Iškelti visas korteles
 zen-folders-search-no-results = Nėra kortelių, atitinkančių šią paiešką. 🤔
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index 0f9917e65..5f5d7c9c1 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = dabartinis profilis
 unified-extensions-description = Plėtiniai naudojami norint į „{ -brand-short-name }“ įtraukti daugiau papildomų funkcijų.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Atkurti prisegtą kortelę
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Įtraukti į būtiniausius ({ $num } / { $max } užpildytų vietų)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Šalinti iš būtiniausių
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Pakeisti prisegtą URL adresą dabartiniu
     .accesskey = C
 zen-themes-corrupted = Jūsų „{ -brand-short-name }“ modifikacijos failas sugadintas. Jie buvo atkurti į numatytąją temą.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Įjungta nauja URL juosta, todėl nebereikia naujų kortelių puslapių.<br/><br/>
     Pabandykite atverti naują kortelę, kad pamatytumėte naująją URL juostą!
 zen-disable = Išjungti
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Sumažinti
     .tooltip = Sumažinti
 zen-panel-ui-gradient-generator-custom-color = Pasirinktinė spalva
 zen-panel-ui-gradient-generator-saved-message = Gradientas sėkmingai įrašytas.
 zen-copy-current-url-confirmation = URL buvo nukopijuotas į iškarpinę.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Atšaukti
-zen-general-confirm =
+zen-general-confirm = 
     .label = Patvirtinti
 zen-pinned-tab-replaced = Prisegtos kortelės URL pakeistas dabartiniu URL.
 zen-tabs-renamed = Kortelė sėkmingai pervadinta.
 zen-background-tab-opened-toast = Nauja fonos kortelė atverta.
 zen-workspace-renamed-toast = Darbo sritis sėkmingai pervadintas.
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Erdvės
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Modifikacijos
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Sužinoti daugiau
 zen-close-label = Užverti
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Ieškokite...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Jaustukai
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Piktogramos
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Veiksmai
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/lt/browser/browser/zen-vertical-tabs.ftl b/locales/lt/browser/browser/zen-vertical-tabs.ftl
index 9276eea15..5b6b37e53 100644
--- a/locales/lt/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/lt/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompaktinis režimas
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Įjungti kompaktinį režimą
     .accesskey = D
diff --git a/locales/lt/browser/browser/zen-workspaces.ftl b/locales/lt/browser/browser/zen-workspaces.ftl
index 018c8120d..580bec0e3 100644
--- a/locales/lt/browser/browser/zen-workspaces.ftl
+++ b/locales/lt/browser/browser/zen-workspaces.ftl
@@ -4,7 +4,7 @@ zen-panel-ui-workspaces-create =
 zen-panel-ui-folder-create = 
     .label = Kurti aplanką
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Naujas skaidymas
 zen-workspaces-panel-context-delete = 
     .label = Ištrinti darbo sritį
     .accesskey = D
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Keisti piktogramą
 zen-workspaces-panel-context-default-profile = 
     .label = Nustatyti profilį
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Kaip pertvarkyti erdves
 zen-workspaces-how-to-reorder-desc = Nutempkite erdvės piktogramas šoninės juostos apačioje, kad pertvarkytumėte jas.
 zen-workspaces-change-theme = 
diff --git a/locales/nl/browser/browser/preferences/zen-preferences.ftl b/locales/nl/browser/browser/preferences/zen-preferences.ftl
index 65451d9cf..c0106766b 100644
--- a/locales/nl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nl/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + klik
 zen-glance-trigger-meta-click = 
     .label = Windows (Command) + klik
-zen-glance-trigger-mantain-click = 
-    .label = Klikken ingedrukt houden (komt binnenkort!)
 zen-look-and-feel-compact-view-header = Toon in compacte weergave
 zen-look-and-feel-compact-view-description = Toon alleen de werkbalken die je gebruikt!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Verberg de standaard container indicator in de tabbladbalk
 zen-key-unsaved = Snelkoppeling is niet opgeslagen! Bewaar deze door op de "Escape" knop te drukken na het opnieuw typen.
-zen-key-conflict = Conflict met een andere snelkoppeling
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Thema instellingen
 zen-vertical-tabs-title = Zijbalk en tabbladen lay-out
 zen-vertical-tabs-header = Verticale tabbladen
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 8e5ba7b49..024dc2692 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = huidig profiel
 unified-extensions-description = Extensies worden gebruikt om extra functionaliteit toe te voegen aan { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Vastgezette tabblad resetten
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Toevoegen aan Essentials ({ $num } / { $max } plekken gevuld)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Verwijderen uit Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Vastgezette URL vervangen met huidige
     .accesskey = C
 zen-themes-corrupted = Je { -brand-short-name } mods bestand is beschadigd. Ze zijn gereset naar het standaard thema.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     De nieuwe URL-balk is ingeschakeld, waardoor nieuwe tabbladen niet meer nodig zijn.<br/><br/>
     Probeer een nieuw tabblad te openen om de nieuwe URL-balk in actie te zien!
 zen-disable = Uitschakelen
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimaliseren
     .tooltip = Minimaliseren
 zen-panel-ui-gradient-generator-custom-color = Aangepaste kleur
 zen-panel-ui-gradient-generator-saved-message = Verloop is succesvol opgeslagen!
 zen-copy-current-url-confirmation = De URL is gekopieerd naar het klembord.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Annuleren
-zen-general-confirm =
+zen-general-confirm = 
     .label = Bevestigen
 zen-pinned-tab-replaced = Vastgemaakte tabblad URL is vervangen met de huidige URL!
 zen-tabs-renamed = Tabblad is succesvol hernoemd!
 zen-background-tab-opened-toast = Nieuw achtergrondtabblad geopend!
 zen-workspace-renamed-toast = Werkruimte succesvol is hernoemd!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Ruimtes
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Meer leren
 zen-close-label = Sluiten
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Zoeken…
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/nl/browser/browser/zen-vertical-tabs.ftl b/locales/nl/browser/browser/zen-vertical-tabs.ftl
index 22b2e4513..c1e21a740 100644
--- a/locales/nl/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/nl/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Compacte modus
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Compacte modus inschakelen
     .accesskey = D
diff --git a/locales/nl/browser/browser/zen-workspaces.ftl b/locales/nl/browser/browser/zen-workspaces.ftl
index 92e0b8926..95d2e37e6 100644
--- a/locales/nl/browser/browser/zen-workspaces.ftl
+++ b/locales/nl/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Icon wijzigen
 zen-workspaces-panel-context-default-profile = 
     .label = Profiel instellen
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Hoe ruimtes te herschikken
 zen-workspaces-how-to-reorder-desc = Sleep het ruimte icoon onderaan de zijbalk om ze te herschikken
 zen-workspaces-change-theme = 
diff --git a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
index 84eccbcd3..85e53500d 100644
--- a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Click
 zen-look-and-feel-compact-view-header = Show in compact view
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Hide the default container indicator in the tab bar
 zen-key-unsaved = Unsaved shortcut! Please save it by clicking the "Escape" key after retyping it.
-zen-key-conflict = Conflict with another shortcut
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Theme Settings
 zen-vertical-tabs-title = Sidebar and tabs layout
 zen-vertical-tabs-header = Vertical Tabs
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 0677b61af..aaa6fa7c8 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = current profile
 unified-extensions-description = Extensions are used to bring more extra functionality into { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl b/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl
index e59cd7a78..9c71802d2 100644
--- a/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Compact mode
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Enable compact mode
     .accesskey = D
diff --git a/locales/nn-NO/browser/browser/zen-workspaces.ftl b/locales/nn-NO/browser/browser/zen-workspaces.ftl
index e194ee7c4..ac5baadd4 100644
--- a/locales/nn-NO/browser/browser/zen-workspaces.ftl
+++ b/locales/nn-NO/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl
index c48814b1c..390737a02 100644
--- a/locales/pl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + kliknięcie
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + kliknięcie
-zen-glance-trigger-mantain-click = 
-    .label = Przytrzymaj kliknięcie (wkrótce!)
 zen-look-and-feel-compact-view-header = Pokaż w widoku kompaktowym
 zen-look-and-feel-compact-view-description = Pokaż tylko paski narzędzi, których używasz!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Ukryj domyślny wskaźnik kontenera na pasku kart
 zen-key-unsaved = Niezapisany skrót! Proszę zabezpieczyć go klikając przycisk "Escape" po ponownym wpisaniu.
-zen-key-conflict = Konflikt z innym skrótem
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Ustawienia Motywu
 zen-vertical-tabs-title = Pasek boczny i układ kart
 zen-vertical-tabs-header = Pionowe karty
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index c74068fb8..cc104d4b2 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = Aktualny profil
 unified-extensions-description = Rozszerzenia są używane do zapewnienia większej liczby dodatkowych funkcji w { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Resetuj przypiętą kartę
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Dodaj do Niezbędnych ({ $num } / { $max } miejsc wypełnione)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Usuń z Niezbędnych
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Zastąp przypięty adres URL aktualnym
     .accesskey = C
 zen-themes-corrupted = Twój plik modów { -brand-short-name } jest uszkodzony. Zostały one zresetowane do domyślnego stanu.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Nowy pasek adresu został aktywowany, a tym samym strona nowej karty nie jest już potrzebna.<br/><br/>
     Spróbuj otworzyć nową kartę i wypróbuj nowy pasek adresu w akcji!
 zen-disable = Deaktywuj
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Zminimalizuj
     .tooltip = Zminimalizuj
 zen-panel-ui-gradient-generator-custom-color = Niestandardowy kolor
 zen-panel-ui-gradient-generator-saved-message = Pomyślnie zapisano gradient!
 zen-copy-current-url-confirmation = Adres URL został skopiowany do schowka.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Anuluj
-zen-general-confirm =
+zen-general-confirm = 
     .label = Potwierdź
 zen-pinned-tab-replaced = URL przypiętej karty został zastąpiony bieżącym adresem.
 zen-tabs-renamed = Nazwa karty została z powodzeniem zmieniona!
 zen-background-tab-opened-toast = Nowa karta została otworzona w tle!
 zen-workspace-renamed-toast = Zmieniono nazwę Przestrzeni roboczej!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Przestrzenie
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Modyfikacje
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Dowiedz się więcej
 zen-close-label = Zamknij
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Szukaj...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/pl/browser/browser/zen-vertical-tabs.ftl b/locales/pl/browser/browser/zen-vertical-tabs.ftl
index 05c52528c..b260030c3 100644
--- a/locales/pl/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/pl/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Tryb kompaktowy
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Włącz tryb kompaktowy
     .accesskey = D
diff --git a/locales/pl/browser/browser/zen-workspaces.ftl b/locales/pl/browser/browser/zen-workspaces.ftl
index 84bbff143..48592dcda 100644
--- a/locales/pl/browser/browser/zen-workspaces.ftl
+++ b/locales/pl/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Zmień ikonę
 zen-workspaces-panel-context-default-profile = 
     .label = Ustaw profil
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Jak przesuwać Przestrzenie
 zen-workspaces-how-to-reorder-desc = Przesuwaj ikony Przestrzeni na dole paska, żeby je przeorganizować
 zen-workspaces-change-theme = 
diff --git a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
index 10fca566b..fe1197646 100644
--- a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Clique
 zen-glance-trigger-meta-click = 
     .label = Meta (Comando) + Clique
-zen-glance-trigger-mantain-click = 
-    .label = Segurar Clique (Em breve!)
 zen-look-and-feel-compact-view-header = Exibir em modo compacto
 zen-look-and-feel-compact-view-description = Apenas mostre as barras de ferramentas que você usa!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Ocultar o indicador padrão do contêiner na barra de guias
 zen-key-unsaved = Atalho não salvo! Proteja-o clicando na tecla "Escape" após digitá-lo novamente.
-zen-key-conflict = Conflito com outro atalho
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Opções de tema
 zen-vertical-tabs-title = Layout de barra lateral e abas
 zen-vertical-tabs-header = Abas verticais
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index dd00db284..2eac3976e 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil atual
 unified-extensions-description = As extensões são usadas para trazer mais recursos adicionais para o { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Redefinir Guia Fixada
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Remover dos Essenciais
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Substituir URL da Guia Fixada pela Atual
     .accesskey = C
 zen-themes-corrupted = Seu arquivo de modificações { -brand-short-name } está corrompido. Eles foram redefinidos para o tema padrão.
@@ -17,33 +17,57 @@ zen-shortcuts-corrupted = Seu arquivo de atalhos { -brand-short-name } está cor
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = A nova barra de URL foi ativada, removendo a necessidade de novas páginas de guia.<br/><br/>Tente abrir uma nova guia para ver a nova barra de URL em ação!
 zen-disable = Desativar
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimizar
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Cor Personalizada
 zen-panel-ui-gradient-generator-saved-message = O gradiente foi salvo com sucesso!
 zen-copy-current-url-confirmation = A URL foi copiada para a área de transferência.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancelar
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirmar
 zen-pinned-tab-replaced = A URL da guia fixada foi substituída pela URL atual!
 zen-tabs-renamed = A guia foi renomeada com sucesso!
 zen-background-tab-opened-toast = Nova guia em segundo plano aberta!
 zen-workspace-renamed-toast = A área de trabalho foi renomeada com sucesso!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Espaços
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Modo Compacto
+    .tooltiptext = Alternar Modo Compacto
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Saiba Mais
 zen-close-label = Fechar
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Pesquisar...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ícones
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Ações
+zen-site-data-settings = Configurações
+zen-generic-manage = Gerenciar
+zen-generic-more = Mais
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Permitido
+zen-site-data-setting-block = Bloqueado
+zen-site-data-security-info-extension = 
+    .label = Extensão
+zen-site-data-security-info-secure = 
+    .label = Seguro
+zen-site-data-security-info-not-secure = 
+    .label = Não seguro
+zen-site-data-manage-addons = 
+    .label = Gerenciar Extensões
+zen-site-data-get-addons = 
+    .label = Adicionar Extensões
+zen-site-data-site-settings = 
+    .label = Todas as Configurações do Site
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl b/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl
index bf9fda39a..5d3b30d0d 100644
--- a/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Modo compacto
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Ativar modo compacto
     .accesskey = D
diff --git a/locales/pt-BR/browser/browser/zen-workspaces.ftl b/locales/pt-BR/browser/browser/zen-workspaces.ftl
index 5a1c1ca2c..95d57fc06 100644
--- a/locales/pt-BR/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-BR/browser/browser/zen-workspaces.ftl
@@ -2,7 +2,7 @@ zen-panel-ui-workspaces-text = Espaços
 zen-panel-ui-workspaces-create = 
     .label = Criar Espaço
 zen-panel-ui-folder-create = 
-    .label = Nova Pasta
+    .label = Criar Pasta
 zen-panel-ui-new-empty-split = 
     .label = Nova Divisão
 zen-workspaces-panel-context-delete = 
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Alterar Ícone
 zen-workspaces-panel-context-default-profile = 
     .label = Definir Perfil
+zen-workspaces-panel-unload = 
+    .label = Descarregar Espaço
 zen-workspaces-how-to-reorder-title = Como reordenar os espaços
 zen-workspaces-how-to-reorder-desc = Arraste os ícones dos espaços na parte inferior da barra lateral para reordená-los
 zen-workspaces-change-theme = 
diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
index acc8637ea..68ea4bf20 100644
--- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Clique
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Clique
-zen-glance-trigger-mantain-click = 
-    .label = Manter Clique (Em Breve!)
 zen-look-and-feel-compact-view-header = Mostrar na vista compacta
 zen-look-and-feel-compact-view-description = Mostrar apenas as barras de ferramentas que usa!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Ocultar o indicador padrão do contentor na barra de separadores
 zen-key-unsaved = Atalho não guardado! Por favor, proteja-o clicando na tecla "Escape" depois de o voltar a inserir.
-zen-key-conflict = Conflito com outro atalho
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Configurações do Tema
 zen-vertical-tabs-title = Disposição da Barra Lateral e dos Separadores
 zen-vertical-tabs-header = Separadores Verticais
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 059e65876..6d123455b 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = perfil atual
 unified-extensions-description = As extensões são usadas para trazer funcionalidades adicionais para o { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Repor o Separador Fixado
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Remover dos Essenciais
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Substituir o URL Fixado pelo URL Atual
     .accesskey = C
 zen-themes-corrupted = O seu ficheiro de modificações do { -brand-short-name } está corrompido. Elas foram redefinidas como iguais às do tema padrão.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     A nova barra de URL foi ativada, removendo a necessidade de páginas de novo separador.<br/><br/>
     Experimente abrir um novo separador para ver a nova barra de URL em ação!
 zen-disable = Desativar
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimizar
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Cor personalizada
 zen-panel-ui-gradient-generator-saved-message = Gradiente guardado com sucesso!
 zen-copy-current-url-confirmation = O URL foi copiado para a área de transferência.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancelar
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirmar
 zen-pinned-tab-replaced = O URL do separador fixado foi substituído pelo URL atual.
 zen-tabs-renamed = Nome do separador alterado com sucesso!
 zen-background-tab-opened-toast = Novo separador aberto em segundo plano!
 zen-workspace-renamed-toast = Nome do espaço de trabalho alterado com sucesso!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Espaços
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Modificações
+zen-toggle-compact-mode-button = 
+    .label = Modo Compacto
+    .tooltiptext = Alternar Modo Compacto
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Saber Mais
 zen-close-label = Fechar
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Pesquisar...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ícones
 urlbar-search-mode-zen_actions = Ações
+zen-site-data-settings = Definições
+zen-generic-manage = Gerir
+zen-generic-more = Mais
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Permitido
+zen-site-data-setting-block = Bloqueado
+zen-site-data-security-info-extension = 
+    .label = Extensão
+zen-site-data-security-info-secure = 
+    .label = Seguro
+zen-site-data-security-info-not-secure = 
+    .label = Não Seguro
+zen-site-data-manage-addons = 
+    .label = Gerir Extensões
+zen-site-data-get-addons = 
+    .label = Adicionar Extensões
+zen-site-data-site-settings = 
+    .label = Todas as Definições do Site
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl b/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl
index 3bf9a69e4..1fa65f89f 100644
--- a/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Modo compacto
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Ativar modo compacto
     .accesskey = D
diff --git a/locales/pt-PT/browser/browser/zen-workspaces.ftl b/locales/pt-PT/browser/browser/zen-workspaces.ftl
index e363e5668..9394615ed 100644
--- a/locales/pt-PT/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-PT/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Alterar Ícone
 zen-workspaces-panel-context-default-profile = 
     .label = Definir Perfil
+zen-workspaces-panel-unload = 
+    .label = Descarregar Espaço
 zen-workspaces-how-to-reorder-title = Como reordenar espaços
 zen-workspaces-how-to-reorder-desc = Arraste os ícones de espaço na parte inferior da barra lateral para os reordenar
 zen-workspaces-change-theme = 
diff --git a/locales/ru/browser/browser/preferences/zen-preferences.ftl b/locales/ru/browser/browser/preferences/zen-preferences.ftl
index 3fdd81e85..10787834d 100644
--- a/locales/ru/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ru/browser/browser/preferences/zen-preferences.ftl
@@ -11,7 +11,7 @@ sync-currently-syncing-workspaces = Рабочие пространства
 sync-engine-workspaces = 
     .label = Рабочие пространства
     .tooltiptext = Синхронизируйте пространства между устройствами
-    .accesskey = W
+    .accesskey = Ц
 zen-glance-title = Предпросмотр
 zen-glance-header = Общие настройки предпросмотра
 zen-glance-description = Быстро просматривайте ссылки, не открывая их в отдельной вкладке
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + ЛКМ
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + ЛКМ
-zen-glance-trigger-mantain-click = 
-    .label = Зажатие ЛКМ (скоро!)
 zen-look-and-feel-compact-view-header = Компактный вид
 zen-look-and-feel-compact-view-description = Включите только нужные панели инструментов!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Скрывать индикатор контейнера по умолчанию на панели вкладок
 zen-key-unsaved = Вы не сохранили сочетание клавиш. Сохраните его, нажав Esc после ввода.
-zen-key-conflict = Конфликт с другим сочетанием клавиш
+zen-key-conflict = Конфликтует с { $group } -> { $shortcut }
 pane-zen-theme-title = Настройки темы
 zen-vertical-tabs-title = Боковая панель и раскладка вкладок
 zen-vertical-tabs-header = Вертикальные вкладки
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 36a47e9c4..3b3783327 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -1,17 +1,17 @@
 zen-panel-ui-current-profile-text = текущий профиль
 unified-extensions-description = Расширения дополняют функционал { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Сбросить закреплённую вкладку
-    .accesskey = R
-tab-context-zen-add-essential =
-    .label = Добавить в важное ({ $num } из { $num } слотов заполнено)
-    .accesskey = E
-tab-context-zen-remove-essential =
+    .accesskey = К
+tab-context-zen-add-essential = 
+    .label = Добавить в важное ({ $num } из { $max } слотов занято)
+    .accesskey = У
+tab-context-zen-remove-essential = 
     .label = Удалить из важного
-    .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+    .accesskey = К
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Заменить закреплённый адрес на текущий
-    .accesskey = C
+    .accesskey = С
 zen-themes-corrupted = Файл дополнения { -brand-short-name } повреждён. Возвращена тема по умолчанию.
 zen-shortcuts-corrupted = Файл комбинаций клавиш { -brand-short-name } повреждён. Возвращены комбинации клавиш по умолчанию.
 # note: Do not translate the "<br/>" tags in the following string
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Новая адресная строка активирована, теперь нет необходимости использовать отдельные страницы для новых вкладок.<br/><br/>
     Попробуйте открыть новую вкладку, чтобы увидеть новую адресную строку в действии!
 zen-disable = Выключить
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Свернуть
     .tooltip = Свернуть
 zen-panel-ui-gradient-generator-custom-color = Пользовательский цвет
 zen-panel-ui-gradient-generator-saved-message = Градиент успешно сохранён!
 zen-copy-current-url-confirmation = Ссылка скопирована в буфер обмена.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Отменить
-zen-general-confirm =
+zen-general-confirm = 
     .label = Подтвердить
 zen-pinned-tab-replaced = Адрес закреплённой вкладки заменён на текущий адрес!
 zen-tabs-renamed = Вкладка успешно переименована!
 zen-background-tab-opened-toast = Открыта новая фоновая вкладка!
 zen-workspace-renamed-toast = Пространство успешно переименовано!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Пространства
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Моды
+zen-toggle-compact-mode-button = 
+    .label = Компактный режим
+    .tooltiptext = Переключить компактный режим
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Узнать больше
 zen-close-label = Закрыть
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Найти...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Эмодзи
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Иконки
 urlbar-search-mode-zen_actions = Действия
+zen-site-data-settings = Настройки
+zen-generic-manage = Изменить
+zen-generic-more = Ещё
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Разрешено
+zen-site-data-setting-block = Запрещено
+zen-site-data-security-info-extension = 
+    .label = Расширение
+zen-site-data-security-info-secure = 
+    .label = Безопасно
+zen-site-data-security-info-not-secure = 
+    .label = Небезопасно
+zen-site-data-manage-addons = 
+    .label = Управление расширениями
+zen-site-data-get-addons = 
+    .label = Добавить расширения
+zen-site-data-site-settings = 
+    .label = Все настройки сайта
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/ru/browser/browser/zen-split-view.ftl b/locales/ru/browser/browser/zen-split-view.ftl
index b3f618278..88d3d207f 100644
--- a/locales/ru/browser/browser/zen-split-view.ftl
+++ b/locales/ru/browser/browser/zen-split-view.ftl
@@ -6,10 +6,10 @@ tab-zen-split-tabs =
             [few] Разделить { $tabCount } вкладки
            *[other] Разделить { $tabCount } вкладок
         }
-    .accesskey = S
+    .accesskey = Ы
 zen-split-link = 
     .label = Раздельный вид в новой вкладке
-    .accesskey = S
+    .accesskey = Ы
 zen-split-view-modifier-header = Разделение вкладок
 zen-split-view-modifier-activate-reallocation = 
     .label = Активировать перемещение вкладок
diff --git a/locales/ru/browser/browser/zen-vertical-tabs.ftl b/locales/ru/browser/browser/zen-vertical-tabs.ftl
index 757a0d602..f9c47ec4e 100644
--- a/locales/ru/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ru/browser/browser/zen-vertical-tabs.ftl
@@ -3,10 +3,9 @@ zen-toolbar-context-tabs-right =
     .accesskey = Р
 zen-toolbar-context-compact-mode = 
     .label = Компактный вид
-    .accesskey = С
 zen-toolbar-context-compact-mode-enable = 
     .label = Включить компактный вид
-    .accesskey = D
+    .accesskey = В
 zen-toolbar-context-compact-mode-just-tabs = 
     .label = Скрыть боковую панель
 zen-toolbar-context-compact-mode-just-toolbar = 
@@ -16,7 +15,7 @@ zen-toolbar-context-compact-mode-hide-both =
     .accesskey = Н
 zen-toolbar-context-new-folder = 
     .label = Новая папка
-    .accesskey = N
+    .accesskey = Т
 sidebar-zen-expand = 
     .label = Развернуть боковую панель
 sidebar-zen-create-new = 
diff --git a/locales/ru/browser/browser/zen-workspaces.ftl b/locales/ru/browser/browser/zen-workspaces.ftl
index ff1c4cb31..554aab913 100644
--- a/locales/ru/browser/browser/zen-workspaces.ftl
+++ b/locales/ru/browser/browser/zen-workspaces.ftl
@@ -1,4 +1,4 @@
-zen-panel-ui-workspaces-text = Рабочие пространства
+zen-panel-ui-workspaces-text = Пространства
 zen-panel-ui-workspaces-create = 
     .label = Создать пространство
 zen-panel-ui-folder-create = 
@@ -7,29 +7,31 @@ zen-panel-ui-new-empty-split =
     .label = Новая разделённая вкладка
 zen-workspaces-panel-context-delete = 
     .label = Удалить пространство
-    .accesskey = D
+    .accesskey = В
 zen-workspaces-panel-change-name = 
     .label = Переименовать
 zen-workspaces-panel-change-icon = 
     .label = Изменить значок
 zen-workspaces-panel-context-default-profile = 
     .label = Настроить профиль
+zen-workspaces-panel-unload = 
+    .label = Выгрузить пространство
 zen-workspaces-how-to-reorder-title = Как переупорядочить пространства
 zen-workspaces-how-to-reorder-desc = Перетащите пространства внизу боковой панели, чтобы изменить их порядок
 zen-workspaces-change-theme = 
     .label = Изменить тему
 zen-workspaces-panel-context-open = 
     .label = Открыть пространство
-    .accesskey = O
+    .accesskey = Щ
 zen-workspaces-panel-context-edit = 
     .label = Редактировать пространство
-    .accesskey = E
+    .accesskey = У
 context-zen-change-workspace-tab = 
     .label = Перенести вкладку(-ки) на рабочее пространство
-    .accesskey = C
+    .accesskey = С
 zen-bookmark-edit-panel-workspace-selector = 
     .value = Рабочие пространства
-    .accesskey = W
+    .accesskey = Ц
 zen-panel-ui-gradient-generator-algo-complementary = 
     .label = Комплементарное
 zen-panel-ui-gradient-generator-algo-splitComplementary = 
diff --git a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
index 01c75fcd1..c66d08cca 100644
--- a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Skift + Klicka
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Klicka
 zen-look-and-feel-compact-view-header = Visa i kompakt vy
 zen-look-and-feel-compact-view-description = Visa bara verktygsfälten du använder!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Dölj standardindikatorn för behållare i flikfältet
 zen-key-unsaved = Osparad genväg! Vänligen säkra den genom att klicka på "Escape" knappen efter att du skrivit om den.
-zen-key-conflict = Konflikt med en annan genväg
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Inställningar för tema
 zen-vertical-tabs-title = Sidofält och flikar layout
 zen-vertical-tabs-header = Vertikala flikar
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index da4a4413f..f5868a1d3 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = nuvarande profil
 unified-extensions-description = Tillägg används för att få fler extra funktioner i { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Återställ Fäst flik
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Lägg till Essentials ({ $num } / { $max } platser fyllda)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Ta bort från Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Ersätt fäst fliks URL med nuvarande
     .accesskey = C
 zen-themes-corrupted = Din { -brand-short-name } modds-fil är skadad. De har återställts till standardtemat.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Inaktivera
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimera
     .tooltip = Minimera
 zen-panel-ui-gradient-generator-custom-color = Anpassad färg
 zen-panel-ui-gradient-generator-saved-message = Lyckades spara gradienten!
 zen-copy-current-url-confirmation = Länken har kopierats till urklipp.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Avbryt
-zen-general-confirm =
+zen-general-confirm = 
     .label = Bekräfta
 zen-pinned-tab-replaced = Den fästa flikens URL har ersatts med den aktuella URL!
 zen-tabs-renamed = Fliken har fått nytt namn!
 zen-background-tab-opened-toast = Ny bakgrundsflik öppnad!
 zen-workspace-renamed-toast = Arbetsytan har fått ett nytt namn!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Arbetsytor
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Läs mer
 zen-close-label = Stäng
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Sök...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Ikoner
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl b/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl
index aaae50173..13d31444e 100644
--- a/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompakt läge
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Aktivera kompakt läge
     .accesskey = D
diff --git a/locales/sv-SE/browser/browser/zen-workspaces.ftl b/locales/sv-SE/browser/browser/zen-workspaces.ftl
index f1d9f0fc3..56735f244 100644
--- a/locales/sv-SE/browser/browser/zen-workspaces.ftl
+++ b/locales/sv-SE/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/th/browser/browser/preferences/zen-preferences.ftl b/locales/th/browser/browser/preferences/zen-preferences.ftl
index 84eccbcd3..85e53500d 100644
--- a/locales/th/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/th/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Click
 zen-look-and-feel-compact-view-header = Show in compact view
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Hide the default container indicator in the tab bar
 zen-key-unsaved = Unsaved shortcut! Please save it by clicking the "Escape" key after retyping it.
-zen-key-conflict = Conflict with another shortcut
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Theme Settings
 zen-vertical-tabs-title = Sidebar and tabs layout
 zen-vertical-tabs-header = Vertical Tabs
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 0677b61af..aaa6fa7c8 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = current profile
 unified-extensions-description = Extensions are used to bring more extra functionality into { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Reset Pinned Tab
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Replace Pinned URL with Current
     .accesskey = C
 zen-themes-corrupted = Your { -brand-short-name } mods file is corrupted. They have been reset to the default theme.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     The new URL bar has been enabled, removing the need for new tab pages.<br/><br/>
     Try opening a new tab to see the new URL bar in action!
 zen-disable = Disable
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Minimize
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Confirm
 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL.
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Learn More
 zen-close-label = Close
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/th/browser/browser/zen-vertical-tabs.ftl b/locales/th/browser/browser/zen-vertical-tabs.ftl
index e59cd7a78..9c71802d2 100644
--- a/locales/th/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/th/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Compact mode
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Enable compact mode
     .accesskey = D
diff --git a/locales/th/browser/browser/zen-workspaces.ftl b/locales/th/browser/browser/zen-workspaces.ftl
index e194ee7c4..ac5baadd4 100644
--- a/locales/th/browser/browser/zen-workspaces.ftl
+++ b/locales/th/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Change Icon
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/tr/browser/browser/preferences/zen-preferences.ftl b/locales/tr/browser/browser/preferences/zen-preferences.ftl
index f21b5c428..2c71e5801 100644
--- a/locales/tr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/tr/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Tıklama
 zen-glance-trigger-meta-click = 
     .label = Meta (Komut) + Tıklama
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Click
 zen-look-and-feel-compact-view-header = Kompakt görünümde göster
 zen-look-and-feel-compact-view-description = Sadece kullandığın araç çubuklarını göster!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Sekme çubuğundaki varsayılan konteyner göstergesini gizle
 zen-key-unsaved = Güvenli olmayan kısayol! Lütfen yazdıktan sonra "Escape" tuşuna tıklayarak kaydedin.
-zen-key-conflict = Başka bir kısayol ile karışıyor
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Tema Ayarları
 zen-vertical-tabs-title = Kenar çubuğu ve sekme düzeni
 zen-vertical-tabs-header = Dikey Sekmeler
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index cc426d665..4406e4de1 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = mevcut profil
 unified-extensions-description = Uzantılar { -brand-short-name } daha fazla işlevsellik kazandırmak için kullanılır.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Sabitlenen Sekmeyi Sıfırla
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Temel Ögelerden Kaldır
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Sabitlenen URL'yi Mevcut ile Değiştir
     .accesskey = C
 zen-themes-corrupted = { -brand-short-name } adlı modun dosyaları hatalı. Varsayılan temaya sıfırlandılar.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Yeni sekme sayfalarına ihtiyacı kaldıran yeni URL Bar aktifleşti.<br/><br/>
     Yeni URL bar'ı görmek için yeni bir sekme açın!
 zen-disable = Devre dışı bırak
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Küçült
     .tooltip = Küçült
 zen-panel-ui-gradient-generator-custom-color = Özel Renk
 zen-panel-ui-gradient-generator-saved-message = Renkler başarıyla kaydedildi!
 zen-copy-current-url-confirmation = URL panoya kopyalandı.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Cancel
-zen-general-confirm =
+zen-general-confirm = 
     .label = Onayla
 zen-pinned-tab-replaced = Başa tutturulmuş sekme URL'si, şimdiki URL ile değiştirildi.
 zen-tabs-renamed = Sekme başarıyla yeniden adlandırıldı!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Spaces
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Daha Fazla Bilgi
 zen-close-label = Kapat
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Emojis
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Icons
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/tr/browser/browser/zen-vertical-tabs.ftl b/locales/tr/browser/browser/zen-vertical-tabs.ftl
index e09848ad8..5a384585a 100644
--- a/locales/tr/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/tr/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompakt mod
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Komapkt modu aktifleştir
     .accesskey = D
diff --git a/locales/tr/browser/browser/zen-workspaces.ftl b/locales/tr/browser/browser/zen-workspaces.ftl
index 9fe4c3b82..ec4ae1750 100644
--- a/locales/tr/browser/browser/zen-workspaces.ftl
+++ b/locales/tr/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Simgeyi Değiştir
 zen-workspaces-panel-context-default-profile = 
     .label = Set Profile
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = How to reorder spaces
 zen-workspaces-how-to-reorder-desc = Drag the space icons at the bottom of the sidebar to reorder them
 zen-workspaces-change-theme = 
diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl
index dd5d54edc..489539c87 100644
--- a/locales/uk/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Клік
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Клац
-zen-glance-trigger-mantain-click = 
-    .label = Затяжний Клік
 zen-look-and-feel-compact-view-header = Показати в компактному вигляді
 zen-look-and-feel-compact-view-description = Показати лише панелі інструментів, які ви використовуєте!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Приховувати індикатор контейнерів за замовчуванням у панелі вкладок
 zen-key-unsaved = Незбережений ярлик! Захистіть його, натиснувши на кнопку „Escape“ після його введення.
-zen-key-conflict = Конфлікт з іншою клавішею
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Налаштування теми
 zen-vertical-tabs-title = Розташування бічної панелі та вкладок
 zen-vertical-tabs-header = Вертикальні таблиці
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index f4fb27fb8..5fe752bff 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = поточний профіль
 unified-extensions-description = Розширення використовуються, щоб додати більше функціональних можливостей до { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Скинути прикріплену вкладку
     .accesskey = Р
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Додати до Основного ({ $num } / { $max } комірок заповнено)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Вилучити з основних елементів
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Замінити закріплений URL на поточний
     .accesskey = C
 zen-themes-corrupted = Ваш файл модифікацій { -brand-short-name } пошкоджено. Вони були скинуті до типової теми.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Увімкнено новий рядок URL-адрес, що усуває потребу в нових сторінках вкладок.<br/><br/>
     Спробуйте відкрити нову вкладку, щоб побачити новий рядок URL-адреси в дії!
 zen-disable = Вимкнути
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Згорнути
     .tooltip = Згорнути
 zen-panel-ui-gradient-generator-custom-color = Власний колір
 zen-panel-ui-gradient-generator-saved-message = Градієнт успішно збережено!
 zen-copy-current-url-confirmation = URL-адресу було скопійовано до буфера обміну.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Скасувати
-zen-general-confirm =
+zen-general-confirm = 
     .label = Підтвердити
 zen-pinned-tab-replaced = URL-адресу закріпленої вкладки замінено на поточну URL-адресу.
 zen-tabs-renamed = Вкладку успішно перейменовано!
 zen-background-tab-opened-toast = Відкрито нову фонову вкладку!
 zen-workspace-renamed-toast = Робочий простір успішно перейменовано!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Простори
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Модифікації
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Увімк. / Вимк. компактний режим
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Дізнатися більше
 zen-close-label = Закрити
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Пошук...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Емоджі
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Значки
 urlbar-search-mode-zen_actions = Дії
+zen-site-data-settings = Налаштування
+zen-generic-manage = Керувати
+zen-generic-more = Більше
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Дозволено
+zen-site-data-setting-block = Заблоковано
+zen-site-data-security-info-extension = 
+    .label = Розширення
+zen-site-data-security-info-secure = 
+    .label = Захищено
+zen-site-data-security-info-not-secure = 
+    .label = Не захищено
+zen-site-data-manage-addons = 
+    .label = Керування розширеннями
+zen-site-data-get-addons = 
+    .label = Додати розширення
+zen-site-data-site-settings = 
+    .label = Усі налаштування сайту
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/uk/browser/browser/zen-vertical-tabs.ftl b/locales/uk/browser/browser/zen-vertical-tabs.ftl
index 1dffa9ad7..7ae28454d 100644
--- a/locales/uk/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/uk/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = Р
 zen-toolbar-context-compact-mode = 
     .label = Компактний режим
-    .accesskey = До
 zen-toolbar-context-compact-mode-enable = 
     .label = Увімкнути компактний режим
     .accesskey = Ре
diff --git a/locales/uk/browser/browser/zen-workspaces.ftl b/locales/uk/browser/browser/zen-workspaces.ftl
index e377e672c..121271d9b 100644
--- a/locales/uk/browser/browser/zen-workspaces.ftl
+++ b/locales/uk/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Змінити значок
 zen-workspaces-panel-context-default-profile = 
     .label = Встановити профіль
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Як впорядкувати простори
 zen-workspaces-how-to-reorder-desc = Перетягніть значок простору в нижній частині панелі для зміни їхнього порядку
 zen-workspaces-change-theme = 
diff --git a/locales/vi/browser/browser/preferences/zen-preferences.ftl b/locales/vi/browser/browser/preferences/zen-preferences.ftl
index a0aae02fc..38bfc6398 100644
--- a/locales/vi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/vi/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + Click
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + Click
-zen-glance-trigger-mantain-click = 
-    .label = Mantain Click
 zen-look-and-feel-compact-view-header = Hiển thị ở chế độ thu gọn
 zen-look-and-feel-compact-view-description = Chỉ hiển thị các thanh công cụ mà bạn sử dụng!
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Ẩn chỉ báo vùng chứa mặc định trên thanh thẻ
 zen-key-unsaved = Lối tắt không an toàn! Xin hãy làm an toàn nó bằng cách ấn nút "Escape/Esc" sau khi nhập lại nó.
-zen-key-conflict = Trùng với lối tắt khác
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Cài đặt chủ đề
 zen-vertical-tabs-title = Bố cục thanh bên và thẻ
 zen-vertical-tabs-header = Thẻ dọc
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 7b8cf2c71..8b98d5df9 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = hồ sơ hiện tại
 unified-extensions-description = Các tiện ích mở rộng được sử dụng để mang thêm tính năng vào { -brand-short-name }.
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = Đặt lại thẻ đã ghim
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Thêm thẻ vào thường trú (đã thêm { $num } / { $max } )
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = Loại ra khỏi thẻ thường trú
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = Thay thế đường dường dẫn đã gim với hiện tại
     .accesskey = C
 zen-themes-corrupted = Thư mục chủ đề { -brand-short-name } của bạn đã bị hư, chúng đã được trả về thiết kế gốc.
@@ -19,33 +19,57 @@ zen-new-urlbar-notification =
     Thanh đường dẫn mới đã được kích hoạt, loại bỏ chức năng của trang "thẻ mới". <br/><br/>
     Hãy thử tạo một thể để xem cái "mới" của thành đường dẫn!
 zen-disable = Vô hiệu hóa
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = Thu nhỏ
     .tooltip = Thu nhỏ
 zen-panel-ui-gradient-generator-custom-color = Tùy chỉnh màu sắc
 zen-panel-ui-gradient-generator-saved-message = Lưu tùy chỉnh đổ màu thành công!
 zen-copy-current-url-confirmation = Đường dẫn đã được chép vào bộ nhớ.
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = Hủy
-zen-general-confirm =
+zen-general-confirm = 
     .label = Xác nhận
 zen-pinned-tab-replaced = Đường dẫn trên thẻ gim đã được thay thể bởi đường dẫn hiện tại!
 zen-tabs-renamed = Thẻ đã được đổi tên!
 zen-background-tab-opened-toast = Một thẻ mới đã được mở dưới nền!
 zen-workspace-renamed-toast = Không gian làm việc đã được đổi tên!
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = Không gian làm việc
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = Mods
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = Tìm hiểu thêm
 zen-close-label = Đóng
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Tìm kiếm...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = Biểu cảm
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = Biểu tượng
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/vi/browser/browser/zen-vertical-tabs.ftl b/locales/vi/browser/browser/zen-vertical-tabs.ftl
index ec1001425..2e519f8f3 100644
--- a/locales/vi/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/vi/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Chế độ thu gọn
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = Bật chế độ thu gọn
     .accesskey = D
diff --git a/locales/vi/browser/browser/zen-workspaces.ftl b/locales/vi/browser/browser/zen-workspaces.ftl
index d7f92a4cb..b781169ff 100644
--- a/locales/vi/browser/browser/zen-workspaces.ftl
+++ b/locales/vi/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = Đổi biểu tượng không gian làm việc
 zen-workspaces-panel-context-default-profile = 
     .label = Cài đặt hồ sơ
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = Cách sắp xếp thứ tự của các không gian làm việc
 zen-workspaces-how-to-reorder-desc = Kéo và thả các biểu tượng của không gian làm việc ở dưới thanh bên để sắp xếp thứ tự của chúng
 zen-workspaces-change-theme = 
diff --git a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
index e73f05a03..5d2cffd86 100644
--- a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + 单击
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + 单击
-zen-glance-trigger-mantain-click = 
-    .label = 长按（即将上线！）
 zen-look-and-feel-compact-view-header = 以紧凑视图显示
 zen-look-and-feel-compact-view-description = 仅显示您使用的工具栏！
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = 隐藏在标签页栏中的默认容器指示器
 zen-key-unsaved = 快捷键未保存！请重新输入并按下“Escape”键保存。
-zen-key-conflict = 和其它快捷键冲突
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = 主题设置
 zen-vertical-tabs-title = 侧边栏和标签页布局
 zen-vertical-tabs-header = 垂直标签页
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index f9e5c12f6..39abbc6e6 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 当前配置
 unified-extensions-description = 扩展用于为 { -brand-short-name } 带来更多额外功能。
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = 重置固定标签页
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = 添加到常驻标签页（已使用 { $num } / { $max }）
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = 从常驻标签页中移除
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = 将固定标签页的 URL 替换为当前页面 URL
     .accesskey = C
 zen-themes-corrupted = 您的 { -brand-short-name } 模组文件已损坏。它们已重置为默认主题。
@@ -17,33 +17,57 @@ zen-shortcuts-corrupted = 您的 { -brand-short-name } 快捷键文件已损坏
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = 新的 URL 栏已启用，不再需要新标签页。<br/><br/>打开一个新标签页来试试看新 URL 栏！
 zen-disable = 禁用
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = 最小化
     .tooltip = 最小化
 zen-panel-ui-gradient-generator-custom-color = 自定义颜色
 zen-panel-ui-gradient-generator-saved-message = 渐变保存成功！
 zen-copy-current-url-confirmation = 网址已复制到剪贴板。
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = 取消
-zen-general-confirm =
+zen-general-confirm = 
     .label = 确认
 zen-pinned-tab-replaced = 固定标签页的网址已更新为当前页面网址。
 zen-tabs-renamed = 标签页重命名成功！
 zen-background-tab-opened-toast = 新的后台标签页已打开 ！
 zen-workspace-renamed-toast = 工作区重命名成功！
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = 工作区
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = 模组
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = 了解更多
 zen-close-label = 关闭
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = 搜索…
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = 表情符号
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = 图标集
 urlbar-search-mode-zen_actions = Actions
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = 管理扩展
+zen-site-data-get-addons = 
+    .label = 添加扩展
+zen-site-data-site-settings = 
+    .label = 所有站点设置
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl b/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl
index 6ecd73c1b..5da8c55cd 100644
--- a/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = 简洁模式
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = 启用简洁模式
     .accesskey = D
diff --git a/locales/zh-CN/browser/browser/zen-workspaces.ftl b/locales/zh-CN/browser/browser/zen-workspaces.ftl
index 6d0bd9336..7a9c3841f 100644
--- a/locales/zh-CN/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-CN/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = 更改图标
 zen-workspaces-panel-context-default-profile = 
     .label = 设置身份
+zen-workspaces-panel-unload = 
+    .label = Unload Space
 zen-workspaces-how-to-reorder-title = 如何排序工作区
 zen-workspaces-how-to-reorder-desc = 拖动侧边栏底部的工作区图标以重新排序
 zen-workspaces-change-theme = 
diff --git a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
index a82e95d1a..af9de897d 100644
--- a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
@@ -26,8 +26,6 @@ zen-glance-trigger-shift-click =
     .label = Shift + 左鍵
 zen-glance-trigger-meta-click = 
     .label = Meta (Command) + 左鍵
-zen-glance-trigger-mantain-click = 
-    .label = 長按（即將推出！）
 zen-look-and-feel-compact-view-header = 在緊湊模式下顯示
 zen-look-and-feel-compact-view-description = 只顯示你需要用的工具欄！
 zen-look-and-feel-compact-view-enabled = 
@@ -74,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = 隱藏分頁欄中的容器指標
 zen-key-unsaved = 快捷鍵未儲存！請重新輸入並按下 "Escape" 鍵來儲存快捷鍵。
-zen-key-conflict = 與其它快捷鍵發生衝突
+zen-key-conflict = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = 主題設定
 zen-vertical-tabs-title = 側邊欄與分頁排版
 zen-vertical-tabs-header = 垂直分頁
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index 68948379c..650c6df0e 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -1,15 +1,15 @@
 zen-panel-ui-current-profile-text = 當前設定檔
 unified-extensions-description = 擴充功能可為 { -brand-short-name } 帶來更多額外功能。
-tab-context-zen-reset-pinned-tab =
+tab-context-zen-reset-pinned-tab = 
     .label = 重置釘選的分頁
     .accesskey = R
-tab-context-zen-add-essential =
+tab-context-zen-add-essential = 
     .label = Add to Essentials ({ $num } / { $max } slots filled)
     .accesskey = E
-tab-context-zen-remove-essential =
+tab-context-zen-remove-essential = 
     .label = 從 Essentials 中移除
     .accesskey = R
-tab-context-zen-replace-pinned-url-with-current =
+tab-context-zen-replace-pinned-url-with-current = 
     .label = 將釘選的網址換成目前的網址
     .accesskey = C
 zen-themes-corrupted = 你的 { -brand-short-name } 模組文件已損壞，它們已重設為預設主題。
@@ -17,33 +17,57 @@ zen-shortcuts-corrupted = 你的 { -brand-short-name } 快捷文件已損壞。
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification = 新的 URL 欄已啟用，你不再需要新增新分頁。<br/><br/>馬上打開新分頁來看看新的 URL 欄！
 zen-disable = 停用
-pictureinpicture-minimize-btn =
+pictureinpicture-minimize-btn = 
     .aria-label = 最小化
     .tooltip = 最小化
 zen-panel-ui-gradient-generator-custom-color = 自訂顏色
 zen-panel-ui-gradient-generator-saved-message = 已成功儲存漸層！
 zen-copy-current-url-confirmation = 網址已複製到剪貼簿。
-zen-general-cancel-label =
+zen-general-cancel-label = 
     .label = 取消
-zen-general-confirm =
+zen-general-confirm = 
     .label = 確認
 zen-pinned-tab-replaced = 釘選分頁網址已替換為當前當前網址。
 zen-tabs-renamed = 已成功重新命名分頁！
 zen-background-tab-opened-toast = 已在背景開啟新分頁！
 zen-workspace-renamed-toast = 已成功重新命名工作區！
-zen-library-sidebar-workspaces =
+zen-library-sidebar-workspaces = 
     .label = 工作區
-zen-library-sidebar-mods =
+zen-library-sidebar-mods = 
     .label = 模組
+zen-toggle-compact-mode-button = 
+    .label = Compact Mode
+    .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
 
 zen-learn-more-text = 瞭解更多
 zen-close-label = 關閉
-zen-singletoolbar-urlbar-placeholder-with-name =
+zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = 搜尋...
-zen-icons-picker-emoji =
+zen-icons-picker-emoji = 
     .label = 表情符號
-zen-icons-picker-svg =
+zen-icons-picker-svg = 
     .label = 圖示
 urlbar-search-mode-zen_actions = 操作
+zen-site-data-settings = Settings
+zen-generic-manage = Manage
+zen-generic-more = More
+# These labels will be used for the site data panel settings
+zen-site-data-setting-allow = Allowed
+zen-site-data-setting-block = Blocked
+zen-site-data-security-info-extension = 
+    .label = Extension
+zen-site-data-security-info-secure = 
+    .label = Secure
+zen-site-data-security-info-not-secure = 
+    .label = Not Secure
+zen-site-data-manage-addons = 
+    .label = Manage Extensions
+zen-site-data-get-addons = 
+    .label = Add Extensions
+zen-site-data-site-settings = 
+    .label = All Site Settings
+zen-site-data-setting-site-protection = Site Protection
+zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
+zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl b/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
index d2ed844a0..5be0b8652 100644
--- a/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
@@ -3,7 +3,6 @@ zen-toolbar-context-tabs-right =
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = 緊湊模式
-    .accesskey = C
 zen-toolbar-context-compact-mode-enable = 
     .label = 開啟緊湊模式
     .accesskey = D
diff --git a/locales/zh-TW/browser/browser/zen-workspaces.ftl b/locales/zh-TW/browser/browser/zen-workspaces.ftl
index 97f59f0a6..18f96eaa4 100644
--- a/locales/zh-TW/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-TW/browser/browser/zen-workspaces.ftl
@@ -14,6 +14,8 @@ zen-workspaces-panel-change-icon =
     .label = 變更圖示
 zen-workspaces-panel-context-default-profile = 
     .label = 設定設定檔
+zen-workspaces-panel-unload = 
+    .label = 卸載工作區
 zen-workspaces-how-to-reorder-title = 如何排序工作區
 zen-workspaces-how-to-reorder-desc = 拖曳側邊欄底部工作區圖示以重新排序
 zen-workspaces-change-theme = 

From 28bf0458e43e2bb741cd67834d2b50ce2b5587c6 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 10 Oct 2025 00:16:23 +0200
Subject: [PATCH 055/111] feat: Add indent to preference and tweak glance
 animation, b=no-bug, c=glance

---
 .../components/preferences/main-inc-xhtml.patch  | 16 +++++++++-------
 src/zen/glance/ZenGlanceManager.mjs              | 14 ++++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch
index 234483ae9..587b67bc6 100644
--- a/src/browser/components/preferences/main-inc-xhtml.patch
+++ b/src/browser/components/preferences/main-inc-xhtml.patch
@@ -1,18 +1,20 @@
 diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index 891cf7108cf4606c99a902afa420e744b9690b87..72034b4a28e68016c04d06a2991ccebff30dd341 100644
+index 891cf7108cf4606c99a902afa420e744b9690b87..80a971b4a3e733e6495a0a11654c209e2aea5d9c 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
-@@ -29,6 +29,9 @@
+@@ -29,6 +29,11 @@
    <vbox id="startupPageBox">
      <checkbox id="browserRestoreSession"
                data-l10n-id="startup-restore-windows-and-tabs"/>
-+    <checkbox id="zenWorkspaceContinueWhereLeftOff"
-+            data-l10n-id="zen-workspace-continue-where-left-off"
-+            preference="zen.workspaces.continue-where-left-off"/>
++    <vbox id="windowsLaunchOnLoginDisabledBox" align="center" class="indent" hidden="true">
++      <checkbox id="zenWorkspaceContinueWhereLeftOff"
++              data-l10n-id="zen-workspace-continue-where-left-off"
++              preference="zen.workspaces.continue-where-left-off"/>
++    </vbox>
  #ifdef XP_WIN
      <hbox id="windowsLaunchOnLoginBox" align="center" hidden="true">
        <checkbox id="windowsLaunchOnLogin"
-@@ -189,7 +192,8 @@
+@@ -189,7 +194,8 @@
  <!-- Browser layout -->
  <groupbox data-category="paneGeneral"
            data-subcategory="layout"
@@ -22,7 +24,7 @@ index 891cf7108cf4606c99a902afa420e744b9690b87..72034b4a28e68016c04d06a2991ccebf
    <label><html:h2 data-l10n-id="browser-layout-header"/></label>
    <radiogroup id="browserLayoutRadioGroup" preference="sidebar.verticalTabs">
      <radio id="browserLayoutHorizontalTabs" data-l10n-id="browser-layout-horizontal-tabs" value="false"/>
-@@ -420,6 +424,7 @@
+@@ -420,6 +426,7 @@
                languages-customize-add.label,
              " />
    </hbox>
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 949844619..d2c28ef9e 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -373,9 +373,10 @@
     /**
      * Handle element preview if provided
      * @param {Object} data - Glance data
+     * @param {Object} rect - The rectangle data
      * @returns {Element|null} The preview element or null
      */
-    #handleElementPreview(data) {
+    #handleElementPreview(data, rect) {
       if (!data.elementData) {
         return null;
       }
@@ -383,9 +384,11 @@
       const imageDataElement = document.createXULElement('image');
       imageDataElement.setAttribute('src', data.elementData);
       imageDataElement.classList.add('zen-glance-element-preview');
+      imageDataElement.style.width = `${data.width}px`;
+      imageDataElement.style.height = `${data.height}px`;
+
       this.browserWrapper.prepend(imageDataElement);
       this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
-
       return imageDataElement;
     }
 
@@ -834,7 +837,7 @@
         const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
         const elementImageData = this.#glances.get(this.#currentGlanceID).elementImageData;
 
-        this.#addElementPreview(elementImageData);
+        this.#addElementPreview(elementImageData, originalPosition);
 
         // Create curved closing animation sequence
         const closingData = this.#createClosingDataFromOriginalPosition(originalPosition);
@@ -876,12 +879,15 @@
     /**
      * Add element preview if available
      * @param {string} elementImageData - The element image data
+     * @param {Object} rect - The rectangle data
      */
-    #addElementPreview(elementImageData) {
+    #addElementPreview(elementImageData, rect) {
       if (elementImageData) {
         const imageDataElement = document.createXULElement('image');
         imageDataElement.setAttribute('src', elementImageData);
         imageDataElement.classList.add('zen-glance-element-preview');
+        imageDataElement.style.width = rect.width;
+        imageDataElement.style.height = rect.height;
         this.browserWrapper.prepend(imageDataElement);
       }
     }

From 9db8e788ff9d858aedc37487863b92a7d2b3b48e Mon Sep 17 00:00:00 2001
From: CrynTox <88785107+CrynTox@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:08:28 +0300
Subject: [PATCH 056/111] feat: allow ctrl+n/p to navigate urlbar entries,
 p=#10753

---
 .../components/urlbar/UrlbarController-sys-mjs.patch | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
index c12b327db..8ad0e02f6 100644
--- a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
@@ -1,8 +1,16 @@
 diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs
-index a1faf7e4278c66865f267283515f22052769928d..d76d19da5a3d4b9739faf3a673bb3ad693765ada 100644
+index a1faf7e4278c66865f267283515f22052769928d..297391205ab3cd96bed2e5a3e36a181c6da90098 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -441,6 +441,8 @@ export class UrlbarController {
+@@ -297,7 +297,6 @@ export class UrlbarController {
+     const isMac = AppConstants.platform == "macosx";
+     // Handle readline/emacs-style navigation bindings on Mac.
+     if (
+-      isMac &&
+       this.view.isOpen &&
+       event.ctrlKey &&
+       (event.key == "n" || event.key == "p")
+@@ -441,6 +440,8 @@ export class UrlbarController {
              });
            }
            event.preventDefault();

From 6e48ffc6dc3fa92fef895dabd4d9661f05077bec Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 10 Oct 2025 11:44:12 +0200
Subject: [PATCH 057/111] feat: Use tahoe native feel, p=#10761

* feat: Use tahoe native feel, b=no-bug, c=media, common

* fix: Remove rect param from glance animation, b=no-bug, c=glance

* chore: Updated surfer, b=no-bug, c=no-component
---
 package-lock.json                             |  20 +-
 package.json                                  |   2 +-
 .../ff-145-tahoe-upgrade.patch                | 452 ++++++++++++++++++
 .../style/gecko/media_features-rs.patch       |   4 +-
 src/zen/common/styles/zen-browser-ui.css      |  14 +-
 src/zen/common/styles/zen-panel-ui.css        |   1 +
 src/zen/glance/ZenGlanceManager.mjs           |   3 +-
 7 files changed, 480 insertions(+), 16 deletions(-)
 create mode 100644 src/firefox-patches/ff-145-tahoe-upgrade.patch

diff --git a/package-lock.json b/package-lock.json
index 760d8650c..ed842dd11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MPL-2.0",
       "dependencies": {
-        "@zen-browser/surfer": "^1.11.21"
+        "@zen-browser/surfer": "^1.11.22"
       },
       "devDependencies": {
         "@babel/preset-typescript": "^7.27.0",
@@ -1135,9 +1135,9 @@
       "license": "MIT"
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.11.21",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.21.tgz",
-      "integrity": "sha512-tUJMtTi6Vy4SPYoxSHsS4y0xYrgptXvxwkKfIrBsFSH7uMtySu1edgmsMYyhs+KOk1Jff1fLkxhnKl0EJf2XhA==",
+      "version": "1.11.22",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.22.tgz",
+      "integrity": "sha512-fvV+8stPXJDyX/6lv4bvgkxq1hNGyJJyOU1ysjJSrElxo9CerB35XU8LMjAs6SjuV1olLMILg2DwCIP2gVn0+Q==",
       "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
@@ -5525,9 +5525,9 @@
       }
     },
     "node_modules/prebuild-install/node_modules/tar-fs": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
-      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
       "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
@@ -6643,9 +6643,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
-      "integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz",
+      "integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==",
       "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0",
diff --git a/package.json b/package.json
index 8844e4840..107ddd6cd 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
   },
   "homepage": "https://github.com/zen-browser/desktop#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.11.21"
+    "@zen-browser/surfer": "^1.11.22"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.27.0",
diff --git a/src/firefox-patches/ff-145-tahoe-upgrade.patch b/src/firefox-patches/ff-145-tahoe-upgrade.patch
new file mode 100644
index 000000000..0872cb770
--- /dev/null
+++ b/src/firefox-patches/ff-145-tahoe-upgrade.patch
@@ -0,0 +1,452 @@
+diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
+--- a/mfbt/tests/TestUniquePtr.cpp
++++ b/mfbt/tests/TestUniquePtr.cpp
+@@ -314,43 +314,45 @@
+   gADestructorCalls = 0;
+   gBDestructorCalls = 0;
+   return true;
+ }
+ 
+-typedef void (&FreeSignature)(void*);
++struct Free {
++  void operator()(void* aPtr) { free(aPtr); }
++};
+ 
+ static size_t DeleteIntFunctionCallCount = 0;
++struct DeleteIntFunction {
++  void operator()(void* aPtr) {
++    DeleteIntFunctionCallCount++;
++    delete[] static_cast<int*>(aPtr);
++  }
++};
+ 
+-static void DeleteIntFunction(void* aPtr) {
+-  DeleteIntFunctionCallCount++;
+-  delete[] static_cast<int*>(aPtr);
+-}
+-
+-static void SetMallocedInt(UniquePtr<int, FreeSignature>& aPtr, int aI) {
++static void SetMallocedInt(UniquePtr<int, Free>& aPtr, int aI) {
+   int* newPtr = static_cast<int*>(malloc(sizeof(int)));
+   *newPtr = aI;
+   aPtr.reset(newPtr);
+ }
+ 
+-static UniquePtr<int, FreeSignature> MallocedInt(int aI) {
+-  UniquePtr<int, FreeSignature> ptr(static_cast<int*>(malloc(sizeof(int))),
+-                                    free);
++static UniquePtr<int, Free> MallocedInt(int aI) {
++  UniquePtr<int, Free> ptr(static_cast<int*>(malloc(sizeof(int))), Free{});
+   *ptr = aI;
+   return ptr;
+ }
+ static bool TestFunctionReferenceDeleter() {
+   // Look for allocator mismatches and leaks to verify these bits
+-  UniquePtr<int, FreeSignature> i1(MallocedInt(17));
++  UniquePtr<int, Free> i1(MallocedInt(17));
+   CHECK(*i1 == 17);
+ 
+   SetMallocedInt(i1, 42);
+   CHECK(*i1 == 42);
+ 
+   // These bits use a custom deleter so we can instrument deletion.
+   {
+-    UniquePtr<int, FreeSignature> i2 =
+-        UniquePtr<int, FreeSignature>(new int[42], DeleteIntFunction);
++    UniquePtr<int, DeleteIntFunction> i2 =
++        UniquePtr<int, DeleteIntFunction>(new int[42], DeleteIntFunction{});
+     CHECK(DeleteIntFunctionCallCount == 0);
+ 
+     i2.reset(new int[76]);
+     CHECK(DeleteIntFunctionCallCount == 1);
+   }
+
+diff --git a/taskcluster/scripts/misc/build-clang.sh b/taskcluster/scripts/misc/build-clang.sh
+--- a/taskcluster/scripts/misc/build-clang.sh
++++ b/taskcluster/scripts/misc/build-clang.sh
+@@ -23,11 +23,11 @@
+   mkdir -p $ORIGPWD/bin
+   echo "#!/bin/sh" > $ORIGPWD/bin/sw_vers
+   echo echo 10.12 >> $ORIGPWD/bin/sw_vers
+   chmod +x $ORIGPWD/bin/sw_vers
+   # these variables are used in build-clang.py
+-  export OSX_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX1*.sdk)
++  export OSX_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX*.sdk)
+   export PATH=$PATH:$ORIGPWD/bin
+   ;;
+ *win64*)
+   case "$(uname -s)" in
+   MINGW*|MSYS*)
+diff --git a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
+--- a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
++++ b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
+@@ -1,11 +1,11 @@
+ #!/bin/bash
+ set -x -e -v
+ 
+ export TARGET_TRIPLE="x86_64-apple-darwin"
+ 
+-MACOS_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX1*.sdk)
++MACOS_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX*.sdk)
+ CLANGDIR="${MOZ_FETCHES_DIR}/clang"
+ 
+ # Deploy the wrench dependencies
+ mv ${MOZ_FETCHES_DIR}/wrench-deps/{vendor,.cargo} "${GECKO_PATH}/gfx/wr/"
+ 
+
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+--- a/build/moz.configure/toolchain.configure
++++ b/build/moz.configure/toolchain.configure
+@@ -231,11 +231,11 @@
+         nargs=1,
+         help="Location of platform SDK to use",
+     )
+ 
+     def mac_sdk_min_version():
+-        return "15.5"
++        return "26.0"
+ 
+     @depends(
+         "--with-macos-sdk",
+         host,
+         bootstrap_path(
+diff --git a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
+--- a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
++++ b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ <plist version="1.0">
+ <dict>
+         <key>Version</key>
+-        <string>15.5</string>
++        <string>26.0</string>
+ </dict>
+ </plist>
+diff --git a/taskcluster/kinds/toolchain/macos-sdk.yml b/taskcluster/kinds/toolchain/macos-sdk.yml
+index 71f4de56367d8b68f78c974f36430e6e97dbe79f..aa1917d795f79d100c4e091437cb454807ac7583 100644
+--- a/taskcluster/kinds/toolchain/macos-sdk.yml
++++ b/taskcluster/kinds/toolchain/macos-sdk.yml
+@@ -46,19 +46,20 @@ macosx64-sdk-15.4:
+             - macosx64-sdk-toolchain
+             - MacOSX15.4.sdk
+ 
+-macosx64-sdk-15.5:
+-    description: "MacOSX15.5 SDK"
++macosx64-sdk-26.0:
++    description: "macOS 26.0 SDK"
+     treeherder:
+-        symbol: TM(sdk15.5)
++        symbol: TM(sdk26.0)
+     run:
+         arguments:
+-            - https://swcdn.apple.com/content/downloads/52/01/082-41241-A_0747ZN8FHV/dectd075r63pppkkzsb75qk61s0lfee22j/CLTools_macOSNMOS_SDK.pkg
+-            - fb7c555e823b830279394e52c7d439bd287a9d8b007883fa0595962a240d488b5613f8cc8d1cc9657909de9367417652564f3df66e238a47bbc87244f5205056
+-            - Library/Developer/CommandLineTools/SDKs/MacOSX15.5.sdk
+-        toolchain-artifact: project/gecko/mac-sdk/MacOSX15.5.sdk.tar.zst
++            - https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg
++            - d3286bd6d4dff1b12f1d0dab4816719e605a1bfb76af84575deec37b25fc4462d4fc1258aa43b138a557c4f9304e06740441b101eb367a4b5bd77200b0708c71
++            - Library/Developer/CommandLineTools/SDKs/MacOSX26.0.sdk
++        toolchain-artifact: project/gecko/mac-sdk/MacOSX26.0.sdk.tar.zst
+         toolchain-alias:
+             - macosx64-sdk
+-            - MacOSX15.5.sdk
++            - macosx64-sdk-toolchain
++            - MacOSX26.0.sdk
+ 
+ ios-sdk-18.4:
+     description: "iPhoneOS18.4 SDK"
+
+diff --git a/browser/themes/osx/places/organizer.css b/browser/themes/osx/places/organizer.css
+index 60e3d65d9ea5..730aa23aed6c 100644
+--- a/browser/themes/osx/places/organizer.css
++++ b/browser/themes/osx/places/organizer.css
+@@ -11,13 +11,15 @@
+   padding: 4px 4px 3px;
+   border-bottom: 1px solid ThreeDShadow;
+ 
+-  &::after {
+-    content: "";
+-    position: absolute;
+-    inset: 0;
+-    appearance: auto;
+-    -moz-default-appearance: -moz-window-titlebar;
+-    z-index: -1;
++  @media not (-moz-mac-tahoe-theme) {
++    &::after {
++      content: "";
++      position: absolute;
++      inset: 0;
++      appearance: auto;
++      -moz-default-appearance: -moz-window-titlebar;
++      z-index: -1;
++    }
+   }
+ }
+ 
+diff --git a/browser/themes/shared/pageInfo.css b/browser/themes/shared/pageInfo.css
+index 92259765b92f..e7bf5a299abe 100644
+--- a/browser/themes/shared/pageInfo.css
++++ b/browser/themes/shared/pageInfo.css
+@@ -14,13 +14,15 @@
+     align-items: center;
+     justify-content: center;
+ 
+-    &::after {
+-      content: "";
+-      position: absolute;
+-      inset: 0;
+-      appearance: auto;
+-      -moz-default-appearance: -moz-window-titlebar;
+-      z-index: -1;
++    @media not (-moz-mac-tahoe-theme) {
++      &::after {
++        content: "";
++        position: absolute;
++        inset: 0;
++        appearance: auto;
++        -moz-default-appearance: -moz-window-titlebar;
++        z-index: -1;
++      }
+     }
+   }
+ }
+diff --git a/layout/style/test/chrome/chrome-only-media-queries.js b/layout/style/test/chrome/chrome-only-media-queries.js
+index e200152ba41b..88ba56525e99 100644
+--- a/layout/style/test/chrome/chrome-only-media-queries.js
++++ b/layout/style/test/chrome/chrome-only-media-queries.js
+@@ -4,6 +4,7 @@ const CHROME_ONLY_TOGGLES = [
+   "-moz-print-preview",
+   "-moz-overlay-scrollbars",
+   "-moz-mac-big-sur-theme",
++  "-moz-mac-tahoe-theme",
+   "-moz-menubar-drag",
+   "-moz-windows-accent-color-in-titlebar",
+   "-moz-swipe-animation-enabled",
+diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
+index b0082951254a..ddbcd495260b 100644
+--- a/servo/components/style/gecko/media_features.rs
++++ b/servo/components/style/gecko/media_features.rs
+@@ -645,7 +645,7 @@ macro_rules! lnf_int_feature {
+ /// to support new types in these entries and (2) ensuring that either
+ /// nsPresContext::MediaFeatureValuesChanged is called when the value that
+ /// would be returned by the evaluator function could change.
+-pub static MEDIA_FEATURES: [QueryFeatureDescription; 58] = [
++pub static MEDIA_FEATURES: [QueryFeatureDescription; 59] = [
+     feature!(
+         atom!("width"),
+         AllowsRanges::Yes,
+@@ -918,6 +918,7 @@ pub static MEDIA_FEATURES: [QueryFeatureDescription; 58] = [
+     ),
+     lnf_int_feature!(atom!("-moz-menubar-drag"), MenuBarDrag),
+     lnf_int_feature!(atom!("-moz-mac-big-sur-theme"), MacBigSurTheme),
++    lnf_int_feature!(atom!("-moz-mac-tahoe-theme"), MacTahoeTheme),
+     feature!(
+         atom!("-moz-mac-rtl"),
+         AllowsRanges::No,
+diff --git a/toolkit/themes/shared/menu.css b/toolkit/themes/shared/menu.css
+index f1330e7dd7a3..23c04a931ae0 100644
+--- a/toolkit/themes/shared/menu.css
++++ b/toolkit/themes/shared/menu.css
+@@ -31,6 +31,11 @@ panel {
+   }
+   @media (-moz-platform: macos) {
+     --menuitem-padding: 3px 9px;
++
++    @media (-moz-mac-tahoe-theme) {
++      --menuitem-padding: 4px 11px;
++      --menuitem-border-radius: 7px;
++    }
+   }
+ 
+   @media (-moz-platform: windows) {
+diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h
+index fc1e28206ac2..1661476a75f0 100644
+--- a/widget/LookAndFeel.h
++++ b/widget/LookAndFeel.h
+@@ -117,6 +117,12 @@ class LookAndFeel {
+      */
+     MacBigSurTheme,
+ 
++    /*
++     * A Boolean value to determine whether the macOS Tahoe-specific
++     * theming should be used.
++     */
++    MacTahoeTheme,
++
+     /*
+      * AlertNotificationOrigin indicates from which corner of the
+      * screen alerts slide in, and from which direction (horizontal/vertical).
+diff --git a/widget/cocoa/nsCocoaFeatures.h b/widget/cocoa/nsCocoaFeatures.h
+index dfad59dfe676..1a2389fda02c 100644
+--- a/widget/cocoa/nsCocoaFeatures.h
++++ b/widget/cocoa/nsCocoaFeatures.h
+@@ -22,6 +22,7 @@ class nsCocoaFeatures {
+   static bool OnMontereyOrLater();
+   static bool OnVenturaOrLater();
+   static bool OnSonomaOrLater();
++  static bool OnTahoeOrLater();
+ 
+   static bool IsAtLeastVersion(int32_t aMajor, int32_t aMinor,
+                                int32_t aBugFix = 0);
+diff --git a/widget/cocoa/nsCocoaFeatures.mm b/widget/cocoa/nsCocoaFeatures.mm
+index 509bdbd3fbe3..b70b9c6bbed3 100644
+--- a/widget/cocoa/nsCocoaFeatures.mm
++++ b/widget/cocoa/nsCocoaFeatures.mm
+@@ -27,6 +27,7 @@
+ #define MACOS_VERSION_12_0_HEX 0x000C0000
+ #define MACOS_VERSION_13_0_HEX 0x000D0000
+ #define MACOS_VERSION_14_0_HEX 0x000E0000
++#define MACOS_VERSION_26_0_HEX 0x001A0000
+ 
+ #include "nsCocoaFeatures.h"
+ #include "nsCocoaUtils.h"
+@@ -186,6 +187,11 @@ static int intAtStringIndex(NSArray* array, int index) {
+   return (macOSVersion() >= MACOS_VERSION_14_0_HEX);
+ }
+ 
++/* static */ bool nsCocoaFeatures::OnTahoeOrLater() {
++  // See comments above regarding SYSTEM_VERSION_COMPAT.
++  return (macOSVersion() >= MACOS_VERSION_26_0_HEX);
++}
++
+ /* static */ bool nsCocoaFeatures::IsAtLeastVersion(int32_t aMajor,
+                                                     int32_t aMinor,
+                                                     int32_t aBugFix) {
+diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
+index 38aca9f32590..9484ef078900 100644
+--- a/widget/cocoa/nsCocoaWindow.h
++++ b/widget/cocoa/nsCocoaWindow.h
+@@ -111,6 +111,9 @@ class TextInputHandler;
+ - (void)setEffectViewWrapperForStyle:(mozilla::WindowShadow)aStyle;
+ @property(nonatomic) mozilla::WindowShadow shadowStyle;
+ 
++- (void)updateTitlebarTransparency;
++- (void)setTitlebarSeparatorStyle:(NSTitlebarSeparatorStyle)aStyle API_AVAILABLE(macos(11.0));
++
+ - (void)releaseJSObjects;
+ 
+ @end
+diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
+index c9991df86dc6..c746a78b8440 100644
+--- a/widget/cocoa/nsCocoaWindow.mm
++++ b/widget/cocoa/nsCocoaWindow.mm
+@@ -7611,6 +7611,15 @@ - (id)initWithContentRect:(NSRect)aContentRect
+ // vibrancy effect and window border.
+ - (void)setEffectViewWrapperForStyle:(WindowShadow)aStyle {
+   NSView* wrapper = [&]() -> NSView* {
++    if (@available(macOS 26.0, *)) {
++      if (aStyle == WindowShadow::Menu) {
++        // Menus on macOS 26 use glass instead of vibrancy.
++        auto* effectView =
++            [[NSGlassEffectView alloc] initWithFrame:self.contentView.frame];
++        effectView.cornerRadius = 12.0f;
++        return effectView;
++      }
++    }
+     if (aStyle == WindowShadow::Menu || aStyle == WindowShadow::Tooltip) {
+       const bool isMenu = aStyle == WindowShadow::Menu;
+       auto* effectView =
+@@ -7721,6 +7730,7 @@ - (void)setDrawsContentsIntoWindowFrame:(BOOL)aState {
+   mDrawsIntoWindowFrame = aState;
+   if (changed) {
+     [self reflowTitlebarElements];
++    [self updateTitlebarTransparency];
+   }
+ }
+ 
+@@ -7850,6 +7860,32 @@ - (void)reflowTitlebarElements {
+   }
+ }
+ 
++- (void)updateTitlebarTransparency {
++  if (self.drawsContentsIntoWindowFrame) {
++    // Hide the titlebar if we are drawing into it
++    self.titlebarAppearsTransparent = true;
++    return;
++  }
++
++  if (@available(macOS 26.0, *)) {
++    // On macOS 26, the titlebar must be transparent to hide the separator.
++    // This does not affect the titlebar background on macOS 26, as it
++    // already matches the window background even when not transparent.
++    if (self.titlebarSeparatorStyle == NSTitlebarSeparatorStyleNone) {
++      self.titlebarAppearsTransparent = true;
++      return;
++    }
++  }
++
++  // Show the titlebar otherwise.
++  self.titlebarAppearsTransparent = false;
++}
++
++- (void)setTitlebarSeparatorStyle:(NSTitlebarSeparatorStyle)aStyle {
++  [super setTitlebarSeparatorStyle:aStyle];
++  [self updateTitlebarTransparency];
++}
++
+ - (BOOL)respondsToSelector:(SEL)aSelector {
+   // Claim the window doesn't respond to this so that the system
+   // doesn't steal keyboard equivalents for it. Bug 613710.
+@@ -8166,8 +8202,6 @@ - (void)setDrawsContentsIntoWindowFrame:(BOOL)aState {
+   BOOL stateChanged = self.drawsContentsIntoWindowFrame != aState;
+   [super setDrawsContentsIntoWindowFrame:aState];
+   if (stateChanged && [self.delegate isKindOfClass:[WindowDelegate class]]) {
+-    // Hide the titlebar if we are drawing into it
+-    self.titlebarAppearsTransparent = aState;
+     self.titleVisibility = aState ? NSWindowTitleHidden : NSWindowTitleVisible;
+ 
+     // Here we extend / shrink our mainChildView.
+diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm
+index 16cf2ed9b0ea..579b2445adfe 100644
+--- a/widget/cocoa/nsLookAndFeel.mm
++++ b/widget/cocoa/nsLookAndFeel.mm
+@@ -458,6 +458,9 @@ static bool PrefersNonBlinkingTextInsertionIndicator() {
+     case IntID::MacBigSurTheme:
+       aResult = nsCocoaFeatures::OnBigSurOrLater();
+       break;
++    case IntID::MacTahoeTheme:
++      aResult = nsCocoaFeatures::OnTahoeOrLater();
++      break;
+     case IntID::AlertNotificationOrigin:
+       aResult = NS_ALERT_TOP;
+       break;
+diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
+index 6ddd495b73f9..b94b8331be87 100644
+--- a/widget/cocoa/nsNativeThemeCocoa.mm
++++ b/widget/cocoa/nsNativeThemeCocoa.mm
+@@ -191,6 +191,10 @@ static NSControlSize ControlSizeForEnum(CocoaSize enumControlSize) {
+ 
+ static void InflateControlRect(NSRect* rect, NSControlSize cocoaControlSize,
+                                const CellMarginArray& marginSet) {
++  if (nsCocoaFeatures::OnTahoeOrLater()) {
++    // Controls on macOS 26 fill the entire frame and do not require inflation.
++    return;
++  }
+   auto controlSize = EnumSizeForCocoaSize(cocoaControlSize);
+   const IntMargin& buttonMargins = marginSet[controlSize];
+   rect->origin.x -= buttonMargins.left;
+diff --git a/widget/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp
+index c0dde6e1c04a..24b6f83930a7 100644
+--- a/widget/nsXPLookAndFeel.cpp
++++ b/widget/nsXPLookAndFeel.cpp
+@@ -121,6 +121,7 @@ static const char sIntPrefs[][45] = {
+     "ui.windowsMica",
+     "ui.windowsMicaPopups",
+     "ui.macBigSurTheme",
++    "ui.macTahoeTheme",
+     "ui.alertNotificationOrigin",
+     "ui.scrollToClick",
+     "ui.IMERawInputUnderlineStyle",
+diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
+index e1a0497dc0b9..ec88f0496378 100644
+--- a/xpcom/ds/StaticAtoms.py
++++ b/xpcom/ds/StaticAtoms.py
+@@ -2283,6 +2283,7 @@ STATIC_ATOMS = [
+     Atom("_moz_windows_mica", "-moz-windows-mica"),
+     Atom("_moz_windows_mica_popups", "-moz-windows-mica-popups"),
+     Atom("_moz_mac_big_sur_theme", "-moz-mac-big-sur-theme"),
++    Atom("_moz_mac_tahoe_theme", "-moz-mac-tahoe-theme"),
+     Atom("_moz_mac_rtl", "-moz-mac-rtl"),
+     Atom("_moz_mac_titlebar_height", "-moz-mac-titlebar-height"),
+     Atom("_moz_platform", "-moz-platform"),
diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch
index eda66d696..5763b5101 100644
--- a/src/servo/components/style/gecko/media_features-rs.patch
+++ b/src/servo/components/style/gecko/media_features-rs.patch
@@ -30,8 +30,8 @@ index b0082951254ad592c73caaa16c5b5c57127831a9..9b3566b08aacfcf2cfbf9941b2b3ca91
  /// to support new types in these entries and (2) ensuring that either
  /// nsPresContext::MediaFeatureValuesChanged is called when the value that
  /// would be returned by the evaluator function could change.
--pub static MEDIA_FEATURES: [QueryFeatureDescription; 58] = [
-+pub static MEDIA_FEATURES: [QueryFeatureDescription; 59] = [
+-pub static MEDIA_FEATURES: [QueryFeatureDescription; 59] = [
++pub static MEDIA_FEATURES: [QueryFeatureDescription; 60] = [
 +    feature!(
 +        atom!("-moz-bool-pref"),
 +        AllowsRanges::No,
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index 43bd6ab0a..08523a982 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -202,16 +202,28 @@
   @media -moz-pref('zen.widget.mac.mono-window-controls') {
     .titlebar-buttonbox-container {
       color: var(--toolbox-textcolor);
+
+      --zen-traffic-light-size: 6px;
+
+      @media (-moz-mac-tahoe-theme) {
+        --zen-traffic-light-size: 7px;
+      }
+
       /* Draw 3 dots as background to represent the window controls,
         all with the same cololr as the titlebar */
       background-image: radial-gradient(
         circle,
-        var(--zen-toolbar-element-bg) 6px,
+        var(--zen-toolbar-element-bg) var(--zen-traffic-light-size),
         transparent 0.5px
       );
       background-size: 20px 22px;
       background-position: 53% 50%;
 
+      @media (-moz-mac-tahoe-theme) {
+        background-size: 23px 22px;
+        background-position: 52% 50%;
+      }
+
       &:not([zen-has-hover='true']) > .titlebar-buttonbox {
         opacity: 0;
       }
diff --git a/src/zen/common/styles/zen-panel-ui.css b/src/zen/common/styles/zen-panel-ui.css
index d44106e95..a90875612 100644
--- a/src/zen/common/styles/zen-panel-ui.css
+++ b/src/zen/common/styles/zen-panel-ui.css
@@ -41,6 +41,7 @@ panel[type='arrow'] {
     --panel-background: light-dark(rgba(255, 255, 255, 0.5), rgba(0, 0, 0, 0.5)) !important;
     --panel-border-color: transparent !important;
     --panel-shadow-margin: 0px !important;
+    border: none !important;
 
     transition-duration: 0s !important;
 
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index d2c28ef9e..31196d520 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -373,10 +373,9 @@
     /**
      * Handle element preview if provided
      * @param {Object} data - Glance data
-     * @param {Object} rect - The rectangle data
      * @returns {Element|null} The preview element or null
      */
-    #handleElementPreview(data, rect) {
+    #handleElementPreview(data) {
       if (!data.elementData) {
         return null;
       }

From 67fa20c45e6ecdf9b7ce63282b134dd35fee9d17 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 10 Oct 2025 13:17:40 +0200
Subject: [PATCH 058/111] feat: Remove native panel look for feature callouts,
 b=no-bug, c=common

---
 src/zen/common/styles/zen-panel-ui.css  | 2 +-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zen/common/styles/zen-panel-ui.css b/src/zen/common/styles/zen-panel-ui.css
index d44106e95..e172e2b44 100644
--- a/src/zen/common/styles/zen-panel-ui.css
+++ b/src/zen/common/styles/zen-panel-ui.css
@@ -32,7 +32,7 @@ panel[type='arrow'] {
 }
 
 menupopup,
-panel[type='arrow'] {
+panel[type='arrow']:not(#feature-callout) {
   @media (-moz-windows-mica-popups) {
     appearance: auto !important;
     -moz-default-appearance: menupopup;
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 4ceab2229..a1244d9d5 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -556,6 +556,6 @@ export class nsZenSiteDataPanel {
           ],
         },
       });
-    }, 500);
+    }, 1000);
   }
 }

From 9024856a77d71bf34686c1d67baf699e2a0aab19 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 10 Oct 2025 17:14:49 +0200
Subject: [PATCH 059/111] New Crowdin updates, p=#10758

---
 .../ga-IE/browser/browser/preferences/zen-preferences.ftl | 2 +-
 locales/ga-IE/browser/browser/zen-general.ftl             | 6 +++---
 locales/hu/browser/browser/zen-general.ftl                | 6 +++---
 .../pt-PT/browser/browser/preferences/zen-preferences.ftl | 2 +-
 locales/pt-PT/browser/browser/zen-general.ftl             | 6 +++---
 locales/ru/browser/browser/zen-general.ftl                | 6 +++---
 .../uk/browser/browser/preferences/zen-preferences.ftl    | 2 +-
 locales/uk/browser/browser/zen-general.ftl                | 8 ++++----
 locales/uk/browser/browser/zen-workspaces.ftl             | 2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
index 21c409222..de1d4cb77 100644
--- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Folaigh an táscaire coimeádáin réamhshocraithe sa bharra cluaisíní
 zen-key-unsaved = Aicearra gan sábháil! Sábháil é trí chliceáil ar an eochair "Escape" tar éis é a athchlóscríobh.
-zen-key-conflict = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Coimhlintí le { $group } -> { $shortcut }
 pane-zen-theme-title = Socruithe Téama
 zen-vertical-tabs-title = Leagan amach barra taobh agus cluaisíní
 zen-vertical-tabs-header = Cluaisíní Ingearacha
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 20de04008..128810442 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -70,6 +70,6 @@ zen-site-data-get-addons =
     .label = Cuir Síneadh leis
 zen-site-data-site-settings = 
     .label = Gach Socrú Suímh
-zen-site-data-setting-site-protection = Site Protection
-zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-site-data-setting-site-protection = Cosaint Láithreáin
+zen-site-data-panel-feature-callout-title = Baile nua do bhreiseáin, ceadanna agus tuilleadh
+zen-site-data-panel-feature-callout-subtitle = Cliceáil an deilbhín chun socruithe suímh a bhainistiú, faisnéis slándála a fheiceáil, rochtain a fháil ar shínteáin, agus gníomhartha coitianta a dhéanamh.
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index ffac660ac..4eb00d02a 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -70,6 +70,6 @@ zen-site-data-get-addons =
     .label = Kiegészítő hozzáadása
 zen-site-data-site-settings = 
     .label = Minden webhelybeállítás
-zen-site-data-setting-site-protection = Site Protection
-zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-site-data-setting-site-protection = Oldalvédelem
+zen-site-data-panel-feature-callout-title = Új hely az add-onok, engedélyek és egyéb elemek számára
+zen-site-data-panel-feature-callout-subtitle = Kattints az ikonra a webhely beállításainak kezeléséhez, a biztonsági információk megtekintéséhez, a kiegészítők eléréséhez és a gyakori műveletek végrehajtásához.
diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
index 68ea4bf20..9edb55b1e 100644
--- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Ocultar o indicador padrão do contentor na barra de separadores
 zen-key-unsaved = Atalho não guardado! Por favor, proteja-o clicando na tecla "Escape" depois de o voltar a inserir.
-zen-key-conflict = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Conflitua com { $group } -> { $shortcut }
 pane-zen-theme-title = Configurações do Tema
 zen-vertical-tabs-title = Disposição da Barra Lateral e dos Separadores
 zen-vertical-tabs-header = Separadores Verticais
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 6d123455b..69db8a622 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -70,6 +70,6 @@ zen-site-data-get-addons =
     .label = Adicionar Extensões
 zen-site-data-site-settings = 
     .label = Todas as Definições do Site
-zen-site-data-setting-site-protection = Site Protection
-zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-site-data-setting-site-protection = Proteção do Site
+zen-site-data-panel-feature-callout-title = Uma nova casa para extensões, permissões e mais
+zen-site-data-panel-feature-callout-subtitle = Clique no ícone para gerir definições do site, ver informações de segurança, extensões de acesso e executar ações comuns.
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 3b3783327..888caae27 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -70,6 +70,6 @@ zen-site-data-get-addons =
     .label = Добавить расширения
 zen-site-data-site-settings = 
     .label = Все настройки сайта
-zen-site-data-setting-site-protection = Site Protection
-zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-site-data-setting-site-protection = Защищённое соединение
+zen-site-data-panel-feature-callout-title = Новый дом для расширений, разрешений и всего остального
+zen-site-data-panel-feature-callout-subtitle = Нажмите на значок для доступа к настройкам сайта, параметрам безопасности, расширениям и прочим действиям.
diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl
index 489539c87..206429694 100644
--- a/locales/uk/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Приховувати індикатор контейнерів за замовчуванням у панелі вкладок
 zen-key-unsaved = Незбережений ярлик! Захистіть його, натиснувши на кнопку „Escape“ після його введення.
-zen-key-conflict = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Конфліктує з { $group } -> { $shortcut }
 pane-zen-theme-title = Налаштування теми
 zen-vertical-tabs-title = Розташування бічної панелі та вкладок
 zen-vertical-tabs-header = Вертикальні таблиці
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 5fe752bff..ede9b850c 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -38,7 +38,7 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods = 
     .label = Модифікації
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
+    .label = Компактний режим
     .tooltiptext = Увімк. / Вимк. компактний режим
 
 # note: Do not translate the "<br/>" tags in the following string
@@ -70,6 +70,6 @@ zen-site-data-get-addons =
     .label = Додати розширення
 zen-site-data-site-settings = 
     .label = Усі налаштування сайту
-zen-site-data-setting-site-protection = Site Protection
-zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-site-data-setting-site-protection = Захист сайту
+zen-site-data-panel-feature-callout-title = Новий дім для доповнень, дозволів тощо
+zen-site-data-panel-feature-callout-subtitle = Натисніть значок, щоби керувати налаштуваннями сайту, переглядати інформацію про безпеку, отримувати доступ до розширень і виконувати поширені дії.
diff --git a/locales/uk/browser/browser/zen-workspaces.ftl b/locales/uk/browser/browser/zen-workspaces.ftl
index 121271d9b..3dc3115b6 100644
--- a/locales/uk/browser/browser/zen-workspaces.ftl
+++ b/locales/uk/browser/browser/zen-workspaces.ftl
@@ -15,7 +15,7 @@ zen-workspaces-panel-change-icon =
 zen-workspaces-panel-context-default-profile = 
     .label = Встановити профіль
 zen-workspaces-panel-unload = 
-    .label = Unload Space
+    .label = Вивантажити простір
 zen-workspaces-how-to-reorder-title = Як впорядкувати простори
 zen-workspaces-how-to-reorder-desc = Перетягніть значок простору в нижній частині панелі для зміни їхнього порядку
 zen-workspaces-change-theme = 

From 6c3ed1fb80b6eef900cb82c50429fd48bb07a1bf Mon Sep 17 00:00:00 2001
From: reizumi <reizumichan@protonmail.com>
Date: Sat, 11 Oct 2025 04:14:48 +0800
Subject: [PATCH 060/111] feat: improve the site popup ui, p=#10765

* style: improve site popup top buttons

* feat: add filled icons for permissions

* style: align and resize items in the site popup

* feat: site popup ui improvements and more permission icons
---
 src/browser/themes/shared/zen-icons/icons.css | 65 +++++++++++++++++--
 .../themes/shared/zen-icons/jar.inc.mn        | 33 ++++++++++
 .../zen-icons/lin/autoplay-media-fill.svg     |  5 ++
 .../themes/shared/zen-icons/lin/bookmark.svg  |  2 +-
 .../shared/zen-icons/lin/camera-fill.svg      |  5 ++
 .../themes/shared/zen-icons/lin/camera.svg    |  2 +-
 .../lin/desktop-notification-fill.svg         |  5 ++
 .../zen-icons/lin/desktop-notification.svg    |  2 +-
 .../shared/zen-icons/lin/extension-fill.svg   |  5 ++
 .../themes/shared/zen-icons/lin/geo-fill.svg  |  5 ++
 .../shared/zen-icons/lin/permissions-fill.svg |  5 ++
 .../zen-icons/lin/persistent-storage-fill.svg |  5 ++
 .../shared/zen-icons/lin/popup-fill.svg       |  5 ++
 .../themes/shared/zen-icons/lin/popup.svg     |  2 +-
 .../shared/zen-icons/lin/reader-mode.svg      |  2 +-
 .../shared/zen-icons/lin/screenshot.svg       |  2 +-
 .../shared/zen-icons/lin/settings-fill.svg    |  5 ++
 .../themes/shared/zen-icons/lin/share.svg     |  2 +-
 .../lin/tracking-protection-fill.svg          |  5 ++
 .../themes/shared/zen-icons/lin/xr-fill.svg   |  5 ++
 .../common/styles/zen-single-components.css   | 54 +++++++--------
 21 files changed, 179 insertions(+), 42 deletions(-)
 create mode 100644 src/browser/themes/shared/zen-icons/lin/autoplay-media-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/camera-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/desktop-notification-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/extension-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/geo-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/permissions-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/persistent-storage-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/popup-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/settings-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/tracking-protection-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/xr-fill.svg

diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 0acac3084..7b2c84651 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -220,7 +220,7 @@
 #appMenu-settings-button,
 #PanelUI-zen-profiles-managePrfs,
 .unified-extensions-item-open-menu.subviewbutton,
-.zen-site-data-permission-icon {
+.permission-popup-permission-item {
   list-style-image: url('settings.svg') !important;
 }
 
@@ -270,7 +270,6 @@
 }
 
 #bookmarks-menu-button,
-#zen-site-data-header-bookmark,
 #appMenu-bookmarks-button,
 #sidebar-switcher-bookmarks,
 #appMenu-library-bookmarks-button,
@@ -425,12 +424,14 @@
   list-style-image: url('folder.svg') !important;
 }
 
+#zen-site-data-header-bookmark,
 #pageAction-panel-bookmark,
 #star-button,
 #zen-bookmark-button {
   list-style-image: url('bookmark-hollow.svg') !important;
 }
 
+#zen-site-data-header-bookmark.active,
 #pageAction-panel-bookmark[starred],
 #star-button[starred] {
   list-style-image: url('bookmark.svg') !important;
@@ -495,8 +496,12 @@
     -moz-context-properties: fill, fill-opacity;
     pointer-events: none;
   }
+  &[open] image {
+    list-style-image: url('permissions-fill.svg');
+  }
 }
 
+.permission-popup-permission-item-geo,
 .geo-icon {
   list-style-image: url('geo.svg') !important;
 }
@@ -505,6 +510,7 @@
   list-style-image: url('geo-blocked.svg') !important;
 }
 
+.permission-popup-permission-item-xr,
 .xr-icon {
   list-style-image: url('xr.svg') !important;
 }
@@ -513,6 +519,7 @@
   list-style-image: url('xr-blocked.svg') !important;
 }
 
+.permission-popup-permission-item-desktop-notification,
 .popup-notification-icon[popupid='web-notifications'],
 .desktop-notification-icon {
   list-style-image: url('desktop-notification.svg') !important;
@@ -522,6 +529,7 @@
   list-style-image: url('desktop-notification-blocked.svg') !important;
 }
 
+.permission-popup-permission-item-camera,
 .camera-icon,
 #zen-site-data-header-screenshot {
   list-style-image: url('camera.svg') !important;
@@ -531,6 +539,7 @@
   list-style-image: url('camera-blocked.svg') !important;
 }
 
+.permission-popup-permission-item-microphone,
 .microphone-icon {
   list-style-image: url('microphone.svg') !important;
 }
@@ -539,6 +548,7 @@
   list-style-image: url('microphone-blocked.svg') !important;
 }
 
+.permission-popup-permission-item-screen,
 .screen-icon {
   list-style-image: url('screen.svg') !important;
 }
@@ -547,6 +557,7 @@
   list-style-image: url('screen-blocked.svg') !important;
 }
 
+.permission-popup-permission-item-persistent-storage,
 .popup-notification-icon[popupid='persistent-storage'],
 .persistent-storage-icon,
 .indexedDB-icon {
@@ -557,10 +568,12 @@
   list-style-image: url('persistent-storage-blocked.svg') !important;
 }
 
+.permission-popup-permission-item-popup,
 .popup-icon {
   list-style-image: url('popup.svg') !important;
 }
 
+.permission-popup-permission-item-autoplay-media,
 .autoplay-media-icon {
   list-style-image: url('autoplay-media.svg') !important;
 }
@@ -598,6 +611,45 @@
   list-style-image: url('extension-blocked.svg') !important;
 }
 
+.permission-popup-permission-item[state='allow'] {
+  &.permission-popup-permission-item {
+    list-style-image: url('settings-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-geo {
+    list-style-image: url('geo-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-xr {
+    list-style-image: url('xr-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-desktop-notification {
+    list-style-image: url('desktop-notification-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-camera {
+    list-style-image: url('camera-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-microphone {
+    list-style-image: url('microphone-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-screen {
+    list-style-image: url('screen.svg') !important;
+  }
+  &.permission-popup-permission-item-persistent-storage {
+    list-style-image: url('persistent-storage-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-popup {
+    list-style-image: url('popup-fill.svg') !important;
+  }
+  &.permission-popup-permission-item-autoplay-media {
+    list-style-image: url('autoplay-media-fill.svg') !important;
+  }
+  .zen-permission-shield-icon {
+    list-style-image: url('tracking-protection-fill.svg') !important;
+  }
+  .zen-permission-extension-icon {
+    list-style-image: url('extension-fill.svg') !important;
+  }
+}
+
 /* tab sound icons */
 .tab-icon-overlay[soundplaying] {
   list-style-image: url('tab-audio-playing-small.svg') !important;
@@ -846,8 +898,8 @@
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   appearance: none;
-  border-radius: 4px;
-  padding: 5px;
+  border-radius: 6px;
+  padding: 6px 10px 6px 8px;
 
   &[identity='secure'] {
     list-style-image: url('security.svg');
@@ -866,6 +918,7 @@
   }
 
   & .toolbarbutton-text {
+    font-weight: 600;
     padding-inline-start: 4px !important;
   }
 
@@ -882,8 +935,8 @@
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   appearance: none;
-  width: 26px;
-  height: 26px;
+  width: 30px;
+  height: 30px;
   border-radius: 99px;
   margin-left: auto !important;
   list-style-image: url('menu.svg');
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index c71a81e50..76fd42874 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -11,12 +11,14 @@
 *  skin/classic/browser/zen-icons/arrow-up.svg                      (../shared/zen-icons/lin/arrow-up.svg) 
 *  skin/classic/browser/zen-icons/audio-save.svg                      (../shared/zen-icons/lin/audio-save.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media-blocked.svg                      (../shared/zen-icons/lin/autoplay-media-blocked.svg) 
+*  skin/classic/browser/zen-icons/autoplay-media-fill.svg                      (../shared/zen-icons/lin/autoplay-media-fill.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media.svg                      (../shared/zen-icons/lin/autoplay-media.svg) 
 *  skin/classic/browser/zen-icons/back.svg                      (../shared/zen-icons/lin/back.svg) 
 *  skin/classic/browser/zen-icons/bookmark-hollow.svg                      (../shared/zen-icons/lin/bookmark-hollow.svg) 
 *  skin/classic/browser/zen-icons/bookmark-star-on-tray.svg                      (../shared/zen-icons/lin/bookmark-star-on-tray.svg) 
 *  skin/classic/browser/zen-icons/bookmark.svg                      (../shared/zen-icons/lin/bookmark.svg) 
 *  skin/classic/browser/zen-icons/camera-blocked.svg                      (../shared/zen-icons/lin/camera-blocked.svg) 
+*  skin/classic/browser/zen-icons/camera-fill.svg                      (../shared/zen-icons/lin/camera-fill.svg) 
 *  skin/classic/browser/zen-icons/camera.svg                      (../shared/zen-icons/lin/camera.svg) 
 *  skin/classic/browser/zen-icons/canvas-blocked.svg                      (../shared/zen-icons/lin/canvas-blocked.svg) 
 *  skin/classic/browser/zen-icons/canvas.svg                      (../shared/zen-icons/lin/canvas.svg) 
@@ -27,6 +29,7 @@
 *  skin/classic/browser/zen-icons/container-tab.svg                      (../shared/zen-icons/lin/container-tab.svg) 
 *  skin/classic/browser/zen-icons/customize.svg                      (../shared/zen-icons/lin/customize.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-blocked.svg                      (../shared/zen-icons/lin/desktop-notification-blocked.svg) 
+*  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/lin/desktop-notification-fill.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification.svg                      (../shared/zen-icons/lin/desktop-notification.svg) 
 *  skin/classic/browser/zen-icons/developer.svg                      (../shared/zen-icons/lin/developer.svg) 
 *  skin/classic/browser/zen-icons/downloads.svg                      (../shared/zen-icons/lin/downloads.svg) 
@@ -45,6 +48,7 @@
 *  skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/lin/essential-remove.svg) 
 *  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/lin/expand-sidebar.svg) 
 *  skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/lin/extension-blocked.svg) 
+*  skin/classic/browser/zen-icons/extension-fill.svg                      (../shared/zen-icons/lin/extension-fill.svg) 
 *  skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/lin/extension.svg) 
 *  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/face-sun.svg                      (../shared/zen-icons/lin/face-sun.svg) 
@@ -55,6 +59,7 @@
 *  skin/classic/browser/zen-icons/fullscreen-exit.svg                      (../shared/zen-icons/lin/fullscreen-exit.svg) 
 *  skin/classic/browser/zen-icons/fullscreen.svg                      (../shared/zen-icons/lin/fullscreen.svg) 
 *  skin/classic/browser/zen-icons/geo-blocked.svg                      (../shared/zen-icons/lin/geo-blocked.svg) 
+*  skin/classic/browser/zen-icons/geo-fill.svg                      (../shared/zen-icons/lin/geo-fill.svg) 
 *  skin/classic/browser/zen-icons/geo.svg                      (../shared/zen-icons/lin/geo.svg) 
 *  skin/classic/browser/zen-icons/help.svg                      (../shared/zen-icons/lin/help.svg) 
 *  skin/classic/browser/zen-icons/history.svg                      (../shared/zen-icons/lin/history.svg) 
@@ -92,11 +97,14 @@
 *  skin/classic/browser/zen-icons/palette.svg                      (../shared/zen-icons/lin/palette.svg) 
 *  skin/classic/browser/zen-icons/passwords.svg                      (../shared/zen-icons/lin/passwords.svg) 
 *  skin/classic/browser/zen-icons/paste-and-go.svg                      (../shared/zen-icons/lin/paste-and-go.svg) 
+*  skin/classic/browser/zen-icons/permissions-fill.svg                      (../shared/zen-icons/lin/permissions-fill.svg) 
 *  skin/classic/browser/zen-icons/permissions.svg                      (../shared/zen-icons/lin/permissions.svg) 
 *  skin/classic/browser/zen-icons/persistent-storage-blocked.svg                      (../shared/zen-icons/lin/persistent-storage-blocked.svg) 
+*  skin/classic/browser/zen-icons/persistent-storage-fill.svg                      (../shared/zen-icons/lin/persistent-storage-fill.svg) 
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
+*  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/lin/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -115,6 +123,7 @@
 *  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/lin/security-warning.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/lin/send-to-device.svg) 
+*  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/lin/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
 *  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
@@ -130,6 +139,7 @@
 *  skin/classic/browser/zen-icons/tab-audio-playing-small.svg                      (../shared/zen-icons/lin/tab-audio-playing-small.svg) 
 *  skin/classic/browser/zen-icons/tab.svg                      (../shared/zen-icons/lin/tab.svg) 
 *  skin/classic/browser/zen-icons/tool-profiler.svg                      (../shared/zen-icons/lin/tool-profiler.svg) 
+*  skin/classic/browser/zen-icons/tracking-protection-fill.svg                      (../shared/zen-icons/lin/tracking-protection-fill.svg) 
 *  skin/classic/browser/zen-icons/tracking-protection.svg                      (../shared/zen-icons/lin/tracking-protection.svg) 
 *  skin/classic/browser/zen-icons/translations.svg                      (../shared/zen-icons/lin/translations.svg) 
 *  skin/classic/browser/zen-icons/trash.svg                      (../shared/zen-icons/lin/trash.svg) 
@@ -140,6 +150,7 @@
 *  skin/classic/browser/zen-icons/video-save.svg                      (../shared/zen-icons/lin/video-save.svg) 
 *  skin/classic/browser/zen-icons/window.svg                      (../shared/zen-icons/lin/window.svg) 
 *  skin/classic/browser/zen-icons/xr-blocked.svg                      (../shared/zen-icons/lin/xr-blocked.svg) 
+*  skin/classic/browser/zen-icons/xr-fill.svg                      (../shared/zen-icons/lin/xr-fill.svg) 
 *  skin/classic/browser/zen-icons/xr.svg                      (../shared/zen-icons/lin/xr.svg) 
 *  skin/classic/browser/zen-icons/zoom-control.svg                      (../shared/zen-icons/lin/zoom-control.svg) 
 *  skin/classic/browser/zen-icons/zoom-out.svg                      (../shared/zen-icons/lin/zoom-out.svg) 
@@ -153,12 +164,14 @@
 *  skin/classic/browser/zen-icons/arrow-up.svg                      (../shared/zen-icons/lin/arrow-up.svg) 
 *  skin/classic/browser/zen-icons/audio-save.svg                      (../shared/zen-icons/lin/audio-save.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media-blocked.svg                      (../shared/zen-icons/lin/autoplay-media-blocked.svg) 
+*  skin/classic/browser/zen-icons/autoplay-media-fill.svg                      (../shared/zen-icons/lin/autoplay-media-fill.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media.svg                      (../shared/zen-icons/lin/autoplay-media.svg) 
 *  skin/classic/browser/zen-icons/back.svg                      (../shared/zen-icons/lin/back.svg) 
 *  skin/classic/browser/zen-icons/bookmark-hollow.svg                      (../shared/zen-icons/lin/bookmark-hollow.svg) 
 *  skin/classic/browser/zen-icons/bookmark-star-on-tray.svg                      (../shared/zen-icons/lin/bookmark-star-on-tray.svg) 
 *  skin/classic/browser/zen-icons/bookmark.svg                      (../shared/zen-icons/lin/bookmark.svg) 
 *  skin/classic/browser/zen-icons/camera-blocked.svg                      (../shared/zen-icons/lin/camera-blocked.svg) 
+*  skin/classic/browser/zen-icons/camera-fill.svg                      (../shared/zen-icons/lin/camera-fill.svg) 
 *  skin/classic/browser/zen-icons/camera.svg                      (../shared/zen-icons/lin/camera.svg) 
 *  skin/classic/browser/zen-icons/canvas-blocked.svg                      (../shared/zen-icons/lin/canvas-blocked.svg) 
 *  skin/classic/browser/zen-icons/canvas.svg                      (../shared/zen-icons/lin/canvas.svg) 
@@ -169,6 +182,7 @@
 *  skin/classic/browser/zen-icons/container-tab.svg                      (../shared/zen-icons/lin/container-tab.svg) 
 *  skin/classic/browser/zen-icons/customize.svg                      (../shared/zen-icons/lin/customize.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-blocked.svg                      (../shared/zen-icons/lin/desktop-notification-blocked.svg) 
+*  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/lin/desktop-notification-fill.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification.svg                      (../shared/zen-icons/lin/desktop-notification.svg) 
 *  skin/classic/browser/zen-icons/developer.svg                      (../shared/zen-icons/lin/developer.svg) 
 *  skin/classic/browser/zen-icons/downloads.svg                      (../shared/zen-icons/lin/downloads.svg) 
@@ -187,6 +201,7 @@
 *  skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/lin/essential-remove.svg) 
 *  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/lin/expand-sidebar.svg) 
 *  skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/lin/extension-blocked.svg) 
+*  skin/classic/browser/zen-icons/extension-fill.svg                      (../shared/zen-icons/lin/extension-fill.svg) 
 *  skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/lin/extension.svg) 
 *  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/face-sun.svg                      (../shared/zen-icons/lin/face-sun.svg) 
@@ -197,6 +212,7 @@
 *  skin/classic/browser/zen-icons/fullscreen-exit.svg                      (../shared/zen-icons/lin/fullscreen-exit.svg) 
 *  skin/classic/browser/zen-icons/fullscreen.svg                      (../shared/zen-icons/lin/fullscreen.svg) 
 *  skin/classic/browser/zen-icons/geo-blocked.svg                      (../shared/zen-icons/lin/geo-blocked.svg) 
+*  skin/classic/browser/zen-icons/geo-fill.svg                      (../shared/zen-icons/lin/geo-fill.svg) 
 *  skin/classic/browser/zen-icons/geo.svg                      (../shared/zen-icons/lin/geo.svg) 
 *  skin/classic/browser/zen-icons/help.svg                      (../shared/zen-icons/lin/help.svg) 
 *  skin/classic/browser/zen-icons/history.svg                      (../shared/zen-icons/lin/history.svg) 
@@ -234,11 +250,14 @@
 *  skin/classic/browser/zen-icons/palette.svg                      (../shared/zen-icons/lin/palette.svg) 
 *  skin/classic/browser/zen-icons/passwords.svg                      (../shared/zen-icons/lin/passwords.svg) 
 *  skin/classic/browser/zen-icons/paste-and-go.svg                      (../shared/zen-icons/lin/paste-and-go.svg) 
+*  skin/classic/browser/zen-icons/permissions-fill.svg                      (../shared/zen-icons/lin/permissions-fill.svg) 
 *  skin/classic/browser/zen-icons/permissions.svg                      (../shared/zen-icons/lin/permissions.svg) 
 *  skin/classic/browser/zen-icons/persistent-storage-blocked.svg                      (../shared/zen-icons/lin/persistent-storage-blocked.svg) 
+*  skin/classic/browser/zen-icons/persistent-storage-fill.svg                      (../shared/zen-icons/lin/persistent-storage-fill.svg) 
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
+*  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/lin/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -257,6 +276,7 @@
 *  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/lin/security-warning.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/lin/send-to-device.svg) 
+*  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/lin/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
 *  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
@@ -272,6 +292,7 @@
 *  skin/classic/browser/zen-icons/tab-audio-playing-small.svg                      (../shared/zen-icons/lin/tab-audio-playing-small.svg) 
 *  skin/classic/browser/zen-icons/tab.svg                      (../shared/zen-icons/lin/tab.svg) 
 *  skin/classic/browser/zen-icons/tool-profiler.svg                      (../shared/zen-icons/lin/tool-profiler.svg) 
+*  skin/classic/browser/zen-icons/tracking-protection-fill.svg                      (../shared/zen-icons/lin/tracking-protection-fill.svg) 
 *  skin/classic/browser/zen-icons/tracking-protection.svg                      (../shared/zen-icons/lin/tracking-protection.svg) 
 *  skin/classic/browser/zen-icons/translations.svg                      (../shared/zen-icons/lin/translations.svg) 
 *  skin/classic/browser/zen-icons/trash.svg                      (../shared/zen-icons/lin/trash.svg) 
@@ -282,6 +303,7 @@
 *  skin/classic/browser/zen-icons/video-save.svg                      (../shared/zen-icons/lin/video-save.svg) 
 *  skin/classic/browser/zen-icons/window.svg                      (../shared/zen-icons/lin/window.svg) 
 *  skin/classic/browser/zen-icons/xr-blocked.svg                      (../shared/zen-icons/lin/xr-blocked.svg) 
+*  skin/classic/browser/zen-icons/xr-fill.svg                      (../shared/zen-icons/lin/xr-fill.svg) 
 *  skin/classic/browser/zen-icons/xr.svg                      (../shared/zen-icons/lin/xr.svg) 
 *  skin/classic/browser/zen-icons/zoom-control.svg                      (../shared/zen-icons/lin/zoom-control.svg) 
 *  skin/classic/browser/zen-icons/zoom-out.svg                      (../shared/zen-icons/lin/zoom-out.svg) 
@@ -295,12 +317,14 @@
 *  skin/classic/browser/zen-icons/arrow-up.svg                      (../shared/zen-icons/lin/arrow-up.svg) 
 *  skin/classic/browser/zen-icons/audio-save.svg                      (../shared/zen-icons/lin/audio-save.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media-blocked.svg                      (../shared/zen-icons/lin/autoplay-media-blocked.svg) 
+*  skin/classic/browser/zen-icons/autoplay-media-fill.svg                      (../shared/zen-icons/lin/autoplay-media-fill.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media.svg                      (../shared/zen-icons/lin/autoplay-media.svg) 
 *  skin/classic/browser/zen-icons/back.svg                      (../shared/zen-icons/lin/back.svg) 
 *  skin/classic/browser/zen-icons/bookmark-hollow.svg                      (../shared/zen-icons/lin/bookmark-hollow.svg) 
 *  skin/classic/browser/zen-icons/bookmark-star-on-tray.svg                      (../shared/zen-icons/lin/bookmark-star-on-tray.svg) 
 *  skin/classic/browser/zen-icons/bookmark.svg                      (../shared/zen-icons/lin/bookmark.svg) 
 *  skin/classic/browser/zen-icons/camera-blocked.svg                      (../shared/zen-icons/lin/camera-blocked.svg) 
+*  skin/classic/browser/zen-icons/camera-fill.svg                      (../shared/zen-icons/lin/camera-fill.svg) 
 *  skin/classic/browser/zen-icons/camera.svg                      (../shared/zen-icons/lin/camera.svg) 
 *  skin/classic/browser/zen-icons/canvas-blocked.svg                      (../shared/zen-icons/lin/canvas-blocked.svg) 
 *  skin/classic/browser/zen-icons/canvas.svg                      (../shared/zen-icons/lin/canvas.svg) 
@@ -311,6 +335,7 @@
 *  skin/classic/browser/zen-icons/container-tab.svg                      (../shared/zen-icons/lin/container-tab.svg) 
 *  skin/classic/browser/zen-icons/customize.svg                      (../shared/zen-icons/lin/customize.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-blocked.svg                      (../shared/zen-icons/lin/desktop-notification-blocked.svg) 
+*  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/lin/desktop-notification-fill.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification.svg                      (../shared/zen-icons/lin/desktop-notification.svg) 
 *  skin/classic/browser/zen-icons/developer.svg                      (../shared/zen-icons/lin/developer.svg) 
 *  skin/classic/browser/zen-icons/downloads.svg                      (../shared/zen-icons/lin/downloads.svg) 
@@ -329,6 +354,7 @@
 *  skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/lin/essential-remove.svg) 
 *  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/lin/expand-sidebar.svg) 
 *  skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/lin/extension-blocked.svg) 
+*  skin/classic/browser/zen-icons/extension-fill.svg                      (../shared/zen-icons/lin/extension-fill.svg) 
 *  skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/lin/extension.svg) 
 *  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/face-sun.svg                      (../shared/zen-icons/lin/face-sun.svg) 
@@ -339,6 +365,7 @@
 *  skin/classic/browser/zen-icons/fullscreen-exit.svg                      (../shared/zen-icons/lin/fullscreen-exit.svg) 
 *  skin/classic/browser/zen-icons/fullscreen.svg                      (../shared/zen-icons/lin/fullscreen.svg) 
 *  skin/classic/browser/zen-icons/geo-blocked.svg                      (../shared/zen-icons/lin/geo-blocked.svg) 
+*  skin/classic/browser/zen-icons/geo-fill.svg                      (../shared/zen-icons/lin/geo-fill.svg) 
 *  skin/classic/browser/zen-icons/geo.svg                      (../shared/zen-icons/lin/geo.svg) 
 *  skin/classic/browser/zen-icons/help.svg                      (../shared/zen-icons/lin/help.svg) 
 *  skin/classic/browser/zen-icons/history.svg                      (../shared/zen-icons/lin/history.svg) 
@@ -376,11 +403,14 @@
 *  skin/classic/browser/zen-icons/palette.svg                      (../shared/zen-icons/lin/palette.svg) 
 *  skin/classic/browser/zen-icons/passwords.svg                      (../shared/zen-icons/lin/passwords.svg) 
 *  skin/classic/browser/zen-icons/paste-and-go.svg                      (../shared/zen-icons/lin/paste-and-go.svg) 
+*  skin/classic/browser/zen-icons/permissions-fill.svg                      (../shared/zen-icons/lin/permissions-fill.svg) 
 *  skin/classic/browser/zen-icons/permissions.svg                      (../shared/zen-icons/lin/permissions.svg) 
 *  skin/classic/browser/zen-icons/persistent-storage-blocked.svg                      (../shared/zen-icons/lin/persistent-storage-blocked.svg) 
+*  skin/classic/browser/zen-icons/persistent-storage-fill.svg                      (../shared/zen-icons/lin/persistent-storage-fill.svg) 
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
+*  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/lin/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -399,6 +429,7 @@
 *  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/lin/security-warning.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/lin/send-to-device.svg) 
+*  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/lin/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
 *  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
@@ -414,6 +445,7 @@
 *  skin/classic/browser/zen-icons/tab-audio-playing-small.svg                      (../shared/zen-icons/lin/tab-audio-playing-small.svg) 
 *  skin/classic/browser/zen-icons/tab.svg                      (../shared/zen-icons/lin/tab.svg) 
 *  skin/classic/browser/zen-icons/tool-profiler.svg                      (../shared/zen-icons/lin/tool-profiler.svg) 
+*  skin/classic/browser/zen-icons/tracking-protection-fill.svg                      (../shared/zen-icons/lin/tracking-protection-fill.svg) 
 *  skin/classic/browser/zen-icons/tracking-protection.svg                      (../shared/zen-icons/lin/tracking-protection.svg) 
 *  skin/classic/browser/zen-icons/translations.svg                      (../shared/zen-icons/lin/translations.svg) 
 *  skin/classic/browser/zen-icons/trash.svg                      (../shared/zen-icons/lin/trash.svg) 
@@ -424,6 +456,7 @@
 *  skin/classic/browser/zen-icons/video-save.svg                      (../shared/zen-icons/lin/video-save.svg) 
 *  skin/classic/browser/zen-icons/window.svg                      (../shared/zen-icons/lin/window.svg) 
 *  skin/classic/browser/zen-icons/xr-blocked.svg                      (../shared/zen-icons/lin/xr-blocked.svg) 
+*  skin/classic/browser/zen-icons/xr-fill.svg                      (../shared/zen-icons/lin/xr-fill.svg) 
 *  skin/classic/browser/zen-icons/xr.svg                      (../shared/zen-icons/lin/xr.svg) 
 *  skin/classic/browser/zen-icons/zoom-control.svg                      (../shared/zen-icons/lin/zoom-control.svg) 
 *  skin/classic/browser/zen-icons/zoom-out.svg                      (../shared/zen-icons/lin/zoom-out.svg) 
diff --git a/src/browser/themes/shared/zen-icons/lin/autoplay-media-fill.svg b/src/browser/themes/shared/zen-icons/lin/autoplay-media-fill.svg
new file mode 100644
index 000000000..d16ce98cf
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/autoplay-media-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M14.609,5.342c-2.539-1.385-4.21-3.969-4.227-3.995-.18-.281-.521-.41-.843-.316-.319,.094-.54,.387-.54,.72V10.269c-.629-.476-1.403-.769-2.25-.769-2.068,0-3.75,1.682-3.75,3.75s1.682,3.75,3.75,3.75,3.75-1.682,3.75-3.75V3.915c.82,.903,1.977,1.972,3.391,2.743,.363,.198,.819,.065,1.018-.299,.199-.364,.064-.819-.299-1.018Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/bookmark.svg b/src/browser/themes/shared/zen-icons/lin/bookmark.svg
index 506c02cc1..278b3fa90 100644
--- a/src/browser/themes/shared/zen-icons/lin/bookmark.svg
+++ b/src/browser/themes/shared/zen-icons/lin/bookmark.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,16.25l-5.25-3.5-5.25,3.5V3.75c0-1.105,.895-2,2-2h6.5c1.105,0,2,.895,2,2v12.5Z"></path><polyline points="6.497 8 8.106 9.5 11.503 5" data-color="color-2"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M12.25,1H5.75c-1.517,0-2.75,1.233-2.75,2.75v12.5c0,.276,.152,.531,.396,.661,.244,.131,.54,.117,.77-.037l4.834-3.223,4.834,3.223c.125,.083,.271,.126,.416,.126,.122,0,.243-.029,.354-.089,.244-.13,.396-.385,.396-.661V3.75c0-1.517-1.233-2.75-2.75-2.75Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/camera-fill.svg b/src/browser/themes/shared/zen-icons/lin/camera-fill.svg
new file mode 100644
index 000000000..60b32e501
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/camera-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M14.25,3h-1.73l-.324-.864c-.254-.68-.913-1.136-1.639-1.136h-3.114c-.726,0-1.384,.457-1.638,1.136l-.324,.864h-1.73c-1.517,0-2.75,1.233-2.75,2.75v6.5c0,1.517,1.233,2.75,2.75,2.75H14.25c1.517,0,2.75-1.233,2.75-2.75V5.75c0-1.517-1.233-2.75-2.75-2.75ZM4,7c-.552,0-1-.448-1-1s.448-1,1-1,1,.448,1,1-.448,1-1,1Zm5,5c-1.657,0-3-1.343-3-3s1.343-3,3-3,3,1.343,3,3-1.343,3-3,3Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/camera.svg b/src/browser/themes/shared/zen-icons/lin/camera.svg
index 310a865d6..232a55ab9 100644
--- a/src/browser/themes/shared/zen-icons/lin/camera.svg
+++ b/src/browser/themes/shared/zen-icons/lin/camera.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2H14.25c1.105,0,2-.895,2-2V5.75c0-1.105-.895-2-2-2Z"></path><circle cx="9" cy="9" r="2.75" data-color="color-2"></circle><circle cx="4.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2H14.25c1.105,0,2-.895,2-2V5.75c0-1.105-.895-2-2-2Z"></path><circle cx="9" cy="9" r="2.75" data-color="color-2"></circle><circle cx="4.25" cy="6.25" r=".75" fill="context-fill" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/desktop-notification-fill.svg b/src/browser/themes/shared/zen-icons/lin/desktop-notification-fill.svg
new file mode 100644
index 000000000..c94bb578c
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/desktop-notification-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M15.75,12.5c-.689,0-1.25-.561-1.25-1.25V6.5c0-3.033-2.467-5.5-5.5-5.5S3.5,3.467,3.5,6.5v4.75c0,.689-.561,1.25-1.25,1.25-.414,0-.75,.336-.75,.75s.336,.75,.75,.75H15.75c.414,0,.75-.336,.75-.75s-.336-.75-.75-.75Z"></path><path d="M10.2,15h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418-.095-.117-.237-.185-.388-.185Z" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/desktop-notification.svg b/src/browser/themes/shared/zen-icons/lin/desktop-notification.svg
index 0620eabbf..fe56121b8 100644
--- a/src/browser/themes/shared/zen-icons/lin/desktop-notification.svg
+++ b/src/browser/themes/shared/zen-icons/lin/desktop-notification.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.75,13.25c-1.105,0-2-.895-2-2V6.5c0-2.623-2.127-4.75-4.75-4.75h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2H15.75Z"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.75,13.25c-1.105,0-2-.895-2-2V6.5c0-2.623-2.127-4.75-4.75-4.75h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2H15.75Z"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="context-fill" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/extension-fill.svg b/src/browser/themes/shared/zen-icons/lin/extension-fill.svg
new file mode 100644
index 000000000..bd54d8d8c
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/extension-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M15.414,8.665c.233,.117,.509,.104,.73-.032,.221-.137,.356-.378,.356-.638v-1.744c0-1.517-1.233-2.75-2.75-2.75h-1.775c.01-.083,.025-.164,.025-.25,0-1.103-.897-2-2-2s-2,.897-2,2c0,.086,.015,.167,.025,.25h-1.775c-1.517,0-2.75,1.233-2.75,2.75v1.775c-.083-.011-.164-.025-.25-.025-1.103,0-2,.897-2,2s.897,2,2,2c.086,0,.167-.015,.25-.025v1.775c0,1.517,1.233,2.75,2.75,2.75h1.744c.26,0,.501-.135,.638-.355,.136-.221,.149-.498,.033-.73-.109-.219-.165-.442-.165-.665,0-.827,.673-1.5,1.5-1.5s1.5,.673,1.5,1.5c0,.221-.056,.445-.166,.666-.116,.232-.103,.508,.034,.729,.137,.221,.378,.355,.638,.355h1.744c1.517,0,2.75-1.233,2.75-2.75v-1.744c0-.26-.135-.501-.356-.638s-.498-.15-.73-.032c-1.027,.515-2.164-.285-2.164-1.335,0-1.05,1.134-1.85,2.164-1.335Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/geo-fill.svg b/src/browser/themes/shared/zen-icons/lin/geo-fill.svg
new file mode 100644
index 000000000..c97eaf78d
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/geo-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M9,1C5.791,1,2.471,3.344,2.471,7.267c0,2.792,3.252,6.915,5.189,9.125,.339,.387,.827,.609,1.34,.609s1.001-.222,1.339-.608c1.938-2.21,5.19-6.335,5.19-9.125,0-3.922-3.32-6.267-6.529-6.267Zm0,8.25c-.967,0-1.75-.784-1.75-1.75s.783-1.75,1.75-1.75,1.75,.784,1.75,1.75-.783,1.75-1.75,1.75Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/permissions-fill.svg b/src/browser/themes/shared/zen-icons/lin/permissions-fill.svg
new file mode 100644
index 000000000..3d38645aa
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/permissions-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M13.25,2H4.75c-1.517,0-2.75,1.233-2.75,2.75V13.25c0,1.517,1.233,2.75,2.75,2.75H13.25c1.517,0,2.75-1.233,2.75-2.75V4.75c0-1.517-1.233-2.75-2.75-2.75ZM5.25,6h1.25v-1c0-.414,.336-.75,.75-.75s.75,.336,.75,.75v3.5c0,.414-.336,.75-.75,.75s-.75-.336-.75-.75v-1h-1.25c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75Zm3,6h-3c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75h3c.414,0,.75,.336,.75,.75s-.336,.75-.75,.75Zm4.5,0h-1.25v1c0,.414-.336,.75-.75,.75s-.75-.336-.75-.75v-3.5c0-.414,.336-.75,.75-.75s.75,.336,.75,.75v1h1.25c.414,0,.75,.336,.75,.75s-.336,.75-.75,.75Zm0-4.5h-3c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75h3c.414,0,.75,.336,.75,.75s-.336,.75-.75,.75Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/persistent-storage-fill.svg b/src/browser/themes/shared/zen-icons/lin/persistent-storage-fill.svg
new file mode 100644
index 000000000..1c5e3099d
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/persistent-storage-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M16.871,10.502l-2.204-6.621c-.375-1.125-1.423-1.881-2.609-1.881H5.942c-1.186,0-2.235,.756-2.609,1.881L1.129,10.502s-.129,.439-.129,.748v2c0,1.241,1.009,2.25,2.25,2.25H14.75c1.241,0,2.25-1.009,2.25-2.25v-2c0-.385-.129-.748-.129-.748Zm-1.371,2.748c0,.414-.336,.75-.75,.75H3.25c-.414,0-.75-.336-.75-.75v-2c0-.414,.336-.75,.75-.75H14.75c.414,0,.75,.336,.75,.75v2Z"></path><path d="M7,11.5h-2.75c-.414,0-.75,.336-.75,.75s.336,.75,.75,.75h2.75c.414,0,.75-.336,.75-.75s-.336-.75-.75-.75Z" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/popup-fill.svg b/src/browser/themes/shared/zen-icons/lin/popup-fill.svg
new file mode 100644
index 000000000..958aed3f2
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/popup-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M14.25,2H3.75c-1.517,0-2.75,1.233-2.75,2.75V13.25c0,1.517,1.233,2.75,2.75,2.75H14.25c1.517,0,2.75-1.233,2.75-2.75V4.75c0-1.517-1.233-2.75-2.75-2.75Zm-7.25,2c.552,0,1,.448,1,1s-.448,1-1,1-1-.448-1-1,.448-1,1-1Zm-3,0c.552,0,1,.448,1,1s-.448,1-1,1-1-.448-1-1,.448-1,1-1ZM15.5,13.25c0,.689-.561,1.25-1.25,1.25H3.75c-.689,0-1.25-.561-1.25-1.25v-5.25H15.5v5.25Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/popup.svg b/src/browser/themes/shared/zen-icons/lin/popup.svg
index 4b1f1eb4b..66f513bfd 100644
--- a/src/browser/themes/shared/zen-icons/lin/popup.svg
+++ b/src/browser/themes/shared/zen-icons/lin/popup.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,8.709v-3.959c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.619"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="context-fill" data-stroke="none" data-color="color-2" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="context-fill" data-stroke="none" data-color="color-2" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,8.709v-3.959c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.619"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/reader-mode.svg b/src/browser/themes/shared/zen-icons/lin/reader-mode.svg
index 22b11f430..be854bc27 100644
--- a/src/browser/themes/shared/zen-icons/lin/reader-mode.svg
+++ b/src/browser/themes/shared/zen-icons/lin/reader-mode.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="6.75" x2="7.75" y2="6.75" data-color="color-2"></line><line x1="5.75" y1="9.75" x2="12.25" y2="9.75" data-color="color-2"></line><line x1="5.75" y1="12.75" x2="12.25" y2="12.75" data-color="color-2"></line><path d="M2.75,14.25V3.75c0-1.105,.895-2,2-2h5.586c.265,0,.52,.105,.707,.293l3.914,3.914c.188,.188,.293,.442,.293,.707v7.586c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2Z"></path><path d="M15.16,6.25h-3.41c-.552,0-1-.448-1-1V1.852"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="11.25" x2="9" y2="11.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><line x1="5.75" y1="8.25" x2="12.25" y2="8.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><line x1="5.75" y1="5.25" x2="12.25" y2="5.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line><rect x="2.75" y="1.75" width="12.5" height="14.5" rx="2" ry="2" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/screenshot.svg b/src/browser/themes/shared/zen-icons/lin/screenshot.svg
index 1ade98c05..2d1224924 100644
--- a/src/browser/themes/shared/zen-icons/lin/screenshot.svg
+++ b/src/browser/themes/shared/zen-icons/lin/screenshot.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.25,2.75h2c1.105,0,2,.895,2,2v2" data-color="color-2"></path><path d="M6.75,15.25h-2c-1.105,0-2-.895-2-2v-2" data-color="color-2"></path><path d="M2.75,6.75v-2c0-1.105,.895-2,2-2h2"></path><path d="M15.25,11.25v2c0,1.105-.895,2-2,2h-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M 14.25 4.75 L 12 4.75 L 11.493 3.399 C 11.347 3.009 10.974 2.75 10.557 2.75 L 7.443 2.75 C 7.026 2.75 6.653 3.009 6.507 3.399 L 6 4.75 L 3.75 4.75 C 2.645 4.75 1.75 5.645 1.75 6.75 L 1.75 13.25 C 1.75 14.355 2.645 15.25 3.75 15.25 L 14.25 15.25 C 15.355 15.25 16.25 14.355 16.25 13.25 L 16.25 6.75 C 16.25 5.645 15.355 4.75 14.25 4.75 Z" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><circle cx="9" cy="10" r="2.75" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></circle><circle cx="4.25" cy="7.25" r="0.75" data-color="color-2" data-stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/settings-fill.svg b/src/browser/themes/shared/zen-icons/lin/settings-fill.svg
new file mode 100644
index 000000000..749d47eba
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/settings-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M15.676,6.934l-.907-.32c-.104-.251-.22-.499-.358-.739-.131-.227-.296-.425-.451-.631l.184-.983c.153-.826-.232-1.664-.96-2.084l-.352-.203c-.728-.42-1.645-.336-2.284,.211l-.729,.624c-.543-.073-1.087-.08-1.623-.01l-.728-.623c-.639-.546-1.557-.632-2.285-.211l-.351,.203c-.728,.419-1.113,1.257-.959,2.084l.174,.933c-.326,.423-.575,.9-.784,1.399l-.939,.331c-.792,.28-1.324,1.033-1.324,1.873v.405c0,.841,.532,1.593,1.324,1.873l.906,.32c.104,.251,.219,.499,.358,.738,.131,.228,.296,.426,.452,.632l-.184,.983c-.153,.826,.232,1.664,.96,2.084l.352,.203c.309,.178,.651,.266,.992,.266,.463,0,.924-.162,1.292-.477l.724-.62c.278,.037,.556,.057,.833,.057,.266,0,.531-.018,.794-.052l.729,.624c.368,.315,.829,.477,1.293,.477,.341,0,.684-.087,.992-.266l.351-.203c.728-.419,1.113-1.257,.959-2.084l-.174-.934c.326-.423,.574-.899,.783-1.397l.94-.332c.792-.28,1.324-1.033,1.324-1.873v-.405c0-.841-.532-1.593-1.324-1.873Zm-6.676,5.066c-1.657,0-3-1.343-3-3s1.343-3,3-3,3,1.343,3,3-1.343,3-3,3Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/share.svg b/src/browser/themes/shared/zen-icons/lin/share.svg
index 8fbd2bd81..a4eb9e169 100644
--- a/src/browser/themes/shared/zen-icons/lin/share.svg
+++ b/src/browser/themes/shared/zen-icons/lin/share.svg
@@ -2,4 +2,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,4.5V1.75s4.5,4.25,4.5,4.25l-4.5,4.25v-2.75c-3.625,0-6,3.5-6,3.5,0,0,0-6.5,6-6.5Z" data-color="color-2"></path><path d="M7.25,2.75h-2.5c-1.105,0-2,.895-2,2V13.25c0,1.105,.895,2,2,2H13.25c1.105,0,2-.895,2-2v-2.5"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12,7.25h1.75c1.105,0,2,.895,2,2v4.5c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2v-4.5c0-1.105,.895-2,2-2h1.75" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><polyline points="6 4.25 9 1.25 12 4.25" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></polyline><line x1="9" y1="1.25" x2="9" y2="12.75" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/tracking-protection-fill.svg b/src/browser/themes/shared/zen-icons/lin/tracking-protection-fill.svg
new file mode 100644
index 000000000..8a9ef1f1f
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/tracking-protection-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M14.783,2.813l-5.25-1.68c-.348-.111-.717-.111-1.066,0L3.216,2.813c-.727,.233-1.216,.903-1.216,1.667v6.52c0,3.507,4.945,5.379,6.461,5.869,.177,.057,.357,.086,.539,.086s.362-.029,.538-.086c1.517-.49,6.462-2.362,6.462-5.869V4.48c0-.764-.489-1.434-1.217-1.667Zm-.283,8.187c0,2.559-4.518,4.149-5.424,4.442-.026,.008-.051,0-.076,0V2.55c.025,0,.051,.004,.076,.012l5.249,1.68c.104,.033,.175,.129,.175,.238v6.52Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/xr-fill.svg b/src/browser/themes/shared/zen-icons/lin/xr-fill.svg
new file mode 100644
index 000000000..bd387cd56
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/xr-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><path d="M15.979,7.495c-.25,0-.496-.126-.638-.354l-1.892-3.049c-.23-.37-.627-.591-1.062-.591H5.613c-.436,0-.833,.221-1.062,.591l-1.892,3.049c-.218,.352-.682,.46-1.033,.242-.352-.218-.46-.681-.242-1.033l1.892-3.049c.506-.814,1.379-1.3,2.337-1.3h6.774c.958,0,1.831,.486,2.337,1.299l1.892,3.05c.218,.352,.11,.814-.242,1.033-.123,.077-.26,.113-.395,.113Z" data-color="color-2"></path><path d="M14.25,5H3.75c-1.517,0-2.75,1.233-2.75,2.75v4.5c0,1.517,1.233,2.75,2.75,2.75h2c.861,0,1.683-.411,2.2-1.1l.45-.6c.286-.381,.914-.381,1.2,0l.45,.601c.517,.688,1.339,1.1,2.2,1.1h2c1.517,0,2.75-1.233,2.75-2.75V7.75c0-1.517-1.233-2.75-2.75-2.75ZM5.5,11.5c-.827,0-1.5-.673-1.5-1.5s.673-1.5,1.5-1.5,1.5,.673,1.5,1.5-.673,1.5-1.5,1.5Zm7,0c-.827,0-1.5-.673-1.5-1.5s.673-1.5,1.5-1.5,1.5,.673,1.5,1.5-.673,1.5-1.5,1.5Z"></path></g></svg>
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 3eefbd64d..4682ded44 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -282,7 +282,7 @@ body > #confetti {
 
 #zen-unified-site-data-panel {
   --panel-padding: 0px;
-  --panel-width: 228px;
+  --panel-width: 234px;
   --menu-panel-width-wide: calc(var(--panel-width) - var(--panel-padding) * 2);
   --uei-icon-size: 14px;
   --arrowpanel-menuitem-border-radius: 10px;
@@ -318,8 +318,8 @@ body > #confetti {
 
     & > * {
       background-color: color-mix(in srgb, currentcolor 6%, transparent);
-      width: 46px;
-      height: 34px;
+      width: 48px;
+      height: 32px;
       margin: 0;
       justify-content: center;
       align-items: center;
@@ -354,22 +354,25 @@ body > #confetti {
 }
 
 .zen-site-data-section-header {
-  font-weight: 500;
-  font-size: small;
+  font-weight: 600;
 
   & label {
     margin: 0;
   }
 
   & > label:nth-child(2) {
-    font-weight: 400;
+    font-weight: 500;
     font-size: smaller;
     transition: opacity 0.15s ease-in-out;
     opacity: 0;
-    padding: 0px 4px;
+    border-radius: 6px;
+    padding: 2px 6px;
 
+    &:hover {
+      background-color: color-mix(in srgb, currentColor 10%, transparent);
+    }
     .zen-site-data-section:hover & {
-      opacity: 0.8;
+      opacity: 0.5;
     }
   }
 }
@@ -438,7 +441,7 @@ body > #confetti {
 }
 
 .zen-permission-popup-permission-state-label {
-  opacity: 0.8;
+  opacity: 0.6;
   font-size: smaller;
   font-weight: 400;
   margin: 0;
@@ -463,7 +466,7 @@ body > #confetti {
 }
 
 #zen-site-data-header {
-  gap: 6px;
+  gap: 8px;
   align-items: center;
   padding: 8px;
   padding-bottom: 0;
@@ -474,7 +477,8 @@ body > #confetti {
     -moz-context-properties: fill;
     fill: currentColor;
     color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
-    padding: 8px 0px;
+    max-width: 48px;
+    height: 32px;
     position: relative;
 
     &[disabled] {
@@ -495,29 +499,21 @@ body > #confetti {
     &::before {
       content: '';
       position: absolute;
-      inset: 1px;
+      width: 100%;
+      height: 100%;
       background: linear-gradient(
         to bottom,
-        color-mix(
-          in srgb,
-          light-dark(rgba(255, 255, 255, 1), rgba(0, 0, 0, 0.5)) 15%,
-          transparent 100%
-        ),
-        color-mix(
-          in srgb,
-          light-dark(rgba(255, 255, 255, 0.8), rgba(0, 0, 0, 0.9)) 100%,
-          transparent 100%
-        )
+        light-dark(rgb(255, 255, 255), rgb(34, 34, 34)),
+        light-dark(rgb(246, 246, 246), rgb(21, 21, 21))
       );
       transition: transform 0.12s ease-in-out;
-      box-shadow: 0px 2px 3px 1px rgba(0, 0, 0, 0.1);
+      box-shadow:
+        0px 2px 4px rgba(0, 0, 0, 0.075),
+        inset 0px 1px 0px light-dark(transparent, rgba(255, 255, 255, 0.15));
       border-radius: 6px;
-      --base-border-color: light-dark(rgba(0, 0, 0, 0.3), rgba(255, 255, 255, 0.1));
-      border: 1px solid;
-      border-top-color: light-dark(var(--base-border-color), rgba(255, 255, 255, 0.1));
-      border-left-color: light-dark(var(--base-border-color), transparent);
-      border-right-color: light-dark(var(--base-border-color), transparent);
-      border-bottom-color: light-dark(var(--base-border-color), rgba(0, 0, 0, 0.12));
+      --base-border-color: light-dark(rgba(0, 0, 0, 0.175), rgba(255, 255, 255, 0.1));
+      border: 1px solid light-dark(var(--base-border-color), rgb(21, 21, 21));
+      box-sizing: border-box;
       will-change: transform;
     }
 

From e495f2ae5d27d834119b659ff3c3c92a1f9deedb Mon Sep 17 00:00:00 2001
From: reizumi <reizumichan@protonmail.com>
Date: Sat, 11 Oct 2025 04:42:54 +0800
Subject: [PATCH 061/111] feat: improve the site popup ui (part 2), p=#10768

---
 src/browser/themes/shared/zen-icons/icons.css | 90 ++++++++-----------
 .../common/styles/zen-single-components.css   |  2 +-
 2 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 7b2c84651..5068b5558 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -219,8 +219,7 @@
 .search-setting-button > .button-box > .button-icon,
 #appMenu-settings-button,
 #PanelUI-zen-profiles-managePrfs,
-.unified-extensions-item-open-menu.subviewbutton,
-.permission-popup-permission-item {
+.unified-extensions-item-open-menu.subviewbutton {
   list-style-image: url('settings.svg') !important;
 }
 
@@ -326,8 +325,7 @@
 #urlbar-input-container[pageproxystate='valid']
   > #tracking-protection-icon-container
   > #tracking-protection-icon-box
-  > #tracking-protection-icon,
-.zen-permission-shield-icon {
+  > #tracking-protection-icon {
   list-style-image: url('tracking-protection.svg') !important;
 }
 
@@ -501,7 +499,6 @@
   }
 }
 
-.permission-popup-permission-item-geo,
 .geo-icon {
   list-style-image: url('geo.svg') !important;
 }
@@ -510,7 +507,6 @@
   list-style-image: url('geo-blocked.svg') !important;
 }
 
-.permission-popup-permission-item-xr,
 .xr-icon {
   list-style-image: url('xr.svg') !important;
 }
@@ -519,7 +515,6 @@
   list-style-image: url('xr-blocked.svg') !important;
 }
 
-.permission-popup-permission-item-desktop-notification,
 .popup-notification-icon[popupid='web-notifications'],
 .desktop-notification-icon {
   list-style-image: url('desktop-notification.svg') !important;
@@ -529,7 +524,6 @@
   list-style-image: url('desktop-notification-blocked.svg') !important;
 }
 
-.permission-popup-permission-item-camera,
 .camera-icon,
 #zen-site-data-header-screenshot {
   list-style-image: url('camera.svg') !important;
@@ -539,7 +533,6 @@
   list-style-image: url('camera-blocked.svg') !important;
 }
 
-.permission-popup-permission-item-microphone,
 .microphone-icon {
   list-style-image: url('microphone.svg') !important;
 }
@@ -548,7 +541,6 @@
   list-style-image: url('microphone-blocked.svg') !important;
 }
 
-.permission-popup-permission-item-screen,
 .screen-icon {
   list-style-image: url('screen.svg') !important;
 }
@@ -557,7 +549,6 @@
   list-style-image: url('screen-blocked.svg') !important;
 }
 
-.permission-popup-permission-item-persistent-storage,
 .popup-notification-icon[popupid='persistent-storage'],
 .persistent-storage-icon,
 .indexedDB-icon {
@@ -568,12 +559,10 @@
   list-style-image: url('persistent-storage-blocked.svg') !important;
 }
 
-.permission-popup-permission-item-popup,
 .popup-icon {
   list-style-image: url('popup.svg') !important;
 }
 
-.permission-popup-permission-item-autoplay-media,
 .autoplay-media-icon {
   list-style-image: url('autoplay-media.svg') !important;
 }
@@ -599,8 +588,7 @@
   list-style-image: url('midi.svg') !important;
 }
 
-.install-icon,
-.zen-permission-extension-icon {
+.install-icon {
   list-style-image: url('extension.svg') !important;
 }
 
@@ -611,43 +599,41 @@
   list-style-image: url('extension-blocked.svg') !important;
 }
 
-.permission-popup-permission-item[state='allow'] {
-  &.permission-popup-permission-item {
-    list-style-image: url('settings-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-geo {
-    list-style-image: url('geo-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-xr {
-    list-style-image: url('xr-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-desktop-notification {
-    list-style-image: url('desktop-notification-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-camera {
-    list-style-image: url('camera-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-microphone {
-    list-style-image: url('microphone-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-screen {
-    list-style-image: url('screen.svg') !important;
-  }
-  &.permission-popup-permission-item-persistent-storage {
-    list-style-image: url('persistent-storage-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-popup {
-    list-style-image: url('popup-fill.svg') !important;
-  }
-  &.permission-popup-permission-item-autoplay-media {
-    list-style-image: url('autoplay-media-fill.svg') !important;
-  }
-  .zen-permission-shield-icon {
-    list-style-image: url('tracking-protection-fill.svg') !important;
-  }
-  .zen-permission-extension-icon {
-    list-style-image: url('extension-fill.svg') !important;
-  }
+.permission-popup-permission-item {
+  list-style-image: url('settings-fill.svg') !important;
+}
+.permission-popup-permission-item-geo {
+  list-style-image: url('geo-fill.svg') !important;
+}
+.permission-popup-permission-item-xr {
+  list-style-image: url('xr-fill.svg') !important;
+}
+.permission-popup-permission-item-desktop-notification {
+  list-style-image: url('desktop-notification-fill.svg') !important;
+}
+.permission-popup-permission-item-camera {
+  list-style-image: url('camera-fill.svg') !important;
+}
+.permission-popup-permission-item-microphone {
+  list-style-image: url('microphone-fill.svg') !important;
+}
+.permission-popup-permission-item-screen {
+  list-style-image: url('screen.svg') !important;
+}
+.permission-popup-permission-item-persistent-storage {
+  list-style-image: url('persistent-storage-fill.svg') !important;
+}
+.permission-popup-permission-item-popup {
+  list-style-image: url('popup-fill.svg') !important;
+}
+.permission-popup-permission-item-autoplay-media {
+  list-style-image: url('autoplay-media-fill.svg') !important;
+}
+.zen-permission-shield-icon {
+  list-style-image: url('tracking-protection-fill.svg') !important;
+}
+.zen-permission-extension-icon {
+  list-style-image: url('extension-fill.svg') !important;
 }
 
 /* tab sound icons */
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 4682ded44..c42c9c57b 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -284,7 +284,7 @@ body > #confetti {
   --panel-padding: 0px;
   --panel-width: 234px;
   --menu-panel-width-wide: calc(var(--panel-width) - var(--panel-padding) * 2);
-  --uei-icon-size: 14px;
+  --uei-icon-size: 16px;
   --arrowpanel-menuitem-border-radius: 10px;
 }
 

From c0b2a779e03c6f2c1703dd70b81bbe484952166b Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Fri, 10 Oct 2025 23:07:42 +0200
Subject: [PATCH 062/111] chore: Better organize preferences files, b=no-bug,
 c=compact-mode, folders, glance, kbs, media, mods, split-view, welcome,
 workspaces

---
 prefs/README.md                            |  8 ++++++
 prefs/{ => fastfox}/smoothscroll.yaml      |  0
 prefs/{ => firefox}/ai.yaml                |  3 ++
 prefs/{ => firefox}/browser.yaml           |  0
 prefs/{ => firefox}/extensions.yaml        |  0
 prefs/{ => firefox}/fullscreen.yaml        |  0
 prefs/{ => firefox}/multilingual.yaml      |  0
 prefs/{ => firefox}/newtab.yaml            |  0
 prefs/{ => firefox}/pdf.yaml               |  0
 prefs/{ => firefox}/performance.yaml       |  0
 prefs/{ => firefox}/pip.yaml               |  0
 prefs/{ => firefox}/urlbar.yaml            |  0
 prefs/{ => privatefox}/disablemozilla.yaml |  0
 prefs/{ => privatefox}/privacy.yaml        |  0
 prefs/{ => zen}/compact-mode.yaml          |  0
 prefs/{ => zen}/downloads.yaml             |  0
 prefs/{ => zen}/folders.yaml               |  0
 prefs/{ => zen}/glance.yaml                |  0
 prefs/{ => zen}/gtk.yaml                   |  0
 prefs/{ => zen}/kbs.yaml                   |  0
 prefs/{ => zen}/macos.yaml                 |  0
 prefs/{ => zen}/media.yaml                 |  0
 prefs/{ => zen}/mods.yaml                  |  0
 prefs/{ => zen}/split-view.yaml            |  0
 prefs/{ => zen}/static.yaml                |  0
 prefs/{ => zen}/theme.yaml                 |  0
 prefs/{ => zen}/view.yaml                  |  0
 prefs/{ => zen}/watermark.yaml             |  0
 prefs/{ => zen}/welcome.yaml               |  0
 prefs/{ => zen}/windows.yaml               |  0
 prefs/{ => zen}/workspaces.yaml            |  0
 prefs/{ => zen}/zen-urlbar.yaml            |  0
 prefs/{ => zen}/zen.yaml                   |  0
 tools/ffprefs/src/main.rs                  | 33 ++++++++++++++--------
 34 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 prefs/README.md
 rename prefs/{ => fastfox}/smoothscroll.yaml (100%)
 rename prefs/{ => firefox}/ai.yaml (91%)
 rename prefs/{ => firefox}/browser.yaml (100%)
 rename prefs/{ => firefox}/extensions.yaml (100%)
 rename prefs/{ => firefox}/fullscreen.yaml (100%)
 rename prefs/{ => firefox}/multilingual.yaml (100%)
 rename prefs/{ => firefox}/newtab.yaml (100%)
 rename prefs/{ => firefox}/pdf.yaml (100%)
 rename prefs/{ => firefox}/performance.yaml (100%)
 rename prefs/{ => firefox}/pip.yaml (100%)
 rename prefs/{ => firefox}/urlbar.yaml (100%)
 rename prefs/{ => privatefox}/disablemozilla.yaml (100%)
 rename prefs/{ => privatefox}/privacy.yaml (100%)
 rename prefs/{ => zen}/compact-mode.yaml (100%)
 rename prefs/{ => zen}/downloads.yaml (100%)
 rename prefs/{ => zen}/folders.yaml (100%)
 rename prefs/{ => zen}/glance.yaml (100%)
 rename prefs/{ => zen}/gtk.yaml (100%)
 rename prefs/{ => zen}/kbs.yaml (100%)
 rename prefs/{ => zen}/macos.yaml (100%)
 rename prefs/{ => zen}/media.yaml (100%)
 rename prefs/{ => zen}/mods.yaml (100%)
 rename prefs/{ => zen}/split-view.yaml (100%)
 rename prefs/{ => zen}/static.yaml (100%)
 rename prefs/{ => zen}/theme.yaml (100%)
 rename prefs/{ => zen}/view.yaml (100%)
 rename prefs/{ => zen}/watermark.yaml (100%)
 rename prefs/{ => zen}/welcome.yaml (100%)
 rename prefs/{ => zen}/windows.yaml (100%)
 rename prefs/{ => zen}/workspaces.yaml (100%)
 rename prefs/{ => zen}/zen-urlbar.yaml (100%)
 rename prefs/{ => zen}/zen.yaml (100%)

diff --git a/prefs/README.md b/prefs/README.md
new file mode 100644
index 000000000..3b2196f81
--- /dev/null
+++ b/prefs/README.md
@@ -0,0 +1,8 @@
+
+# Browser Preferences
+
+This directory contains configuration files for Zen. They are divided by folder according to the source / component they belong to and further divided by file according to their purpose.
+
+- `firefox/`: Preferences to override Firefox defaults.
+- `zen/`: Preferences to configure Zen-specific features.
+- `privatefox/` & `fastfox/`: *Some* of the preferences got extracted from [Betterfox](https://github.com/yokoffing/Betterfox).
diff --git a/prefs/smoothscroll.yaml b/prefs/fastfox/smoothscroll.yaml
similarity index 100%
rename from prefs/smoothscroll.yaml
rename to prefs/fastfox/smoothscroll.yaml
diff --git a/prefs/ai.yaml b/prefs/firefox/ai.yaml
similarity index 91%
rename from prefs/ai.yaml
rename to prefs/firefox/ai.yaml
index cdeb20691..e54bb0d38 100644
--- a/prefs/ai.yaml
+++ b/prefs/firefox/ai.yaml
@@ -17,3 +17,6 @@
 
 - name: browser.ml.enable
   value: false
+
+- name: browser.ml.chat.menu
+  value: false
diff --git a/prefs/browser.yaml b/prefs/firefox/browser.yaml
similarity index 100%
rename from prefs/browser.yaml
rename to prefs/firefox/browser.yaml
diff --git a/prefs/extensions.yaml b/prefs/firefox/extensions.yaml
similarity index 100%
rename from prefs/extensions.yaml
rename to prefs/firefox/extensions.yaml
diff --git a/prefs/fullscreen.yaml b/prefs/firefox/fullscreen.yaml
similarity index 100%
rename from prefs/fullscreen.yaml
rename to prefs/firefox/fullscreen.yaml
diff --git a/prefs/multilingual.yaml b/prefs/firefox/multilingual.yaml
similarity index 100%
rename from prefs/multilingual.yaml
rename to prefs/firefox/multilingual.yaml
diff --git a/prefs/newtab.yaml b/prefs/firefox/newtab.yaml
similarity index 100%
rename from prefs/newtab.yaml
rename to prefs/firefox/newtab.yaml
diff --git a/prefs/pdf.yaml b/prefs/firefox/pdf.yaml
similarity index 100%
rename from prefs/pdf.yaml
rename to prefs/firefox/pdf.yaml
diff --git a/prefs/performance.yaml b/prefs/firefox/performance.yaml
similarity index 100%
rename from prefs/performance.yaml
rename to prefs/firefox/performance.yaml
diff --git a/prefs/pip.yaml b/prefs/firefox/pip.yaml
similarity index 100%
rename from prefs/pip.yaml
rename to prefs/firefox/pip.yaml
diff --git a/prefs/urlbar.yaml b/prefs/firefox/urlbar.yaml
similarity index 100%
rename from prefs/urlbar.yaml
rename to prefs/firefox/urlbar.yaml
diff --git a/prefs/disablemozilla.yaml b/prefs/privatefox/disablemozilla.yaml
similarity index 100%
rename from prefs/disablemozilla.yaml
rename to prefs/privatefox/disablemozilla.yaml
diff --git a/prefs/privacy.yaml b/prefs/privatefox/privacy.yaml
similarity index 100%
rename from prefs/privacy.yaml
rename to prefs/privatefox/privacy.yaml
diff --git a/prefs/compact-mode.yaml b/prefs/zen/compact-mode.yaml
similarity index 100%
rename from prefs/compact-mode.yaml
rename to prefs/zen/compact-mode.yaml
diff --git a/prefs/downloads.yaml b/prefs/zen/downloads.yaml
similarity index 100%
rename from prefs/downloads.yaml
rename to prefs/zen/downloads.yaml
diff --git a/prefs/folders.yaml b/prefs/zen/folders.yaml
similarity index 100%
rename from prefs/folders.yaml
rename to prefs/zen/folders.yaml
diff --git a/prefs/glance.yaml b/prefs/zen/glance.yaml
similarity index 100%
rename from prefs/glance.yaml
rename to prefs/zen/glance.yaml
diff --git a/prefs/gtk.yaml b/prefs/zen/gtk.yaml
similarity index 100%
rename from prefs/gtk.yaml
rename to prefs/zen/gtk.yaml
diff --git a/prefs/kbs.yaml b/prefs/zen/kbs.yaml
similarity index 100%
rename from prefs/kbs.yaml
rename to prefs/zen/kbs.yaml
diff --git a/prefs/macos.yaml b/prefs/zen/macos.yaml
similarity index 100%
rename from prefs/macos.yaml
rename to prefs/zen/macos.yaml
diff --git a/prefs/media.yaml b/prefs/zen/media.yaml
similarity index 100%
rename from prefs/media.yaml
rename to prefs/zen/media.yaml
diff --git a/prefs/mods.yaml b/prefs/zen/mods.yaml
similarity index 100%
rename from prefs/mods.yaml
rename to prefs/zen/mods.yaml
diff --git a/prefs/split-view.yaml b/prefs/zen/split-view.yaml
similarity index 100%
rename from prefs/split-view.yaml
rename to prefs/zen/split-view.yaml
diff --git a/prefs/static.yaml b/prefs/zen/static.yaml
similarity index 100%
rename from prefs/static.yaml
rename to prefs/zen/static.yaml
diff --git a/prefs/theme.yaml b/prefs/zen/theme.yaml
similarity index 100%
rename from prefs/theme.yaml
rename to prefs/zen/theme.yaml
diff --git a/prefs/view.yaml b/prefs/zen/view.yaml
similarity index 100%
rename from prefs/view.yaml
rename to prefs/zen/view.yaml
diff --git a/prefs/watermark.yaml b/prefs/zen/watermark.yaml
similarity index 100%
rename from prefs/watermark.yaml
rename to prefs/zen/watermark.yaml
diff --git a/prefs/welcome.yaml b/prefs/zen/welcome.yaml
similarity index 100%
rename from prefs/welcome.yaml
rename to prefs/zen/welcome.yaml
diff --git a/prefs/windows.yaml b/prefs/zen/windows.yaml
similarity index 100%
rename from prefs/windows.yaml
rename to prefs/zen/windows.yaml
diff --git a/prefs/workspaces.yaml b/prefs/zen/workspaces.yaml
similarity index 100%
rename from prefs/workspaces.yaml
rename to prefs/zen/workspaces.yaml
diff --git a/prefs/zen-urlbar.yaml b/prefs/zen/zen-urlbar.yaml
similarity index 100%
rename from prefs/zen-urlbar.yaml
rename to prefs/zen/zen-urlbar.yaml
diff --git a/prefs/zen.yaml b/prefs/zen/zen.yaml
similarity index 100%
rename from prefs/zen.yaml
rename to prefs/zen/zen.yaml
diff --git a/tools/ffprefs/src/main.rs b/tools/ffprefs/src/main.rs
index e044fd0f5..e2c7259e6 100644
--- a/tools/ffprefs/src/main.rs
+++ b/tools/ffprefs/src/main.rs
@@ -102,10 +102,10 @@
 //
 
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 use std::env;
 use std::fs;
 use std::path::PathBuf;
-use std::collections::HashMap;
 
 const STATIC_PREFS: &str = "../engine/modules/libpref/init/zen-static-prefs.inc";
 const FIREFOX_PREFS: &str = "../engine/browser/app/profile/firefox.js";
@@ -136,25 +136,34 @@ fn ordered_prefs(mut prefs: Vec<Preference>) -> Vec<Preference> {
     prefs
 }
 
-fn load_preferences() -> Vec<Preference> {
-    let mut prefs = Vec::new();
-    let config_path = get_config_path();
-    // Iterate each file in the prefs directory
-    if let Ok(entries) = fs::read_dir(&config_path) {
+fn get_prefs_files_recursively(dir: &PathBuf, files: &mut Vec<PathBuf>) {
+    if let Ok(entries) = fs::read_dir(dir) {
         for entry in entries {
             if let Ok(entry) = entry {
-                if let Some(ext) = entry.path().extension() {
+                let path = entry.path();
+                if path.is_dir() {
+                    get_prefs_files_recursively(&path, files);
+                } else if let Some(ext) = path.extension() {
                     if ext == "yaml" || ext == "yml" {
-                        let file_path = entry.path();
-                        let content = fs::read_to_string(&file_path).expect("Failed to read file");
-                        let mut parsed_prefs: Vec<Preference> =
-                            serde_yaml::from_str(&content).expect("Failed to parse YAML");
-                        prefs.append(&mut parsed_prefs);
+                        files.push(path);
                     }
                 }
             }
         }
     }
+}
+
+fn load_preferences() -> Vec<Preference> {
+    let mut prefs = Vec::new();
+    let config_path = get_config_path();
+    let mut pref_files = Vec::new();
+    get_prefs_files_recursively(&config_path, &mut pref_files);
+    for file_path in pref_files {
+        let content = fs::read_to_string(&file_path).expect("Failed to read file");
+        let mut parsed_prefs: Vec<Preference> =
+            serde_yaml::from_str(&content).expect("Failed to parse YAML");
+        prefs.append(&mut parsed_prefs);
+    }
     ordered_prefs(prefs)
 }
 

From 21d5273bb9b8360afb9406fca9ccb71dbaee7d43 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sat, 11 Oct 2025 00:21:01 +0200
Subject: [PATCH 063/111] feat: Add a bounce to the glance element float and
 format, b=no-bug, c=common, glance

---
 prefs/README.md                               |  3 +-
 .../urlbar/UrlbarInput-sys-mjs.patch          | 44 ++++++++++---------
 src/zen/common/ZenUIManager.mjs               |  1 +
 src/zen/glance/ZenGlanceManager.mjs           | 39 +++++++++++++++-
 src/zen/glance/zen-glance.css                 | 13 +++---
 5 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/prefs/README.md b/prefs/README.md
index 3b2196f81..6d1ef9d47 100644
--- a/prefs/README.md
+++ b/prefs/README.md
@@ -1,8 +1,7 @@
-
 # Browser Preferences
 
 This directory contains configuration files for Zen. They are divided by folder according to the source / component they belong to and further divided by file according to their purpose.
 
 - `firefox/`: Preferences to override Firefox defaults.
 - `zen/`: Preferences to configure Zen-specific features.
-- `privatefox/` & `fastfox/`: *Some* of the preferences got extracted from [Betterfox](https://github.com/yokoffing/Betterfox).
+- `privatefox/` & `fastfox/`: _Some_ of the preferences got extracted from [Betterfox](https://github.com/yokoffing/Betterfox).
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 8793bce8c..5388f07bc 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0ce222c46 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..77955d888e70409c83b217e676e1575417018831 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -75,10 +75,14 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      }
  
      if (isCanonized) {
-@@ -2298,6 +2330,13 @@ export class UrlbarInput {
+@@ -2298,6 +2330,17 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
++  zenFormatURLValue() {
++    return this.#lazy.valueFormatter._formatURL();
++  }
++
 +  get zenUrlbarBehavior() {
 +    if (this.document.documentElement.hasAttribute("inDOMFullscreen")) {
 +      return "float";
@@ -89,7 +93,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2312,6 +2351,12 @@ export class UrlbarInput {
+@@ -2312,6 +2355,12 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -102,7 +106,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2331,6 +2376,24 @@ export class UrlbarInput {
+@@ -2331,6 +2380,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -127,7 +131,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2660,7 +2723,7 @@ export class UrlbarInput {
+@@ -2660,7 +2727,7 @@ export class UrlbarInput {
  
          this.textbox.parentNode.style.setProperty(
            "--urlbar-container-height",
@@ -136,7 +140,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -3093,6 +3156,7 @@ export class UrlbarInput {
+@@ -3093,6 +3160,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -144,7 +148,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3197,7 +3261,7 @@ export class UrlbarInput {
+@@ -3197,7 +3265,7 @@ export class UrlbarInput {
        return val;
      }
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -153,7 +157,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3407,6 +3471,7 @@ export class UrlbarInput {
+@@ -3407,6 +3475,7 @@ export class UrlbarInput {
        );
      }
  
@@ -161,7 +165,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      // No point in setting these because we'll handleRevert() a few rows below.
      if (openUILinkWhere == "current") {
        // Make sure URL is formatted properly (don't show punycode).
-@@ -3608,6 +3673,10 @@ export class UrlbarInput {
+@@ -3608,6 +3677,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -172,7 +176,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3615,6 +3684,9 @@ export class UrlbarInput {
+@@ -3615,6 +3688,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -182,7 +186,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      return where;
    }
  
-@@ -3872,6 +3944,7 @@ export class UrlbarInput {
+@@ -3872,6 +3948,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -190,7 +194,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
  
        this._suppressStartQuery = false;
      });
-@@ -3879,7 +3952,6 @@ export class UrlbarInput {
+@@ -3879,7 +3956,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -198,7 +202,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3991,7 +4063,11 @@ export class UrlbarInput {
+@@ -3991,7 +4067,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -211,7 +215,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4302,6 +4378,7 @@ export class UrlbarInput {
+@@ -4302,6 +4382,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -219,7 +223,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4413,6 +4490,11 @@ export class UrlbarInput {
+@@ -4413,6 +4494,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -231,7 +235,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4485,7 +4567,7 @@ export class UrlbarInput {
+@@ -4485,7 +4571,7 @@ export class UrlbarInput {
        }
      }
  
@@ -240,7 +244,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4525,9 +4607,16 @@ export class UrlbarInput {
+@@ -4525,9 +4611,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -258,7 +262,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
  
          if (
            event.target != this.inputField &&
-@@ -4538,6 +4627,10 @@ export class UrlbarInput {
+@@ -4538,6 +4631,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -269,7 +273,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4573,7 +4666,7 @@ export class UrlbarInput {
+@@ -4573,7 +4670,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
@@ -278,7 +282,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..3aafb612152af88d570c7d7046ca3bd0
            break;
          }
  
-@@ -4890,7 +4983,7 @@ export class UrlbarInput {
+@@ -4890,7 +4987,7 @@ export class UrlbarInput {
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index d344e543e..bc8922b53 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -889,6 +889,7 @@ var gZenVerticalTabsManager = {
       if (typeof height !== 'undefined') {
         document.getElementById('urlbar').style.setProperty('--urlbar-height', `${height}px`);
       }
+      gURLBar.zenFormatURLValue();
     });
   },
 
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 31196d520..0b5eb8029 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -388,6 +388,18 @@
 
       this.browserWrapper.prepend(imageDataElement);
       this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
+
+      gZenUIManager.motion.animate(
+        imageDataElement,
+        {
+          scale: [1, 3],
+        },
+        {
+          duration: 0.3,
+          easing: 'easeInOut',
+        }
+      );
+
       return imageDataElement;
     }
 
@@ -437,6 +449,19 @@
       const transformOrigin = this.#getTransformOrigin(data);
 
       this.browserWrapper.style.transformOrigin = transformOrigin;
+      gZenUIManager.motion
+        .animate(
+          this.contentWrapper,
+          { opacity: [0, 1] },
+          {
+            duration: 0.1,
+            easing: 'easeInOut',
+          }
+        )
+        .then(() => {
+          this.contentWrapper.style.opacity = '';
+        });
+
       gZenUIManager.motion
         .animate(this.browserWrapper, arcSequence, {
           duration: gZenUIManager.testingEnabled ? 0 : 0.4,
@@ -876,7 +901,7 @@
     }
 
     /**
-     * Add element preview if available
+     * Add element preview if available, used for the closing animation
      * @param {string} elementImageData - The element image data
      * @param {Object} rect - The rectangle data
      */
@@ -888,6 +913,18 @@
         imageDataElement.style.width = rect.width;
         imageDataElement.style.height = rect.height;
         this.browserWrapper.prepend(imageDataElement);
+
+        gZenUIManager.motion.animate(
+          imageDataElement,
+          {
+            scale: [3, 1],
+          },
+          {
+            duration: 0.3,
+            easing: 'easeInOut',
+            bounce: 0.1,
+          }
+        );
       }
     }
 
diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css
index 81dbd5445..819d4c6bf 100644
--- a/src/zen/glance/zen-glance.css
+++ b/src/zen/glance/zen-glance.css
@@ -146,12 +146,6 @@
       border-radius: var(--zen-native-inner-radius);
       overflow: hidden;
       box-shadow: var(--zen-big-shadow);
-      opacity: 1;
-      transition: opacity 0.08s;
-
-      @starting-style {
-        opacity: 0;
-      }
     }
 
     & browser {
@@ -167,7 +161,7 @@
 
   &[fade-out='true'] {
     & .browserStack {
-      transition: opacity 0.2s ease-in-out;
+      transition: opacity 0.15s ease-in-out;
       opacity: 0;
     }
   }
@@ -178,6 +172,9 @@
   pointer-events: none;
   width: 100%;
   height: 100%;
-  z-index: -1;
+  z-index: 0;
   border-radius: var(--zen-native-inner-radius);
+  inset: 50%;
+  translate: -50% -50%;
+  will-change: transform;
 }

From 78bba35f3475c0d2a7442d1637649048ae0d7145 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 11 Oct 2025 17:02:38 +0200
Subject: [PATCH 064/111] feat: Fix bootstraping and other small nitpicks,
 b=no-bug, c=common, tabs, workspaces

---
 prefs/theme.yaml                              |  2 +-
 .../base/content/browser-init-js.patch        | 10 ++-
 .../ff-145-tahoe-upgrade.patch                | 80 -------------------
 src/zen/common/ZenUIMigration.sys.mjs         |  2 +-
 src/zen/common/styles/zen-browser-ui.css      | 29 ++++---
 src/zen/common/styles/zen-panel-ui.css        |  1 +
 .../common/styles/zen-single-components.css   |  2 +-
 src/zen/common/styles/zen-theme.css           |  5 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css       |  5 +-
 src/zen/workspaces/ZenGradientGenerator.mjs   | 12 ++-
 src/zen/workspaces/ZenWorkspaces.mjs          |  2 -
 11 files changed, 49 insertions(+), 101 deletions(-)

diff --git a/prefs/theme.yaml b/prefs/theme.yaml
index 2a654d17b..1fe3a6a88 100644
--- a/prefs/theme.yaml
+++ b/prefs/theme.yaml
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - name: zen.theme.accent-color
-  value: '#ffb787'
+  value: 'AccentColor'
 
 - name: zen.theme.content-element-separation
   value: 8
diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch
index 2d21acf05..b8b27c308 100644
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index 8e63654b343e8518aa0e366a3fd3bf7e0856eafb..fe402e526ab33cdcc4baabf8685dfb03efac6003 100644
+index 8e63654b343e8518aa0e366a3fd3bf7e0856eafb..3cebc9bb057f51cea639130fecd7576e1c9db79c 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
 @@ -198,6 +198,7 @@ var gBrowserInit = {
@@ -10,3 +10,11 @@ index 8e63654b343e8518aa0e366a3fd3bf7e0856eafb..fe402e526ab33cdcc4baabf8685dfb03
      gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
        PopupAndRedirectBlockerObserver.handleEvent(e)
      );
+@@ -372,6 +373,7 @@ var gBrowserInit = {
+ 
+     this._handleURIToLoad();
+ 
++    gZenWorkspaces.selectStartPage();
+     Services.obs.addObserver(gIdentityHandler, "perm-changed");
+     Services.obs.addObserver(gRemoteControl, "devtools-socket");
+     Services.obs.addObserver(gRemoteControl, "marionette-listening");
diff --git a/src/firefox-patches/ff-145-tahoe-upgrade.patch b/src/firefox-patches/ff-145-tahoe-upgrade.patch
index 0872cb770..9caa99615 100644
--- a/src/firefox-patches/ff-145-tahoe-upgrade.patch
+++ b/src/firefox-patches/ff-145-tahoe-upgrade.patch
@@ -61,39 +61,6 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
      CHECK(DeleteIntFunctionCallCount == 1);
    }
 
-diff --git a/taskcluster/scripts/misc/build-clang.sh b/taskcluster/scripts/misc/build-clang.sh
---- a/taskcluster/scripts/misc/build-clang.sh
-+++ b/taskcluster/scripts/misc/build-clang.sh
-@@ -23,11 +23,11 @@
-   mkdir -p $ORIGPWD/bin
-   echo "#!/bin/sh" > $ORIGPWD/bin/sw_vers
-   echo echo 10.12 >> $ORIGPWD/bin/sw_vers
-   chmod +x $ORIGPWD/bin/sw_vers
-   # these variables are used in build-clang.py
--  export OSX_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX1*.sdk)
-+  export OSX_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX*.sdk)
-   export PATH=$PATH:$ORIGPWD/bin
-   ;;
- *win64*)
-   case "$(uname -s)" in
-   MINGW*|MSYS*)
-diff --git a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
---- a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
-+++ b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
-@@ -1,11 +1,11 @@
- #!/bin/bash
- set -x -e -v
- 
- export TARGET_TRIPLE="x86_64-apple-darwin"
- 
--MACOS_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX1*.sdk)
-+MACOS_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX*.sdk)
- CLANGDIR="${MOZ_FETCHES_DIR}/clang"
- 
- # Deploy the wrench dependencies
- mv ${MOZ_FETCHES_DIR}/wrench-deps/{vendor,.cargo} "${GECKO_PATH}/gfx/wr/"
- 
-
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
@@ -110,53 +77,6 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
          "--with-macos-sdk",
          host,
          bootstrap_path(
-diff --git a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
---- a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
-+++ b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
-@@ -1,8 +1,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
- <plist version="1.0">
- <dict>
-         <key>Version</key>
--        <string>15.5</string>
-+        <string>26.0</string>
- </dict>
- </plist>
-diff --git a/taskcluster/kinds/toolchain/macos-sdk.yml b/taskcluster/kinds/toolchain/macos-sdk.yml
-index 71f4de56367d8b68f78c974f36430e6e97dbe79f..aa1917d795f79d100c4e091437cb454807ac7583 100644
---- a/taskcluster/kinds/toolchain/macos-sdk.yml
-+++ b/taskcluster/kinds/toolchain/macos-sdk.yml
-@@ -46,19 +46,20 @@ macosx64-sdk-15.4:
-             - macosx64-sdk-toolchain
-             - MacOSX15.4.sdk
- 
--macosx64-sdk-15.5:
--    description: "MacOSX15.5 SDK"
-+macosx64-sdk-26.0:
-+    description: "macOS 26.0 SDK"
-     treeherder:
--        symbol: TM(sdk15.5)
-+        symbol: TM(sdk26.0)
-     run:
-         arguments:
--            - https://swcdn.apple.com/content/downloads/52/01/082-41241-A_0747ZN8FHV/dectd075r63pppkkzsb75qk61s0lfee22j/CLTools_macOSNMOS_SDK.pkg
--            - fb7c555e823b830279394e52c7d439bd287a9d8b007883fa0595962a240d488b5613f8cc8d1cc9657909de9367417652564f3df66e238a47bbc87244f5205056
--            - Library/Developer/CommandLineTools/SDKs/MacOSX15.5.sdk
--        toolchain-artifact: project/gecko/mac-sdk/MacOSX15.5.sdk.tar.zst
-+            - https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg
-+            - d3286bd6d4dff1b12f1d0dab4816719e605a1bfb76af84575deec37b25fc4462d4fc1258aa43b138a557c4f9304e06740441b101eb367a4b5bd77200b0708c71
-+            - Library/Developer/CommandLineTools/SDKs/MacOSX26.0.sdk
-+        toolchain-artifact: project/gecko/mac-sdk/MacOSX26.0.sdk.tar.zst
-         toolchain-alias:
-             - macosx64-sdk
--            - MacOSX15.5.sdk
-+            - macosx64-sdk-toolchain
-+            - MacOSX26.0.sdk
- 
- ios-sdk-18.4:
-     description: "iPhoneOS18.4 SDK"
-
 diff --git a/browser/themes/osx/places/organizer.css b/browser/themes/osx/places/organizer.css
 index 60e3d65d9ea5..730aa23aed6c 100644
 --- a/browser/themes/osx/places/organizer.css
diff --git a/src/zen/common/ZenUIMigration.sys.mjs b/src/zen/common/ZenUIMigration.sys.mjs
index c073c59c5..bd9129360 100644
--- a/src/zen/common/ZenUIMigration.sys.mjs
+++ b/src/zen/common/ZenUIMigration.sys.mjs
@@ -74,7 +74,7 @@ class nsZenUIMigration {
 
   _migrateV3() {
     if (Services.prefs.getStringPref('zen.theme.accent-color', '').startsWith('system')) {
-      Services.prefs.setStringPref('zen.theme.accent-color', '#ffb787');
+      Services.prefs.setStringPref('zen.theme.accent-color', 'AccentColor');
     }
   }
 
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index 08523a982..c85a3c78d 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -37,11 +37,8 @@
 }
 
 .zen-browser-generic-background {
-  width: 100%;
-  height: 100%;
   position: absolute;
-  top: 0;
-  left: 0;
+  inset: 0;
   z-index: 0;
   pointer-events: none;
   overflow: clip;
@@ -112,17 +109,29 @@
   }
 }
 
+#zen-browser-background {
+  /* This is conceptually a background, but putting this on a pseudo-element
+    * avoids it from suppressing the chrome-content separator border, etc.
+    *
+    * See bugzilla's 1949528 and bug 1476281 (which would make this unnecessary). */
+  @media (-moz-platform: macos) {
+    -moz-default-appearance: -moz-sidebar;
+    appearance: auto;
+  }
+
+  /*
+   *  Important: We set the color to `AccentColor` so we can
+   *  Compute the stylings and get the native accent color.
+   *  Please, do not remove this.
+   */
+  color: AccentColor;
+}
+
 #sidebar-box {
   /** Sidebar is already hidden in full screen mode */
   border: none;
 }
 
-@media (-moz-platform: macos) {
-  #zen-main-app-wrapper {
-    appearance: -moz-sidebar !important;
-  }
-}
-
 :root:not([zen-single-toolbar='true']) #zen-appcontent-wrapper {
   z-index: 2;
 }
diff --git a/src/zen/common/styles/zen-panel-ui.css b/src/zen/common/styles/zen-panel-ui.css
index 5badd839e..7de4f73e4 100644
--- a/src/zen/common/styles/zen-panel-ui.css
+++ b/src/zen/common/styles/zen-panel-ui.css
@@ -60,6 +60,7 @@ panel[type='arrow']:not(#feature-callout) {
     --panel-shadow-margin: 0px !important;
     --panel-background: transparent !important;
     --panel-border-color: transparent;
+    border: 0 !important;
 
     &::part(content) {
       background-color: transparent !important;
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 3eefbd64d..9efdedf14 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -170,7 +170,7 @@ body > #confetti {
   }
 }
 
-.toolbarbutton-1 {
+.toolbarbutton-1:not(#tabs-newtab-button) {
   :root:is([zen-single-toolbar='true'], :not([zen-sidebar-expanded='true']))
     #zen-sidebar-top-buttons-customization-target
     &,
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 40118cbff..2174b75e2 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -157,8 +157,6 @@
   --zen-toolbar-button-inner-padding: 6px;
   --toolbarbutton-outer-padding: 4px;
 
-  --toolbarbutton-inner-padding: 5px !important;
-
   --toolbarbutton-hover-background: var(--zen-toolbar-element-bg-hover) !important;
 
   /* Using a semitransparent background preserves the tinting from the backdrop.
@@ -239,6 +237,9 @@
   @media (-moz-platform: linux) {
     --zen-native-content-radius: env(-moz-gtk-csd-titlebar-radius);
   }
+  @media (-moz-mac-tahoe-theme) {
+    --zen-native-content-radius: 14px;
+  }
   --zen-native-inner-radius: var(
     --zen-webview-border-radius,
     /* Inner radius calculation:
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index fb4af924f..296a269ca 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -1150,7 +1150,10 @@
       --zen-essential-bg-margin: 2px;
 
       &::before {
-        background: light-dark(rgba(255, 255, 255, 0.85), rgba(68, 64, 64, 0.85));
+        background: light-dark(
+          rgba(255, 255, 255, 0.85),
+          color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 50%)
+        );
         margin: var(--zen-essential-bg-margin);
         border-radius: calc(var(--border-radius-medium) - var(--zen-essential-bg-margin));
         position: absolute;
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index f08aee8ee..a28ad93a2 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -1513,8 +1513,16 @@
     }
 
     getNativeAccentColor() {
-      const accentColor = Services.prefs.getStringPref('zen.theme.accent-color');
-      const rgb = this.hexToRgb(accentColor);
+      let accentColor = Services.prefs.getStringPref('zen.theme.accent-color');
+      let rgb;
+      if (accentColor === 'AccentColor') {
+        const rawRgb = window.getComputedStyle(document.getElementById('zen-browser-background'))[
+          'color'
+        ];
+        rgb = rawRgb.match(/\d+/g).map(Number);
+      } else {
+        rgb = this.hexToRgb(accentColor);
+      }
       if (this.isDarkMode) {
         // If the theme is dark, we want to use a lighter color
         return this.blendColors(rgb, [0, 0, 0], 40);
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index ceac62ff7..074877269 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -950,8 +950,6 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     window.addEventListener('TabSelect', this.onLocationChange.bind(this));
 
     window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
-
-    await this.selectStartPage();
   }
 
   async selectStartPage() {

From d7611c066b032bbfcd20fe7b1b953f9153378fd6 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sat, 11 Oct 2025 17:03:16 +0200
Subject: [PATCH 065/111] New Crowdin updates, p=#10769

* New translations zen-preferences.ftl (French)

* New translations zen-preferences.ftl (Lithuanian)

* New translations zen-workspaces.ftl (Lithuanian)

* New translations zen-general.ftl (Lithuanian)
---
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/lt/browser/browser/zen-general.ftl    | 32 +++++++++----------
 locales/lt/browser/browser/zen-workspaces.ftl |  8 ++---
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl
index 375df655d..148b9ec72 100644
--- a/locales/fr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Dans la barre d’onglets, masquer l’indicateur de conteneur par défaut
 zen-key-unsaved = Raccourci non sauvegardé ! Pour l’enregistrer, veuillez le resaisir et en appuyer sur Échap.
-zen-key-conflict = Conflits avec { $group } → { $shortcut }
+zen-key-conflict = En conflit avec { $group } → { $shortcut }
 pane-zen-theme-title = Paramètres de thème
 zen-vertical-tabs-title = Disposition de la barre latérale et des onglets
 zen-vertical-tabs-header = Onglets verticaux
diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl
index 43318d643..bd5c567ae 100644
--- a/locales/lt/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Slėpti numatytojo konteinerio indikatorių kortelių juostoje
 zen-key-unsaved = Neįrašytas spartusis klavišas! Iš naujo jį įvedę, paspauskite grįžimo klavišą.
-zen-key-conflict = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Konfliktuoja su „{ $group }“ -> „{ $shortcut }“
 pane-zen-theme-title = Temų nustatymai
 zen-vertical-tabs-title = Šoninė juosta ir kortelių išdėstymas
 zen-vertical-tabs-header = Vertikalios kortelės
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index 5f5d7c9c1..e6c4ac290 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -38,8 +38,8 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods = 
     .label = Modifikacijos
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
-    .tooltiptext = Toggle Compact Mode
+    .label = Kompaktinis režimas
+    .tooltiptext = Perjungti kompaktinį režimą
 
 # note: Do not translate the "<br/>" tags in the following string
 
@@ -52,24 +52,24 @@ zen-icons-picker-emoji =
 zen-icons-picker-svg = 
     .label = Piktogramos
 urlbar-search-mode-zen_actions = Veiksmai
-zen-site-data-settings = Settings
-zen-generic-manage = Manage
-zen-generic-more = More
+zen-site-data-settings = Nustatymai
+zen-generic-manage = Tvarkyti
+zen-generic-more = Daugiau
 # These labels will be used for the site data panel settings
-zen-site-data-setting-allow = Allowed
-zen-site-data-setting-block = Blocked
+zen-site-data-setting-allow = Leidžiama
+zen-site-data-setting-block = Užblokuota
 zen-site-data-security-info-extension = 
-    .label = Extension
+    .label = Plėtinys
 zen-site-data-security-info-secure = 
-    .label = Secure
+    .label = Saugi
 zen-site-data-security-info-not-secure = 
-    .label = Not Secure
+    .label = Nesaugi
 zen-site-data-manage-addons = 
-    .label = Manage Extensions
+    .label = Tvarkyti plėtinius
 zen-site-data-get-addons = 
-    .label = Add Extensions
+    .label = Įtraukti plėtinius
 zen-site-data-site-settings = 
-    .label = All Site Settings
-zen-site-data-setting-site-protection = Site Protection
-zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+    .label = Visi svetainės nustatymai
+zen-site-data-setting-site-protection = Svetainės apsauga
+zen-site-data-panel-feature-callout-title = Nauji namai priedams, leidimams ir daugiau
+zen-site-data-panel-feature-callout-subtitle = Spustelėkite piktogramą, kad tvarkytumėte svetainės nustatymus, peržiūrėtumėte saugumo informaciją, pasiektumėte plėtinius ir atliktumėte įprastus veiksmus.
diff --git a/locales/lt/browser/browser/zen-workspaces.ftl b/locales/lt/browser/browser/zen-workspaces.ftl
index 580bec0e3..27ec93263 100644
--- a/locales/lt/browser/browser/zen-workspaces.ftl
+++ b/locales/lt/browser/browser/zen-workspaces.ftl
@@ -1,4 +1,4 @@
-zen-panel-ui-workspaces-text = Darbo sritys
+zen-panel-ui-workspaces-text = Erdvės
 zen-panel-ui-workspaces-create = 
     .label = Kurti erdvę
 zen-panel-ui-folder-create = 
@@ -6,7 +6,7 @@ zen-panel-ui-folder-create =
 zen-panel-ui-new-empty-split = 
     .label = Naujas skaidymas
 zen-workspaces-panel-context-delete = 
-    .label = Ištrinti darbo sritį
+    .label = Ištrinti erdvę
     .accesskey = D
 zen-workspaces-panel-change-name = 
     .label = Keisti pavadinimą
@@ -15,7 +15,7 @@ zen-workspaces-panel-change-icon =
 zen-workspaces-panel-context-default-profile = 
     .label = Nustatyti profilį
 zen-workspaces-panel-unload = 
-    .label = Unload Space
+    .label = Iškelti erdvę
 zen-workspaces-how-to-reorder-title = Kaip pertvarkyti erdves
 zen-workspaces-how-to-reorder-desc = Nutempkite erdvės piktogramas šoninės juostos apačioje, kad pertvarkytumėte jas.
 zen-workspaces-change-theme = 
@@ -51,5 +51,5 @@ zen-workspace-creation-profile = Profilis
     .tooltiptext = Profiliai naudojami atskirti slapukus ir svetainės duomenis tarp erdvių.
 zen-workspace-creation-header = Kurti erdvę
 zen-workspace-creation-label = Erdvės naudojamos tvarkyti jūsų korteles ir seansus.
-zen-workspaces-delete-workspace-title = Delete Workspace?
+zen-workspaces-delete-workspace-title = Ištrinti erdvę?
 zen-workspaces-delete-workspace-body = Ar tikrai norite ištrinti „{ $name }“? Šio veiksmo anuliuoti negalima.

From bedca8087e719f5e2f4a0594c7cfba1f346c546a Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 11 Oct 2025 17:56:04 +0200
Subject: [PATCH 066/111] chore: Update workflows to use macos 26 SDK,
 b=no-bug, c=workflows

---
 .github/workflows/macos-release-build.yml           | 2 +-
 .github/workflows/macos-universal-release-build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 724133008..a4e5a48b5 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -26,7 +26,7 @@ on:
 jobs:
   mac-build:
     name: Build macOS - ${{ matrix.arch }}
-    runs-on: macos-15
+    runs-on: macos-26
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/macos-universal-release-build.yml b/.github/workflows/macos-universal-release-build.yml
index 933d9766f..a85824927 100644
--- a/.github/workflows/macos-universal-release-build.yml
+++ b/.github/workflows/macos-universal-release-build.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   mac-build:
     name: Unify macOS (Universal)
-    runs-on: 'macos-15'
+    runs-on: 'macos-26'
 
     strategy:
       fail-fast: false

From ac5f43c15b7ff8461a438cda42af6b56563f2d21 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 12 Oct 2025 00:31:05 +0200
Subject: [PATCH 067/111] feat: Add toggle compact mode to the default
 placements, b=no-bug, c=common, glance

---
 src/zen/common/ZenCustomizableUI.sys.mjs | 2 +-
 src/zen/common/styles/zen-panel-ui.css   | 2 +-
 src/zen/glance/ZenGlanceManager.mjs      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index d667fd39c..8ca0d97ac 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -13,7 +13,7 @@ export var ZenCustomizableUI = new (class {
       'zen-sidebar-top-buttons',
       {
         type: this.TYPE_TOOLBAR,
-        defaultPlacements: [],
+        defaultPlacements: ['zen-toggle-compact-mode'],
         defaultCollapsed: null,
         overflowable: true,
       },
diff --git a/src/zen/common/styles/zen-panel-ui.css b/src/zen/common/styles/zen-panel-ui.css
index 7de4f73e4..b683f8e8f 100644
--- a/src/zen/common/styles/zen-panel-ui.css
+++ b/src/zen/common/styles/zen-panel-ui.css
@@ -51,6 +51,7 @@ panel[type='arrow']:not(#feature-callout) {
   }
 
   @media (-moz-platform: macos) {
+    border: 0px transparent !important;
     appearance: auto !important;
     -moz-default-appearance: menupopup;
     /* We set the default background here, rather than on ::part(content),
@@ -60,7 +61,6 @@ panel[type='arrow']:not(#feature-callout) {
     --panel-shadow-margin: 0px !important;
     --panel-background: transparent !important;
     --panel-border-color: transparent;
-    border: 0 !important;
 
     &::part(content) {
       background-color: transparent !important;
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 0b5eb8029..157efd694 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -922,7 +922,7 @@
           {
             duration: 0.3,
             easing: 'easeInOut',
-            bounce: 0.1,
+            bounce: 0,
           }
         );
       }

From 6a6fd4be1c749161ff28f5ff1435bbcef0a81ea1 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 12 Oct 2025 11:29:04 +0200
Subject: [PATCH 068/111] chore: Only run autopep8 if python files changed,
 b=no-bug, c=workflows

---
 .github/workflows/code-linter.yml | 7 +++++--
 package.json                      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/code-linter.yml b/.github/workflows/code-linter.yml
index 74e17d709..decb9dcac 100644
--- a/.github/workflows/code-linter.yml
+++ b/.github/workflows/code-linter.yml
@@ -27,8 +27,11 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Setup autopep8
-        run: sudo apt install python3-autopep8
+      - name: Setup and run autopep8
+        if: ${{ contains(join(github.event.commits.*.modified, ' '), '.py') || contains(join(github.event.commits.*.added, ' '), '.py') || contains(join(github.event.commits.*.removed, ' '), '.py') }}
+        run: |
+          sudo apt install python3-autopep8
+          autopep8 --diff scripts/ src/
 
       - name: Install dependencies
         run: npm ci
diff --git a/package.json b/package.json
index 107ddd6cd..4d980483e 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "update-ff:rc": "python3 scripts/update_ff.py --rc",
     "update-ff:l10n": "python3 scripts/update_ff.py --just-l10n",
     "pretty": "prettier . --write --cache && autopep8 -r --in-place scripts/ src/",
-    "lint": "npx eslint src/ && prettier . --check && autopep8 --diff scripts/ src/",
+    "lint": "npx eslint src/ && prettier . --check --cache",
     "lint:fix": "npm run pretty && npx eslint src/ --fix",
     "prepare": "husky",
     "reset-ff": "surfer reset",

From 07661ea19a8e00b96137c8cdffc8786802efdee3 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 12 Oct 2025 11:37:18 +0200
Subject: [PATCH 069/111] chore: Revert to the new folder animation, p=#10783,
 c=folders

---
 .../tabbrowser/content/tab-js.patch           |    6 +-
 .../tabbrowser/content/tabs-js.patch          |   96 +-
 src/zen/folders/ZenFolder.mjs                 |   14 +-
 src/zen/folders/ZenFolders.mjs                | 1134 ++++++++---------
 src/zen/folders/zen-folders.css               |    2 +-
 src/zen/tabs/ZenPinnedTabManager.mjs          |  126 +-
 6 files changed, 693 insertions(+), 685 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 50543e0eb..997098854 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..5b0f46642e36fd3e15d13a8dbc633c7a9751f8aa 100644
+index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362efc001afdd 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -65,7 +65,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..5b0f46642e36fd3e15d13a8dbc633c7a
 +      }
 +
 +      // Selected tabs are always visible
-+      if ((this.selected || this.multiselected || this.hasAttribute("folder-active")) && !this.hasAttribute("was-folder-active")) return true;
++      if (this.selected || this.multiselected || this.hasAttribute("folder-active")) return true;
 +      // Recursively check all parent groups
 +      let currentParent = this.group;
 +      while (currentParent) {
@@ -138,7 +138,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..5b0f46642e36fd3e15d13a8dbc633c7a
 +        gZenPinnedTabManager._onTabResetPinButton(event, this, 'reset');
 +        gBrowser.tabContainer._blockDblClick = true;
 +      } else if (event.target.classList.contains("tab-reset-button")) {
-+        gZenPinnedTabManager._onCloseTabShortcut(event, this);
++        gZenPinnedTabManager.onCloseTabShortcut(event, this);
 +        gBrowser.tabContainer._blockDblClick = true;
 +      }
      }
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 8318bbc10..c1c09ac70 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b19b606e9 100644
+index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e52915a44c9b1 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -44,6 +44,9 @@
@@ -70,7 +70,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
  
            if (collapseTabGroupDuringDrag) {
              tab.group.collapsed = true;
-+            gZenFolders.collapseVisibleTab(tab.group);
++            gZenFolders.animateGroupMove(tab.group);
            }
          }
        }
@@ -85,7 +85,17 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        if (
          (dropEffect == "move" || dropEffect == "copy") &&
          document == draggedTab.ownerDocument &&
-@@ -1208,6 +1218,18 @@
+@@ -1154,7 +1164,8 @@
+         isTabGroupLabel(draggedTab) &&
+         draggedTab._dragData?.expandGroupOnDrop
+       ) {
+-        draggedTab.group.collapsed = false;
++        draggedTab.group.collapsed = draggedTab.group.hasAttribute("has-active");
++        gZenFolders.animateGroupMove(draggedTab.group, true);
+       }
+     }
+ 
+@@ -1208,6 +1219,18 @@
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
@@ -104,7 +114,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        if (draggedTab && dropEffect == "copy") {
          let duplicatedDraggedTab;
          let duplicatedTabs = [];
-@@ -1232,8 +1254,9 @@
+@@ -1232,8 +1255,9 @@
          let translateOffsetY = oldTranslateY % tabHeight;
          let newTranslateX = oldTranslateX - translateOffsetX;
          let newTranslateY = oldTranslateY - translateOffsetY;
@@ -116,7 +126,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
  
          if (this.#isContainerVerticalPinnedGrid(draggedTab)) {
            // Update both translate axis for pinned vertical expanded tabs
-@@ -1249,8 +1272,8 @@
+@@ -1249,8 +1273,8 @@
            }
          } else {
            let tabs = this.ariaFocusableItems.slice(
@@ -127,7 +137,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            );
            let size = this.verticalMode ? "height" : "width";
            let screenAxis = this.verticalMode ? "screenY" : "screenX";
-@@ -1299,11 +1322,13 @@
+@@ -1299,11 +1323,13 @@
            this.dragToPinPromoCard,
          ];
          let shouldPin =
@@ -141,7 +151,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            isTab(draggedTab) &&
            draggedTab.pinned &&
            this.arrowScrollbox.contains(event.target);
-@@ -1321,6 +1346,7 @@
+@@ -1321,6 +1347,7 @@
              (oldTranslateY && oldTranslateY != newTranslateY);
          } else if (this.verticalMode) {
            shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
@@ -149,7 +159,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
          } else {
            shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
          }
-@@ -1515,6 +1541,7 @@
+@@ -1515,6 +1542,7 @@
  
            let nextItem = this.ariaFocusableItems[newIndex];
            let tabGroup = isTab(nextItem) && nextItem.group;
@@ -157,7 +167,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            gBrowser.loadTabs(urls, {
              inBackground,
              replace,
-@@ -1553,6 +1580,17 @@
+@@ -1553,6 +1581,17 @@
        }
        this.#resetTabsAfterDrop(draggedTab.ownerDocument);
  
@@ -175,7 +185,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
-@@ -1719,7 +1757,6 @@
+@@ -1719,7 +1758,6 @@
  
        this.toggleAttribute("overflow", true);
        this._updateCloseButtons();
@@ -183,7 +193,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
  
        document
          .getElementById("tab-preview-panel")
-@@ -1777,7 +1814,7 @@
+@@ -1777,7 +1815,7 @@
      }
  
      get newTabButton() {
@@ -192,7 +202,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
      }
  
      get verticalMode() {
-@@ -1793,6 +1830,7 @@
+@@ -1793,6 +1831,7 @@
      }
  
      get overflowing() {
@@ -200,7 +210,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        return this.hasAttribute("overflow");
      }
  
-@@ -1806,29 +1844,54 @@
+@@ -1806,29 +1845,54 @@
        if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
          pinnedChildren.pop();
        }
@@ -265,7 +275,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
      }
  
      /**
-@@ -1895,29 +1958,23 @@
+@@ -1895,29 +1959,23 @@
  
        let elementIndex = 0;
  
@@ -304,7 +314,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
          }
        }
  
-@@ -1929,6 +1986,7 @@
+@@ -1929,6 +1987,7 @@
      _invalidateCachedTabs() {
        this.#allTabs = null;
        this._invalidateCachedVisibleTabs();
@@ -312,7 +322,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
      }
  
      _invalidateCachedVisibleTabs() {
-@@ -1944,8 +2002,8 @@
+@@ -1944,8 +2003,8 @@
      #isContainerVerticalPinnedGrid(tab) {
        return (
          this.verticalMode &&
@@ -323,7 +333,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
          !this.expandOnHover
        );
      }
-@@ -1961,7 +2019,7 @@
+@@ -1961,7 +2020,7 @@
  
        if (node == null) {
          // We have a container for non-tab elements at the end of the scrollbox.
@@ -332,7 +342,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        }
  
        node.before(tab);
-@@ -2056,7 +2114,7 @@
+@@ -2056,7 +2115,7 @@
            // There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
            // for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
            // Attach the long click popup to all of them.
@@ -341,7 +351,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            const newTab2 = this.newTabButton;
            const newTabVertical = document.getElementById(
              "vertical-tabs-newtab-button"
-@@ -2156,8 +2214,10 @@
+@@ -2156,8 +2215,10 @@
       */
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
@@ -352,7 +362,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -2166,7 +2226,7 @@
+@@ -2166,7 +2227,7 @@
       * @param {boolean} [shouldScrollInstantly=false]
       */
      #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
@@ -361,7 +371,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        if (arrowScrollbox?.overflowing) {
          arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
        }
-@@ -2305,6 +2365,16 @@
+@@ -2305,6 +2366,16 @@
        when the tab is first selected to be dragged.
      */
      #updateTabStylesOnDrag(tab) {
@@ -378,7 +388,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        let isPinned = tab.pinned;
        let numPinned = gBrowser.pinnedTabCount;
        let allTabs = this.ariaFocusableItems;
-@@ -2578,7 +2648,7 @@
+@@ -2578,7 +2649,7 @@
          return;
        }
  
@@ -387,7 +397,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2587,6 +2657,8 @@
+@@ -2587,6 +2658,8 @@
  
        let { width: tabWidth, height: tabHeight } =
          draggedTab.getBoundingClientRect();
@@ -396,7 +406,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        let shiftSizeX = tabWidth * movingTabs.length;
        let shiftSizeY = tabHeight;
        dragData.tabWidth = tabWidth;
-@@ -2623,8 +2695,8 @@
+@@ -2623,8 +2696,8 @@
        let lastBoundX =
          lastTabInRow.screenX +
          lastTabInRow.getBoundingClientRect().width -
@@ -407,7 +417,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX);
        translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
  
-@@ -2782,13 +2854,18 @@
+@@ -2782,13 +2855,18 @@
        this.#clearDragOverGroupingTimer();
        this.#clearPinnedDropIndicatorTimer();
  
@@ -430,7 +440,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
  
        if (this.#rtlMode) {
          tabs.reverse();
-@@ -2799,7 +2876,7 @@
+@@ -2799,7 +2877,7 @@
        let screenAxis = this.verticalMode ? "screenY" : "screenX";
        let size = this.verticalMode ? "height" : "width";
        let translateAxis = this.verticalMode ? "translateY" : "translateX";
@@ -439,7 +449,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        let tabSize = this.verticalMode ? tabHeight : tabWidth;
        let translateX = event.screenX - dragData.screenX;
        let translateY = event.screenY - dragData.screenY;
-@@ -2815,6 +2892,12 @@
+@@ -2815,6 +2893,12 @@
        );
        let lastMovingTab = movingTabs.at(-1);
        let firstMovingTab = movingTabs[0];
@@ -452,7 +462,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
        let lastMovingTabScreen = endEdge(lastMovingTab);
        let firstMovingTabScreen = firstMovingTab[screenAxis];
-@@ -2829,6 +2912,11 @@
+@@ -2829,6 +2913,11 @@
        let endBound = this.#rtlMode
          ? endEdge(this) - lastMovingTabScreen
          : periphery[screenAxis] - 1 - lastMovingTabScreen;
@@ -464,7 +474,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        translate = Math.min(Math.max(translate, startBound), endBound);
  
        // Center the tab under the cursor if the tab is not under the cursor while dragging
-@@ -3018,6 +3106,8 @@
+@@ -3018,6 +3107,8 @@
        };
  
        let dropElement = getOverlappedElement();
@@ -473,7 +483,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
  
        let newDropElementIndex;
        if (dropElement) {
-@@ -3099,7 +3189,7 @@
+@@ -3099,7 +3190,7 @@
            ? Services.prefs.getIntPref(
                "browser.tabs.dragDrop.moveOverThresholdPercent"
              ) / 100
@@ -482,7 +492,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
          moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
          let shouldMoveOver = overlapPercent > moveOverThreshold;
          if (logicalForward && shouldMoveOver) {
-@@ -3132,6 +3222,7 @@
+@@ -3132,6 +3223,7 @@
          // If dragging a group over another group, don't make it look like it is
          // possible to drop the dragged group inside the other group.
          if (
@@ -490,7 +500,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            isTabGroupLabel(draggedTab) &&
            dropElement?.group &&
            (!dropElement.group.collapsed ||
-@@ -3158,20 +3249,13 @@
+@@ -3158,20 +3250,13 @@
          let isOutOfBounds = isPinned
            ? dropElement.elementIndex >= numPinned
            : dropElement.elementIndex < numPinned;
@@ -515,7 +525,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
          let groupingDelay = Services.prefs.getIntPref(
            "browser.tabs.dragDrop.createGroup.delayMS"
          );
-@@ -3179,6 +3263,7 @@
+@@ -3179,6 +3264,7 @@
          // When dragging tab(s) over an ungrouped tab, signal to the user
          // that dropping the tab(s) will create a new tab group.
          let shouldCreateGroupOnDrop =
@@ -523,7 +533,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            !movingTabsSet.has(dropElement) &&
            isTab(dropElement) &&
            !dropElement?.group &&
-@@ -3187,6 +3272,7 @@
+@@ -3187,6 +3273,7 @@
          // When dragging tab(s) over a collapsed tab group label, signal to the
          // user that dropping the tab(s) will add them to the group.
          let shouldDropIntoCollapsedTabGroup =
@@ -531,7 +541,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            isTabGroupLabel(dropElement) &&
            dropElement.group.collapsed &&
            overlapPercent > dragOverGroupingThreshold;
-@@ -3231,19 +3317,14 @@
+@@ -3231,19 +3318,14 @@
              dropElement = dropElementGroup;
              colorCode = undefined;
            } else if (isTabGroupLabel(dropElement)) {
@@ -559,7 +569,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            }
            this.#setDragOverGroupColor(colorCode);
            this.toggleAttribute("movingtab-addToGroup", colorCode);
-@@ -3262,11 +3343,11 @@
+@@ -3262,11 +3344,11 @@
        dragData.dropElement = dropElement;
        dragData.dropBefore = dropBefore;
        dragData.animDropElementIndex = newDropElementIndex;
@@ -573,7 +583,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            continue;
          }
  
-@@ -3388,12 +3469,14 @@
+@@ -3388,12 +3470,14 @@
        element?.removeAttribute("dragover-groupTarget");
      }
  
@@ -590,7 +600,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
  
        for (let item of this.ariaFocusableItems) {
          this.#resetGroupTarget(item);
-@@ -3440,7 +3523,7 @@
+@@ -3440,7 +3524,7 @@
          tab.style.left = "";
          tab.style.top = "";
          tab.style.maxWidth = "";
@@ -599,7 +609,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        }
        for (let label of draggedTabDocument.getElementsByClassName(
          "tab-group-label-container"
-@@ -3450,7 +3533,7 @@
+@@ -3450,7 +3534,7 @@
          label.style.left = "";
          label.style.top = "";
          label.style.maxWidth = "";
@@ -608,7 +618,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
        }
        let periphery = draggedTabDocument.getElementById(
          "tabbrowser-arrowscrollbox-periphery"
-@@ -3522,7 +3605,7 @@
+@@ -3522,7 +3606,7 @@
          let postTransitionCleanup = () => {
            movingTab._moveTogetherSelectedTabsData.animate = false;
          };
@@ -617,7 +627,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            postTransitionCleanup();
          } else {
            let onTransitionEnd = transitionendEvent => {
-@@ -3686,7 +3769,7 @@
+@@ -3686,7 +3770,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -626,7 +636,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
          return;
        }
  
-@@ -3795,7 +3878,10 @@
+@@ -3795,7 +3879,10 @@
      #getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
@@ -638,7 +648,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
            break;
          }
          target = target.parentNode;
-@@ -3812,6 +3898,9 @@
+@@ -3812,6 +3899,9 @@
            return null;
          }
        }
diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index 470cc6127..f6ac00a86 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -117,6 +117,10 @@
       return activeGroups;
     }
 
+    get childActiveGroups() {
+      return Array.from(this.querySelectorAll('zen-folder[has-active]'));
+    }
+
     rename() {
       if (!document.documentElement.hasAttribute('zen-sidebar-expanded')) {
         return;
@@ -240,16 +244,18 @@
     }
 
     async #unloadAllActiveTabs(event, noClose = false) {
-      for (const tab of this.tabs) {
-        await gZenPinnedTabManager._onCloseTabShortcut(event, tab, { noClose });
-      }
+      await gZenPinnedTabManager.onCloseTabShortcut(event, this.tabs, {
+        noClose,
+        alwaysUnload: true,
+        folderToUnload: this,
+      });
       this.activeTabs = [];
     }
 
     on_click(event) {
       if (event.target === this.resetButton) {
         event.stopPropagation();
-        this.#unloadAllActiveTabs(event);
+        this.unloadAllTabs(event);
         return;
       }
       super.on_click(event);
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index a3c91abf0..b04c2a787 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -194,6 +194,7 @@
       window.addEventListener('TabGroupExpand', this);
       window.addEventListener('TabGroupCollapse', this);
       window.addEventListener('FolderGrouped', this);
+      window.addEventListener('FolderUngrouped', this);
       window.addEventListener('TabSelect', this);
       window.addEventListener('TabOpen', this);
       const onNewFolder = this.#onNewFolder.bind(this);
@@ -255,6 +256,15 @@
       parentFolder.collapsed = isActiveFolder;
     }
 
+    on_FolderUngrouped(event) {
+      if (this._sessionRestoring) return;
+      const parentFolder = event.target;
+      const folder = event.detail;
+      for (const tab of folder.tabs) {
+        this.animateUnload(parentFolder, tab, true);
+      }
+    }
+
     async on_TabSelect(event) {
       const tab = gZenGlanceManager.getTabOrGlanceParent(event.target);
       let group = tab?.group;
@@ -269,7 +279,7 @@
       }
 
       collapsedRoot.setAttribute('has-active', 'true');
-      await this.expandToSelected(collapsedRoot);
+      await this.animateSelect(collapsedRoot);
       gBrowser.tabContainer._invalidateCachedTabs();
     }
 
@@ -286,26 +296,15 @@
       }
     }
 
-    on_TabUngrouped(event) {
+    async on_TabUngrouped(event) {
       const tab = event.detail;
       const group = event.target;
-      tab.removeAttribute('folder-active');
       if (group.hasAttribute('split-view-group') && tab.hasAttribute('had-zen-pinned-changed')) {
         tab.setAttribute('zen-pinned-changed', true);
         tab.removeAttribute('had-zen-pinned-changed');
       }
 
-      const activeGroup = group.activeGroups;
-      if (activeGroup?.length > 0) {
-        for (const folder of activeGroup) {
-          folder.activeTabs = folder.activeTabs.filter((tab) => tab.hasAttribute('folder-active'));
-          if (!folder.activeTabs.length) {
-            folder.removeAttribute('has-active');
-          }
-          this.collapseVisibleTab(folder, true);
-          this.updateFolderIcon(folder, 'close');
-        }
-      }
+      await this.animateUnload(group, tab, true);
     }
 
     on_TabGroupCreate(event) {
@@ -352,336 +351,14 @@
       const group = event.target;
       if (!group.isZenFolder) return;
 
-      this.cancelPopupTimer();
-      const isForCollapseVisible = event.forCollapseVisible;
-      const canInheritMarginTop = event.canInheritMarginTop;
-
-      const tabsContainer = group.querySelector('.tab-group-container');
-      const animations = [];
-      const groupStart = group.querySelector('.zen-tab-group-start');
-      let selectedItems = [];
-      let selectedGroupIds = new Set();
-      let activeGroupIds = new Set();
-      let itemsToHide = [];
-
-      const items = group.childGroupsAndTabs
-        .filter((item) => !item.hasAttribute('zen-empty-tab'))
-        .map((item) => {
-          const isSplitView = item.group?.hasAttribute?.('split-view-group');
-          const lastActiveGroup = !isSplitView
-            ? item?.group?.activeGroups?.at(-1)
-            : item?.group?.group?.activeGroups?.at(-1);
-          const activeGroupId = lastActiveGroup?.id;
-          const splitGroupId = isSplitView ? item.group.id : null;
-          if (gBrowser.isTabGroupLabel(item) && !isSplitView) item = item.parentNode;
-
-          if (
-            isForCollapseVisible
-              ? group.activeTabs.includes(item)
-              : item.multiselected || item.selected
-          ) {
-            selectedItems.push(item);
-            if (splitGroupId) selectedGroupIds.add(splitGroupId);
-            if (activeGroupId) activeGroupIds.add(activeGroupId);
-          }
-
-          return { item, splitGroupId, activeGroupId };
-        });
-
-      // Calculate the height we need to hide until we reach the selected item.
-      let heightUntilSelected = groupStart.style.marginTop
-        ? Math.abs(parseInt(groupStart.style.marginTop.slice(0, -2)))
-        : 0;
-      if (!isForCollapseVisible) {
-        if (selectedItems.length) {
-          if (!canInheritMarginTop) {
-            heightUntilSelected = 0;
-          }
-          const selectedItem = selectedItems[0];
-          const isSplitView = selectedItem.group?.hasAttribute('split-view-group');
-          const selectedContainer = isSplitView ? selectedItem.group : selectedItem;
-          heightUntilSelected +=
-            window.windowUtils.getBoundsWithoutFlushing(selectedContainer).top -
-            window.windowUtils.getBoundsWithoutFlushing(groupStart).bottom;
-          if (isSplitView) {
-            heightUntilSelected -= 2;
-          }
-        } else {
-          heightUntilSelected += window.windowUtils.getBoundsWithoutFlushing(tabsContainer).height;
-        }
-      }
-
-      let selectedIdx = items.length;
-      if (selectedItems.length) {
-        for (let i = 0; i < items.length; i++) {
-          if (selectedItems.includes(items[i].item)) {
-            selectedIdx = i;
-            break;
-          }
-        }
-      }
-
-      for (let i = 0; i < items.length; i++) {
-        const { item, splitGroupId, activeGroupId } = items[i];
-
-        // Dont hide items before the first selected tab
-        if (selectedIdx >= 0 && i < selectedIdx && !isForCollapseVisible) continue;
-
-        // Skip selected items
-        if (selectedItems.includes(item)) continue;
-
-        // Skip items from selected split-view groups
-        if (splitGroupId && selectedGroupIds.has(splitGroupId)) continue;
-
-        // Skip items from selected active groups
-        if (activeGroupId && activeGroupIds.has(activeGroupId)) {
-          // If item is tab-group-label-container we should hide it.
-          // Other items between tab-group-labe-container and folder-active tab should be visible cuz they are hidden by margin-top
-          if (
-            item.parentElement.id !== activeGroupId &&
-            !item.hasAttribute('folder-active') &&
-            !isForCollapseVisible
-          ) {
-            continue;
-          }
-        }
-
-        const itemToHide = splitGroupId ? item.group : item;
-        if (!itemsToHide.includes(itemToHide)) {
-          itemsToHide.push(itemToHide);
-        }
-      }
-
-      if (selectedItems.length) {
-        group.setAttribute('has-active', 'true');
-        group.activeTabs = selectedItems;
-
-        selectedItems.forEach((item) => {
-          this.setFolderIndentation([item], group, /* for collapse = */ true);
-        });
-      }
-
-      itemsToHide.map((item) => {
-        animations.push(
-          gZenUIManager.motion.animate(
-            item,
-            {
-              opacity: 0,
-              height: 0,
-            },
-            { duration: 0.12, ease: 'easeInOut' }
-          )
-        );
-      });
-
-      animations.push(...this.updateFolderIcon(group));
-      const startMargin = -(heightUntilSelected + 4 * (selectedItems.length === 0 ? 1 : 0));
-      animations.push(
-        gZenUIManager.motion.animate(
-          groupStart,
-          {
-            marginTop: startMargin,
-          },
-          { duration: 0.12, ease: 'easeInOut' }
-        )
-      );
-
-      gBrowser.tabContainer._invalidateCachedVisibleTabs();
-      this.#animationCount += 1;
-      await Promise.all(animations);
-      // Prevent hiding if we spam the group animations
-      this.#animationCount -= 1;
-      if (selectedItems.length === 0 && !this.#animationCount) {
-        tabsContainer.setAttribute('hidden', true);
-      }
+      await this.animateCollapse(group);
     }
 
     async on_TabGroupExpand(event) {
       const group = event.target;
       if (!group.isZenFolder) return;
 
-      this.cancelPopupTimer();
-
-      const tabsContainer = group.querySelector('.tab-group-container');
-      tabsContainer.removeAttribute('hidden');
-
-      const groupStart = group.querySelector('.zen-tab-group-start');
-      const animations = [];
-      tabsContainer.style.overflow = 'hidden';
-
-      const normalizeGroupItems = (items) => {
-        const processed = [];
-        items
-          .filter((item) => !item.hasAttribute('zen-empty-tab'))
-          .forEach((item) => {
-            if (gBrowser.isTabGroupLabel(item)) {
-              if (item?.group?.hasAttribute('split-view-group')) {
-                item = item.group;
-              } else {
-                item = item.parentElement;
-              }
-            }
-            processed.push(item);
-          });
-        return processed;
-      };
-
-      const activeGroups = group.querySelectorAll('zen-folder[has-active]');
-      const groupItems = normalizeGroupItems(group.childGroupsAndTabs);
-      const itemsToHide = [];
-
-      // TODO: It is necessary to correctly set marginTop for groups with has-active
-      for (const activeGroup of activeGroups) {
-        const activeGroupItems = activeGroup.childGroupsAndTabs;
-        let selectedTabs = activeGroup.activeTabs;
-        let selectedGroupIds = new Set();
-
-        selectedTabs.forEach((tab) => {
-          if (tab?.group?.hasAttribute('split-view-group')) {
-            selectedGroupIds.add(tab.group.id);
-          }
-        });
-
-        if (selectedTabs.length) {
-          let selectedIdx = -1;
-          for (let i = 0; i < activeGroupItems.length; i++) {
-            const item = activeGroup.childGroupsAndTabs[i];
-            let selectedTab = item;
-
-            // If the item is in a split view group, we need to get the last tab
-            if (selectedTab?.group?.hasAttribute('split-view-group')) {
-              selectedTab = selectedTab.group.tabs.at(-1);
-            }
-
-            if (selectedTabs.includes(selectedTab) || selectedTabs.includes(item)) {
-              selectedIdx = i;
-              break;
-            }
-          }
-
-          if (selectedIdx >= 0) {
-            for (let i = selectedIdx; i < activeGroupItems.length; i++) {
-              const item = activeGroup.childGroupsAndTabs[i];
-
-              if (selectedTabs.includes(item)) continue;
-
-              const isSplitView = item.group?.hasAttribute?.('split-view-group');
-              const splitGroupId = isSplitView ? item.group.id : null;
-              if (splitGroupId && selectedGroupIds.has(splitGroupId)) continue;
-
-              itemsToHide.push(...normalizeGroupItems([item]));
-            }
-          }
-        }
-      }
-
-      groupItems.map((item) => {
-        animations.push(
-          gZenUIManager.motion.animate(
-            item,
-            {
-              opacity: 1,
-              height: '',
-            },
-            { duration: 0.12, ease: 'easeInOut' }
-          )
-        );
-      });
-
-      itemsToHide.map((item) => {
-        animations.push(
-          gZenUIManager.motion.animate(
-            item,
-            {
-              opacity: 0,
-              height: 0,
-            },
-            { duration: 0.12, ease: 'easeInOut' }
-          )
-        );
-      });
-
-      animations.push(...this.updateFolderIcon(group));
-      animations.push(
-        gZenUIManager.motion
-          .animate(
-            groupStart,
-            {
-              marginTop: 0,
-            },
-            {
-              duration: 0.12,
-              ease: 'easeInOut',
-            }
-          )
-          .then(() => {
-            tabsContainer.style.overflow = '';
-            if (group.hasAttribute('has-active')) {
-              const activeTabs = group.activeTabs;
-              const folders = new Map();
-              group.removeAttribute('has-active');
-              for (let tab of activeTabs) {
-                const group = tab?.group?.hasAttribute('split-view-group')
-                  ? tab?.group?.group
-                  : tab?.group;
-                if (!folders.has(group?.id)) {
-                  folders.set(group?.id, group?.activeGroups?.at(-1));
-                }
-                let activeGroup = folders.get(group?.id);
-                // If group has active tabs, we need to update the indentation
-                if (activeGroup) {
-                  const activeGroupStart = activeGroup.querySelector('.zen-tab-group-start');
-                  const selectedTabs = activeGroup.activeTabs;
-                  if (selectedTabs.length > 0) {
-                    const selectedItem = selectedTabs[0];
-                    const isSplitView = selectedItem.group?.hasAttribute('split-view-group');
-                    const selectedContainer = isSplitView ? selectedItem.group : selectedItem;
-
-                    const heightUntilSelected =
-                      window.windowUtils.getBoundsWithoutFlushing(selectedContainer).top -
-                      window.windowUtils.getBoundsWithoutFlushing(activeGroupStart).bottom;
-
-                    const adjustedHeight = isSplitView
-                      ? heightUntilSelected - 2
-                      : heightUntilSelected;
-                    activeGroupStart.style.marginTop =
-                      -(adjustedHeight + 4 * (selectedTabs.length === 0 ? 1 : 0)) + 'px';
-                  }
-                  this.setFolderIndentation([tab], activeGroup, /* for collapse = */ true);
-                } else {
-                  // Since the folder is now expanded, we should remove active attribute
-                  // to the tab that was previously visible
-                  tab.removeAttribute('folder-active');
-                  if (tab.group?.hasAttribute('split-view-group')) {
-                    tab.group.style.removeProperty('--zen-folder-indent');
-                  } else {
-                    tab.style.removeProperty('--zen-folder-indent');
-                  }
-                }
-              }
-
-              folders.clear();
-            }
-            // Folder has been expanded and has no active tabs
-            group.activeTabs = [];
-          })
-      );
-
-      this.#animationCount += 1;
-      await Promise.all(animations);
-      this.#animationCount -= 1;
-      if (this.#animationCount) {
-        return;
-      }
-      groupItems.forEach((item) => {
-        // Cleanup just in case
-        item.style.opacity = '';
-        item.style.height = '';
-      });
-      itemsToHide.forEach((item) => {
-        item.style.opacity = '';
-        item.style.height = '';
-      });
+      await this.animateExpand(group);
     }
 
     #onNewFolder(event) {
@@ -1208,256 +885,6 @@
       }
     }
 
-    collapseVisibleTab(group, onlyIfActive = false, selectedTab = null) {
-      let tabsToCollapse = [selectedTab];
-      if (group?.hasAttribute('split-view-group') && selectedTab && onlyIfActive) {
-        tabsToCollapse = group.tabs;
-        group = group.group;
-      }
-      if (!group?.isZenFolder) return;
-
-      if (selectedTab) {
-        selectedTab.style.removeProperty('--zen-folder-indent');
-      }
-      // We ignore if the flag is set to avoid infinite recursion
-      if (onlyIfActive && group.activeGroups.length && selectedTab) {
-        onlyIfActive = true;
-        group = group.activeGroups[group.activeGroups.length - 1];
-      }
-      // Only continue from here if we have the active tab for this group.
-      // This is important so we dont set the margin to the wrong group.
-      // Example:
-      //   folder1
-      //   ├─ folder2
-      //   └─── tab
-      // When we collapse folder1 ONLY and reset tab since it's `active`, pinned
-      // manager gives originally the direct group of `tab`, which is `folder2`.
-      // But we should be setting the margin only on `folder1`.
-      if (!group.activeTabs.includes(selectedTab) && selectedTab) return;
-      group._prevActiveTabs = group.activeTabs;
-      for (const item of group._prevActiveTabs) {
-        if (selectedTab ? tabsToCollapse.includes(item) : !item.selected || !onlyIfActive) {
-          item.removeAttribute('folder-active');
-          group.activeTabs = group.activeTabs.filter((t) => t !== item);
-          if (!onlyIfActive) {
-            item.setAttribute('was-folder-active', 'true');
-          }
-        }
-      }
-
-      if (group.activeTabs.length === 0) {
-        group.removeAttribute('has-active');
-        this.updateFolderIcon(group, 'close');
-      }
-
-      return this.on_TabGroupCollapse({
-        target: group,
-        forCollapseVisible: true,
-        targetTab: selectedTab,
-      }).then(() => {
-        if (selectedTab) {
-          selectedTab.style.removeProperty('--zen-folder-indent');
-        }
-      });
-    }
-
-    expandVisibleTab(group) {
-      if (!group?.isZenFolder) return;
-
-      group.activeTabs = group._prevActiveTabs || [];
-      for (const tab of group.activeTabs) {
-        if (tab.hasAttribute('was-folder-active')) {
-          tab.setAttribute('folder-active', 'true');
-          tab.removeAttribute('was-folder-active');
-        }
-      }
-
-      if (group.activeTabs.length === 0) {
-        group.removeAttribute('has-active');
-        this.updateFolderIcon(group, 'close');
-      }
-
-      this.on_TabGroupExpand({ target: group, forExpandVisible: true });
-
-      gBrowser.tabContainer._invalidateCachedVisibleTabs();
-    }
-
-    async expandToSelected(group) {
-      if (!group?.isZenFolder) return;
-
-      this.cancelPopupTimer?.();
-
-      const tabsContainer = group.querySelector('.tab-group-container');
-      const groupStart = group.querySelector('.zen-tab-group-start');
-      const animations = [];
-
-      const normalizeGroupItems = (items) => {
-        const processed = [];
-        items
-          .filter((item) => !item.hasAttribute('zen-empty-tab'))
-          .forEach((item) => {
-            if (gBrowser.isTabGroupLabel(item)) {
-              if (item?.group?.hasAttribute('split-view-group')) {
-                item = item.group;
-              } else {
-                item = item.parentElement;
-              }
-            }
-            processed.push(item);
-          });
-        return processed;
-      };
-
-      const selectedItems = [];
-      const groupItems = normalizeGroupItems(group.childGroupsAndTabs);
-
-      for (const item of groupItems) {
-        if (item.hasAttribute('folder-active') || item.selected) {
-          selectedItems.push(item);
-        }
-      }
-
-      for (const tab of selectedItems) {
-        let current = tab?.group?.hasAttribute('split-view-group') ? tab.group.group : tab?.group;
-        while (current) {
-          const activeForGroup = selectedItems.filter((t) => current.contains(t));
-          if (activeForGroup.length) {
-            if (current.collapsed) {
-              if (current.hasAttribute('has-active')) {
-                // It is important to keep the sequence of elements as in the DOM
-                current.activeTabs = [...new Set([...current.activeTabs, ...activeForGroup])].sort(
-                  (a, b) => {
-                    const position = a.compareDocumentPosition(b);
-                    if (position & Node.DOCUMENT_POSITION_FOLLOWING) return -1;
-                    if (position & Node.DOCUMENT_POSITION_PRECEDING) return 1;
-                    return 0;
-                  }
-                );
-              } else {
-                current.setAttribute('has-active', 'true');
-                current.activeTabs = activeForGroup;
-              }
-
-              // If selectedItems does not have a tab, it is necessary to add it
-              current.activeTabs.forEach((tab) => {
-                if (!selectedItems.includes(tab)) {
-                  selectedItems.push(tab);
-                }
-              });
-              const tabsContainer = current.querySelector('.tab-group-container');
-              const groupStart = current.querySelector('.zen-tab-group-start');
-              const curMarginTop = parseInt(groupStart.style.marginTop) || 0;
-
-              if (tabsContainer.hasAttribute('hidden')) tabsContainer.removeAttribute('hidden');
-
-              animations.push(...this.updateFolderIcon(current, 'close'));
-              animations.push(
-                gZenUIManager.motion.animate(
-                  groupStart,
-                  {
-                    marginTop: [curMarginTop, 0],
-                  },
-                  { duration: 0.12, ease: 'easeInOut' }
-                )
-              );
-              for (const tab of activeForGroup) {
-                this.setFolderIndentation(
-                  [tab],
-                  current,
-                  /* for collapse = */ true,
-                  /* animate = */ false
-                );
-              }
-            }
-          }
-          current = current.group;
-        }
-      }
-
-      const selectedItemsSet = new Set();
-      const selectedGroupIds = new Set();
-      for (const tab of selectedItems) {
-        const isSplit = tab?.group?.hasAttribute?.('split-view-group');
-        if (isSplit) selectedGroupIds.add(tab.group.id);
-        const container = isSplit ? tab.group : tab;
-        selectedItemsSet.add(container);
-      }
-
-      const itemsToHide = [];
-      for (const item of groupItems) {
-        const isSplit = item.group?.hasAttribute?.('split-view-group');
-        const splitId = isSplit ? item.group.id : null;
-        const itemElem = isSplit ? item.group : item;
-
-        if (selectedItemsSet.has(itemElem)) continue;
-        if (splitId && selectedGroupIds.has(splitId)) continue;
-
-        if (!itemElem.hasAttribute?.('folder-active')) {
-          if (!itemsToHide.includes(itemElem)) itemsToHide.push(itemElem);
-        }
-      }
-
-      if (tabsContainer.hasAttribute('hidden')) {
-        tabsContainer.removeAttribute('hidden');
-      }
-
-      for (const item of groupItems) {
-        animations.push(
-          gZenUIManager.motion.animate(
-            item,
-            {
-              opacity: 1,
-              height: '',
-            },
-            { duration: 0.12, ease: 'easeInOut' }
-          )
-        );
-      }
-
-      for (const item of itemsToHide) {
-        animations.push(
-          gZenUIManager.motion.animate(
-            item,
-            {
-              opacity: 0,
-              height: 0,
-            },
-            { duration: 0.12, ease: 'easeInOut' }
-          )
-        );
-      }
-
-      let curMarginTop = parseInt(groupStart.style.marginTop) || 0;
-      animations.push(
-        gZenUIManager.motion
-          .animate(
-            groupStart,
-            {
-              marginTop: [curMarginTop, 0],
-            },
-            { duration: 0.12, ease: 'easeInOut' }
-          )
-          .then(() => {
-            tabsContainer.style.overflow = '';
-          })
-      );
-
-      animations.push(...this.updateFolderIcon(group));
-
-      this.#animationCount = (this.#animationCount || 0) + 1;
-      await Promise.all(animations);
-      this.#animationCount -= 1;
-
-      for (const item of groupItems) {
-        item.style.opacity = '';
-        item.style.height = '';
-      }
-      for (const item of itemsToHide) {
-        item.style.opacity = '';
-        item.style.height = '';
-      }
-    }
-
     #groupInit(group, stateData) {
       // Setup zen-folder icon to the correct position
       this.updateFolderIcon(group, 'auto');
@@ -1760,6 +1187,537 @@
 
       return { dropElement, colorCode, dropBefore };
     }
+
+    #normalizeGroupItems(items) {
+      return items
+        .filter((item) => !item.hasAttribute('zen-empty-tab'))
+        .map((item) => {
+          if (gBrowser.isTabGroup(item)) {
+            item = item.firstChild;
+          } else if (gBrowser.isTabGroupLabel(item)) {
+            if (item?.group?.hasAttribute('split-view-group')) {
+              item = item.group;
+            } else {
+              item = item.parentElement;
+            }
+          }
+          return item;
+        });
+    }
+
+    #collectGroupItems(group, opts = {}) {
+      const { selectedTabs = [], splitViewIds = new Set(), activeFoldersIds = new Set() } = opts;
+      const folders = new Map();
+      return group.childGroupsAndTabs
+        .filter((item) => !item.hasAttribute('zen-empty-tab'))
+        .map((item) => {
+          const isSplitView = item.group?.hasAttribute?.('split-view-group');
+          const group = isSplitView ? item.group.group : item.group;
+          if (!folders.has(group?.id)) {
+            folders.set(group?.id, group?.activeGroups[0]);
+          }
+          const lastActiveFolder = folders.get(group?.id);
+          const activeFolderId = lastActiveFolder?.id;
+          const splitViewId = isSplitView ? item?.group?.id : null;
+
+          if (item.multiselected || item.selected || item.hasAttribute('folder-active')) {
+            selectedTabs.push(item);
+            if (splitViewId) splitViewIds.add(splitViewId);
+            if (activeFolderId) activeFoldersIds.add(activeFolderId);
+          }
+
+          if (gBrowser.isTabGroupLabel(item)) {
+            if (isSplitView) {
+              item = item.group;
+            } else {
+              item = item.parentElement;
+            }
+          }
+
+          return { item, splitViewId, activeFolderId };
+        });
+    }
+
+    #createAnimation(items, targetState, opts, callback = () => {}) {
+      items = Array.isArray(items) ? items : [items];
+      return items.map((item) =>
+        gZenUIManager.motion.animate(item, targetState, opts).then(callback)
+      );
+    }
+
+    #calculateHeightShift(tabsContainer, selectedTabs) {
+      let heightShift = 0;
+      if (selectedTabs.length) {
+        return heightShift;
+      } else {
+        heightShift += window.windowUtils.getBoundsWithoutFlushing(tabsContainer).height;
+      }
+      return heightShift;
+    }
+
+    async animateCollapse(group) {
+      this.cancelPopupTimer();
+
+      const animations = [];
+      const selectedTabs = [];
+      const splitViewIds = new Set();
+      const activeFoldersIds = new Set();
+      const itemsToHide = [];
+
+      const tabsContainer = group.querySelector('.tab-group-container');
+      const groupStart = group.querySelector('.zen-tab-group-start');
+
+      const groupItems = this.#collectGroupItems(group, {
+        selectedTabs,
+        splitViewIds,
+        activeFoldersIds,
+      });
+      const heightUntilSelected = this.#calculateHeightShift(tabsContainer, selectedTabs);
+
+      if (selectedTabs.length) {
+        for (let i = 0; i < groupItems.length; i++) {
+          const { item, splitViewId, activeFolderId } = groupItems[i];
+
+          // Skip selected items
+          if (selectedTabs.includes(item)) continue;
+
+          // Skip items from selected split-view groups
+          if (splitViewId && splitViewIds.has(splitViewId)) continue;
+
+          // Skip items from selected active groups
+          if (activeFolderId && activeFoldersIds.has(activeFolderId)) {
+            // If item is tab-group-label-container we should hide it.
+            // Other items between tab-group-labe-container and folder-active tab should be visible cuz they are hidden by margin-top
+            if (item.parentElement.id !== activeFolderId && !item.hasAttribute('folder-active')) {
+              continue;
+            }
+          }
+
+          if (!itemsToHide.includes(item)) {
+            itemsToHide.push(item);
+          }
+        }
+
+        group.setAttribute('has-active', 'true');
+        group.activeTabs = selectedTabs;
+
+        selectedTabs.forEach((tab) => {
+          this.setFolderIndentation([tab], group, /* for collapse = */ true);
+        });
+      }
+
+      animations.push(
+        ...this.#createAnimation(
+          itemsToHide,
+          { opacity: 0, height: 0 },
+          { duration: 0.12, ease: 'easeInOut' }
+        ),
+        ...this.updateFolderIcon(group),
+        ...this.#createAnimation(
+          groupStart,
+          {
+            marginTop: -(heightUntilSelected + 4 * (selectedTabs.length === 0 ? 1 : 0)),
+          },
+          { duration: 0.12, ease: 'easeInOut' }
+        )
+      );
+
+      gBrowser.tabContainer._invalidateCachedVisibleTabs();
+      this.#animationCount += 1;
+      await Promise.all(animations);
+      if (this.#animationCount) {
+        this.#animationCount -= 1;
+        return;
+      }
+      // Prevent hiding if we spam the group animations
+      if (!selectedTabs.length && !this.#animationCount) {
+        tabsContainer.setAttribute('hidden', true);
+      }
+
+      this.styleCleanup(itemsToHide);
+    }
+
+    async animateExpand(group) {
+      this.cancelPopupTimer();
+
+      const animations = [];
+      const itemsToHide = [];
+
+      const tabsContainer = group.querySelector('.tab-group-container');
+      tabsContainer.removeAttribute('hidden');
+      tabsContainer.style.overflow = 'hidden';
+
+      const groupStart = group.querySelector('.zen-tab-group-start');
+      const itemsToShow = this.#normalizeGroupItems(group.childGroupsAndTabs);
+      const activeFolders = group.childActiveGroups;
+
+      for (const folder of activeFolders) {
+        const splitViewIds = new Set();
+        const selectedTabs = folder.activeTabs;
+
+        const activeFoldersIds = new Set();
+        const activeFolderItems = this.#collectGroupItems(folder, {
+          splitViewIds,
+          activeFoldersIds,
+        });
+
+        if (selectedTabs.length) {
+          for (let i = 0; i < activeFolderItems.length; i++) {
+            const { item, splitViewId, activeFolderId } = activeFolderItems[i];
+
+            // Skip selected items
+            if (selectedTabs.includes(item)) continue;
+
+            // Skip items from selected split-view groups
+            if (splitViewId && splitViewIds.has(splitViewId)) continue;
+
+            if (activeFolderId && activeFoldersIds.has(activeFolderId)) {
+              const folder = item.parentElement;
+              if (
+                gBrowser.isTabGroup(folder) &&
+                folder.id !== activeFolderId &&
+                item.hasAttribute('folder-active')
+              ) {
+                continue;
+              }
+            }
+
+            if (!itemsToHide.includes(item)) {
+              itemsToHide.push(item);
+            }
+          }
+        }
+      }
+
+      const afterMarginTop = () => {
+        tabsContainer.style.overflow = '';
+        if (group.hasAttribute('has-active')) {
+          const activeTabs = group.activeTabs;
+          const folders = new Map();
+          group.removeAttribute('has-active');
+          for (let tab of activeTabs) {
+            const group = tab?.group?.hasAttribute('split-view-group')
+              ? tab?.group?.group
+              : tab?.group;
+            if (!folders.has(group?.id)) {
+              folders.set(group?.id, group?.activeGroups?.at(-1));
+            }
+            let activeGroup = folders.get(group?.id);
+            if (activeGroup) {
+              this.setFolderIndentation([tab], activeGroup, /* for collapse = */ true);
+            } else {
+              // Since the folder is now expanded, we should remove active attribute
+              // to the tab that was previously visible
+              tab.removeAttribute('folder-active');
+              if (tab.group?.hasAttribute('split-view-group')) {
+                tab.group.style.removeProperty('--zen-folder-indent');
+              } else {
+                tab.style.removeProperty('--zen-folder-indent');
+              }
+            }
+          }
+          folders.clear();
+        }
+        // Folder has been expanded and has no active tabs
+        group.activeTabs = [];
+      };
+
+      animations.push(
+        ...this.#createAnimation(
+          itemsToShow,
+          { opacity: '', height: '' },
+          { duration: 0.12, ease: 'easeInOut' }
+        ),
+        ...this.#createAnimation(
+          itemsToHide,
+          { opacity: 0, height: 0 },
+          { duration: 0.12, ease: 'easeInOut' }
+        ),
+        ...this.updateFolderIcon(group),
+        ...this.#createAnimation(
+          groupStart,
+          {
+            marginTop: 0,
+          },
+          { duration: 0.12, ease: 'easeInOut' },
+          afterMarginTop
+        )
+      );
+
+      this.#animationCount += 1;
+      await Promise.all(animations);
+      this.#animationCount -= 1;
+
+      // Cleanup
+      this.styleCleanup(itemsToShow);
+      this.styleCleanup(itemsToHide);
+    }
+
+    async animateUnloadAll(group) {
+      const animations = [];
+
+      const activeGroups = [group, ...group.childActiveGroups];
+      for (const folder of activeGroups) {
+        folder.removeAttribute('has-active');
+        folder.activeTabs = [];
+        const groupItems = this.#normalizeGroupItems(folder.allItems);
+        const tabsContainer = folder.querySelector('.tab-group-container');
+
+        this.styleCleanup(groupItems);
+
+        const groupStart = folder.querySelector('.zen-tab-group-start');
+
+        // Trigger a reflow
+        tabsContainer.offsetHeight;
+
+        const heightUntilSelected = this.#calculateHeightShift(tabsContainer, []);
+
+        // Collect animations for this specific folder becoming inactive
+        animations.push(
+          ...this.updateFolderIcon(folder, 'close', false),
+          ...this.#createAnimation(
+            groupStart,
+            {
+              marginTop: -(heightUntilSelected + 4),
+            },
+            { duration: 0.12, ease: 'easeInOut' }
+          )
+        );
+      }
+
+      this.#animationCount += 1;
+      await Promise.all(animations);
+      this.#animationCount -= 1;
+      gBrowser.tabContainer._invalidateCachedTabs();
+    }
+
+    async animateUnload(group, tabToUnload, ungroup = false) {
+      const isSplitView = tabToUnload.group?.hasAttribute('split-view-group');
+      if ((!group?.isZenFolder || !isSplitView) && !tabToUnload.hasAttribute('folder-active'))
+        return;
+      const animations = [];
+
+      const activeGroups = group.activeGroups;
+      for (const folder of activeGroups) {
+        folder.activeTabs = folder.activeTabs.filter((tab) => tab !== tabToUnload);
+
+        if (folder.activeTabs.length === 0) {
+          animations.push(async () => {
+            folder.removeAttribute('has-active');
+            const groupItems = this.#normalizeGroupItems(folder.allItems);
+            const tabsContainer = folder.querySelector('.tab-group-container');
+
+            this.styleCleanup(groupItems);
+
+            const groupStart = folder.querySelector('.zen-tab-group-start');
+
+            // Trigger a reflow
+            tabsContainer.offsetHeight;
+            tabsContainer.setAttribute('hidden', true);
+
+            const heightUntilSelected = this.#calculateHeightShift(tabsContainer, []);
+
+            // Collect animations for this specific folder becoming inactive
+            const folderAnimation = [
+              ...this.updateFolderIcon(folder, 'close', false),
+              ...this.#createAnimation(
+                groupStart,
+                {
+                  marginTop: -(heightUntilSelected + 4),
+                },
+                { duration: 0.12, ease: 'easeInOut' }
+              ),
+            ];
+            await Promise.all(folderAnimation);
+          });
+        }
+      }
+
+      tabToUnload.removeAttribute('folder-active');
+      if (isSplitView) {
+        tabToUnload = tabToUnload.group;
+      }
+
+      tabToUnload.style.removeProperty('--zen-folder-indent');
+
+      let tabUnloadAnimations = [];
+      if (!ungroup) {
+        tabUnloadAnimations = this.#createAnimation(
+          tabToUnload,
+          {
+            opacity: 0,
+            height: 0,
+          },
+          {
+            duration: 0.12,
+            ease: 'easeInOut',
+          }
+        );
+      }
+
+      // Manage global animation count
+      this.#animationCount += 1;
+
+      // Await the tab unload animation first
+      await Promise.all(tabUnloadAnimations);
+      await Promise.all(animations.map((item) => (typeof item === 'function' ? item() : item)));
+      this.#animationCount -= 1;
+      gBrowser.tabContainer._invalidateCachedTabs();
+    }
+
+    async animateSelect(group) {
+      if (!group?.isZenFolder) return;
+
+      this.cancelPopupTimer();
+
+      const animations = [];
+      const selectedTabs = [];
+      const splitViewIds = new Set();
+      const itemsToHide = [];
+
+      const groupItems = this.#collectGroupItems(group, {
+        selectedTabs,
+        splitViewIds,
+      });
+
+      for (const tab of selectedTabs) {
+        let currentGroup = tab?.group?.hasAttribute('split-view-group')
+          ? tab.group.group
+          : tab?.group;
+        while (currentGroup) {
+          const activeTabs = selectedTabs.filter((t) => currentGroup.tabs.includes(t));
+          if (activeTabs.length) {
+            if (currentGroup.collapsed) {
+              if (currentGroup.hasAttribute('has-active')) {
+                // It is important to keep the sequence of elements as in the DOM
+                currentGroup.activeTabs = [
+                  ...new Set([...currentGroup.activeTabs, ...activeTabs]),
+                ].sort((a, b) => a._tPos > b._tPos);
+              } else {
+                currentGroup.setAttribute('has-active', 'true');
+                currentGroup.activeTabs = activeTabs;
+              }
+
+              const tabsContainer = currentGroup.querySelector('.tab-group-container');
+              const groupStart = currentGroup.querySelector('.zen-tab-group-start');
+              tabsContainer.style.overflow = 'clip';
+
+              if (tabsContainer.hasAttribute('hidden')) tabsContainer.removeAttribute('hidden');
+
+              const afterMarginTop = () => {
+                tabsContainer.style.overflow = '';
+              };
+
+              animations.push(
+                ...this.updateFolderIcon(currentGroup, 'close', false),
+                ...this.#createAnimation(
+                  groupStart,
+                  {
+                    marginTop: 0,
+                  },
+                  { duration: 0.12, ease: 'easeInOut' },
+                  afterMarginTop
+                )
+              );
+              for (const tab of activeTabs) {
+                this.setFolderIndentation(
+                  [tab],
+                  currentGroup,
+                  /* for collapse = */ true,
+                  /* animate = */ false
+                );
+              }
+            }
+          }
+          currentGroup = currentGroup.group;
+        }
+      }
+
+      const itemsToShow = [];
+      if (selectedTabs.length) {
+        for (let i = 0; i < groupItems.length; i++) {
+          const { item, splitViewId } = groupItems[i];
+
+          itemsToShow.push(item);
+
+          // Skip selected items
+          if (selectedTabs.includes(item)) continue;
+
+          // Skip items from selected split-view groups
+          if (splitViewId && splitViewIds.has(splitViewId)) continue;
+
+          if (!item.hasAttribute?.('folder-active')) {
+            if (!itemsToHide.includes(item)) itemsToHide.push(item);
+          }
+        }
+      }
+
+      // FIXME: This is a hack to fix the animations not working properly
+      this.styleCleanup(itemsToShow);
+      itemsToHide.forEach((item) => {
+        item.style.opacity = 0;
+        item.style.height = 0;
+      });
+
+      animations.push(
+        ...this.#createAnimation(
+          itemsToShow,
+          {
+            opacity: '',
+            height: '',
+          },
+          {
+            duration: 0.12,
+            ease: 'easeInOut',
+          }
+        ),
+        ...this.#createAnimation(
+          itemsToHide,
+          {
+            opacity: 0,
+            height: 0,
+          },
+          {
+            duration: 0.12,
+            ease: 'easeInOut',
+          }
+        )
+      );
+
+      this.#animationCount += 1;
+      await Promise.all(animations);
+      this.#animationCount -= 1;
+      if (this.#animationCount) {
+        return;
+      }
+
+      // Cleanup
+      this.styleCleanup(itemsToHide);
+      this.styleCleanup(selectedTabs);
+    }
+
+    animateGroupMove(group, expand = false) {
+      if (!group?.isZenFolder) return;
+      const groupStart = group.querySelector('.zen-tab-group-start');
+      const tabsContainer = group.querySelector('.tab-group-container');
+      const heightContainer = expand ? 0 : this.#calculateHeightShift(tabsContainer, []);
+      tabsContainer.style.overflow = expand ? '' : 'clip';
+
+      this.#createAnimation(
+        groupStart,
+        {
+          marginTop: expand ? 0 : -(heightContainer + 4),
+        },
+        { duration: 0.12, ease: 'easeInOut' }
+      );
+    }
+
+    styleCleanup(items) {
+      items.forEach((item) => {
+        item.style.removeProperty('opacity');
+        item.style.removeProperty('height');
+      });
+    }
   }
 
   window.gZenFolders = new nsZenFolders();
diff --git a/src/zen/folders/zen-folders.css b/src/zen/folders/zen-folders.css
index d841303f1..6d4618795 100644
--- a/src/zen/folders/zen-folders.css
+++ b/src/zen/folders/zen-folders.css
@@ -207,7 +207,7 @@ zen-folder {
       display: flex;
     }
 
-    & > .tab-group-container {
+    &:not([has-active]) > .tab-group-container {
       overflow-y: clip;
     }
   }
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index a33df17d0..a9dd070ee 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -639,7 +639,7 @@
     async _onTabClick(e) {
       const tab = e.target?.closest('tab');
       if (e.button === 1 && tab) {
-        await this._onCloseTabShortcut(e, tab, {
+        await this.onCloseTabShortcut(e, tab, {
           closeIfPending: Services.prefs.getBoolPref(
             'zen.pinned-tab-manager.wheel-close-if-pending'
           ),
@@ -769,7 +769,7 @@
       let cmdClose = document.getElementById('cmd_close');
 
       if (cmdClose) {
-        cmdClose.addEventListener('command', this._onCloseTabShortcut.bind(this));
+        cmdClose.addEventListener('command', this.onCloseTabShortcut.bind(this));
       }
     }
 
@@ -788,20 +788,38 @@
       await ZenPinnedTabsStorage.savePin(pin, notifyObservers);
     }
 
-    async _onCloseTabShortcut(
+    async onCloseTabShortcut(
       event,
       selectedTab = gBrowser.selectedTab,
       {
         behavior = lazy.zenPinnedTabCloseShortcutBehavior,
         noClose = false,
         closeIfPending = false,
+        alwaysUnload = false,
+        folderToUnload = null,
       } = {}
     ) {
       try {
-        if (!selectedTab?.pinned) {
+        const tabs = Array.isArray(selectedTab) ? selectedTab : [selectedTab];
+        const pinnedTabs = [
+          ...new Set(
+            tabs
+              .flatMap((tab) => {
+                if (tab.group?.hasAttribute('split-view-group')) {
+                  return tab.group.tabs;
+                }
+                return tab;
+              })
+              .filter((tab) => tab?.pinned)
+          ),
+        ];
+
+        if (!pinnedTabs.length) {
           return;
         }
 
+        const selectedTabs = pinnedTabs.filter((tab) => tab.selected);
+
         event.stopPropagation();
         event.preventDefault();
 
@@ -809,66 +827,82 @@
           behavior = 'unload-switch';
         }
 
+        if (alwaysUnload && ['close', 'reset', 'switch', 'reset-switch'].includes(behavior)) {
+          behavior = behavior.contains('reset') ? 'reset-unload-switch' : 'unload-switch';
+        }
+
         switch (behavior) {
-          case 'close':
-            this._removePinnedAttributes(selectedTab, true);
-            gBrowser.removeTab(selectedTab, { animate: true });
+          case 'close': {
+            for (const tab of pinnedTabs) {
+              this._removePinnedAttributes(tab, true);
+              gBrowser.removeTab(tab, { animate: true });
+            }
             break;
+          }
           case 'reset-unload-switch':
           case 'unload-switch':
           case 'reset-switch':
           case 'switch':
             if (behavior.includes('unload')) {
-              if (selectedTab.hasAttribute('glance-id')) {
-                // We have a glance tab inside the tab we are trying to unload,
-                // before we used to just ignore it but now we need to fully close
-                // it as well.
-                gZenGlanceManager.manageTabClose(selectedTab.glanceTab);
-                await new Promise((resolve) => {
-                  let hasRan = false;
-                  const onGlanceClose = () => {
-                    hasRan = true;
-                    resolve();
-                  };
-                  window.addEventListener('GlanceClose', onGlanceClose, { once: true });
-                  // Set a timeout to resolve the promise if the event doesn't fire.
-                  // We do this to prevent any future issues where glance woudnt close such as
-                  // glance requering to ask for permit unload.
-                  setTimeout(() => {
-                    if (!hasRan) {
-                      console.warn('GlanceClose event did not fire within 3 seconds');
+              for (const tab of pinnedTabs) {
+                if (tab.hasAttribute('glance-id')) {
+                  // We have a glance tab inside the tab we are trying to unload,
+                  // before we used to just ignore it but now we need to fully close
+                  // it as well.
+                  gZenGlanceManager.manageTabClose(tab.glanceTab);
+                  await new Promise((resolve) => {
+                    let hasRan = false;
+                    const onGlanceClose = () => {
+                      hasRan = true;
                       resolve();
-                    }
-                  }, 3000);
-                });
+                    };
+                    window.addEventListener('GlanceClose', onGlanceClose, { once: true });
+                    // Set a timeout to resolve the promise if the event doesn't fire.
+                    // We do this to prevent any future issues where glance woudnt close such as
+                    // glance requering to ask for permit unload.
+                    setTimeout(() => {
+                      if (!hasRan) {
+                        console.warn('GlanceClose event did not fire within 3 seconds');
+                        resolve();
+                      }
+                    }, 3000);
+                  });
+                }
+                const isSpltView = tab.group?.hasAttribute('split-view-group');
+                const group = isSpltView ? tab.group.group : tab.group;
+                if (!folderToUnload && tab.hasAttribute('folder-active')) {
+                  await gZenFolders.animateUnload(group, tab);
+                }
               }
-              await gZenFolders.collapseVisibleTab(
-                selectedTab.group,
-                /* only if active */ true,
-                selectedTab
-              );
-              let tabsToUnload = [selectedTab];
-              if (selectedTab.group?.hasAttribute('split-view-group')) {
-                tabsToUnload = selectedTab.group.tabs;
+              if (folderToUnload) {
+                await gZenFolders.animateUnloadAll(folderToUnload);
               }
-              const allAreUnloaded = tabsToUnload.every(
+              const allAreUnloaded = pinnedTabs.every(
                 (tab) => tab.hasAttribute('pending') && !tab.hasAttribute('zen-essential')
               );
-              if (allAreUnloaded && closeIfPending) {
-                return await this._onCloseTabShortcut(event, selectedTab, { behavior: 'close' });
+              for (const tab of pinnedTabs) {
+                if (allAreUnloaded && closeIfPending) {
+                  return await this._onCloseTabShortcut(event, tab, { behavior: 'close' });
+                }
+              }
+              await gBrowser.explicitUnloadTabs(pinnedTabs);
+              for (const tab of pinnedTabs) {
+                tab.removeAttribute('discarded');
               }
-              await gBrowser.explicitUnloadTabs(tabsToUnload);
-              selectedTab.removeAttribute('discarded');
             }
-            if (selectedTab.selected) {
-              this._handleTabSwitch(selectedTab);
+            if (selectedTabs.length) {
+              this._handleTabSwitch(selectedTabs[0]);
             }
             if (behavior.includes('reset')) {
-              this._resetTabToStoredState(selectedTab);
+              for (const tab of pinnedTabs) {
+                this._resetTabToStoredState(tab);
+              }
             }
             break;
           case 'reset':
-            this._resetTabToStoredState(selectedTab);
+            for (const tab of pinnedTabs) {
+              this._resetTabToStoredState(tab);
+            }
             break;
           default:
             return;
@@ -1279,7 +1313,7 @@
           let isVisible = true;
           let parent = item.group;
           while (parent) {
-            if (parent.collapsed && !parent.hasAttribute('has-active')) {
+            if (!parent.visible) {
               isVisible = false;
               break;
             }

From 0ee942db25ed06231eb9a6f685130681b0364749 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 12 Oct 2025 12:04:52 +0200
Subject: [PATCH 070/111] feat: Use close icon for pinned reset if the
 preference says so, p=#10786, c=no-component

---
 package-lock.json                             | 37 ++++++-------------
 package.json                                  |  2 +-
 src/browser/themes/shared/zen-icons/icons.css | 13 ++++---
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed842dd11..1363a1b2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-json": "^4.0.1",
         "eslint-plugin-react-hooks": "^5.2.0",
-        "formal-git": "^1.1.5",
+        "formal-git": "^1.2.6",
         "globals": "^16.3.0",
         "husky": "^9.1.7",
         "lint-staged": "^15.3.0",
@@ -35,7 +35,6 @@
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -65,7 +64,6 @@
       "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -108,7 +106,6 @@
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -149,7 +146,6 @@
       "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.26.8",
         "@babel/helper-validator-option": "^7.25.9",
@@ -167,7 +163,6 @@
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -341,7 +336,6 @@
       "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/template": "^7.27.0",
         "@babel/types": "^7.27.0"
@@ -1173,6 +1167,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1846,8 +1841,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "CC-BY-4.0",
-      "peer": true
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
       "version": "4.1.2",
@@ -2034,8 +2028,7 @@
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/core-js-pure": {
       "version": "3.41.0",
@@ -2355,8 +2348,7 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.139.tgz",
       "integrity": "sha512-GGnRYOTdN5LYpwbIr0rwP/ZHOQSvAF6TG0LSzp28uCBb9JiXHJGmaaKw29qjNJc5bGnnp6kXJqRnGMQoELwi5w==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
@@ -2592,7 +2584,6 @@
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -2616,6 +2607,7 @@
       "integrity": "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3387,9 +3379,9 @@
       }
     },
     "node_modules/formal-git": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/formal-git/-/formal-git-1.1.5.tgz",
-      "integrity": "sha512-cSPoV0+/LFdUsE+fCGxCOK/eJNZeWj5c+6IxB3PP3QkeWIgdQFgw+RObnnpG/0KOsXy8mFrsD6tkEHbGjNGMpQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/formal-git/-/formal-git-1.2.6.tgz",
+      "integrity": "sha512-/sCZIEpGP5sGx1r8zJStXHmuZQxTdnyB5Mrq7I2BZhAMEP6TOvqopP0uzYCLjWhE2Z4QrFcxeTzsyHAENZaCzQ==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -3463,7 +3455,6 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -4461,7 +4452,6 @@
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -4896,7 +4886,6 @@
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -5111,8 +5100,7 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
       "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -5568,6 +5556,7 @@
       "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -6982,7 +6971,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "escalade": "^3.2.0",
         "picocolors": "^1.1.1"
@@ -7264,8 +7252,7 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/yaml": {
       "version": "2.7.0",
diff --git a/package.json b/package.json
index 4d980483e..dc2a51e85 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-json": "^4.0.1",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "formal-git": "^1.1.5",
+    "formal-git": "^1.2.6",
     "globals": "^16.3.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.3.0",
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 5068b5558..526528f8e 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -40,15 +40,18 @@
   list-style-image: url('trash.svg');
 }
 
-.reset-icon {
-  list-style-image: url('reload.svg') !important;
-}
-
-.tab-reset-button,
 #PanelUI-zen-gradient-generator-color-remove {
   list-style-image: url('unpin.svg') !important;
 }
 
+.tab-reset-button {
+  list-style-image: url('unpin.svg');
+
+  @media (-moz-pref('zen.pinned-tab-manager.close-shortcut-behavior', 'close')) {
+    list-style-image: url('close.svg');
+  }
+}
+
 #sidebar-button {
   list-style-image: url('sidebars-right.svg') !important;
 }

From 125ef4bead7f38790c068761693a88705f078f9a Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 12 Oct 2025 14:34:52 +0200
Subject: [PATCH 071/111] feat: Improve glance animation, p=#10790, c=glance

---
 package-lock.json                             |  8 ++---
 package.json                                  |  2 +-
 src/browser/themes/shared/zen-icons/icons.css |  9 ++++-
 src/zen/common/ZenUIManager.mjs               |  2 ++
 src/zen/common/styles/zen-popup.css           |  4 ---
 .../common/styles/zen-single-components.css   | 35 ++++++++++++++-----
 src/zen/glance/ZenGlanceManager.mjs           | 29 ++++++---------
 src/zen/glance/zen-glance.css                 |  2 +-
 8 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1363a1b2d..b3752f1f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-json": "^4.0.1",
         "eslint-plugin-react-hooks": "^5.2.0",
-        "formal-git": "^1.2.6",
+        "formal-git": "^1.2.8",
         "globals": "^16.3.0",
         "husky": "^9.1.7",
         "lint-staged": "^15.3.0",
@@ -3379,9 +3379,9 @@
       }
     },
     "node_modules/formal-git": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/formal-git/-/formal-git-1.2.6.tgz",
-      "integrity": "sha512-/sCZIEpGP5sGx1r8zJStXHmuZQxTdnyB5Mrq7I2BZhAMEP6TOvqopP0uzYCLjWhE2Z4QrFcxeTzsyHAENZaCzQ==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/formal-git/-/formal-git-1.2.8.tgz",
+      "integrity": "sha512-ZGJbnKs4ANaxq3Dr3znRwZTdxP+F1AfEzkiEjCGBIf31xDcJ8StLWPI87/H/8KY801NWw9dc6qoraZzTSH5IyA==",
       "dev": true,
       "license": "ISC",
       "bin": {
diff --git a/package.json b/package.json
index dc2a51e85..b3178bb9c 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-json": "^4.0.1",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "formal-git": "^1.2.6",
+    "formal-git": "^1.2.8",
     "globals": "^16.3.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.3.0",
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 526528f8e..e5e2aa640 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -105,6 +105,14 @@
 
 #nav-bar-overflow-button {
   list-style-image: url('chevron.svg') !important;
+
+  /* On macos, we don't display the app menu, meaning
+   * we can re-use the menu icon for the overflow button.
+   * Which is more intuitive for users and looks better.
+   */
+  @media (-moz-platform: macos) {
+    list-style-image: url('menu.svg') !important;
+  }
 }
 
 #zen-rice-share-options .options-header,
@@ -411,7 +419,6 @@
   list-style-image: url('arrow-left.svg') !important;
 }
 
-#overflowMenu-customize-button,
 #appmenu-moreTools-button {
   list-style-image: url('customize.svg') !important;
 }
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index bc8922b53..509e0aeaf 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -58,6 +58,8 @@ var gZenUIManager = {
       this.onUrlbarSearchModeChanged.bind(this)
     );
 
+    document.getElementById('stop-reload-button').removeAttribute('overflows');
+
     gZenMediaController.init();
     gZenVerticalTabsManager.init();
 
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index 31058262f..1b36ad5a3 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -176,10 +176,6 @@ panel {
   opacity: 0.7;
 }
 
-#widget-overflow-mainView .panel-subview-body {
-  padding-bottom: 0;
-}
-
 .PanelUI-subView > .panel-header + toolbarseparator {
   margin-bottom: 0;
 }
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 95ca519d0..26ebd8e1f 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -171,15 +171,10 @@ body > #confetti {
 }
 
 .toolbarbutton-1:not(#tabs-newtab-button) {
-  :root:is([zen-single-toolbar='true'], :not([zen-sidebar-expanded='true']))
-    #zen-sidebar-top-buttons-customization-target
-    &,
-  #zen-sidebar-foot-buttons & {
-    --tab-border-radius: 6px;
-    --toolbarbutton-border-radius: var(--tab-border-radius);
-    --toolbarbutton-inner-padding: 7px;
-    --toolbarbutton-outer-padding: 2px;
-  }
+  --tab-border-radius: 6px;
+  --toolbarbutton-border-radius: var(--tab-border-radius);
+  --toolbarbutton-inner-padding: 7px;
+  --toolbarbutton-outer-padding: 2px;
 
   transition:
     background-color 0.1s,
@@ -534,3 +529,25 @@ body > #confetti {
     }
   }
 }
+
+/* Overflow panel */
+#widget-overflow-mainView {
+  --menu-panel-width-wide: 200px;
+
+  & toolbarbutton {
+    scale: 1 !important;
+  }
+
+  & .panel-subview-body {
+    padding: var(--panel-subview-body-padding) !important;
+  }
+}
+
+#widget-overflow-mainView > toolbarseparator,
+#overflowMenu-customize-button {
+  display: none;
+}
+
+#widget-overflow-list {
+  flex-direction: column-reverse;
+}
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 157efd694..f9d33f50f 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -383,8 +383,9 @@
       const imageDataElement = document.createXULElement('image');
       imageDataElement.setAttribute('src', data.elementData);
       imageDataElement.classList.add('zen-glance-element-preview');
-      imageDataElement.style.width = `${data.width}px`;
-      imageDataElement.style.height = `${data.height}px`;
+
+      // set an aspect ratio to prevent stretching during animation
+      imageDataElement.style.aspectRatio = `${data.width} / ${data.height}`;
 
       this.browserWrapper.prepend(imageDataElement);
       this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
@@ -392,7 +393,7 @@
       gZenUIManager.motion.animate(
         imageDataElement,
         {
-          scale: [1, 3],
+          opacity: [1, 0],
         },
         {
           duration: 0.3,
@@ -572,12 +573,12 @@
       }
 
       let scale = 1;
-      const bounceSteps = 40;
+      const bounceSteps = 50;
       if (direction === 'opening') {
         for (let i = 0; i < bounceSteps; i++) {
           const progress = i / bounceSteps;
           // Scale up slightly then back to normal
-          scale = 1 + 0.006 * Math.sin(progress * Math.PI);
+          scale = 1 + 0.004 * Math.sin(progress * Math.PI);
           // If we are at the last step, ensure scale is exactly 1
           if (i === bounceSteps - 1) {
             scale = 1;
@@ -910,21 +911,11 @@
         const imageDataElement = document.createXULElement('image');
         imageDataElement.setAttribute('src', elementImageData);
         imageDataElement.classList.add('zen-glance-element-preview');
-        imageDataElement.style.width = rect.width;
-        imageDataElement.style.height = rect.height;
-        this.browserWrapper.prepend(imageDataElement);
 
-        gZenUIManager.motion.animate(
-          imageDataElement,
-          {
-            scale: [3, 1],
-          },
-          {
-            duration: 0.3,
-            easing: 'easeInOut',
-            bounce: 0,
-          }
-        );
+        // set an aspect ratio to prevent stretching during animation
+        imageDataElement.style.aspectRatio = `${parseFloat(rect.width)} / ${parseFloat(rect.height)}`;
+
+        this.browserWrapper.prepend(imageDataElement);
       }
     }
 
diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css
index 819d4c6bf..b35e16758 100644
--- a/src/zen/glance/zen-glance.css
+++ b/src/zen/glance/zen-glance.css
@@ -176,5 +176,5 @@
   border-radius: var(--zen-native-inner-radius);
   inset: 50%;
   translate: -50% -50%;
-  will-change: transform;
+  will-change: transform, opacity;
 }

From fb40660650633edb80b9dc4dc70c5fed75c84031 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 13 Oct 2025 00:52:43 +0200
Subject: [PATCH 072/111] feat: Add less opacity to the glance background,
 b=no-bug, c=common, glance

---
 src/zen/common/styles/zen-panel-ui.css | 1 -
 src/zen/glance/ZenGlanceManager.mjs    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/zen/common/styles/zen-panel-ui.css b/src/zen/common/styles/zen-panel-ui.css
index b683f8e8f..5badd839e 100644
--- a/src/zen/common/styles/zen-panel-ui.css
+++ b/src/zen/common/styles/zen-panel-ui.css
@@ -51,7 +51,6 @@ panel[type='arrow']:not(#feature-callout) {
   }
 
   @media (-moz-platform: macos) {
-    border: 0px transparent !important;
     appearance: auto !important;
     -moz-default-appearance: menupopup;
     /* We set the default background here, rather than on ::part(content),
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index f9d33f50f..fd7eac8b0 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -328,7 +328,7 @@
         parentSidebarContainer,
         {
           scale: [1, 0.98],
-          opacity: [1, 0.6],
+          opacity: [1, 0.5],
         },
         {
           duration: 0.3,
@@ -836,7 +836,7 @@
           browserSidebarContainer,
           {
             scale: [0.98, 1],
-            opacity: [0.6, 1],
+            opacity: [0.5, 1],
           },
           {
             duration: 0.3,

From f9d1f18ad150f10e3af4d829b18624307fd69f4d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 13 Oct 2025 01:06:13 +0200
Subject: [PATCH 073/111] fix: Fix hover color for essentials on dark mode,
 b=no-bug, c=common, tabs

---
 package-lock.json                       | 29 ++++++++++++++++++-------
 src/zen/common/styles/zen-popup.css     |  2 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css |  7 ++++--
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b3752f1f1..9a71660c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,6 +35,7 @@
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -64,6 +65,7 @@
       "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -106,6 +108,7 @@
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -146,6 +149,7 @@
       "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.26.8",
         "@babel/helper-validator-option": "^7.25.9",
@@ -163,6 +167,7 @@
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -336,6 +341,7 @@
       "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/template": "^7.27.0",
         "@babel/types": "^7.27.0"
@@ -1167,7 +1173,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1841,7 +1846,8 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "CC-BY-4.0"
+      "license": "CC-BY-4.0",
+      "peer": true
     },
     "node_modules/chalk": {
       "version": "4.1.2",
@@ -2028,7 +2034,8 @@
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/core-js-pure": {
       "version": "3.41.0",
@@ -2348,7 +2355,8 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.139.tgz",
       "integrity": "sha512-GGnRYOTdN5LYpwbIr0rwP/ZHOQSvAF6TG0LSzp28uCBb9JiXHJGmaaKw29qjNJc5bGnnp6kXJqRnGMQoELwi5w==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
@@ -2584,6 +2592,7 @@
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -2607,7 +2616,6 @@
       "integrity": "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3455,6 +3463,7 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -4452,6 +4461,7 @@
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -4886,6 +4896,7 @@
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -5100,7 +5111,8 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
       "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -5556,7 +5568,6 @@
       "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -6971,6 +6982,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "escalade": "^3.2.0",
         "picocolors": "^1.1.1"
@@ -7252,7 +7264,8 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/yaml": {
       "version": "2.7.0",
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index 1b36ad5a3..a6dee2776 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -359,7 +359,7 @@ menuseparator {
       color-mix(in srgb, var(--zen-primary-color) 85%, #0f0f0f 15%)
     );
     box-shadow: 0 0 14px 3px rgba(0, 0, 0, 0.05);
-    border: 1px solid rgba(0, 0, 0, 0.2);
+    border: none;
     display: flex;
     font-weight: 600;
     align-items: center;
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 296a269ca..40585a8ca 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -1152,7 +1152,7 @@
       &::before {
         background: light-dark(
           rgba(255, 255, 255, 0.85),
-          color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 50%)
+          color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 40%)
         );
         margin: var(--zen-essential-bg-margin);
         border-radius: calc(var(--border-radius-medium) - var(--zen-essential-bg-margin));
@@ -1165,7 +1165,10 @@
     }
 
     &[visuallyselected]:hover .tab-background::before {
-      background: light-dark(rgba(255, 255, 255, 0.8), rgba(68, 64, 64, 0.75));
+      background: light-dark(
+        rgba(255, 255, 255, 0.8),
+        color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 50%)
+      );
     }
   }
 }

From c2d6ce83c052b2da53b6f825c013927bc6168d8e Mon Sep 17 00:00:00 2001
From: octaviusz <50177704+octaviusz@users.noreply.github.com>
Date: Mon, 13 Oct 2025 02:08:08 +0300
Subject: [PATCH 074/111] fix: Correct styling and cleanup after folder unload
 animation, p=#10795, c=folders

* fix: Correct styling and cleanup after folder unload animation

* fix: Formatting

* fix: Add overflow:clip when animateGroupMove

* fix: Don't reset groupLabel height after drag and drop

* fix: When unloading, don't hide the last tab
---
 .../tabbrowser/content/tabs-js.patch          | 16 +++---
 src/zen/folders/ZenFolders.mjs                | 57 ++++++++++++-------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index c1c09ac70..ec1bebfc1 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e52915a44c9b1 100644
+index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78bec02d253a 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -44,6 +44,9 @@
@@ -600,7 +600,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e5291
  
        for (let item of this.ariaFocusableItems) {
          this.#resetGroupTarget(item);
-@@ -3440,7 +3524,7 @@
+@@ -3440,17 +3524,16 @@
          tab.style.left = "";
          tab.style.top = "";
          tab.style.maxWidth = "";
@@ -609,7 +609,9 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e5291
        }
        for (let label of draggedTabDocument.getElementsByClassName(
          "tab-group-label-container"
-@@ -3450,7 +3534,7 @@
+       )) {
+         label.style.width = "";
+-        label.style.height = "";
          label.style.left = "";
          label.style.top = "";
          label.style.maxWidth = "";
@@ -618,7 +620,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e5291
        }
        let periphery = draggedTabDocument.getElementById(
          "tabbrowser-arrowscrollbox-periphery"
-@@ -3522,7 +3606,7 @@
+@@ -3522,7 +3605,7 @@
          let postTransitionCleanup = () => {
            movingTab._moveTogetherSelectedTabsData.animate = false;
          };
@@ -627,7 +629,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e5291
            postTransitionCleanup();
          } else {
            let onTransitionEnd = transitionendEvent => {
-@@ -3686,7 +3770,7 @@
+@@ -3686,7 +3769,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -636,7 +638,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e5291
          return;
        }
  
-@@ -3795,7 +3879,10 @@
+@@ -3795,7 +3878,10 @@
      #getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
@@ -648,7 +650,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e5291
            break;
          }
          target = target.parentNode;
-@@ -3812,6 +3899,9 @@
+@@ -3812,6 +3898,9 @@
            return null;
          }
        }
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index b04c2a787..ec10042b6 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1272,7 +1272,7 @@
         splitViewIds,
         activeFoldersIds,
       });
-      const heightUntilSelected = this.#calculateHeightShift(tabsContainer, selectedTabs);
+      const collapsedHeight = this.#calculateHeightShift(tabsContainer, selectedTabs);
 
       if (selectedTabs.length) {
         for (let i = 0; i < groupItems.length; i++) {
@@ -1316,7 +1316,7 @@
         ...this.#createAnimation(
           groupStart,
           {
-            marginTop: -(heightUntilSelected + 4 * (selectedTabs.length === 0 ? 1 : 0)),
+            marginTop: -(collapsedHeight + 4 * (selectedTabs.length === 0 ? 1 : 0)),
           },
           { duration: 0.12, ease: 'easeInOut' }
         )
@@ -1463,14 +1463,20 @@
         const groupItems = this.#normalizeGroupItems(folder.allItems);
         const tabsContainer = folder.querySelector('.tab-group-container');
 
-        this.styleCleanup(groupItems);
+        // Set correct margin-top after animation
+        const afterAnimate = () => {
+          groupStart.style.removeProperty('margin-top');
+          this.styleCleanup(groupItems);
+          // Trigger the recalculation so that zen returns
+          // the correct container size in the DOM
+          tabsContainer.offsetHeight;
+          tabsContainer.setAttribute('hidden', true);
+          const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
+          groupStart.style.marginTop = `${-(collapsedHeight + 4)}px`;
+        };
 
         const groupStart = folder.querySelector('.zen-tab-group-start');
-
-        // Trigger a reflow
-        tabsContainer.offsetHeight;
-
-        const heightUntilSelected = this.#calculateHeightShift(tabsContainer, []);
+        const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
 
         // Collect animations for this specific folder becoming inactive
         animations.push(
@@ -1478,9 +1484,10 @@
           ...this.#createAnimation(
             groupStart,
             {
-              marginTop: -(heightUntilSelected + 4),
+              marginTop: -(collapsedHeight + 4),
             },
-            { duration: 0.12, ease: 'easeInOut' }
+            { duration: 0.12, ease: 'easeInOut' },
+            afterAnimate
           )
         );
       }
@@ -1496,26 +1503,33 @@
       if ((!group?.isZenFolder || !isSplitView) && !tabToUnload.hasAttribute('folder-active'))
         return;
       const animations = [];
+      let lastTab = false;
 
       const activeGroups = group.activeGroups;
       for (const folder of activeGroups) {
         folder.activeTabs = folder.activeTabs.filter((tab) => tab !== tabToUnload);
 
         if (folder.activeTabs.length === 0) {
+          lastTab = true;
           animations.push(async () => {
             folder.removeAttribute('has-active');
             const groupItems = this.#normalizeGroupItems(folder.allItems);
             const tabsContainer = folder.querySelector('.tab-group-container');
 
-            this.styleCleanup(groupItems);
+            // Set correct margin-top after animation
+            const afterAnimate = () => {
+              groupStart.style.removeProperty('margin-top');
+              this.styleCleanup(groupItems);
+              // Trigger the recalculation so that zen returns
+              // the correct container size in the DOM
+              tabsContainer.offsetHeight;
+              tabsContainer.setAttribute('hidden', true);
+              const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
+              groupStart.style.marginTop = `${-(collapsedHeight + 4)}px`;
+            };
 
             const groupStart = folder.querySelector('.zen-tab-group-start');
-
-            // Trigger a reflow
-            tabsContainer.offsetHeight;
-            tabsContainer.setAttribute('hidden', true);
-
-            const heightUntilSelected = this.#calculateHeightShift(tabsContainer, []);
+            const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
 
             // Collect animations for this specific folder becoming inactive
             const folderAnimation = [
@@ -1523,9 +1537,10 @@
               ...this.#createAnimation(
                 groupStart,
                 {
-                  marginTop: -(heightUntilSelected + 4),
+                  marginTop: -(collapsedHeight + 4),
                 },
-                { duration: 0.12, ease: 'easeInOut' }
+                { duration: 0.12, ease: 'easeInOut' },
+                afterAnimate
               ),
             ];
             await Promise.all(folderAnimation);
@@ -1541,7 +1556,7 @@
       tabToUnload.style.removeProperty('--zen-folder-indent');
 
       let tabUnloadAnimations = [];
-      if (!ungroup) {
+      if (!ungroup && !lastTab) {
         tabUnloadAnimations = this.#createAnimation(
           tabToUnload,
           {
@@ -1701,7 +1716,7 @@
       const groupStart = group.querySelector('.zen-tab-group-start');
       const tabsContainer = group.querySelector('.tab-group-container');
       const heightContainer = expand ? 0 : this.#calculateHeightShift(tabsContainer, []);
-      tabsContainer.style.overflow = expand ? '' : 'clip';
+      tabsContainer.style.overflow = 'clip';
 
       this.#createAnimation(
         groupStart,

From 3c014999d8a82921280dd15a1e96ccce1e6cd84b Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 00:25:13 +0200
Subject: [PATCH 075/111] feat: Added copy url button and small tweaks,
 b=no-bug, c=common, compact-mode, folders, glance

---
 locales/en-US/browser/browser/zen-general.ftl |  3 +
 .../urlbar/UrlbarInput-sys-mjs.patch          | 16 ++--
 src/browser/themes/shared/zen-icons/icons.css |  4 +
 src/zen/common/ZenUIManager.mjs               |  3 +
 src/zen/common/styles/zen-animations.css      | 29 ------
 src/zen/common/styles/zen-omnibox.css         |  7 +-
 src/zen/common/styles/zen-panel-ui.css        |  6 --
 src/zen/common/styles/zen-popup.css           |  8 +-
 .../common/styles/zen-single-components.css   |  6 +-
 src/zen/common/styles/zen-theme.css           |  2 +-
 src/zen/compact-mode/sidebar.inc.css          |  1 +
 .../downloads/zen-download-arc-animation.css  |  2 +-
 .../downloads/zen-download-box-animation.css  |  2 +-
 src/zen/folders/zen-folders.css               |  8 +-
 src/zen/glance/ZenGlanceManager.mjs           | 88 +++++++++++++++----
 src/zen/glance/actors/ZenGlanceParent.sys.mjs | 35 +-------
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       | 48 +++++++++-
 17 files changed, 158 insertions(+), 110 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 37a35a77b..3cf66bfa5 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -90,6 +90,9 @@ zen-site-data-get-addons =
 zen-site-data-site-settings =
     .label = All Site Settings
 
+zen-urlbar-copy-url-button =
+  .tooltiptext = Copy URL
+
 zen-site-data-setting-site-protection = Site Protection
 
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 5388f07bc..944fd80e1 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..77955d888e70409c83b217e676e1575417018831 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2b69f0cf7 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -157,14 +157,14 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..77955d888e70409c83b217e676e15754
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3407,6 +3475,7 @@ export class UrlbarInput {
-       );
-     }
- 
+@@ -3501,6 +3569,7 @@ export class UrlbarInput {
+     resultDetails = null,
+     browser = this.window.gBrowser.selectedBrowser
+   ) {
 +    openUILinkWhere = this.window.gZenUIManager.getOpenUILinkWhere(url, browser, openUILinkWhere);
-     // No point in setting these because we'll handleRevert() a few rows below.
-     if (openUILinkWhere == "current") {
-       // Make sure URL is formatted properly (don't show punycode).
+     if (this.isAddressbar) {
+       this.#prepareAddressbarLoad(
+         url,
 @@ -3608,6 +3677,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index e5e2aa640..93ecaabdd 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -944,3 +944,7 @@
     display: none;
   }
 }
+
+#zen-copy-url-button image {
+  list-style-image: url('link.svg');
+}
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 509e0aeaf..b19b39f7c 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -527,6 +527,9 @@ var gZenUIManager = {
     this._toastContainer.removeAttribute('hidden');
     this._toastContainer.appendChild(toast);
     const timeoutFunction = () => {
+      if (Services.prefs.getBoolPref('ui.popup.disable_autohide')) {
+        return;
+      }
       this.motion
         .animate(toast, { opacity: [1, 0], scale: [1, 0.5] }, { duration: 0.2, bounce: 0 })
         .then(() => {
diff --git a/src/zen/common/styles/zen-animations.css b/src/zen/common/styles/zen-animations.css
index efdc0b6df..ae77e9502 100644
--- a/src/zen/common/styles/zen-animations.css
+++ b/src/zen/common/styles/zen-animations.css
@@ -3,20 +3,6 @@
  * 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/.
  */
-@keyframes zen-jello-animation {
-  0% {
-    transform: scale3d(0.8, 0.8, 0.8);
-  }
-
-  60% {
-    transform: scale3d(1.02, 1.02, 1.02);
-  }
-
-  to {
-    opacity: 1;
-    transform: scale3d(1, 1, 1);
-  }
-}
 
 @keyframes zen-jello-animation-macos {
   0% {
@@ -30,21 +16,6 @@
   }
 }
 
-@keyframes zen-jello-animation-large {
-  0% {
-    transform: scale3d(0.8, 0.8, 0.8);
-  }
-
-  60% {
-    transform: scale3d(1.02, 1.02, 1.02);
-  }
-
-  to {
-    opacity: 1;
-    transform: scale3d(1, 1, 1);
-  }
-}
-
 @keyframes zen-theme-picker-dot-animation {
   from {
     transform: scale(0.8) translate(-50%, -50%);
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 846b60d37..5874345cb 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -130,7 +130,8 @@
     }
   }
 
-  .identity-box-button {
+  .identity-box-button,
+  #zen-copy-url-button {
     opacity: 0;
     transition:
       opacity 0.2s,
@@ -246,7 +247,9 @@
 :root[zen-single-toolbar='true'] {
   --urlbar-icon-border-radius: 8px !important;
 
-  .urlbar-page-action:not([open]):not([showing]):not(#identity-permission-box),
+  .urlbar-page-action:not([open]):not([showing]):not(
+      :is(#zen-copy-url-button, #identity-permission-box)
+    ),
   #tracking-protection-icon-container {
     display: none;
   }
diff --git a/src/zen/common/styles/zen-panel-ui.css b/src/zen/common/styles/zen-panel-ui.css
index 5badd839e..2c10aea56 100644
--- a/src/zen/common/styles/zen-panel-ui.css
+++ b/src/zen/common/styles/zen-panel-ui.css
@@ -23,12 +23,6 @@ panel[type='arrow'] {
       animation: zen-jello-animation-macos 0.2s ease-in-out forwards !important;
     }
   }
-  @media (-moz-platform: linux) or ((-moz-platform: windows) and (not (-moz-windows-mica-popups))) and (-moz-panel-animations) {
-    /* Mica popups have a weird background while the animation is running */
-    &::part(content) {
-      animation: zen-jello-animation 0.35s ease;
-    }
-  }
 }
 
 menupopup,
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index a6dee2776..a7d95c9b0 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -386,13 +386,17 @@ menuseparator {
       min-width: unset !important;
       margin: 0px !important;
       border-radius: calc(var(--zen-native-inner-radius) + 2px) !important;
-      background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1)) !important;
-      border: 1px solid light-dark(rgba(0, 0, 0, 0.15), rgba(255, 255, 255, 0.15)) !important;
+      background: light-dark(rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05)) !important;
+      border: 1px solid light-dark(rgba(0, 0, 0, 0.01), rgba(255, 255, 255, 0.01)) !important;
       color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8)) !important;
 
       :root[zen-right-side='true'] & {
         order: -1;
       }
+
+      & .button-text {
+        display: none;
+      }
     }
   }
 }
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 26ebd8e1f..8108d4aef 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -180,7 +180,11 @@ body > #confetti {
     background-color 0.1s,
     transform 0.2s;
 
-  &:active:hover {
+  &[open='true'] {
+    transition: background-color 0.1s;
+  }
+
+  &:not([open='true']):active:hover {
     transform: scale(0.95);
   }
 }
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 2174b75e2..b922c42ea 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -238,7 +238,7 @@
     --zen-native-content-radius: env(-moz-gtk-csd-titlebar-radius);
   }
   @media (-moz-mac-tahoe-theme) {
-    --zen-native-content-radius: 14px;
+    --zen-native-content-radius: 15px;
   }
   --zen-native-inner-radius: var(
     --zen-webview-border-radius,
diff --git a/src/zen/compact-mode/sidebar.inc.css b/src/zen/compact-mode/sidebar.inc.css
index b5f72008f..e65d4775a 100644
--- a/src/zen/compact-mode/sidebar.inc.css
+++ b/src/zen/compact-mode/sidebar.inc.css
@@ -39,6 +39,7 @@
   #navigator-toolbox {
     --zen-toolbox-max-width: 74px !important;
     --zen-compact-float: var(--zen-element-separation);
+ 
     :root[zen-no-padding='true'] & {
       --zen-compact-float: 10px;
       --zen-compact-mode-no-padding-radius-fix: 2px;
diff --git a/src/zen/downloads/zen-download-arc-animation.css b/src/zen/downloads/zen-download-arc-animation.css
index 0ce56f287..ea3bd2f97 100644
--- a/src/zen/downloads/zen-download-arc-animation.css
+++ b/src/zen/downloads/zen-download-arc-animation.css
@@ -31,7 +31,7 @@
   width: 100%;
   height: 100%;
   border-radius: 50%;
-  background-color: var(--zen-colors-secondary);
+  background-color: var(--toolbar-color);
 }
 
 .zen-download-arc-animation-icon {
diff --git a/src/zen/downloads/zen-download-box-animation.css b/src/zen/downloads/zen-download-box-animation.css
index 54634ea9b..211a8091e 100644
--- a/src/zen/downloads/zen-download-box-animation.css
+++ b/src/zen/downloads/zen-download-box-animation.css
@@ -10,7 +10,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  background-color: var(--zen-colors-primary);
+  background-color: var(--toolbar-color);
   border-radius: var(--zen-native-content-radius);
   box-shadow: var(--zen-big-shadow);
   pointer-events: none;
diff --git a/src/zen/folders/zen-folders.css b/src/zen/folders/zen-folders.css
index 6d4618795..f1be64211 100644
--- a/src/zen/folders/zen-folders.css
+++ b/src/zen/folders/zen-folders.css
@@ -335,13 +335,13 @@ zen-folder {
   }
 
   &:last-child {
-    border-bottom-left-radius: max(calc(var(--panel-border-radius) - 6px), 4px);
-    border-bottom-right-radius: max(calc(var(--panel-border-radius) - 6px), 4px);
+    border-bottom-left-radius: max(calc(var(--panel-border-radius) - 2px), 4px);
+    border-bottom-right-radius: max(calc(var(--panel-border-radius) - 2px), 4px);
   }
 
   &:first-child {
-    border-top-left-radius: max(calc(var(--panel-border-radius) - 6px), 4px);
-    border-top-right-radius: max(calc(var(--panel-border-radius) - 6px), 4px);
+    border-top-left-radius: max(calc(var(--panel-border-radius) - 2px), 4px);
+    border-top-right-radius: max(calc(var(--panel-border-radius) - 2px), 4px);
   }
 }
 
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index fd7eac8b0..5805742fe 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -142,7 +142,7 @@
      * @param {Tab} existingTab - Optional existing tab to reuse
      * @returns {Browser} The created browser element
      */
-    createBrowserElement(url, currentTab, existingTab = null) {
+    #createBrowserElement(url, currentTab, existingTab = null) {
       const newTabOptions = this.#createTabOptions(currentTab);
       const newUUID = gZenUIManager.generateUuidv4();
 
@@ -250,6 +250,28 @@
       );
     }
 
+    /**
+     * Get element preview data as a data URL
+     * @param {Object} data - Glance data
+     * @returns {Promise<string|null>} Promise resolving to data URL or null
+     * if not available
+     */
+    async #getElementPreviewData(data) {
+      // Make the rect relative to the tabpanels. We dont do it directly on the
+      // content process since it does not take into account scroll. This way, we can
+      // be sure that the coordinates are correct.
+      const tabPanelsRect = gBrowser.tabpanels.getBoundingClientRect();
+      const rect = new DOMRect(
+        data.clientX + tabPanelsRect.left,
+        data.clientY + tabPanelsRect.top,
+        data.width,
+        data.height
+      );
+      return await this.#imageBitmapToBase64(
+        await window.browsingContext.currentWindowGlobal.drawSnapshot(rect, 1, 'transparent', true)
+      );
+    }
+
     /**
      * Open a glance overlay with the specified data
      * @param {Object} data - Glance data including URL, position, and dimensions
@@ -269,7 +291,7 @@
 
       this.#setAnimationState(true);
       const currentTab = ownerTab ?? gBrowser.selectedTab;
-      const browserElement = this.createBrowserElement(data.url, currentTab, existingTab);
+      const browserElement = this.#createBrowserElement(data.url, currentTab, existingTab);
 
       this.fillOverlay(browserElement);
       this.overlay.classList.add('zen-glance-overlay');
@@ -293,9 +315,13 @@
      * @returns {Promise<Tab>} Promise that resolves to the glance tab
      */
     #animateGlanceOpening(data, browserElement) {
-      return new Promise((resolve) => {
+      return new Promise(async (resolve) => {
+        this.#prepareGlanceAnimation(data, browserElement);
+        if (data.width && data.height) {
+          data.elementData = await this.#getElementPreviewData(data);
+        }
+        this.#glances.get(this.#currentGlanceID).elementData = data.elementData;
         window.requestAnimationFrame(() => {
-          this.#prepareGlanceAnimation(data, browserElement);
           this.#executeGlanceAnimation(data, browserElement, resolve);
         });
       });
@@ -450,18 +476,24 @@
       const transformOrigin = this.#getTransformOrigin(data);
 
       this.browserWrapper.style.transformOrigin = transformOrigin;
-      gZenUIManager.motion
-        .animate(
-          this.contentWrapper,
-          { opacity: [0, 1] },
-          {
-            duration: 0.1,
-            easing: 'easeInOut',
-          }
-        )
-        .then(() => {
-          this.contentWrapper.style.opacity = '';
-        });
+
+      // Only animate if there is element data, so we can apply a
+      // nice fade-in effect to the content. But if it doesn't exist,
+      // we just fall back to always showing the browser directly.
+      if (data.elementData) {
+        gZenUIManager.motion
+          .animate(
+            this.contentWrapper,
+            { opacity: [0, 1] },
+            {
+              duration: 0.1,
+              easing: 'easeInOut',
+            }
+          )
+          .then(() => {
+            this.contentWrapper.style.opacity = '';
+          });
+      }
 
       gZenUIManager.motion
         .animate(this.browserWrapper, arcSequence, {
@@ -826,6 +858,21 @@
       }
     }
 
+    #imageBitmapToBase64(imageBitmap) {
+      // 1. Create a canvas with the same size as the ImageBitmap
+      const canvas = document.createElement('canvas');
+      canvas.width = imageBitmap.width;
+      canvas.height = imageBitmap.height;
+
+      // 2. Draw the ImageBitmap onto the canvas
+      const ctx = canvas.getContext('2d');
+      ctx.drawImage(imageBitmap, 0, 0);
+
+      // 3. Convert the canvas content to a Base64 string (PNG by default)
+      const base64String = canvas.toDataURL('image/png');
+      return base64String;
+    }
+
     /**
      * Animate parent background restoration
      * @param {Element} browserSidebarContainer - The sidebar container
@@ -1481,10 +1528,15 @@
      */
     #createGlanceDataFromBookmark(event) {
       const rect = window.windowUtils.getBoundsWithoutFlushing(event.target);
+      const tabPanelRect = window.windowUtils.getBoundsWithoutFlushing(gBrowser.tabpanels);
+      // the bookmark is most likely outisde the tabpanel, so we need to give a negative number
+      // so it can be corrected later
+      let top = rect.top - tabPanelRect.top;
+      let left = rect.left - tabPanelRect.left;
       return {
         url: event.target._placesNode.uri,
-        clientX: rect.left,
-        clientY: rect.top,
+        clientX: left,
+        clientY: top,
         width: rect.width,
         height: rect.height,
       };
diff --git a/src/zen/glance/actors/ZenGlanceParent.sys.mjs b/src/zen/glance/actors/ZenGlanceParent.sys.mjs
index 0939cd47a..2bc025df9 100644
--- a/src/zen/glance/actors/ZenGlanceParent.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceParent.sys.mjs
@@ -28,38 +28,7 @@ export class ZenGlanceParent extends JSWindowActorParent {
     }
   }
 
-  #imageBitmapToBase64(imageBitmap) {
-    // 1. Create a canvas with the same size as the ImageBitmap
-    const canvas = this.browsingContext.topChromeWindow.document.createElement('canvas');
-    canvas.width = imageBitmap.width;
-    canvas.height = imageBitmap.height;
-
-    // 2. Draw the ImageBitmap onto the canvas
-    const ctx = canvas.getContext('2d');
-    ctx.drawImage(imageBitmap, 0, 0);
-
-    // 3. Convert the canvas content to a Base64 string (PNG by default)
-    const base64String = canvas.toDataURL('image/png');
-    return base64String;
-  }
-
-  async openGlance(window, data) {
-    const win = this.browsingContext.topChromeWindow;
-    const tabPanels = win.gBrowser.tabpanels;
-    // Make the rect relative to the tabpanels. We dont do it directly on the
-    // content process since it does not take into account scroll. This way, we can
-    // be sure that the coordinates are correct.
-    const tabPanelsRect = tabPanels.getBoundingClientRect();
-    const rect = new DOMRect(
-      data.clientX + tabPanelsRect.left,
-      data.clientY + tabPanelsRect.top,
-      data.width,
-      data.height
-    );
-    const elementData = await this.#imageBitmapToBase64(
-      await win.browsingContext.currentWindowGlobal.drawSnapshot(rect, 1, 'transparent', true)
-    );
-    data.elementData = elementData;
-    window.gZenGlanceManager.openGlance(data);
+  openGlance(window, data) {
+    return window.gZenGlanceManager.openGlance(data);
   }
 }
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index a1244d9d5..8d08cfc5e 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -42,6 +42,7 @@ export class nsZenSiteDataPanel {
     // Remove the old permissions dialog
     this.document.getElementById('unified-extensions-panel-template').remove();
 
+    this.#initCopyUrlButton();
     this.#initEventListeners();
     this.#maybeShowFeatureCallout();
   }
@@ -65,6 +66,35 @@ export class nsZenSiteDataPanel {
     this.#initContextMenuEventListener();
   }
 
+  #initCopyUrlButton() {
+    // This function is a bit out of place, but it's related enough to the panel
+    // that it's easier to do it here than in a separate module.
+    const container = this.document.getElementById('page-action-buttons');
+    const fragment = this.window.MozXULElement.parseXULToFragment(`
+      <hbox id="zen-copy-url-button"
+            class="urlbar-page-action"
+            role="button"
+            data-l10n-id="zen-urlbar-copy-url-button"
+            hidden="true">
+        <image class="urlbar-icon"/>
+      </hbox>
+    `);
+    container.appendChild(fragment);
+
+    const aElement = this.document.getElementById('zen-copy-url-button');
+    aElement.addEventListener('click', (event) => {
+      this.document.getElementById('cmd_zenCopyCurrentURL').doCommand();
+    });
+
+    this.window.gBrowser.addProgressListener({
+      onLocationChange: (aWebProgress, aRequest, aLocation) => {
+        if (aWebProgress.isTopLevel) {
+          aElement.hidden = !this.#canCopyUrl(aLocation);
+        }
+      },
+    });
+  }
+
   #initContextMenuEventListener() {
     const kCommands = {
       context_zenClearSiteData: (event) => {
@@ -117,10 +147,7 @@ export class nsZenSiteDataPanel {
     }
     {
       const button = this.document.getElementById('zen-site-data-header-share');
-      if (
-        this.window.gBrowser.currentURI.schemeIs('http') ||
-        this.window.gBrowser.currentURI.schemeIs('https')
-      ) {
+      if (this.#canCopyUrl(this.window.gBrowser.currentURI)) {
         button.removeAttribute('disabled');
       } else {
         button.setAttribute('disabled', 'true');
@@ -128,6 +155,19 @@ export class nsZenSiteDataPanel {
     }
   }
 
+  /*
+   * Determines whether the copy URL button should be hidden for the given URI.
+   * @param {nsIURI} uri - The URI to check.
+   * @returns {boolean} True if the button should be hidden, false otherwise.
+   */
+  #canCopyUrl(uri) {
+    if (!uri) {
+      return false;
+    }
+
+    return uri.scheme.startsWith('http');
+  }
+
   #setSiteSecurityInfo() {
     const { gIdentityHandler } = this.window;
     const button = this.document.getElementById('zen-site-data-security-info');

From bd7df3831040bf38b20cbcaa7cf0d69041aa6c27 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 02:26:22 +0200
Subject: [PATCH 076/111] chore: Fix linter issues, b=no-bug, c=folders, glance

---
 src/zen/folders/ZenFolders.mjs          | 2 +-
 src/zen/glance/ZenGlanceManager.mjs     | 4 ++++
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index ec10042b6..3d181132b 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1309,7 +1309,7 @@
       animations.push(
         ...this.#createAnimation(
           itemsToHide,
-          { opacity: 0, height: 0 },
+          { opacity: [1, 0], height: ['auto', 0] },
           { duration: 0.12, ease: 'easeInOut' }
         ),
         ...this.updateFolderIcon(group),
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 5805742fe..ce6258f52 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -315,6 +315,10 @@
      * @returns {Promise<Tab>} Promise that resolves to the glance tab
      */
     #animateGlanceOpening(data, browserElement) {
+      // FIXME(cheffy): We *must* have the call back async (at least,
+      // until a better solution is found). If we do it inside the requestAnimationFrame,
+      // we see flashing and if we do it directly, the animation does not play at all.
+      // eslint-disable-next-line no-async-promise-executor
       return new Promise(async (resolve) => {
         this.#prepareGlanceAnimation(data, browserElement);
         if (data.width && data.height) {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 8d08cfc5e..4b04d49ee 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -82,7 +82,7 @@ export class nsZenSiteDataPanel {
     container.appendChild(fragment);
 
     const aElement = this.document.getElementById('zen-copy-url-button');
-    aElement.addEventListener('click', (event) => {
+    aElement.addEventListener('click', () => {
       this.document.getElementById('cmd_zenCopyCurrentURL').doCommand();
     });
 

From 2ba0b8ccdf60030d6a0f824ed42135a4070745e6 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 03:22:53 +0200
Subject: [PATCH 077/111] feat: Improved UI and spacings for toasts, b=no-bug,
 c=common

---
 locales/en-US/browser/browser/zen-general.ftl |  2 +-
 .../content/zen-tabbrowser-elements.inc.xhtml |  2 +-
 src/browser/themes/shared/zen-icons/icons.css |  6 ++--
 src/zen/common/styles/zen-popup.css           | 31 ++++++++++++-------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 3cf66bfa5..9e568170c 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -31,7 +31,7 @@ pictureinpicture-minimize-btn =
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 
-zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
+zen-copy-current-url-confirmation = Copied Current URL!
 
 zen-general-cancel-label =
     .label = Cancel
diff --git a/src/browser/base/content/zen-tabbrowser-elements.inc.xhtml b/src/browser/base/content/zen-tabbrowser-elements.inc.xhtml
index 187791740..887db5f26 100644
--- a/src/browser/base/content/zen-tabbrowser-elements.inc.xhtml
+++ b/src/browser/base/content/zen-tabbrowser-elements.inc.xhtml
@@ -2,7 +2,7 @@
 # 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/.
 
-<vbox id="zen-toast-container"></vbox>
+<vbox id="zen-toast-container" />
 
 #include ../../../zen/split-view/zen-splitview-overlay.inc.xhtml
 #include ../../../zen/glance/zen-glance.inc.xhtml
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 93ecaabdd..dc87060f3 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -133,7 +133,8 @@
 
 #sync-button,
 .urlbarView-row[source='tabs'] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
-#urlbar-engine-one-off-item-tabs {
+#urlbar-engine-one-off-item-tabs,
+#zen-open-background-tab-button {
   list-style-image: url('tab.svg') !important;
 }
 
@@ -177,8 +178,7 @@
   list-style-image: url('search-page.svg') !important;
 }
 
-#open-file-button,
-#zen-open-background-tab-button {
+#open-file-button {
   list-style-image: url('open.svg') !important;
 }
 
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index a7d95c9b0..de9cdb051 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -345,20 +345,20 @@ menuseparator {
     --zen-toast-padding: 6px;
     --zen-toast-max-height: 46px;
     @media (-moz-platform: macos) {
-      --zen-toast-padding: 10px;
-      --zen-toast-max-height: 52px;
+      --zen-toast-padding: 8px;
+      --zen-toast-max-height: 48px;
     }
 
-    gap: 10px;
+    gap: 8px;
     z-index: 1000;
     padding: var(--zen-toast-padding);
-    border-radius: calc(var(--zen-native-inner-radius) + 6px);
+    border-radius: 10px;
     background: linear-gradient(
-      170deg,
+      to bottom,
       var(--zen-primary-color) -40%,
-      color-mix(in srgb, var(--zen-primary-color) 85%, #0f0f0f 15%)
+      color-mix(in srgb, var(--zen-primary-color), #0f0f0f 20%)
     );
-    box-shadow: 0 0 14px 3px rgba(0, 0, 0, 0.05);
+    box-shadow: light-dark(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.4)) 0px 0px 22px 2px;
     border: none;
     display: flex;
     font-weight: 600;
@@ -382,14 +382,18 @@ menuseparator {
 
     & button {
       width: min-content;
-      padding: 0 10px !important;
+      padding: 0px 8px !important;
       min-width: unset !important;
+      min-height: 28px;
       margin: 0px !important;
-      border-radius: calc(var(--zen-native-inner-radius) + 2px) !important;
-      background: light-dark(rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05)) !important;
-      border: 1px solid light-dark(rgba(0, 0, 0, 0.01), rgba(255, 255, 255, 0.01)) !important;
+      border-radius: 6px !important;
+      background: light-dark(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1)) !important;
+      border-top: 2px solid light-dark(transparent, rgba(255, 255, 255, 0.1));
       color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8)) !important;
 
+      outline: 0.5px solid light-dark(rgba(0, 0, 0, 0.3), rgba(255, 255, 255, 0.02));
+      outline-offset: -0.5px;
+
       :root[zen-right-side='true'] & {
         order: -1;
       }
@@ -397,6 +401,11 @@ menuseparator {
       & .button-text {
         display: none;
       }
+
+      & .button-icon {
+        width: 14px;
+        opacity: 0.6;
+      }
     }
   }
 }

From 3d97bef79e6045ee59423290e76b3702ba29d174 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 14 Oct 2025 03:23:16 +0200
Subject: [PATCH 078/111] chore: New Crowdin updates, p=#10801

* New translations zen-preferences.ftl (Italian)

* New translations zen-general.ftl (Italian)

* New translations zen-folders.ftl (Italian)
---
 locales/it/browser/browser/preferences/zen-preferences.ftl | 2 +-
 locales/it/browser/browser/zen-folders.ftl                 | 2 +-
 locales/it/browser/browser/zen-general.ftl                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl
index 5b2948cc3..22d8c54f5 100644
--- a/locales/it/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/it/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Nascondi l'indicatore predefinito del contenitore nella barra delle schede
 zen-key-unsaved = Scorciatoia non salvata! Si prega di proteggerla facendo clic sul tasto "Escape" dopo averlo ripetuto.
-zen-key-conflict = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Conflitti con { $group } -> { $shortcut }
 pane-zen-theme-title = Impostazioni tema
 zen-vertical-tabs-title = Layout barra laterale e schede
 zen-vertical-tabs-header = Schede verticali
diff --git a/locales/it/browser/browser/zen-folders.ftl b/locales/it/browser/browser/zen-folders.ftl
index 4d81d433e..fa5a5b795 100644
--- a/locales/it/browser/browser/zen-folders.ftl
+++ b/locales/it/browser/browser/zen-folders.ftl
@@ -15,7 +15,7 @@ zen-folders-panel-change-folder-space =
 zen-folders-panel-change-icon-folder = 
     .label = Cambia icona
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = Scarica tutte le schede attive in questa cartella
 zen-folders-unload-folder = 
     .label = Scarica tutte le schede
 zen-folders-search-no-results = Nessuna scheda corrispondente alla ricerca 🤔
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index e179c78eb..9f4afe3bb 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -68,6 +68,6 @@ zen-site-data-get-addons =
     .label = Aggiungi estensioni
 zen-site-data-site-settings = 
     .label = Tutte le impostazioni del sito
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Protezione sito
 zen-site-data-panel-feature-callout-title = Una nuova casa per componenti aggiuntivi, permessi, e altro ancora
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-site-data-panel-feature-callout-subtitle = Clicca l'icona per gestire le impostazioni del sito, visualizzare informazioni di sicurezza, accedere alle estensioni, ed eseguire azioni comuni.

From 1fa53202755f4787cbbb32aafe8a5e5b25187c0c Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 03:25:45 +0200
Subject: [PATCH 079/111] feat: Increase the number of steps for glance
 animation, b=no-bug, c=glance

---
 src/zen/glance/ZenGlanceManager.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index ce6258f52..5134e3bff 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -26,7 +26,7 @@
 
     // Arc animation configuration
     #ARC_CONFIG = Object.freeze({
-      ARC_STEPS: 40, // Increased for smoother bounce
+      ARC_STEPS: 60, // Increased for smoother bounce
       MAX_ARC_HEIGHT: 30,
       ARC_HEIGHT_RATIO: 0.2, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
     });
@@ -609,7 +609,7 @@
       }
 
       let scale = 1;
-      const bounceSteps = 50;
+      const bounceSteps = 60;
       if (direction === 'opening') {
         for (let i = 0; i < bounceSteps; i++) {
           const progress = i / bounceSteps;

From dd5c4455fe98a595f4a7e99b774e2ceda8c6b5cc Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 11:16:09 +0200
Subject: [PATCH 080/111] fix: Fixed broken layout when the reload button
 doesn't exist, b=closes #10796, c=common

---
 src/zen/common/ZenCustomizableUI.sys.mjs | 17 +++++++++--------
 src/zen/common/ZenUIManager.mjs          |  2 --
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index 8ca0d97ac..e494a6cf6 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -32,11 +32,11 @@ export var ZenCustomizableUI = new (class {
 
   // We do not have access to the window object here
   init(window) {
-    this._addSidebarButtons(window);
-    this._hideToolbarButtons(window);
+    this.#addSidebarButtons(window);
+    this.#modifyToolbarButtons(window);
   }
 
-  _addSidebarButtons(window) {
+  #addSidebarButtons(window) {
     const kDefaultSidebarWidth = '210px';
     const toolbox = window.gNavToolbox;
 
@@ -105,11 +105,11 @@ export var ZenCustomizableUI = new (class {
       elem.setAttribute('removable', 'true');
     }
 
-    this._initCreateNewButton(window);
-    this._moveWindowButtons(window);
+    this.#initCreateNewButton(window);
+    this.#moveWindowButtons(window);
   }
 
-  _initCreateNewButton(window) {
+  #initCreateNewButton(window) {
     const button = window.document.getElementById('zen-create-new-button');
     button.addEventListener('command', (event) => {
       if (button.hasAttribute('open')) {
@@ -128,7 +128,7 @@ export var ZenCustomizableUI = new (class {
     });
   }
 
-  _moveWindowButtons(window) {
+  #moveWindowButtons(window) {
     const windowControls = window.document.getElementsByClassName('titlebar-buttonbox-container');
     const toolboxIcons = window.document.getElementById(
       'zen-sidebar-top-buttons-customization-target'
@@ -147,7 +147,7 @@ export var ZenCustomizableUI = new (class {
     }
   }
 
-  _hideToolbarButtons(window) {
+  #modifyToolbarButtons(window) {
     const wrapper = window.document.getElementById('zen-sidebar-foot-buttons');
     const elementsToHide = ['new-tab-button'];
     for (let id of elementsToHide) {
@@ -156,6 +156,7 @@ export var ZenCustomizableUI = new (class {
         wrapper.prepend(elem);
       }
     }
+    window.document.getElementById('stop-reload-button').removeAttribute('overflows');
   }
 
   _dispatchResizeEvent(window) {
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index b19b39f7c..c0a45816c 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -58,8 +58,6 @@ var gZenUIManager = {
       this.onUrlbarSearchModeChanged.bind(this)
     );
 
-    document.getElementById('stop-reload-button').removeAttribute('overflows');
-
     gZenMediaController.init();
     gZenVerticalTabsManager.init();
 

From 9e2b0cc1edf1d4116a1cf38dba9311e3bbb4e630 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 14:28:54 +0200
Subject: [PATCH 081/111] fix: Fix tahoe popups rendering shadows and other
 small tweaks, b=no-bug, c=welcome, common

---
 locales/en-US/browser/browser/zen-general.ftl |  3 ++
 locales/en-US/browser/browser/zen-welcome.ftl |  1 -
 src/zen/common/ZenUIManager.mjs               | 34 +++++++++++++------
 src/zen/common/ZenUIMigration.sys.mjs         |  2 +-
 src/zen/common/styles/zen-omnibox.css         |  4 +++
 src/zen/common/styles/zen-panel-ui.css        | 16 ++++++++-
 src/zen/common/styles/zen-popup.css           | 12 ++++---
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       |  5 ++-
 src/zen/welcome/ZenWelcome.mjs                |  8 ++---
 9 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 9e568170c..636809b2f 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -72,6 +72,7 @@ zen-site-data-settings = Settings
 
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
@@ -95,5 +96,7 @@ zen-urlbar-copy-url-button =
 
 zen-site-data-setting-site-protection = Site Protection
 
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/en-US/browser/browser/zen-welcome.ftl b/locales/en-US/browser/browser/zen-welcome.ftl
index c137bf910..1967595a9 100644
--- a/locales/en-US/browser/browser/zen-welcome.ftl
+++ b/locales/en-US/browser/browser/zen-welcome.ftl
@@ -29,6 +29,5 @@ zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index c0a45816c..faf3cf950 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -2,10 +2,6 @@
 // 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/.
 
-ChromeUtils.defineESModuleGetters(this, {
-  nsZenSiteDataPanel: 'resource:///modules/ZenSiteDataPanel.sys.mjs',
-});
-
 var gZenUIManager = {
   _popupTrackingElements: [],
   _hoverPausedForExpand: false,
@@ -36,10 +32,6 @@ var gZenUIManager = {
       return document.getElementById('zen-toast-container');
     });
 
-    window.gZenSiteDataPanel = new nsZenSiteDataPanel(window);
-
-    gURLBar._zenTrimURL = this.urlbarTrim.bind(this);
-
     new ResizeObserver(
       gZenCommonActions.throttle(
         gZenCompactModeManager.getAndApplySidebarWidth.bind(gZenCompactModeManager),
@@ -63,14 +55,36 @@ var gZenUIManager = {
 
     this._initCreateNewPopup();
     this._debloatContextMenus();
-    this._initOmniboxCommands();
+    this._addNewCustomizableButtonsIfNeeded();
+    this._initOmnibox();
   },
 
-  _initOmniboxCommands() {
+  _addNewCustomizableButtonsIfNeeded() {
+    const kPref = 'zen.ui.migration.compact-mode-button-added';
+    let navbarPlacements = CustomizableUI.getWidgetIdsInArea('zen-sidebar-top-buttons');
+    try {
+      if (!navbarPlacements.length && !Services.prefs.getBoolPref(kPref, false)) {
+        CustomizableUI.addWidgetToArea('zen-toggle-compact-mode', 'zen-sidebar-top-buttons', 0);
+        gZenVerticalTabsManager._topButtonsSeparatorElement.before(
+          document.getElementById('zen-toggle-compact-mode')
+        );
+      }
+    } catch (e) {
+      console.error('Error adding compact mode button to sidebar:', e);
+    }
+    Services.prefs.setBoolPref(kPref, true);
+  },
+
+  _initOmnibox() {
     const { registerZenUrlbarProviders } = ChromeUtils.importESModule(
       'resource:///modules/ZenUBProvider.sys.mjs'
     );
+    const { nsZenSiteDataPanel } = ChromeUtils.importESModule(
+      'resource:///modules/ZenSiteDataPanel.sys.mjs'
+    );
     registerZenUrlbarProviders();
+    window.gZenSiteDataPanel = new nsZenSiteDataPanel(window);
+    gURLBar._zenTrimURL = this.urlbarTrim.bind(this);
   },
 
   _debloatContextMenus() {
diff --git a/src/zen/common/ZenUIMigration.sys.mjs b/src/zen/common/ZenUIMigration.sys.mjs
index bd9129360..7b7457012 100644
--- a/src/zen/common/ZenUIMigration.sys.mjs
+++ b/src/zen/common/ZenUIMigration.sys.mjs
@@ -2,7 +2,7 @@
 // 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/.
 
-const { AppConstants } = ChromeUtils.importESModule('resource://gre/modules/AppConstants.sys.mjs');
+import { AppConstants } from 'resource://gre/modules/AppConstants.sys.mjs';
 
 class nsZenUIMigration {
   PREF_NAME = 'zen.ui.migration.version';
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 5874345cb..e0cef344d 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -238,6 +238,10 @@
     pointer-events: none;
     animation: zen-urlbar-searchmode ease-out 1s forwards;
   }
+
+  & #zen-copy-url-button {
+    display: none;
+  }
 }
 
 #urlbar-go-button {
diff --git a/src/zen/common/styles/zen-panel-ui.css b/src/zen/common/styles/zen-panel-ui.css
index 2c10aea56..8c42b9803 100644
--- a/src/zen/common/styles/zen-panel-ui.css
+++ b/src/zen/common/styles/zen-panel-ui.css
@@ -33,13 +33,19 @@ panel[type='arrow']:not(#feature-callout) {
     /* The blur behind doesn't blur all that much, add a semi-transparent
      * background to improve contrast */
     --panel-background: light-dark(rgba(255, 255, 255, 0.5), rgba(0, 0, 0, 0.5)) !important;
-    --panel-border-color: transparent !important;
+
+    /* The mica rendering already adds a shadow and a border, so we
+     * remove the one we add via CSS */
     --panel-shadow-margin: 0px !important;
+    --panel-border-color: transparent !important;
     border: none !important;
 
     transition-duration: 0s !important;
 
     &::part(content) {
+      /* Refrain from animating for now as we haven't found a 
+       * way to properly animate the popup without having the mica
+       * backdrop staying still while the popup animates */
       animation: none !important;
     }
   }
@@ -55,7 +61,15 @@ panel[type='arrow']:not(#feature-callout) {
     --panel-background: transparent !important;
     --panel-border-color: transparent;
 
+    /* Remove the shadow for the native panels, as macos already
+     * adds the shadows to the window. This is specially important
+     * on Tahoe, where we *dont* apply an image mask, meaning that 
+     * trying to render a shadow would end up in having weird borders
+     * around the panel */
+    --panel-shadow: none;
+
     &::part(content) {
+      /* This shoudn't really be needed, but just in case */
       background-color: transparent !important;
     }
   }
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index de9cdb051..755799ad3 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -38,12 +38,15 @@
 menupopup,
 panel {
   --panel-background: var(--arrowpanel-background);
-  --menuitem-padding: 6px !important;
   --panel-shadow-margin: 10px;
 
-  /* This should match GetMenuMaskImage() on macOS, or be overridden below */
+  /* This should match GetMenuCornerRadius() on macOS, or be overridden below */
   @media (-moz-platform: macos) {
     --panel-border-radius: 10px;
+
+    @media (-moz-mac-tahoe-theme) {
+      --panel-border-radius: 12px;
+    }
   }
 }
 
@@ -343,7 +346,7 @@ menuseparator {
     }
 
     --zen-toast-padding: 6px;
-    --zen-toast-max-height: 46px;
+    --zen-toast-max-height: 42px;
     @media (-moz-platform: macos) {
       --zen-toast-padding: 8px;
       --zen-toast-max-height: 48px;
@@ -376,8 +379,7 @@ menuseparator {
     }
 
     & label {
-      margin-top: 0;
-      margin-bottom: 0;
+      margin: 0 4px;
     }
 
     & button {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 4b04d49ee..e86c6f53e 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -554,10 +554,10 @@ export class nsZenSiteDataPanel {
           id: 'ZEN_EXTENSIONS_PANEL_MOVE_CALLOUT',
           template: 'multistage',
           backdrop: 'transparent',
-          transitions: false,
+          transitions: true,
           screens: [
             {
-              id: 'ZEN_EXTENSIONS_PANEL_MOVE_CALLOUT_HORIZONTAL',
+              id: 'ZEN_EXTENSIONS_PANEL_MOVE_CALLOUT',
               anchors: [
                 {
                   selector: '#zen-site-data-icon-button',
@@ -577,7 +577,6 @@ export class nsZenSiteDataPanel {
               content: {
                 position: 'callout',
                 width: '355px',
-                padding: 16,
                 title: {
                   string_id: 'zen-site-data-panel-feature-callout-title',
                 },
diff --git a/src/zen/welcome/ZenWelcome.mjs b/src/zen/welcome/ZenWelcome.mjs
index 08a9458a5..3e1074bf5 100644
--- a/src/zen/welcome/ZenWelcome.mjs
+++ b/src/zen/welcome/ZenWelcome.mjs
@@ -409,7 +409,7 @@
               document.querySelector('#zen-welcome-page-sidebar-buttons button').remove();
               const newButton = document.querySelector('#zen-welcome-page-sidebar-buttons button');
               newButton.classList.add('primary');
-              document.l10n.setAttributes(newButton, 'zen-welcome-next-action');
+              document.l10n.setAttributes(newButton, 'zen-generic-next');
               return false;
             },
           },
@@ -464,7 +464,7 @@
         ],
         buttons: [
           {
-            l10n: 'zen-welcome-next-action',
+            l10n: 'zen-generic-next',
             onclick: async () => {
               return true;
             },
@@ -533,7 +533,7 @@
         ],
         buttons: [
           {
-            l10n: 'zen-welcome-next-action',
+            l10n: 'zen-generic-next',
             onclick: async () => {
               return true;
             },
@@ -658,7 +658,7 @@
         ],
         buttons: [
           {
-            l10n: 'zen-welcome-next-action',
+            l10n: 'zen-generic-next',
             onclick: async () => {
               return true;
             },

From 9377dc0844f7b6d9300be13dcfc37d1de13b4695 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 14 Oct 2025 14:44:51 +0200
Subject: [PATCH 082/111] chore: New Crowdin updates, p=#10808

* New translations zen-general.ftl (French)

* New translations zen-general.ftl (Chinese Simplified)

* New translations zen-general.ftl (Chinese Traditional)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Arabic)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Czech)

* New translations zen-general.ftl (Danish)

* New translations zen-general.ftl (German)

* New translations zen-general.ftl (Greek)

* New translations zen-general.ftl (Finnish)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hebrew)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Italian)

* New translations zen-general.ftl (Japanese)

* New translations zen-general.ftl (Korean)

* New translations zen-general.ftl (Lithuanian)

* New translations zen-general.ftl (Dutch)

* New translations zen-general.ftl (Polish)

* New translations zen-general.ftl (Portuguese)

* New translations zen-general.ftl (Russian)

* New translations zen-general.ftl (Swedish)

* New translations zen-general.ftl (Turkish)

* New translations zen-general.ftl (Ukrainian)

* New translations zen-general.ftl (Vietnamese)

* New translations zen-general.ftl (Icelandic)

* New translations zen-general.ftl (Portuguese, Brazilian)

* New translations zen-general.ftl (Indonesian)

* New translations zen-general.ftl (Persian)

* New translations zen-general.ftl (Thai)

* New translations zen-general.ftl (Norwegian Nynorsk)

* New translations zen-general.ftl (Estonian)

* New translations zen-general.ftl (English, United Kingdom)

* New translations zen-general.ftl (Welsh)

* Update source file zen-general.ftl

* Update source file zen-welcome.ftl

* New translations zen-general.ftl (French)

* New translations zen-general.ftl (Chinese Simplified)

* New translations zen-general.ftl (Chinese Traditional)

* New translations zen-welcome.ftl (French)

* New translations zen-welcome.ftl (Chinese Traditional)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Arabic)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Czech)

* New translations zen-general.ftl (Danish)

* New translations zen-general.ftl (German)

* New translations zen-general.ftl (Greek)

* New translations zen-general.ftl (Finnish)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hebrew)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Italian)

* New translations zen-general.ftl (Japanese)

* New translations zen-general.ftl (Korean)

* New translations zen-general.ftl (Lithuanian)

* New translations zen-general.ftl (Dutch)

* New translations zen-general.ftl (Polish)

* New translations zen-general.ftl (Portuguese)

* New translations zen-general.ftl (Russian)

* New translations zen-general.ftl (Swedish)

* New translations zen-general.ftl (Turkish)

* New translations zen-general.ftl (Ukrainian)

* New translations zen-general.ftl (Vietnamese)

* New translations zen-general.ftl (Icelandic)

* New translations zen-general.ftl (Portuguese, Brazilian)

* New translations zen-general.ftl (Indonesian)

* New translations zen-general.ftl (Persian)

* New translations zen-general.ftl (Thai)

* New translations zen-general.ftl (Norwegian Nynorsk)

* New translations zen-general.ftl (Estonian)

* New translations zen-general.ftl (English, United Kingdom)

* New translations zen-general.ftl (Welsh)

* New translations zen-welcome.ftl (Spanish)

* New translations zen-welcome.ftl (Arabic)

* New translations zen-welcome.ftl (Catalan)

* New translations zen-welcome.ftl (Czech)

* New translations zen-welcome.ftl (Danish)

* New translations zen-welcome.ftl (German)

* New translations zen-welcome.ftl (Greek)

* New translations zen-welcome.ftl (Finnish)

* New translations zen-welcome.ftl (Irish)

* New translations zen-welcome.ftl (Hebrew)

* New translations zen-welcome.ftl (Hungarian)

* New translations zen-welcome.ftl (Italian)

* New translations zen-welcome.ftl (Japanese)

* New translations zen-welcome.ftl (Korean)

* New translations zen-welcome.ftl (Lithuanian)

* New translations zen-welcome.ftl (Dutch)

* New translations zen-welcome.ftl (Polish)

* New translations zen-welcome.ftl (Portuguese)

* New translations zen-welcome.ftl (Russian)

* New translations zen-welcome.ftl (Swedish)

* New translations zen-welcome.ftl (Turkish)

* New translations zen-welcome.ftl (Ukrainian)

* New translations zen-welcome.ftl (Chinese Simplified)

* New translations zen-welcome.ftl (Vietnamese)

* New translations zen-welcome.ftl (Icelandic)

* New translations zen-welcome.ftl (Portuguese, Brazilian)

* New translations zen-welcome.ftl (Indonesian)

* New translations zen-welcome.ftl (Persian)

* New translations zen-welcome.ftl (Thai)

* New translations zen-welcome.ftl (Norwegian Nynorsk)

* New translations zen-welcome.ftl (Estonian)

* New translations zen-welcome.ftl (English, United Kingdom)

* New translations zen-welcome.ftl (Welsh)
---
 locales/ar/browser/browser/zen-general.ftl    | 6 ++++++
 locales/ar/browser/browser/zen-welcome.ftl    | 1 -
 locales/ca/browser/browser/zen-general.ftl    | 6 ++++++
 locales/ca/browser/browser/zen-welcome.ftl    | 1 -
 locales/cs/browser/browser/zen-general.ftl    | 6 ++++++
 locales/cs/browser/browser/zen-welcome.ftl    | 1 -
 locales/cy/browser/browser/zen-general.ftl    | 6 ++++++
 locales/cy/browser/browser/zen-welcome.ftl    | 1 -
 locales/da/browser/browser/zen-general.ftl    | 6 ++++++
 locales/da/browser/browser/zen-welcome.ftl    | 1 -
 locales/de/browser/browser/zen-general.ftl    | 6 ++++++
 locales/de/browser/browser/zen-welcome.ftl    | 1 -
 locales/el/browser/browser/zen-general.ftl    | 6 ++++++
 locales/el/browser/browser/zen-welcome.ftl    | 1 -
 locales/en-GB/browser/browser/zen-general.ftl | 6 ++++++
 locales/en-GB/browser/browser/zen-welcome.ftl | 1 -
 locales/es-ES/browser/browser/zen-general.ftl | 6 ++++++
 locales/es-ES/browser/browser/zen-welcome.ftl | 1 -
 locales/et/browser/browser/zen-general.ftl    | 6 ++++++
 locales/et/browser/browser/zen-welcome.ftl    | 1 -
 locales/fa/browser/browser/zen-general.ftl    | 6 ++++++
 locales/fa/browser/browser/zen-welcome.ftl    | 1 -
 locales/fi/browser/browser/zen-general.ftl    | 6 ++++++
 locales/fi/browser/browser/zen-welcome.ftl    | 1 -
 locales/fr/browser/browser/zen-general.ftl    | 6 ++++++
 locales/fr/browser/browser/zen-welcome.ftl    | 1 -
 locales/ga-IE/browser/browser/zen-general.ftl | 6 ++++++
 locales/ga-IE/browser/browser/zen-welcome.ftl | 1 -
 locales/he/browser/browser/zen-general.ftl    | 6 ++++++
 locales/he/browser/browser/zen-welcome.ftl    | 1 -
 locales/hu/browser/browser/zen-general.ftl    | 6 ++++++
 locales/hu/browser/browser/zen-welcome.ftl    | 1 -
 locales/id/browser/browser/zen-general.ftl    | 6 ++++++
 locales/id/browser/browser/zen-welcome.ftl    | 1 -
 locales/is/browser/browser/zen-general.ftl    | 6 ++++++
 locales/is/browser/browser/zen-welcome.ftl    | 1 -
 locales/it/browser/browser/zen-general.ftl    | 6 ++++++
 locales/it/browser/browser/zen-welcome.ftl    | 1 -
 locales/ja/browser/browser/zen-general.ftl    | 6 ++++++
 locales/ja/browser/browser/zen-welcome.ftl    | 1 -
 locales/ko/browser/browser/zen-general.ftl    | 6 ++++++
 locales/ko/browser/browser/zen-welcome.ftl    | 1 -
 locales/lt/browser/browser/zen-general.ftl    | 6 ++++++
 locales/lt/browser/browser/zen-welcome.ftl    | 1 -
 locales/nl/browser/browser/zen-general.ftl    | 6 ++++++
 locales/nl/browser/browser/zen-welcome.ftl    | 1 -
 locales/nn-NO/browser/browser/zen-general.ftl | 6 ++++++
 locales/nn-NO/browser/browser/zen-welcome.ftl | 1 -
 locales/pl/browser/browser/zen-general.ftl    | 6 ++++++
 locales/pl/browser/browser/zen-welcome.ftl    | 1 -
 locales/pt-BR/browser/browser/zen-general.ftl | 6 ++++++
 locales/pt-BR/browser/browser/zen-welcome.ftl | 1 -
 locales/pt-PT/browser/browser/zen-general.ftl | 6 ++++++
 locales/pt-PT/browser/browser/zen-welcome.ftl | 1 -
 locales/ru/browser/browser/zen-general.ftl    | 6 ++++++
 locales/ru/browser/browser/zen-welcome.ftl    | 1 -
 locales/sv-SE/browser/browser/zen-general.ftl | 6 ++++++
 locales/sv-SE/browser/browser/zen-welcome.ftl | 1 -
 locales/th/browser/browser/zen-general.ftl    | 6 ++++++
 locales/th/browser/browser/zen-welcome.ftl    | 1 -
 locales/tr/browser/browser/zen-general.ftl    | 6 ++++++
 locales/tr/browser/browser/zen-welcome.ftl    | 1 -
 locales/uk/browser/browser/zen-general.ftl    | 6 ++++++
 locales/uk/browser/browser/zen-welcome.ftl    | 1 -
 locales/vi/browser/browser/zen-general.ftl    | 6 ++++++
 locales/vi/browser/browser/zen-welcome.ftl    | 1 -
 locales/zh-CN/browser/browser/zen-general.ftl | 6 ++++++
 locales/zh-CN/browser/browser/zen-welcome.ftl | 1 -
 locales/zh-TW/browser/browser/zen-general.ftl | 6 ++++++
 locales/zh-TW/browser/browser/zen-welcome.ftl | 1 -
 70 files changed, 210 insertions(+), 35 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 8f05fe270..44838e2cb 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/ar/browser/browser/zen-welcome.ftl b/locales/ar/browser/browser/zen-welcome.ftl
index 0767c9bb0..86d517ffd 100644
--- a/locales/ar/browser/browser/zen-welcome.ftl
+++ b/locales/ar/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 054cd9340..96113ca72 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Accions
 zen-site-data-settings = Configuració
 zen-generic-manage = Gestiona
 zen-generic-more = Més
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permès
 zen-site-data-setting-block = Bloquejat
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Afegeix extensions
 zen-site-data-site-settings = 
     .label = Totes les configuracions del lloc
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Protecció del lloc
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Una nova ubicació per a les extenions, permisos i molt més
 zen-site-data-panel-feature-callout-subtitle = Feu clic a la icona per gestionar la configuració del lloc, veure la informació de seguretat, accedir a les extensions i dur a terme accions habituals.
diff --git a/locales/ca/browser/browser/zen-welcome.ftl b/locales/ca/browser/browser/zen-welcome.ftl
index 7d93f6b4a..7d6537dfa 100644
--- a/locales/ca/browser/browser/zen-welcome.ftl
+++ b/locales/ca/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Som-hi!
 zen-welcome-default-search-title = El vostre motor de cerca per defecte
 zen-welcome-default-search-description = Trieu el vostre motor de cerca per defecte. Sempre el podeu canviar més tard!
 zen-welcome-skip-button = Omet
-zen-welcome-next-action = Següent
 zen-welcome-finished = El Zen s'ha configurat correctament!
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 03f19c3a3..b6c3f4c11 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Akce
 zen-site-data-settings = Nastavení
 zen-generic-manage = Spravovat
 zen-generic-more = Více
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Povoleno
 zen-site-data-setting-block = Blokováno
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Přidat rozšíření
 zen-site-data-site-settings = 
     .label = Nastavení všech stránek
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/cs/browser/browser/zen-welcome.ftl b/locales/cs/browser/browser/zen-welcome.ftl
index 15e19b0fb..135340346 100644
--- a/locales/cs/browser/browser/zen-welcome.ftl
+++ b/locales/cs/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Pustit se do toho!
 zen-welcome-default-search-title = Váš výchozí vyhledávač
 zen-welcome-default-search-description = Vyberte si svůj výchozí vyhledávač. Později jej můžete změnit!
 zen-welcome-skip-button = Přeskočit
-zen-welcome-next-action = Další
 zen-welcome-finished = Váš Zen byl úspěšně nastaven!
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index f46b35b7b..3e2ba6849 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/cy/browser/browser/zen-welcome.ftl b/locales/cy/browser/browser/zen-welcome.ftl
index 5b7310dc4..e3b5e3287 100644
--- a/locales/cy/browser/browser/zen-welcome.ftl
+++ b/locales/cy/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index 26d705929..62331ea60 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Handlinger
 zen-site-data-settings = Indstillinger
 zen-generic-manage = Administrer
 zen-generic-more = Mere
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Tilladt
 zen-site-data-setting-block = Blokeret
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Tilføj udvidelser
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/da/browser/browser/zen-welcome.ftl b/locales/da/browser/browser/zen-welcome.ftl
index ffe45216e..d51350c3e 100644
--- a/locales/da/browser/browser/zen-welcome.ftl
+++ b/locales/da/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Kom i gang!
 zen-welcome-default-search-title = Din standardsøgemaskine
 zen-welcome-default-search-description = Vælg din standardsøgemaskine. Du kan altid ændre det senere!
 zen-welcome-skip-button = Spring over
-zen-welcome-next-action = Næste
 zen-welcome-finished = Din Zen er blevet opsat korrekt!
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 30e94dbc6..37dd9548d 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Aktionen
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/de/browser/browser/zen-welcome.ftl b/locales/de/browser/browser/zen-welcome.ftl
index aa2e41933..7a860e4df 100644
--- a/locales/de/browser/browser/zen-welcome.ftl
+++ b/locales/de/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Los geht's!
 zen-welcome-default-search-title = Ihre Standard-Suchmaschine
 zen-welcome-default-search-description = Wählen Sie Ihre Standard-Suchmaschine. Sie können diese später jederzeit ändern!
 zen-welcome-skip-button = Überspringen
-zen-welcome-next-action = Weiter
 zen-welcome-finished = Ihr Zen wurde erfolgreich eingerichtet!
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 940104de5..033ae6c6d 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/el/browser/browser/zen-welcome.ftl b/locales/el/browser/browser/zen-welcome.ftl
index fa9bcce37..3b6840565 100644
--- a/locales/el/browser/browser/zen-welcome.ftl
+++ b/locales/el/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Ξεκινάμε!
 zen-welcome-default-search-title = Η Προεπιλεγμένη Μηχανή Αναζήτησης Σας
 zen-welcome-default-search-description = Επιλέξτε την προεπιλεγμένη μηχανή αναζήτησης. Μπορείτε πάντα να την αλλάξετε αργότερα!
 zen-welcome-skip-button = Παράλειψη
-zen-welcome-next-action = Επόμενο
 zen-welcome-finished = Το Zen σας έχει ρυθμιστεί σωστά!
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index 5efaaabd5..0d1fa69b0 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -53,6 +53,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -68,6 +69,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/en-GB/browser/browser/zen-welcome.ftl b/locales/en-GB/browser/browser/zen-welcome.ftl
index 2aeceeb88..0f22364c9 100644
--- a/locales/en-GB/browser/browser/zen-welcome.ftl
+++ b/locales/en-GB/browser/browser/zen-welcome.ftl
@@ -21,5 +21,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index a88bca030..0048dfb91 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Ajustes
 zen-generic-manage = Administrar
 zen-generic-more = Más
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Añadir extensión
 zen-site-data-site-settings = 
     .label = Todas las configuraciones del sitio
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Protección del sitio
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Un nuevo hogar para complementos, permisos y más
 zen-site-data-panel-feature-callout-subtitle = Haga clic en el icono para administrar la configuración del sitio, ver información de seguridad, acceder a extensiones, y realizar acciones comunes.
diff --git a/locales/es-ES/browser/browser/zen-welcome.ftl b/locales/es-ES/browser/browser/zen-welcome.ftl
index 9bba81e9d..9a855f7ee 100644
--- a/locales/es-ES/browser/browser/zen-welcome.ftl
+++ b/locales/es-ES/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = ¡Comencemos!
 zen-welcome-default-search-title = Su motor de búsqueda predeterminado
 zen-welcome-default-search-description = Elija su motor de búsqueda predeterminado. ¡Siempre puede cambiarlo más tarde!
 zen-welcome-skip-button = Omitir
-zen-welcome-next-action = Siguiente
 zen-welcome-finished = ¡Su Zen se ha configurado correctamente!
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index edd366bee..c0048e676 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Tegevused
 zen-site-data-settings = Sätted
 zen-generic-manage = Halda
 zen-generic-more = Rohkem
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Lubatud
 zen-site-data-setting-block = Keelatud
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Lisa laiendusi
 zen-site-data-site-settings = 
     .label = Kõik saidi sätted
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/et/browser/browser/zen-welcome.ftl b/locales/et/browser/browser/zen-welcome.ftl
index c8f092249..fe19b2e7c 100644
--- a/locales/et/browser/browser/zen-welcome.ftl
+++ b/locales/et/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Hakkame pihta!
 zen-welcome-default-search-title = Sinu vaikimisi otsingumootor
 zen-welcome-default-search-description = Vali oma vaikimisi otsingumootor. Saad seda alati hiljem muuta!
 zen-welcome-skip-button = Jäta vahele
-zen-welcome-next-action = Edasi
 zen-welcome-finished = Zen on edukalt seadistatud!
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index 28f10d3bd..60d6ea694 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/fa/browser/browser/zen-welcome.ftl b/locales/fa/browser/browser/zen-welcome.ftl
index 0767c9bb0..86d517ffd 100644
--- a/locales/fa/browser/browser/zen-welcome.ftl
+++ b/locales/fa/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 30cbb9baa..79ff46827 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/fi/browser/browser/zen-welcome.ftl b/locales/fi/browser/browser/zen-welcome.ftl
index 0767c9bb0..86d517ffd 100644
--- a/locales/fi/browser/browser/zen-welcome.ftl
+++ b/locales/fi/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 281f3d0c8..0de2c4dde 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Paramètres
 zen-generic-manage = Gérer
 zen-generic-more = Plus
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Autorisé
 zen-site-data-setting-block = Bloqué
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Ajouter des extensions
 zen-site-data-site-settings = 
     .label = Tous les paramètres du site
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copier l'URL
 zen-site-data-setting-site-protection = Protection du site
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Un nouvel endroit pour vos extensions, permissions et plus encore
 zen-site-data-panel-feature-callout-subtitle = Cliquez sur l'icône pour gérer les paramètres du site, afficher les infos de sécurité, accéder aux extensions et effectuer d'autres actions.
diff --git a/locales/fr/browser/browser/zen-welcome.ftl b/locales/fr/browser/browser/zen-welcome.ftl
index 037d9d80c..2de8e50ca 100644
--- a/locales/fr/browser/browser/zen-welcome.ftl
+++ b/locales/fr/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = C’est parti !
 zen-welcome-default-search-title = Votre moteur de recherche par défaut
 zen-welcome-default-search-description = Sélectionnez votre moteur de recherche par défaut. Vous pouvez toujours le modifier plus tard !
 zen-welcome-skip-button = Ignorer
-zen-welcome-next-action = Suivant
 zen-welcome-finished = Votre navigateur Zen a été configuré correctement !
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 128810442..8094f2b23 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Gníomhartha
 zen-site-data-settings = Socruithe
 zen-generic-manage = Bainistigh
 zen-generic-more = Tuilleadh
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Ceadaithe
 zen-site-data-setting-block = Blocáilte
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Cuir Síneadh leis
 zen-site-data-site-settings = 
     .label = Gach Socrú Suímh
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Cóipeáil URL
 zen-site-data-setting-site-protection = Cosaint Láithreáin
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Baile nua do bhreiseáin, ceadanna agus tuilleadh
 zen-site-data-panel-feature-callout-subtitle = Cliceáil an deilbhín chun socruithe suímh a bhainistiú, faisnéis slándála a fheiceáil, rochtain a fháil ar shínteáin, agus gníomhartha coitianta a dhéanamh.
diff --git a/locales/ga-IE/browser/browser/zen-welcome.ftl b/locales/ga-IE/browser/browser/zen-welcome.ftl
index 643197f3b..496336dd3 100644
--- a/locales/ga-IE/browser/browser/zen-welcome.ftl
+++ b/locales/ga-IE/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Tum isteach!
 zen-welcome-default-search-title = D'Inneall Cuardaigh Réamhshocraithe
 zen-welcome-default-search-description = Roghnaigh d'inneall cuardaigh réamhshocraithe. Is féidir leat é a athrú níos déanaí!
 zen-welcome-skip-button = Scipeáil
-zen-welcome-next-action = Ar Aghaidh
 zen-welcome-finished = Tá do Zen socraithe i gceart!
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index a6a31bcbb..8005fcacb 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = פעולות
 zen-site-data-settings = הגדרות
 zen-generic-manage = ניהול
 zen-generic-more = עוד
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = אושר
 zen-site-data-setting-block = חסום
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = הוספת תוספים
 zen-site-data-site-settings = 
     .label = כל הגדרות אתר
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = בטיחות אתר
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = בית חדש לתוספים, הרשאות, ועוד
 zen-site-data-panel-feature-callout-subtitle = ניתן ללחוץ על הסמל כדי לנהל הגדרות אתר, לצפות במידע אבטחה, לגשת לתוספים, ולבצע פעולות נפוצות.
diff --git a/locales/he/browser/browser/zen-welcome.ftl b/locales/he/browser/browser/zen-welcome.ftl
index 1595bd1dd..a4949f8c1 100644
--- a/locales/he/browser/browser/zen-welcome.ftl
+++ b/locales/he/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = יאללה בלאגן!
 zen-welcome-default-search-title = מנוע החיפוש ברירת מחדל שלך
 zen-welcome-default-search-description = יש לבחור את מנוע החיפוש ברירת מחדל שלך. תמיד ניתן לשנות אותו!
 zen-welcome-skip-button = דלג
-zen-welcome-next-action = הבא
 zen-welcome-finished = הZen שלך הוגדר בהצלחה!
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 4eb00d02a..2a7c947c0 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Műveletek
 zen-site-data-settings = Beállítások
 zen-generic-manage = Kezelés
 zen-generic-more = Több
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Engedélyezve
 zen-site-data-setting-block = Letiltva
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Kiegészítő hozzáadása
 zen-site-data-site-settings = 
     .label = Minden webhelybeállítás
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Oldalvédelem
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Új hely az add-onok, engedélyek és egyéb elemek számára
 zen-site-data-panel-feature-callout-subtitle = Kattints az ikonra a webhely beállításainak kezeléséhez, a biztonsági információk megtekintéséhez, a kiegészítők eléréséhez és a gyakori műveletek végrehajtásához.
diff --git a/locales/hu/browser/browser/zen-welcome.ftl b/locales/hu/browser/browser/zen-welcome.ftl
index daefeb7c6..498869a73 100644
--- a/locales/hu/browser/browser/zen-welcome.ftl
+++ b/locales/hu/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Merüljön el!
 zen-welcome-default-search-title = Az Ön alapértelmezett keresőmotorja
 zen-welcome-default-search-description = Válassza ki az alapértelmezett keresőmotort. Később bármikor megváltoztathatja!
 zen-welcome-skip-button = Kihagyás
-zen-welcome-next-action = Következő
 zen-welcome-finished = A Zen helyesen lett beállítva!
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index f065c4669..c228da851 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Aksi
 zen-site-data-settings = Pengaturan
 zen-generic-manage = Kelola
 zen-generic-more = Selengkapnya
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Diizinkan
 zen-site-data-setting-block = Diblokir
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Tambahkan Ekstensi
 zen-site-data-site-settings = 
     .label = Semua Pengaturan Situs
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Salin URL
 zen-site-data-setting-site-protection = Perlindungan Situs
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Rumah baru untuk add-on, izin, dan lainnya
 zen-site-data-panel-feature-callout-subtitle = Klik ikon untuk mengelola pengaturan situs, melihat info keamanan, mengakses ekstensi, dan melakukan tindakan umum.
diff --git a/locales/id/browser/browser/zen-welcome.ftl b/locales/id/browser/browser/zen-welcome.ftl
index 63b7d4b05..8cebcb240 100644
--- a/locales/id/browser/browser/zen-welcome.ftl
+++ b/locales/id/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Penyelaman dimulai!
 zen-welcome-default-search-title = Mesin Pencari Default Anda
 zen-welcome-default-search-description = Pilih mesin pencari default Anda. Anda selalu dapat mengubahnya nanti!
 zen-welcome-skip-button = Lewati
-zen-welcome-next-action = Lanjut
 zen-welcome-finished = Anda berhasil mengatur Zen milik anda!
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index be97016f6..8e416e1ec 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/is/browser/browser/zen-welcome.ftl b/locales/is/browser/browser/zen-welcome.ftl
index 0767c9bb0..86d517ffd 100644
--- a/locales/is/browser/browser/zen-welcome.ftl
+++ b/locales/is/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 9f4afe3bb..71f7ee652 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -53,6 +53,7 @@ urlbar-search-mode-zen_actions = Azioni
 zen-site-data-settings = Impostazioni
 zen-generic-manage = Gestisci
 zen-generic-more = Altro
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Consentito
 zen-site-data-setting-block = Bloccato
@@ -68,6 +69,11 @@ zen-site-data-get-addons =
     .label = Aggiungi estensioni
 zen-site-data-site-settings = 
     .label = Tutte le impostazioni del sito
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Protezione sito
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Una nuova casa per componenti aggiuntivi, permessi, e altro ancora
 zen-site-data-panel-feature-callout-subtitle = Clicca l'icona per gestire le impostazioni del sito, visualizzare informazioni di sicurezza, accedere alle estensioni, ed eseguire azioni comuni.
diff --git a/locales/it/browser/browser/zen-welcome.ftl b/locales/it/browser/browser/zen-welcome.ftl
index 0e4f1dda8..986abd1e7 100644
--- a/locales/it/browser/browser/zen-welcome.ftl
+++ b/locales/it/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Andiamo!
 zen-welcome-default-search-title = Il tuo Motore di Ricerca Predefinito
 zen-welcome-default-search-description = Scegli il tuo motore di ricerca predefinito. Puoi sempre cambiarlo più tardi!
 zen-welcome-skip-button = Salta
-zen-welcome-next-action = Prossimo
 zen-welcome-finished = Il tuo Zen è stato configurato correttamente!
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index f7397ca6d..97af620fc 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/ja/browser/browser/zen-welcome.ftl b/locales/ja/browser/browser/zen-welcome.ftl
index 4aa447a5d..c3141d9ae 100644
--- a/locales/ja/browser/browser/zen-welcome.ftl
+++ b/locales/ja/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = スキップ
-zen-welcome-next-action = 次へ
 zen-welcome-finished = Zen の設定が完了しました！
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 6b0d3fee0..5685851bf 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = 액션
 zen-site-data-settings = 설정
 zen-generic-manage = 관리
 zen-generic-more = 더 보기
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = 허용됨
 zen-site-data-setting-block = 금지됨
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = 확장 프로그램 추가
 zen-site-data-site-settings = 
     .label = 모든 사이트 설정
+zen-urlbar-copy-url-button = 
+    .tooltiptext = URL 복사
 zen-site-data-setting-site-protection = 사이트 보호
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = 애드온, 권한, 그리고 더 많은 것을 위한 새로운 곳
 zen-site-data-panel-feature-callout-subtitle = 아이콘을 클릭해 사이트 설정, 보안 정보 조회, 확장 프로그램 접근, 기타 행동을 수행할 수 있습니다.
diff --git a/locales/ko/browser/browser/zen-welcome.ftl b/locales/ko/browser/browser/zen-welcome.ftl
index b166a2b4e..8c308c07a 100644
--- a/locales/ko/browser/browser/zen-welcome.ftl
+++ b/locales/ko/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = 시작하기!
 zen-welcome-default-search-title = 기본 검색 엔진
 zen-welcome-default-search-description = 기본 검색 엔진을 선택하세요. 나중에 언제든지 바꿀 수 있습니다!
 zen-welcome-skip-button = 건너뛰기
-zen-welcome-next-action = 다음
 zen-welcome-finished = Zen이 정상적으로 설정되었습니다!
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index e6c4ac290..20db4d4fc 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Veiksmai
 zen-site-data-settings = Nustatymai
 zen-generic-manage = Tvarkyti
 zen-generic-more = Daugiau
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Leidžiama
 zen-site-data-setting-block = Užblokuota
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Įtraukti plėtinius
 zen-site-data-site-settings = 
     .label = Visi svetainės nustatymai
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Svetainės apsauga
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Nauji namai priedams, leidimams ir daugiau
 zen-site-data-panel-feature-callout-subtitle = Spustelėkite piktogramą, kad tvarkytumėte svetainės nustatymus, peržiūrėtumėte saugumo informaciją, pasiektumėte plėtinius ir atliktumėte įprastus veiksmus.
diff --git a/locales/lt/browser/browser/zen-welcome.ftl b/locales/lt/browser/browser/zen-welcome.ftl
index 90eac7629..03ceb5b64 100644
--- a/locales/lt/browser/browser/zen-welcome.ftl
+++ b/locales/lt/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Pirmyn!
 zen-welcome-default-search-title = Jūsų numatytasis paieškos variklis
 zen-welcome-default-search-description = Pasirinkite numatytąjį paieškos variklį. Vėliau visada galite ją pakeisti!
 zen-welcome-skip-button = Praleisti
-zen-welcome-next-action = Toliau
 zen-welcome-finished = Jūsų „Zen“ nustatytas teisingai!
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 024dc2692..12541a870 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/nl/browser/browser/zen-welcome.ftl b/locales/nl/browser/browser/zen-welcome.ftl
index 7095987d8..b1a2c3270 100644
--- a/locales/nl/browser/browser/zen-welcome.ftl
+++ b/locales/nl/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Duik erin!
 zen-welcome-default-search-title = Je standaard zoekmachine
 zen-welcome-default-search-description = Kies je standaard zoekmachine. Je kunt het altijd later wijzigen!
 zen-welcome-skip-button = Overslaan
-zen-welcome-next-action = Volgende
 zen-welcome-finished = Je Zen is correct ingesteld!
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index aaa6fa7c8..91e2b07b0 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/nn-NO/browser/browser/zen-welcome.ftl b/locales/nn-NO/browser/browser/zen-welcome.ftl
index 0767c9bb0..86d517ffd 100644
--- a/locales/nn-NO/browser/browser/zen-welcome.ftl
+++ b/locales/nn-NO/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index cc104d4b2..46795be5b 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/pl/browser/browser/zen-welcome.ftl b/locales/pl/browser/browser/zen-welcome.ftl
index d001cd53d..72e1e36b3 100644
--- a/locales/pl/browser/browser/zen-welcome.ftl
+++ b/locales/pl/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Wskakuj!
 zen-welcome-default-search-title = Twój domyślny silnik wyszukiwania
 zen-welcome-default-search-description = Wybierz swój domyślny silnik wyszukiwania. Możesz to zmienić w przyszłości!
 zen-welcome-skip-button = Pomiń
-zen-welcome-next-action = Dalej
 zen-welcome-finished = Twoja przeglądarka Zen została prawidłowo przygotowana!
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 2eac3976e..067d15640 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -53,6 +53,7 @@ urlbar-search-mode-zen_actions = Ações
 zen-site-data-settings = Configurações
 zen-generic-manage = Gerenciar
 zen-generic-more = Mais
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
@@ -68,6 +69,11 @@ zen-site-data-get-addons =
     .label = Adicionar Extensões
 zen-site-data-site-settings = 
     .label = Todas as Configurações do Site
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/pt-BR/browser/browser/zen-welcome.ftl b/locales/pt-BR/browser/browser/zen-welcome.ftl
index da92f871c..e2ff11fb3 100644
--- a/locales/pt-BR/browser/browser/zen-welcome.ftl
+++ b/locales/pt-BR/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Mergulhe de cabeça!
 zen-welcome-default-search-title = Seu Mecanismo de Busca Padrão
 zen-welcome-default-search-description = Escolha seu mecanismo de busca padrão. Você sempre pode alterá-lo mais tarde!
 zen-welcome-skip-button = Pular
-zen-welcome-next-action = Próximo
 zen-welcome-finished = Seu Zen foi configurado corretamente!
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 69db8a622..892d98130 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Ações
 zen-site-data-settings = Definições
 zen-generic-manage = Gerir
 zen-generic-more = Mais
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Adicionar Extensões
 zen-site-data-site-settings = 
     .label = Todas as Definições do Site
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Proteção do Site
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Uma nova casa para extensões, permissões e mais
 zen-site-data-panel-feature-callout-subtitle = Clique no ícone para gerir definições do site, ver informações de segurança, extensões de acesso e executar ações comuns.
diff --git a/locales/pt-PT/browser/browser/zen-welcome.ftl b/locales/pt-PT/browser/browser/zen-welcome.ftl
index c8de82e41..ae323133a 100644
--- a/locales/pt-PT/browser/browser/zen-welcome.ftl
+++ b/locales/pt-PT/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Mergulhar!
 zen-welcome-default-search-title = O seu Motor de Busca Padrão
 zen-welcome-default-search-description = Escolha o seu motor de busca padrão. Pode sempre alterá-lo mais tarde!
 zen-welcome-skip-button = Ignorar
-zen-welcome-next-action = Seguinte
 zen-welcome-finished = O seu Zen foi configurado corretamente!
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 888caae27..49a42cfd0 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Действия
 zen-site-data-settings = Настройки
 zen-generic-manage = Изменить
 zen-generic-more = Ещё
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Разрешено
 zen-site-data-setting-block = Запрещено
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Добавить расширения
 zen-site-data-site-settings = 
     .label = Все настройки сайта
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Защищённое соединение
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Новый дом для расширений, разрешений и всего остального
 zen-site-data-panel-feature-callout-subtitle = Нажмите на значок для доступа к настройкам сайта, параметрам безопасности, расширениям и прочим действиям.
diff --git a/locales/ru/browser/browser/zen-welcome.ftl b/locales/ru/browser/browser/zen-welcome.ftl
index 147db34bd..27ad1ed1b 100644
--- a/locales/ru/browser/browser/zen-welcome.ftl
+++ b/locales/ru/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Погрузиться!
 zen-welcome-default-search-title = Ваша поисковая система по умолчанию
 zen-welcome-default-search-description = Выберите поисковую систему по умолчанию. Вы всегда можете изменить её позже!
 zen-welcome-skip-button = Пропустить
-zen-welcome-next-action = Продолжить
 zen-welcome-finished = Zen настроен правильно!
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index f5868a1d3..56034535f 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/sv-SE/browser/browser/zen-welcome.ftl b/locales/sv-SE/browser/browser/zen-welcome.ftl
index 118f71d08..f375130db 100644
--- a/locales/sv-SE/browser/browser/zen-welcome.ftl
+++ b/locales/sv-SE/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dyk in!
 zen-welcome-default-search-title = Din standardsökmotor
 zen-welcome-default-search-description = Välj din standardsökmotor. Du kan alltid ändra det senare!
 zen-welcome-skip-button = Hoppa över
-zen-welcome-next-action = Nästa
 zen-welcome-finished = Din Zen har konfigurerats korrekt!
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index aaa6fa7c8..91e2b07b0 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/th/browser/browser/zen-welcome.ftl b/locales/th/browser/browser/zen-welcome.ftl
index 0767c9bb0..86d517ffd 100644
--- a/locales/th/browser/browser/zen-welcome.ftl
+++ b/locales/th/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Dive in!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 zen-welcome-skip-button = Skip
-zen-welcome-next-action = Next
 zen-welcome-finished = Your Zen has been set up correctly!
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 4406e4de1..6009916db 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/tr/browser/browser/zen-welcome.ftl b/locales/tr/browser/browser/zen-welcome.ftl
index 69b30038c..d70d19049 100644
--- a/locales/tr/browser/browser/zen-welcome.ftl
+++ b/locales/tr/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = İçeri dal!
 zen-welcome-default-search-title = Varsayılan Arama Motorun
 zen-welcome-default-search-description = Varsayılan arama motorunu seç. Bu seçimi istediğin zaman değiştirebilirsin!
 zen-welcome-skip-button = Geç
-zen-welcome-next-action = Sonraki
 zen-welcome-finished = Zen başarıyla kuruldu ve ayarlandı!
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index ede9b850c..55c8a12a5 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Дії
 zen-site-data-settings = Налаштування
 zen-generic-manage = Керувати
 zen-generic-more = Більше
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Дозволено
 zen-site-data-setting-block = Заблоковано
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Додати розширення
 zen-site-data-site-settings = 
     .label = Усі налаштування сайту
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Захист сайту
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = Новий дім для доповнень, дозволів тощо
 zen-site-data-panel-feature-callout-subtitle = Натисніть значок, щоби керувати налаштуваннями сайту, переглядати інформацію про безпеку, отримувати доступ до розширень і виконувати поширені дії.
diff --git a/locales/uk/browser/browser/zen-welcome.ftl b/locales/uk/browser/browser/zen-welcome.ftl
index b09c46e95..ef00afeea 100644
--- a/locales/uk/browser/browser/zen-welcome.ftl
+++ b/locales/uk/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Зануритися!
 zen-welcome-default-search-title = Ваша типова пошукова система
 zen-welcome-default-search-description = Оберіть вашу типову пошукову систему. Ви завжди зможете змінити її пізніше!
 zen-welcome-skip-button = Пропустити
-zen-welcome-next-action = Далі
 zen-welcome-finished = Zen налаштовано правильно!
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 8b98d5df9..cfadf30e7 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -55,6 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -70,6 +71,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/vi/browser/browser/zen-welcome.ftl b/locales/vi/browser/browser/zen-welcome.ftl
index aeed748f1..8cb2574c6 100644
--- a/locales/vi/browser/browser/zen-welcome.ftl
+++ b/locales/vi/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = Bắt đầu nào!
 zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Hãy chọn công cụ tìm kiếm mặc đinh. Bạn luôn có thể đổi nó sau này!
 zen-welcome-skip-button = Bỏ qua
-zen-welcome-next-action = Tiếp theo
 zen-welcome-finished = Trình duyệt của bạn đã được thiết lập thành công!
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index 39abbc6e6..bb47d1c41 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -53,6 +53,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -68,6 +69,11 @@ zen-site-data-get-addons =
     .label = 添加扩展
 zen-site-data-site-settings = 
     .label = 所有站点设置
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/zh-CN/browser/browser/zen-welcome.ftl b/locales/zh-CN/browser/browser/zen-welcome.ftl
index be5e1ff37..ba7a349f3 100644
--- a/locales/zh-CN/browser/browser/zen-welcome.ftl
+++ b/locales/zh-CN/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = 立刻开始！
 zen-welcome-default-search-title = 您的默认搜索引擎
 zen-welcome-default-search-description = 选择您的默认搜索引擎。您可以随时更改它！
 zen-welcome-skip-button = 跳过
-zen-welcome-next-action = 下一步
 zen-welcome-finished = 您的 Zen 已正确设置！
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index 650c6df0e..ea1198fe5 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -53,6 +53,7 @@ urlbar-search-mode-zen_actions = 操作
 zen-site-data-settings = Settings
 zen-generic-manage = Manage
 zen-generic-more = More
+zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
@@ -68,6 +69,11 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-urlbar-copy-url-button = 
+    .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
+
+# Section: Feature callouts
+
 zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
diff --git a/locales/zh-TW/browser/browser/zen-welcome.ftl b/locales/zh-TW/browser/browser/zen-welcome.ftl
index c572eb13e..20cb671b2 100644
--- a/locales/zh-TW/browser/browser/zen-welcome.ftl
+++ b/locales/zh-TW/browser/browser/zen-welcome.ftl
@@ -23,5 +23,4 @@ zen-welcome-start-browsing = 立即開始！
 zen-welcome-default-search-title = 您的預設搜尋引擎
 zen-welcome-default-search-description = 選擇您的預設搜尋引擎，您可以隨時更改它！
 zen-welcome-skip-button = 跳過
-zen-welcome-next-action = 下一步
 zen-welcome-finished = 您的 Zen 瀏覽器已成功設定！

From 02dd985e8fd904899500e4ea98532c6e8df0d01b Mon Sep 17 00:00:00 2001
From: Slowlife <slowlife1165@gmail.com>
Date: Tue, 14 Oct 2025 19:45:15 +0700
Subject: [PATCH 083/111] fix: media position state getting stuck after seek,
 p=#10809, c=media

---
 .../mediacontrol/MediaStatusManager-cpp.patch      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/dom/media/mediacontrol/MediaStatusManager-cpp.patch

diff --git a/src/dom/media/mediacontrol/MediaStatusManager-cpp.patch b/src/dom/media/mediacontrol/MediaStatusManager-cpp.patch
new file mode 100644
index 000000000..9e005e88c
--- /dev/null
+++ b/src/dom/media/mediacontrol/MediaStatusManager-cpp.patch
@@ -0,0 +1,14 @@
+diff --git a/dom/media/mediacontrol/MediaStatusManager.cpp b/dom/media/mediacontrol/MediaStatusManager.cpp
+index 9d62b302fb519df9c00e26e8876dc6adcbc0b448..ece3509d2a99dee1cf7c22749b38959340c85976 100644
+--- a/dom/media/mediacontrol/MediaStatusManager.cpp
++++ b/dom/media/mediacontrol/MediaStatusManager.cpp
+@@ -427,7 +427,8 @@ void MediaStatusManager::UpdateGuessedPositionState(
+     return;
+   }
+ 
+-  mPositionStateChangedEvent.Notify(GetCurrentPositionState());
++  // Workaround to position state getting stuck after seek
++  mPositionStateChangedEvent.Notify(aGuessedState);
+ }
+ 
+ void MediaStatusManager::NotifySupportedKeysChangedIfNeeded(

From 0446cc783376169f9e390c4db9b0a0b8128dee7b Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 17:24:42 +0200
Subject: [PATCH 084/111] chore: Updated to Firefox `144.0`, b=no-bug, c=l10n

---
 README.md                                 | 2 +-
 build/firefox-cache/l10n-last-commit-hash | 2 +-
 surfer.json                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d61a328ca..f9166612c 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `143.0.4`! 🚀
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `144.0`! 🚀
 - [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 144.0`!
 
 ### Contributing
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 12646d8ca..34eb47c39 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-dd57c783345c5401fcdcc48e83b1fa9ce511d1cf
\ No newline at end of file
+16e978d10b8a1c49267e8f1574f52c3e0d5089ae
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index 9b19fc205..0406df841 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "143.0.4",
+    "version": "144.0",
     "candidate": "144.0"
   },
   "buildOptions": {

From 5ad5341f5b5a64ca85c5f22e38ed7b916764c6e6 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 20:55:27 +0200
Subject: [PATCH 085/111] feat: Always show the remaining overflowed button if
 only one is left, b=no-bug, c=common

---
 .../CustomizableUI-sys-mjs.patch              | 34 ++++++++++---------
 src/zen/common/ZenCustomizableUI.sys.mjs      |  2 +-
 surfer.json                                   |  4 +--
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index abfdf5f78..905c782ca 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb074aa94d 100644
+index d9a059f608779fea7cd8c595a432f6fe95183e0c..7f6493ced4abb1f6ba54242b8ee213a74f01aea5 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -127,15 +127,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb
      this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
        this.setLocationAttributes(aNode, aAreaId);
        aContainer.insertBefore(aNode, aNextNode);
-@@ -3306,7 +3305,6 @@ var CustomizableUIInternal = {
-     if (!this.isWidgetRemovable(aWidgetId)) {
-       return;
-     }
--
-     let placements = gPlacements.get(oldPlacement.area);
-     let position = placements.indexOf(aWidgetId);
-     if (position != -1) {
-@@ -4541,7 +4539,7 @@ var CustomizableUIInternal = {
+@@ -4541,7 +4540,7 @@ var CustomizableUIInternal = {
     * For all registered areas, builds those areas to reflect the current
     * placement state of all widgets.
     */
@@ -144,7 +136,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -4552,7 +4550,7 @@ var CustomizableUIInternal = {
+@@ -4552,7 +4551,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -153,7 +145,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -5843,6 +5841,7 @@ export var CustomizableUI = {
+@@ -5843,6 +5842,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -161,7 +153,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -7890,11 +7889,11 @@ class OverflowableToolbar {
+@@ -7890,11 +7890,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -175,7 +167,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb
      });
  
      lazy.log.debug(
-@@ -7909,7 +7908,8 @@ class OverflowableToolbar {
+@@ -7909,7 +7909,8 @@ class OverflowableToolbar {
        Math.max(targetWidth, targetChildrenWidth)
      );
      totalAvailWidth = Math.ceil(totalAvailWidth);
@@ -185,7 +177,17 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -8003,7 +8003,7 @@ class OverflowableToolbar {
+@@ -7970,7 +7971,8 @@ class OverflowableToolbar {
+             return;
+           }
+         }
+-        if (totalAvailWidth <= minSize) {
++        let isLastItem = win.gZenVerticalTabsManager._hasSetSingleToolbar && this.#target.id == 'zen-sidebar-top-buttons-customization-target' && this.#overflowedInfo.size == 1;
++        if (totalAvailWidth <= minSize && !isLastItem) {
+           lazy.log.debug(
+             `Need ${minSize} but width is ${totalAvailWidth} so bailing`
+           );
+@@ -8003,7 +8005,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -194,7 +196,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..a3c18551e3b24ee86a4373cbbc4f2cdb
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8348,7 +8348,7 @@ class OverflowableToolbar {
+@@ -8348,7 +8350,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {
diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index e494a6cf6..6be1ced7b 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -37,7 +37,7 @@ export var ZenCustomizableUI = new (class {
   }
 
   #addSidebarButtons(window) {
-    const kDefaultSidebarWidth = '210px';
+    const kDefaultSidebarWidth = '215px';
     const toolbox = window.gNavToolbox;
 
     // Set a splitter to navigator-toolbox
diff --git a/surfer.json b/surfer.json
index 0406df841..d2baf90a9 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.16.3b",
+        "displayVersion": "1.17b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -39,7 +39,7 @@
       "brandShortName": "Twilight",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.17t",
+        "displayVersion": "1.18t",
         "github": {
           "repo": "zen-browser/desktop"
         }

From 80623a8e46662dcc4cbae416acec1cb91b948aed Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 14 Oct 2025 21:00:30 +0200
Subject: [PATCH 086/111] chore: Remove unused ffmpeg/vaapi prefs from gtk,
 b=no-bug, c=no-component

---
 prefs/zen/gtk.yaml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/prefs/zen/gtk.yaml b/prefs/zen/gtk.yaml
index 9f8a6e226..d68eb68a7 100644
--- a/prefs/zen/gtk.yaml
+++ b/prefs/zen/gtk.yaml
@@ -5,17 +5,8 @@
 # GTK-specific preferences
 - name: widget.gtk.rounded-bottom-corners.enabled
   value: true
-  condition: 'defined(MOZ_WIDGET_GTK) && defined(UNIX_BUT_NOT_MAC)'
+  condition: 'defined(MOZ_WIDGET_GTK)'
 
 - name: zen.widget.linux.transparency
   value: false
   condition: 'defined(MOZ_WIDGET_GTK)'
-
-# VAAPI/FFmpeg preferences for Linux
-- name: media.ffmpeg.vaapi.enabled
-  value: true
-  condition: 'defined(MOZ_WIDGET_GTK)'
-
-- name: media.ffmpeg.encoder.enabled
-  value: true
-  condition: 'defined(MOZ_WIDGET_GTK)'

From c06de3372d328437e203655a92c3fcee8898fc2c Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 15 Oct 2025 02:06:51 +0200
Subject: [PATCH 087/111] test: Fixed tests and other small QA fixes, b=no-bug,
 c=common, workspaces

---
 locales/en-US/browser/browser/zen-general.ftl |  4 ++-
 .../base/content/zen-locales.inc.xhtml        |  2 ++
 src/image/DecoderFactory-cpp.patch            | 32 -------------------
 .../common/styles/zen-single-components.css   |  8 ++++-
 src/zen/workspaces/ZenGradientGenerator.mjs   |  9 ++++--
 src/zen/workspaces/ZenWorkspaces.mjs          |  7 ++--
 6 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 src/image/DecoderFactory-cpp.patch

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 636809b2f..d75efe43d 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -31,7 +31,7 @@ pictureinpicture-minimize-btn =
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
 
-zen-copy-current-url-confirmation = Copied Current URL!
+zen-copy-current-url-confirmation = Copied current URL!
 
 zen-general-cancel-label =
     .label = Cancel
@@ -90,6 +90,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings =
     .label = All Site Settings
+zen-site-data-share =
+    .label = Share This Page
 
 zen-urlbar-copy-url-button =
   .tooltiptext = Copy URL
diff --git a/src/browser/base/content/zen-locales.inc.xhtml b/src/browser/base/content/zen-locales.inc.xhtml
index b9693795e..247fbbc51 100644
--- a/src/browser/base/content/zen-locales.inc.xhtml
+++ b/src/browser/base/content/zen-locales.inc.xhtml
@@ -2,8 +2,10 @@
 # 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/.
 
+<linkset>
 <link rel="localization" href="browser/zen-workspaces.ftl"/>
 <link rel="localization" href="browser/zen-split-view.ftl"/>
 <link rel="localization" href="browser/zen-general.ftl"/>
 <link rel="localization" href="browser/zen-vertical-tabs.ftl"/>
 <link rel="localization" href="browser/zen-folders.ftl"/>
+</linkset>
diff --git a/src/image/DecoderFactory-cpp.patch b/src/image/DecoderFactory-cpp.patch
deleted file mode 100644
index 63e321437..000000000
--- a/src/image/DecoderFactory-cpp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/image/DecoderFactory.cpp b/image/DecoderFactory.cpp
-index 21c94898cbbce9bdc9dec87c7e3e05fec77fb7c1..83a8fcc3aca34c61ac7334eb4b4ef3f3ea21c7ab 100644
---- a/image/DecoderFactory.cpp
-+++ b/image/DecoderFactory.cpp
-@@ -249,7 +249,12 @@ nsresult DecoderFactory::CreateAnimationDecoder(
-   }
- 
-   MOZ_ASSERT(aType == DecoderType::GIF || aType == DecoderType::PNG ||
--                 aType == DecoderType::WEBP || aType == DecoderType::AVIF,
-+                 aType == DecoderType::WEBP || aType == DecoderType::AVIF
-+#ifdef MOZ_JXL
-+                 || aType == DecoderType::JXL,
-+#else
-+             ,
-+#endif
-              "Calling CreateAnimationDecoder for non-animating DecoderType");
- 
-   // Create an anonymous decoder. Interaction with the SurfaceCache and the
-@@ -304,7 +309,12 @@ already_AddRefed<Decoder> DecoderFactory::CloneAnimationDecoder(
-   // rediscover it is animated).
-   DecoderType type = aDecoder->GetType();
-   MOZ_ASSERT(type == DecoderType::GIF || type == DecoderType::PNG ||
--                 type == DecoderType::WEBP || type == DecoderType::AVIF,
-+                 type == DecoderType::WEBP || type == DecoderType::AVIF
-+#ifdef MOZ_JXL
-+                 || aType == DecoderType::JXL,
-+#else
-+             ,
-+#endif
-              "Calling CloneAnimationDecoder for non-animating DecoderType");
- 
-   RefPtr<Decoder> decoder = GetDecoder(type, nullptr, /* aIsRedecode = */ true);
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 8108d4aef..4d78eccc9 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -386,12 +386,17 @@ body > #confetti {
   align-items: center;
 }
 
+.permission-popup-permission-label-container {
+  min-width: 1px;
+}
+
 .permission-popup-permission-label {
   margin: 0px;
   font-weight: 500;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  max-width: 100%;
 }
 
 .permission-popup-permission-icon {
@@ -446,7 +451,8 @@ body > #confetti {
   margin: 0;
 }
 
-#identity-box {
+#identity-box,
+#page-action-buttons {
   opacity: 0.6;
 }
 
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index a28ad93a2..d897442c5 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -126,7 +126,12 @@
         darkModeChange
       );
 
-      XPCOMUtils.defineLazyPreferenceGetter(this, 'darkModeBias', 'zen.theme.dark-mode-bias', 0.5);
+      XPCOMUtils.defineLazyPreferenceGetter(
+        this,
+        'darkModeBias',
+        'zen.theme.dark-mode-bias',
+        '0.5'
+      );
     }
 
     handleDarkModeChange() {
@@ -1212,7 +1217,7 @@
       let lightText = this.getToolbarColor(false); // e.g. [r, g, b, a]
 
       if (this.canBeTransparent) {
-        lightText[3] -= this.darkModeBias; // Reduce alpha for light text
+        lightText[3] -= parseFloat(this.darkModeBias); // Reduce alpha for light text
       }
 
       // Composite text color over background
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 074877269..53378d6a8 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2473,7 +2473,10 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     const shouldHideSeparator =
       pinnedContainer.children.length === 1 ||
       Array.from(arrowScrollbox.children).filter(
-        (child) => !child.hasAttribute('hidden') && !child.hasAttribute('zen-empty-tab')
+        (child) =>
+          !child.hasAttribute('hidden') &&
+          !child.hasAttribute('bursting') &&
+          !child.hasAttribute('zen-empty-tab')
       ).length <= 1;
     if (shouldHideSeparator) {
       pinnedContainer.setAttribute('hide-separator', 'true');
@@ -2498,7 +2501,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     for (const entry of entries) {
       let originalWorkspaceId = entry.target.getAttribute('zen-workspace-id');
       if (!originalWorkspaceId) {
-        originalWorkspaceId = entry.target.closest('zen-workspace')?.id;
+        originalWorkspaceId = entry.target.closest('zen-workspace')?.id || this.activeWorkspace;
       }
       const workspacesIds = [];
       if (entry.target.closest('#zen-essentials')) {

From 2cbfeaee98a94c75e1277450fa4dde118aed97e3 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 15 Oct 2025 02:58:45 +0200
Subject: [PATCH 088/111] chore: New Crowdin updates, p=#10813

---
 locales/ar/browser/browser/zen-general.ftl    | 4 +++-
 locales/ca/browser/browser/zen-general.ftl    | 8 +++++---
 locales/cs/browser/browser/zen-general.ftl    | 4 +++-
 locales/cy/browser/browser/zen-general.ftl    | 4 +++-
 locales/da/browser/browser/zen-general.ftl    | 8 +++++---
 locales/de/browser/browser/zen-general.ftl    | 4 +++-
 locales/el/browser/browser/zen-general.ftl    | 4 +++-
 locales/en-GB/browser/browser/zen-general.ftl | 4 +++-
 locales/es-ES/browser/browser/zen-general.ftl | 6 ++++--
 locales/et/browser/browser/zen-general.ftl    | 4 +++-
 locales/fa/browser/browser/zen-general.ftl    | 4 +++-
 locales/fi/browser/browser/zen-general.ftl    | 4 +++-
 locales/fr/browser/browser/zen-general.ftl    | 6 ++++--
 locales/ga-IE/browser/browser/zen-general.ftl | 4 +++-
 locales/he/browser/browser/zen-general.ftl    | 4 +++-
 locales/hu/browser/browser/zen-general.ftl    | 8 +++++---
 locales/id/browser/browser/zen-general.ftl    | 4 +++-
 locales/is/browser/browser/zen-general.ftl    | 4 +++-
 locales/it/browser/browser/zen-general.ftl    | 6 ++++--
 locales/ja/browser/browser/zen-general.ftl    | 4 +++-
 locales/ko/browser/browser/zen-general.ftl    | 4 +++-
 locales/lt/browser/browser/zen-general.ftl    | 4 +++-
 locales/nl/browser/browser/zen-general.ftl    | 4 +++-
 locales/nn-NO/browser/browser/zen-general.ftl | 4 +++-
 locales/pl/browser/browser/zen-general.ftl    | 4 +++-
 locales/pt-BR/browser/browser/zen-general.ftl | 4 +++-
 locales/pt-PT/browser/browser/zen-general.ftl | 4 +++-
 locales/ru/browser/browser/zen-general.ftl    | 8 +++++---
 locales/sv-SE/browser/browser/zen-general.ftl | 4 +++-
 locales/th/browser/browser/zen-general.ftl    | 4 +++-
 locales/tr/browser/browser/zen-general.ftl    | 4 +++-
 locales/uk/browser/browser/zen-general.ftl    | 8 +++++---
 locales/vi/browser/browser/zen-general.ftl    | 4 +++-
 locales/zh-CN/browser/browser/zen-general.ftl | 4 +++-
 locales/zh-TW/browser/browser/zen-general.ftl | 4 +++-
 35 files changed, 118 insertions(+), 48 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 44838e2cb..5310c4b77 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = لون مخصص
 zen-panel-ui-gradient-generator-saved-message = حفظ معامل التدرج بنجاح!
-zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 96113ca72..c0583e8de 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimitza
 zen-panel-ui-gradient-generator-custom-color = Color personalitzat
 zen-panel-ui-gradient-generator-saved-message = El degradat s'ha desat correctament!
-zen-copy-current-url-confirmation = L'URL s'ha copiat al porta-retalls.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel·la
 zen-general-confirm = 
@@ -55,7 +55,7 @@ urlbar-search-mode-zen_actions = Accions
 zen-site-data-settings = Configuració
 zen-generic-manage = Gestiona
 zen-generic-more = Més
-zen-generic-next = Next
+zen-generic-next = Següent
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permès
 zen-site-data-setting-block = Bloquejat
@@ -71,8 +71,10 @@ zen-site-data-get-addons =
     .label = Afegeix extensions
 zen-site-data-site-settings = 
     .label = Totes les configuracions del lloc
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
+    .tooltiptext = Copia l'URL
 zen-site-data-setting-site-protection = Protecció del lloc
 
 # Section: Feature callouts
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index b6c3f4c11..f740c3d6e 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimalizovat
 zen-panel-ui-gradient-generator-custom-color = Vlastní barva
 zen-panel-ui-gradient-generator-saved-message = Gradient byl úspěšně uložen!
-zen-copy-current-url-confirmation = URL adresa byla zkopírována do schránky.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Zrušit
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Přidat rozšíření
 zen-site-data-site-settings = 
     .label = Nastavení všech stránek
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index 3e2ba6849..530d09c54 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Addasu Lliw
 zen-panel-ui-gradient-generator-saved-message = Llwyddiant arbedi'r graddiant!
-zen-copy-current-url-confirmation = Mae'r URL wedi'i gopïo i'r clipfwrdd.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index 62331ea60..1e31af7e9 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimer
 zen-panel-ui-gradient-generator-custom-color = Brugerdefineret Farve
 zen-panel-ui-gradient-generator-saved-message = Gradienten blev gemt!
-zen-copy-current-url-confirmation = URL'en blev kopieret til udklipsholderen.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Annuller
 zen-general-confirm = 
@@ -55,7 +55,7 @@ urlbar-search-mode-zen_actions = Handlinger
 zen-site-data-settings = Indstillinger
 zen-generic-manage = Administrer
 zen-generic-more = Mere
-zen-generic-next = Next
+zen-generic-next = Næste
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Tilladt
 zen-site-data-setting-block = Blokeret
@@ -71,8 +71,10 @@ zen-site-data-get-addons =
     .label = Tilføj udvidelser
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
+    .tooltiptext = Kopiér URL
 zen-site-data-setting-site-protection = Site Protection
 
 # Section: Feature callouts
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 37dd9548d..017be252d 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimieren
 zen-panel-ui-gradient-generator-custom-color = Benutzerdefinierte Farbe
 zen-panel-ui-gradient-generator-saved-message = Farbverlauf erfolgreich gespeichert!
-zen-copy-current-url-confirmation = Die URL wurde in die Zwischenablage kopiert.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Abbrechen
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 033ae6c6d..731383b07 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Ελαχιστοποίηση
 zen-panel-ui-gradient-generator-custom-color = Προσαρμοσμένο Χρώμα
 zen-panel-ui-gradient-generator-saved-message = Επιτυχής αποθήκευση της διαβάθμισης!
-zen-copy-current-url-confirmation = Το URL έχει αντιγραφεί στο πρόχειρο.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Ακύρωση
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index 0d1fa69b0..b874a309d 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -22,7 +22,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom colour
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
-zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -69,6 +69,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index 0048dfb91..9f5aae4b9 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Color personalizado
 zen-panel-ui-gradient-generator-saved-message = ¡Gradiente guardado con éxito!
-zen-copy-current-url-confirmation = La URL se ha copiado al portapapeles.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancelar
 zen-general-confirm = 
@@ -55,7 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Ajustes
 zen-generic-manage = Administrar
 zen-generic-more = Más
-zen-generic-next = Next
+zen-generic-next = Siguiente
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Añadir extensión
 zen-site-data-site-settings = 
     .label = Todas las configuraciones del sitio
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Protección del sitio
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index c0048e676..686b2cdcc 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimeeri
 zen-panel-ui-gradient-generator-custom-color = Kohandatud värv
 zen-panel-ui-gradient-generator-saved-message = Värviüleminek on edukalt salvestatud!
-zen-copy-current-url-confirmation = URL kopeeriti lõikelauale.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Tühista
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Lisa laiendusi
 zen-site-data-site-settings = 
     .label = Kõik saidi sätted
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index 60d6ea694..afc97014a 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
-zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 79ff46827..1eef49747 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Muokattu Väri
 zen-panel-ui-gradient-generator-saved-message = Kaltevuus tallennettu onnistuneesti!
-zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 0de2c4dde..724eb5677 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimiser
 zen-panel-ui-gradient-generator-custom-color = Couleur personnalisée
 zen-panel-ui-gradient-generator-saved-message = Le dégradé a été enregistré avec succès !
-zen-copy-current-url-confirmation = L’adresse a été copiée dans le presse-papier.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Annuler
 zen-general-confirm = 
@@ -55,7 +55,7 @@ urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Paramètres
 zen-generic-manage = Gérer
 zen-generic-more = Plus
-zen-generic-next = Next
+zen-generic-next = Suivant
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Autorisé
 zen-site-data-setting-block = Bloqué
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Ajouter des extensions
 zen-site-data-site-settings = 
     .label = Tous les paramètres du site
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copier l'URL
 zen-site-data-setting-site-protection = Protection du site
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 8094f2b23..64ccda5d4 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Íoslaghdaigh
 zen-panel-ui-gradient-generator-custom-color = Dath Saincheaptha
 zen-panel-ui-gradient-generator-saved-message = Sábháladh an grádán go rathúil!
-zen-copy-current-url-confirmation = Tá an URL cóipeáilte chuig an ghearrthaisce.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cealaigh
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Cuir Síneadh leis
 zen-site-data-site-settings = 
     .label = Gach Socrú Suímh
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Cóipeáil URL
 zen-site-data-setting-site-protection = Cosaint Láithreáin
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index 8005fcacb..b53a0f84d 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = מזער
 zen-panel-ui-gradient-generator-custom-color = צבע מותאם אישית
 zen-panel-ui-gradient-generator-saved-message = מיזוג הצבעים נשמר בהצלחה!
-zen-copy-current-url-confirmation = הקישור הועתק ללוח.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = ביטול
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = הוספת תוספים
 zen-site-data-site-settings = 
     .label = כל הגדרות אתר
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = בטיחות אתר
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 2a7c947c0..213eaba17 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimalizálás
 zen-panel-ui-gradient-generator-custom-color = Egyedi szín
 zen-panel-ui-gradient-generator-saved-message = Színátmenet sikeresen mentve!
-zen-copy-current-url-confirmation = Az URL-cím a vágólapra lett másolva.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Mégsem
 zen-general-confirm = 
@@ -55,7 +55,7 @@ urlbar-search-mode-zen_actions = Műveletek
 zen-site-data-settings = Beállítások
 zen-generic-manage = Kezelés
 zen-generic-more = Több
-zen-generic-next = Next
+zen-generic-next = Következő
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Engedélyezve
 zen-site-data-setting-block = Letiltva
@@ -71,8 +71,10 @@ zen-site-data-get-addons =
     .label = Kiegészítő hozzáadása
 zen-site-data-site-settings = 
     .label = Minden webhelybeállítás
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
+    .tooltiptext = URL másolása
 zen-site-data-setting-site-protection = Oldalvédelem
 
 # Section: Feature callouts
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index c228da851..817735838 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimalkan
 zen-panel-ui-gradient-generator-custom-color = Warna Kustom
 zen-panel-ui-gradient-generator-saved-message = Berhasil menyimpan gradien!
-zen-copy-current-url-confirmation = URL telah disalin ke clipboard.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Batalkan
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Tambahkan Ekstensi
 zen-site-data-site-settings = 
     .label = Semua Pengaturan Situs
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Salin URL
 zen-site-data-setting-site-protection = Perlindungan Situs
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index 8e416e1ec..b3e7a81f3 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Sérsniðinn litur
 zen-panel-ui-gradient-generator-saved-message = Vistað hallann!
-zen-copy-current-url-confirmation = Slóðin hefur verið afrituð á klippiborðið.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 71f7ee652..1fb03c3b1 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -22,7 +22,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimizza
 zen-panel-ui-gradient-generator-custom-color = Colore personalizzato
 zen-panel-ui-gradient-generator-saved-message = Gradiente salvato con successo!
-zen-copy-current-url-confirmation = L'URL è stato copiato negli appunti.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Annulla
 zen-general-confirm = 
@@ -69,8 +69,10 @@ zen-site-data-get-addons =
     .label = Aggiungi estensioni
 zen-site-data-site-settings = 
     .label = Tutte le impostazioni del sito
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
+    .tooltiptext = Copia URL
 zen-site-data-setting-site-protection = Protezione sito
 
 # Section: Feature callouts
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 97af620fc..394a8d4ee 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = カスタムカラー
 zen-panel-ui-gradient-generator-saved-message = グラデーションを正常に保存しました！
-zen-copy-current-url-confirmation = URLをクリップボードにコピーしました
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 5685851bf..95baa8880 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = 최소화
 zen-panel-ui-gradient-generator-custom-color = 커스텀 색상
 zen-panel-ui-gradient-generator-saved-message = 성공적으로 그라데이션을 저장했습니다!
-zen-copy-current-url-confirmation = URL이 복사되었습니다.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = 취소
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = 확장 프로그램 추가
 zen-site-data-site-settings = 
     .label = 모든 사이트 설정
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL 복사
 zen-site-data-setting-site-protection = 사이트 보호
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index 20db4d4fc..556510476 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Sumažinti
 zen-panel-ui-gradient-generator-custom-color = Pasirinktinė spalva
 zen-panel-ui-gradient-generator-saved-message = Gradientas sėkmingai įrašytas.
-zen-copy-current-url-confirmation = URL buvo nukopijuotas į iškarpinę.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Atšaukti
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Įtraukti plėtinius
 zen-site-data-site-settings = 
     .label = Visi svetainės nustatymai
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Svetainės apsauga
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 12541a870..70f5e0e99 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimaliseren
 zen-panel-ui-gradient-generator-custom-color = Aangepaste kleur
 zen-panel-ui-gradient-generator-saved-message = Verloop is succesvol opgeslagen!
-zen-copy-current-url-confirmation = De URL is gekopieerd naar het klembord.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Annuleren
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 91e2b07b0..ebd0a56fb 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
-zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 46795be5b..dfe716c5c 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Zminimalizuj
 zen-panel-ui-gradient-generator-custom-color = Niestandardowy kolor
 zen-panel-ui-gradient-generator-saved-message = Pomyślnie zapisano gradient!
-zen-copy-current-url-confirmation = Adres URL został skopiowany do schowka.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Anuluj
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 067d15640..1e6845a5b 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -22,7 +22,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Cor Personalizada
 zen-panel-ui-gradient-generator-saved-message = O gradiente foi salvo com sucesso!
-zen-copy-current-url-confirmation = A URL foi copiada para a área de transferência.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancelar
 zen-general-confirm = 
@@ -69,6 +69,8 @@ zen-site-data-get-addons =
     .label = Adicionar Extensões
 zen-site-data-site-settings = 
     .label = Todas as Configurações do Site
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 892d98130..a3db1d4bd 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Cor personalizada
 zen-panel-ui-gradient-generator-saved-message = Gradiente guardado com sucesso!
-zen-copy-current-url-confirmation = O URL foi copiado para a área de transferência.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancelar
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Adicionar Extensões
 zen-site-data-site-settings = 
     .label = Todas as Definições do Site
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Proteção do Site
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 49a42cfd0..09aea8024 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Свернуть
 zen-panel-ui-gradient-generator-custom-color = Пользовательский цвет
 zen-panel-ui-gradient-generator-saved-message = Градиент успешно сохранён!
-zen-copy-current-url-confirmation = Ссылка скопирована в буфер обмена.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Отменить
 zen-general-confirm = 
@@ -55,7 +55,7 @@ urlbar-search-mode-zen_actions = Действия
 zen-site-data-settings = Настройки
 zen-generic-manage = Изменить
 zen-generic-more = Ещё
-zen-generic-next = Next
+zen-generic-next = Далее
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Разрешено
 zen-site-data-setting-block = Запрещено
@@ -71,8 +71,10 @@ zen-site-data-get-addons =
     .label = Добавить расширения
 zen-site-data-site-settings = 
     .label = Все настройки сайта
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
+    .tooltiptext = Скопировать URL
 zen-site-data-setting-site-protection = Защищённое соединение
 
 # Section: Feature callouts
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 56034535f..3459dbf49 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimera
 zen-panel-ui-gradient-generator-custom-color = Anpassad färg
 zen-panel-ui-gradient-generator-saved-message = Lyckades spara gradienten!
-zen-copy-current-url-confirmation = Länken har kopierats till urklipp.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Avbryt
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 91e2b07b0..ebd0a56fb 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimize
 zen-panel-ui-gradient-generator-custom-color = Custom Color
 zen-panel-ui-gradient-generator-saved-message = Successfully saved the gradient!
-zen-copy-current-url-confirmation = The URL has been copied to the clipboard.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 6009916db..f6f7d6f32 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Küçült
 zen-panel-ui-gradient-generator-custom-color = Özel Renk
 zen-panel-ui-gradient-generator-saved-message = Renkler başarıyla kaydedildi!
-zen-copy-current-url-confirmation = URL panoya kopyalandı.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Cancel
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 55c8a12a5..3fdaa3b30 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Згорнути
 zen-panel-ui-gradient-generator-custom-color = Власний колір
 zen-panel-ui-gradient-generator-saved-message = Градієнт успішно збережено!
-zen-copy-current-url-confirmation = URL-адресу було скопійовано до буфера обміну.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Скасувати
 zen-general-confirm = 
@@ -55,7 +55,7 @@ urlbar-search-mode-zen_actions = Дії
 zen-site-data-settings = Налаштування
 zen-generic-manage = Керувати
 zen-generic-more = Більше
-zen-generic-next = Next
+zen-generic-next = Далі
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Дозволено
 zen-site-data-setting-block = Заблоковано
@@ -71,8 +71,10 @@ zen-site-data-get-addons =
     .label = Додати розширення
 zen-site-data-site-settings = 
     .label = Усі налаштування сайту
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
+    .tooltiptext = Копіювати URL-адресу
 zen-site-data-setting-site-protection = Захист сайту
 
 # Section: Feature callouts
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index cfadf30e7..9e09c2bb5 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Thu nhỏ
 zen-panel-ui-gradient-generator-custom-color = Tùy chỉnh màu sắc
 zen-panel-ui-gradient-generator-saved-message = Lưu tùy chỉnh đổ màu thành công!
-zen-copy-current-url-confirmation = Đường dẫn đã được chép vào bộ nhớ.
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = Hủy
 zen-general-confirm = 
@@ -71,6 +71,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index bb47d1c41..cd2fad128 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -22,7 +22,7 @@ pictureinpicture-minimize-btn =
     .tooltip = 最小化
 zen-panel-ui-gradient-generator-custom-color = 自定义颜色
 zen-panel-ui-gradient-generator-saved-message = 渐变保存成功！
-zen-copy-current-url-confirmation = 网址已复制到剪贴板。
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = 取消
 zen-general-confirm = 
@@ -69,6 +69,8 @@ zen-site-data-get-addons =
     .label = 添加扩展
 zen-site-data-site-settings = 
     .label = 所有站点设置
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index ea1198fe5..0dc7a7f26 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -22,7 +22,7 @@ pictureinpicture-minimize-btn =
     .tooltip = 最小化
 zen-panel-ui-gradient-generator-custom-color = 自訂顏色
 zen-panel-ui-gradient-generator-saved-message = 已成功儲存漸層！
-zen-copy-current-url-confirmation = 網址已複製到剪貼簿。
+zen-copy-current-url-confirmation = Copied current URL!
 zen-general-cancel-label = 
     .label = 取消
 zen-general-confirm = 
@@ -69,6 +69,8 @@ zen-site-data-get-addons =
     .label = Add Extensions
 zen-site-data-site-settings = 
     .label = All Site Settings
+zen-site-data-share = 
+    .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Site Protection

From b1e860dea2b6982b4eada0f24035e5fd60e5b15b Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 15 Oct 2025 03:30:12 +0200
Subject: [PATCH 089/111] test: Fixed tests for welcome page and fixed QA
 issues, b=bug #10666, c=common, tabs, tests, welcome, workspaces

---
 prefs/zen/theme.yaml                          |  3 ++
 .../CustomizableUI-sys-mjs.patch              | 13 +++++----
 src/zen/common/styles/zen-popup.css           |  1 +
 .../common/styles/zen-single-components.css   |  6 ++++
 src/zen/tabs/zen-tabs/vertical-tabs.css       | 28 ++++++++++++++-----
 .../tests/tabs/browser_tabs_fetch_checks.js   |  4 +--
 src/zen/tests/welcome/browser_welcome.js      |  7 ++---
 src/zen/workspaces/ZenGradientGenerator.mjs   | 12 ++++++--
 src/zen/workspaces/ZenWorkspaces.mjs          |  7 +++++
 9 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/prefs/zen/theme.yaml b/prefs/zen/theme.yaml
index 1fe3a6a88..afbc4ba01 100644
--- a/prefs/zen/theme.yaml
+++ b/prefs/zen/theme.yaml
@@ -35,6 +35,9 @@
 - name: zen.theme.styled-status-panel
   value: '@IS_TWILIGHT@'
 
+- name: zen.theme.hide-unified-extensions-button
+  value: false
+
 # ==== Mark: border radius ====
 
 # macOS border radius
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index 905c782ca..6625364c3 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index d9a059f608779fea7cd8c595a432f6fe95183e0c..7f6493ced4abb1f6ba54242b8ee213a74f01aea5 100644
+index d9a059f608779fea7cd8c595a432f6fe95183e0c..97fbe5f7ac2c5bf18526528a8f50dcf4466fcafd 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -177,17 +177,20 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..7f6493ced4abb1f6ba54242b8ee213a7
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -7970,7 +7971,8 @@ class OverflowableToolbar {
+@@ -7970,7 +7971,11 @@ class OverflowableToolbar {
              return;
            }
          }
 -        if (totalAvailWidth <= minSize) {
-+        let isLastItem = win.gZenVerticalTabsManager._hasSetSingleToolbar && this.#target.id == 'zen-sidebar-top-buttons-customization-target' && this.#overflowedInfo.size == 1;
++        let isLastItem = win.gZenVerticalTabsManager._hasSetSingleToolbar && 
++          this.#target.id == 'zen-sidebar-top-buttons-customization-target' && 
++          this.#overflowedInfo.size == 1 && 
++          !child.classList.contains('unified-extensions-item');
 +        if (totalAvailWidth <= minSize && !isLastItem) {
            lazy.log.debug(
              `Need ${minSize} but width is ${totalAvailWidth} so bailing`
            );
-@@ -8003,7 +8005,7 @@ class OverflowableToolbar {
+@@ -8003,7 +8008,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -196,7 +199,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..7f6493ced4abb1f6ba54242b8ee213a7
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8348,7 +8350,7 @@ class OverflowableToolbar {
+@@ -8348,7 +8353,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index 755799ad3..55f3ac798 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -38,6 +38,7 @@
 menupopup,
 panel {
   --panel-background: var(--arrowpanel-background);
+  --menuitem-padding: 6px !important;
   --panel-shadow-margin: 10px;
 
   /* This should match GetMenuCornerRadius() on macOS, or be overridden below */
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 4d78eccc9..62fdb7d78 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -466,6 +466,12 @@ body > #confetti {
   }
 }
 
+@media (-moz-pref('zen.theme.hide-unified-extensions-button')) {
+  #unified-extensions-button {
+    display: none !important;
+  }
+}
+
 #unified-extensions-button:not([showing]) {
   display: none !important;
 }
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 40585a8ca..4220c5375 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -1149,11 +1149,28 @@
       position: relative;
       --zen-essential-bg-margin: 2px;
 
-      &::before {
-        background: light-dark(
+      --zen-essential-tab-selected-bg: light-dark(
+        rgba(255, 255, 255, 0.85),
+        color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 40%)
+      );
+      --zen-essential-tab-selected-bg-hover: light-dark(
+        rgba(255, 255, 255, 0.8),
+        color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 50%)
+      );
+
+      :root[zen-default-theme='true'] & {
+        --zen-essential-tab-selected-bg: light-dark(
           rgba(255, 255, 255, 0.85),
-          color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 40%)
+          rgba(68, 64, 64, 0.85)
         );
+        --zen-essential-tab-selected-bg-hover: light-dark(
+          rgba(255, 255, 255, 0.8),
+          rgba(68, 64, 64, 0.75)
+        );
+      }
+
+      &::before {
+        background: var(--zen-essential-tab-selected-bg);
         margin: var(--zen-essential-bg-margin);
         border-radius: calc(var(--border-radius-medium) - var(--zen-essential-bg-margin));
         position: absolute;
@@ -1165,10 +1182,7 @@
     }
 
     &[visuallyselected]:hover .tab-background::before {
-      background: light-dark(
-        rgba(255, 255, 255, 0.8),
-        color-mix(in srgb, var(--zen-primary-color), rgba(68, 64, 64, 0.85) 50%)
-      );
+      background: var(--zen-essential-tab-selected-bg-hover);
     }
   }
 }
diff --git a/src/zen/tests/tabs/browser_tabs_fetch_checks.js b/src/zen/tests/tabs/browser_tabs_fetch_checks.js
index a223af8b0..db6fa0f81 100644
--- a/src/zen/tests/tabs/browser_tabs_fetch_checks.js
+++ b/src/zen/tests/tabs/browser_tabs_fetch_checks.js
@@ -23,7 +23,7 @@ add_task(async function test_Aria_Focusable_Tabs() {
   }
   Assert.equal(
     gBrowser.tabContainer.ariaFocusableItems.length,
-    2,
-    'There should be 2 focusable tabs (1 empty tab + 1 about:blank tab) at startup'
+    1,
+    'There should be 1 focusable tab (1 about:blank tab) at startup'
   );
 });
diff --git a/src/zen/tests/welcome/browser_welcome.js b/src/zen/tests/welcome/browser_welcome.js
index b5302ae58..d780ce9f1 100644
--- a/src/zen/tests/welcome/browser_welcome.js
+++ b/src/zen/tests/welcome/browser_welcome.js
@@ -43,7 +43,6 @@ add_task(async function test_Welcome_Steps() {
   );
 
   for (const child of welcomeContent.children) {
-    console.log(child);
     ok(
       child.querySelector('img').getAttribute('src').includes('blob:'),
       'Welcome page content should have an image with a base64 data URL'
@@ -66,7 +65,7 @@ add_task(async function test_Welcome_Steps() {
     }, 100); // Wait for the transition to complete
   });
 
-  await goNextWelcomePage('zen-welcome-next-action');
+  await goNextWelcomePage('zen-generic-next');
   ok(true, 'Welcome Search Step Test Finished');
 
   await new Promise((resolve) => {
@@ -103,7 +102,7 @@ add_task(async function test_Welcome_Steps() {
         ok(url.startsWith('https://'), `The URL "${url}" should start with "https://"`);
       }
 
-      await goNextWelcomePage('zen-welcome-next-action');
+      await goNextWelcomePage('zen-generic-next');
 
       await new Promise((resolve) => {
         setTimeout(async () => {
@@ -120,7 +119,7 @@ add_task(async function test_Welcome_Steps() {
     }, 1000); // Wait for the transition to complete
   });
 
-  await goNextWelcomePage('zen-welcome-next-action');
+  await goNextWelcomePage('zen-generic-next');
   ok(true, 'Welcome Theme Step Test Finished');
 
   await goNextWelcomePage('zen-welcome-start-browsing');
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index d897442c5..6a7591340 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -1470,9 +1470,15 @@
           gradient
         );
         const isDarkModeWindow = browser.gZenThemePicker.isDarkMode;
+        const docElement = browser.document.documentElement;
+        if (isDefaultTheme) {
+          docElement.setAttribute('zen-default-theme', 'true');
+        } else {
+          docElement.removeAttribute('zen-default-theme');
+        }
         if (dominantColor) {
           const primaryColor = this.getAccentColorForUI(dominantColor);
-          browser.document.documentElement.style.setProperty('--zen-primary-color', primaryColor);
+          docElement.style.setProperty('--zen-primary-color', primaryColor);
 
           // Should be set to `this.isLegacyVersion` but for some reason it is set to undefined if we open a private window,
           // so instead get the pref value directly.
@@ -1483,10 +1489,10 @@
           if (!isDefaultTheme && !this.isLegacyVersion) {
             // Check for the primary color
             isDarkMode = browser.gZenThemePicker.shouldBeDarkMode(dominantColor);
-            browser.document.documentElement.setAttribute('zen-should-be-dark-mode', isDarkMode);
+            docElement.setAttribute('zen-should-be-dark-mode', isDarkMode);
             browser.gZenThemePicker.panel.removeAttribute('invalidate-controls');
           } else {
-            browser.document.documentElement.removeAttribute('zen-should-be-dark-mode');
+            docElement.removeAttribute('zen-should-be-dark-mode');
             if (!this.isLegacyVersion) {
               browser.gZenThemePicker.panel.setAttribute('invalidate-controls', 'true');
             }
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 53378d6a8..7e41bfc8d 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2181,6 +2181,13 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
       return true; // Always show glance tabs
     }
 
+    // See https://github.com/zen-browser/desktop/issues/10666, we should never
+    // show closing tabs and consider them as not part of any workspace. This will
+    // invalidate the `lastSelectedTab[previousWorkspaceId]` logic in `_handleTabSelection`
+    if (tab.closing) {
+      return false; // Never show closing tabs
+    }
+
     // Handle essential tabs
     if (isEssential) {
       if (!this.containerSpecificEssentials) {

From 4f8df007e7ef4cd8c699f1c3adfbbde493366102 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 15 Oct 2025 03:41:58 +0200
Subject: [PATCH 090/111] fix: Fixed zoom icon not being visible in light mode,
 p=#10815, c=common

---
 src/browser/themes/linux/browser-css.patch | 14 +++++++++++---
 src/zen/common/styles/zen-theme.css        |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/browser/themes/linux/browser-css.patch b/src/browser/themes/linux/browser-css.patch
index 81b190aaf..d22b13b43 100644
--- a/src/browser/themes/linux/browser-css.patch
+++ b/src/browser/themes/linux/browser-css.patch
@@ -1,8 +1,16 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index b0ec88f361399cea255ef8fb6c7f2b87779a8e04..c7ca01c2033f9a300caa1a1e3de9d5517d438796 100644
+index b0ec88f361399cea255ef8fb6c7f2b87779a8e04..5b0d0bd663c309be3ddd0e946e1681b66938ee4d 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
-@@ -43,7 +43,8 @@
+@@ -14,7 +14,6 @@
+     @media (-moz-gtk-theme-family) {
+       --tabs-navbar-separator-style: none;
+       @media (prefers-color-scheme: light) {
+-        --urlbar-box-bgcolor: #fafafa;
+       }
+     }
+   }
+@@ -43,7 +42,8 @@
        -moz-default-appearance: -moz-window-decorations;
        appearance: auto;
  
@@ -12,7 +20,7 @@ index b0ec88f361399cea255ef8fb6c7f2b87779a8e04..c7ca01c2033f9a300caa1a1e3de9d551
        dialog::backdrop {
          border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
          border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
-@@ -51,13 +52,11 @@
+@@ -51,13 +51,11 @@
  
        /* stylelint-disable-next-line media-query-no-invalid */
        @media -moz-pref("widget.gtk.rounded-bottom-corners.enabled") {
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index b922c42ea..1de665622 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -98,8 +98,8 @@
   --in-content-button-text-color: var(--zen-secondary-btn-color) !important;
   --in-content-button-background-hover: color-mix(
     in srgb,
-    currentColor 3%,
-    transparent 97%
+    currentColor,
+    transparent 85%
   ) !important;
   --button-bgcolor: var(--in-content-button-background) !important;
   --button-hover-bgcolor: var(--in-content-button-background-hover) !important;

From 127e11fe1f3a0f64f4095e1698f1c228748ba8f9 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 15 Oct 2025 11:37:31 +0200
Subject: [PATCH 091/111] fix: Fixed overflowed extensions not opening,
 p=#10818, c=common

---
 package-lock.json                             |  8 +++----
 package.json                                  |  2 +-
 .../CustomizeMode-sys-mjs.patch               | 23 +------------------
 src/zen/common/ZenCustomizableUI.sys.mjs      |  2 +-
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9a71660c6..0a4a39033 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-json": "^4.0.1",
         "eslint-plugin-react-hooks": "^5.2.0",
-        "formal-git": "^1.2.8",
+        "formal-git": "^1.2.9",
         "globals": "^16.3.0",
         "husky": "^9.1.7",
         "lint-staged": "^15.3.0",
@@ -3387,9 +3387,9 @@
       }
     },
     "node_modules/formal-git": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/formal-git/-/formal-git-1.2.8.tgz",
-      "integrity": "sha512-ZGJbnKs4ANaxq3Dr3znRwZTdxP+F1AfEzkiEjCGBIf31xDcJ8StLWPI87/H/8KY801NWw9dc6qoraZzTSH5IyA==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/formal-git/-/formal-git-1.2.9.tgz",
+      "integrity": "sha512-EksDGPXBHz/jyxGt4zvXqDptjCnLYyATI1mb5/kEsc6vuruHu1QCjXarGFdkN8WkfFH0UImoJlvhz3HwwwcKsA==",
       "dev": true,
       "license": "ISC",
       "bin": {
diff --git a/package.json b/package.json
index b3178bb9c..f84997605 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-json": "^4.0.1",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "formal-git": "^1.2.8",
+    "formal-git": "^1.2.9",
     "globals": "^16.3.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.3.0",
diff --git a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
index 6ceefc12b..e4a83fbfb 100644
--- a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs
-index fd3c54a1d80f5800ffd2dcaaf594eed4bd2d300c..259af2688e5a8bca88017e5da0bfdb488ab59f59 100644
+index fd3c54a1d80f5800ffd2dcaaf594eed4bd2d300c..3178bd28affd8bd2e18c347fde6c3ec00068710c 100644
 --- a/browser/components/customizableui/CustomizeMode.sys.mjs
 +++ b/browser/components/customizableui/CustomizeMode.sys.mjs
 @@ -503,7 +503,7 @@ export class CustomizeMode {
@@ -28,24 +28,3 @@ index fd3c54a1d80f5800ffd2dcaaf594eed4bd2d300c..259af2688e5a8bca88017e5da0bfdb48
        aNode.localName == "toolbarseparator" ||
        aNode.localName == "toolbarspring" ||
        aNode.localName == "toolbarspacer"
-@@ -3128,6 +3129,20 @@ export class CustomizeMode {
-         if (makeSpaceImmediately) {
-           aDraggedOverItem.setAttribute("notransition", "true");
-         }
-+        if (aItem.parentElement.id === "TabsToolbar-customization-target")  {
-+          // We change the border values so we can properly implement the native vertical tabs
-+          // drag and drop behavior.
-+          aItem.style.borderColor = "transparent";
-+          if (aValue == "before") {
-+            prop = "borderTopWidth";
-+            otherProp = "borderBottomWidth";
-+            aItem.style.borderTopStyle = "solid";
-+          } else {
-+            prop = "borderBottomWidth";
-+            otherProp = "borderTopWidth";
-+            aItem.style.borderBottomStyle = "solid";
-+          }
-+        }
-         aDraggedOverItem.style[prop] = borderWidth + "px";
-         aDraggedOverItem.style.removeProperty(otherProp);
-         if (makeSpaceImmediately) {
diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index 6be1ced7b..b8d54b856 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -63,7 +63,7 @@ export var ZenCustomizableUI = new (class {
         default-overflowbutton="nav-bar-overflow-button"
         default-overflowtarget="widget-overflow-list"
         default-overflowpanel="widget-overflow"
-        addon-webext-overflowbutton="unified-extensions-button"
+        addon-webext-overflowbutton="zen-site-data-icon-button"
         addon-webext-overflowtarget="overflowed-extensions-list"
         mode="icons">
         <hbox id="zen-sidebar-top-buttons-customization-target" class="customization-target" flex="1">

From a679d1bcb52c0bee425e0ee77d96fd15bbc6c7bf Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 15 Oct 2025 11:38:09 +0200
Subject: [PATCH 092/111] fix: Fixed sidebar getting stuck opened when clicking
 on panels, b=closes #10812, p=#10819, c=compact-mode

---
 src/zen/compact-mode/ZenCompactMode.mjs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 58c6f4b07..720174d5f 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -605,14 +605,6 @@ var gZenCompactModeManager = {
           }
         }
 
-        // If it's a child element but not the target, ignore the event
-        if (
-          target.contains(event.explicitOriginalTarget) &&
-          event.explicitOriginalTarget !== target
-        ) {
-          return;
-        }
-
         // See bug https://bugzilla.mozilla.org/show_bug.cgi?id=1979340 and issue https://github.com/zen-browser/desktop/issues/7746.
         // If we want the toolbars to be draggable, we need to make sure to check the hover state after a short delay.
         // This is because the mouse is left to be handled natively so firefox thinks the mouse left the window for a split second.

From a46cac8203ccfcee91adaca323d70349625379da Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:51:46 +0200
Subject: [PATCH 093/111] feat: New compact mode toolbar hover, p=#10825,
 c=common, compact-mode, tabs

---
 src/zen/common/ZenStartup.mjs                 |  3 -
 src/zen/common/ZenUIManager.mjs               | 23 ++++++--
 .../common/styles/zen-browser-container.css   | 25 ++++++++-
 src/zen/common/styles/zen-theme.css           |  5 ++
 src/zen/compact-mode/ZenCompactMode.mjs       | 53 +++++++++++++-----
 src/zen/compact-mode/toolbar.inc.css          | 55 +++++++------------
 src/zen/tabs/zen-tabs.css                     |  9 ++-
 .../zen-tabs/vertical-tabs-topbar.inc.css     | 23 +++-----
 src/zen/tabs/zen-tabs/vertical-tabs.css       |  3 +-
 9 files changed, 123 insertions(+), 76 deletions(-)

diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
index 289266a2b..f1b6c5a0f 100644
--- a/src/zen/common/ZenStartup.mjs
+++ b/src/zen/common/ZenStartup.mjs
@@ -32,9 +32,6 @@
       toolbarBackground.removeAttribute('id');
       toolbarBackground.classList.add('zen-toolbar-background');
       document.getElementById('titlebar').prepend(toolbarBackground);
-      document
-        .getElementById('zen-appcontent-navbar-container')
-        .prepend(toolbarBackground.cloneNode(true));
     }
 
     #zenInitBrowserLayout() {
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index faf3cf950..aa03fef2a 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -57,6 +57,7 @@ var gZenUIManager = {
     this._debloatContextMenus();
     this._addNewCustomizableButtonsIfNeeded();
     this._initOmnibox();
+    this._initBookmarkCollapseListener();
   },
 
   _addNewCustomizableButtonsIfNeeded() {
@@ -75,6 +76,19 @@ var gZenUIManager = {
     Services.prefs.setBoolPref(kPref, true);
   },
 
+  _initBookmarkCollapseListener() {
+    document
+      .getElementById('PersonalToolbar')
+      .addEventListener('toolbarvisibilitychange', (event) => {
+        const visible = event.detail.visible;
+        if (visible) {
+          document.documentElement.setAttribute('zen-has-bookmarks', 'true');
+        } else {
+          document.documentElement.removeAttribute('zen-has-bookmarks');
+        }
+      });
+  },
+
   _initOmnibox() {
     const { registerZenUrlbarProviders } = ChromeUtils.importESModule(
       'resource:///modules/ZenUBProvider.sys.mjs'
@@ -231,7 +245,7 @@ var gZenUIManager = {
         continue;
       }
       document.removeEventListener('mousemove', this.__removeHasPopupAttribute);
-      el.setAttribute('has-popup-menu', '');
+      gZenCompactModeManager._setElementExpandAttribute(el, true, 'has-popup-menu');
       this.__currentPopup = showEvent.target;
       this.__currentPopupTrackElement = el;
       break;
@@ -244,9 +258,10 @@ var gZenUIManager = {
     }
     const element = this.__currentPopupTrackElement;
     if (document.getElementById('main-window').matches(':hover')) {
-      element.removeAttribute('has-popup-menu');
+      gZenCompactModeManager._setElementExpandAttribute(element, false, 'has-popup-menu');
     } else {
-      this.__removeHasPopupAttribute = () => element.removeAttribute('has-popup-menu');
+      this.__removeHasPopupAttribute = () =>
+        gZenCompactModeManager._setElementExpandAttribute(element, false, 'has-popup-menu');
       document.addEventListener('mousemove', this.__removeHasPopupAttribute, { once: true });
     }
     this.__currentPopup = null;
@@ -978,7 +993,7 @@ var gZenVerticalTabsManager = {
           (isCompactMode && isSingleToolbar && this.isWindowsStyledButtons)) &&
         isSingleToolbar
       ) {
-        appContentNavbarWrapper.setAttribute('should-hide', 'true');
+        appContentNavbarWrapper.setAttribute('should-hide', true);
         shouldHide = true;
       } else {
         appContentNavbarWrapper.removeAttribute('should-hide');
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index ea34f8434..77a0172c8 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -10,10 +10,11 @@
     position: relative;
 
     &.browserSidebarContainer {
+      overflow: clip;
+
       :root:not([zen-no-padding='true']) &:not(.zen-glance-overlay) {
         border-radius: var(--zen-native-inner-radius);
         box-shadow: var(--zen-big-shadow);
-        overflow: clip;
       }
 
       & browser[type='content'] {
@@ -41,4 +42,26 @@
       }
     }
   }
+
+  @media not ((-moz-pref('zen.view.experimental-no-window-controls') or not -moz-pref('zen.view.hide-window-controls') ) and -moz-pref('zen.view.use-single-toolbar')) {
+    .browserSidebarContainer:is(.deck-selected, [zen-split='true']) .browserContainer {
+      transition: margin 0.15s ease;
+
+      :root[zen-single-toolbar='true'] & {
+        transition-delay: 0.2s;
+      }
+
+      #tabbrowser-tabpanels[has-toolbar-hovered] & {
+        --margin-top-fix: calc(-1 * var(--zen-toolbar-height) + var(--zen-element-separation));
+
+        :root:not([zen-single-toolbar='true']) & {
+          --margin-top-fix: calc(
+            -1 * var(--zen-toolbar-height-with-bookmarks) + var(--zen-element-separation)
+          );
+        }
+
+        margin-top: var(--margin-top-fix);
+      }
+    }
+  }
 }
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 1de665622..77472547b 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -156,6 +156,11 @@
   --zen-toolbar-height: 38px;
   --zen-toolbar-button-inner-padding: 6px;
   --toolbarbutton-outer-padding: 4px;
+  --zen-toolbar-height-with-bookmarks: var(--zen-toolbar-height);
+  &[zen-has-bookmarks='true'] {
+    /* Make sure `30px` matches the bookmarks toolbar height */
+    --zen-toolbar-height-with-bookmarks: calc(var(--zen-toolbar-height) + 30px);
+  }
 
   --toolbarbutton-hover-background: var(--zen-toolbar-element-bg-hover) !important;
 
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 720174d5f..f6b02d86c 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -79,7 +79,7 @@ var gZenCompactModeManager = {
       window.addEventListener('mouseover', (event) => {
         const buttons = gZenVerticalTabsManager.actualWindowButtons;
         if (event.target.closest('.titlebar-buttonbox-container') === buttons) return;
-        buttons.removeAttribute('zen-has-hover');
+        this._setElementExpandAttribute(buttons, false);
       });
     }
 
@@ -323,7 +323,7 @@ var gZenCompactModeManager = {
         this.sidebar.setAttribute('animate', 'true');
       }
       if (this._ignoreNextHover) {
-        this.sidebar.removeAttribute('zen-has-hover');
+        this._setElementExpandAttribute(this.sidebar, false);
       }
       this.sidebar.style.removeProperty('margin-right');
       this.sidebar.style.removeProperty('margin-left');
@@ -354,7 +354,7 @@ var gZenCompactModeManager = {
           } else {
             sidebarWidth -= elementSeparation;
           }
-          this.sidebar.removeAttribute('zen-has-hover');
+          this._setElementExpandAttribute(this.sidebar, false);
           gZenUIManager.motion
             .animate(
               this.sidebar,
@@ -405,6 +405,8 @@ var gZenCompactModeManager = {
               });
             });
         } else if (canHideSidebar && !isCompactMode) {
+          // Shouldn't be ever true, but just in case
+          delete this._ignoreNextHover;
           document.getElementById('browser').style.overflow = 'clip';
           if (this.sidebarIsOnRight) {
             this.sidebar.style.marginRight = `-${sidebarWidth}px`;
@@ -443,6 +445,7 @@ var gZenCompactModeManager = {
         } else {
           this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
           document.documentElement.removeAttribute('zen-compact-animating');
+          delete this._ignoreNextHover;
           resolve();
         }
       });
@@ -530,17 +533,14 @@ var gZenCompactModeManager = {
   },
 
   flashElement(element, duration, id, attrName = 'flash-popup') {
-    //if (element.matches(':hover')) {
-    //  return;
-    //}
     if (this._flashTimeouts[id]) {
       clearTimeout(this._flashTimeouts[id]);
     } else {
-      requestAnimationFrame(() => element.setAttribute(attrName, 'true'));
+      requestAnimationFrame(() => this._setElementExpandAttribute(element, true, attrName));
     }
     this._flashTimeouts[id] = setTimeout(() => {
       window.requestAnimationFrame(() => {
-        element.removeAttribute(attrName);
+        this._setElementExpandAttribute(element, false, attrName);
         this._flashTimeouts[id] = null;
       });
     }, duration);
@@ -551,11 +551,34 @@ var gZenCompactModeManager = {
     this._flashTimeouts[id] = null;
   },
 
+  _setElementExpandAttribute(element, value, attr = 'zen-has-hover') {
+    const kVerifiedAttributes = ['zen-has-hover', 'has-popup-menu'];
+    const isToolbar = element.id === 'zen-appcontent-navbar-wrapper';
+    if (value) {
+      element.setAttribute(attr, 'true');
+      if (
+        isToolbar &&
+        (element.hasAttribute('should-hide') ||
+          (this.preference &&
+            Services.prefs.getBoolPref('zen.view.compact.hide-toolbar') &&
+            !gZenVerticalTabsManager._hasSetSingleToolbar))
+      ) {
+        gBrowser.tabpanels.setAttribute('has-toolbar-hovered', 'true');
+      }
+    } else {
+      element.removeAttribute(attr);
+      // Only remove if none of the verified attributes are present
+      if (isToolbar && !kVerifiedAttributes.some((attr) => element.hasAttribute(attr))) {
+        gBrowser.tabpanels.removeAttribute('has-toolbar-hovered');
+      }
+    }
+  },
+
   addMouseActions() {
     gURLBar.textbox.addEventListener('mouseenter', (event) => {
       if (event.target.closest('#urlbar[zen-floating-urlbar]')) {
         window.requestAnimationFrame(() => {
-          this.sidebar.removeAttribute('zen-has-hover');
+          this._setElementExpandAttribute(gZenVerticalTabsManager.actualWindowButtons, false);
         });
         this._hasHoveredUrlbar = true;
         return;
@@ -567,7 +590,7 @@ var gZenCompactModeManager = {
 
       // Add the attribute on startup if the mouse is already over the element
       if (target.matches(':hover')) {
-        target.setAttribute('zen-has-hover', 'true');
+        this._setElementExpandAttribute(target, true);
       }
 
       const onEnter = (event) => {
@@ -585,7 +608,7 @@ var gZenCompactModeManager = {
             ) {
               return;
             }
-            target.setAttribute('zen-has-hover', 'true');
+            this._setElementExpandAttribute(target, true);
           });
         }, this.HOVER_HACK_DELAY);
       };
@@ -633,7 +656,7 @@ var gZenCompactModeManager = {
             );
           } else {
             this._removeHoverFrames[target.id] = window.requestAnimationFrame(() =>
-              target.removeAttribute('zen-has-hover')
+              this._setElementExpandAttribute(target, false)
             );
           }
         }, this.HOVER_HACK_DELAY);
@@ -669,7 +692,7 @@ var gZenCompactModeManager = {
             'mousemove',
             () => {
               if (target.matches(':hover')) return;
-              target.removeAttribute('zen-has-hover');
+              this._setElementExpandAttribute(target, false);
               this.clearFlashTimeout('has-hover' + target.id);
             },
             { once: true }
@@ -710,7 +733,7 @@ var gZenCompactModeManager = {
     for (let entry of this.hoverableElements) {
       const target = entry.element;
       if (target && !target.matches(':hover') && target.hasAttribute('zen-has-hover')) {
-        target.removeAttribute('zen-has-hover');
+        this._setElementExpandAttribute(target, false);
         this.clearFlashTimeout('has-hover' + target.id);
       }
     }
@@ -718,7 +741,7 @@ var gZenCompactModeManager = {
 
   isSidebarPotentiallyOpen() {
     if (this._ignoreNextHover) {
-      this.sidebar.removeAttribute('zen-has-hover');
+      this._setElementExpandAttribute(this.sidebar, false);
     }
     return (
       this.sidebar.hasAttribute('zen-user-show') ||
diff --git a/src/zen/compact-mode/toolbar.inc.css b/src/zen/compact-mode/toolbar.inc.css
index f58134b53..6ca231175 100644
--- a/src/zen/compact-mode/toolbar.inc.css
+++ b/src/zen/compact-mode/toolbar.inc.css
@@ -9,8 +9,7 @@
     --zen-toolbox-top-align: var(--zen-element-separation);
   }
 
-  & #titlebar,
-  & #zen-appcontent-wrapper {
+  & #titlebar {
     margin-top: var(--zen-element-separation) !important;
   }
 
@@ -22,33 +21,23 @@
     & .zen-toolbar-background {
       display: flex;
     }
-    --zen-compact-toolbar-offset: 5px;
-    position: absolute;
-    top: calc(-1 * var(--zen-toolbar-height) + 1px);
-    left: 0;
-    z-index: 20;
-    transition: all 0.15s ease;
-    width: 100%;
+    transition: height 0.15s ease;
 
-    max-height: var(--zen-toolbar-height);
-    overflow: hidden;
+    height: calc(var(--zen-element-separation) + 0.1px);
+    overflow: clip;
 
     & #urlbar:not([breakout-extend='true']) {
-      opacity: 0 !important;
+      opacity: 0;
+      pointer-events: none;
+      transition: opacity 0.15s ease;
     }
 
-    & #zen-appcontent-navbar-container {
+    & .titlebar-buttonbox-container {
       visibility: hidden;
-
-      box-shadow: var(--zen-big-shadow);
-      border-bottom-left-radius: var(--zen-border-radius);
-      border-bottom-right-radius: var(--zen-border-radius);
-      :root:not([sizemode='maximized']) & {
-        border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
-        border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
-      }
-      transition: all 0.15s ease;
-      width: 100%;
+      /* We need to hide them since on Windows the native
+       * panels when hovering over them can interfere with the
+       * web content */
+      transition: visibility 0.15s ease;
     }
   }
 
@@ -63,22 +52,18 @@
           #urlbar[zen-floating-urlbar='true']
         ):not(.zen-compact-mode-ignore)
     ) {
-    & #zen-appcontent-navbar-container {
-      visibility: visible !important;
-    }
-    border-top-width: 0px;
 
-    top: -1px;
-    overflow: initial;
-    max-height: unset;
+    height: var(--zen-toolbar-height-with-bookmarks);
+    overflow: inherit;
+
+    & .titlebar-buttonbox-container {
+      visibility: visible;
+      transition: none;
+    }
 
     & #urlbar {
-      opacity: 1 !important;
-    }
-
-    & #urlbar[breakout-extend='true']:not([zen-floating-urlbar='true']) {
-      top: 2px !important;
       opacity: 1;
+      pointer-events: auto;
     }
   }
 }
diff --git a/src/zen/tabs/zen-tabs.css b/src/zen/tabs/zen-tabs.css
index bfd25a1ff..aa71f65a7 100644
--- a/src/zen/tabs/zen-tabs.css
+++ b/src/zen/tabs/zen-tabs.css
@@ -36,7 +36,7 @@
       * - Bookmarks toolbar is visible OR
       * - The container is explicitly marked to hide controls (e.g., on Linux with reversed controls)
       */
-    &:has(#PersonalToolbar:not([collapsed])) {
+    :root[zen-has-bookmarks] & {
 %include zen-tabs/vertical-tabs-topbar.inc.css
     }
     &[should-hide='true'] {
@@ -108,4 +108,11 @@
     /* Include common fixes for this top-button scenario */
 %include zen-tabs/vertical-tabs-topbuttons-fix.css
   }
+
+  &:not([zen-right-side='true']):not([zen-sidebar-expanded='true']):not([zen-window-buttons-reversed='true']),
+  &[zen-right-side='true']:not([zen-sidebar-expanded='true'])[zen-window-buttons-reversed='true'] {
+    & #titlebar {
+      padding-top: var(--zen-toolbar-height);
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
index 5bd8997da..f66ee357b 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
@@ -8,31 +8,22 @@ z-index: 1;
 
 #zen-appcontent-navbar-container {
   display: flex;
+  min-height: var(--zen-toolbar-height);
 }
 
 @media -moz-pref('zen.view.hide-window-controls') {
-  & {
-    transition:
-      height 0.15s ease,
-      opacity 0.1s ease-out;
-    transition-delay: 0.2s;
-
-    & > * {
-      transition: opacity 0.2s ease-out;
-      transition-delay: 0.2s;
-    }
-  }
+  transition: height 0.15s ease, opacity 0.15s ease;
+  will-change: height, opacity;
+  transition-delay: 0.2s;
+  overflow: clip;
 
   &:not([zen-has-hover='true']):not([has-popup-menu]):not(:focus-within):not(
       :has(*:is([panelopen='true'], [open='true']))
     ) {
-    transition-delay: 0.2s;
     /* In order to still use it on fullscreen, even if it's 0px, add .1px (almost invisible) */
     height: calc(var(--zen-element-separation) + 0.1px);
-    overflow: hidden;
     opacity: 0;
-    & > * {
-      opacity: 0;
+    & #zen-appcontent-navbar-container {
       pointer-events: none;
     }
 
@@ -43,7 +34,7 @@ z-index: 1;
   }
 
   @media -moz-pref('zen.view.experimental-no-window-controls') {
-    &:has(#PersonalToolbar[collapsed]) {
+    :root:not([zen-has-bookmarks]) & {
       max-height: 0 !important;
       overflow: hidden;
       opacity: 0 !important;
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 4220c5375..8be3fe996 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -30,9 +30,10 @@
    Single Toolbar Mode Specific Styles (`zen-single-toolbar='true'`)
    ========================================================================== */
 :root[zen-single-toolbar='true'] {
+  --zen-toolbar-height: 32px;
+
   & #zen-appcontent-navbar-wrapper,
   & #zen-sidebar-top-buttons {
-    --zen-toolbar-height: 32px;
     height: var(--zen-toolbar-height);
   }
 

From b5e52ed087503155aed333497d30f57853e29f0a Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 15 Oct 2025 17:47:34 +0200
Subject: [PATCH 094/111] fix: Fixed right side tabs being out of order,
 p=#10826, c=common, compact-mode

* fix: Fixed right side tabs being out of order, b=no-bug, c=common, compact-mode

* chore: Fix spelling mistake, b=no-bug, c=compact-mode

* chore: Fix lint, b=no-bug, c=common, compact-mode

---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 .../themes/shared/browser-shared-css.patch    | 18 ++++++++-
 src/zen/common/ZenUIManager.mjs               | 40 +++++++++++++------
 .../common/styles/zen-browser-container.css   |  2 +-
 src/zen/compact-mode/ZenCompactMode.mjs       | 23 +++++++----
 src/zen/compact-mode/toolbar.inc.css          | 16 +++++++-
 5 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch
index 009a642c9..780f07a9b 100644
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index c77a0e6388c4061d9e6ee5f396a3e3af8867e4fe..d37e49538cd07716da5ebed823622fccde5dd69a 100644
+index c77a0e6388c4061d9e6ee5f396a3e3af8867e4fe..3da164d2414e8726675ac0184310c9363365387f 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
 @@ -102,7 +102,7 @@ body {
@@ -20,3 +20,19 @@ index c77a0e6388c4061d9e6ee5f396a3e3af8867e4fe..d37e49538cd07716da5ebed823622fcc
    }
  
    /* Themes define a set of toolbox foreground and background colors which we
+@@ -281,13 +279,13 @@ body {
+ 
+   @media (-moz-platform: macos) and (not (-moz-mac-rtl)) {
+     &:-moz-locale-dir(ltr) {
+-      order: -1;
++      order: -2;
+     }
+   }
+ 
+   @media (-moz-mac-rtl) {
+     &:-moz-locale-dir(rtl) {
+-      order: -1;
++      order: -2;
+     }
+   }
+ 
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index aa03fef2a..a1726711a 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -77,16 +77,20 @@ var gZenUIManager = {
   },
 
   _initBookmarkCollapseListener() {
-    document
-      .getElementById('PersonalToolbar')
-      .addEventListener('toolbarvisibilitychange', (event) => {
-        const visible = event.detail.visible;
-        if (visible) {
-          document.documentElement.setAttribute('zen-has-bookmarks', 'true');
-        } else {
-          document.documentElement.removeAttribute('zen-has-bookmarks');
-        }
-      });
+    const toolbar = document.getElementById('PersonalToolbar');
+    if (toolbar.getAttribute('collapsed') !== 'true') {
+      // Set it initially if bookmarks toolbar is visible, customizable UI
+      // is ran before this function.
+      document.documentElement.setAttribute('zen-has-bookmarks', 'true');
+    }
+    toolbar.addEventListener('toolbarvisibilitychange', (event) => {
+      const visible = event.detail.visible;
+      if (visible) {
+        document.documentElement.setAttribute('zen-has-bookmarks', 'true');
+      } else {
+        document.documentElement.removeAttribute('zen-has-bookmarks');
+      }
+    });
   },
 
   _initOmnibox() {
@@ -1081,7 +1085,15 @@ var gZenVerticalTabsManager = {
         topButtons.prepend(windowButtons);
       }
 
-      if ((!isSingleToolbar && isCompactMode) || !isSidebarExpanded) {
+      const canHideTabBarPref = Services.prefs.getBoolPref('zen.view.compact.hide-tabbar');
+      const captionsShouldStayOnSidebar =
+        !canHideTabBarPref &&
+        ((!this.isWindowsStyledButtons && !isRightSide) ||
+          (this.isWindowsStyledButtons && isRightSide));
+      if (
+        (!isSingleToolbar && isCompactMode && !captionsShouldStayOnSidebar) ||
+        !isSidebarExpanded
+      ) {
         navBar.prepend(topButtons);
       }
 
@@ -1112,7 +1124,11 @@ var gZenVerticalTabsManager = {
           }
         }
       } else if (!isSingleToolbar && isCompactMode) {
-        navBar.appendChild(windowButtons);
+        if (captionsShouldStayOnSidebar) {
+          topButtons.prepend(windowButtons);
+        } else {
+          navBar.appendChild(windowButtons);
+        }
       } else if (isSingleToolbar && isCompactMode) {
         if (!isRightSide && !this.isWindowsStyledButtons) {
           topButtons.prepend(windowButtons);
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index 77a0172c8..de25bf38e 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -43,7 +43,7 @@
     }
   }
 
-  @media not ((-moz-pref('zen.view.experimental-no-window-controls') or not -moz-pref('zen.view.hide-window-controls') ) and -moz-pref('zen.view.use-single-toolbar')) {
+  @media not ((-moz-pref('zen.view.experimental-no-window-controls') or (not -moz-pref('zen.view.hide-window-controls'))) and -moz-pref('zen.view.use-single-toolbar')) {
     .browserSidebarContainer:is(.deck-selected, [zen-split='true']) .browserContainer {
       transition: margin 0.15s ease;
 
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index f6b02d86c..8dfd8365d 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -30,7 +30,7 @@ ChromeUtils.defineLazyGetter(lazyCompactMode, 'mainAppWrapper', () =>
 
 var gZenCompactModeManager = {
   _flashTimeouts: {},
-  _evenListeners: [],
+  _eventListeners: [],
   _removeHoverFrames: {},
 
   // Delay to avoid flickering when hovering over the sidebar
@@ -216,26 +216,33 @@ var gZenCompactModeManager = {
   hideSidebar() {
     Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
     Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', false);
+    this.callAllEventListeners();
   },
 
   hideToolbar() {
     Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
     Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', false);
+    this.callAllEventListeners();
   },
 
   hideBoth() {
     Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
     Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
+    this.callAllEventListeners();
+  },
+
+  callAllEventListeners() {
+    this._eventListeners.forEach((callback) => callback());
   },
 
   addEventListener(callback) {
-    this._evenListeners.push(callback);
+    this._eventListeners.push(callback);
   },
 
   removeEventListener(callback) {
-    const index = this._evenListeners.indexOf(callback);
+    const index = this._eventListeners.indexOf(callback);
     if (index !== -1) {
-      this._evenListeners.splice(index, 1);
+      this._eventListeners.splice(index, 1);
     }
   },
 
@@ -245,11 +252,11 @@ var gZenCompactModeManager = {
     // once the window buttons are shown
     this.updateContextMenu();
     if (!this.preference) {
-      this._evenListeners.forEach((callback) => callback());
+      this.callAllEventListeners();
       await this.animateCompactMode();
     } else {
       await this.animateCompactMode();
-      this._evenListeners.forEach((callback) => callback());
+      this.callAllEventListeners();
     }
     gZenUIManager.updateTabsToolbar();
     if (isUrlbarFocused) {
@@ -558,7 +565,9 @@ var gZenCompactModeManager = {
       element.setAttribute(attr, 'true');
       if (
         isToolbar &&
-        (element.hasAttribute('should-hide') ||
+        ((gZenVerticalTabsManager._hasSetSingleToolbar &&
+          (element.hasAttribute('should-hide') ||
+            document.documentElement.hasAttribute('zen-has-bookmarks'))) ||
           (this.preference &&
             Services.prefs.getBoolPref('zen.view.compact.hide-toolbar') &&
             !gZenVerticalTabsManager._hasSetSingleToolbar))
diff --git a/src/zen/compact-mode/toolbar.inc.css b/src/zen/compact-mode/toolbar.inc.css
index 6ca231175..166da1039 100644
--- a/src/zen/compact-mode/toolbar.inc.css
+++ b/src/zen/compact-mode/toolbar.inc.css
@@ -9,8 +9,10 @@
     --zen-toolbox-top-align: var(--zen-element-separation);
   }
 
-  & #titlebar {
-    margin-top: var(--zen-element-separation) !important;
+  @media -moz-pref('zen.view.compact.hide-tabbar') {
+    & #titlebar {
+      margin-top: var(--zen-element-separation) !important;
+    }
   }
 
   & #zen-appcontent-wrapper {
@@ -39,6 +41,11 @@
        * web content */
       transition: visibility 0.15s ease;
     }
+
+    & #zen-appcontent-navbar-container {
+      opacity: 0;
+      transition: opacity 0.15s ease;
+    }
   }
 
   &
@@ -65,5 +72,10 @@
       opacity: 1;
       pointer-events: auto;
     }
+
+    & #zen-appcontent-navbar-container {
+      opacity: 1;
+      transition: none;
+    }
   }
 }

From 1443d8e55922b62e890891bc41c80681b329d278 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 15 Oct 2025 21:13:57 +0200
Subject: [PATCH 095/111] fix: Fixed where top buttons should stay when
 entering compact mode, p=#10829, c=common, compact-mode, tabs, workspaces

---
 src/zen/common/ZenUIManager.mjs                  |  7 +++++--
 src/zen/common/styles/zen-browser-container.css  |  2 +-
 src/zen/compact-mode/ZenCompactMode.mjs          |  3 ++-
 src/zen/compact-mode/toolbar.inc.css             |  6 ++----
 .../tabs/zen-tabs/vertical-tabs-topbar.inc.css   |  2 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css          | 16 ++++++++--------
 src/zen/workspaces/zen-workspaces.css            |  2 +-
 7 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index a1726711a..aedc9f29c 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -78,7 +78,7 @@ var gZenUIManager = {
 
   _initBookmarkCollapseListener() {
     const toolbar = document.getElementById('PersonalToolbar');
-    if (toolbar.getAttribute('collapsed') !== 'true') {
+    if (!toolbar.hasAttribute('collapsed')) {
       // Set it initially if bookmarks toolbar is visible, customizable UI
       // is ran before this function.
       document.documentElement.setAttribute('zen-has-bookmarks', 'true');
@@ -1091,7 +1091,10 @@ var gZenVerticalTabsManager = {
         ((!this.isWindowsStyledButtons && !isRightSide) ||
           (this.isWindowsStyledButtons && isRightSide));
       if (
-        (!isSingleToolbar && isCompactMode && !captionsShouldStayOnSidebar) ||
+        (!isSingleToolbar &&
+          isCompactMode &&
+          !captionsShouldStayOnSidebar &&
+          this.isWindowsStyledButtons === isRightSide) ||
         !isSidebarExpanded
       ) {
         navBar.prepend(topButtons);
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index de25bf38e..536c11ac6 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -45,7 +45,7 @@
 
   @media not ((-moz-pref('zen.view.experimental-no-window-controls') or (not -moz-pref('zen.view.hide-window-controls'))) and -moz-pref('zen.view.use-single-toolbar')) {
     .browserSidebarContainer:is(.deck-selected, [zen-split='true']) .browserContainer {
-      transition: margin 0.15s ease;
+      transition: margin 0.15s ease-in-out;
 
       :root[zen-single-toolbar='true'] & {
         transition-delay: 0.2s;
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 8dfd8365d..83f8303be 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -570,7 +570,8 @@ var gZenCompactModeManager = {
             document.documentElement.hasAttribute('zen-has-bookmarks'))) ||
           (this.preference &&
             Services.prefs.getBoolPref('zen.view.compact.hide-toolbar') &&
-            !gZenVerticalTabsManager._hasSetSingleToolbar))
+            !gZenVerticalTabsManager._hasSetSingleToolbar &&
+            !gURLBar.hasAttribute('breakout-extend')))
       ) {
         gBrowser.tabpanels.setAttribute('has-toolbar-hovered', 'true');
       }
diff --git a/src/zen/compact-mode/toolbar.inc.css b/src/zen/compact-mode/toolbar.inc.css
index 166da1039..5c7e1ecce 100644
--- a/src/zen/compact-mode/toolbar.inc.css
+++ b/src/zen/compact-mode/toolbar.inc.css
@@ -23,7 +23,7 @@
     & .zen-toolbar-background {
       display: flex;
     }
-    transition: height 0.15s ease;
+    transition: height 0.15s ease-in-out;
 
     height: calc(var(--zen-element-separation) + 0.1px);
     overflow: clip;
@@ -55,9 +55,7 @@
   & #zen-appcontent-navbar-wrapper[has-popup-menu],
   &
     #zen-appcontent-navbar-wrapper:has(
-      *:is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(
-          #urlbar[zen-floating-urlbar='true']
-        ):not(.zen-compact-mode-ignore)
+      *:is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(.zen-compact-mode-ignore)
     ) {
 
     height: var(--zen-toolbar-height-with-bookmarks);
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
index f66ee357b..cf6994743 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
@@ -12,7 +12,7 @@ z-index: 1;
 }
 
 @media -moz-pref('zen.view.hide-window-controls') {
-  transition: height 0.15s ease, opacity 0.15s ease;
+  transition: height 0.15s ease-in-out, opacity 0.15s ease-in-out;
   will-change: height, opacity;
   transition-delay: 0.2s;
   overflow: clip;
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 8be3fe996..ec5943370 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -29,6 +29,14 @@
 /* ==========================================================================
    Single Toolbar Mode Specific Styles (`zen-single-toolbar='true'`)
    ========================================================================== */
+@media (-moz-platform: macos) and (not -moz-pref('zen.view.mac.show-three-dot-menu')) {
+  &:not([customizing]) #PanelUI-button:not([open]):not([panelopen]) {
+    position: absolute;
+    opacity: 0;
+    pointer-events: none;
+  }
+}
+
 :root[zen-single-toolbar='true'] {
   --zen-toolbar-height: 32px;
 
@@ -37,14 +45,6 @@
     height: var(--zen-toolbar-height);
   }
 
-  @media (-moz-platform: macos) and (not -moz-pref('zen.view.mac.show-three-dot-menu')) {
-    &:not([customizing]) #PanelUI-button:not([open]):not([panelopen]) {
-      position: absolute;
-      opacity: 0;
-      pointer-events: none;
-    }
-  }
-
   & #zen-sidebar-top-buttons-separator {
     width: 100%;
   }
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index d38f0fab6..eb1044835 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -165,7 +165,7 @@
   max-width: 100%;
   width: 100%;
   font-size: small;
-  padding-right: 10px;
+  padding-right: 12px;
   -moz-window-dragging: no-drag;
 
   &::before {

From fc951e5dc13da7c30db1bff165515a2cbfb84b87 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 16 Oct 2025 00:14:33 +0200
Subject: [PATCH 096/111] feat: Always move the buttons to the topbar in
 compact mode, b=no-bug, c=common

---
 src/zen/common/ZenUIManager.mjs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index aedc9f29c..d05678a80 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -1091,10 +1091,7 @@ var gZenVerticalTabsManager = {
         ((!this.isWindowsStyledButtons && !isRightSide) ||
           (this.isWindowsStyledButtons && isRightSide));
       if (
-        (!isSingleToolbar &&
-          isCompactMode &&
-          !captionsShouldStayOnSidebar &&
-          this.isWindowsStyledButtons === isRightSide) ||
+        (!isSingleToolbar && isCompactMode && !captionsShouldStayOnSidebar) ||
         !isSidebarExpanded
       ) {
         navBar.prepend(topButtons);

From cb38a0921d2c5d493fdecb8d587c9466159060f8 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 16 Oct 2025 00:22:47 +0200
Subject: [PATCH 097/111] feat: Properly align the sidebar buttons on double
 toolbar, b=no-bug, c=compact-mode

---
 src/zen/compact-mode/toolbar.inc.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/zen/compact-mode/toolbar.inc.css b/src/zen/compact-mode/toolbar.inc.css
index 5c7e1ecce..715b3beb1 100644
--- a/src/zen/compact-mode/toolbar.inc.css
+++ b/src/zen/compact-mode/toolbar.inc.css
@@ -9,10 +9,8 @@
     --zen-toolbox-top-align: var(--zen-element-separation);
   }
 
-  @media -moz-pref('zen.view.compact.hide-tabbar') {
-    & #titlebar {
-      margin-top: var(--zen-element-separation) !important;
-    }
+  & #titlebar {
+    margin-top: var(--zen-element-separation) !important;
   }
 
   & #zen-appcontent-wrapper {

From 178e6d939473b03cb211deecdf577c0e38b8dcfa Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 16 Oct 2025 01:12:34 +0200
Subject: [PATCH 098/111] feat: Set opacity for glance before animating to
 avoid flashing, b=no-bug, c=glance

---
 src/zen/glance/ZenGlanceManager.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 5134e3bff..56ccc7ef4 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -485,6 +485,7 @@
       // nice fade-in effect to the content. But if it doesn't exist,
       // we just fall back to always showing the browser directly.
       if (data.elementData) {
+        this.contentWrapper.style.opacity = 0;
         gZenUIManager.motion
           .animate(
             this.contentWrapper,

From 70b05bf7fb80c17b5cd2e518615ff39ae4a47a0b Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 16 Oct 2025 01:50:52 +0200
Subject: [PATCH 099/111] chore: Restore previous app panel button UI,
 p=#10830, c=tabs

---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index ec5943370..0e55016cf 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -29,17 +29,17 @@
 /* ==========================================================================
    Single Toolbar Mode Specific Styles (`zen-single-toolbar='true'`)
    ========================================================================== */
-@media (-moz-platform: macos) and (not -moz-pref('zen.view.mac.show-three-dot-menu')) {
-  &:not([customizing]) #PanelUI-button:not([open]):not([panelopen]) {
-    position: absolute;
-    opacity: 0;
-    pointer-events: none;
-  }
-}
-
 :root[zen-single-toolbar='true'] {
   --zen-toolbar-height: 32px;
 
+  @media (-moz-platform: macos) and (not -moz-pref('zen.view.mac.show-three-dot-menu')) {
+    &:not([customizing]) #PanelUI-button:not([open]):not([panelopen]) {
+      position: absolute;
+      opacity: 0;
+      pointer-events: none;
+    }
+  }
+
   & #zen-appcontent-navbar-wrapper,
   & #zen-sidebar-top-buttons {
     height: var(--zen-toolbar-height);

From b90005dc113dfd1917eb47fd6f2996db3dffac5d Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:45:05 +0200
Subject: [PATCH 100/111] feat: Added section for cross-site cookies, p=#10833,
 c=media, common, compact-mode, glance, tabs, workspaces

---
 locales/en-US/browser/browser/zen-general.ftl |   3 +-
 .../preferences/main-inc-xhtml.patch          |   4 +-
 src/browser/themes/shared/zen-icons/icons.css |   7 +-
 .../themes/shared/zen-icons/jar.inc.mn        | 217 +++++++++---------
 .../shared/zen-icons/lin/cookies-fill.svg     |   5 +
 .../themes/shared/zen-icons/win/NOTE.md       |   3 +
 .../shared/zen-icons/win/accessibility.svg    |   8 -
 .../zen-icons/win/add-to-dictionary.svg       |   8 -
 .../shared/zen-icons/win/arrow-down.svg       |   8 -
 .../shared/zen-icons/win/arrow-left.svg       |   8 -
 .../shared/zen-icons/win/arrow-right.svg      |   8 -
 .../themes/shared/zen-icons/win/arrow-up.svg  |   8 -
 .../shared/zen-icons/win/audio-save.svg       |   8 -
 .../zen-icons/win/autoplay-media-blocked.svg  |   8 -
 .../shared/zen-icons/win/autoplay-media.svg   |   8 -
 .../themes/shared/zen-icons/win/back.svg      |   8 -
 .../shared/zen-icons/win/bookmark-hollow.svg  |   8 -
 .../zen-icons/win/bookmark-star-on-tray.svg   |   8 -
 .../themes/shared/zen-icons/win/bookmark.svg  |   8 -
 .../shared/zen-icons/win/camera-blocked.svg   |   8 -
 .../themes/shared/zen-icons/win/camera.svg    |   8 -
 .../shared/zen-icons/win/canvas-blocked.svg   |   8 -
 .../themes/shared/zen-icons/win/canvas.svg    |   8 -
 .../themes/shared/zen-icons/win/checkmark.svg |   8 -
 .../themes/shared/zen-icons/win/chevron.svg   |   8 -
 .../themes/shared/zen-icons/win/close-all.svg |   8 -
 .../themes/shared/zen-icons/win/close.svg     |   8 -
 .../shared/zen-icons/win/container-tab.svg    |   8 -
 .../themes/shared/zen-icons/win/customize.svg |   8 -
 .../win/desktop-notification-blocked.svg      |   8 -
 .../zen-icons/win/desktop-notification.svg    |   8 -
 .../themes/shared/zen-icons/win/developer.svg |   8 -
 .../themes/shared/zen-icons/win/downloads.svg |   8 -
 .../shared/zen-icons/win/drag-indicator.svg   |  13 --
 .../shared/zen-icons/win/duplicate-tab.svg    |   8 -
 .../themes/shared/zen-icons/win/edit-copy.svg |   8 -
 .../themes/shared/zen-icons/win/edit-cut.svg  |   8 -
 .../shared/zen-icons/win/edit-delete.svg      |   8 -
 .../shared/zen-icons/win/edit-paste.svg       |   8 -
 .../themes/shared/zen-icons/win/edit-redo.svg |   8 -
 .../shared/zen-icons/win/edit-select-all.svg  |   8 -
 .../shared/zen-icons/win/edit-theme.svg       |   8 -
 .../themes/shared/zen-icons/win/edit-undo.svg |   8 -
 .../themes/shared/zen-icons/win/edit.svg      |   8 -
 .../shared/zen-icons/win/essential-add.svg    |   8 -
 .../shared/zen-icons/win/essential-remove.svg |   8 -
 .../shared/zen-icons/win/expand-sidebar.svg   |   6 -
 .../themes/shared/zen-icons/win/ext-link.svg  |   8 -
 .../zen-icons/win/extension-blocked.svg       |   8 -
 .../themes/shared/zen-icons/win/extension.svg |   8 -
 .../themes/shared/zen-icons/win/folder.svg    |   8 -
 .../themes/shared/zen-icons/win/forget.svg    |   8 -
 .../themes/shared/zen-icons/win/forward.svg   |   8 -
 .../shared/zen-icons/win/fullscreen-exit.svg  |   8 -
 .../shared/zen-icons/win/fullscreen.svg       |   8 -
 .../shared/zen-icons/win/geo-blocked.svg      |   8 -
 .../themes/shared/zen-icons/win/geo.svg       |   8 -
 .../themes/shared/zen-icons/win/help.svg      |   8 -
 .../themes/shared/zen-icons/win/history.svg   |   8 -
 .../themes/shared/zen-icons/win/home.svg      |   8 -
 .../shared/zen-icons/win/image-copy.svg       |   8 -
 .../shared/zen-icons/win/image-open.svg       |   8 -
 .../shared/zen-icons/win/image-save.svg       |   8 -
 .../themes/shared/zen-icons/win/info.svg      |   8 -
 .../themes/shared/zen-icons/win/inspect.svg   |   8 -
 .../themes/shared/zen-icons/win/library.svg   |   8 -
 .../themes/shared/zen-icons/win/link.svg      |   8 -
 .../themes/shared/zen-icons/win/mail.svg      |   8 -
 .../themes/shared/zen-icons/win/manage.svg    |   8 -
 .../shared/zen-icons/win/media-loop.svg       |   8 -
 .../shared/zen-icons/win/media-mute.svg       |   8 -
 .../shared/zen-icons/win/media-pause.svg      |   8 -
 .../themes/shared/zen-icons/win/media-pip.svg |   8 -
 .../shared/zen-icons/win/media-play.svg       |   8 -
 .../shared/zen-icons/win/media-speed.svg      |   8 -
 .../shared/zen-icons/win/media-unmute.svg     |   8 -
 .../themes/shared/zen-icons/win/menu-bar.svg  |   8 -
 .../themes/shared/zen-icons/win/menu.svg      |   8 -
 .../zen-icons/win/microphone-blocked.svg      |   8 -
 .../shared/zen-icons/win/microphone.svg       |   8 -
 .../themes/shared/zen-icons/win/midi.svg      |   8 -
 .../themes/shared/zen-icons/win/move-tab.svg  |   8 -
 .../shared/zen-icons/win/new-tab-image.svg    |   8 -
 .../themes/shared/zen-icons/win/open.svg      |   8 -
 .../shared/zen-icons/win/page-portrait.svg    |   8 -
 .../themes/shared/zen-icons/win/palette.svg   |   8 -
 .../themes/shared/zen-icons/win/passwords.svg |   8 -
 .../shared/zen-icons/win/paste-and-go.svg     |   8 -
 .../shared/zen-icons/win/permissions.svg      |   8 -
 .../win/persistent-storage-blocked.svg        |   8 -
 .../zen-icons/win/persistent-storage.svg      |   8 -
 .../themes/shared/zen-icons/win/pin.svg       |   8 -
 .../themes/shared/zen-icons/win/plus.svg      |   8 -
 .../themes/shared/zen-icons/win/popup.svg     |   8 -
 .../themes/shared/zen-icons/win/print.svg     |   8 -
 .../shared/zen-icons/win/private-window.svg   |   8 -
 .../shared/zen-icons/win/privateBrowsing.svg  |   8 -
 .../shared/zen-icons/win/reader-mode.svg      |   8 -
 .../shared/zen-icons/win/reload-to-stop.svg   |   8 -
 .../themes/shared/zen-icons/win/reload.svg    |   8 -
 .../themes/shared/zen-icons/win/report.svg    |   8 -
 .../themes/shared/zen-icons/win/save.svg      |   8 -
 .../shared/zen-icons/win/screen-blocked.svg   |   8 -
 .../themes/shared/zen-icons/win/screen.svg    |   8 -
 .../shared/zen-icons/win/screenshot.svg       |   8 -
 .../shared/zen-icons/win/search-glass.svg     |   8 -
 .../shared/zen-icons/win/search-page.svg      |   8 -
 .../shared/zen-icons/win/security-broken.svg  |   8 -
 .../shared/zen-icons/win/security-warning.svg |   8 -
 .../themes/shared/zen-icons/win/security.svg  |   8 -
 .../shared/zen-icons/win/send-to-device.svg   |   8 -
 .../themes/shared/zen-icons/win/settings.svg  |   8 -
 .../themes/shared/zen-icons/win/share.svg     |   8 -
 .../themes/shared/zen-icons/win/sidebar.svg   |   8 -
 .../shared/zen-icons/win/sidebars-right.svg   |   8 -
 .../shared/zen-icons/win/source-code.svg      |   8 -
 .../shared/zen-icons/win/spell-check.svg      |   8 -
 .../themes/shared/zen-icons/win/split.svg     |   8 -
 .../shared/zen-icons/win/stop-to-reload.svg   |   8 -
 .../zen-icons/win/tab-audio-blocked-small.svg |   8 -
 .../zen-icons/win/tab-audio-muted-small.svg   |   8 -
 .../zen-icons/win/tab-audio-playing-small.svg |   8 -
 .../themes/shared/zen-icons/win/tab.svg       |   8 -
 .../zen-icons/win/tracking-protection.svg     |   8 -
 .../shared/zen-icons/win/translations.svg     |   8 -
 .../themes/shared/zen-icons/win/unpin.svg     |   8 -
 .../shared/zen-icons/win/video-open.svg       |   8 -
 .../shared/zen-icons/win/video-save.svg       |   8 -
 .../themes/shared/zen-icons/win/window.svg    |   8 -
 .../shared/zen-icons/win/xr-blocked.svg       |   8 -
 .../themes/shared/zen-icons/win/xr.svg        |   8 -
 .../shared/zen-icons/win/zoom-control.svg     |   8 -
 .../themes/shared/zen-icons/win/zoom-out.svg  |   8 -
 src/zen/common/ZenCustomizableUI.sys.mjs      |  11 +-
 src/zen/common/ZenUIManager.mjs               |  25 +-
 .../common/styles/zen-browser-container.css   |   2 +-
 .../common/styles/zen-single-components.css   |   4 +
 src/zen/common/zenThemeModifier.js            |   5 +-
 src/zen/compact-mode/sidebar.inc.css          |   8 +-
 src/zen/compact-mode/toolbar.inc.css          |  16 +-
 src/zen/glance/ZenGlanceManager.mjs           |   2 +-
 .../zen-tabs/vertical-tabs-topbar.inc.css     |   5 +-
 .../zen-tabs/vertical-tabs-topbuttons-fix.css |   5 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css       |   2 +-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       |  52 ++++-
 src/zen/workspaces/ZenWorkspaces.mjs          |   4 +-
 146 files changed, 218 insertions(+), 1181 deletions(-)
 create mode 100644 src/browser/themes/shared/zen-icons/lin/cookies-fill.svg
 create mode 100644 src/browser/themes/shared/zen-icons/win/NOTE.md
 delete mode 100644 src/browser/themes/shared/zen-icons/win/accessibility.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/add-to-dictionary.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/arrow-down.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/arrow-left.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/arrow-right.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/arrow-up.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/audio-save.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/autoplay-media-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/autoplay-media.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/back.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/bookmark-hollow.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/bookmark-star-on-tray.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/bookmark.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/camera-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/camera.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/canvas-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/canvas.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/checkmark.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/chevron.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/close-all.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/close.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/container-tab.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/customize.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/desktop-notification-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/desktop-notification.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/developer.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/downloads.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/drag-indicator.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/duplicate-tab.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-copy.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-cut.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-delete.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-paste.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-redo.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-select-all.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-theme.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit-undo.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/edit.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/essential-add.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/essential-remove.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/expand-sidebar.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/ext-link.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/extension-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/extension.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/folder.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/forget.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/forward.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/fullscreen-exit.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/fullscreen.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/geo-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/geo.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/help.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/history.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/home.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/image-copy.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/image-open.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/image-save.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/info.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/inspect.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/library.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/link.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/mail.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/manage.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/media-loop.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/media-mute.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/media-pause.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/media-pip.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/media-play.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/media-speed.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/media-unmute.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/menu-bar.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/menu.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/microphone-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/microphone.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/midi.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/move-tab.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/new-tab-image.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/open.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/page-portrait.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/palette.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/passwords.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/paste-and-go.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/permissions.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/persistent-storage-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/persistent-storage.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/pin.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/plus.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/popup.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/print.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/private-window.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/privateBrowsing.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/reader-mode.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/reload-to-stop.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/reload.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/report.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/save.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/screen-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/screen.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/screenshot.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/search-glass.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/search-page.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/security-broken.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/security-warning.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/security.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/send-to-device.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/settings.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/share.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/sidebar.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/sidebars-right.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/source-code.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/spell-check.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/split.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/stop-to-reload.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/tab-audio-blocked-small.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/tab-audio-muted-small.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/tab-audio-playing-small.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/tab.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/tracking-protection.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/translations.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/unpin.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/video-open.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/video-save.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/window.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/xr-blocked.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/xr.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/zoom-control.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win/zoom-out.svg

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index d75efe43d..a1d427124 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -77,6 +77,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension =
     .label = Extension
 zen-site-data-security-info-secure =
@@ -96,7 +97,7 @@ zen-site-data-share =
 zen-urlbar-copy-url-button =
   .tooltiptext = Copy URL
 
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch
index 587b67bc6..de244411a 100644
--- a/src/browser/components/preferences/main-inc-xhtml.patch
+++ b/src/browser/components/preferences/main-inc-xhtml.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index 891cf7108cf4606c99a902afa420e744b9690b87..80a971b4a3e733e6495a0a11654c209e2aea5d9c 100644
+index 891cf7108cf4606c99a902afa420e744b9690b87..2bdbc1f0b6ac2c883dcbd706aed0615fad5e0760 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
 @@ -29,6 +29,11 @@
    <vbox id="startupPageBox">
      <checkbox id="browserRestoreSession"
                data-l10n-id="startup-restore-windows-and-tabs"/>
-+    <vbox id="windowsLaunchOnLoginDisabledBox" align="center" class="indent" hidden="true">
++    <vbox class="indent">
 +      <checkbox id="zenWorkspaceContinueWhereLeftOff"
 +              data-l10n-id="zen-workspace-continue-where-left-off"
 +              preference="zen.workspaces.continue-where-left-off"/>
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index dc87060f3..ca3d21e8b 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -640,10 +640,13 @@
   list-style-image: url('autoplay-media-fill.svg') !important;
 }
 .zen-permission-shield-icon {
-  list-style-image: url('tracking-protection-fill.svg') !important;
+  list-style-image: url('tracking-protection-fill.svg');
 }
 .zen-permission-extension-icon {
-  list-style-image: url('extension-fill.svg') !important;
+  list-style-image: url('extension-fill.svg');
+}
+.zen-permission-cookie-icon {
+  list-style-image: url('cookies-fill.svg');
 }
 
 /* tab sound icons */
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index 76fd42874..e27e79524 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -27,6 +27,7 @@
 *  skin/classic/browser/zen-icons/close-all.svg                      (../shared/zen-icons/lin/close-all.svg) 
 *  skin/classic/browser/zen-icons/close.svg                      (../shared/zen-icons/lin/close.svg) 
 *  skin/classic/browser/zen-icons/container-tab.svg                      (../shared/zen-icons/lin/container-tab.svg) 
+*  skin/classic/browser/zen-icons/cookies-fill.svg                      (../shared/zen-icons/lin/cookies-fill.svg) 
 *  skin/classic/browser/zen-icons/customize.svg                      (../shared/zen-icons/lin/customize.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-blocked.svg                      (../shared/zen-icons/lin/desktop-notification-blocked.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/lin/desktop-notification-fill.svg) 
@@ -41,16 +42,16 @@
 *  skin/classic/browser/zen-icons/edit-paste.svg                      (../shared/zen-icons/lin/edit-paste.svg) 
 *  skin/classic/browser/zen-icons/edit-redo.svg                      (../shared/zen-icons/lin/edit-redo.svg) 
 *  skin/classic/browser/zen-icons/edit-select-all.svg                      (../shared/zen-icons/lin/edit-select-all.svg) 
-*  skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/lin/edit.svg) 
 *  skin/classic/browser/zen-icons/edit-theme.svg                      (../shared/zen-icons/lin/edit-theme.svg) 
 *  skin/classic/browser/zen-icons/edit-undo.svg                      (../shared/zen-icons/lin/edit-undo.svg) 
+*  skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/lin/edit.svg) 
 *  skin/classic/browser/zen-icons/essential-add.svg                      (../shared/zen-icons/lin/essential-add.svg) 
 *  skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/lin/essential-remove.svg) 
 *  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/lin/expand-sidebar.svg) 
+*  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/lin/extension-blocked.svg) 
 *  skin/classic/browser/zen-icons/extension-fill.svg                      (../shared/zen-icons/lin/extension-fill.svg) 
 *  skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/lin/extension.svg) 
-*  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/face-sun.svg                      (../shared/zen-icons/lin/face-sun.svg) 
 *  skin/classic/browser/zen-icons/firefox.svg                      (../shared/zen-icons/lin/firefox.svg) 
 *  skin/classic/browser/zen-icons/folder.svg                      (../shared/zen-icons/lin/folder.svg) 
@@ -107,28 +108,28 @@
 *  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/lin/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
-*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/lin/private-window.svg) 
+*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/lin/reader-mode.svg) 
-*  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/reload-to-stop.svg                      (../shared/zen-icons/lin/reload-to-stop.svg) 
+*  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/report.svg                      (../shared/zen-icons/lin/report.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/lin/save.svg) 
 *  skin/classic/browser/zen-icons/screen-blocked.svg                      (../shared/zen-icons/lin/screen-blocked.svg) 
-*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/lin/screenshot.svg) 
 *  skin/classic/browser/zen-icons/screen.svg                      (../shared/zen-icons/lin/screen.svg) 
+*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/lin/screenshot.svg) 
 *  skin/classic/browser/zen-icons/search-glass.svg                      (../shared/zen-icons/lin/search-glass.svg) 
 *  skin/classic/browser/zen-icons/search-page.svg                      (../shared/zen-icons/lin/search-page.svg) 
 *  skin/classic/browser/zen-icons/security-broken.svg                      (../shared/zen-icons/lin/security-broken.svg) 
-*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/lin/security-warning.svg) 
+*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/lin/send-to-device.svg) 
 *  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/lin/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
-*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/lin/sidebar-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/lin/sidebar.svg) 
+*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/source-code.svg                      (../shared/zen-icons/lin/source-code.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/lin/spell-check.svg) 
@@ -180,6 +181,7 @@
 *  skin/classic/browser/zen-icons/close-all.svg                      (../shared/zen-icons/lin/close-all.svg) 
 *  skin/classic/browser/zen-icons/close.svg                      (../shared/zen-icons/lin/close.svg) 
 *  skin/classic/browser/zen-icons/container-tab.svg                      (../shared/zen-icons/lin/container-tab.svg) 
+*  skin/classic/browser/zen-icons/cookies-fill.svg                      (../shared/zen-icons/lin/cookies-fill.svg) 
 *  skin/classic/browser/zen-icons/customize.svg                      (../shared/zen-icons/lin/customize.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-blocked.svg                      (../shared/zen-icons/lin/desktop-notification-blocked.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/lin/desktop-notification-fill.svg) 
@@ -194,16 +196,16 @@
 *  skin/classic/browser/zen-icons/edit-paste.svg                      (../shared/zen-icons/lin/edit-paste.svg) 
 *  skin/classic/browser/zen-icons/edit-redo.svg                      (../shared/zen-icons/lin/edit-redo.svg) 
 *  skin/classic/browser/zen-icons/edit-select-all.svg                      (../shared/zen-icons/lin/edit-select-all.svg) 
-*  skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/lin/edit.svg) 
 *  skin/classic/browser/zen-icons/edit-theme.svg                      (../shared/zen-icons/lin/edit-theme.svg) 
 *  skin/classic/browser/zen-icons/edit-undo.svg                      (../shared/zen-icons/lin/edit-undo.svg) 
+*  skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/lin/edit.svg) 
 *  skin/classic/browser/zen-icons/essential-add.svg                      (../shared/zen-icons/lin/essential-add.svg) 
 *  skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/lin/essential-remove.svg) 
 *  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/lin/expand-sidebar.svg) 
+*  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/lin/extension-blocked.svg) 
 *  skin/classic/browser/zen-icons/extension-fill.svg                      (../shared/zen-icons/lin/extension-fill.svg) 
 *  skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/lin/extension.svg) 
-*  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/face-sun.svg                      (../shared/zen-icons/lin/face-sun.svg) 
 *  skin/classic/browser/zen-icons/firefox.svg                      (../shared/zen-icons/lin/firefox.svg) 
 *  skin/classic/browser/zen-icons/folder.svg                      (../shared/zen-icons/lin/folder.svg) 
@@ -260,28 +262,28 @@
 *  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/lin/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
-*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/lin/private-window.svg) 
+*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/lin/reader-mode.svg) 
-*  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/reload-to-stop.svg                      (../shared/zen-icons/lin/reload-to-stop.svg) 
+*  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/report.svg                      (../shared/zen-icons/lin/report.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/lin/save.svg) 
 *  skin/classic/browser/zen-icons/screen-blocked.svg                      (../shared/zen-icons/lin/screen-blocked.svg) 
-*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/lin/screenshot.svg) 
 *  skin/classic/browser/zen-icons/screen.svg                      (../shared/zen-icons/lin/screen.svg) 
+*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/lin/screenshot.svg) 
 *  skin/classic/browser/zen-icons/search-glass.svg                      (../shared/zen-icons/lin/search-glass.svg) 
 *  skin/classic/browser/zen-icons/search-page.svg                      (../shared/zen-icons/lin/search-page.svg) 
 *  skin/classic/browser/zen-icons/security-broken.svg                      (../shared/zen-icons/lin/security-broken.svg) 
-*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/lin/security-warning.svg) 
+*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/lin/send-to-device.svg) 
 *  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/lin/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
-*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/lin/sidebar-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/lin/sidebar.svg) 
+*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/source-code.svg                      (../shared/zen-icons/lin/source-code.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/lin/spell-check.svg) 
@@ -333,6 +335,7 @@
 *  skin/classic/browser/zen-icons/close-all.svg                      (../shared/zen-icons/lin/close-all.svg) 
 *  skin/classic/browser/zen-icons/close.svg                      (../shared/zen-icons/lin/close.svg) 
 *  skin/classic/browser/zen-icons/container-tab.svg                      (../shared/zen-icons/lin/container-tab.svg) 
+*  skin/classic/browser/zen-icons/cookies-fill.svg                      (../shared/zen-icons/lin/cookies-fill.svg) 
 *  skin/classic/browser/zen-icons/customize.svg                      (../shared/zen-icons/lin/customize.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-blocked.svg                      (../shared/zen-icons/lin/desktop-notification-blocked.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/lin/desktop-notification-fill.svg) 
@@ -347,16 +350,16 @@
 *  skin/classic/browser/zen-icons/edit-paste.svg                      (../shared/zen-icons/lin/edit-paste.svg) 
 *  skin/classic/browser/zen-icons/edit-redo.svg                      (../shared/zen-icons/lin/edit-redo.svg) 
 *  skin/classic/browser/zen-icons/edit-select-all.svg                      (../shared/zen-icons/lin/edit-select-all.svg) 
-*  skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/lin/edit.svg) 
 *  skin/classic/browser/zen-icons/edit-theme.svg                      (../shared/zen-icons/lin/edit-theme.svg) 
 *  skin/classic/browser/zen-icons/edit-undo.svg                      (../shared/zen-icons/lin/edit-undo.svg) 
+*  skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/lin/edit.svg) 
 *  skin/classic/browser/zen-icons/essential-add.svg                      (../shared/zen-icons/lin/essential-add.svg) 
 *  skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/lin/essential-remove.svg) 
 *  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/lin/expand-sidebar.svg) 
+*  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/lin/extension-blocked.svg) 
 *  skin/classic/browser/zen-icons/extension-fill.svg                      (../shared/zen-icons/lin/extension-fill.svg) 
 *  skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/lin/extension.svg) 
-*  skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/lin/ext-link.svg) 
 *  skin/classic/browser/zen-icons/face-sun.svg                      (../shared/zen-icons/lin/face-sun.svg) 
 *  skin/classic/browser/zen-icons/firefox.svg                      (../shared/zen-icons/lin/firefox.svg) 
 *  skin/classic/browser/zen-icons/folder.svg                      (../shared/zen-icons/lin/folder.svg) 
@@ -413,28 +416,28 @@
 *  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/lin/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
-*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/lin/private-window.svg) 
+*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/lin/reader-mode.svg) 
-*  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/reload-to-stop.svg                      (../shared/zen-icons/lin/reload-to-stop.svg) 
+*  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/report.svg                      (../shared/zen-icons/lin/report.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/lin/save.svg) 
 *  skin/classic/browser/zen-icons/screen-blocked.svg                      (../shared/zen-icons/lin/screen-blocked.svg) 
-*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/lin/screenshot.svg) 
 *  skin/classic/browser/zen-icons/screen.svg                      (../shared/zen-icons/lin/screen.svg) 
+*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/lin/screenshot.svg) 
 *  skin/classic/browser/zen-icons/search-glass.svg                      (../shared/zen-icons/lin/search-glass.svg) 
 *  skin/classic/browser/zen-icons/search-page.svg                      (../shared/zen-icons/lin/search-page.svg) 
 *  skin/classic/browser/zen-icons/security-broken.svg                      (../shared/zen-icons/lin/security-broken.svg) 
-*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/lin/security-warning.svg) 
+*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/lin/security.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/lin/send-to-device.svg) 
 *  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/lin/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/lin/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/lin/share.svg) 
-*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/lin/sidebar-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/lin/sidebar.svg) 
+*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/lin/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/source-code.svg                      (../shared/zen-icons/lin/source-code.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/lin/spell-check.svg) 
@@ -462,90 +465,90 @@
 *  skin/classic/browser/zen-icons/zoom-out.svg                      (../shared/zen-icons/lin/zoom-out.svg) 
 #endif
 *  skin/classic/browser/zen-icons/urlbar-arrow.svg                      (../shared/zen-icons/common/urlbar-arrow.svg) 
-*  skin/classic/browser/zen-icons/selectable/airplane.svg          (../shared/zen-icons/common/selectable/airplane.svg)
-*  skin/classic/browser/zen-icons/selectable/american-football.svg          (../shared/zen-icons/common/selectable/american-football.svg)
-*  skin/classic/browser/zen-icons/selectable/baseball.svg          (../shared/zen-icons/common/selectable/baseball.svg)
-*  skin/classic/browser/zen-icons/selectable/basket.svg          (../shared/zen-icons/common/selectable/basket.svg)
-*  skin/classic/browser/zen-icons/selectable/bed.svg          (../shared/zen-icons/common/selectable/bed.svg)
-*  skin/classic/browser/zen-icons/selectable/bell.svg          (../shared/zen-icons/common/selectable/bell.svg)
-*  skin/classic/browser/zen-icons/selectable/bookmark.svg          (../shared/zen-icons/common/selectable/bookmark.svg)
-*  skin/classic/browser/zen-icons/selectable/book.svg          (../shared/zen-icons/common/selectable/book.svg)
-*  skin/classic/browser/zen-icons/selectable/briefcase.svg          (../shared/zen-icons/common/selectable/briefcase.svg)
-*  skin/classic/browser/zen-icons/selectable/brush.svg          (../shared/zen-icons/common/selectable/brush.svg)
-*  skin/classic/browser/zen-icons/selectable/bug.svg          (../shared/zen-icons/common/selectable/bug.svg)
-*  skin/classic/browser/zen-icons/selectable/build.svg          (../shared/zen-icons/common/selectable/build.svg)
-*  skin/classic/browser/zen-icons/selectable/cafe.svg          (../shared/zen-icons/common/selectable/cafe.svg)
-*  skin/classic/browser/zen-icons/selectable/call.svg          (../shared/zen-icons/common/selectable/call.svg)
-*  skin/classic/browser/zen-icons/selectable/card.svg          (../shared/zen-icons/common/selectable/card.svg)
-*  skin/classic/browser/zen-icons/selectable/chat.svg          (../shared/zen-icons/common/selectable/chat.svg)
-*  skin/classic/browser/zen-icons/selectable/checkbox.svg          (../shared/zen-icons/common/selectable/checkbox.svg)
-*  skin/classic/browser/zen-icons/selectable/circle.svg          (../shared/zen-icons/common/selectable/circle.svg)
-*  skin/classic/browser/zen-icons/selectable/cloud.svg          (../shared/zen-icons/common/selectable/cloud.svg)
-*  skin/classic/browser/zen-icons/selectable/code.svg          (../shared/zen-icons/common/selectable/code.svg)
-*  skin/classic/browser/zen-icons/selectable/coins.svg          (../shared/zen-icons/common/selectable/coins.svg)
-*  skin/classic/browser/zen-icons/selectable/construct.svg          (../shared/zen-icons/common/selectable/construct.svg)
-*  skin/classic/browser/zen-icons/selectable/cutlery.svg          (../shared/zen-icons/common/selectable/cutlery.svg)
-*  skin/classic/browser/zen-icons/selectable/egg.svg          (../shared/zen-icons/common/selectable/egg.svg)
-*  skin/classic/browser/zen-icons/selectable/extension-puzzle.svg          (../shared/zen-icons/common/selectable/extension-puzzle.svg)
-*  skin/classic/browser/zen-icons/selectable/eye.svg          (../shared/zen-icons/common/selectable/eye.svg)
-*  skin/classic/browser/zen-icons/selectable/fast-food.svg          (../shared/zen-icons/common/selectable/fast-food.svg)
-*  skin/classic/browser/zen-icons/selectable/fish.svg          (../shared/zen-icons/common/selectable/fish.svg)
-*  skin/classic/browser/zen-icons/selectable/flag.svg          (../shared/zen-icons/common/selectable/flag.svg)
-*  skin/classic/browser/zen-icons/selectable/flame.svg          (../shared/zen-icons/common/selectable/flame.svg)
-*  skin/classic/browser/zen-icons/selectable/flask.svg          (../shared/zen-icons/common/selectable/flask.svg)
-*  skin/classic/browser/zen-icons/selectable/folder.svg          (../shared/zen-icons/common/selectable/folder.svg)
-*  skin/classic/browser/zen-icons/selectable/game-controller.svg          (../shared/zen-icons/common/selectable/game-controller.svg)
-*  skin/classic/browser/zen-icons/selectable/globe-1.svg          (../shared/zen-icons/common/selectable/globe-1.svg)
-*  skin/classic/browser/zen-icons/selectable/globe.svg          (../shared/zen-icons/common/selectable/globe.svg)
-*  skin/classic/browser/zen-icons/selectable/grid-2x2.svg          (../shared/zen-icons/common/selectable/grid-2x2.svg)
-*  skin/classic/browser/zen-icons/selectable/grid-3x3.svg          (../shared/zen-icons/common/selectable/grid-3x3.svg)
-*  skin/classic/browser/zen-icons/selectable/heart.svg          (../shared/zen-icons/common/selectable/heart.svg)
-*  skin/classic/browser/zen-icons/selectable/ice-cream.svg          (../shared/zen-icons/common/selectable/ice-cream.svg)
-*  skin/classic/browser/zen-icons/selectable/image.svg          (../shared/zen-icons/common/selectable/image.svg)
-*  skin/classic/browser/zen-icons/selectable/inbox.svg          (../shared/zen-icons/common/selectable/inbox.svg)
-*  skin/classic/browser/zen-icons/selectable/key.svg          (../shared/zen-icons/common/selectable/key.svg)
-*  skin/classic/browser/zen-icons/selectable/layers.svg          (../shared/zen-icons/common/selectable/layers.svg)
-*  skin/classic/browser/zen-icons/selectable/leaf.svg          (../shared/zen-icons/common/selectable/leaf.svg)
-*  skin/classic/browser/zen-icons/selectable/lightning.svg          (../shared/zen-icons/common/selectable/lightning.svg)
-*  skin/classic/browser/zen-icons/selectable/location.svg          (../shared/zen-icons/common/selectable/location.svg)
-*  skin/classic/browser/zen-icons/selectable/lock-closed.svg          (../shared/zen-icons/common/selectable/lock-closed.svg)
-*  skin/classic/browser/zen-icons/selectable/logo-rss.svg          (../shared/zen-icons/common/selectable/logo-rss.svg)
-*  skin/classic/browser/zen-icons/selectable/logo-usd.svg          (../shared/zen-icons/common/selectable/logo-usd.svg)
-*  skin/classic/browser/zen-icons/selectable/mail.svg          (../shared/zen-icons/common/selectable/mail.svg)
-*  skin/classic/browser/zen-icons/selectable/map.svg          (../shared/zen-icons/common/selectable/map.svg)
-*  skin/classic/browser/zen-icons/selectable/megaphone.svg          (../shared/zen-icons/common/selectable/megaphone.svg)
-*  skin/classic/browser/zen-icons/selectable/moon.svg          (../shared/zen-icons/common/selectable/moon.svg)
-*  skin/classic/browser/zen-icons/selectable/music.svg          (../shared/zen-icons/common/selectable/music.svg)
-*  skin/classic/browser/zen-icons/selectable/navigate.svg          (../shared/zen-icons/common/selectable/navigate.svg)
-*  skin/classic/browser/zen-icons/selectable/nuclear.svg          (../shared/zen-icons/common/selectable/nuclear.svg)
-*  skin/classic/browser/zen-icons/selectable/page.svg          (../shared/zen-icons/common/selectable/page.svg)
-*  skin/classic/browser/zen-icons/selectable/palette.svg          (../shared/zen-icons/common/selectable/palette.svg)
-*  skin/classic/browser/zen-icons/selectable/paw.svg          (../shared/zen-icons/common/selectable/paw.svg)
-*  skin/classic/browser/zen-icons/selectable/people.svg          (../shared/zen-icons/common/selectable/people.svg)
-*  skin/classic/browser/zen-icons/selectable/pizza.svg          (../shared/zen-icons/common/selectable/pizza.svg)
-*  skin/classic/browser/zen-icons/selectable/planet.svg          (../shared/zen-icons/common/selectable/planet.svg)
-*  skin/classic/browser/zen-icons/selectable/present.svg          (../shared/zen-icons/common/selectable/present.svg)
-*  skin/classic/browser/zen-icons/selectable/rocket.svg          (../shared/zen-icons/common/selectable/rocket.svg)
-*  skin/classic/browser/zen-icons/selectable/school.svg          (../shared/zen-icons/common/selectable/school.svg)
-*  skin/classic/browser/zen-icons/selectable/shapes.svg          (../shared/zen-icons/common/selectable/shapes.svg)
-*  skin/classic/browser/zen-icons/selectable/shirt.svg          (../shared/zen-icons/common/selectable/shirt.svg)
-*  skin/classic/browser/zen-icons/selectable/skull.svg          (../shared/zen-icons/common/selectable/skull.svg)
-*  skin/classic/browser/zen-icons/selectable/squares.svg          (../shared/zen-icons/common/selectable/squares.svg)
-*  skin/classic/browser/zen-icons/selectable/square.svg          (../shared/zen-icons/common/selectable/square.svg)
-*  skin/classic/browser/zen-icons/selectable/star-1.svg          (../shared/zen-icons/common/selectable/star-1.svg)
-*  skin/classic/browser/zen-icons/selectable/star.svg          (../shared/zen-icons/common/selectable/star.svg)
-*  skin/classic/browser/zen-icons/selectable/stats-chart.svg          (../shared/zen-icons/common/selectable/stats-chart.svg)
-*  skin/classic/browser/zen-icons/selectable/sun.svg          (../shared/zen-icons/common/selectable/sun.svg)
-*  skin/classic/browser/zen-icons/selectable/tada.svg          (../shared/zen-icons/common/selectable/tada.svg)
-*  skin/classic/browser/zen-icons/selectable/terminal.svg          (../shared/zen-icons/common/selectable/terminal.svg)
-*  skin/classic/browser/zen-icons/selectable/ticket.svg          (../shared/zen-icons/common/selectable/ticket.svg)
-*  skin/classic/browser/zen-icons/selectable/time.svg          (../shared/zen-icons/common/selectable/time.svg)
-*  skin/classic/browser/zen-icons/selectable/trash.svg          (../shared/zen-icons/common/selectable/trash.svg)
-*  skin/classic/browser/zen-icons/selectable/triangle.svg          (../shared/zen-icons/common/selectable/triangle.svg)
-*  skin/classic/browser/zen-icons/selectable/video.svg          (../shared/zen-icons/common/selectable/video.svg)
-*  skin/classic/browser/zen-icons/selectable/volume-high.svg          (../shared/zen-icons/common/selectable/volume-high.svg)
-*  skin/classic/browser/zen-icons/selectable/wallet.svg          (../shared/zen-icons/common/selectable/wallet.svg)
-*  skin/classic/browser/zen-icons/selectable/warning.svg          (../shared/zen-icons/common/selectable/warning.svg)
-*  skin/classic/browser/zen-icons/selectable/water.svg          (../shared/zen-icons/common/selectable/water.svg)
-*  skin/classic/browser/zen-icons/selectable/weight.svg          (../shared/zen-icons/common/selectable/weight.svg)
+*  skin/classic/browser/zen-icons/selectable/airplane.svg          (../shared/zen-icons/common/selectable/airplane.svg) 
+*  skin/classic/browser/zen-icons/selectable/american-football.svg          (../shared/zen-icons/common/selectable/american-football.svg) 
+*  skin/classic/browser/zen-icons/selectable/baseball.svg          (../shared/zen-icons/common/selectable/baseball.svg) 
+*  skin/classic/browser/zen-icons/selectable/basket.svg          (../shared/zen-icons/common/selectable/basket.svg) 
+*  skin/classic/browser/zen-icons/selectable/bed.svg          (../shared/zen-icons/common/selectable/bed.svg) 
+*  skin/classic/browser/zen-icons/selectable/bell.svg          (../shared/zen-icons/common/selectable/bell.svg) 
+*  skin/classic/browser/zen-icons/selectable/book.svg          (../shared/zen-icons/common/selectable/book.svg) 
+*  skin/classic/browser/zen-icons/selectable/bookmark.svg          (../shared/zen-icons/common/selectable/bookmark.svg) 
+*  skin/classic/browser/zen-icons/selectable/briefcase.svg          (../shared/zen-icons/common/selectable/briefcase.svg) 
+*  skin/classic/browser/zen-icons/selectable/brush.svg          (../shared/zen-icons/common/selectable/brush.svg) 
+*  skin/classic/browser/zen-icons/selectable/bug.svg          (../shared/zen-icons/common/selectable/bug.svg) 
+*  skin/classic/browser/zen-icons/selectable/build.svg          (../shared/zen-icons/common/selectable/build.svg) 
+*  skin/classic/browser/zen-icons/selectable/cafe.svg          (../shared/zen-icons/common/selectable/cafe.svg) 
+*  skin/classic/browser/zen-icons/selectable/call.svg          (../shared/zen-icons/common/selectable/call.svg) 
+*  skin/classic/browser/zen-icons/selectable/card.svg          (../shared/zen-icons/common/selectable/card.svg) 
+*  skin/classic/browser/zen-icons/selectable/chat.svg          (../shared/zen-icons/common/selectable/chat.svg) 
+*  skin/classic/browser/zen-icons/selectable/checkbox.svg          (../shared/zen-icons/common/selectable/checkbox.svg) 
+*  skin/classic/browser/zen-icons/selectable/circle.svg          (../shared/zen-icons/common/selectable/circle.svg) 
+*  skin/classic/browser/zen-icons/selectable/cloud.svg          (../shared/zen-icons/common/selectable/cloud.svg) 
+*  skin/classic/browser/zen-icons/selectable/code.svg          (../shared/zen-icons/common/selectable/code.svg) 
+*  skin/classic/browser/zen-icons/selectable/coins.svg          (../shared/zen-icons/common/selectable/coins.svg) 
+*  skin/classic/browser/zen-icons/selectable/construct.svg          (../shared/zen-icons/common/selectable/construct.svg) 
+*  skin/classic/browser/zen-icons/selectable/cutlery.svg          (../shared/zen-icons/common/selectable/cutlery.svg) 
+*  skin/classic/browser/zen-icons/selectable/egg.svg          (../shared/zen-icons/common/selectable/egg.svg) 
+*  skin/classic/browser/zen-icons/selectable/extension-puzzle.svg          (../shared/zen-icons/common/selectable/extension-puzzle.svg) 
+*  skin/classic/browser/zen-icons/selectable/eye.svg          (../shared/zen-icons/common/selectable/eye.svg) 
+*  skin/classic/browser/zen-icons/selectable/fast-food.svg          (../shared/zen-icons/common/selectable/fast-food.svg) 
+*  skin/classic/browser/zen-icons/selectable/fish.svg          (../shared/zen-icons/common/selectable/fish.svg) 
+*  skin/classic/browser/zen-icons/selectable/flag.svg          (../shared/zen-icons/common/selectable/flag.svg) 
+*  skin/classic/browser/zen-icons/selectable/flame.svg          (../shared/zen-icons/common/selectable/flame.svg) 
+*  skin/classic/browser/zen-icons/selectable/flask.svg          (../shared/zen-icons/common/selectable/flask.svg) 
+*  skin/classic/browser/zen-icons/selectable/folder.svg          (../shared/zen-icons/common/selectable/folder.svg) 
+*  skin/classic/browser/zen-icons/selectable/game-controller.svg          (../shared/zen-icons/common/selectable/game-controller.svg) 
+*  skin/classic/browser/zen-icons/selectable/globe-1.svg          (../shared/zen-icons/common/selectable/globe-1.svg) 
+*  skin/classic/browser/zen-icons/selectable/globe.svg          (../shared/zen-icons/common/selectable/globe.svg) 
+*  skin/classic/browser/zen-icons/selectable/grid-2x2.svg          (../shared/zen-icons/common/selectable/grid-2x2.svg) 
+*  skin/classic/browser/zen-icons/selectable/grid-3x3.svg          (../shared/zen-icons/common/selectable/grid-3x3.svg) 
+*  skin/classic/browser/zen-icons/selectable/heart.svg          (../shared/zen-icons/common/selectable/heart.svg) 
+*  skin/classic/browser/zen-icons/selectable/ice-cream.svg          (../shared/zen-icons/common/selectable/ice-cream.svg) 
+*  skin/classic/browser/zen-icons/selectable/image.svg          (../shared/zen-icons/common/selectable/image.svg) 
+*  skin/classic/browser/zen-icons/selectable/inbox.svg          (../shared/zen-icons/common/selectable/inbox.svg) 
+*  skin/classic/browser/zen-icons/selectable/key.svg          (../shared/zen-icons/common/selectable/key.svg) 
+*  skin/classic/browser/zen-icons/selectable/layers.svg          (../shared/zen-icons/common/selectable/layers.svg) 
+*  skin/classic/browser/zen-icons/selectable/leaf.svg          (../shared/zen-icons/common/selectable/leaf.svg) 
+*  skin/classic/browser/zen-icons/selectable/lightning.svg          (../shared/zen-icons/common/selectable/lightning.svg) 
+*  skin/classic/browser/zen-icons/selectable/location.svg          (../shared/zen-icons/common/selectable/location.svg) 
+*  skin/classic/browser/zen-icons/selectable/lock-closed.svg          (../shared/zen-icons/common/selectable/lock-closed.svg) 
+*  skin/classic/browser/zen-icons/selectable/logo-rss.svg          (../shared/zen-icons/common/selectable/logo-rss.svg) 
+*  skin/classic/browser/zen-icons/selectable/logo-usd.svg          (../shared/zen-icons/common/selectable/logo-usd.svg) 
+*  skin/classic/browser/zen-icons/selectable/mail.svg          (../shared/zen-icons/common/selectable/mail.svg) 
+*  skin/classic/browser/zen-icons/selectable/map.svg          (../shared/zen-icons/common/selectable/map.svg) 
+*  skin/classic/browser/zen-icons/selectable/megaphone.svg          (../shared/zen-icons/common/selectable/megaphone.svg) 
+*  skin/classic/browser/zen-icons/selectable/moon.svg          (../shared/zen-icons/common/selectable/moon.svg) 
+*  skin/classic/browser/zen-icons/selectable/music.svg          (../shared/zen-icons/common/selectable/music.svg) 
+*  skin/classic/browser/zen-icons/selectable/navigate.svg          (../shared/zen-icons/common/selectable/navigate.svg) 
+*  skin/classic/browser/zen-icons/selectable/nuclear.svg          (../shared/zen-icons/common/selectable/nuclear.svg) 
+*  skin/classic/browser/zen-icons/selectable/page.svg          (../shared/zen-icons/common/selectable/page.svg) 
+*  skin/classic/browser/zen-icons/selectable/palette.svg          (../shared/zen-icons/common/selectable/palette.svg) 
+*  skin/classic/browser/zen-icons/selectable/paw.svg          (../shared/zen-icons/common/selectable/paw.svg) 
+*  skin/classic/browser/zen-icons/selectable/people.svg          (../shared/zen-icons/common/selectable/people.svg) 
+*  skin/classic/browser/zen-icons/selectable/pizza.svg          (../shared/zen-icons/common/selectable/pizza.svg) 
+*  skin/classic/browser/zen-icons/selectable/planet.svg          (../shared/zen-icons/common/selectable/planet.svg) 
+*  skin/classic/browser/zen-icons/selectable/present.svg          (../shared/zen-icons/common/selectable/present.svg) 
+*  skin/classic/browser/zen-icons/selectable/rocket.svg          (../shared/zen-icons/common/selectable/rocket.svg) 
+*  skin/classic/browser/zen-icons/selectable/school.svg          (../shared/zen-icons/common/selectable/school.svg) 
+*  skin/classic/browser/zen-icons/selectable/shapes.svg          (../shared/zen-icons/common/selectable/shapes.svg) 
+*  skin/classic/browser/zen-icons/selectable/shirt.svg          (../shared/zen-icons/common/selectable/shirt.svg) 
+*  skin/classic/browser/zen-icons/selectable/skull.svg          (../shared/zen-icons/common/selectable/skull.svg) 
+*  skin/classic/browser/zen-icons/selectable/square.svg          (../shared/zen-icons/common/selectable/square.svg) 
+*  skin/classic/browser/zen-icons/selectable/squares.svg          (../shared/zen-icons/common/selectable/squares.svg) 
+*  skin/classic/browser/zen-icons/selectable/star-1.svg          (../shared/zen-icons/common/selectable/star-1.svg) 
+*  skin/classic/browser/zen-icons/selectable/star.svg          (../shared/zen-icons/common/selectable/star.svg) 
+*  skin/classic/browser/zen-icons/selectable/stats-chart.svg          (../shared/zen-icons/common/selectable/stats-chart.svg) 
+*  skin/classic/browser/zen-icons/selectable/sun.svg          (../shared/zen-icons/common/selectable/sun.svg) 
+*  skin/classic/browser/zen-icons/selectable/tada.svg          (../shared/zen-icons/common/selectable/tada.svg) 
+*  skin/classic/browser/zen-icons/selectable/terminal.svg          (../shared/zen-icons/common/selectable/terminal.svg) 
+*  skin/classic/browser/zen-icons/selectable/ticket.svg          (../shared/zen-icons/common/selectable/ticket.svg) 
+*  skin/classic/browser/zen-icons/selectable/time.svg          (../shared/zen-icons/common/selectable/time.svg) 
+*  skin/classic/browser/zen-icons/selectable/trash.svg          (../shared/zen-icons/common/selectable/trash.svg) 
+*  skin/classic/browser/zen-icons/selectable/triangle.svg          (../shared/zen-icons/common/selectable/triangle.svg) 
+*  skin/classic/browser/zen-icons/selectable/video.svg          (../shared/zen-icons/common/selectable/video.svg) 
+*  skin/classic/browser/zen-icons/selectable/volume-high.svg          (../shared/zen-icons/common/selectable/volume-high.svg) 
+*  skin/classic/browser/zen-icons/selectable/wallet.svg          (../shared/zen-icons/common/selectable/wallet.svg) 
+*  skin/classic/browser/zen-icons/selectable/warning.svg          (../shared/zen-icons/common/selectable/warning.svg) 
+*  skin/classic/browser/zen-icons/selectable/water.svg          (../shared/zen-icons/common/selectable/water.svg) 
+*  skin/classic/browser/zen-icons/selectable/weight.svg          (../shared/zen-icons/common/selectable/weight.svg) 
   skin/classic/browser/zen-icons/icons.css                      (../shared/zen-icons/icons.css) 
diff --git a/src/browser/themes/shared/zen-icons/lin/cookies-fill.svg b/src/browser/themes/shared/zen-icons/lin/cookies-fill.svg
new file mode 100644
index 000000000..384076dc0
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/cookies-fill.svg
@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g fill="context-fill" fill-opacity="context-fill-opacity" class="nc-icon-wrapper"><circle cx="12.25" cy="1.75" r=".75" data-color="color-2"></circle><circle cx="14.75" cy="4.25" r=".75" data-color="color-2"></circle><path d="M16.87,7.599c-.039-.222-.176-.415-.373-.524-.197-.109-.433-.125-.642-.042-.363,.144-.735,.217-1.105,.217-1.498,0-2.77-1.128-2.958-2.624-.051-.403-.409-.688-.818-.652l-.224,.026c-1.209,0-2.193-.951-2.239-2.165-.008-.216-.109-.418-.277-.554-.168-.137-.386-.193-.6-.157C3.79,1.788,1,5.1,1,9c0,4.411,3.589,8,8,8s8-3.589,8-8c0-.451-.042-.909-.13-1.401Zm-9.87-1.599c.552,0,1,.448,1,1s-.448,1-1,1-1-.448-1-1,.448-1,1-1Zm.25,6.5c-.69,0-1.25-.56-1.25-1.25s.56-1.25,1.25-1.25,1.25,.56,1.25,1.25-.56,1.25-1.25,1.25Zm4,0c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75,.75,.336,.75,.75-.336,.75-.75,.75Z"></path></g></svg>
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/win/NOTE.md b/src/browser/themes/shared/zen-icons/win/NOTE.md
new file mode 100644
index 000000000..7c04449e8
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/win/NOTE.md
@@ -0,0 +1,3 @@
+# Notice
+
+MacOS icons are using Nucleo icons. This until we figure out how sizing works with Fluent icons.
diff --git a/src/browser/themes/shared/zen-icons/win/accessibility.svg b/src/browser/themes/shared/zen-icons/win/accessibility.svg
deleted file mode 100644
index da974a8e9..000000000
--- a/src/browser/themes/shared/zen-icons/win/accessibility.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.50006 4.49805C8.50006 3.66962 9.17163 2.99805 10.0001 2.99805C10.8285 2.99805 11.5001 3.66962 11.5001 4.49805C11.5001 5.32647 10.8285 5.99805 10.0001 5.99805C9.17163 5.99805 8.50006 5.32647 8.50006 4.49805ZM10.0001 1.99805C8.61935 1.99805 7.50006 3.11734 7.50006 4.49805C7.50006 4.69992 7.52399 4.89621 7.56916 5.08423L5.47189 4.15047C4.59026 3.75794 3.55353 4.15155 3.15456 5.0303C2.75442 5.91164 3.1474 6.94669 4.03165 7.34038L6.99997 8.66196L6.99997 10.9489L5.12327 15.5939C4.76121 16.4901 5.19416 17.51 6.09028 17.8721C6.9864 18.2341 8.00636 17.8012 8.36841 16.9051L9.92354 13.056C9.93301 13.0325 9.94388 13.0233 9.95195 13.0181C9.96244 13.0114 9.97829 13.006 9.99771 13.006C10.0171 13.006 10.033 13.0114 10.0435 13.0181C10.0515 13.0233 10.0624 13.0325 10.0719 13.056L11.6269 16.9049C11.989 17.801 13.0089 18.2339 13.9051 17.8719C14.8012 17.5098 15.2341 16.4899 14.8721 15.5938L13 10.9601V8.66196L15.9683 7.34038C16.8525 6.94669 17.2455 5.91164 16.8454 5.0303C16.4464 4.15155 15.4097 3.75794 14.528 4.15047L12.431 5.08414C12.4761 4.89615 12.5001 4.69989 12.5001 4.49805C12.5001 3.11734 11.3808 1.99805 10.0001 1.99805ZM4.06511 5.4437C4.23694 5.06524 4.68545 4.89495 5.06516 5.06401L8.98313 6.8084C9.6304 7.09659 10.3695 7.09659 11.0168 6.8084L14.9348 5.06401C15.3145 4.89495 15.763 5.06524 15.9348 5.4437C16.1055 5.81956 15.9387 6.25894 15.5616 6.42683L12.5932 7.74842C12.2324 7.90906 12 8.26701 12 8.66196V10.9601C12 11.0885 12.0247 11.2157 12.0728 11.3347L13.9449 15.9684C14.1001 16.3524 13.9145 16.7895 13.5305 16.9447C13.1464 17.0999 12.7093 16.9143 12.5541 16.5303L10.9991 12.6814C10.6352 11.7808 9.36021 11.7808 8.99635 12.6814L7.44123 16.5305C7.28606 16.9145 6.84894 17.1001 6.46489 16.9449C6.08083 16.7897 5.89529 16.3526 6.05045 15.9685L7.92715 11.3235C7.97525 11.2045 7.99997 11.0773 7.99997 10.9489V8.66196C7.99997 8.26701 7.76751 7.90906 7.40671 7.74842L4.43838 6.42683C4.06128 6.25894 3.89446 5.81956 4.06511 5.4437Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/add-to-dictionary.svg b/src/browser/themes/shared/zen-icons/win/add-to-dictionary.svg
deleted file mode 100644
index 49cd0844a..000000000
--- a/src/browser/themes/shared/zen-icons/win/add-to-dictionary.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 3H6C5.44772 3 5 3.44772 5 4V15H9.02242C9.05337 15.3434 9.11588 15.6777 9.20703 16H5C5 16.5523 5.44772 17 6 17H9.59971C9.78261 17.3578 10.0035 17.6929 10.2572 18H6C4.89543 18 4 17.1046 4 16V4C4 2.89543 4.89543 2 6 2H14C15.1046 2 16 2.89543 16 4V9.20703C15.6777 9.11588 15.3434 9.05337 15 9.02242V4C15 3.44772 14.5523 3 14 3ZM6 5V6C6 6.55228 6.44772 7 7 7H13C13.5523 7 14 6.55228 14 6V5C14 4.44772 13.5523 4 13 4H7C6.44772 4 6 4.44772 6 5ZM7 5H13V6H7V5ZM19 14.5C19 16.9853 16.9853 19 14.5 19C12.0147 19 10 16.9853 10 14.5C10 12.0147 12.0147 10 14.5 10C16.9853 10 19 12.0147 19 14.5ZM15 12.5C15 12.2239 14.7761 12 14.5 12C14.2239 12 14 12.2239 14 12.5V14H12.5C12.2239 14 12 14.2239 12 14.5C12 14.7761 12.2239 15 12.5 15H14V16.5C14 16.7761 14.2239 17 14.5 17C14.7761 17 15 16.7761 15 16.5V15H16.5C16.7761 15 17 14.7761 17 14.5C17 14.2239 16.7761 14 16.5 14H15V12.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/arrow-down.svg b/src/browser/themes/shared/zen-icons/win/arrow-down.svg
deleted file mode 100644
index 8704d0cf6..000000000
--- a/src/browser/themes/shared/zen-icons/win/arrow-down.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.8664 10.8371C17.0526 10.6332 17.0382 10.3169 16.8342 10.1307C16.6303 9.94456 16.314 9.95895 16.1278 10.1629L10.4971 16.3307V2.5C10.4971 2.22386 10.2733 2 9.99712 2C9.72097 2 9.49712 2.22386 9.49712 2.5V16.3279L3.86903 10.1629C3.68285 9.95895 3.36659 9.94456 3.16265 10.1307C2.95871 10.3169 2.94431 10.6332 3.13049 10.8371L9.44454 17.7535C9.5723 17.8934 9.73984 17.9732 9.91298 17.993C9.94033 17.9976 9.96844 18 9.99712 18C10.024 18 10.0504 17.9979 10.0761 17.9938C10.252 17.9756 10.4227 17.8955 10.5523 17.7535L16.8664 10.8371Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/arrow-left.svg b/src/browser/themes/shared/zen-icons/win/arrow-left.svg
deleted file mode 100644
index caba961b9..000000000
--- a/src/browser/themes/shared/zen-icons/win/arrow-left.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.15898 16.8666C9.36292 17.0528 9.67918 17.0384 9.86536 16.8345C10.0515 16.6305 10.0371 16.3143 9.8332 16.1281L3.66535 10.4974H17.4961C17.7722 10.4974 17.9961 10.2735 17.9961 9.99736C17.9961 9.72122 17.7722 9.49736 17.4961 9.49736H3.66824L9.8332 3.86927C10.0371 3.68309 10.0515 3.36684 9.86536 3.16289C9.67918 2.95895 9.36292 2.94456 9.15898 3.13074L2.24263 9.44478C2.10268 9.57254 2.02285 9.74008 2.00314 9.91323C1.99851 9.94058 1.99609 9.96869 1.99609 9.99736C1.99609 10.0242 1.99821 10.0506 2.00229 10.0763C2.02047 10.2522 2.10058 10.4229 2.24263 10.5526L9.15898 16.8666Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/arrow-right.svg b/src/browser/themes/shared/zen-icons/win/arrow-right.svg
deleted file mode 100644
index f9f1f57ef..000000000
--- a/src/browser/themes/shared/zen-icons/win/arrow-right.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.8371 3.13074C10.6332 2.94456 10.3169 2.95895 10.1307 3.16289C9.94456 3.36683 9.95895 3.68309 10.1629 3.86927L16.3307 9.5H2.5C2.22386 9.5 2 9.72386 2 10C2 10.2761 2.22386 10.5 2.5 10.5H16.3279L10.1629 16.1281C9.95895 16.3143 9.94456 16.6305 10.1307 16.8345C10.3169 17.0384 10.6332 17.0528 10.8371 16.8666L17.7535 10.5526C17.8934 10.4248 17.9732 10.2573 17.993 10.0841C17.9976 10.0568 18 10.0287 18 10C18 9.97313 17.9979 9.94675 17.9938 9.92103C17.9756 9.74512 17.8955 9.57446 17.7535 9.44478L10.8371 3.13074Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/arrow-up.svg b/src/browser/themes/shared/zen-icons/win/arrow-up.svg
deleted file mode 100644
index f577628c6..000000000
--- a/src/browser/themes/shared/zen-icons/win/arrow-up.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.13196 9.16156C2.94578 9.3655 2.96017 9.68176 3.16412 9.86794C3.36806 10.0541 3.68431 10.0397 3.87049 9.83578L9.50122 3.66792L9.50122 17.4987C9.50122 17.7748 9.72508 17.9987 10.0012 17.9987C10.2774 17.9987 10.5012 17.7748 10.5012 17.4987L10.5012 3.67081L16.1293 9.83578C16.3155 10.0397 16.6317 10.0541 16.8357 9.86794C17.0396 9.68176 17.054 9.3655 16.8678 9.16156L10.5538 2.24521C10.426 2.10526 10.2585 2.02543 10.0854 2.00572C10.058 2.00109 10.0299 1.99867 10.0012 1.99867C9.97435 1.99867 9.94797 2.00079 9.92225 2.00487C9.74634 2.02305 9.57568 2.10316 9.446 2.24521L3.13196 9.16156Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/audio-save.svg b/src/browser/themes/shared/zen-icons/win/audio-save.svg
deleted file mode 100644
index c43d00a7e..000000000
--- a/src/browser/themes/shared/zen-icons/win/audio-save.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.147 2.02211C9.99539 1.97545 9.83058 2.00354 9.70295 2.09781C9.57531 2.19208 9.5 2.34133 9.5 2.5V12.4048C8.91605 11.8444 8.12325 11.5 7.25 11.5C5.45507 11.5 4 12.9551 4 14.75C4 16.5449 5.45507 18 7.25 18C9.04493 18 10.5 16.5449 10.5 14.75C10.5 14.6897 10.4984 14.6297 10.4951 14.5702C10.4983 14.5473 10.5 14.5238 10.5 14.5V7.17698L16.353 8.97789C16.5046 9.02456 16.6694 8.99647 16.7971 8.9022C16.9247 8.80793 17 8.65868 17 8.5V5.97715C17 4.87964 16.2842 3.91047 15.2352 3.58771L10.147 2.02211ZM16 7.82302L10.5 6.13072V3.17698L14.9411 4.54348C15.5705 4.73714 16 5.31865 16 5.97715V7.82302ZM5 14.75C5 13.5074 6.00736 12.5 7.25 12.5C8.49264 12.5 9.5 13.5074 9.5 14.75C9.5 15.9926 8.49264 17 7.25 17C6.00736 17 5 15.9926 5 14.75Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/autoplay-media-blocked.svg b/src/browser/themes/shared/zen-icons/win/autoplay-media-blocked.svg
deleted file mode 100644
index 8b524b130..000000000
--- a/src/browser/themes/shared/zen-icons/win/autoplay-media-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.00058 4.70769L2.14645 2.85355C1.95118 2.65829 1.95118 2.34171 2.14645 2.14645C2.34171 1.95118 2.65829 1.95118 2.85355 2.14645L17.8536 17.1464C18.0488 17.3417 18.0488 17.6583 17.8536 17.8536C17.6583 18.0488 17.3417 18.0488 17.1464 17.8536L15.2923 15.9994C13.882 17.2445 12.0292 18 10 18C5.58172 18 2 14.4183 2 10C2 7.97079 2.75551 6.11804 4.00058 4.70769ZM14.5836 15.2907L4.70926 5.41637C3.64441 6.64443 3 8.24696 3 10C3 13.866 6.13401 17 10 17C11.753 17 13.3556 16.3556 14.5836 15.2907ZM17 10C17 11.3901 16.5948 12.6856 15.8961 13.7747L16.6178 14.4964C17.4901 13.215 18 11.6671 18 10C18 5.58172 14.4183 2 10 2C8.33295 2 6.78499 2.5099 5.50358 3.38224L6.22528 4.10394C7.31443 3.4052 8.6099 3 10 3C13.866 3 17 6.13401 17 10Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/autoplay-media.svg b/src/browser/themes/shared/zen-icons/win/autoplay-media.svg
deleted file mode 100644
index 2f16958a1..000000000
--- a/src/browser/themes/shared/zen-icons/win/autoplay-media.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.25469 6C5.51964 4.18652 7.62125 3 10 3C13.866 3 17 6.13401 17 10C17 13.866 13.866 17 10 17C6.13401 17 3 13.866 3 10C3 9.85504 3.00441 9.71111 3.01309 9.56834C3.0314 9.26732 2.80103 9 2.49945 9C2.2495 9 2.03699 9.18611 2.01961 9.43546C2.00661 9.62195 2 9.8102 2 10C2 14.4183 5.58172 18 10 18C14.4183 18 18 14.4183 18 10C18 5.58172 14.4183 2 10 2C7.32244 2 4.95211 3.31542 3.5 5.33528V3.5C3.5 3.22386 3.27614 3 3 3C2.72386 3 2.5 3.22386 2.5 3.5V6.5C2.5 6.77614 2.72386 7 3 7H6C6.27614 7 6.5 6.77614 6.5 6.5C6.5 6.22386 6.27614 6 6 6H4.25469ZM8 7.75146C8 6.98645 8.82401 6.50475 9.49062 6.88008L13.4876 9.13058C14.1668 9.51299 14.1668 10.4909 13.4876 10.8733L9.49062 13.1238C8.82401 13.4992 8 13.0175 8 12.2525V7.75146ZM12.997 10.002L9 7.75146V12.2525L12.997 10.002Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/back.svg b/src/browser/themes/shared/zen-icons/win/back.svg
deleted file mode 100644
index caba961b9..000000000
--- a/src/browser/themes/shared/zen-icons/win/back.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.15898 16.8666C9.36292 17.0528 9.67918 17.0384 9.86536 16.8345C10.0515 16.6305 10.0371 16.3143 9.8332 16.1281L3.66535 10.4974H17.4961C17.7722 10.4974 17.9961 10.2735 17.9961 9.99736C17.9961 9.72122 17.7722 9.49736 17.4961 9.49736H3.66824L9.8332 3.86927C10.0371 3.68309 10.0515 3.36684 9.86536 3.16289C9.67918 2.95895 9.36292 2.94456 9.15898 3.13074L2.24263 9.44478C2.10268 9.57254 2.02285 9.74008 2.00314 9.91323C1.99851 9.94058 1.99609 9.96869 1.99609 9.99736C1.99609 10.0242 1.99821 10.0506 2.00229 10.0763C2.02047 10.2522 2.10058 10.4229 2.24263 10.5526L9.15898 16.8666Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/bookmark-hollow.svg b/src/browser/themes/shared/zen-icons/win/bookmark-hollow.svg
deleted file mode 100644
index 97d4fd562..000000000
--- a/src/browser/themes/shared/zen-icons/win/bookmark-hollow.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.9999 4.5C3.9999 3.11929 5.11919 2 6.4999 2H13.4999C14.8806 2 15.9999 3.11929 15.9999 4.5V17.5C15.9999 17.6881 15.8944 17.8602 15.7268 17.9456C15.5592 18.0309 15.3579 18.015 15.2058 17.9044L9.9999 14.1182L4.79399 17.9044C4.64189 18.015 4.4406 18.0309 4.27301 17.9456C4.10543 17.8602 3.9999 17.6881 3.9999 17.5V4.5ZM6.4999 3C5.67147 3 4.9999 3.67157 4.9999 4.5V16.5181L9.70582 13.0956C9.88114 12.9681 10.1187 12.9681 10.294 13.0956L14.9999 16.5181V4.5C14.9999 3.67157 14.3283 3 13.4999 3H6.4999Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/bookmark-star-on-tray.svg b/src/browser/themes/shared/zen-icons/win/bookmark-star-on-tray.svg
deleted file mode 100644
index 874eeeb91..000000000
--- a/src/browser/themes/shared/zen-icons/win/bookmark-star-on-tray.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.10433 2.89893C9.47114 2.15568 10.531 2.15568 10.8978 2.89893L12.8282 6.81042L17.1448 7.43766C17.9651 7.55685 18.2926 8.56482 17.699 9.14335L14.5755 12.188L15.3129 16.4872C15.453 17.3041 14.5956 17.927 13.8619 17.5414L10.0011 15.5116L6.14018 17.5414C5.40655 17.9271 4.54913 17.3041 4.68924 16.4872L5.4266 12.188L2.30308 9.14335C1.70956 8.56482 2.03708 7.55685 2.8573 7.43766L7.17389 6.81042L9.10433 2.89893ZM10.0011 3.34149L8.07062 7.25299C7.92496 7.54813 7.6434 7.7527 7.31769 7.80003L3.00109 8.42727L6.12461 11.4719C6.3603 11.7017 6.46784 12.0327 6.41221 12.3571L5.67484 16.6562L9.53572 14.6264C9.82705 14.4733 10.1751 14.4733 10.4664 14.6264L14.3273 16.6562L13.5899 12.3571C13.5343 12.0327 13.6418 11.7017 13.8775 11.4719L17.001 8.42727L12.6844 7.80003C12.3587 7.7527 12.0772 7.54813 11.9315 7.25299L10.0011 3.34149Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/bookmark.svg b/src/browser/themes/shared/zen-icons/win/bookmark.svg
deleted file mode 100644
index 39d18ddc9..000000000
--- a/src/browser/themes/shared/zen-icons/win/bookmark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.9999 4.5C3.9999 3.11929 5.11919 2 6.4999 2H13.4999C14.8806 2 15.9999 3.11929 15.9999 4.5V17.5C15.9999 17.6881 15.8944 17.8602 15.7268 17.9456C15.5592 18.0309 15.3579 18.015 15.2058 17.9044L9.9999 14.1183L4.79399 17.9044C4.64189 18.015 4.4406 18.0309 4.27301 17.9456C4.10543 17.8602 3.9999 17.6881 3.9999 17.5V4.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/camera-blocked.svg b/src/browser/themes/shared/zen-icons/win/camera-blocked.svg
deleted file mode 100644
index 5a534884a..000000000
--- a/src/browser/themes/shared/zen-icons/win/camera-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.50163 4.20874L2.14645 2.85355C1.95118 2.65829 1.95118 2.34171 2.14645 2.14645C2.34171 1.95118 2.65829 1.95118 2.85355 2.14645L17.8536 17.1464C18.0488 17.3417 18.0488 17.6583 17.8536 17.8536C17.6583 18.0488 17.3417 18.0488 17.1464 17.8536L16.1961 16.9032C15.9765 16.9662 15.7445 17 15.5046 17H4.50464C3.12393 17 2.00464 15.8807 2.00464 14.5V6.4994C2.00464 5.4754 2.62029 4.5952 3.50163 4.20874ZM15.2929 16L12.4528 13.1599C11.7755 13.6865 10.9243 14 9.99994 14C7.7908 14 5.99994 12.2092 5.99994 10C5.99994 9.07565 6.3135 8.22451 6.84005 7.54716L4.30541 5.01251C3.57116 5.10996 3.00464 5.73852 3.00464 6.4994V14.5C3.00464 15.3284 3.67621 16 4.50464 16H15.2929ZM11.7383 12.4454L7.5546 8.26171C7.20535 8.75213 6.99994 9.35209 6.99994 10C6.99994 11.6569 8.34308 13 9.99994 13C10.6479 13 11.2478 12.7946 11.7383 12.4454ZM8.43787 6.31653L9.22296 7.10162C9.47077 7.03536 9.73123 7.00003 9.99994 7.00003C11.6568 7.00003 12.9999 8.34318 12.9999 10C12.9999 10.2687 12.9646 10.5292 12.8983 10.777L13.6834 11.5621C13.8872 11.0822 13.9999 10.5543 13.9999 10C13.9999 7.79089 12.2091 6.00003 9.99994 6.00003C9.44569 6.00003 8.91778 6.11275 8.43787 6.31653ZM17.0046 14.5C17.0046 14.6183 16.991 14.7334 16.9651 14.8437L17.7407 15.6193C17.9096 15.2826 18.0046 14.9024 18.0046 14.5V6.4994C18.0046 5.11869 16.8854 3.9994 15.5046 3.9994H13.8147L13.2298 2.8293C12.9757 2.32106 12.4563 2 11.8881 2H8.12387C7.55682 2 7.03824 2.31977 6.78361 2.82643L6.19412 3.9994H6.12074L6.91016 4.78883C6.92466 4.7684 6.93772 4.74673 6.94919 4.72392L7.67712 3.27548C7.762 3.10659 7.93486 3 8.12387 3H11.8881C12.0775 3 12.2506 3.10702 12.3353 3.27643L13.0584 4.72296C13.1431 4.89238 13.3162 4.9994 13.5056 4.9994H15.5046C16.3331 4.9994 17.0046 5.67097 17.0046 6.4994V14.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/camera.svg b/src/browser/themes/shared/zen-icons/win/camera.svg
deleted file mode 100644
index 23fa82b5c..000000000
--- a/src/browser/themes/shared/zen-icons/win/camera.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 6.00003C7.79086 6.00003 6 7.79089 6 10C6 12.2092 7.79086 14 10 14C12.2091 14 14 12.2092 14 10C14 7.79089 12.2091 6.00003 10 6.00003ZM7 10C7 8.34318 8.34315 7.00003 10 7.00003C11.6569 7.00003 13 8.34318 13 10C13 11.6569 11.6569 13 10 13C8.34315 13 7 11.6569 7 10ZM8.12394 2C7.55688 2 7.0383 2.31977 6.78367 2.82643L6.19418 3.9994H4.5047C3.12399 3.9994 2.0047 5.11868 2.0047 6.4994V14.5C2.0047 15.8807 3.12399 17 4.5047 17H15.5047C16.8854 17 18.0047 15.8807 18.0047 14.5V6.4994C18.0047 5.11869 16.8854 3.9994 15.5047 3.9994H13.8148L13.2298 2.8293C12.9758 2.32106 12.4563 2 11.8881 2H8.12394ZM7.67718 3.27548C7.76206 3.10659 7.93492 3 8.12394 3H11.8881C12.0775 3 12.2507 3.10702 12.3354 3.27643L13.0585 4.72296C13.1432 4.89238 13.3163 4.9994 13.5057 4.9994H15.5047C16.3331 4.9994 17.0047 5.67097 17.0047 6.4994V14.5C17.0047 15.3284 16.3331 16 15.5047 16H4.5047C3.67627 16 3.0047 15.3284 3.0047 14.5V6.4994C3.0047 5.67097 3.67627 4.9994 4.5047 4.9994H6.50249C6.69151 4.9994 6.86437 4.89281 6.94925 4.72392L7.67718 3.27548Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/canvas-blocked.svg b/src/browser/themes/shared/zen-icons/win/canvas-blocked.svg
deleted file mode 100644
index 610701ad9..000000000
--- a/src/browser/themes/shared/zen-icons/win/canvas-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.08859 4.21569L4.14645 4.14645C4.32001 3.97288 4.58944 3.9536 4.78431 4.08859L4.85355 4.14645L10 9.293L15.1464 4.14645C15.32 3.97288 15.5894 3.9536 15.7843 4.08859L15.8536 4.14645C16.0271 4.32001 16.0464 4.58944 15.9114 4.78431L15.8536 4.85355L10.707 10L15.8536 15.1464C16.0271 15.32 16.0464 15.5894 15.9114 15.7843L15.8536 15.8536C15.68 16.0271 15.4106 16.0464 15.2157 15.9114L15.1464 15.8536L10 10.707L4.85355 15.8536C4.67999 16.0271 4.41056 16.0464 4.21569 15.9114L4.14645 15.8536C3.97288 15.68 3.9536 15.4106 4.08859 15.2157L4.14645 15.1464L9.293 10L4.14645 4.85355C3.97288 4.67999 3.9536 4.41056 4.08859 4.21569L4.14645 4.14645L4.08859 4.21569Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/canvas.svg b/src/browser/themes/shared/zen-icons/win/canvas.svg
deleted file mode 100644
index c4cb3d062..000000000
--- a/src/browser/themes/shared/zen-icons/win/canvas.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3C2.44772 3 2 3.44772 2 4C2 4.55228 2.44772 5 3 5V11C3 12.6569 4.34315 14 6 14H9.5V16H7.5C7.22386 16 7 16.2239 7 16.5C7 16.7761 7.22386 17 7.5 17H12.5C12.7761 17 13 16.7761 13 16.5C13 16.2239 12.7761 16 12.5 16H10.5V14H14C15.6569 14 17 12.6569 17 11V5C17.5523 5 18 4.55228 18 4C18 3.44772 17.5523 3 17 3H3ZM4 5H16V11C16 12.1046 15.1046 13 14 13H6C4.89543 13 4 12.1046 4 11V5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/checkmark.svg b/src/browser/themes/shared/zen-icons/win/checkmark.svg
deleted file mode 100644
index b93b71eef..000000000
--- a/src/browser/themes/shared/zen-icons/win/checkmark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.3737 10.1678C3.19025 9.96143 2.87421 9.94284 2.66782 10.1263C2.46143 10.3098 2.44284 10.6258 2.62629 10.8322L6.6263 15.3322C6.81742 15.5472 7.15013 15.557 7.35355 15.3536L17.8536 4.85355C18.0488 4.65829 18.0488 4.34171 17.8536 4.14645C17.6583 3.95118 17.3417 3.95118 17.1464 4.14645L7.02141 14.2715L3.3737 10.1678Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/chevron.svg b/src/browser/themes/shared/zen-icons/win/chevron.svg
deleted file mode 100644
index 54b5ccee5..000000000
--- a/src/browser/themes/shared/zen-icons/win/chevron.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.64582 4.14708C7.84073 3.95147 8.15731 3.9509 8.35292 4.14582L13.8374 9.6108C14.0531 9.82574 14.0531 10.1751 13.8374 10.39L8.35292 15.855C8.15731 16.0499 7.84073 16.0493 7.64582 15.8537C7.4509 15.6581 7.45147 15.3415 7.64708 15.1466L12.8117 10.0004L7.64708 4.85418C7.45147 4.65927 7.4509 4.34269 7.64582 4.14708Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/close-all.svg b/src/browser/themes/shared/zen-icons/win/close-all.svg
deleted file mode 100644
index 610701ad9..000000000
--- a/src/browser/themes/shared/zen-icons/win/close-all.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.08859 4.21569L4.14645 4.14645C4.32001 3.97288 4.58944 3.9536 4.78431 4.08859L4.85355 4.14645L10 9.293L15.1464 4.14645C15.32 3.97288 15.5894 3.9536 15.7843 4.08859L15.8536 4.14645C16.0271 4.32001 16.0464 4.58944 15.9114 4.78431L15.8536 4.85355L10.707 10L15.8536 15.1464C16.0271 15.32 16.0464 15.5894 15.9114 15.7843L15.8536 15.8536C15.68 16.0271 15.4106 16.0464 15.2157 15.9114L15.1464 15.8536L10 10.707L4.85355 15.8536C4.67999 16.0271 4.41056 16.0464 4.21569 15.9114L4.14645 15.8536C3.97288 15.68 3.9536 15.4106 4.08859 15.2157L4.14645 15.1464L9.293 10L4.14645 4.85355C3.97288 4.67999 3.9536 4.41056 4.08859 4.21569L4.14645 4.14645L4.08859 4.21569Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/close.svg b/src/browser/themes/shared/zen-icons/win/close.svg
deleted file mode 100644
index 610701ad9..000000000
--- a/src/browser/themes/shared/zen-icons/win/close.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.08859 4.21569L4.14645 4.14645C4.32001 3.97288 4.58944 3.9536 4.78431 4.08859L4.85355 4.14645L10 9.293L15.1464 4.14645C15.32 3.97288 15.5894 3.9536 15.7843 4.08859L15.8536 4.14645C16.0271 4.32001 16.0464 4.58944 15.9114 4.78431L15.8536 4.85355L10.707 10L15.8536 15.1464C16.0271 15.32 16.0464 15.5894 15.9114 15.7843L15.8536 15.8536C15.68 16.0271 15.4106 16.0464 15.2157 15.9114L15.1464 15.8536L10 10.707L4.85355 15.8536C4.67999 16.0271 4.41056 16.0464 4.21569 15.9114L4.14645 15.8536C3.97288 15.68 3.9536 15.4106 4.08859 15.2157L4.14645 15.1464L9.293 10L4.14645 4.85355C3.97288 4.67999 3.9536 4.41056 4.08859 4.21569L4.14645 4.14645L4.08859 4.21569Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/container-tab.svg b/src/browser/themes/shared/zen-icons/win/container-tab.svg
deleted file mode 100644
index 10ad36eb4..000000000
--- a/src/browser/themes/shared/zen-icons/win/container-tab.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 7C8 5.89543 8.89543 5 10 5C11.1046 5 12 5.89543 12 7C12 8.10457 11.1046 9 10 9C8.89543 9 8 8.10457 8 7ZM7.49998 10L12.5 10C13.3284 10 14 10.6716 14 11.5C14 12.6161 13.541 13.5103 12.7879 14.1148C12.0466 14.7098 11.0531 15 10 15C8.94692 15 7.95342 14.7098 7.21215 14.1148C6.45897 13.5103 6 12.6161 6 11.5C6 10.6716 6.67156 10 7.49998 10ZM10 2C5.58172 2 2 5.58172 2 10C2 14.4183 5.58172 18 10 18C14.4183 18 18 14.4183 18 10C18 5.58172 14.4183 2 10 2ZM3 10C3 6.13401 6.13401 3 10 3C13.866 3 17 6.13401 17 10C17 13.866 13.866 17 10 17C6.13401 17 3 13.866 3 10Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/customize.svg b/src/browser/themes/shared/zen-icons/win/customize.svg
deleted file mode 100644
index 9afdcfad5..000000000
--- a/src/browser/themes/shared/zen-icons/win/customize.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.5 1.99915C5.22386 1.99915 5 2.223 5 2.49915L5.00002 11.0035C5.00002 12.1081 5.89545 13.0035 7.00002 13.0035H8.00411V16.0008C8.00411 17.1054 8.89954 18.0008 10.0041 18.0008C11.1087 18.0008 12.0041 17.1054 12.0041 16.0008V13.0035H13C14.1046 13.0035 15 12.1081 15 11.0035V9.50351L15 9.4991V2.49915C15 2.223 14.7761 1.99915 14.5 1.99915H5.5ZM6.00002 10.0035H14V11.0035C14 11.5558 13.5523 12.0035 13 12.0035H11.5041C11.228 12.0035 11.0041 12.2274 11.0041 12.5035V16.0008C11.0041 16.5531 10.5564 17.0008 10.0041 17.0008C9.45183 17.0008 9.00411 16.5531 9.00411 16.0008V12.5035C9.00411 12.2274 8.78026 12.0035 8.50411 12.0035H7.00002C6.44773 12.0035 6.00002 11.5558 6.00002 11.0035V10.0035ZM14 9.00351H6V2.99915H10V4.49915C10 4.77529 10.2239 4.99915 10.5 4.99915C10.7761 4.99915 11 4.77529 11 4.49915V2.99915H12V5.50134C12 5.77748 12.2239 6.00134 12.5 6.00134C12.7761 6.00134 13 5.77748 13 5.50134V2.99915H14V9.00351Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/desktop-notification-blocked.svg b/src/browser/themes/shared/zen-icons/win/desktop-notification-blocked.svg
deleted file mode 100644
index fcde94f09..000000000
--- a/src/browser/themes/shared/zen-icons/win/desktop-notification-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.0044 7.56824C4.03648 6.75282 4.2411 5.98297 4.58356 5.29065L2.14645 2.85355C1.95118 2.65829 1.95118 2.34171 2.14645 2.14645C2.34171 1.95118 2.65829 1.95118 2.85355 2.14645L17.8536 17.1464C18.0488 17.3417 18.0488 17.6583 17.8536 17.8536C17.6583 18.0488 17.3417 18.0488 17.1464 17.8536L14.2972 15.0043L12.4996 15.004L12.4946 15.1653C12.4095 16.469 11.3252 17.5 10 17.5C8.67453 17.5 7.58998 16.4685 7.50533 15.1644L7.49962 15.004L3.99891 15.0046C3.91096 15.0046 3.82358 14.993 3.73902 14.9702L3.61456 14.9277C3.20378 14.7567 2.96181 14.3392 3.01221 13.8757L3.0333 13.7483L3.07572 13.6202L3.99902 11.401L4.0001 7.79281L4.0044 7.56824ZM13.299 14.0061L5.33843 6.04552C5.16766 6.46607 5.05719 6.91575 5.01715 7.38498L5.00393 7.59723L5.00002 7.80214V11.5L4.96161 11.6922L3.9989 14.0046L13.299 14.0061ZM11.4996 15.004H8.49962L8.50697 15.1454C8.57552 15.8581 9.14275 16.425 9.85556 16.4931L10 16.5C10.7797 16.5 11.4205 15.9051 11.4931 15.1445L11.4996 15.004ZM15.0384 11.6922L15.9133 13.7919L16.7653 14.644C16.9153 14.4691 17.0013 14.2458 17.0013 14.0046L16.9926 13.8733L16.9774 13.7871C16.9647 13.7302 16.947 13.6743 16.9244 13.6202L15.999 11.398L16 7.80214L15.9955 7.57762L15.9821 7.3554C15.7416 4.33488 13.1466 2 9.99766 2C8.3584 2 6.86951 2.63266 5.78523 3.66389L6.49193 4.3706C7.39369 3.52222 8.63126 3 9.99766 3C12.6947 3 14.8909 5.0349 14.996 7.60831L15.0001 7.81241L15 11.5L15.0384 11.6922Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/desktop-notification.svg b/src/browser/themes/shared/zen-icons/win/desktop-notification.svg
deleted file mode 100644
index 1cb4892a2..000000000
--- a/src/browser/themes/shared/zen-icons/win/desktop-notification.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.99766 2C13.1466 2 15.7416 4.33488 15.9821 7.3554L15.9955 7.57762L16 7.80214L15.999 11.398L16.9244 13.6202C16.947 13.6743 16.9647 13.7302 16.9774 13.7871L16.9926 13.8733L17.0013 14.0046C17.0013 14.4526 16.7048 14.8387 16.2521 14.9677L16.1358 14.9945L16.0013 15.0046L12.4996 15.004L12.4946 15.1653C12.4095 16.469 11.3252 17.5 10 17.5C8.67453 17.5 7.58998 16.4685 7.50533 15.1644L7.49962 15.004L3.99891 15.0046C3.91096 15.0046 3.82358 14.993 3.73902 14.9702L3.61456 14.9277C3.20378 14.7567 2.96181 14.3392 3.01221 13.8757L3.0333 13.7483L3.07572 13.6202L3.99902 11.401L4.0001 7.79281L4.0044 7.56824C4.12702 4.45115 6.77104 2 9.99766 2ZM11.4996 15.004H8.49962L8.50697 15.1454C8.57552 15.8581 9.14275 16.425 9.85556 16.4931L10 16.5C10.7797 16.5 11.4205 15.9051 11.4931 15.1445L11.4996 15.004ZM9.99766 3C7.37511 3 5.22717 4.92372 5.01715 7.38498L5.00393 7.59723L5.00002 7.80214V11.5L4.96161 11.6922L3.9989 14.0046L15.9566 14.0066L16.0019 14.0045L15.0384 11.6922L15 11.5L15.0001 7.81241L14.996 7.60831C14.8909 5.0349 12.6947 3 9.99766 3Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/developer.svg b/src/browser/themes/shared/zen-icons/win/developer.svg
deleted file mode 100644
index 754c7127a..000000000
--- a/src/browser/themes/shared/zen-icons/win/developer.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.99994 6.5C8.99994 4.01472 11.0147 2 13.4999 2C14.1593 2 14.7868 2.14214 15.3524 2.39792C15.502 2.46556 15.6089 2.60232 15.6383 2.76381C15.6678 2.92531 15.616 3.09097 15.5 3.20705L13.207 5.49998L14.5 6.79287L16.7929 4.49998C16.909 4.3839 17.0746 4.33219 17.2361 4.36164C17.3976 4.39108 17.5344 4.49793 17.602 4.6475C17.8578 5.2131 17.9999 5.84062 17.9999 6.5C17.9999 8.98528 15.9852 11 13.4999 11C13.1193 11 12.7492 10.9526 12.3954 10.8633L6.03058 17.3113C5.18308 18.1698 3.82415 18.25 2.88158 17.497C1.79647 16.6302 1.69215 15.0178 2.6565 14.0184L9.08195 7.35911C9.02809 7.08069 8.99994 6.79343 8.99994 6.5ZM13.4999 3C11.5669 3 9.99994 4.567 9.99994 6.5C9.99994 6.80674 10.0393 7.10354 10.1129 7.38597C10.1569 7.55458 10.1099 7.73392 9.98891 7.85931L3.37613 14.7127C2.82086 15.2882 2.88093 16.2166 3.50573 16.7157C4.04845 17.1493 4.83091 17.1031 5.3189 16.6088L11.8927 9.94909C12.0261 9.81397 12.2245 9.76605 12.4048 9.8254C12.7487 9.93857 13.1166 10 13.4999 10C15.4329 10 16.9999 8.433 16.9999 6.5C16.9999 6.25328 16.9745 6.01282 16.9261 5.78097L14.8536 7.85352C14.6583 8.04878 14.3417 8.04879 14.1465 7.85353L12.1464 5.85355C12.0526 5.75979 11.9999 5.63261 11.9999 5.5C11.9999 5.36739 12.0526 5.24021 12.1464 5.14644L14.219 3.07383C13.9871 3.02545 13.7467 3 13.4999 3Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/downloads.svg b/src/browser/themes/shared/zen-icons/win/downloads.svg
deleted file mode 100644
index 7395f44d4..000000000
--- a/src/browser/themes/shared/zen-icons/win/downloads.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.5 16.9989C15.7761 16.9989 16 17.2227 16 17.4989C16 17.7443 15.8231 17.9485 15.5899 17.9908L15.5 17.9989H4.5C4.22386 17.9989 4 17.775 4 17.4989C4 17.2534 4.17688 17.0493 4.41012 17.0069L4.5 16.9989H15.5ZM10.0001 2.0011C10.2456 2.0011 10.4497 2.1781 10.492 2.41137L10.5 2.50124L10.496 14.2951L14.1414 10.6468C14.3148 10.473 14.5842 10.4535 14.7792 10.5883L14.8485 10.6461C15.0222 10.8195 15.0418 11.0889 14.907 11.2839L14.8492 11.3532L10.3574 15.8532C10.285 15.9259 10.1957 15.9715 10.1021 15.9902L9.99608 16C9.83511 16 9.69192 15.9239 9.60051 15.8057L5.14386 11.3538C4.94846 11.1587 4.94823 10.8421 5.14336 10.6467C5.3168 10.473 5.58621 10.4535 5.78117 10.5884L5.85046 10.6462L9.496 14.2871L9.5 2.50095C9.50008 2.22481 9.724 2.0011 10.0001 2.0011Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/drag-indicator.svg b/src/browser/themes/shared/zen-icons/win/drag-indicator.svg
deleted file mode 100644
index cfa50fb6c..000000000
--- a/src/browser/themes/shared/zen-icons/win/drag-indicator.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.5 10.5556C7.80683 10.5556 8.05556 10.3068 8.05556 10C8.05556 9.69319 7.80683 9.44446 7.5 9.44446C7.19318 9.44446 6.94444 9.69319 6.94444 10C6.94444 10.3068 7.19318 10.5556 7.5 10.5556Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.5 4.7222C7.80683 4.7222 8.05556 4.47346 8.05556 4.16664C8.05556 3.85981 7.80683 3.61108 7.5 3.61108C7.19318 3.61108 6.94444 3.85981 6.94444 4.16664C6.94444 4.47346 7.19318 4.7222 7.5 4.7222Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.5 16.3889C7.80683 16.3889 8.05556 16.1402 8.05556 15.8334C8.05556 15.5266 7.80683 15.2778 7.5 15.2778C7.19318 15.2778 6.94444 15.5266 6.94444 15.8334C6.94444 16.1402 7.19318 16.3889 7.5 16.3889Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 10.5556C12.8068 10.5556 13.0556 10.3068 13.0556 10C13.0556 9.69319 12.8068 9.44446 12.5 9.44446C12.1932 9.44446 11.9444 9.69319 11.9444 10C11.9444 10.3068 12.1932 10.5556 12.5 10.5556Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 4.7222C12.8068 4.7222 13.0556 4.47346 13.0556 4.16664C13.0556 3.85981 12.8068 3.61108 12.5 3.61108C12.1932 3.61108 11.9444 3.85981 11.9444 4.16664C11.9444 4.47346 12.1932 4.7222 12.5 4.7222Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 16.3889C12.8068 16.3889 13.0556 16.1402 13.0556 15.8334C13.0556 15.5266 12.8068 15.2778 12.5 15.2778C12.1932 15.2778 11.9444 15.5266 11.9444 15.8334C11.9444 16.1402 12.1932 16.3889 12.5 16.3889Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/duplicate-tab.svg b/src/browser/themes/shared/zen-icons/win/duplicate-tab.svg
deleted file mode 100644
index 0d19e1ea6..000000000
--- a/src/browser/themes/shared/zen-icons/win/duplicate-tab.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 8C2 4.68629 4.68629 2 8 2H11C11.892 2 12.693 2.38929 13.2426 3.00723C13.1623 3.00243 13.0814 3 13 3H8C5.23858 3 3 5.23858 3 8V13C3 13.0814 3.00244 13.1623 3.00724 13.2426C2.38929 12.6931 2 11.892 2 11V8ZM15 6C16.6569 6 18 7.34315 18 9V15C18 16.6569 16.6569 18 15 18H9C7.34315 18 6 16.6569 6 15V9C6 7.34315 7.34315 6 9 6H15ZM7 15C7 16.1046 7.89543 17 9 17H15C16.1046 17 17 16.1046 17 15V9C17 7.89543 16.1046 7 15 7H9C7.89543 7 7 7.89543 7 9V15ZM4 8.5C4 6.01472 6.01472 4 8.5 4H13C13.892 4 14.693 4.38929 15.2426 5.00723C15.1623 5.00243 15.0814 5 15 5H8.5C6.567 5 5 6.567 5 8.5V15C5 15.0814 5.00244 15.1623 5.00724 15.2426C4.38929 14.6931 4 13.892 4 13V8.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-copy.svg b/src/browser/themes/shared/zen-icons/win/edit-copy.svg
deleted file mode 100644
index fe5b95f0c..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-copy.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2C6.89543 2 6 2.89543 6 4V14C6 15.1046 6.89543 16 8 16H14C15.1046 16 16 15.1046 16 14V4C16 2.89543 15.1046 2 14 2H8ZM7 4C7 3.44772 7.44772 3 8 3H14C14.5523 3 15 3.44772 15 4V14C15 14.5523 14.5523 15 14 15H8C7.44772 15 7 14.5523 7 14V4ZM4 6.00001C4 5.25973 4.4022 4.61339 5 4.26758V14.5C5 15.8807 6.11929 17 7.5 17H13.7324C13.3866 17.5978 12.7403 18 12 18H7.5C5.567 18 4 16.433 4 14.5V6.00001Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-cut.svg b/src/browser/themes/shared/zen-icons/win/edit-cut.svg
deleted file mode 100644
index 207bf8c2d..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-cut.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.91939 2.22774C5.769 1.99615 5.45933 1.93033 5.22774 2.08072C4.99615 2.23112 4.93033 2.54079 5.08072 2.77238L9.40382 9.42936L7.4809 12.3904C7.04398 12.1419 6.53857 12 6 12C4.34315 12 3 13.3431 3 15C3 16.6569 4.34315 18 6 18C7.65685 18 9 16.6569 9 15C9 14.2446 8.72078 13.5543 8.25991 13.0269L10 10.3474L11.7401 13.0269C11.2792 13.5543 11 14.2446 11 15C11 16.6569 12.3431 18 14 18C15.6569 18 17 16.6569 17 15C17 13.3431 15.6569 12 14 12C13.4614 12 12.956 12.1419 12.5191 12.3904L5.91939 2.22774ZM14 17C12.8954 17 12 16.1046 12 15C12 13.8954 12.8954 13 14 13C15.1046 13 16 13.8954 16 15C16 16.1046 15.1046 17 14 17ZM4 15C4 13.8954 4.89543 13 6 13C7.10457 13 8 13.8954 8 15C8 16.1046 7.10457 17 6 17C4.89543 17 4 16.1046 4 15ZM11.1924 8.51133L10.5962 7.59329L14.0806 2.22774C14.231 1.99615 14.5407 1.93033 14.7723 2.08072C15.0039 2.23112 15.0697 2.54079 14.9193 2.77238L11.1924 8.51133Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-delete.svg b/src/browser/themes/shared/zen-icons/win/edit-delete.svg
deleted file mode 100644
index 5b2514d5a..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-delete.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 4H11.5C11.5 3.17157 10.8284 2.5 10 2.5C9.17157 2.5 8.5 3.17157 8.5 4ZM7.5 4C7.5 2.61929 8.61929 1.5 10 1.5C11.3807 1.5 12.5 2.61929 12.5 4H17.5C17.7761 4 18 4.22386 18 4.5C18 4.77614 17.7761 5 17.5 5H16.4456L15.2521 15.3439C15.0774 16.8576 13.7957 18 12.2719 18H7.72813C6.20431 18 4.92256 16.8576 4.7479 15.3439L3.55437 5H2.5C2.22386 5 2 4.77614 2 4.5C2 4.22386 2.22386 4 2.5 4H7.5ZM5.74131 15.2292C5.85775 16.2384 6.71225 17 7.72813 17H12.2719C13.2878 17 14.1422 16.2384 14.2587 15.2292L15.439 5H4.56101L5.74131 15.2292ZM8.5 7.5C8.77614 7.5 9 7.72386 9 8V14C9 14.2761 8.77614 14.5 8.5 14.5C8.22386 14.5 8 14.2761 8 14V8C8 7.72386 8.22386 7.5 8.5 7.5ZM12 8C12 7.72386 11.7761 7.5 11.5 7.5C11.2239 7.5 11 7.72386 11 8V14C11 14.2761 11.2239 14.5 11.5 14.5C11.7761 14.5 12 14.2761 12 14V8Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-paste.svg b/src/browser/themes/shared/zen-icons/win/edit-paste.svg
deleted file mode 100644
index 9d6e28cb9..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-paste.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 4H6.08535C6.29127 4.5826 6.84689 5 7.5 5H10.5C11.1531 5 11.7087 4.5826 11.9146 4H13.5C13.7761 4 14 4.22386 14 4.5V5.5C14 5.77614 14.2239 6 14.5 6C14.7761 6 15 5.77614 15 5.5V4.5C15 3.67157 14.3284 3 13.5 3H11.9146C11.7087 2.4174 11.1531 2 10.5 2H7.5C6.84689 2 6.29127 2.4174 6.08535 3H4.5C3.67157 3 3 3.67157 3 4.5V16.5C3 17.3284 3.67157 18 4.5 18H7.5C7.77614 18 8 17.7761 8 17.5C8 17.2239 7.77614 17 7.5 17H4.5C4.22386 17 4 16.7761 4 16.5V4.5C4 4.22386 4.22386 4 4.5 4ZM7.5 4C7.22386 4 7 3.77614 7 3.5C7 3.22386 7.22386 3 7.5 3H10.5C10.7761 3 11 3.22386 11 3.5C11 3.77614 10.7761 4 10.5 4H7.5ZM10.5 7C9.67157 7 9 7.67157 9 8.5V16.5C9 17.3284 9.67157 18 10.5 18H15.5C16.3284 18 17 17.3284 17 16.5V8.5C17 7.67157 16.3284 7 15.5 7H10.5ZM10 8.5C10 8.22386 10.2239 8 10.5 8H15.5C15.7761 8 16 8.22386 16 8.5V16.5C16 16.7761 15.7761 17 15.5 17H10.5C10.2239 17 10 16.7761 10 16.5V8.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-redo.svg b/src/browser/themes/shared/zen-icons/win/edit-redo.svg
deleted file mode 100644
index 941b5532c..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-redo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.003 2.5C15.003 2.22386 15.2269 2 15.503 2C15.7792 2 16.003 2.22386 16.003 2.5V7.4C16.003 7.73137 15.7344 8 15.403 8H10.503C10.2269 8 10.003 7.77614 10.003 7.5C10.003 7.22386 10.2269 7 10.503 7H14.097L10.6243 3.98124C8.95706 2.53191 6.43056 2.70858 4.98124 4.37584C3.53191 6.0431 3.70858 8.56959 5.37584 10.0189L13.5477 17.1226C13.7562 17.3038 13.7782 17.6196 13.5971 17.828C13.4159 18.0364 13.1001 18.0585 12.8917 17.8774L4.71978 10.7736C2.63571 8.96197 2.41487 5.80385 4.22653 3.71978C6.03818 1.63571 9.1963 1.41487 11.2804 3.22653L15.003 6.46259V2.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-select-all.svg b/src/browser/themes/shared/zen-icons/win/edit-select-all.svg
deleted file mode 100644
index 44fc0323d..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-select-all.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.16212 2.21224C8.75272 2.07336 9.36811 2 10 2C10.6319 2 11.2473 2.07336 11.8379 2.21224C12.1067 2.27545 12.2734 2.5446 12.2102 2.81341C12.1469 3.08222 11.8778 3.2489 11.609 3.18569C11.0929 3.06432 10.5543 3 10 3C9.44574 3 8.90714 3.06432 8.39102 3.18569C8.12221 3.2489 7.85306 3.08222 7.78985 2.81341C7.72663 2.5446 7.89331 2.27545 8.16212 2.21224ZM6.48118 3.35616C6.6266 3.59091 6.55417 3.8991 6.31942 4.04451C5.39652 4.61618 4.61618 5.39652 4.04451 6.31942C3.8991 6.55417 3.59092 6.6266 3.35616 6.48118C3.12141 6.33577 3.04898 6.02759 3.19439 5.79283C3.84745 4.73853 4.73853 3.84745 5.79283 3.19439C6.02759 3.04898 6.33577 3.12141 6.48118 3.35616ZM13.5188 3.35616C13.6642 3.12141 13.9724 3.04898 14.2072 3.19439C15.2615 3.84745 16.1525 4.73853 16.8056 5.79283C16.951 6.02759 16.8786 6.33577 16.6438 6.48118C16.4091 6.6266 16.1009 6.55417 15.9555 6.31942C15.3838 5.39652 14.6035 4.61618 13.6806 4.04451C13.4458 3.8991 13.3734 3.59092 13.5188 3.35616ZM2.81341 7.78984C3.08222 7.85306 3.2489 8.12221 3.18569 8.39102C3.06432 8.90714 3 9.44574 3 10C3 10.5543 3.06432 11.0929 3.18569 11.609C3.2489 11.8778 3.08222 12.1469 2.81341 12.2102C2.5446 12.2734 2.27545 12.1067 2.21224 11.8379C2.07336 11.2473 2 10.6319 2 10C2 9.36811 2.07336 8.75272 2.21224 8.16212C2.27545 7.89331 2.5446 7.72663 2.81341 7.78984ZM17.1866 7.78985C17.4554 7.72663 17.7246 7.89331 17.7878 8.16212C17.9266 8.75272 18 9.36811 18 10C18 10.6319 17.9266 11.2473 17.7878 11.8379C17.7246 12.1067 17.4554 12.2734 17.1866 12.2102C16.9178 12.1469 16.7511 11.8778 16.8143 11.609C16.9357 11.0929 17 10.5543 17 10C17 9.44574 16.9357 8.90714 16.8143 8.39102C16.7511 8.12221 16.9178 7.85306 17.1866 7.78985ZM3.35616 13.5188C3.59091 13.3734 3.8991 13.4458 4.04451 13.6806C4.61618 14.6035 5.39652 15.3838 6.31942 15.9555C6.55417 16.1009 6.6266 16.4091 6.48118 16.6438C6.33577 16.8786 6.02759 16.951 5.79283 16.8056C4.73853 16.1525 3.84745 15.2615 3.19439 14.2072C3.04898 13.9724 3.12141 13.6642 3.35616 13.5188ZM16.9342 14.2481C17.0712 14.0083 16.988 13.7029 16.7482 13.5659C16.5086 13.4289 16.2031 13.5124 16.066 13.7519L16.0636 13.756L16.0497 13.7791C16.0367 13.8005 16.016 13.8337 15.9877 13.877C15.9311 13.9636 15.8443 14.0904 15.7274 14.2438C15.493 14.5514 15.1404 14.9628 14.6708 15.3737C14.6393 15.4013 14.6073 15.4288 14.5747 15.4563C13.5586 14.6639 12.1996 14 10.5002 14C8.97904 14 8.013 14.9003 8.01294 16C8.01288 17.0997 8.97889 18 10.5001 18C12.1729 18 13.5184 17.4308 14.5329 16.7422C14.5714 16.7792 14.6093 16.8164 14.6465 16.8535C15.1178 17.3249 15.4725 17.7977 15.7089 18.1523C15.8268 18.3292 15.9146 18.4756 15.972 18.5762C16.0007 18.6264 16.0218 18.6651 16.0353 18.6903L16.0497 18.7178L16.053 18.7242C16.1766 18.9708 16.4767 19.0706 16.7235 18.9472C16.9705 18.8238 17.0701 18.5225 16.9467 18.2755C16.9467 18.2755 16.8178 18.0411 16.946 18.2743L16.9442 18.2707L16.9383 18.2592C16.9334 18.2497 16.9265 18.2365 16.9176 18.2198C16.8998 18.1865 16.8741 18.1392 16.8403 18.0801C16.7728 17.9619 16.673 17.7958 16.541 17.5977C16.2775 17.2023 15.8822 16.6751 15.3536 16.1465L15.3315 16.1244C15.8608 15.6609 16.2575 15.1981 16.5228 14.8499C16.6559 14.6753 16.7566 14.5286 16.825 14.4238C16.8592 14.3714 16.8854 14.3294 16.9036 14.2996C16.9127 14.2846 16.9198 14.2727 16.9249 14.2641L16.9311 14.2536C16.812 14.4436 16.9342 14.2481 16.9342 14.2481ZM10.5002 15C11.8003 15 12.8759 15.4631 13.7289 16.0722C12.8787 16.5981 11.8033 17 10.5001 17C9.37164 17 9.01292 16.4003 9.01294 16C9.01296 15.5997 9.37181 15 10.5002 15Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-theme.svg b/src/browser/themes/shared/zen-icons/win/edit-theme.svg
deleted file mode 100644
index bc2deff2c..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-theme.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="24" height="24" viewBox="0 0 24 24" fill="#000000" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.83885 5.85764C6.77986 1.94203 12.8685 0.802644 17.2028 3.49752C21.4826 6.15853 23.0566 11.2746 21.3037 16.0749C19.6485 20.6075 15.2873 22.4033 12.144 20.1233C10.9666 19.2692 10.5101 18.1985 10.2895 16.4595L10.1841 15.4715L10.1387 15.0741C10.016 14.14 9.82762 13.7216 9.43435 13.5024C8.89876 13.2038 8.54213 13.1969 7.83887 13.4694L7.48775 13.615L7.30902 13.693C6.29524 14.1332 5.62085 14.2879 4.76786 14.1092L4.56761 14.062L4.40407 14.0154C1.61511 13.1512 1.20202 9.36827 3.83885 5.85764ZM4.82307 12.5741L4.94598 12.6105L5.07993 12.6414C5.519 12.7283 5.89425 12.6558 6.51695 12.3995L7.11912 12.1423C8.32126 11.6494 9.10436 11.6012 10.1646 12.1921C11.0822 12.7036 11.4399 13.4897 11.6223 14.8518L11.6755 15.3109L11.7297 15.8427L11.7768 16.2651C11.9489 17.6263 12.2617 18.3556 13.0248 18.9091C15.3001 20.5595 18.5592 19.2175 19.8947 15.5604C21.411 11.4082 20.0688 7.04581 16.4107 4.77137C12.7365 2.4869 7.5123 3.46453 5.03822 6.75848C2.96343 9.52082 3.21791 12.038 4.82307 12.5741ZM16.0476 10.5797C15.8689 9.91288 16.2646 9.22746 16.9314 9.04878C17.5983 8.87011 18.2837 9.26583 18.4624 9.93267C18.6411 10.5995 18.2453 11.2849 17.5785 11.4636C16.9117 11.6423 16.2262 11.2465 16.0476 10.5797ZM16.5421 14.0684C16.3635 13.4015 16.7592 12.7161 17.426 12.5374C18.0929 12.3588 18.7783 12.7545 18.957 13.4213C19.1356 14.0882 18.7399 14.7736 18.0731 14.9523C17.4062 15.1309 16.7208 14.7352 16.5421 14.0684ZM14.0691 7.57703C13.8904 6.9102 14.2861 6.22478 14.9529 6.0461C15.6198 5.86742 16.3052 6.26315 16.4839 6.92998C16.6625 7.59681 16.2668 8.28224 15.6 8.46091C14.9331 8.63959 14.2477 8.24386 14.0691 7.57703ZM14.0406 16.5754C13.8619 15.9086 14.2576 15.2232 14.9245 15.0445C15.5913 14.8658 16.2767 15.2615 16.4554 15.9284C16.6341 16.5952 16.2383 17.2806 15.5715 17.4593C14.9047 17.638 14.2192 17.2422 14.0406 16.5754ZM10.5436 6.60544C10.365 5.9386 10.7607 5.25318 11.4275 5.07451C12.0944 4.89583 12.7798 5.29156 12.9585 5.95839C13.1371 6.62522 12.7414 7.31064 12.0746 7.48932C11.4077 7.668 10.7223 7.27227 10.5436 6.60544Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit-undo.svg b/src/browser/themes/shared/zen-icons/win/edit-undo.svg
deleted file mode 100644
index 185390167..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit-undo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 2.5C5 2.22386 4.77614 2 4.5 2C4.22386 2 4 2.22386 4 2.5V7.4C4 7.73137 4.26863 8 4.6 8H9.5C9.77614 8 10 7.77614 10 7.5C10 7.22386 9.77614 7 9.5 7H5.90603L9.37872 3.98124C11.046 2.53191 13.5725 2.70858 15.0218 4.37584C16.4711 6.0431 16.2945 8.56959 14.6272 10.0189L6.45529 17.1226C6.24688 17.3038 6.2248 17.6196 6.40596 17.828C6.58713 18.0364 6.90294 18.0585 7.11135 17.8774L15.2833 10.7736C17.3673 8.96197 17.5882 5.80385 15.7765 3.71978C13.9648 1.63571 10.8067 1.41487 8.72266 3.22653L5 6.46259V2.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/edit.svg b/src/browser/themes/shared/zen-icons/win/edit.svg
deleted file mode 100644
index 3f61408de..000000000
--- a/src/browser/themes/shared/zen-icons/win/edit.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.1794 2.92616C16.0271 1.71432 14.1027 1.69004 12.9203 2.87244L3.54545 12.2468C3.21763 12.5746 2.99008 12.9891 2.88953 13.4417L2.01191 17.3916C1.97483 17.5585 2.02559 17.7328 2.14649 17.8537C2.26739 17.9745 2.44166 18.0253 2.60855 17.9881L6.53494 17.115C7.00237 17.011 7.43048 16.776 7.76907 16.4374L15.7497 8.4567L16.0858 8.79281C16.4763 9.18333 16.4763 9.8165 16.0858 10.207L15.1464 11.1464C14.9512 11.3416 14.9512 11.6582 15.1464 11.8535C15.3417 12.0487 15.6583 12.0487 15.8536 11.8535L16.7929 10.9141C17.5739 10.1331 17.5739 8.86675 16.7929 8.0857L16.4568 7.74959L17.1271 7.0793C18.2681 5.93826 18.2913 4.09558 17.1794 2.92616ZM13.6274 3.57956C14.4123 2.79465 15.6898 2.81077 16.4547 3.61522C17.1928 4.39152 17.1774 5.61474 16.42 6.3722L7.06196 15.7303C6.85781 15.9344 6.59969 16.0762 6.31786 16.1388L3.15855 16.8414L3.86572 13.6586C3.92502 13.3917 4.05921 13.1473 4.25254 12.9539L13.6274 3.57956Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/essential-add.svg b/src/browser/themes/shared/zen-icons/win/essential-add.svg
deleted file mode 100644
index 85bf28ce4..000000000
--- a/src/browser/themes/shared/zen-icons/win/essential-add.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.4965 16.8028L16.7408 10.4994C18.4252 8.78856 18.4199 6.02549 16.7239 4.31249C15.0611 2.63292 12.3961 2.5895 10.6978 4.19086C10.6612 4.22539 10.6251 4.26068 10.5894 4.29673L9.99299 4.90026L9.38843 4.28963C9.35529 4.25616 9.32175 4.22333 9.28783 4.19116C7.58595 2.57726 4.91654 2.60193 3.26122 4.2739C1.5729 5.9792 1.58114 8.75004 3.27679 10.4627L9.55368 16.8028C9.81404 17.0657 10.2362 17.0657 10.4965 16.8028ZM11.3 5.00029C12.5964 3.69135 14.7025 3.69204 16.0133 5.01604C17.3253 6.34123 17.3272 8.47734 16.0292 9.79681L16.0282 9.79783L10.0252 15.8577L3.98743 9.75919C2.67408 8.43263 2.67286 6.28953 3.97185 4.97746C5.26525 3.67106 7.36984 3.67208 8.6778 4.99319L9.63801 5.96306C9.8338 6.16082 10.1534 6.16067 10.349 5.96272L11.3 5.00029Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/essential-remove.svg b/src/browser/themes/shared/zen-icons/win/essential-remove.svg
deleted file mode 100644
index 22056e100..000000000
--- a/src/browser/themes/shared/zen-icons/win/essential-remove.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.85355 2.14645C2.65829 1.95118 2.34171 1.95118 2.14645 2.14645C1.95118 2.34171 1.95118 2.65829 2.14645 2.85355L3.417 4.1241C3.36415 4.17247 3.3122 4.22241 3.26122 4.2739C1.5729 5.9792 1.58114 8.75004 3.27679 10.4627L9.55368 16.8028C9.81404 17.0657 10.2362 17.0657 10.4965 16.8028L13.2829 13.99L17.1464 17.8536C17.3417 18.0488 17.6583 18.0488 17.8536 17.8536C18.0488 17.6583 18.0488 17.3417 17.8536 17.1464L2.85355 2.14645ZM12.5758 13.2829L10.0252 15.8577L3.98743 9.75919C2.67408 8.43263 2.67286 6.28953 3.97185 4.97746C4.02174 4.92708 4.07283 4.87864 4.12503 4.83214L12.5758 13.2829ZM16.0282 9.79783L13.9834 11.862L14.6905 12.5691L16.7408 10.4994C18.4252 8.78856 18.4199 6.02549 16.7239 4.31248C15.0611 2.63292 12.3961 2.5895 10.6978 4.19086C10.6612 4.22539 10.6251 4.26068 10.5894 4.29673L9.99299 4.90026L9.38843 4.28963C9.35529 4.25616 9.32175 4.22333 9.28783 4.19116C8.17254 3.13353 6.64174 2.77958 5.25313 3.13179L6.1265 4.00516C7.04062 3.95404 7.97441 4.28273 8.6778 4.99319L9.63801 5.96306C9.8338 6.16082 10.1534 6.16067 10.349 5.96272L11.3 5.00029C12.5964 3.69135 14.7025 3.69204 16.0133 5.01604C17.3253 6.34123 17.3272 8.47734 16.0292 9.79681L16.0282 9.79783Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/expand-sidebar.svg b/src/browser/themes/shared/zen-icons/win/expand-sidebar.svg
deleted file mode 100644
index a0b557ac9..000000000
--- a/src/browser/themes/shared/zen-icons/win/expand-sidebar.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="0.9" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="6.25" y1="12.5" x2="6.25" y2="15.25" data-color="color-2"></line><line x1="6.25" y1="2.75" x2="6.25" y2="5.5" data-color="color-2"></line><polyline points="8.75 6.5 6.25 9 8.75 11.5" data-color="color-2"></polyline><line x1="6.25" y1="9" x2="12.75" y2="9" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/win/ext-link.svg b/src/browser/themes/shared/zen-icons/win/ext-link.svg
deleted file mode 100644
index 97d1d7a58..000000000
--- a/src/browser/themes/shared/zen-icons/win/ext-link.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 6C8.27614 6 8.5 6.22386 8.5 6.5C8.5 6.74546 8.32312 6.94961 8.08988 6.99194L8 7H6C4.34315 7 3 8.34315 3 10C3 11.5906 4.23784 12.892 5.80275 12.9936L6 13H8C8.27614 13 8.5 13.2239 8.5 13.5C8.5 13.7455 8.32312 13.9496 8.08988 13.9919L8 14H6C3.79086 14 2 12.2091 2 10C2 7.8645 3.67346 6.11986 5.78053 6.00592L6 6H8ZM14 6C16.2091 6 18 7.79086 18 10C18 12.1355 16.3265 13.8801 14.2195 13.9941L14 14H12C11.7239 14 11.5 13.7761 11.5 13.5C11.5 13.2545 11.6769 13.0504 11.9101 13.0081L12 13H14C15.6569 13 17 11.6569 17 10C17 8.40942 15.7622 7.10795 14.1973 7.00638L14 7H12C11.7239 7 11.5 6.77614 11.5 6.5C11.5 6.25454 11.6769 6.05039 11.9101 6.00806L12 6H14ZM6 9.5H14C14.2761 9.5 14.5 9.72386 14.5 10C14.5 10.2455 14.3231 10.4496 14.0899 10.4919L14 10.5H6C5.72386 10.5 5.5 10.2761 5.5 10C5.5 9.75454 5.67688 9.55039 5.91012 9.50806L6 9.5H14H6Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/extension-blocked.svg b/src/browser/themes/shared/zen-icons/win/extension-blocked.svg
deleted file mode 100644
index 1b113373b..000000000
--- a/src/browser/themes/shared/zen-icons/win/extension-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2C14.4183 2 18 5.58172 18 10ZM17 10C17 8.24696 16.3556 6.64442 15.2907 5.41636L5.41636 15.2907C6.64442 16.3556 8.24696 17 10 17C13.866 17 17 13.866 17 10ZM4.70925 14.5836L14.5836 4.70925C13.3556 3.6444 11.753 3 10 3C6.13401 3 3 6.13401 3 10C3 11.753 3.6444 13.3556 4.70925 14.5836Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/extension.svg b/src/browser/themes/shared/zen-icons/win/extension.svg
deleted file mode 100644
index a2a1ed1b3..000000000
--- a/src/browser/themes/shared/zen-icons/win/extension.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 3C10.3096 3 9.75 3.55964 9.75 4.25V5H6.5C6.22386 5 6 5.22386 6 5.5V8.75H5.25C4.55964 8.75 4 9.30964 4 10C4 10.6904 4.55964 11.25 5.25 11.25H6V14.5C6 14.7761 6.22386 15 6.5 15H9.75V15.75C9.75 16.4404 10.3096 17 11 17C11.6904 17 12.25 16.4404 12.25 15.75V15H15.5C15.7761 15 16 14.7761 16 14.5V12.25H15.25C14.0074 12.25 13 11.2426 13 10C13 8.75736 14.0074 7.75 15.25 7.75H16V5.5C16 5.22386 15.7761 5 15.5 5H12.25V4.25C12.25 3.55964 11.6904 3 11 3ZM8.76373 4C8.88809 2.87501 9.84186 2 11 2C12.1581 2 13.1119 2.87501 13.2363 4H15.5C16.3284 4 17 4.67157 17 5.5V8.75H15.25C14.5596 8.75 14 9.30964 14 10C14 10.6904 14.5596 11.25 15.25 11.25H17V14.5C17 15.3284 16.3284 16 15.5 16H13.2363C13.1119 17.125 12.1581 18 11 18C9.84186 18 8.88809 17.125 8.76373 16H6.5C5.67157 16 5 15.3284 5 14.5V12.2363C3.87501 12.1119 3 11.1581 3 10C3 8.84186 3.87501 7.88809 5 7.76373V5.5C5 4.67157 5.67157 4 6.5 4H8.76373Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/folder.svg b/src/browser/themes/shared/zen-icons/win/folder.svg
deleted file mode 100644
index d0d746da5..000000000
--- a/src/browser/themes/shared/zen-icons/win/folder.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 3C3.11929 3 2 4.11929 2 5.5V14.5C2 15.8807 3.11929 17 4.5 17H15.5C16.8807 17 18 15.8807 18 14.5V7.5C18 6.11929 16.8807 5 15.5 5H9.70711L8.21967 3.51256C7.89148 3.18437 7.44636 3 6.98223 3H4.5ZM3 5.5C3 4.67157 3.67157 4 4.5 4H6.98223C7.18115 4 7.37191 4.07902 7.51256 4.21967L8.79289 5.5L7.43934 6.85355C7.34557 6.94732 7.21839 7 7.08579 7H3V5.5ZM3 8H7.08579C7.48361 8 7.86514 7.84196 8.14645 7.56066L9.70711 6H15.5C16.3284 6 17 6.67157 17 7.5V14.5C17 15.3284 16.3284 16 15.5 16H4.5C3.67157 16 3 15.3284 3 14.5V8Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/forget.svg b/src/browser/themes/shared/zen-icons/win/forget.svg
deleted file mode 100644
index e8d85efba..000000000
--- a/src/browser/themes/shared/zen-icons/win/forget.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.85355 2.64645C6.04882 2.84171 6.04882 3.15829 5.85355 3.35355L4.20711 5H11C14.3137 5 17 7.68629 17 11C17 14.3137 14.3137 17 11 17C7.68629 17 5 14.3137 5 11C5 10.7239 5.22386 10.5 5.5 10.5C5.77614 10.5 6 10.7239 6 11C6 13.7614 8.23858 16 11 16C13.7614 16 16 13.7614 16 11C16 8.23858 13.7614 6 11 6H4.20711L5.85355 7.64645C6.04882 7.84171 6.04882 8.15829 5.85355 8.35355C5.65829 8.54882 5.34171 8.54882 5.14645 8.35355L2.64645 5.85355C2.45118 5.65829 2.45118 5.34171 2.64645 5.14645L5.14645 2.64645C5.34171 2.45118 5.65829 2.45118 5.85355 2.64645Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/forward.svg b/src/browser/themes/shared/zen-icons/win/forward.svg
deleted file mode 100644
index f9f1f57ef..000000000
--- a/src/browser/themes/shared/zen-icons/win/forward.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.8371 3.13074C10.6332 2.94456 10.3169 2.95895 10.1307 3.16289C9.94456 3.36683 9.95895 3.68309 10.1629 3.86927L16.3307 9.5H2.5C2.22386 9.5 2 9.72386 2 10C2 10.2761 2.22386 10.5 2.5 10.5H16.3279L10.1629 16.1281C9.95895 16.3143 9.94456 16.6305 10.1307 16.8345C10.3169 17.0384 10.6332 17.0528 10.8371 16.8666L17.7535 10.5526C17.8934 10.4248 17.9732 10.2573 17.993 10.0841C17.9976 10.0568 18 10.0287 18 10C18 9.97313 17.9979 9.94675 17.9938 9.92103C17.9756 9.74512 17.8955 9.57446 17.7535 9.44478L10.8371 3.13074Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/fullscreen-exit.svg b/src/browser/themes/shared/zen-icons/win/fullscreen-exit.svg
deleted file mode 100644
index 1620641e8..000000000
--- a/src/browser/themes/shared/zen-icons/win/fullscreen-exit.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 11H8.5C8.74546 11 8.94961 11.1769 8.99194 11.4101L9 11.5V16.5C9 16.7761 8.77614 17 8.5 17C8.25454 17 8.05039 16.8231 8.00806 16.5899L8 16.5V12.706L2.85355 17.8536C2.65829 18.0488 2.34171 18.0488 2.14645 17.8536C1.97288 17.68 1.9536 17.4106 2.08859 17.2157L2.14645 17.1464L7.292 12H3.5C3.25454 12 3.05039 11.8231 3.00806 11.5899L3 11.5C3 11.2545 3.17688 11.0504 3.41012 11.0081L3.5 11H8.5H3.5ZM17.8536 2.14645C18.0271 2.32001 18.0464 2.58944 17.9114 2.78431L17.8536 2.85355L12.706 8H16.5C16.7455 8 16.9496 8.17688 16.9919 8.41012L17 8.5C17 8.74546 16.8231 8.94961 16.5899 8.99194L16.5 9L11.4796 8.99959L11.4112 8.99213L11.309 8.96221L11.233 8.92281L11.1779 8.88242L11.1464 8.85355L11.109 8.81166L11.0667 8.74977L11.0376 8.69059L11.0166 8.62814L11.0111 8.60499C11.0038 8.5713 11 8.5361 11 8.5L11.0055 8.57392L11.0018 8.5428L11 3.5C11 3.22386 11.2239 3 11.5 3C11.7455 3 11.9496 3.17687 11.9919 3.41012L12 3.5V7.292L17.1464 2.14645C17.3417 1.95118 17.6583 1.95118 17.8536 2.14645Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/fullscreen.svg b/src/browser/themes/shared/zen-icons/win/fullscreen.svg
deleted file mode 100644
index 6079f4ffc..000000000
--- a/src/browser/themes/shared/zen-icons/win/fullscreen.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.5 3L16.5428 3.00182L16.6281 3.01661L16.691 3.03779L16.767 3.07719L16.8221 3.11759L16.8824 3.17788L16.9112 3.21534L16.9533 3.2886L16.9834 3.37186L16.9979 3.45421L17 3.5V9.5C17 9.77614 16.7761 10 16.5 10C16.2545 10 16.0504 9.82312 16.0081 9.58988L16 9.5V4.706L4.706 16H9.5C9.74546 16 9.94961 16.1769 9.99194 16.4101L10 16.5C10 16.7455 9.82312 16.9496 9.58988 16.9919L9.5 17L3.47964 16.9996L3.4112 16.9921L3.30896 16.9622L3.23299 16.9228L3.17786 16.8824L3.11758 16.8221L3.08884 16.7847L3.04674 16.7114L3.01661 16.6281L3.01109 16.605C3.00383 16.5713 3 16.5361 3 16.5L3.00546 16.5739L3.00182 16.5428L3 10.5C3 10.2239 3.22386 10 3.5 10C3.74546 10 3.94961 10.1769 3.99194 10.4101L4 10.5V15.292L15.292 4H10.5C10.2545 4 10.0504 3.82312 10.0081 3.58988L10 3.5C10 3.22386 10.2239 3 10.5 3Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/geo-blocked.svg b/src/browser/themes/shared/zen-icons/win/geo-blocked.svg
deleted file mode 100644
index ed3e8d83d..000000000
--- a/src/browser/themes/shared/zen-icons/win/geo-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.14645 2.14645C2.34171 1.95118 2.65829 1.95118 2.85355 2.14645L17.8536 17.1464C18.0488 17.3417 18.0488 17.6583 17.8536 17.8536C17.6583 18.0488 17.3417 18.0488 17.1464 17.8536L14.0938 14.8009L13.8223 15.0691L11.3861 17.4391C10.6562 18.1455 9.52168 18.1847 8.74691 17.5567L8.61408 17.4389L6.57128 15.4538L5.05025 13.955C2.60742 11.5111 2.34753 7.71028 4.27056 4.97765L2.14645 2.85355C1.95118 2.65829 1.95118 2.34171 2.14645 2.14645ZM11.0777 11.7848C10.7435 11.9139 10.3802 11.9847 10.0005 11.9847C8.34839 11.9847 7.00909 10.6448 7.00909 8.99195C7.00909 8.6125 7.07967 8.24955 7.20843 7.91552L4.98793 5.69502C3.49206 7.95827 3.68917 11.0117 5.57927 13.0667L5.75499 13.2499L6.3263 13.817L9.30713 16.7224L9.40012 16.802C9.7543 17.0698 10.2459 17.0699 10.6002 16.8021L10.6931 16.7225L12.9237 14.5539L13.3883 14.0954L11.0777 11.7848ZM11.8541 9.73275L12.5983 10.4769C12.8487 10.0393 12.9919 9.53236 12.9919 8.99195C12.9919 7.33911 11.6526 5.99923 10.0005 5.99923C9.45986 5.99923 8.95271 6.14271 8.51504 6.3937L9.25921 7.13787C9.48839 7.04608 9.73855 6.99559 10.0005 6.99559C11.1026 6.99559 11.996 7.88939 11.996 8.99195C11.996 9.25371 11.9456 9.5037 11.8541 9.73275ZM6.35291 4.23157C8.70671 2.42616 12.0908 2.60103 14.245 4.75619C16.3986 6.91072 16.5739 10.2949 14.771 12.6497L15.4812 13.3599C17.6702 10.6106 17.493 6.59551 14.9497 4.05115C12.4058 1.50605 8.39081 1.32945 5.64269 3.52136L6.35291 4.23157Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/geo.svg b/src/browser/themes/shared/zen-icons/win/geo.svg
deleted file mode 100644
index 624ae44eb..000000000
--- a/src/browser/themes/shared/zen-icons/win/geo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 9C13 10.6569 11.6569 12 10 12C8.34315 12 7 10.6569 7 9C7 7.34315 8.34315 6 10 6C11.6569 6 13 7.34315 13 9ZM12 9C12 7.89543 11.1046 7 10 7C8.89543 7 8 7.89543 8 9C8 10.1046 8.89543 11 10 11C11.1046 11 12 10.1046 12 9ZM14.9497 13.955C17.6834 11.2201 17.6834 6.78601 14.9497 4.05115C12.2161 1.31628 7.78392 1.31628 5.05025 4.05115C2.31658 6.78601 2.31658 11.2201 5.05025 13.955L6.57128 15.4538L8.61408 17.4389L8.74691 17.5567C9.52168 18.1847 10.6562 18.1455 11.3861 17.4391L13.8223 15.0691L14.9497 13.955ZM5.75499 4.75619C8.09944 2.41072 11.9006 2.41072 14.245 4.75619C16.5294 7.04153 16.5879 10.7104 14.4207 13.0667L14.245 13.2499L12.9237 14.5539L10.6931 16.7225L10.6002 16.8021C10.2459 17.0699 9.7543 17.0698 9.40012 16.802L9.30713 16.7224L6.3263 13.817L5.75499 13.2499L5.57927 13.0667C3.41208 10.7104 3.47065 7.04153 5.75499 4.75619Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/help.svg b/src/browser/themes/shared/zen-icons/win/help.svg
deleted file mode 100644
index 34881278a..000000000
--- a/src/browser/themes/shared/zen-icons/win/help.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 2C14.4183 2 18 5.58172 18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2ZM10 3C6.13401 3 3 6.13401 3 10C3 13.866 6.13401 17 10 17C13.866 17 17 13.866 17 10C17 6.13401 13.866 3 10 3ZM10 13.5C10.4142 13.5 10.75 13.8358 10.75 14.25C10.75 14.6642 10.4142 15 10 15C9.58579 15 9.25 14.6642 9.25 14.25C9.25 13.8358 9.58579 13.5 10 13.5ZM10 5.5C11.3807 5.5 12.5 6.61929 12.5 8C12.5 8.72959 12.1848 9.40774 11.6513 9.8771L11.4967 10.0024L11.2782 10.1655L11.1906 10.2372C11.1348 10.2851 11.0835 10.3337 11.0346 10.3859C10.6963 10.7464 10.5 11.2422 10.5 12C10.5 12.2761 10.2761 12.5 10 12.5C9.72386 12.5 9.5 12.2761 9.5 12C9.5 10.988 9.79312 10.2475 10.3054 9.70162C10.4165 9.5832 10.532 9.47988 10.6609 9.37874L10.9076 9.19439L11.0256 9.09468C11.325 8.81435 11.5 8.42206 11.5 8C11.5 7.17157 10.8284 6.5 10 6.5C9.17157 6.5 8.5 7.17157 8.5 8C8.5 8.27614 8.27614 8.5 8 8.5C7.72386 8.5 7.5 8.27614 7.5 8C7.5 6.61929 8.61929 5.5 10 5.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/history.svg b/src/browser/themes/shared/zen-icons/win/history.svg
deleted file mode 100644
index 01c6dde38..000000000
--- a/src/browser/themes/shared/zen-icons/win/history.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 4C13.3137 4 16 6.68629 16 10C16 13.3137 13.3137 16 10 16C6.68629 16 4 13.3137 4 10C4 9.84443 4.00591 9.69034 4.0175 9.53793C4.03845 9.26258 3.83222 9.02239 3.55687 9.00144C3.28152 8.98049 3.04133 9.18673 3.02038 9.46207C3.00687 9.6397 3 9.8191 3 10C3 13.866 6.13401 17 10 17C13.866 17 17 13.866 17 10C17 6.13401 13.866 3 10 3C8.04094 3 6.27012 3.80499 5 5.10109V3.5C5 3.22386 4.77614 3 4.5 3C4.22386 3 4 3.22386 4 3.5V6.5C4 6.77614 4.22386 7 4.5 7H7.5C7.77614 7 8 6.77614 8 6.5C8 6.22386 7.77614 6 7.5 6H5.52772C6.62683 4.77191 8.2234 4 10 4ZM10 6.5C10 6.22386 9.77614 6 9.5 6C9.22386 6 9 6.22386 9 6.5V10.5C9 10.7761 9.22386 11 9.5 11H12.5C12.7761 11 13 10.7761 13 10.5C13 10.2239 12.7761 10 12.5 10H10V6.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/home.svg b/src/browser/themes/shared/zen-icons/win/home.svg
deleted file mode 100644
index f59c8c4f3..000000000
--- a/src/browser/themes/shared/zen-icons/win/home.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.9975 2.38811C9.56767 1.87584 10.4323 1.87584 11.0025 2.38811L16.5025 7.32965C16.8191 7.61414 17 8.01977 17 8.44544V15.4996C17 16.328 16.3284 16.9996 15.5 16.9996H13C12.1716 16.9996 11.5 16.328 11.5 15.4996V11.9996C11.5 11.7234 11.2761 11.4996 11 11.4996H9C8.72386 11.4996 8.5 11.7234 8.5 11.9996V15.4996C8.5 16.328 7.82843 16.9996 7 16.9996H4.5C3.67157 16.9996 3 16.328 3 15.4996V8.44544C3 8.01977 3.18086 7.61414 3.4975 7.32965L8.9975 2.38811ZM10.3342 3.13197C10.1441 2.96122 9.85589 2.96122 9.66583 3.13197L4.16583 8.07351C4.06029 8.16834 4 8.30355 4 8.44544V15.4996C4 15.7757 4.22386 15.9996 4.5 15.9996H7C7.27614 15.9996 7.5 15.7757 7.5 15.4996V11.9996C7.5 11.1711 8.17157 10.4996 9 10.4996H11C11.8284 10.4996 12.5 11.1711 12.5 11.9996V15.4996C12.5 15.7757 12.7239 15.9996 13 15.9996H15.5C15.7761 15.9996 16 15.7757 16 15.4996V8.44544C16 8.30355 15.9397 8.16834 15.8342 8.07351L10.3342 3.13197Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/image-copy.svg b/src/browser/themes/shared/zen-icons/win/image-copy.svg
deleted file mode 100644
index 1a40f3c9f..000000000
--- a/src/browser/themes/shared/zen-icons/win/image-copy.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.49751 7.4966C9.04842 7.4966 9.49502 7.05 9.49502 6.4991C9.49502 5.94819 9.04842 5.50159 8.49751 5.50159C7.9466 5.50159 7.5 5.94819 7.5 6.4991C7.5 7.05 7.9466 7.4966 8.49751 7.4966ZM5 6C5 4.34315 6.34315 3 8 3H14C15.6569 3 17 4.34315 17 6V12C17 13.6569 15.6569 15 14 15H8C6.34315 15 5 13.6569 5 12V6ZM8 4C6.89543 4 6 4.89543 6 6V12C6 12.3709 6.10097 12.7182 6.27692 13.016L9.79085 9.50207C10.4586 8.83427 11.5414 8.83427 12.2092 9.50207L15.7231 13.016C15.899 12.7182 16 12.3709 16 12V6C16 4.89543 15.1046 4 14 4H8ZM15.016 13.7231L11.502 10.2092C11.2248 9.9319 10.7752 9.9319 10.498 10.2092L6.98403 13.7231C7.28178 13.899 7.6291 14 8 14H14C14.3709 14 14.7182 13.899 15.016 13.7231ZM12 17C12.8885 17 13.6868 16.6138 14.2361 16H7.5C5.68782 16 4.1973 14.6228 4.01807 12.8579C4.00612 12.7402 4 12.6208 4 12.5V5.76392C3.38625 6.31324 3 7.11152 3 8.00002V12.5C3 14.9853 5.01472 17 7.5 17H12Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/image-open.svg b/src/browser/themes/shared/zen-icons/win/image-open.svg
deleted file mode 100644
index 18c8d8c5b..000000000
--- a/src/browser/themes/shared/zen-icons/win/image-open.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 7.5C14 8.32843 13.3284 9 12.5 9C11.6716 9 11 8.32843 11 7.5C11 6.67157 11.6716 6 12.5 6C13.3284 6 14 6.67157 14 7.5ZM13 7.5C13 7.22386 12.7761 7 12.5 7C12.2239 7 12 7.22386 12 7.5C12 7.77614 12.2239 8 12.5 8C12.7761 8 13 7.77614 13 7.5ZM3 6C3 4.34315 4.34315 3 6 3H14C15.6569 3 17 4.34315 17 6V14C17 15.6569 15.6569 17 14 17H6C4.34315 17 3 15.6569 3 14V6ZM6 4C4.89543 4 4 4.89543 4 6V14C4 14.3726 4.10191 14.7215 4.27937 15.0201L8.94868 10.432C9.53227 9.85859 10.4677 9.85859 11.0513 10.432L15.7206 15.0201C15.8981 14.7215 16 14.3726 16 14V6C16 4.89543 15.1046 4 14 4H6ZM6 16H14C14.3692 16 14.7149 15.9 15.0118 15.7256L10.3504 11.1453C10.1559 10.9542 9.84409 10.9542 9.64956 11.1453L4.98824 15.7256C5.28505 15.9 5.63085 16 6 16Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/image-save.svg b/src/browser/themes/shared/zen-icons/win/image-save.svg
deleted file mode 100644
index dcc543496..000000000
--- a/src/browser/themes/shared/zen-icons/win/image-save.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17 6.12501V9.03545C16.8367 9.01209 16.6698 9 16.5 9H16V6.12501C16.003 5.99304 15.9789 5.86186 15.9292 5.73958C15.8795 5.61729 15.8052 5.50649 15.711 5.41401L13.586 3.28901C13.4292 3.1302 13.222 3.03086 13 3.00801V5.50001C13.0009 5.69865 12.9611 5.89537 12.883 6.07801C12.8076 6.25614 12.6986 6.41808 12.562 6.55501C12.4222 6.69314 12.2581 6.80433 12.078 6.88301C11.8966 6.96487 11.699 7.00486 11.5 7.00001H7.50001C7.30138 7.00093 7.10466 6.96111 6.92201 6.88301C6.74389 6.80761 6.58194 6.69863 6.44501 6.56201C6.30688 6.42219 6.19569 6.25812 6.11701 6.07801C6.03516 5.89656 5.99517 5.69901 6.00001 5.50001V3.00001H5.00001C4.86569 2.99871 4.73256 3.02527 4.60901 3.07801C4.49272 3.12818 4.38688 3.19975 4.29701 3.28901C4.20532 3.3816 4.13113 3.49002 4.07801 3.60901C4.0216 3.73139 3.99488 3.86535 4.00001 4.00001V14C3.99872 14.1343 4.02528 14.2675 4.07801 14.391C4.12954 14.509 4.20091 14.6172 4.28901 14.711C4.3763 14.8038 4.48325 14.8759 4.60201 14.922C4.72923 14.9706 4.86386 14.997 5.00001 15V10.5C4.99909 10.3014 5.03891 10.1047 5.11701 9.92201C5.19241 9.74388 5.30139 9.58194 5.43801 9.44501C5.57783 9.30688 5.7419 9.19569 5.92201 9.11701C6.10347 9.03515 6.30101 8.99516 6.50001 9.00001H12.4917C11.5414 9.0022 10.6799 9.3832 10.0505 10H6.50001C6.36781 10.0013 6.24139 10.0544 6.1479 10.1479C6.05441 10.2414 6.00132 10.3678 6.00001 10.5V15H9V16H5.00001C4.73927 16.001 4.48116 15.9479 4.24201 15.844C4.00563 15.7419 3.78901 15.599 3.60201 15.422C3.41612 15.2478 3.26717 15.038 3.16401 14.805C3.05836 14.5633 3.00258 14.3028 3.00001 14.039V4.00001C2.999 3.73927 3.05212 3.48116 3.15601 3.24201C3.25794 3.00491 3.40078 2.7876 3.57801 2.60001C3.75389 2.41429 3.96545 2.26599 4.20001 2.16401C4.44016 2.05901 4.69893 2.00324 4.96101 2.00001H12.875C13.1375 1.9992 13.3977 2.04947 13.641 2.14801C13.8854 2.24691 14.1061 2.39615 14.289 2.58601L16.414 4.71101C16.5999 4.89556 16.7462 5.11604 16.844 5.35901C16.9428 5.60255 16.9956 5.86225 17 6.12501ZM7.00001 3.00001V5.50001C7.00132 5.63221 7.05441 5.75864 7.1479 5.85212C7.24139 5.94561 7.36781 5.99871 7.50001 6.00001H11.5C11.6322 5.99871 11.7586 5.94561 11.8521 5.85212C11.9456 5.75864 11.9987 5.63221 12 5.50001V3.00001H7.00001ZM10 12.5C10 11.1193 11.1193 10 12.5 10H16.5C17.8807 10 19 11.1193 19 12.5V16.5C19 17.0095 18.8476 17.4835 18.5858 17.8787L15.5607 14.8536C14.9749 14.2678 14.0251 14.2678 13.4393 14.8536L10.4142 17.8787C10.1524 17.4835 10 17.0095 10 16.5V12.5ZM17 12.75C17 12.3358 16.6642 12 16.25 12C15.8358 12 15.5 12.3358 15.5 12.75C15.5 13.1642 15.8358 13.5 16.25 13.5C16.6642 13.5 17 13.1642 17 12.75ZM11.1213 18.5858C11.5165 18.8476 11.9905 19 12.5 19H16.5C17.0095 19 17.4835 18.8476 17.8787 18.5858L14.8536 15.5607C14.6583 15.3654 14.3417 15.3654 14.1464 15.5607L11.1213 18.5858Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/info.svg b/src/browser/themes/shared/zen-icons/win/info.svg
deleted file mode 100644
index 0b6e91f1d..000000000
--- a/src/browser/themes/shared/zen-icons/win/info.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.4921 8.91012C10.4497 8.67687 10.2456 8.49999 10.0001 8.49999C9.72397 8.49999 9.50011 8.72385 9.50011 8.99999V13.5021L9.50817 13.592C9.55051 13.8253 9.75465 14.0021 10.0001 14.0021C10.2763 14.0021 10.5001 13.7783 10.5001 13.5021V8.99999L10.4921 8.91012ZM10.7988 6.74999C10.7988 6.33578 10.463 5.99999 10.0488 5.99999C9.63461 5.99999 9.29883 6.33578 9.29883 6.74999C9.29883 7.16421 9.63461 7.49999 10.0488 7.49999C10.463 7.49999 10.7988 7.16421 10.7988 6.74999ZM18 10C18 5.58172 14.4183 2 10 2C5.58172 2 2 5.58172 2 10C2 14.4183 5.58172 18 10 18C14.4183 18 18 14.4183 18 10ZM3 10C3 6.13401 6.13401 3 10 3C13.866 3 17 6.13401 17 10C17 13.866 13.866 17 10 17C6.13401 17 3 13.866 3 10Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/inspect.svg b/src/browser/themes/shared/zen-icons/win/inspect.svg
deleted file mode 100644
index 0b2d1b13f..000000000
--- a/src/browser/themes/shared/zen-icons/win/inspect.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 3C11.5376 3 14 5.46243 14 8.5C14 9.83879 13.5217 11.0659 12.7266 12.0196L16.8536 16.1464C17.0488 16.3417 17.0488 16.6583 16.8536 16.8536C16.68 17.0271 16.4106 17.0464 16.2157 16.9114L16.1464 16.8536L12.0196 12.7266C11.0659 13.5217 9.83879 14 8.5 14C5.46243 14 3 11.5376 3 8.5C3 5.46243 5.46243 3 8.5 3ZM8.5 4C6.01472 4 4 6.01472 4 8.5C4 10.9853 6.01472 13 8.5 13C10.9853 13 13 10.9853 13 8.5C13 6.01472 10.9853 4 8.5 4ZM8.5 8C8.77614 8 9 8.22386 9 8.5V10.5C9 10.7761 8.77614 11 8.5 11C8.22386 11 8 10.7761 8 10.5V8.5C8 8.22386 8.22386 8 8.5 8ZM9 6.5C9 6.77614 8.77614 7 8.5 7C8.22386 7 8 6.77614 8 6.5C8 6.22386 8.22386 6 8.5 6C8.77614 6 9 6.22386 9 6.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/library.svg b/src/browser/themes/shared/zen-icons/win/library.svg
deleted file mode 100644
index 0b6529f24..000000000
--- a/src/browser/themes/shared/zen-icons/win/library.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 3.49788C2 2.67062 2.67135 2 3.49951 2H4.49918C5.32733 2 5.99869 2.67062 5.99869 3.49788V16.4795C5.99869 17.3068 5.32733 17.9774 4.49918 17.9774H3.49951C2.67135 17.9774 2 17.3068 2 16.4795V3.49788ZM3.49951 2.99859C3.22346 2.99859 2.99967 3.22213 2.99967 3.49788V16.4795C2.99967 16.7552 3.22346 16.9788 3.49951 16.9788H4.49918C4.77523 16.9788 4.99901 16.7552 4.99901 16.4795V3.49788C4.99901 3.22213 4.77523 2.99859 4.49918 2.99859H3.49951ZM6.99836 3.49788C6.99836 2.67062 7.66971 2 8.49786 2H9.49754C10.3257 2 10.997 2.67062 10.997 3.49788V16.4795C10.997 17.3068 10.3257 17.9774 9.49754 17.9774H8.49786C7.66971 17.9774 6.99836 17.3068 6.99836 16.4795V3.49788ZM8.49786 2.99859C8.22181 2.99859 7.99803 3.22213 7.99803 3.49788V16.4795C7.99803 16.7552 8.22181 16.9788 8.49786 16.9788H9.49754C9.77359 16.9788 9.99737 16.7552 9.99737 16.4795V3.49788C9.99737 3.22213 9.77359 2.99859 9.49754 2.99859H8.49786ZM15.7179 6.15675C15.5259 5.32176 14.6733 4.81743 13.848 5.05077L13.1029 5.26146C12.3477 5.47502 11.8851 6.23427 12.0422 7.00249L14.046 16.8015C14.2174 17.6394 15.0551 18.1642 15.8848 17.9534L16.8698 17.7031C17.6592 17.5025 18.144 16.7091 17.9616 15.9162L15.7179 6.15675ZM14.1203 6.0116C14.3954 5.93382 14.6796 6.10193 14.7436 6.38026L16.9873 16.1397C17.0481 16.404 16.8865 16.6684 16.6234 16.7353L15.6384 16.9856C15.3618 17.0559 15.0826 16.8809 15.0255 16.6016L13.0216 6.80264C12.9693 6.54656 13.1234 6.29348 13.3752 6.22229L14.1203 6.0116Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/link.svg b/src/browser/themes/shared/zen-icons/win/link.svg
deleted file mode 100644
index 97d1d7a58..000000000
--- a/src/browser/themes/shared/zen-icons/win/link.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 6C8.27614 6 8.5 6.22386 8.5 6.5C8.5 6.74546 8.32312 6.94961 8.08988 6.99194L8 7H6C4.34315 7 3 8.34315 3 10C3 11.5906 4.23784 12.892 5.80275 12.9936L6 13H8C8.27614 13 8.5 13.2239 8.5 13.5C8.5 13.7455 8.32312 13.9496 8.08988 13.9919L8 14H6C3.79086 14 2 12.2091 2 10C2 7.8645 3.67346 6.11986 5.78053 6.00592L6 6H8ZM14 6C16.2091 6 18 7.79086 18 10C18 12.1355 16.3265 13.8801 14.2195 13.9941L14 14H12C11.7239 14 11.5 13.7761 11.5 13.5C11.5 13.2545 11.6769 13.0504 11.9101 13.0081L12 13H14C15.6569 13 17 11.6569 17 10C17 8.40942 15.7622 7.10795 14.1973 7.00638L14 7H12C11.7239 7 11.5 6.77614 11.5 6.5C11.5 6.25454 11.6769 6.05039 11.9101 6.00806L12 6H14ZM6 9.5H14C14.2761 9.5 14.5 9.72386 14.5 10C14.5 10.2455 14.3231 10.4496 14.0899 10.4919L14 10.5H6C5.72386 10.5 5.5 10.2761 5.5 10C5.5 9.75454 5.67688 9.55039 5.91012 9.50806L6 9.5H14H6Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/mail.svg b/src/browser/themes/shared/zen-icons/win/mail.svg
deleted file mode 100644
index 2e81d135a..000000000
--- a/src/browser/themes/shared/zen-icons/win/mail.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.5 4C16.8807 4 18 5.11929 18 6.5V14.5C18 15.8807 16.8807 17 15.5 17H4.5C3.11929 17 2 15.8807 2 14.5V6.5C2 5.11929 3.11929 4 4.5 4H15.5ZM17 7.961L10.2535 11.931C10.1231 12.0077 9.96661 12.0205 9.82751 11.9693L9.74649 11.931L3 7.963V14.5C3 15.3284 3.67157 16 4.5 16H15.5C16.3284 16 17 15.3284 17 14.5V7.961ZM15.5 5H4.5C3.67157 5 3 5.67157 3 6.5V6.802L10 10.9199L17 6.801V6.5C17 5.67157 16.3284 5 15.5 5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/manage.svg b/src/browser/themes/shared/zen-icons/win/manage.svg
deleted file mode 100644
index 3f61408de..000000000
--- a/src/browser/themes/shared/zen-icons/win/manage.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.1794 2.92616C16.0271 1.71432 14.1027 1.69004 12.9203 2.87244L3.54545 12.2468C3.21763 12.5746 2.99008 12.9891 2.88953 13.4417L2.01191 17.3916C1.97483 17.5585 2.02559 17.7328 2.14649 17.8537C2.26739 17.9745 2.44166 18.0253 2.60855 17.9881L6.53494 17.115C7.00237 17.011 7.43048 16.776 7.76907 16.4374L15.7497 8.4567L16.0858 8.79281C16.4763 9.18333 16.4763 9.8165 16.0858 10.207L15.1464 11.1464C14.9512 11.3416 14.9512 11.6582 15.1464 11.8535C15.3417 12.0487 15.6583 12.0487 15.8536 11.8535L16.7929 10.9141C17.5739 10.1331 17.5739 8.86675 16.7929 8.0857L16.4568 7.74959L17.1271 7.0793C18.2681 5.93826 18.2913 4.09558 17.1794 2.92616ZM13.6274 3.57956C14.4123 2.79465 15.6898 2.81077 16.4547 3.61522C17.1928 4.39152 17.1774 5.61474 16.42 6.3722L7.06196 15.7303C6.85781 15.9344 6.59969 16.0762 6.31786 16.1388L3.15855 16.8414L3.86572 13.6586C3.92502 13.3917 4.05921 13.1473 4.25254 12.9539L13.6274 3.57956Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/media-loop.svg b/src/browser/themes/shared/zen-icons/win/media-loop.svg
deleted file mode 100644
index 61c564724..000000000
--- a/src/browser/themes/shared/zen-icons/win/media-loop.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.5 6.67122C16.6163 6.67122 16.7233 6.71092 16.8082 6.77751L16.8755 6.84057L16.8918 6.86057C17.5849 7.71877 18 8.81091 18 10C18 12.6888 15.8777 14.8818 13.2169 14.9954L13 15H7C6.89826 15 6.79724 14.997 6.697 14.991L8.35355 16.6464C8.52712 16.82 8.5464 17.0894 8.41141 17.2843L8.35355 17.3536C8.17999 17.5271 7.91056 17.5464 7.71569 17.4114L7.64645 17.3536L5.14645 14.8536C4.97288 14.68 4.9536 14.4106 5.08859 14.2157L5.14645 14.1464L7.64645 11.6464C7.84171 11.4512 8.15829 11.4512 8.35355 11.6464C8.52712 11.82 8.5464 12.0894 8.41141 12.2843L8.35355 12.3536L6.71699 13.9901L6.85787 13.9975L7 14H13C15.2091 14 17 12.2091 17 10C17 9.04652 16.6664 8.17096 16.1095 7.48367C16.0414 7.39911 16 7.29 16 7.17122C16 6.89508 16.2239 6.67122 16.5 6.67122ZM11.6464 2.64645C11.82 2.47288 12.0894 2.4536 12.2843 2.58859L12.3536 2.64645L14.8536 5.14645L14.9114 5.21569C15.0295 5.3862 15.0295 5.6138 14.9114 5.78431L14.8536 5.85355L12.3536 8.35355L12.2843 8.41141C12.1138 8.52953 11.8862 8.52953 11.7157 8.41141L11.6464 8.35355L11.5886 8.28431C11.4705 8.1138 11.4705 7.8862 11.5886 7.71569L11.6464 7.64645L13.283 6.00986L13.1421 6.00248L13 6H7C4.79086 6 3 7.79086 3 10C3 10.9563 3.33557 11.8342 3.89537 12.5224C3.95954 12.606 4 12.7139 4 12.8313C4 13.1074 3.77614 13.3313 3.5 13.3313C3.333 13.3313 3.18512 13.2494 3.09432 13.1236C2.40993 12.2676 2 11.1817 2 10C2 7.31124 4.12231 5.11818 6.78311 5.00462L7 5H13C13.1017 5 13.2028 5.00304 13.303 5.00903L11.6464 3.35355L11.5886 3.28431C11.4536 3.08944 11.4729 2.82001 11.6464 2.64645Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/media-mute.svg b/src/browser/themes/shared/zen-icons/win/media-mute.svg
deleted file mode 100644
index 0d36ee1a3..000000000
--- a/src/browser/themes/shared/zen-icons/win/media-mute.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.9971 3.00613C11.9971 2.13311 10.9568 1.67928 10.3168 2.27313L6.44467 5.86651C6.3522 5.95232 6.23071 6.00001 6.10456 6.00001H3.49707C2.66864 6.00001 1.99707 6.67158 1.99707 7.50001V12.5C1.99707 13.3284 2.66864 14 3.49707 14H6.10456C6.23071 14 6.3522 14.0477 6.44467 14.1335L10.3168 17.7269C10.9568 18.3207 11.9971 17.8669 11.9971 16.9939V3.00613ZM7.1249 6.59951L10.9971 3.00613V16.9939L7.1249 13.4005C6.84749 13.1431 6.48302 13 6.10456 13H3.49707C3.22093 13 2.99707 12.7761 2.99707 12.5V7.50001C2.99707 7.22386 3.22093 7.00001 3.49707 7.00001H6.10456C6.48302 7.00001 6.84749 6.85695 7.1249 6.59951ZM13.1435 7.64646C13.3388 7.4512 13.6554 7.4512 13.8506 7.64646L15.4971 9.29291L17.1435 7.64646C17.3388 7.4512 17.6554 7.4512 17.8506 7.64646C18.0459 7.84173 18.0459 8.15831 17.8506 8.35357L16.2042 10L17.8506 11.6465C18.0459 11.8417 18.0459 12.1583 17.8506 12.3536C17.6554 12.5488 17.3388 12.5488 17.1435 12.3536L15.4971 10.7071L13.8506 12.3536C13.6554 12.5488 13.3388 12.5488 13.1435 12.3536C12.9483 12.1583 12.9483 11.8417 13.1435 11.6465L14.79 10L13.1435 8.35357C12.9483 8.15831 12.9483 7.84173 13.1435 7.64646Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/media-pause.svg b/src/browser/themes/shared/zen-icons/win/media-pause.svg
deleted file mode 100644
index 0821baf41..000000000
--- a/src/browser/themes/shared/zen-icons/win/media-pause.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 2C3.89543 2 3 2.89543 3 4V16C3 17.1046 3.89543 18 5 18H7C8.10457 18 9 17.1046 9 16V4C9 2.89543 8.10457 2 7 2H5ZM13 2C11.8954 2 11 2.89543 11 4V16C11 17.1046 11.8954 18 13 18H15C16.1046 18 17 17.1046 17 16V4C17 2.89543 16.1046 2 15 2H13Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/media-pip.svg b/src/browser/themes/shared/zen-icons/win/media-pip.svg
deleted file mode 100644
index 6706a9905..000000000
--- a/src/browser/themes/shared/zen-icons/win/media-pip.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5.75C2 4.23122 3.23122 3 4.75 3H15.25C16.7688 3 18 4.23122 18 5.75V10H17V5.75C17 4.7835 16.2165 4 15.25 4H4.75C3.7835 4 3 4.7835 3 5.75V12.25C3 13.2165 3.7835 14 4.75 14H9V15H4.75C3.23122 15 2 13.7688 2 12.25V5.75ZM11.5 11C10.6716 11 10 11.6716 10 12.5V16.5C10 17.3284 10.6716 18 11.5 18H17.5C18.3284 18 19 17.3284 19 16.5V12.5C19 11.6716 18.3284 11 17.5 11H11.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/media-play.svg b/src/browser/themes/shared/zen-icons/win/media-play.svg
deleted file mode 100644
index 56e3247d9..000000000
--- a/src/browser/themes/shared/zen-icons/win/media-play.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.2221 8.68458C18.2586 9.25438 18.2586 10.7437 17.2221 11.3135L7.22259 16.8105C6.22292 17.36 5 16.6367 5 15.496L5 4.50214C5 3.36137 6.22292 2.63812 7.22259 3.18766L17.2221 8.68458Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/media-speed.svg b/src/browser/themes/shared/zen-icons/win/media-speed.svg
deleted file mode 100644
index 043e248be..000000000
--- a/src/browser/themes/shared/zen-icons/win/media-speed.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.41621 4.70941C6.52652 3.74659 7.94296 3.12747 9.5 3.01758V4.5C9.5 4.77614 9.72386 5 10 5C10.2761 5 10.5 4.77614 10.5 4.5V3.01758C13.7991 3.25042 16.467 5.76943 16.9291 9.00001L15 9C14.7239 9 14.5 9.22386 14.5 9.5C14.5 9.77614 14.7239 10 15 10L17 10C17 12.0089 16.139 13.8947 14.7888 15.1694C14.588 15.359 14.5789 15.6755 14.7684 15.8763C14.958 16.077 15.2744 16.0862 15.4752 15.8966C17.0218 14.4365 18 12.2894 18 10C18 5.58172 14.4183 2 10 2C5.58172 2 2 5.58172 2 10C2 12.2954 3.02085 14.4408 4.56285 15.8966C4.76365 16.0862 5.0801 16.077 5.26967 15.8763C5.45923 15.6755 5.45013 15.359 5.24934 15.1694C3.89451 13.8904 3 12.0029 3 10L5 10C5.27614 10 5.5 9.77615 5.5 9.50001C5.5 9.22387 5.27614 9.00001 5 9.00001L3.07089 9C3.26537 7.64034 3.85058 6.40672 4.70912 5.41654L6.14648 6.85359C6.34177 7.04883 6.65835 7.0488 6.85359 6.85352C7.04883 6.65823 7.0488 6.34165 6.85352 6.14641L5.41621 4.70941ZM13.4488 5.80748C13.6361 5.65891 13.9024 5.66374 14.0842 5.81899C14.266 5.97425 14.3124 6.2365 14.195 6.44476L14.0842 6.64091C14.0135 6.76586 13.9122 6.94478 13.7895 7.16077C13.5441 7.59267 13.213 8.17317 12.8706 8.76703C12.5284 9.36048 12.1739 9.96907 11.8818 10.4565C11.7359 10.7 11.6042 10.9156 11.4967 11.085C11.3967 11.2425 11.2986 11.3907 11.2267 11.475C10.6887 12.105 9.74187 12.1796 9.11188 11.6416C8.4819 11.1036 8.40731 10.1568 8.94528 9.52685C9.01728 9.44253 9.14834 9.32247 9.28824 9.19906C9.43867 9.06636 9.63102 8.90251 9.84865 8.72031C10.2844 8.35553 10.8299 7.91006 11.3625 7.47918C11.8954 7.048 12.4169 6.63012 12.8051 6.32013C12.9992 6.16511 13.16 6.03701 13.2724 5.94764L13.4488 5.80748Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/media-unmute.svg b/src/browser/themes/shared/zen-icons/win/media-unmute.svg
deleted file mode 100644
index 892a7b8c9..000000000
--- a/src/browser/themes/shared/zen-icons/win/media-unmute.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.9971 3.00613C11.9971 2.13311 10.9568 1.67928 10.3168 2.27313L6.44467 5.86651C6.3522 5.95232 6.23071 6.00001 6.10456 6.00001H3.49707C2.66864 6.00001 1.99707 6.67158 1.99707 7.50001V12.5C1.99707 13.3284 2.66864 14 3.49707 14H6.10456C6.23071 14 6.3522 14.0477 6.44467 14.1335L10.3168 17.7269C10.9568 18.3207 11.9971 17.8669 11.9971 16.9939V3.00613ZM7.1249 6.59951L10.9971 3.00613V16.9939L7.1249 13.4005C6.84749 13.1431 6.48302 13 6.10456 13H3.49707C3.22093 13 2.99707 12.7761 2.99707 12.5V7.50001C2.99707 7.22386 3.22093 7.00001 3.49707 7.00001H6.10456C6.48302 7.00001 6.84749 6.85695 7.1249 6.59951ZM14.0814 12.9332C13.8421 12.7954 13.7599 12.4897 13.8977 12.2504C14.6739 10.9028 14.7294 9.1916 13.897 7.74991C13.759 7.51076 13.8409 7.20497 14.08 7.0669C14.3192 6.92883 14.625 7.01076 14.7631 7.24991C15.7811 9.01318 15.7112 11.1054 14.7642 12.7495C14.6264 12.9888 14.3207 13.0711 14.0814 12.9332Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/menu-bar.svg b/src/browser/themes/shared/zen-icons/win/menu-bar.svg
deleted file mode 100644
index 8d1b46478..000000000
--- a/src/browser/themes/shared/zen-icons/win/menu-bar.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 3C4.34315 3 3 4.34315 3 6V14C3 15.6569 4.34315 17 6 17H14C15.6569 17 17 15.6569 17 14V6C17 4.34315 15.6569 3 14 3H6ZM4 6C4 4.89543 4.89543 4 6 4H14C15.1046 4 16 4.89543 16 6L4 6ZM4 7H16V14C16 15.1046 15.1046 16 14 16H6C4.89543 16 4 15.1046 4 14V7Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/menu.svg b/src/browser/themes/shared/zen-icons/win/menu.svg
deleted file mode 100644
index 239e4fd6b..000000000
--- a/src/browser/themes/shared/zen-icons/win/menu.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.25 10C6.25 10.6904 5.69036 11.25 5 11.25C4.30964 11.25 3.75 10.6904 3.75 10C3.75 9.30964 4.30964 8.75 5 8.75C5.69036 8.75 6.25 9.30964 6.25 10ZM11.25 10C11.25 10.6904 10.6904 11.25 10 11.25C9.30964 11.25 8.75 10.6904 8.75 10C8.75 9.30964 9.30964 8.75 10 8.75C10.6904 8.75 11.25 9.30964 11.25 10ZM15 11.25C15.6904 11.25 16.25 10.6904 16.25 10C16.25 9.30964 15.6904 8.75 15 8.75C14.3096 8.75 13.75 9.30964 13.75 10C13.75 10.6904 14.3096 11.25 15 11.25Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/microphone-blocked.svg b/src/browser/themes/shared/zen-icons/win/microphone-blocked.svg
deleted file mode 100644
index ae310434a..000000000
--- a/src/browser/themes/shared/zen-icons/win/microphone-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 5V9.87866L12.8984 10.777C12.9647 10.5292 13 10.2687 13 9.99998V5C13 3.34315 11.6569 2 10 2C8.38301 2 7.06481 3.2793 7.00232 4.88098L8 5.87866V5C8 3.89543 8.89543 3 10 3C11.1046 3 12 3.89543 12 5ZM7 7.70712L2.14645 2.85357C1.95118 2.65831 1.95118 2.34172 2.14645 2.14646C2.34171 1.9512 2.65829 1.9512 2.85355 2.14646L17.8536 17.1465C18.0488 17.3417 18.0488 17.6583 17.8536 17.8536C17.6583 18.0488 17.3417 18.0488 17.1464 17.8536L13.5195 14.2266C12.6858 14.9216 11.6434 15.3745 10.5 15.4776V17.5C10.5 17.7761 10.2761 18 10 18C9.72386 18 9.5 17.7761 9.5 17.5V15.4776C6.69675 15.2249 4.5 12.869 4.5 9.99998C4.5 9.72384 4.72386 9.49998 5 9.49998C5.27614 9.49998 5.5 9.72384 5.5 9.99998C5.5 12.4853 7.51472 14.5 10 14.5C11.0625 14.5 12.039 14.1318 12.8088 13.5159L11.7382 12.4454C11.2478 12.7946 10.6479 13 10 13C8.34315 13 7 11.6568 7 9.99998V7.70712ZM11.016 11.7231L8 8.70712V9.99998C8 11.1046 8.89543 12 10 12C10.3709 12 10.7182 11.899 11.016 11.7231ZM14.803 12.6817L14.0614 11.9401C14.3426 11.3527 14.5 10.6947 14.5 9.99998C14.5 9.72384 14.7239 9.49998 15 9.49998C15.2761 9.49998 15.5 9.72384 15.5 9.99998C15.5 10.9737 15.247 11.8883 14.803 12.6817Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/microphone.svg b/src/browser/themes/shared/zen-icons/win/microphone.svg
deleted file mode 100644
index 2e070f6c6..000000000
--- a/src/browser/themes/shared/zen-icons/win/microphone.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 13C11.6569 13 13 11.6568 13 9.99998V5C13 3.34315 11.6569 2 10 2C8.34315 2 7 3.34315 7 5V9.99998C7 11.6568 8.34315 13 10 13ZM10 12C8.89543 12 8 11.1046 8 9.99998V5C8 3.89543 8.89543 3 10 3C11.1046 3 12 3.89543 12 5V9.99998C12 11.1046 11.1046 12 10 12ZM5 9.49998C5.27614 9.49998 5.5 9.72384 5.5 9.99998C5.5 12.4853 7.51472 14.5 10 14.5C12.4853 14.5 14.5 12.4853 14.5 9.99998C14.5 9.72384 14.7239 9.49998 15 9.49998C15.2761 9.49998 15.5 9.72384 15.5 9.99998C15.5 12.869 13.3033 15.2249 10.5 15.4776V17.5C10.5 17.7761 10.2761 18 10 18C9.72386 18 9.5 17.7761 9.5 17.5V15.4776C6.69675 15.2249 4.5 12.869 4.5 9.99998C4.5 9.72384 4.72386 9.49998 5 9.49998Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/midi.svg b/src/browser/themes/shared/zen-icons/win/midi.svg
deleted file mode 100644
index 83926d7b1..000000000
--- a/src/browser/themes/shared/zen-icons/win/midi.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 2C10.2761 2 10.5 2.22386 10.5 2.5V17.5C10.5 17.7761 10.2761 18 10 18C9.72386 18 9.5 17.7761 9.5 17.5V2.5C9.5 2.22386 9.72386 2 10 2ZM13.5 5C13.7761 5 14 5.22386 14 5.5V14.5C14 14.7761 13.7761 15 13.5 15C13.2239 15 13 14.7761 13 14.5V5.5C13 5.22386 13.2239 5 13.5 5ZM7 5.5C7 5.22386 6.77614 5 6.5 5C6.22386 5 6 5.22386 6 5.5V14.5C6 14.7761 6.22386 15 6.5 15C6.77614 15 7 14.7761 7 14.5V5.5ZM16.5 8C16.7761 8 17 8.22386 17 8.5V11.5C17 11.7761 16.7761 12 16.5 12C16.2239 12 16 11.7761 16 11.5V8.5C16 8.22386 16.2239 8 16.5 8ZM4 8.5C4 8.22386 3.77614 8 3.5 8C3.22386 8 3 8.22386 3 8.5V11.5C3 11.7761 3.22386 12 3.5 12C3.77614 12 4 11.7761 4 11.5V8.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/move-tab.svg b/src/browser/themes/shared/zen-icons/win/move-tab.svg
deleted file mode 100644
index 18c3ce5cf..000000000
--- a/src/browser/themes/shared/zen-icons/win/move-tab.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="24" height="24" viewBox="0 0 24 24" fill="#000000" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.03033 8.96967C7.73744 8.67678 7.26256 8.67678 6.96967 8.96967L5.21967 10.7197C4.92678 11.0126 4.92678 11.4874 5.21967 11.7803C5.51256 12.0732 5.98744 12.0732 6.28033 11.7803L6.75 11.3107V14.25C6.75 14.6642 7.08579 15 7.5 15C7.91421 15 8.25 14.6642 8.25 14.25V11.3107L8.71967 11.7803C9.01256 12.0732 9.48744 12.0732 9.78033 11.7803C10.0732 11.4874 10.0732 11.0126 9.78033 10.7197L8.03033 8.96967ZM14.2197 13.0303L15.9697 14.7803C16.2626 15.0732 16.7374 15.0732 17.0303 14.7803L18.7803 13.0303C19.0732 12.7374 19.0732 12.2626 18.7803 11.9697C18.4874 11.6768 18.0126 11.6768 17.7197 11.9697L17.25 12.4393V9.5C17.25 9.08579 16.9142 8.75 16.5 8.75C16.0858 8.75 15.75 9.08579 15.75 9.5V12.4393L15.2803 11.9697C14.9874 11.6768 14.5126 11.6768 14.2197 11.9697C13.9268 12.2626 13.9268 12.7374 14.2197 13.0303ZM5.25 4C3.45507 4 2 5.45507 2 7.25V16.75C2 18.5449 3.45507 20 5.25 20H18.75C20.5449 20 22 18.5449 22 16.75V7.25C22 5.45507 20.5449 4 18.75 4H5.25ZM3.5 7.25C3.5 6.2835 4.2835 5.5 5.25 5.5H11.25L11.25 18.5H5.25C4.2835 18.5 3.5 17.7165 3.5 16.75V7.25ZM12.75 5.5H18.75C19.7165 5.5 20.5 6.2835 20.5 7.25V16.75C20.5 17.7165 19.7165 18.5 18.75 18.5H12.75L12.75 5.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/new-tab-image.svg b/src/browser/themes/shared/zen-icons/win/new-tab-image.svg
deleted file mode 100644
index 3c51d9ce1..000000000
--- a/src/browser/themes/shared/zen-icons/win/new-tab-image.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.75 3C4.23122 3 3 4.23122 3 5.75V18.25C3 19.7688 4.23122 21 5.75 21H18.25C19.7688 21 21 19.7688 21 18.25V5.75C21 4.23122 19.7688 3 18.25 3H5.75ZM11 4.5V5.75C11 6.99264 12.0074 8 13.25 8H19.5V18.25C19.5 18.9404 18.9404 19.5 18.25 19.5H5.75C5.05964 19.5 4.5 18.9404 4.5 18.25V5.75C4.5 5.05964 5.05964 4.5 5.75 4.5H11ZM19.5 6.5H13.25C12.8358 6.5 12.5 6.16421 12.5 5.75V4.5H18.25C18.9404 4.5 19.5 5.05964 19.5 5.75V6.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/open.svg b/src/browser/themes/shared/zen-icons/win/open.svg
deleted file mode 100644
index ca73b622b..000000000
--- a/src/browser/themes/shared/zen-icons/win/open.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 4C4.89543 4 4 4.89543 4 6V14C4 15.1046 4.89543 16 6 16H14C15.1046 16 16 15.1046 16 14V11.5C16 11.2239 16.2239 11 16.5 11C16.7761 11 17 11.2239 17 11.5V14C17 15.6569 15.6569 17 14 17H6C4.34315 17 3 15.6569 3 14V6C3 4.34315 4.34315 3 6 3H8.5C8.77614 3 9 3.22386 9 3.5C9 3.77614 8.77614 4 8.5 4H6ZM11 3.5C11 3.22386 11.2239 3 11.5 3H16.5C16.7761 3 17 3.22386 17 3.5V8.5C17 8.77614 16.7761 9 16.5 9C16.2239 9 16 8.77614 16 8.5V4.70711L11.8536 8.85355C11.6583 9.04882 11.3417 9.04882 11.1464 8.85355C10.9512 8.65829 10.9512 8.34171 11.1464 8.14645L15.2929 4H11.5C11.2239 4 11 3.77614 11 3.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/page-portrait.svg b/src/browser/themes/shared/zen-icons/win/page-portrait.svg
deleted file mode 100644
index e4671ddfc..000000000
--- a/src/browser/themes/shared/zen-icons/win/page-portrait.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.07246 15.4442L8.13717 15.0024H7.5C7.22386 15.0024 7 14.7786 7 14.5024C7 14.2263 7.22386 14.0024 7.5 14.0024H8.28363L8.50333 12.5024H8C7.72386 12.5024 7.5 12.2786 7.5 12.0024C7.5 11.7263 7.72386 11.5024 8 11.5024H8.64979L8.80721 10.4276C8.84723 10.1544 9.10117 9.96535 9.37439 10.0054C9.64762 10.0454 9.83667 10.2993 9.79666 10.5725L9.66046 11.5024H10.8998L11.0572 10.4276C11.0972 10.1544 11.3512 9.96535 11.6244 10.0054C11.8976 10.0454 12.0867 10.2993 12.0467 10.5725L11.9105 11.5024H12.5C12.7761 11.5024 13 11.7263 13 12.0024C13 12.2786 12.7761 12.5024 12.5 12.5024H11.764L11.5443 14.0024H12C12.2761 14.0024 12.5 14.2263 12.5 14.5024C12.5 14.7786 12.2761 15.0024 12 15.0024H11.3978L11.3119 15.5891C11.2719 15.8624 11.0179 16.0514 10.7447 16.0114C10.4715 15.9714 10.2824 15.7174 10.3225 15.4442L10.3872 15.0024H9.14784L9.0619 15.5891C9.02188 15.8624 8.76795 16.0514 8.49472 16.0114C8.22149 15.9714 8.03244 15.7174 8.07246 15.4442ZM10.7533 12.5024H9.514L9.2943 14.0024H10.5336L10.7533 12.5024ZM6 2C4.89543 2 4 2.89543 4 4V16C4 17.1046 4.89543 18 6 18H14C15.1046 18 16 17.1046 16 16L16 4C16 2.89543 15.1046 2 14 2H6ZM6 3L14 3C14.5523 3 15 3.44771 15 4L15 16C15 16.5523 14.5523 17 14 17H6C5.44772 17 5 16.5523 5 16V4C5 3.44772 5.44772 3 6 3Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/palette.svg b/src/browser/themes/shared/zen-icons/win/palette.svg
deleted file mode 100644
index ccefad575..000000000
--- a/src/browser/themes/shared/zen-icons/win/palette.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.75 6.5C10.1642 6.5 10.5 6.16421 10.5 5.75C10.5 5.33579 10.1642 5 9.75 5C9.33579 5 9 5.33579 9 5.75C9 6.16421 9.33579 6.5 9.75 6.5ZM12.75 7.5C13.1642 7.5 13.5 7.16421 13.5 6.75C13.5 6.33579 13.1642 6 12.75 6C12.3358 6 12 6.33579 12 6.75C12 7.16421 12.3358 7.5 12.75 7.5ZM15.25 9C15.25 9.41421 14.9142 9.75 14.5 9.75C14.0858 9.75 13.75 9.41421 13.75 9C13.75 8.58579 14.0858 8.25 14.5 8.25C14.9142 8.25 15.25 8.58579 15.25 9ZM14.5 12.75C14.9142 12.75 15.25 12.4142 15.25 12C15.25 11.5858 14.9142 11.25 14.5 11.25C14.0858 11.25 13.75 11.5858 13.75 12C13.75 12.4142 14.0858 12.75 14.5 12.75ZM13.25 14C13.25 14.4142 12.9142 14.75 12.5 14.75C12.0858 14.75 11.75 14.4142 11.75 14C11.75 13.5858 12.0858 13.25 12.5 13.25C12.9142 13.25 13.25 13.5858 13.25 14ZM13.6972 2.99169C10.9426 1.57663 8.14317 1.7124 5.77004 3.16636C4.55906 3.9083 3.25328 5.46925 2.51602 7.05899C2.14539 7.85816 1.89912 8.70492 1.90234 9.49318C1.90562 10.2941 2.1698 11.0587 2.84036 11.6053C3.45055 12.1026 3.98162 12.353 4.49571 12.3784C5.01372 12.404 5.41801 12.1942 5.73426 12.0076C5.80379 11.9666 5.86888 11.927 5.9311 11.8892C6.17329 11.7421 6.37202 11.6214 6.62046 11.5426C6.90188 11.4534 7.25817 11.4205 7.77576 11.5787C7.96658 11.637 8.08158 11.7235 8.16209 11.8229C8.24789 11.9289 8.31659 12.0774 8.36784 12.2886C8.41952 12.5016 8.44764 12.7527 8.46865 13.0491C8.47648 13.1594 8.48376 13.2855 8.49139 13.4176C8.50249 13.6098 8.51434 13.8149 8.52971 14.0037C8.58432 14.6744 8.69968 15.4401 9.10359 16.1357C9.51761 16.8488 10.2047 17.439 11.307 17.8158C12.9092 18.3636 14.3731 17.9191 15.5126 17.0169C16.6391 16.125 17.4691 14.7761 17.8841 13.4272C19.199 9.15377 17.6728 5.03394 13.6972 2.99169ZM6.29246 4.01905C8.35683 2.75426 10.7844 2.61959 13.2403 3.88119C16.7473 5.68275 18.1134 9.28161 16.9284 13.1332C16.5624 14.3227 15.8338 15.4871 14.8918 16.2329C13.9629 16.9684 12.8486 17.286 11.6305 16.8696C10.7269 16.5607 10.2467 16.1129 9.96839 15.6336C9.67998 15.1369 9.57796 14.5556 9.52641 13.9225C9.51098 13.733 9.50129 13.5621 9.49144 13.3884C9.48396 13.2564 9.47639 13.1229 9.46615 12.9783C9.44421 12.669 9.41172 12.3499 9.33965 12.0529C9.26716 11.7541 9.14899 11.4527 8.93932 11.1937C8.72436 10.9282 8.43529 10.7346 8.06798 10.6223C7.36645 10.408 6.80263 10.4359 6.31836 10.5893C5.94328 10.7082 5.62013 10.9061 5.37176 11.0582C5.31989 11.0899 5.27127 11.1197 5.22613 11.1463C4.94091 11.3146 4.75354 11.39 4.54511 11.3796C4.33276 11.3691 4.00259 11.2625 3.47215 10.8301C3.08657 10.5158 2.9047 10.0668 2.90234 9.48908C2.89992 8.89865 3.08839 8.20165 3.42321 7.47971C4.09683 6.0272 5.28468 4.63649 6.29246 4.01905Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/passwords.svg b/src/browser/themes/shared/zen-icons/win/passwords.svg
deleted file mode 100644
index 91c6abd01..000000000
--- a/src/browser/themes/shared/zen-icons/win/passwords.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.85355 8.14645C7.65829 7.95118 7.34171 7.95118 7.14645 8.14645L6.5 8.79289L5.85355 8.14645C5.65829 7.95118 5.34171 7.95118 5.14645 8.14645C4.95118 8.34171 4.95118 8.65829 5.14645 8.85355L5.79289 9.5L5.14645 10.1464C4.95118 10.3417 4.95118 10.6583 5.14645 10.8536C5.34171 11.0488 5.65829 11.0488 5.85355 10.8536L6.5 10.2071L7.14645 10.8536C7.34171 11.0488 7.65829 11.0488 7.85355 10.8536C8.04882 10.6583 8.04882 10.3417 7.85355 10.1464L7.20711 9.5L7.85355 8.85355C8.04882 8.65829 8.04882 8.34171 7.85355 8.14645ZM11.1464 8.14645C11.3417 7.95118 11.6583 7.95118 11.8536 8.14645C12.0488 8.34171 12.0488 8.65829 11.8536 8.85355L11.2071 9.5L11.8536 10.1464C12.0488 10.3417 12.0488 10.6583 11.8536 10.8536C11.6583 11.0488 11.3417 11.0488 11.1464 10.8536L10.5 10.2071L9.85355 10.8536C9.65829 11.0488 9.34171 11.0488 9.14645 10.8536C8.95118 10.6583 8.95118 10.3417 9.14645 10.1464L9.79289 9.5L9.14645 8.85355C8.95118 8.65829 8.95118 8.34171 9.14645 8.14645C9.34171 7.95118 9.65829 7.95118 9.85355 8.14645L10.5 8.79289L11.1464 8.14645ZM13.5 10C13.2239 10 13 10.2239 13 10.5C13 10.7761 13.2239 11 13.5 11H15.5C15.7761 11 16 10.7761 16 10.5C16 10.2239 15.7761 10 15.5 10H13.5ZM4.75 4C3.23122 4 2 5.23122 2 6.75V12.25C2 13.7688 3.23122 15 4.75 15H15.25C16.7688 15 18 13.7688 18 12.25V6.75C18 5.23122 16.7688 4 15.25 4H4.75ZM3 6.75C3 5.7835 3.7835 5 4.75 5H15.25C16.2165 5 17 5.7835 17 6.75V12.25C17 13.2165 16.2165 14 15.25 14H4.75C3.7835 14 3 13.2165 3 12.25V6.75Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/paste-and-go.svg b/src/browser/themes/shared/zen-icons/win/paste-and-go.svg
deleted file mode 100644
index 0557af7b6..000000000
--- a/src/browser/themes/shared/zen-icons/win/paste-and-go.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2C6.89543 2 6 2.89543 6 4V14C6 15.1046 6.89543 16 8 16H9.20703C9.11588 15.6777 9.05337 15.3434 9.02242 15H8C7.44772 15 7 14.5523 7 14V4C7 3.44772 7.44772 3 8 3H14C14.5523 3 15 3.44772 15 4V9.02242C15.3434 9.05337 15.6777 9.11588 16 9.20703V4C16 2.89543 15.1046 2 14 2H8ZM7.5 17H9.59972C9.78261 17.3578 10.0035 17.6929 10.2572 18H7.5C5.567 18 4 16.433 4 14.5V6.00001C4 5.25973 4.4022 4.61339 5 4.26758V14.5C5 15.8807 6.11929 17 7.5 17ZM14.5 10C16.9853 10 19 12.0147 19 14.5C19 16.9853 16.9853 19 14.5 19C12.0147 19 10 16.9853 10 14.5C10 12.0147 12.0147 10 14.5 10ZM16.8532 14.854L16.8557 14.8514C16.9026 14.804 16.938 14.7495 16.9621 14.6914C16.9861 14.6333 16.9996 14.5697 17 14.503L17 14.5L17 14.497C16.9996 14.4303 16.9861 14.3667 16.9621 14.3086C16.9377 14.2496 16.9015 14.1944 16.8536 14.1464L14.8536 12.1464C14.6583 11.9512 14.3417 11.9512 14.1464 12.1464C13.9512 12.3417 13.9512 12.6583 14.1464 12.8536L15.2929 14H12.5C12.2239 14 12 14.2239 12 14.5C12 14.7761 12.2239 15 12.5 15H15.2929L14.1464 16.1464C13.9512 16.3417 13.9512 16.6583 14.1464 16.8536C14.3417 17.0488 14.6583 17.0488 14.8536 16.8536L16.8532 14.854Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/permissions.svg b/src/browser/themes/shared/zen-icons/win/permissions.svg
deleted file mode 100644
index 8127d5fd0..000000000
--- a/src/browser/themes/shared/zen-icons/win/permissions.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.95 5C14.7184 3.85888 13.7095 3 12.5 3C11.2905 3 10.2816 3.85888 10.05 5H2.5C2.22386 5 2 5.22386 2 5.5C2 5.77614 2.22386 6 2.5 6H10.05C10.2816 7.14112 11.2905 8 12.5 8C13.7297 8 14.752 7.11217 14.961 5.94254C14.9575 5.96177 14.9539 5.98093 14.95 6H17.5C17.7761 6 18 5.77614 18 5.5C18 5.22386 17.7761 5 17.5 5H14.95ZM12.5 7C11.6716 7 11 6.32843 11 5.5C11 4.67157 11.6716 4 12.5 4C13.3284 4 14 4.67157 14 5.5C14 6.32843 13.3284 7 12.5 7ZM9.94999 14C9.71836 12.8589 8.70948 12 7.5 12C6.29052 12 5.28164 12.8589 5.05001 14H2.5C2.22386 14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H5.05001C5.28164 16.1411 6.29052 17 7.5 17C8.70948 17 9.71836 16.1411 9.94999 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239 17.7761 14 17.5 14H9.94999ZM7.5 16C6.67157 16 6 15.3284 6 14.5C6 13.6716 6.67157 13 7.5 13C8.32843 13 9 13.6716 9 14.5C9 15.3284 8.32843 16 7.5 16Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/persistent-storage-blocked.svg b/src/browser/themes/shared/zen-icons/win/persistent-storage-blocked.svg
deleted file mode 100644
index e916240ae..000000000
--- a/src/browser/themes/shared/zen-icons/win/persistent-storage-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 12C2 11.6024 2.08076 11.2089 2.23739 10.8435L4.65084 5.21215C4.966 4.47679 5.68907 4 6.48913 4H13.5931C14.335 4 15.0231 4.41071 15.356 5.08776C15.9274 6.25021 16.9887 8.51197 17.8103 10.8618C17.9394 11.2308 18 11.6163 18 12V14C18 15.1046 17.1046 16 16 16H4C2.89543 16 2 15.1046 2 14V12ZM13.5931 5H6.48913C6.0891 5 5.72756 5.2384 5.56998 5.60608L3.67563 10.0262C3.78121 10.009 3.88956 10 4 10H16C16.1535 10 16.303 10.0173 16.4466 10.05C15.7287 8.18365 14.9283 6.48449 14.4586 5.52894C14.2994 5.20511 13.9664 5 13.5931 5ZM16 15C16.5523 15 17 14.5523 17 14V12C17 11.4477 16.5523 11 16 11H4C3.44772 11 3 11.4477 3 12V14C3 14.5523 3.44772 15 4 15H16ZM14.75 13.75C15.1642 13.75 15.5 13.4142 15.5 13C15.5 12.5858 15.1642 12.25 14.75 12.25C14.3358 12.25 14 12.5858 14 13C14 13.4142 14.3358 13.75 14.75 13.75Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/persistent-storage.svg b/src/browser/themes/shared/zen-icons/win/persistent-storage.svg
deleted file mode 100644
index e916240ae..000000000
--- a/src/browser/themes/shared/zen-icons/win/persistent-storage.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 12C2 11.6024 2.08076 11.2089 2.23739 10.8435L4.65084 5.21215C4.966 4.47679 5.68907 4 6.48913 4H13.5931C14.335 4 15.0231 4.41071 15.356 5.08776C15.9274 6.25021 16.9887 8.51197 17.8103 10.8618C17.9394 11.2308 18 11.6163 18 12V14C18 15.1046 17.1046 16 16 16H4C2.89543 16 2 15.1046 2 14V12ZM13.5931 5H6.48913C6.0891 5 5.72756 5.2384 5.56998 5.60608L3.67563 10.0262C3.78121 10.009 3.88956 10 4 10H16C16.1535 10 16.303 10.0173 16.4466 10.05C15.7287 8.18365 14.9283 6.48449 14.4586 5.52894C14.2994 5.20511 13.9664 5 13.5931 5ZM16 15C16.5523 15 17 14.5523 17 14V12C17 11.4477 16.5523 11 16 11H4C3.44772 11 3 11.4477 3 12V14C3 14.5523 3.44772 15 4 15H16ZM14.75 13.75C15.1642 13.75 15.5 13.4142 15.5 13C15.5 12.5858 15.1642 12.25 14.75 12.25C14.3358 12.25 14 12.5858 14 13C14 13.4142 14.3358 13.75 14.75 13.75Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/pin.svg b/src/browser/themes/shared/zen-icons/win/pin.svg
deleted file mode 100644
index 521dc77a8..000000000
--- a/src/browser/themes/shared/zen-icons/win/pin.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.1221 3.13764C10.7326 1.91665 12.3599 1.65257 13.3251 2.61785L17.382 6.67468C18.3472 7.63996 18.0832 9.26725 16.8622 9.87775L13.4037 11.607C13.0751 11.7713 12.8183 12.0504 12.6818 12.3915L11.2459 15.9815C10.9792 16.648 10.1179 16.8248 9.61027 16.3172L7 13.7069L3.70711 16.9998H3V16.2927L6.29289 12.9998L3.68262 10.3896C3.17498 9.88191 3.35177 9.0206 4.01834 8.75397L7.60829 7.31799C7.94939 7.18155 8.22855 6.92468 8.39285 6.59609L10.1221 3.13764ZM12.618 3.32496C12.1354 2.84232 11.3217 2.97436 11.0165 3.58486L9.28727 7.04331C9.01345 7.59095 8.54818 8.01907 7.97968 8.24646L4.38973 9.68245L10.3174 15.6101L11.7534 12.0201C11.9808 11.4516 12.4089 10.9864 12.9565 10.7125L16.415 8.98332C17.0255 8.67807 17.1575 7.86443 16.6749 7.38179L12.618 3.32496Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/plus.svg b/src/browser/themes/shared/zen-icons/win/plus.svg
deleted file mode 100644
index 9c8388c67..000000000
--- a/src/browser/themes/shared/zen-icons/win/plus.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 2.5C10 2.22386 9.77614 2 9.5 2C9.22386 2 9 2.22386 9 2.5V9H2.5C2.22386 9 2 9.22386 2 9.5C2 9.77614 2.22386 10 2.5 10H9V16.5C9 16.7761 9.22386 17 9.5 17C9.77614 17 10 16.7761 10 16.5V10H16.5C16.7761 10 17 9.77614 17 9.5C17 9.22386 16.7761 9 16.5 9H10V2.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/popup.svg b/src/browser/themes/shared/zen-icons/win/popup.svg
deleted file mode 100644
index 5eeccf131..000000000
--- a/src/browser/themes/shared/zen-icons/win/popup.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 2C3.11929 2 2 3.11929 2 4.5V12.5C2 13.8807 3.11929 15 4.5 15H12.5C13.8807 15 15 13.8807 15 12.5V4.5C15 3.11929 13.8807 2 12.5 2H4.5ZM3 12.5V6H14V12.5C14 13.3284 13.3284 14 12.5 14H4.5C3.67157 14 3 13.3284 3 12.5ZM3 5V4.5C3 3.67157 3.67157 3 4.5 3H12.5C13.3284 3 14 3.67157 14 4.5V5H3ZM7.4998 18C6.29032 18 5.28144 17.1411 5.0498 16H6.08515C6.29107 16.5826 6.84669 17 7.4998 17H13.9998C15.6566 17 16.9998 15.6569 16.9998 14V7.50001C16.9998 6.8469 16.5824 6.29128 15.9998 6.08536V5.05002C17.1409 5.28165 17.9998 6.29053 17.9998 7.50001V14C17.9998 16.2091 16.2089 18 13.9998 18H7.4998Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/print.svg b/src/browser/themes/shared/zen-icons/win/print.svg
deleted file mode 100644
index b052dc728..000000000
--- a/src/browser/themes/shared/zen-icons/win/print.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 4.5C5 3.67157 5.67157 3 6.5 3H13.5C14.3284 3 15 3.67157 15 4.5V5H15.5C16.8807 5 18 6.11929 18 7.5V12.5C18 13.3284 17.3284 14 16.5 14H15V15.5C15 16.3284 14.3284 17 13.5 17H6.5C5.67157 17 5 16.3284 5 15.5V14H3.5C2.67157 14 2 13.3284 2 12.5V7.5C2 6.11929 3.11929 5 4.5 5H5V4.5ZM6 5H14V4.5C14 4.22386 13.7761 4 13.5 4H6.5C6.22386 4 6 4.22386 6 4.5V5ZM5 13V11.5C5 10.6716 5.67157 10 6.5 10H13.5C14.3284 10 15 10.6716 15 11.5V13H16.5C16.7761 13 17 12.7761 17 12.5V7.5C17 6.67157 16.3284 6 15.5 6H4.5C3.67157 6 3 6.67157 3 7.5V12.5C3 12.7761 3.22386 13 3.5 13H5ZM6.5 11C6.22386 11 6 11.2239 6 11.5V15.5C6 15.7761 6.22386 16 6.5 16H13.5C13.7761 16 14 15.7761 14 15.5V11.5C14 11.2239 13.7761 11 13.5 11H6.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/private-window.svg b/src/browser/themes/shared/zen-icons/win/private-window.svg
deleted file mode 100644
index 4b6d4a841..000000000
--- a/src/browser/themes/shared/zen-icons/win/private-window.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.17082 4.27639C6.25552 4.107 6.42865 4 6.61803 4H13.382C13.5714 4 13.7445 4.107 13.8292 4.27639L15.0528 6.72361C15.1763 6.9706 15.4766 7.07071 15.7236 6.94721C15.9706 6.82372 16.0707 6.52338 15.9472 6.27639L14.7236 3.82918C14.4695 3.321 13.9501 3 13.382 3H6.61803C6.04988 3 5.53048 3.321 5.27639 3.82918L4.05279 6.27639C3.92929 6.52338 4.0294 6.82372 4.27639 6.94721C4.52338 7.07071 4.82372 6.9706 4.94721 6.72361L6.17082 4.27639ZM17.4178 8.99322C11.4722 8.00227 8.52778 8.00226 2.5822 8.99322C2.30982 9.03862 2.0522 8.85461 2.0068 8.58223C1.9614 8.30984 2.14541 8.05223 2.4178 8.00683C8.47222 6.99772 11.5278 6.99773 17.5822 8.00683C17.8546 8.05223 18.0386 8.30984 17.9932 8.58223C17.9478 8.85461 17.6902 9.03862 17.4178 8.99322ZM5.5 11C4.11929 11 3 12.1193 3 13.5C3 14.8807 4.11929 16 5.5 16C6.88071 16 8 14.8807 8 13.5C8 12.1193 6.88071 11 5.5 11ZM2 13.5C2 11.567 3.567 10 5.5 10C7.26324 10 8.72194 11.3039 8.96456 13H11.0354C11.2781 11.3039 12.7368 10 14.5 10C16.433 10 18 11.567 18 13.5C18 15.433 16.433 17 14.5 17C12.7368 17 11.2781 15.6961 11.0354 14H8.96456C8.72194 15.6961 7.26324 17 5.5 17C3.567 17 2 15.433 2 13.5ZM14.5 11C13.1193 11 12 12.1193 12 13.5C12 14.8807 13.1193 16 14.5 16C15.8807 16 17 14.8807 17 13.5C17 12.1193 15.8807 11 14.5 11Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/privateBrowsing.svg b/src/browser/themes/shared/zen-icons/win/privateBrowsing.svg
deleted file mode 100644
index 4b6d4a841..000000000
--- a/src/browser/themes/shared/zen-icons/win/privateBrowsing.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.17082 4.27639C6.25552 4.107 6.42865 4 6.61803 4H13.382C13.5714 4 13.7445 4.107 13.8292 4.27639L15.0528 6.72361C15.1763 6.9706 15.4766 7.07071 15.7236 6.94721C15.9706 6.82372 16.0707 6.52338 15.9472 6.27639L14.7236 3.82918C14.4695 3.321 13.9501 3 13.382 3H6.61803C6.04988 3 5.53048 3.321 5.27639 3.82918L4.05279 6.27639C3.92929 6.52338 4.0294 6.82372 4.27639 6.94721C4.52338 7.07071 4.82372 6.9706 4.94721 6.72361L6.17082 4.27639ZM17.4178 8.99322C11.4722 8.00227 8.52778 8.00226 2.5822 8.99322C2.30982 9.03862 2.0522 8.85461 2.0068 8.58223C1.9614 8.30984 2.14541 8.05223 2.4178 8.00683C8.47222 6.99772 11.5278 6.99773 17.5822 8.00683C17.8546 8.05223 18.0386 8.30984 17.9932 8.58223C17.9478 8.85461 17.6902 9.03862 17.4178 8.99322ZM5.5 11C4.11929 11 3 12.1193 3 13.5C3 14.8807 4.11929 16 5.5 16C6.88071 16 8 14.8807 8 13.5C8 12.1193 6.88071 11 5.5 11ZM2 13.5C2 11.567 3.567 10 5.5 10C7.26324 10 8.72194 11.3039 8.96456 13H11.0354C11.2781 11.3039 12.7368 10 14.5 10C16.433 10 18 11.567 18 13.5C18 15.433 16.433 17 14.5 17C12.7368 17 11.2781 15.6961 11.0354 14H8.96456C8.72194 15.6961 7.26324 17 5.5 17C3.567 17 2 15.433 2 13.5ZM14.5 11C13.1193 11 12 12.1193 12 13.5C12 14.8807 13.1193 16 14.5 16C15.8807 16 17 14.8807 17 13.5C17 12.1193 15.8807 11 14.5 11Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/reader-mode.svg b/src/browser/themes/shared/zen-icons/win/reader-mode.svg
deleted file mode 100644
index 9b5bd9e2f..000000000
--- a/src/browser/themes/shared/zen-icons/win/reader-mode.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.18603 4C6.60508 4 6.05284 4.2526 5.67294 4.69212L2.36157 8.52303C2.13613 8.78548 2 9.12688 2 9.5V12.5C2 13.8807 3.11929 15 4.5 15H6.5C7.88071 15 9 13.8807 9 12.5V11H11V12.5C11 13.8807 12.1193 15 13.5 15H15.5C16.8807 15 18 13.8807 18 12.5V9.5C18 9.07146 17.8203 8.6849 17.5321 8.41155L14.3274 4.69412C13.9475 4.25341 13.3945 4 12.8126 4H12C11.7238 4 11.5 4.22386 11.5 4.5C11.5 4.77614 11.7238 5 12 5H12.8126C13.1036 5 13.3801 5.1267 13.57 5.34706L15.8571 8H12.5C11.6716 8 11 8.67157 11 9.5V10H9V9.5C9 8.67157 8.32843 8 7.5 8H4.13547L6.42948 5.34606C6.61943 5.1263 6.89555 5 7.18603 5H7.99985C8.276 5 8.49985 4.77614 8.49985 4.5C8.49985 4.22386 8.276 4 7.99985 4H7.18603ZM8 9.5V12.5C8 13.3284 7.32843 14 6.5 14H4.5C3.67157 14 3 13.3284 3 12.5V9.5C3 9.22386 3.22386 9 3.5 9H7.5C7.77614 9 8 9.22386 8 9.5ZM12 12.5V9.5C12 9.22386 12.2239 9 12.5 9H16.5C16.62 9 16.7302 9.04229 16.8163 9.11278L16.8713 9.17647L16.877 9.17153C16.9536 9.25939 17 9.37427 17 9.5V12.5C17 13.3284 16.3284 14 15.5 14H13.5C12.6716 14 12 13.3284 12 12.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/reload-to-stop.svg b/src/browser/themes/shared/zen-icons/win/reload-to-stop.svg
deleted file mode 100644
index 610701ad9..000000000
--- a/src/browser/themes/shared/zen-icons/win/reload-to-stop.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.08859 4.21569L4.14645 4.14645C4.32001 3.97288 4.58944 3.9536 4.78431 4.08859L4.85355 4.14645L10 9.293L15.1464 4.14645C15.32 3.97288 15.5894 3.9536 15.7843 4.08859L15.8536 4.14645C16.0271 4.32001 16.0464 4.58944 15.9114 4.78431L15.8536 4.85355L10.707 10L15.8536 15.1464C16.0271 15.32 16.0464 15.5894 15.9114 15.7843L15.8536 15.8536C15.68 16.0271 15.4106 16.0464 15.2157 15.9114L15.1464 15.8536L10 10.707L4.85355 15.8536C4.67999 16.0271 4.41056 16.0464 4.21569 15.9114L4.14645 15.8536C3.97288 15.68 3.9536 15.4106 4.08859 15.2157L4.14645 15.1464L9.293 10L4.14645 4.85355C3.97288 4.67999 3.9536 4.41056 4.08859 4.21569L4.14645 4.14645L4.08859 4.21569Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/reload.svg b/src/browser/themes/shared/zen-icons/win/reload.svg
deleted file mode 100644
index 5fb5b4ae8..000000000
--- a/src/browser/themes/shared/zen-icons/win/reload.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 10C4 6.68629 6.68629 4 10 4C11.7766 4 13.3732 4.77191 14.4723 6H12.5C12.2239 6 12 6.22386 12 6.5C12 6.77614 12.2239 7 12.5 7H15.5C15.7761 7 16 6.77614 16 6.5V3.5C16 3.22386 15.7761 3 15.5 3C15.2239 3 15 3.22386 15 3.5V5.10109C13.7299 3.80499 11.9591 3 10 3C6.13401 3 3 6.13401 3 10C3 13.866 6.13401 17 10 17C13.866 17 17 13.866 17 10C17 9.8191 16.9931 9.6397 16.9796 9.46207C16.9587 9.18673 16.7185 8.98049 16.4431 9.00144C16.1678 9.02239 15.9615 9.26258 15.9825 9.53793C15.9941 9.69034 16 9.84443 16 10C16 13.3137 13.3137 16 10 16C6.68629 16 4 13.3137 4 10Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/report.svg b/src/browser/themes/shared/zen-icons/win/report.svg
deleted file mode 100644
index 6bbc3ba0b..000000000
--- a/src/browser/themes/shared/zen-icons/win/report.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 13H16.5C16.8993 13 17.1375 12.5549 16.916 12.2226L14.1009 8L16.916 3.77735C17.1375 3.44507 16.8993 3 16.5 3H4.5C4.22386 3 4 3.22386 4 3.5V17.5C4 17.7761 4.22386 18 4.5 18C4.77614 18 5 17.7761 5 17.5V13ZM5 12V4H15.5657L13.084 7.72265C12.972 7.8906 12.972 8.1094 13.084 8.27735L15.5657 12H5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/save.svg b/src/browser/themes/shared/zen-icons/win/save.svg
deleted file mode 100644
index 98cdb9736..000000000
--- a/src/browser/themes/shared/zen-icons/win/save.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5C3 3.89543 3.89543 3 5 3H13.3787C13.9091 3 14.4178 3.21071 14.7929 3.58579L16.4142 5.20711C16.7893 5.58218 17 6.09089 17 6.62132V15C17 16.1046 16.1046 17 15 17H5C3.89543 17 3 16.1046 3 15V5ZM5 4C4.44772 4 4 4.44772 4 5V15C4 15.5523 4.44772 16 5 16L5 11.5C5 10.6716 5.67157 10 6.5 10H13.5C14.3284 10 15 10.6716 15 11.5V16C15.5523 16 16 15.5523 16 15V6.62132C16 6.3561 15.8946 6.10175 15.7071 5.91421L14.0858 4.29289C13.8983 4.10536 13.6439 4 13.3787 4L13 4V6.5C13 7.32843 12.3284 8 11.5 8L7.5 8C6.67157 8 6 7.32843 6 6.5L6 4H5ZM7 4L7 6.5C7 6.77614 7.22386 7 7.5 7L11.5 7C11.7761 7 12 6.77614 12 6.5V4L7 4ZM14 16V11.5C14 11.2239 13.7761 11 13.5 11H6.5C6.22386 11 6 11.2239 6 11.5V16H14Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/screen-blocked.svg b/src/browser/themes/shared/zen-icons/win/screen-blocked.svg
deleted file mode 100644
index 1b113373b..000000000
--- a/src/browser/themes/shared/zen-icons/win/screen-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2C14.4183 2 18 5.58172 18 10ZM17 10C17 8.24696 16.3556 6.64442 15.2907 5.41636L5.41636 15.2907C6.64442 16.3556 8.24696 17 10 17C13.866 17 17 13.866 17 10ZM4.70925 14.5836L14.5836 4.70925C13.3556 3.6444 11.753 3 10 3C6.13401 3 3 6.13401 3 10C3 11.753 3.6444 13.3556 4.70925 14.5836Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/screen.svg b/src/browser/themes/shared/zen-icons/win/screen.svg
deleted file mode 100644
index 0fd4a1d5b..000000000
--- a/src/browser/themes/shared/zen-icons/win/screen.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 7C2 5.34315 3.34315 4 5 4H15C16.6569 4 18 5.34315 18 7V13C18 14.6569 16.6569 16 15 16H5C3.34315 16 2 14.6569 2 13V7ZM5 5C3.89543 5 3 5.89543 3 7V13C3 14.1046 3.89543 15 5 15H15C16.1046 15 17 14.1046 17 13V7C17 5.89543 16.1046 5 15 5H5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/screenshot.svg b/src/browser/themes/shared/zen-icons/win/screenshot.svg
deleted file mode 100644
index 57beb3728..000000000
--- a/src/browser/themes/shared/zen-icons/win/screenshot.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5.75C3 4.23122 4.23122 3 5.75 3H14.25C15.7688 3 17 4.23122 17 5.75V14.25C17 15.7688 15.7688 17 14.25 17H5.75C4.23122 17 3 15.7688 3 14.25V5.75ZM5.75 4C4.7835 4 4 4.7835 4 5.75V14.25C4 15.2165 4.7835 16 5.75 16H14.25C15.2165 16 16 15.2165 16 14.25V5.75C16 4.7835 15.2165 4 14.25 4H5.75ZM6.5 6C6.22386 6 6 6.22386 6 6.5V8.5C6 8.77614 5.77614 9 5.5 9C5.22386 9 5 8.77614 5 8.5V6.5C5 5.67157 5.67157 5 6.5 5H8.5C8.77614 5 9 5.22386 9 5.5C9 5.77614 8.77614 6 8.5 6H6.5ZM6 13.5C6 13.7761 6.22386 14 6.5 14H8.5C8.77614 14 9 14.2239 9 14.5C9 14.7761 8.77614 15 8.5 15H6.5C5.67157 15 5 14.3284 5 13.5V11.5C5 11.2239 5.22386 11 5.5 11C5.77614 11 6 11.2239 6 11.5V13.5ZM13.5 6C13.7761 6 14 6.22386 14 6.5V8.5C14 8.77614 14.2239 9 14.5 9C14.7761 9 15 8.77614 15 8.5V6.5C15 5.67157 14.3284 5 13.5 5H11.5C11.2239 5 11 5.22386 11 5.5C11 5.77614 11.2239 6 11.5 6H13.5ZM14 13.5C14 13.7761 13.7761 14 13.5 14H11.5C11.2239 14 11 14.2239 11 14.5C11 14.7761 11.2239 15 11.5 15H13.5C14.3284 15 15 14.3284 15 13.5V11.5C15 11.2239 14.7761 11 14.5 11C14.2239 11 14 11.2239 14 11.5V13.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/search-glass.svg b/src/browser/themes/shared/zen-icons/win/search-glass.svg
deleted file mode 100644
index 0276bf0f6..000000000
--- a/src/browser/themes/shared/zen-icons/win/search-glass.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 3C11.5376 3 14 5.46243 14 8.5C14 9.83879 13.5217 11.0659 12.7266 12.0196L16.8536 16.1464C17.0488 16.3417 17.0488 16.6583 16.8536 16.8536C16.68 17.0271 16.4106 17.0464 16.2157 16.9114L16.1464 16.8536L12.0196 12.7266C11.0659 13.5217 9.83879 14 8.5 14C5.46243 14 3 11.5376 3 8.5C3 5.46243 5.46243 3 8.5 3ZM8.5 4C6.01472 4 4 6.01472 4 8.5C4 10.9853 6.01472 13 8.5 13C10.9853 13 13 10.9853 13 8.5C13 6.01472 10.9853 4 8.5 4Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/search-page.svg b/src/browser/themes/shared/zen-icons/win/search-page.svg
deleted file mode 100644
index 56f962ce1..000000000
--- a/src/browser/themes/shared/zen-icons/win/search-page.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.75 3H14.25C15.7688 3 17 4.23122 17 5.75V14.25C17 15.7688 15.7688 17 14.25 17H10.1213L9.12132 16H14.25C15.2165 16 16 15.2165 16 14.25V5.75C16 4.7835 15.2165 4 14.25 4H5.75C4.7835 4 4 4.7835 4 5.75V9.02746C3.65327 9.06579 3.31841 9.14352 3 9.25606V5.75C3 4.23122 4.23122 3 5.75 3ZM9.5 14C9.22386 14 9 13.7761 9 13.5C9 13.2239 9.22386 13 9.5 13H13.5C13.7761 13 14 13.2239 14 13.5C14 13.7761 13.7761 14 13.5 14H9.5ZM7.5 7.25C7.5 7.66421 7.16421 8 6.75 8C6.33579 8 6 7.66421 6 7.25C6 6.83579 6.33579 6.5 6.75 6.5C7.16421 6.5 7.5 6.83579 7.5 7.25ZM9.5 7C9.22386 7 9 7.22386 9 7.5C9 7.77614 9.22386 8 9.5 8H13.5C13.7761 8 14 7.77614 14 7.5C14 7.22386 13.7761 7 13.5 7H9.5ZM9.5 10C9.22386 10 9 10.2239 9 10.5C9 10.7761 9.22386 11 9.5 11H13.5C13.7761 11 14 10.7761 14 10.5C14 10.2239 13.7761 10 13.5 10H9.5ZM4.5 17C5.2862 17 6.01185 16.7408 6.59615 16.3031L9.14644 18.8535C9.3417 19.0488 9.65828 19.0488 9.85355 18.8535C10.0488 18.6583 10.0488 18.3417 9.85356 18.1464L7.30324 15.596C7.74082 15.0117 8 14.2861 8 13.5C8 11.567 6.433 10 4.5 10C2.567 10 1 11.567 1 13.5C1 15.433 2.567 17 4.5 17ZM4.5 16C3.11929 16 2 14.8807 2 13.5C2 12.1193 3.11929 11 4.5 11C5.88071 11 7 12.1193 7 13.5C7 14.8807 5.88071 16 4.5 16Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/security-broken.svg b/src/browser/themes/shared/zen-icons/win/security-broken.svg
deleted file mode 100644
index 05db52f90..000000000
--- a/src/browser/themes/shared/zen-icons/win/security-broken.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.85355 7.14645C7.65829 6.95118 7.34171 6.95118 7.14645 7.14645C6.95118 7.34171 6.95118 7.65829 7.14645 7.85355L9.29289 10L7.14645 12.1464C6.95118 12.3417 6.95118 12.6583 7.14645 12.8536C7.34171 13.0488 7.65829 13.0488 7.85355 12.8536L10 10.7071L12.1464 12.8536C12.3417 13.0488 12.6583 13.0488 12.8536 12.8536C13.0488 12.6583 13.0488 12.3417 12.8536 12.1464L10.7071 10L12.8536 7.85355C13.0488 7.65829 13.0488 7.34171 12.8536 7.14645C12.6583 6.95118 12.3417 6.95118 12.1464 7.14645L10 9.29289L7.85355 7.14645ZM10.2774 2.08397C10.1094 1.97201 9.8906 1.97201 9.72265 2.08397C7.78446 3.3761 5.68833 4.1823 3.42929 4.50503C3.18296 4.54021 3 4.75117 3 5V9.5C3 13.3913 5.30699 16.2307 9.82051 17.9667C9.93605 18.0111 10.064 18.0111 10.1795 17.9667C14.693 16.2307 17 13.3913 17 9.5V5C17 4.75117 16.817 4.54021 16.5707 4.50503C14.3117 4.1823 12.2155 3.3761 10.2774 2.08397ZM4 5.42787C5.98541 5.09055 7.85275 4.39606 9.59914 3.34583L10 3.09715L10.4009 3.34583C12.1473 4.39606 14.0146 5.09055 16 5.42787V9.5C16 12.892 14.0321 15.3634 10 16.9632C5.96795 15.3634 4 12.892 4 9.5V5.42787Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/security-warning.svg b/src/browser/themes/shared/zen-icons/win/security-warning.svg
deleted file mode 100644
index 4526702e3..000000000
--- a/src/browser/themes/shared/zen-icons/win/security-warning.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 6C10.2761 6 10.5 6.22386 10.5 6.5V11.5C10.5 11.7761 10.2761 12 10 12C9.72386 12 9.5 11.7761 9.5 11.5V6.5C9.5 6.22386 9.72386 6 10 6ZM10 14.5C10.4142 14.5 10.75 14.1642 10.75 13.75C10.75 13.3358 10.4142 13 10 13C9.58579 13 9.25 13.3358 9.25 13.75C9.25 14.1642 9.58579 14.5 10 14.5ZM9.72265 2.08397C9.8906 1.97201 10.1094 1.97201 10.2774 2.08397C12.2155 3.3761 14.3117 4.1823 16.5707 4.50503C16.817 4.54021 17 4.75117 17 5V9.5C17 13.3913 14.693 16.2307 10.1795 17.9667C10.064 18.0111 9.93604 18.0111 9.82051 17.9667C5.30699 16.2307 3 13.3913 3 9.5V5C3 4.75117 3.18297 4.54021 3.42929 4.50503C5.68833 4.1823 7.78446 3.3761 9.72265 2.08397ZM9.59914 3.34583C7.85275 4.39606 5.98541 5.09055 4 5.42787V9.5C4 12.892 5.96795 15.3634 10 16.9632C14.0321 15.3634 16 12.892 16 9.5V5.42787C14.0146 5.09055 12.1473 4.39606 10.4009 3.34583L10 3.09715L9.59914 3.34583Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/security.svg b/src/browser/themes/shared/zen-icons/win/security.svg
deleted file mode 100644
index 1b0ad62aa..000000000
--- a/src/browser/themes/shared/zen-icons/win/security.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.72265 2.08397C9.8906 1.97201 10.1094 1.97201 10.2774 2.08397C12.2155 3.3761 14.3117 4.1823 16.5707 4.50503C16.817 4.54021 17 4.75117 17 5V9.5C17 13.3913 14.693 16.2307 10.1795 17.9667C10.064 18.0111 9.93605 18.0111 9.82051 17.9667C5.30699 16.2307 3 13.3913 3 9.5V5C3 4.75117 3.18296 4.54021 3.42929 4.50503C5.68833 4.1823 7.78446 3.3761 9.72265 2.08397ZM9.59914 3.34583C7.85275 4.39606 5.98541 5.09055 4 5.42787V9.5C4 12.892 5.96795 15.3634 10 16.9632C14.0321 15.3634 16 12.892 16 9.5V5.42787C14.0146 5.09055 12.1473 4.39606 10.4009 3.34583L10 3.09715L9.59914 3.34583Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/send-to-device.svg b/src/browser/themes/shared/zen-icons/win/send-to-device.svg
deleted file mode 100644
index bf1d8760b..000000000
--- a/src/browser/themes/shared/zen-icons/win/send-to-device.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.65849 4.94595C3.91717 3.80773 4.92907 3 6.09632 3H13.9034C15.0707 3 16.0826 3.80773 16.3412 4.94595L17.9321 11.9459C18.2877 13.5104 17.0986 15 15.4943 15H8.99996V14H15.4943C16.4569 14 17.1703 13.1062 16.957 12.1676L15.3661 5.16757C15.2109 4.48464 14.6038 4 13.9034 4H6.09632C5.39597 4 4.78883 4.48464 4.63362 5.16757L4.21716 7H3.49996C3.39406 7 3.2897 7.00659 3.18726 7.01937L3.65849 4.94595ZM8.94995 17H14.5C14.7761 17 15 16.7761 15 16.5C15 16.2239 14.7761 16 14.5 16H8.99996V16.5C8.99996 16.6712 8.98275 16.8384 8.94995 17ZM5 12C5.55228 12 6 11.5523 6 11C6 10.4477 5.55228 10 5 10C4.44772 10 4 10.4477 4 11C4 11.5523 4.44772 12 5 12ZM2 9.5C2 8.67157 2.67157 8 3.5 8H6.5C7.32843 8 8 8.67157 8 9.5V16.5C8 17.3284 7.32843 18 6.5 18H3.5C2.67157 18 2 17.3284 2 16.5V9.5ZM3.5 9C3.22386 9 3 9.22386 3 9.5V16.5C3 16.7761 3.22386 17 3.5 17H6.5C6.77614 17 7 16.7761 7 16.5V9.5C7 9.22386 6.77614 9 6.5 9H3.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/settings.svg b/src/browser/themes/shared/zen-icons/win/settings.svg
deleted file mode 100644
index 7a33ac655..000000000
--- a/src/browser/themes/shared/zen-icons/win/settings.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.91073 7.38266C2.28002 6.24053 2.88837 5.19213 3.69107 4.30364C3.82681 4.15339 4.03977 4.09984 4.23043 4.16802L6.14871 4.85392C6.66879 5.03977 7.24105 4.76883 7.42691 4.24875C7.44518 4.19762 7.45926 4.14507 7.46899 4.09173L7.83445 2.08573C7.87079 1.88627 8.02396 1.7285 8.22226 1.6863C8.80245 1.5628 9.39733 1.5 10 1.5C10.6023 1.5 11.1968 1.56273 11.7767 1.68607C11.9749 1.72824 12.1281 1.88591 12.1645 2.08529L12.531 4.09165C12.6301 4.63497 13.1509 4.9951 13.6942 4.89601C13.7476 4.88627 13.8001 4.87219 13.8512 4.85395L15.7696 4.16802C15.9602 4.09984 16.1732 4.15339 16.3089 4.30364C17.1116 5.19213 17.72 6.24053 18.0893 7.38266C18.1516 7.57534 18.0915 7.78658 17.9371 7.91764L16.3823 9.23773C15.9613 9.5952 15.9098 10.2263 16.2673 10.6473C16.3024 10.6887 16.3409 10.7271 16.3823 10.7623L17.9371 12.0824C18.0915 12.2134 18.1516 12.4247 18.0893 12.6173C17.72 13.7595 17.1116 14.8079 16.3089 15.6964C16.1732 15.8466 15.9602 15.9002 15.7696 15.832L13.8513 15.1461C13.3312 14.9602 12.7589 15.2312 12.5731 15.7512C12.5548 15.8024 12.5407 15.8549 12.531 15.9085L12.1645 17.9147C12.1281 18.1141 11.9749 18.2718 11.7767 18.3139C11.1968 18.4373 10.6023 18.5 10 18.5C9.39733 18.5 8.80245 18.4372 8.22226 18.3137C8.02396 18.2715 7.87079 18.1137 7.83445 17.9143L7.469 15.9084C7.36992 15.365 6.84914 15.0049 6.30582 15.104C6.2524 15.1137 6.19985 15.1278 6.1488 15.1461L4.23043 15.832C4.03977 15.9002 3.82681 15.8466 3.69107 15.6964C2.88837 14.8079 2.28002 13.7595 1.91073 12.6173C1.84843 12.4247 1.90851 12.2134 2.06288 12.0824L3.61772 10.7623C4.03871 10.4048 4.0902 9.77373 3.73273 9.35274C3.69758 9.31135 3.65911 9.27288 3.61774 9.23775L2.06288 7.91764C1.90851 7.78658 1.84843 7.57534 1.91073 7.38266ZM2.97128 7.37709L4.26498 8.47546C4.34777 8.54576 4.4247 8.62269 4.495 8.70548C5.20994 9.54746 5.10696 10.8096 4.26495 11.5246L2.97128 12.6229C3.26333 13.4051 3.68478 14.1322 4.21622 14.7751L5.8122 14.2044C5.91448 14.1679 6.01956 14.1397 6.12641 14.1202C7.21306 13.922 8.25461 14.6423 8.45279 15.729L8.75676 17.3975C9.16463 17.4655 9.57999 17.5 10 17.5C10.4197 17.5 10.8348 17.4656 11.2424 17.3976L11.5472 15.7289C11.5667 15.6221 11.5949 15.517 11.6314 15.4147C12.0031 14.3746 13.1477 13.8327 14.1879 14.2044L15.7838 14.7751C16.3152 14.1322 16.7367 13.4051 17.0287 12.6229L15.735 11.5245C15.6522 11.4542 15.5753 11.3773 15.505 11.2945C14.7901 10.4525 14.893 9.1904 15.735 8.47544L17.0287 7.37709C16.7367 6.59486 16.3152 5.86783 15.7838 5.22494L14.1878 5.79559C14.0855 5.83214 13.9804 5.8603 13.8736 5.87979C12.7869 6.07796 11.7454 5.3577 11.5472 4.27119L11.2424 2.60235C10.8348 2.53443 10.4197 2.5 10 2.5C9.57999 2.5 9.16463 2.53448 8.75676 2.60249L8.45278 4.27105C8.43329 4.37791 8.40514 4.48299 8.36859 4.58527C7.99688 5.62542 6.85235 6.1673 5.81211 5.79556L4.21622 5.22494C3.68478 5.86783 3.26333 6.59486 2.97128 7.37709ZM7.5 10C7.5 8.61929 8.61929 7.5 10 7.5C11.3807 7.5 12.5 8.61929 12.5 10C12.5 11.3807 11.3807 12.5 10 12.5C8.61929 12.5 7.5 11.3807 7.5 10ZM8.5 10C8.5 10.8284 9.17157 11.5 10 11.5C10.8284 11.5 11.5 10.8284 11.5 10C11.5 9.17157 10.8284 8.5 10 8.5C9.17157 8.5 8.5 9.17157 8.5 10Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/share.svg b/src/browser/themes/shared/zen-icons/win/share.svg
deleted file mode 100644
index 145a304fa..000000000
--- a/src/browser/themes/shared/zen-icons/win/share.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3298 12.8377L17.8269 8.41512L17.8841 8.34968C18.0558 8.12058 18.0367 7.78916 17.8268 7.58283L13.3297 3.16165L13.268 3.10864C12.9078 2.83964 12.3776 3.09805 12.3776 3.57782V5.70757L12.153 5.72268C8.59039 6.00547 6.50344 8.25989 6.00472 12.3501C5.94067 12.8754 6.54318 13.2042 6.93261 12.8564C8.36448 11.5779 9.84382 10.784 11.3776 10.4657C11.6236 10.4147 11.871 10.3759 12.1199 10.3493L12.3776 10.3261V12.4216L12.3829 12.5039C12.4429 12.9566 12.992 13.1699 13.3298 12.8377ZM12.2263 6.72L13.3776 6.64256V4.61104L16.8238 7.99905L13.3776 11.3882V9.23223L12.022 9.35403L12.0136 9.35493C10.3113 9.53692 8.70337 10.2189 7.18674 11.3555C7.48493 10.0174 7.99417 9.01008 8.6632 8.28852C9.49235 7.39426 10.6526 6.84605 12.2263 6.72ZM5.5 4C4.11929 4 3 5.11929 3 6.5V14.5C3 15.8807 4.11929 17 5.5 17H13.5C14.8807 17 16 15.8807 16 14.5V13.5C16 13.2239 15.7761 13 15.5 13C15.2239 13 15 13.2239 15 13.5V14.5C15 15.3284 14.3284 16 13.5 16H5.5C4.67157 16 4 15.3284 4 14.5V6.5C4 5.67157 4.67157 5 5.5 5H8.5C8.77614 5 9 4.77614 9 4.5C9 4.22386 8.77614 4 8.5 4H5.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/sidebar.svg b/src/browser/themes/shared/zen-icons/win/sidebar.svg
deleted file mode 100644
index 30ae938f9..000000000
--- a/src/browser/themes/shared/zen-icons/win/sidebar.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.58988 6.99194C6.82312 6.94961 7 6.74546 7 6.5C7 6.22386 6.77614 6 6.5 6H4.5L4.41012 6.00806C4.17688 6.05039 4 6.25454 4 6.5C4 6.77614 4.22386 7 4.5 7H6.5L6.58988 6.99194ZM6.58988 9.99194C6.82312 9.94961 7 9.74546 7 9.5C7 9.22386 6.77614 9 6.5 9H4.5L4.41012 9.00806C4.17688 9.05039 4 9.25454 4 9.5C4 9.77614 4.22386 10 4.5 10H6.5L6.58988 9.99194ZM6.58988 12.9919C6.82312 12.9496 7 12.7455 7 12.5C7 12.2239 6.77614 12 6.5 12H4.5L4.41012 12.0081C4.17688 12.0504 4 12.2545 4 12.5C4 12.7761 4.22386 13 4.5 13H6.5L6.58988 12.9919ZM5 3C3.34315 3 2 4.34315 2 6V13C2 14.6569 3.34315 16 5 16H15C16.6569 16 18 14.6569 18 13V6C18 4.34315 16.6569 3 15 3H5ZM15 15H9V4H15C16.1046 4 17 4.89543 17 6V13C17 14.1046 16.1046 15 15 15ZM5 4H8V15H5C3.89543 15 3 14.1046 3 13V6C3 4.89543 3.89543 4 5 4Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/sidebars-right.svg b/src/browser/themes/shared/zen-icons/win/sidebars-right.svg
deleted file mode 100644
index b9b6776d6..000000000
--- a/src/browser/themes/shared/zen-icons/win/sidebars-right.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.4101 6.99194C13.1769 6.94961 13 6.74546 13 6.5C13 6.22386 13.2239 6 13.5 6H15.5L15.5899 6.00806C15.8231 6.05039 16 6.25454 16 6.5C16 6.77614 15.7761 7 15.5 7H13.5L13.4101 6.99194ZM13.4101 9.99194C13.1769 9.94961 13 9.74546 13 9.5C13 9.22386 13.2239 9 13.5 9H15.5L15.5899 9.00806C15.8231 9.05039 16 9.25454 16 9.5C16 9.77614 15.7761 10 15.5 10H13.5L13.4101 9.99194ZM13.4101 12.9919C13.1769 12.9496 13 12.7455 13 12.5C13 12.2239 13.2239 12 13.5 12H15.5L15.5899 12.0081C15.8231 12.0504 16 12.2545 16 12.5C16 12.7761 15.7761 13 15.5 13H13.5L13.4101 12.9919ZM15 3C16.6569 3 18 4.34315 18 6V13C18 14.6569 16.6569 16 15 16H5C3.34315 16 2 14.6569 2 13V6C2 4.34315 3.34315 3 5 3H15ZM5 15H11V4H5C3.89543 4 3 4.89543 3 6V13C3 14.1046 3.89543 15 5 15ZM15 4H12V15H15C16.1046 15 17 14.1046 17 13V6C17 4.89543 16.1046 4 15 4Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/source-code.svg b/src/browser/themes/shared/zen-icons/win/source-code.svg
deleted file mode 100644
index f7d10c8f3..000000000
--- a/src/browser/themes/shared/zen-icons/win/source-code.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9667 3.67962C13.0658 3.42189 12.9372 3.13259 12.6795 3.03346C12.4218 2.93433 12.1325 3.06291 12.0333 3.32065L7.03334 16.3206C6.93421 16.5784 7.06279 16.8677 7.32052 16.9668C7.57826 17.0659 7.86756 16.9374 7.96669 16.6796L12.9667 3.67962ZM5.8254 6.1205C6.03506 6.30021 6.05934 6.61586 5.87963 6.82553L3.15854 10.0001L5.87963 13.1747C6.05934 13.3844 6.03506 13.7 5.8254 13.8798C5.61573 14.0595 5.30008 14.0352 5.12037 13.8255L2.12037 10.3255C1.95988 10.1383 1.95988 9.86198 2.12037 9.67474L5.12037 6.17474C5.30008 5.96507 5.61573 5.94079 5.8254 6.1205ZM14.1746 14.3797C13.9649 14.2 13.9407 13.8844 14.1204 13.6747L16.8415 10.5001L14.1204 7.32551C13.9407 7.11585 13.9649 6.8002 14.1746 6.62048C14.3843 6.44077 14.6999 6.46505 14.8796 6.67472L17.8796 10.1747C18.0401 10.362 18.0401 10.6383 17.8796 10.8255L14.8796 14.3255C14.6999 14.5352 14.3843 14.5595 14.1746 14.3797Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/spell-check.svg b/src/browser/themes/shared/zen-icons/win/spell-check.svg
deleted file mode 100644
index 2b5aa112b..000000000
--- a/src/browser/themes/shared/zen-icons/win/spell-check.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.5 5C2.22386 5 2 5.22386 2 5.5C2 5.77614 2.22386 6 2.5 6H17.5C17.7761 6 18 5.77614 18 5.5C18 5.22386 17.7761 5 17.5 5H2.5ZM2.5 8C2.22386 8 2 8.22386 2 8.5C2 8.77614 2.22386 9 2.5 9H11.5C11.7761 9 12 8.77614 12 8.5C12 8.22386 11.7761 8 11.5 8H2.5ZM2.5 11C2.22386 11 2 11.2239 2 11.5C2 11.7761 2.22386 12 2.5 12H9.38312C9.14997 11.7346 9.01013 11.3871 9.01013 11.0101L9.01017 11H2.5ZM2.5 14H8.87729L7.8764 15H2.5C2.22386 15 2 14.7761 2 14.5C2 14.2239 2.22386 14 2.5 14ZM14 7C14.2525 7 14.4654 7.18829 14.4963 7.43892L14.5937 8.23046C14.7338 9.36907 15.6309 10.2662 16.7695 10.4063L17.5611 10.5037C17.8117 10.5346 18 10.7475 18 11C18 11.2525 17.8117 11.4654 17.5611 11.4963L16.7695 11.5937C15.6309 11.7338 14.7338 12.6309 14.5937 13.7695L14.4963 14.5611C14.4654 14.8117 14.2525 15 14 15C13.7475 15 13.5346 14.8117 13.5037 14.5611L13.4063 13.7695C13.2662 12.6309 12.3691 11.7338 11.2305 11.5937L10.4389 11.4963C10.1883 11.4654 10 11.2525 10 11C10 10.7475 10.1883 10.5346 10.4389 10.5037L11.2305 10.4063C12.3691 10.2662 13.2662 9.36907 13.4063 8.23046L13.5037 7.43892C13.5346 7.18829 13.7475 7 14 7ZM14 9.59736C13.6776 10.1897 13.1897 10.6776 12.5974 11C13.1897 11.3224 13.6776 11.8103 14 12.4026C14.3224 11.8103 14.8103 11.3224 15.4026 11C14.8103 10.6776 14.3224 10.1897 14 9.59736ZM11.853 13.1466C12.0482 13.3419 12.0481 13.6585 11.8528 13.8537L7.85343 17.8501C7.65809 18.0453 7.34151 18.0452 7.14632 17.8499C6.95113 17.6545 6.95124 17.338 7.14657 17.1428L11.1459 13.1463C11.3413 12.9511 11.6579 12.9512 11.853 13.1466Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/split.svg b/src/browser/themes/shared/zen-icons/win/split.svg
deleted file mode 100644
index 35301d829..000000000
--- a/src/browser/themes/shared/zen-icons/win/split.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 2.5C10 2.22386 9.77614 2 9.5 2C9.22386 2 9 2.22386 9 2.5V17.5C9 17.7761 9.22386 18 9.5 18C9.77614 18 10 17.7761 10 17.5V2.5ZM4 4C2.89543 4 2 4.89543 2 6V14C2 15.1046 2.89543 16 4 16H8V15H4C3.44772 15 3 14.5523 3 14V6C3 5.44772 3.44772 5 4 5H8V4H4ZM11 4V5H15C15.5523 5 16 5.44772 16 6V14C16 14.5523 15.5523 15 15 15H11V16H15C16.1046 16 17 15.1046 17 14V6C17 4.89543 16.1046 4 15 4H11Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/stop-to-reload.svg b/src/browser/themes/shared/zen-icons/win/stop-to-reload.svg
deleted file mode 100644
index 610701ad9..000000000
--- a/src/browser/themes/shared/zen-icons/win/stop-to-reload.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.08859 4.21569L4.14645 4.14645C4.32001 3.97288 4.58944 3.9536 4.78431 4.08859L4.85355 4.14645L10 9.293L15.1464 4.14645C15.32 3.97288 15.5894 3.9536 15.7843 4.08859L15.8536 4.14645C16.0271 4.32001 16.0464 4.58944 15.9114 4.78431L15.8536 4.85355L10.707 10L15.8536 15.1464C16.0271 15.32 16.0464 15.5894 15.9114 15.7843L15.8536 15.8536C15.68 16.0271 15.4106 16.0464 15.2157 15.9114L15.1464 15.8536L10 10.707L4.85355 15.8536C4.67999 16.0271 4.41056 16.0464 4.21569 15.9114L4.14645 15.8536C3.97288 15.68 3.9536 15.4106 4.08859 15.2157L4.14645 15.1464L9.293 10L4.14645 4.85355C3.97288 4.67999 3.9536 4.41056 4.08859 4.21569L4.14645 4.14645L4.08859 4.21569Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/tab-audio-blocked-small.svg b/src/browser/themes/shared/zen-icons/win/tab-audio-blocked-small.svg
deleted file mode 100644
index e3aef5a93..000000000
--- a/src/browser/themes/shared/zen-icons/win/tab-audio-blocked-small.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.9971 3.00588C11.9971 2.13286 10.9568 1.67903 10.3168 2.27288L6.44467 5.86626C6.3522 5.95208 6.23071 5.99976 6.10456 5.99976H3.49707C2.66864 5.99976 1.99707 6.67134 1.99707 7.49976V12.4998C1.99707 13.3282 2.66864 13.9998 3.49707 13.9998H6.10456C6.23071 13.9998 6.3522 14.0474 6.44467 14.1333L10.3168 17.7266C10.9568 18.3205 11.9971 17.8667 11.9971 16.9936V3.00588ZM7.1249 6.59927L10.9971 3.00588V16.9936L7.1249 13.4003C6.84749 13.1428 6.48302 12.9998 6.10456 12.9998H3.49707C3.22093 12.9998 2.99707 12.7759 2.99707 12.4998V7.49976C2.99707 7.22362 3.22093 6.99976 3.49707 6.99976H6.10456C6.48302 6.99976 6.84749 6.8567 7.1249 6.59927ZM13.1435 7.64622C13.3388 7.45096 13.6554 7.45096 13.8506 7.64622L15.4971 9.29267L17.1435 7.64622C17.3388 7.45096 17.6554 7.45096 17.8506 7.64622C18.0459 7.84148 18.0459 8.15806 17.8506 8.35333L16.2042 9.99977L17.8506 11.6462C18.0459 11.8415 18.0459 12.1581 17.8506 12.3533C17.6554 12.5486 17.3388 12.5486 17.1435 12.3533L15.4971 10.7069L13.8506 12.3533C13.6554 12.5486 13.3388 12.5486 13.1435 12.3533C12.9483 12.1581 12.9483 11.8415 13.1435 11.6462L14.79 9.99977L13.1435 8.35333C12.9483 8.15806 12.9483 7.84148 13.1435 7.64622Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/tab-audio-muted-small.svg b/src/browser/themes/shared/zen-icons/win/tab-audio-muted-small.svg
deleted file mode 100644
index 46aa4baf8..000000000
--- a/src/browser/themes/shared/zen-icons/win/tab-audio-muted-small.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.85355 2.14645C2.65829 1.95118 2.34171 1.95118 2.14645 2.14645C1.95118 2.34171 1.95118 2.65829 2.14645 2.85355L5.29289 5.99999H3.49707C2.66864 5.99999 1.99707 6.67157 1.99707 7.49999V12.5C1.99707 13.3284 2.66864 14 3.49707 14H6.10456C6.23071 14 6.3522 14.0477 6.44467 14.1335L10.3168 17.7269C10.9568 18.3207 11.9971 17.8669 11.9971 16.9939V12.7042L17.1464 17.8536C17.3417 18.0488 17.6583 18.0488 17.8536 17.8536C18.0488 17.6583 18.0488 17.3417 17.8536 17.1464L15.2908 14.5837C15.2908 14.5837 15.2908 14.5837 15.2908 14.5837L2.85355 2.14645ZM10.9971 11.7042V16.9939L7.1249 13.4005C6.84749 13.1431 6.48302 13 6.10456 13H3.49707C3.22093 13 2.99707 12.7761 2.99707 12.5V7.49999C2.99707 7.22385 3.22093 6.99999 3.49707 6.99999H6.10456C6.16425 6.99999 6.2236 6.99643 6.28232 6.98943L10.9971 11.7042ZM10.9971 3.00611V8.87572L11.9971 9.87572V3.00611C11.9971 2.13309 10.9568 1.67926 10.3168 2.27311L7.24507 5.12372L7.95267 5.83132L10.9971 3.00611ZM14.0609 11.9396L14.8028 12.6814C15.713 11.0479 15.7671 8.98893 14.7631 7.2499C14.625 7.01075 14.3192 6.92881 14.08 7.06688C13.8409 7.20496 13.759 7.51075 13.897 7.7499C14.6666 9.08286 14.6772 10.6463 14.0609 11.9396ZM15.8965 13.7751L16.6182 14.4968C18.6578 11.502 18.4393 7.43048 15.9627 4.66632C15.7785 4.46065 15.4623 4.44331 15.2567 4.62758C15.051 4.81185 15.0337 5.12796 15.2179 5.33363C17.3407 7.70288 17.5669 11.1716 15.8965 13.7751Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/tab-audio-playing-small.svg b/src/browser/themes/shared/zen-icons/win/tab-audio-playing-small.svg
deleted file mode 100644
index 2c335ca32..000000000
--- a/src/browser/themes/shared/zen-icons/win/tab-audio-playing-small.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.9971 3.00588C11.9971 2.13286 10.9568 1.67903 10.3168 2.27288L6.44467 5.86626C6.3522 5.95208 6.23071 5.99976 6.10456 5.99976H3.49707C2.66864 5.99976 1.99707 6.67134 1.99707 7.49976V12.4998C1.99707 13.3282 2.66864 13.9998 3.49707 13.9998H6.10456C6.23071 13.9998 6.3522 14.0474 6.44467 14.1333L10.3168 17.7266C10.9568 18.3205 11.9971 17.8667 11.9971 16.9936V3.00588ZM7.1249 6.59927L10.9971 3.00588V16.9936L7.1249 13.4003C6.84749 13.1428 6.48302 12.9998 6.10456 12.9998H3.49707C3.22093 12.9998 2.99707 12.7759 2.99707 12.4998V7.49976C2.99707 7.22362 3.22093 6.99976 3.49707 6.99976H6.10456C6.48302 6.99976 6.84749 6.8567 7.1249 6.59927ZM14.0814 12.933C13.8421 12.7952 13.7599 12.4894 13.8977 12.2502C14.6739 10.9026 14.7294 9.19135 13.897 7.74967C13.759 7.51052 13.8409 7.20473 14.08 7.06665C14.3192 6.92858 14.625 7.01052 14.7631 7.24967C15.7811 9.01294 15.7112 11.1052 14.7642 12.7493C14.6264 12.9886 14.3207 13.0708 14.0814 12.933Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/tab.svg b/src/browser/themes/shared/zen-icons/win/tab.svg
deleted file mode 100644
index 33910b1c5..000000000
--- a/src/browser/themes/shared/zen-icons/win/tab.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 3C6.13401 3 3 6.13401 3 10C3 13.866 6.13401 17 10 17C13.866 17 17 13.866 17 10C17 6.13401 13.866 3 10 3ZM2 10C2 5.58172 5.58172 2 10 2C14.4183 2 18 5.58172 18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/tracking-protection.svg b/src/browser/themes/shared/zen-icons/win/tracking-protection.svg
deleted file mode 100644
index 1b0ad62aa..000000000
--- a/src/browser/themes/shared/zen-icons/win/tracking-protection.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.72265 2.08397C9.8906 1.97201 10.1094 1.97201 10.2774 2.08397C12.2155 3.3761 14.3117 4.1823 16.5707 4.50503C16.817 4.54021 17 4.75117 17 5V9.5C17 13.3913 14.693 16.2307 10.1795 17.9667C10.064 18.0111 9.93605 18.0111 9.82051 17.9667C5.30699 16.2307 3 13.3913 3 9.5V5C3 4.75117 3.18296 4.54021 3.42929 4.50503C5.68833 4.1823 7.78446 3.3761 9.72265 2.08397ZM9.59914 3.34583C7.85275 4.39606 5.98541 5.09055 4 5.42787V9.5C4 12.892 5.96795 15.3634 10 16.9632C14.0321 15.3634 16 12.892 16 9.5V5.42787C14.0146 5.09055 12.1473 4.39606 10.4009 3.34583L10 3.09715L9.59914 3.34583Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/translations.svg b/src/browser/themes/shared/zen-icons/win/translations.svg
deleted file mode 100644
index 1f1250aee..000000000
--- a/src/browser/themes/shared/zen-icons/win/translations.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.07616 4.21649C4.78409 4.00914 5.77942 3.88471 6.92028 4.21664L6.92136 4.21695C7.93342 4.51387 8.48142 5.11698 8.7532 5.78501C9.00595 6.40627 9.0058 7.05477 9.0057 7.44659L9.0057 12.5C9.0057 12.7761 8.78184 13.0007 8.5057 13.0007C8.22956 13.0007 8.0057 12.7768 8.0057 12.5007V11.9672C7.69572 12.1601 7.3403 12.3547 6.9599 12.5219C6.18016 12.8646 5.22351 13.1237 4.31803 12.9356C3.14925 12.6927 2.35713 11.8259 2.07014 10.8537C1.78345 9.88255 1.98877 8.75084 2.87738 8.01176C3.8874 7.17169 5.04808 6.96529 6.08385 7.00818C6.79336 7.03755 7.46199 7.18481 8.00531 7.33317C8.0026 6.95825 7.98173 6.54236 7.82692 6.16185C7.66747 5.76992 7.35305 5.3859 6.64043 5.17668C5.72242 4.90971 4.92619 5.00953 4.35724 5.17617C4.07228 5.25963 3.84612 5.35945 3.69373 5.43678C3.6177 5.47536 3.56057 5.50808 3.52423 5.52992C3.50608 5.54083 3.49318 5.54899 3.48576 5.55378L3.4788 5.55833L3.47963 5.55776C3.25207 5.71386 2.94134 5.65588 2.78502 5.42841C2.62863 5.20082 2.68634 4.88954 2.91393 4.73315L2.91566 4.73196L2.91797 4.7304L2.92429 4.72615L2.9437 4.71344C2.95962 4.70317 2.98147 4.68941 3.00903 4.67285C3.0641 4.63974 3.14215 4.5953 3.24121 4.54503C3.439 4.44466 3.72264 4.32003 4.07616 4.21649ZM6.04249 8.00732C5.16917 7.97116 4.27958 8.14618 3.51683 8.78058C2.98777 9.22062 2.83491 9.91237 3.02922 10.5706C3.22322 11.2278 3.75127 11.7964 4.52148 11.9565C5.12729 12.0824 5.85264 11.9162 6.55757 11.6064C7.13927 11.3508 7.65814 11.0189 8.0057 10.7577V8.37278C7.44769 8.20973 6.76366 8.03718 6.04249 8.00732ZM14.4703 6.66746C14.5624 6.40715 14.4261 6.12142 14.1657 6.02928C13.9054 5.93714 13.6197 6.07347 13.5276 6.33378C13.3506 6.83371 13.1599 7.55505 13.056 7.97614C12.5635 8.00833 12.0627 8.00989 11.5326 7.97414C11.2571 7.95557 11.0186 8.16386 11.0001 8.43937C10.9815 8.71489 11.1898 8.9533 11.4653 8.97188C11.9397 9.00387 12.392 9.00816 12.8326 8.98952C12.7193 9.55955 12.6381 10.074 12.5842 10.5409C11.418 11.1184 10.6646 11.9654 10.2849 12.8418C9.84301 13.8617 9.88857 15.0059 10.5334 15.6948C10.9624 16.1523 11.5936 16.2167 12.1699 16.0841C12.5899 15.9875 13.0274 15.78 13.4474 15.4808C13.4771 15.5469 13.506 15.6144 13.5343 15.6855C13.6364 15.9421 13.9272 16.0673 14.1838 15.9652C14.4404 15.8631 14.5656 15.5723 14.4635 15.3157C14.3952 15.1442 14.312 14.9662 14.2284 14.7932C15.0204 13.9472 15.6823 12.7243 15.9123 11.1869C16.677 11.4498 17.1868 11.9846 17.4051 12.5743C17.7907 13.6153 17.3699 15.1219 15.296 16.0437C15.0436 16.1558 14.93 16.4513 15.0421 16.7037C15.1543 16.956 15.4498 17.0697 15.7021 16.9575C18.1281 15.8793 18.9573 13.886 18.3429 12.227C17.9775 11.2405 17.1386 10.479 15.9973 10.1693C15.9985 10.1134 15.999 10.0572 15.999 10.0006C15.999 9.72447 15.7752 9.50061 15.499 9.50061C15.2229 9.50061 14.999 9.72447 14.999 10.0006L14.999 10.0214C14.5732 10.0061 14.1196 10.0466 13.6445 10.1508C13.7008 9.77145 13.7753 9.35715 13.8711 8.90344C14.6095 8.8135 15.3384 8.66682 16.1118 8.48771C16.3808 8.4254 16.5483 8.1568 16.486 7.88778C16.4237 7.61876 16.1551 7.45119 15.8861 7.51349C15.2659 7.65714 14.6871 7.77648 14.1172 7.86108C14.2176 7.47771 14.3495 7.00849 14.4703 6.66746ZM11.2025 13.2393C11.4264 12.7226 11.843 12.1827 12.5004 11.7417C12.4893 12.3749 12.5399 12.9002 12.6307 13.3537C12.7266 13.833 12.8652 14.2206 13.0115 14.5583C12.6305 14.8577 12.2572 15.0379 11.9457 15.1096C11.5618 15.1979 11.3567 15.1106 11.2632 15.0111C10.9875 14.7166 10.8536 14.0445 11.2025 13.2393ZM14.9265 11.0169C14.7584 12.1671 14.3154 13.0962 13.7802 13.7803C13.715 13.5919 13.6572 13.3874 13.6112 13.1574C13.514 12.6716 13.4657 12.0551 13.5244 11.2227C13.5641 11.2079 13.6044 11.1934 13.6451 11.1792C14.1105 11.0566 14.5384 11.0074 14.9265 11.0169Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/unpin.svg b/src/browser/themes/shared/zen-icons/win/unpin.svg
deleted file mode 100644
index eaecf42c2..000000000
--- a/src/browser/themes/shared/zen-icons/win/unpin.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 10C3 9.72386 3.22386 9.5 3.5 9.5H16.5C16.7761 9.5 17 9.72386 17 10C17 10.2761 16.7761 10.5 16.5 10.5H3.5C3.22386 10.5 3 10.2761 3 10Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/video-open.svg b/src/browser/themes/shared/zen-icons/win/video-open.svg
deleted file mode 100644
index 098a3c6fd..000000000
--- a/src/browser/themes/shared/zen-icons/win/video-open.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.76512 7.07608C8.61099 6.97969 8.41669 6.97454 8.25768 7.06264C8.09867 7.15075 8 7.31821 8 7.5V12.65C8 12.8341 8.10118 13.0033 8.26337 13.0905C8.42557 13.1776 8.62252 13.1685 8.77603 13.0669L12.776 10.4185C12.9178 10.3246 13.0022 10.1651 13 9.99508C12.9978 9.82505 12.9093 9.6678 12.7651 9.57764L8.76512 7.07608ZM4.5 3C3.11929 3 2 4.11929 2 5.5V14.5C2 15.8807 3.11929 17 4.5 17H15.5C16.8807 17 18 15.8807 18 14.5V5.5C18 4.11929 16.8807 3 15.5 3H4.5ZM3 5.5C3 4.67157 3.67157 4 4.5 4H15.5C16.3284 4 17 4.67157 17 5.5V14.5C17 15.3284 16.3284 16 15.5 16H4.5C3.67157 16 3 15.3284 3 14.5V5.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/video-save.svg b/src/browser/themes/shared/zen-icons/win/video-save.svg
deleted file mode 100644
index dac667cf2..000000000
--- a/src/browser/themes/shared/zen-icons/win/video-save.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 13H12.5C12.7761 13 13 13.2239 13 13.5C13 13.7455 12.8231 13.9496 12.5899 13.9919L12.5 14H3.5C3.22386 14 3 13.7761 3 13.5C3 13.2545 3.17688 13.0504 3.41012 13.0081L3.5 13H12.5H3.5ZM7.91012 1.00806L8 1C8.24546 1 8.44961 1.17688 8.49194 1.41012L8.5 1.5V10.292L11.182 7.61091C11.3555 7.43735 11.625 7.41806 11.8198 7.55306L11.8891 7.61091C12.0627 7.78448 12.0819 8.0539 11.9469 8.24877L11.8891 8.31802L8.35355 11.8536C8.17999 12.0271 7.91056 12.0464 7.71569 11.9114L7.64645 11.8536L4.11091 8.31802C3.91565 8.12276 3.91565 7.80617 4.11091 7.61091C4.28448 7.43735 4.5539 7.41806 4.74877 7.55306L4.81802 7.61091L7.5 10.292V1.5C7.5 1.25454 7.67688 1.05039 7.91012 1.00806L8 1L7.91012 1.00806Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/window.svg b/src/browser/themes/shared/zen-icons/win/window.svg
deleted file mode 100644
index 8d1b46478..000000000
--- a/src/browser/themes/shared/zen-icons/win/window.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 3C4.34315 3 3 4.34315 3 6V14C3 15.6569 4.34315 17 6 17H14C15.6569 17 17 15.6569 17 14V6C17 4.34315 15.6569 3 14 3H6ZM4 6C4 4.89543 4.89543 4 6 4H14C15.1046 4 16 4.89543 16 6L4 6ZM4 7H16V14C16 15.1046 15.1046 16 14 16H6C4.89543 16 4 15.1046 4 14V7Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/xr-blocked.svg b/src/browser/themes/shared/zen-icons/win/xr-blocked.svg
deleted file mode 100644
index 20ec5003d..000000000
--- a/src/browser/themes/shared/zen-icons/win/xr-blocked.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.75 8C10.75 8.41421 10.4142 8.75 10 8.75C9.58579 8.75 9.25 8.41421 9.25 8C9.25 7.58579 9.58579 7.25 10 7.25C10.4142 7.25 10.75 7.58579 10.75 8ZM5.5 10C5.22386 10 5 10.2239 5 10.5C5 10.7761 5.22386 11 5.5 11H7.5C7.77614 11 8 10.7761 8 10.5C8 10.2239 7.77614 10 7.5 10H5.5ZM12 10.5C12 10.2239 12.2239 10 12.5 10H14.5C14.7761 10 15 10.2239 15 10.5C15 10.7761 14.7761 11 14.5 11H12.5C12.2239 11 12 10.7761 12 10.5ZM8.5 3C8.22386 3 8 3.22386 8 3.5V5H5.25C3.53919 5 2.13713 6.32189 2.00947 8H1.5C1.22386 8 1 8.22386 1 8.5V11.5C1 11.7761 1.22386 12 1.5 12H2V13.75C2 15.5449 3.45507 17 5.25 17H6.85935C7.7213 17 8.54795 16.6576 9.15745 16.0481L9.75095 15.4546C9.88763 15.3179 10.1092 15.3179 10.2459 15.4546L10.8394 16.0481C11.4489 16.6576 12.2756 17 13.1375 17H14.75C16.5449 17 18 15.5449 18 13.75V12H18.5C18.7761 12 19 11.7761 19 11.5V8.5C19 8.22386 18.7761 8 18.5 8H17.9905C17.8629 6.32189 16.4608 5 14.75 5H12V3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM17 8.25V13.75C17 14.9926 15.9926 16 14.75 16H13.1375C12.5408 16 11.9685 15.7629 11.5465 15.341L10.953 14.7475C10.4258 14.2203 9.57105 14.2203 9.04384 14.7475L8.45034 15.341C8.02838 15.7629 7.45609 16 6.85935 16H5.25C4.00736 16 3 14.9926 3 13.75V8.25C3 7.00736 4.00736 6 5.25 6H14.75C15.9926 6 17 7.00736 17 8.25Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/xr.svg b/src/browser/themes/shared/zen-icons/win/xr.svg
deleted file mode 100644
index 20ec5003d..000000000
--- a/src/browser/themes/shared/zen-icons/win/xr.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.75 8C10.75 8.41421 10.4142 8.75 10 8.75C9.58579 8.75 9.25 8.41421 9.25 8C9.25 7.58579 9.58579 7.25 10 7.25C10.4142 7.25 10.75 7.58579 10.75 8ZM5.5 10C5.22386 10 5 10.2239 5 10.5C5 10.7761 5.22386 11 5.5 11H7.5C7.77614 11 8 10.7761 8 10.5C8 10.2239 7.77614 10 7.5 10H5.5ZM12 10.5C12 10.2239 12.2239 10 12.5 10H14.5C14.7761 10 15 10.2239 15 10.5C15 10.7761 14.7761 11 14.5 11H12.5C12.2239 11 12 10.7761 12 10.5ZM8.5 3C8.22386 3 8 3.22386 8 3.5V5H5.25C3.53919 5 2.13713 6.32189 2.00947 8H1.5C1.22386 8 1 8.22386 1 8.5V11.5C1 11.7761 1.22386 12 1.5 12H2V13.75C2 15.5449 3.45507 17 5.25 17H6.85935C7.7213 17 8.54795 16.6576 9.15745 16.0481L9.75095 15.4546C9.88763 15.3179 10.1092 15.3179 10.2459 15.4546L10.8394 16.0481C11.4489 16.6576 12.2756 17 13.1375 17H14.75C16.5449 17 18 15.5449 18 13.75V12H18.5C18.7761 12 19 11.7761 19 11.5V8.5C19 8.22386 18.7761 8 18.5 8H17.9905C17.8629 6.32189 16.4608 5 14.75 5H12V3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM17 8.25V13.75C17 14.9926 15.9926 16 14.75 16H13.1375C12.5408 16 11.9685 15.7629 11.5465 15.341L10.953 14.7475C10.4258 14.2203 9.57105 14.2203 9.04384 14.7475L8.45034 15.341C8.02838 15.7629 7.45609 16 6.85935 16H5.25C4.00736 16 3 14.9926 3 13.75V8.25C3 7.00736 4.00736 6 5.25 6H14.75C15.9926 6 17 7.00736 17 8.25Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/zoom-control.svg b/src/browser/themes/shared/zen-icons/win/zoom-control.svg
deleted file mode 100644
index d20186926..000000000
--- a/src/browser/themes/shared/zen-icons/win/zoom-control.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5 8.5C11.5 8.22386 11.2761 8 11 8H9V6C9 5.72386 8.77614 5.5 8.5 5.5C8.22386 5.5 8 5.72386 8 6V8H6C5.72386 8 5.5 8.22386 5.5 8.5C5.5 8.77614 5.72386 9 6 9H8V11C8 11.2761 8.22386 11.5 8.5 11.5C8.77614 11.5 9 11.2761 9 11V9H11C11.2761 9 11.5 8.77614 11.5 8.5ZM8.5 3C11.5376 3 14 5.46243 14 8.5C14 9.83879 13.5217 11.0659 12.7266 12.0196L16.8536 16.1464C17.0488 16.3417 17.0488 16.6583 16.8536 16.8536C16.68 17.0271 16.4106 17.0464 16.2157 16.9114L16.1464 16.8536L12.0196 12.7266C11.0659 13.5217 9.83879 14 8.5 14C5.46243 14 3 11.5376 3 8.5C3 5.46243 5.46243 3 8.5 3ZM8.5 4C6.01472 4 4 6.01472 4 8.5C4 10.9853 6.01472 13 8.5 13C10.9853 13 13 10.9853 13 8.5C13 6.01472 10.9853 4 8.5 4Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win/zoom-out.svg b/src/browser/themes/shared/zen-icons/win/zoom-out.svg
deleted file mode 100644
index 494e71dd1..000000000
--- a/src/browser/themes/shared/zen-icons/win/zoom-out.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 8C11.2761 8 11.5 8.22386 11.5 8.5C11.5 8.77614 11.2761 9 11 9H6C5.72386 9 5.5 8.77614 5.5 8.5C5.5 8.22386 5.72386 8 6 8H11ZM14 8.5C14 5.46243 11.5376 3 8.5 3C5.46243 3 3 5.46243 3 8.5C3 11.5376 5.46243 14 8.5 14C9.83879 14 11.0659 13.5217 12.0196 12.7266L16.1464 16.8536L16.2157 16.9114C16.4106 17.0464 16.68 17.0271 16.8536 16.8536C17.0488 16.6583 17.0488 16.3417 16.8536 16.1464L12.7266 12.0196C13.5217 11.0659 14 9.83879 14 8.5ZM4 8.5C4 6.01472 6.01472 4 8.5 4C10.9853 4 13 6.01472 13 8.5C13 10.9853 10.9853 13 8.5 13C6.01472 13 4 10.9853 4 8.5Z" fill="currentColor" stroke="none" fill-opacity="context-fill-opacity"/>
-</svg>
diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index b8d54b856..81359f7ed 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -67,11 +67,12 @@ export var ZenCustomizableUI = new (class {
         addon-webext-overflowtarget="overflowed-extensions-list"
         mode="icons">
         <hbox id="zen-sidebar-top-buttons-customization-target" class="customization-target" flex="1">
-          <toolbarbutton id="zen-toggle-compact-mode"
-            class="toolbarbutton-1"
-            command="cmd_toggleCompactModeIgnoreHover"
-            data-l10n-id="zen-toggle-compact-mode-button"
-            removable="true" />
+          <toolbaritem id="zen-toggle-compact-mode" removable="true">
+            <toolbarbutton
+              class="toolbarbutton-1"
+              command="cmd_toggleCompactModeIgnoreHover"
+              data-l10n-id="zen-toggle-compact-mode-button" />
+          </toolbaritem>
           <html:div id="zen-sidebar-top-buttons-separator" skipintoolbarset="true" overflows="false"></html:div>
         </hbox>
       </toolbar>
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index d05678a80..9ae4d45fa 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -915,17 +915,19 @@ var gZenVerticalTabsManager = {
 
   recalculateURLBarHeight() {
     requestAnimationFrame(() => {
-      document.getElementById('urlbar').removeAttribute('--urlbar-height');
-      let height;
-      if (!this._hasSetSingleToolbar) {
-        height = 32;
-      } else if (gURLBar.getAttribute('breakout-extend') !== 'true') {
-        height = 40;
-      }
-      if (typeof height !== 'undefined') {
-        document.getElementById('urlbar').style.setProperty('--urlbar-height', `${height}px`);
-      }
-      gURLBar.zenFormatURLValue();
+      requestAnimationFrame(() => {
+        gURLBar.textbox.removeAttribute('--urlbar-height');
+        let height;
+        if (!this._hasSetSingleToolbar) {
+          height = 32;
+        } else if (gURLBar.getAttribute('breakout-extend') !== 'true') {
+          height = 40;
+        }
+        if (typeof height !== 'undefined') {
+          gURLBar.textbox.style.setProperty('--urlbar-height', `${height}px`);
+        }
+        gURLBar.zenFormatURLValue();
+      });
     });
   },
 
@@ -1140,7 +1142,6 @@ var gZenVerticalTabsManager = {
       }
 
       gZenCompactModeManager.updateCompactModeContext(isSingleToolbar);
-      this.recalculateURLBarHeight();
 
       // Always move the splitter next to the sidebar
       const splitter = document.getElementById('zen-sidebar-splitter');
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index 536c11ac6..7b2fc796a 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -45,7 +45,7 @@
 
   @media not ((-moz-pref('zen.view.experimental-no-window-controls') or (not -moz-pref('zen.view.hide-window-controls'))) and -moz-pref('zen.view.use-single-toolbar')) {
     .browserSidebarContainer:is(.deck-selected, [zen-split='true']) .browserContainer {
-      transition: margin 0.15s ease-in-out;
+      transition: margin 0.1s ease;
 
       :root[zen-single-toolbar='true'] & {
         transition-delay: 0.2s;
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 62fdb7d78..b837c0fd2 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -546,6 +546,10 @@ body > #confetti {
   }
 }
 
+#zen-site-data-settings-list toolbarseparator {
+  margin: 6px 0;
+}
+
 /* Overflow panel */
 #widget-overflow-mainView {
   --menu-panel-width-wide: 200px;
diff --git a/src/zen/common/zenThemeModifier.js b/src/zen/common/zenThemeModifier.js
index acd7899d8..fb736d733 100644
--- a/src/zen/common/zenThemeModifier.js
+++ b/src/zen/common/zenThemeModifier.js
@@ -92,6 +92,7 @@ var ZenThemeModifier = {
   },
 
   updateElementSeparation() {
+    const kMinElementSeparation = 0.1; // in px
     let separation = this.elementSeparation;
     if (
       window.fullScreen &&
@@ -101,8 +102,10 @@ var ZenThemeModifier = {
     ) {
       separation = 0;
     }
+    // In order to still use it on fullscreen, even if it's 0px, add .1px (almost invisible)
+    separation = Math.max(kMinElementSeparation, separation);
     document.documentElement.style.setProperty('--zen-element-separation', separation + 'px');
-    if (separation == 0) {
+    if (separation == kMinElementSeparation) {
       document.documentElement.setAttribute('zen-no-padding', true);
     } else {
       document.documentElement.removeAttribute('zen-no-padding');
diff --git a/src/zen/compact-mode/sidebar.inc.css b/src/zen/compact-mode/sidebar.inc.css
index e65d4775a..b93f6f174 100644
--- a/src/zen/compact-mode/sidebar.inc.css
+++ b/src/zen/compact-mode/sidebar.inc.css
@@ -66,7 +66,7 @@
       }
       :root:not([zen-single-toolbar='true']) & {
         bottom: calc(var(--zen-compact-float) / 2);
-        height: calc(100% - var(--zen-toolbar-height));
+        height: calc(100% - var(--zen-toolbar-height-with-bookmarks)); 
         @media -moz-pref('zen.view.compact.hide-toolbar') {
           height: 100%;
         }
@@ -86,12 +86,12 @@
   }
 
   /* When we have multiple toolbars and the top-toolbar is NOT being hidden,
-       * we need to adjust the top-padding of the toolbox to account for the
-       * extra toolbar height. */
+   * we need to adjust the top-padding of the toolbox to account for the
+   * extra toolbar height. */
   @media not -moz-pref('zen.view.compact.hide-toolbar') {
     &:not([zen-single-toolbar='true']) {
       #navigator-toolbox:not([animate='true']) {
-        margin-top: var(--zen-toolbar-height) !important;
+        margin-top: var(--zen-toolbar-height-with-bookmarks) !important;
       }
     }
   }
diff --git a/src/zen/compact-mode/toolbar.inc.css b/src/zen/compact-mode/toolbar.inc.css
index 715b3beb1..5d147ee78 100644
--- a/src/zen/compact-mode/toolbar.inc.css
+++ b/src/zen/compact-mode/toolbar.inc.css
@@ -9,8 +9,10 @@
     --zen-toolbox-top-align: var(--zen-element-separation);
   }
 
-  & #titlebar {
-    margin-top: var(--zen-element-separation) !important;
+  @media -moz-pref('zen.view.compact.hide-tabbar') {
+    & #titlebar {
+      margin-top: var(--zen-element-separation) !important;
+    }
   }
 
   & #zen-appcontent-wrapper {
@@ -21,15 +23,15 @@
     & .zen-toolbar-background {
       display: flex;
     }
-    transition: height 0.15s ease-in-out;
+    transition: height 0.1s ease;
 
-    height: calc(var(--zen-element-separation) + 0.1px);
+    height: var(--zen-element-separation);
     overflow: clip;
 
     & #urlbar:not([breakout-extend='true']) {
       opacity: 0;
       pointer-events: none;
-      transition: opacity 0.15s ease;
+      transition: opacity 0.1s ease;
     }
 
     & .titlebar-buttonbox-container {
@@ -37,12 +39,12 @@
       /* We need to hide them since on Windows the native
        * panels when hovering over them can interfere with the
        * web content */
-      transition: visibility 0.15s ease;
+      transition: visibility 0.1s ease;
     }
 
     & #zen-appcontent-navbar-container {
       opacity: 0;
-      transition: opacity 0.15s ease;
+      transition: opacity 0.1s ease;
     }
   }
 
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 56ccc7ef4..1990a1d77 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -26,7 +26,7 @@
 
     // Arc animation configuration
     #ARC_CONFIG = Object.freeze({
-      ARC_STEPS: 60, // Increased for smoother bounce
+      ARC_STEPS: 70, // Increased for smoother bounce
       MAX_ARC_HEIGHT: 30,
       ARC_HEIGHT_RATIO: 0.2, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
     });
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
index cf6994743..2251b02d8 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
@@ -12,7 +12,7 @@ z-index: 1;
 }
 
 @media -moz-pref('zen.view.hide-window-controls') {
-  transition: height 0.15s ease-in-out, opacity 0.15s ease-in-out;
+  transition: height 0.1s ease, opacity 0.1s ease;
   will-change: height, opacity;
   transition-delay: 0.2s;
   overflow: clip;
@@ -20,8 +20,7 @@ z-index: 1;
   &:not([zen-has-hover='true']):not([has-popup-menu]):not(:focus-within):not(
       :has(*:is([panelopen='true'], [open='true']))
     ) {
-    /* In order to still use it on fullscreen, even if it's 0px, add .1px (almost invisible) */
-    height: calc(var(--zen-element-separation) + 0.1px);
+    height: var(--zen-element-separation);
     opacity: 0;
     & #zen-appcontent-navbar-container {
       pointer-events: none;
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css b/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
index 4ebaa0bca..4d0d8e534 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css
@@ -6,7 +6,10 @@
 
 &:not([zen-compact-animating])
   #zen-sidebar-top-buttons:not(
-    :has(#zen-sidebar-top-buttons-customization-target > *:not(#zen-sidebar-top-buttons-separator))
+    :has(
+      #zen-sidebar-top-buttons-customization-target > *:not(#zen-sidebar-top-buttons-separator),
+      .titlebar-buttonbox-container
+    )
   ) {
   max-height: 0 !important;
   min-height: 0 !important;
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 0e55016cf..f64cdd504 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -117,7 +117,7 @@
   }
 
   & #zen-sidebar-top-buttons {
-    margin: var(--zen-toolbox-padding) 0 calc(var(--zen-toolbox-padding) / 2) 0;
+    margin: var(--zen-toolbox-padding) 0;
   }
 
   & #PanelUI-menu-button {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index e86c6f53e..48cf7aebb 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -14,6 +14,7 @@ export class nsZenSiteDataPanel {
   #iconMap = {
     install: 'extension',
     'site-protection': 'shield',
+    '3rdPartyStorage': 'cookie',
   };
 
   constructor(window) {
@@ -299,7 +300,11 @@ export class nsZenSiteDataPanel {
       });
     }
 
+    const separator = this.document.createXULElement('toolbarseparator');
     list.innerHTML = '';
+    list.appendChild(separator);
+    const settingElements = [];
+    const crossSiteCookieElements = [];
     for (let permission of permissions) {
       let [id, key] = permission.id.split(SitePermissions.PERM_KEY_DELIMITER);
 
@@ -314,12 +319,24 @@ export class nsZenSiteDataPanel {
         continue;
       }
 
-      let item = this.#createPermissionItem(id, key, permission);
+      let [item, isCrossSiteCookie] = this.#createPermissionItem(id, key, permission);
       if (item) {
-        list.appendChild(item);
+        if (isCrossSiteCookie) {
+          crossSiteCookieElements.push(item);
+        } else {
+          settingElements.push(item);
+        }
       }
     }
 
+    for (let elem of settingElements) {
+      separator.before(elem);
+    }
+    for (let elem of crossSiteCookieElements) {
+      separator.after(elem);
+    }
+
+    separator.hidden = !settingElements.length || !crossSiteCookieElements.length;
     section.hidden = list.childElementCount == 0;
   }
 
@@ -339,6 +356,7 @@ export class nsZenSiteDataPanel {
 
   #createPermissionItem(id, key, permission) {
     const { SitePermissions } = this.window;
+    const isCrossSiteCookie = id === '3rdPartyStorage';
 
     // Create a permission item for the site data panel.
     let container = this.document.createXULElement('hbox');
@@ -368,23 +386,32 @@ export class nsZenSiteDataPanel {
     let nameLabel = this.document.createXULElement('label');
     nameLabel.setAttribute('flex', '1');
     nameLabel.setAttribute('class', 'permission-popup-permission-label');
-    let label = SitePermissions.getPermissionLabel(permission.id);
-    if (label) {
-      nameLabel.textContent = label;
+    if (isCrossSiteCookie) {
+      this.document.l10n.setAttributes(nameLabel, 'zen-site-data-setting-cross-site');
     } else {
-      this.document.l10n.setAttributes(nameLabel, 'zen-site-data-setting-' + idNoSuffix);
+      let label = SitePermissions.getPermissionLabel(permission.id);
+      if (label) {
+        nameLabel.textContent = label;
+      } else {
+        this.document.l10n.setAttributes(nameLabel, 'zen-site-data-setting-' + idNoSuffix);
+      }
     }
     labelContainer.appendChild(nameLabel);
 
     let stateLabel = this.document.createXULElement('label');
     stateLabel.setAttribute('class', 'zen-permission-popup-permission-state-label');
-    stateLabel.setAttribute('data-l10n-id', this.#getPermissionStateLabelId(permission));
+    if (isCrossSiteCookie) {
+      // The key should be the site for cross-site cookies.
+      stateLabel.textContent = key;
+    } else {
+      stateLabel.setAttribute('data-l10n-id', this.#getPermissionStateLabelId(permission));
+    }
     labelContainer.appendChild(stateLabel);
 
     container.appendChild(img);
     container.appendChild(labelContainer);
 
-    return container;
+    return [container, isCrossSiteCookie];
   }
 
   #openGetAddons() {
@@ -473,10 +500,13 @@ export class nsZenSiteDataPanel {
       SitePermissions.setForPrincipal(gBrowser.contentPrincipal, permission.id, newState);
     }
 
+    const isCrossSiteCookie = permission.id.startsWith('3rdPartyStorage');
     label.parentNode.setAttribute('state', newState == SitePermissions.ALLOW ? 'allow' : 'block');
-    label
-      .querySelector('.zen-permission-popup-permission-state-label')
-      .setAttribute('data-l10n-id', this.#getPermissionStateLabelId({ state: newState }));
+    if (!isCrossSiteCookie) {
+      label
+        .querySelector('.zen-permission-popup-permission-state-label')
+        .setAttribute('data-l10n-id', this.#getPermissionStateLabelId({ state: newState }));
+    }
     label._permission.state = newState;
   }
 
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 7e41bfc8d..7cb7685f1 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2481,9 +2481,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
       pinnedContainer.children.length === 1 ||
       Array.from(arrowScrollbox.children).filter(
         (child) =>
-          !child.hasAttribute('hidden') &&
-          !child.hasAttribute('bursting') &&
-          !child.hasAttribute('zen-empty-tab')
+          !child.hasAttribute('hidden') && !child.closing && !child.hasAttribute('zen-empty-tab')
       ).length <= 1;
     if (shouldHideSeparator) {
       pinnedContainer.setAttribute('hide-separator', 'true');

From 9ae85f962ab1dc015be71ba7f92f45c51de7488c Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:53:57 +0200
Subject: [PATCH 101/111] chor: New Crowdin updates, p=#10831

* New translations zen-general.ftl (French)

* New translations zen-preferences.ftl (Catalan)

* New translations zen-preferences.ftl (Hungarian)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Italian)

* New translations zen-general.ftl (Portuguese)

* New translations zen-general.ftl (Ukrainian)

* New translations zen-general.ftl (Indonesian)

* New translations zen-welcome.ftl (Catalan)

* Update source file zen-general.ftl

* New translations zen-general.ftl (French)

* New translations zen-general.ftl (Chinese Simplified)

* New translations zen-general.ftl (Chinese Traditional)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Arabic)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Czech)

* New translations zen-general.ftl (Danish)

* New translations zen-general.ftl (German)

* New translations zen-general.ftl (Greek)

* New translations zen-general.ftl (Finnish)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hebrew)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Italian)

* New translations zen-general.ftl (Japanese)

* New translations zen-general.ftl (Korean)

* New translations zen-general.ftl (Lithuanian)

* New translations zen-general.ftl (Dutch)

* New translations zen-general.ftl (Polish)

* New translations zen-general.ftl (Portuguese)

* New translations zen-general.ftl (Russian)

* New translations zen-general.ftl (Swedish)

* New translations zen-general.ftl (Turkish)

* New translations zen-general.ftl (Ukrainian)

* New translations zen-general.ftl (Vietnamese)

* New translations zen-general.ftl (Icelandic)

* New translations zen-general.ftl (Portuguese, Brazilian)

* New translations zen-general.ftl (Indonesian)

* New translations zen-general.ftl (Persian)

* New translations zen-general.ftl (Thai)

* New translations zen-general.ftl (Norwegian Nynorsk)

* New translations zen-general.ftl (Estonian)

* New translations zen-general.ftl (English, United Kingdom)

* New translations zen-general.ftl (Welsh)
---
 locales/ar/browser/browser/zen-general.ftl        |  3 ++-
 .../browser/preferences/zen-preferences.ftl       |  4 ++--
 locales/ca/browser/browser/zen-general.ftl        | 15 ++++++++-------
 locales/ca/browser/browser/zen-welcome.ftl        |  6 +++---
 locales/cs/browser/browser/zen-general.ftl        |  3 ++-
 locales/cy/browser/browser/zen-general.ftl        |  3 ++-
 locales/da/browser/browser/zen-general.ftl        |  3 ++-
 locales/de/browser/browser/zen-general.ftl        |  3 ++-
 locales/el/browser/browser/zen-general.ftl        |  3 ++-
 locales/en-GB/browser/browser/zen-general.ftl     |  3 ++-
 locales/es-ES/browser/browser/zen-general.ftl     |  7 ++++---
 locales/et/browser/browser/zen-general.ftl        |  3 ++-
 locales/fa/browser/browser/zen-general.ftl        |  3 ++-
 locales/fi/browser/browser/zen-general.ftl        |  3 ++-
 locales/fr/browser/browser/zen-general.ftl        |  7 ++++---
 locales/ga-IE/browser/browser/zen-general.ftl     |  9 +++++----
 locales/he/browser/browser/zen-general.ftl        |  3 ++-
 .../browser/preferences/zen-preferences.ftl       |  2 +-
 locales/hu/browser/browser/zen-general.ftl        |  7 ++++---
 locales/id/browser/browser/zen-general.ftl        |  9 +++++----
 locales/is/browser/browser/zen-general.ftl        |  3 ++-
 locales/it/browser/browser/zen-general.ftl        |  7 ++++---
 locales/ja/browser/browser/zen-general.ftl        |  3 ++-
 locales/ko/browser/browser/zen-general.ftl        |  3 ++-
 locales/lt/browser/browser/zen-general.ftl        |  3 ++-
 locales/nl/browser/browser/zen-general.ftl        |  3 ++-
 locales/nn-NO/browser/browser/zen-general.ftl     |  3 ++-
 locales/pl/browser/browser/zen-general.ftl        |  3 ++-
 locales/pt-BR/browser/browser/zen-general.ftl     |  3 ++-
 locales/pt-PT/browser/browser/zen-general.ftl     |  9 +++++----
 locales/ru/browser/browser/zen-general.ftl        |  7 ++++---
 locales/sv-SE/browser/browser/zen-general.ftl     |  3 ++-
 locales/th/browser/browser/zen-general.ftl        |  3 ++-
 locales/tr/browser/browser/zen-general.ftl        |  3 ++-
 locales/uk/browser/browser/zen-general.ftl        |  7 ++++---
 locales/vi/browser/browser/zen-general.ftl        |  3 ++-
 locales/zh-CN/browser/browser/zen-general.ftl     |  3 ++-
 locales/zh-TW/browser/browser/zen-general.ftl     |  3 ++-
 38 files changed, 103 insertions(+), 68 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 5310c4b77..1999f49b0 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl
index d399d0105..0813471cf 100644
--- a/locales/ca/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl
@@ -71,7 +71,7 @@ zen-settings-workspaces-enabled =
     .label = Habilita els espais de treball
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Amaga l'indicador de contenidor per defecte a la barra de pestanyes
-zen-key-unsaved = Drecera no desada! Deseu-la fent clic a la tecla «Esc» després de tornar-la a escriure.
+zen-key-unsaved = Drecera no desada. Deseu-la fent clic a la tecla «Esc» després de tornar-la a escriure.
 zen-key-conflict = Conflicte amb { $group } -> { $shortcut }
 pane-zen-theme-title = Configuració del tema
 zen-vertical-tabs-title = Disseny de la barra lateral i pestanyes
@@ -107,7 +107,7 @@ zen-theme-marketplace-import-failure = Hi ha hagut un error en importar les modi
 zen-theme-marketplace-export-success = Les modificacions s'han exportat correctament
 zen-theme-marketplace-export-failure = Hi ha hagut un error en exportar les modificacions
 zen-theme-marketplace-updates-success = Les modificacions s'han actualitzat correctament
-zen-theme-marketplace-updates-failure = No s'ha trobat cap actualització!
+zen-theme-marketplace-updates-failure = No s'ha trobat cap actualització
 zen-theme-marketplace-toggle-enabled-button = 
     .title = Deshabilita la modificació
 zen-theme-marketplace-toggle-disabled-button = 
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index c0583e8de..b098352e9 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -23,16 +23,16 @@ pictureinpicture-minimize-btn =
     .aria-label = Minimitza
     .tooltip = Minimitza
 zen-panel-ui-gradient-generator-custom-color = Color personalitzat
-zen-panel-ui-gradient-generator-saved-message = El degradat s'ha desat correctament!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-panel-ui-gradient-generator-saved-message = El degradat s'ha desat correctament
+zen-copy-current-url-confirmation = L'URL actual s'ha copiat.
 zen-general-cancel-label = 
     .label = Cancel·la
 zen-general-confirm = 
     .label = Confirma
 zen-pinned-tab-replaced = L'URL de la pestanya fixada s'ha substituït per l'URL actual.
-zen-tabs-renamed = S'ha canviat el nom de la pestanya correctament!
-zen-background-tab-opened-toast = S'ha obert una nova pestanya de fons!
-zen-workspace-renamed-toast = S'ha canviat el nom de l'espai de treball correctament!
+zen-tabs-renamed = S'ha canviat el nom de la pestanya correctament
+zen-background-tab-opened-toast = S'ha obert una nova pestanya de fons
+zen-workspace-renamed-toast = S'ha canviat el nom de l'espai de treball correctament
 zen-library-sidebar-workspaces = 
     .label = Espais
 zen-library-sidebar-mods = 
@@ -59,6 +59,7 @@ zen-generic-next = Següent
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permès
 zen-site-data-setting-block = Bloquejat
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extensió
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Totes les configuracions del lloc
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Comparteix aquesta pàgina
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia l'URL
-zen-site-data-setting-site-protection = Protecció del lloc
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/ca/browser/browser/zen-welcome.ftl b/locales/ca/browser/browser/zen-welcome.ftl
index 7d6537dfa..833c3a73b 100644
--- a/locales/ca/browser/browser/zen-welcome.ftl
+++ b/locales/ca/browser/browser/zen-welcome.ftl
@@ -5,7 +5,7 @@
 zen-welcome-title-line1 = Us donem la benvingut
 zen-welcome-title-line2 = a un internet més tranquil
 zen-welcome-import-title = Un nou començament, els mateixos marcadors
-zen-welcome-import-description-1 = Els vostres marcadors, historial i contrasenyes són com un rastre de molles de pa a través d'Internet: no les deixis enrere!
+zen-welcome-import-description-1 = Els vostres marcadors, historial i contrasenyes són com un rastre de molles de pa a través d'Internet: no les deixis enrere
 zen-welcome-import-description-2 = Porteu-los fàcilment des d'un altre navegador i repreneu exactament on ho vau deixar.
 zen-welcome-import-button = Importa ara
 zen-welcome-set-default-browser = Estableix el { -brand-short-name } com a navegador per defecte
@@ -21,6 +21,6 @@ zen-welcome-start-browsing-title =
 zen-welcome-start-browsing-description-1 = Ja esteu llestos i preparats per començar. Feu clic al botó següent per començar a navegar amb el { -brand-short-name }.
 zen-welcome-start-browsing = Som-hi!
 zen-welcome-default-search-title = El vostre motor de cerca per defecte
-zen-welcome-default-search-description = Trieu el vostre motor de cerca per defecte. Sempre el podeu canviar més tard!
+zen-welcome-default-search-description = Trieu el vostre motor de cerca per defecte. Sempre el podeu canviar més tard
 zen-welcome-skip-button = Omet
-zen-welcome-finished = El Zen s'ha configurat correctament!
+zen-welcome-finished = El Zen s'ha configurat correctament
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index f740c3d6e..26dcdadf6 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Povoleno
 zen-site-data-setting-block = Blokováno
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Rozšíření
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index 530d09c54..d060f96fc 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index 1e31af7e9..ab527f9c6 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Næste
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Tilladt
 zen-site-data-setting-block = Blokeret
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Udvidelse
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Kopiér URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 017be252d..7ee1d0f50 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 731383b07..5e93572b0 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index b874a309d..93bb3bb33 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -57,6 +57,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -73,7 +74,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index 9f5aae4b9..2ad98e52a 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Color personalizado
 zen-panel-ui-gradient-generator-saved-message = ¡Gradiente guardado con éxito!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = ¡URL actual copiada!
 zen-general-cancel-label = 
     .label = Cancelar
 zen-general-confirm = 
@@ -59,6 +59,7 @@ zen-generic-next = Siguiente
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extensión
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Todas las configuraciones del sitio
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Compartir esta página
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
-zen-site-data-setting-site-protection = Protección del sitio
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index 686b2cdcc..62789f896 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Lubatud
 zen-site-data-setting-block = Keelatud
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Laiendus
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index afc97014a..a46966e24 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 1eef49747..241971b29 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 724eb5677..b0fc3d154 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimiser
 zen-panel-ui-gradient-generator-custom-color = Couleur personnalisée
 zen-panel-ui-gradient-generator-saved-message = Le dégradé a été enregistré avec succès !
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = URL actuelle copiée !
 zen-general-cancel-label = 
     .label = Annuler
 zen-general-confirm = 
@@ -59,6 +59,7 @@ zen-generic-next = Suivant
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Autorisé
 zen-site-data-setting-block = Bloqué
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Tous les paramètres du site
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Partager cette page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copier l'URL
-zen-site-data-setting-site-protection = Protection du site
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 64ccda5d4..f49593590 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Íoslaghdaigh
 zen-panel-ui-gradient-generator-custom-color = Dath Saincheaptha
 zen-panel-ui-gradient-generator-saved-message = Sábháladh an grádán go rathúil!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = Cóipeáladh an URL reatha!
 zen-general-cancel-label = 
     .label = Cealaigh
 zen-general-confirm = 
@@ -55,10 +55,11 @@ urlbar-search-mode-zen_actions = Gníomhartha
 zen-site-data-settings = Socruithe
 zen-generic-manage = Bainistigh
 zen-generic-more = Tuilleadh
-zen-generic-next = Next
+zen-generic-next = Ar Aghaidh
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Ceadaithe
 zen-site-data-setting-block = Blocáilte
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Síneadh
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Gach Socrú Suímh
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Comhroinn an Leathanach seo
 zen-urlbar-copy-url-button = 
     .tooltiptext = Cóipeáil URL
-zen-site-data-setting-site-protection = Cosaint Láithreáin
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index b53a0f84d..d15ba51f0 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = אושר
 zen-site-data-setting-block = חסום
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = תוספים
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = בטיחות אתר
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl
index f79677e69..941ba12f3 100644
--- a/locales/hu/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Alapértelmezett konténerjelző elrejtése a tabulátor sávban
 zen-key-unsaved = Nem mentett gyorsbillentyű! Mentsd meg az "Escape" gomb lenyomásával, majd újraírásával.
-zen-key-conflict = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Ütközik ezzel: { $group } → { $shortcut }
 pane-zen-theme-title = Téma beállítások
 zen-vertical-tabs-title = Oldalsó sáv és lapok elrendezése
 zen-vertical-tabs-header = Függőleges lapok
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 213eaba17..b48bba8a5 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimalizálás
 zen-panel-ui-gradient-generator-custom-color = Egyedi szín
 zen-panel-ui-gradient-generator-saved-message = Színátmenet sikeresen mentve!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = Jelenlegi URL másolva!
 zen-general-cancel-label = 
     .label = Mégsem
 zen-general-confirm = 
@@ -59,6 +59,7 @@ zen-generic-next = Következő
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Engedélyezve
 zen-site-data-setting-block = Letiltva
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Kiegészítő
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Minden webhelybeállítás
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Oldal megosztása
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL másolása
-zen-site-data-setting-site-protection = Oldalvédelem
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 817735838..1186a839a 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimalkan
 zen-panel-ui-gradient-generator-custom-color = Warna Kustom
 zen-panel-ui-gradient-generator-saved-message = Berhasil menyimpan gradien!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = URL Disalin!
 zen-general-cancel-label = 
     .label = Batalkan
 zen-general-confirm = 
@@ -55,10 +55,11 @@ urlbar-search-mode-zen_actions = Aksi
 zen-site-data-settings = Pengaturan
 zen-generic-manage = Kelola
 zen-generic-more = Selengkapnya
-zen-generic-next = Next
+zen-generic-next = Lanjut
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Diizinkan
 zen-site-data-setting-block = Diblokir
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Ekstensi
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Semua Pengaturan Situs
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Bagikan Halaman Ini
 zen-urlbar-copy-url-button = 
     .tooltiptext = Salin URL
-zen-site-data-setting-site-protection = Perlindungan Situs
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index b3e7a81f3..af3320150 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 1fb03c3b1..5b9a31dc6 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -22,7 +22,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimizza
 zen-panel-ui-gradient-generator-custom-color = Colore personalizzato
 zen-panel-ui-gradient-generator-saved-message = Gradiente salvato con successo!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = L'URL corrente è stato copiato!
 zen-general-cancel-label = 
     .label = Annulla
 zen-general-confirm = 
@@ -57,6 +57,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Consentito
 zen-site-data-setting-block = Bloccato
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Estensione
 zen-site-data-security-info-secure = 
@@ -70,10 +71,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Tutte le impostazioni del sito
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Condividi questa pagina
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia URL
-zen-site-data-setting-site-protection = Protezione sito
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 394a8d4ee..f35f070c2 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 95baa8880..a0e04b030 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = 허용됨
 zen-site-data-setting-block = 금지됨
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = 확장
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL 복사
-zen-site-data-setting-site-protection = 사이트 보호
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index 556510476..03afe42a7 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Leidžiama
 zen-site-data-setting-block = Užblokuota
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Plėtinys
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Svetainės apsauga
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 70f5e0e99..10bee75cd 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index ebd0a56fb..b4ce133cf 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index dfe716c5c..9c8b82b2c 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 1e6845a5b..9f48fcd14 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -57,6 +57,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extensão
 zen-site-data-security-info-secure = 
@@ -73,7 +74,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index a3db1d4bd..88d67713d 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimizar
 zen-panel-ui-gradient-generator-custom-color = Cor personalizada
 zen-panel-ui-gradient-generator-saved-message = Gradiente guardado com sucesso!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = URL atual copiado!
 zen-general-cancel-label = 
     .label = Cancelar
 zen-general-confirm = 
@@ -55,10 +55,11 @@ urlbar-search-mode-zen_actions = Ações
 zen-site-data-settings = Definições
 zen-generic-manage = Gerir
 zen-generic-more = Mais
-zen-generic-next = Next
+zen-generic-next = Seguinte
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extensão
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Todas as Definições do Site
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Partilhar Esta Página
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
-zen-site-data-setting-site-protection = Proteção do Site
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 09aea8024..154f6c9d5 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Свернуть
 zen-panel-ui-gradient-generator-custom-color = Пользовательский цвет
 zen-panel-ui-gradient-generator-saved-message = Градиент успешно сохранён!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = Адрес скопирован!
 zen-general-cancel-label = 
     .label = Отменить
 zen-general-confirm = 
@@ -59,6 +59,7 @@ zen-generic-next = Далее
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Разрешено
 zen-site-data-setting-block = Запрещено
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Расширение
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Все настройки сайта
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Поделиться этой страницей
 zen-urlbar-copy-url-button = 
     .tooltiptext = Скопировать URL
-zen-site-data-setting-site-protection = Защищённое соединение
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 3459dbf49..6bfeca164 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index ebd0a56fb..b4ce133cf 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index f6f7d6f32..9c5dd7dba 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 3fdaa3b30..ae3fab0b3 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Згорнути
 zen-panel-ui-gradient-generator-custom-color = Власний колір
 zen-panel-ui-gradient-generator-saved-message = Градієнт успішно збережено!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = Скопійовано поточну URL-адресу!
 zen-general-cancel-label = 
     .label = Скасувати
 zen-general-confirm = 
@@ -59,6 +59,7 @@ zen-generic-next = Далі
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Дозволено
 zen-site-data-setting-block = Заблоковано
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Розширення
 zen-site-data-security-info-secure = 
@@ -72,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Усі налаштування сайту
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Поділитися цією сторінкою
 zen-urlbar-copy-url-button = 
     .tooltiptext = Копіювати URL-адресу
-zen-site-data-setting-site-protection = Захист сайту
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 9e09c2bb5..dfd0650c7 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -59,6 +59,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -75,7 +76,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index cd2fad128..556104f6b 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -57,6 +57,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -73,7 +74,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index 0dc7a7f26..0574bc55c 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -57,6 +57,7 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -73,7 +74,7 @@ zen-site-data-share =
     .label = Share This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Site Protection
+zen-site-data-setting-site-protection = Tracking Protection
 
 # Section: Feature callouts
 

From 7e565b90296411275b2c088402769d2dd5fc5671 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 16 Oct 2025 23:19:50 +0200
Subject: [PATCH 102/111] feat: Make sure to correct system accent color,
 b=no-bug, c=common, compact-mode, tabs, workspaces

---
 .../common/styles/zen-browser-container.css   |  2 +-
 src/zen/common/styles/zen-theme.css           |  1 +
 src/zen/compact-mode/toolbar.inc.css          | 28 ++++++++-----------
 .../windows-captions-fix-active.inc.css       | 10 +++++++
 .../windows-captions-fix-default.inc.css      | 13 +++++++++
 .../zen-tabs/vertical-tabs-topbar.inc.css     |  6 +++-
 src/zen/workspaces/ZenGradientGenerator.mjs   |  7 +++++
 7 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 src/zen/compact-mode/windows-captions-fix-active.inc.css
 create mode 100644 src/zen/compact-mode/windows-captions-fix-default.inc.css

diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index 7b2fc796a..c06def63c 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -45,7 +45,7 @@
 
   @media not ((-moz-pref('zen.view.experimental-no-window-controls') or (not -moz-pref('zen.view.hide-window-controls'))) and -moz-pref('zen.view.use-single-toolbar')) {
     .browserSidebarContainer:is(.deck-selected, [zen-split='true']) .browserContainer {
-      transition: margin 0.1s ease;
+      transition: margin var(--zen-hidden-toolbar-transition);
 
       :root[zen-single-toolbar='true'] & {
         transition-delay: 0.2s;
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 77472547b..859e08293 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -192,6 +192,7 @@
 
   /* Transitions */
   --zen-tabbox-element-indent-transition: margin-inline-start 0.1s ease-in-out;
+  --zen-hidden-toolbar-transition: 0.15s ease-in-out;
 
   /* XUL */
   --zen-main-browser-background: light-dark(rgb(235, 235, 235), #1b1b1b);
diff --git a/src/zen/compact-mode/toolbar.inc.css b/src/zen/compact-mode/toolbar.inc.css
index 5d147ee78..8cd55c910 100644
--- a/src/zen/compact-mode/toolbar.inc.css
+++ b/src/zen/compact-mode/toolbar.inc.css
@@ -15,6 +15,12 @@
     }
   }
 
+  &[zen-right-side='true'][zen-window-buttons-reversed='true'] #titlebar,
+  &:not([zen-right-side='true']):not([zen-window-buttons-reversed='true']) #titlebar {
+    /* The same as the expression above */
+    margin-top: var(--zen-element-separation) !important;
+  }
+
   & #zen-appcontent-wrapper {
     z-index: 3 !important;
   }
@@ -23,28 +29,22 @@
     & .zen-toolbar-background {
       display: flex;
     }
-    transition: height 0.1s ease;
-
+    transition: height var(--zen-hidden-toolbar-transition);
+    
     height: var(--zen-element-separation);
     overflow: clip;
 
     & #urlbar:not([breakout-extend='true']) {
       opacity: 0;
       pointer-events: none;
-      transition: opacity 0.1s ease;
+      transition: opacity var(--zen-hidden-toolbar-transition);
     }
 
-    & .titlebar-buttonbox-container {
-      visibility: hidden;
-      /* We need to hide them since on Windows the native
-       * panels when hovering over them can interfere with the
-       * web content */
-      transition: visibility 0.1s ease;
-    }
+%include windows-captions-fix-default.inc.css
 
     & #zen-appcontent-navbar-container {
       opacity: 0;
-      transition: opacity 0.1s ease;
+      transition: opacity var(--zen-hidden-toolbar-transition);
     }
   }
 
@@ -61,10 +61,7 @@
     height: var(--zen-toolbar-height-with-bookmarks);
     overflow: inherit;
 
-    & .titlebar-buttonbox-container {
-      visibility: visible;
-      transition: none;
-    }
+%include windows-captions-fix-active.inc.css
 
     & #urlbar {
       opacity: 1;
@@ -73,7 +70,6 @@
 
     & #zen-appcontent-navbar-container {
       opacity: 1;
-      transition: none;
     }
   }
 }
diff --git a/src/zen/compact-mode/windows-captions-fix-active.inc.css b/src/zen/compact-mode/windows-captions-fix-active.inc.css
new file mode 100644
index 000000000..252de7bf4
--- /dev/null
+++ b/src/zen/compact-mode/windows-captions-fix-active.inc.css
@@ -0,0 +1,10 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/.
+ */
+
+& .titlebar-buttonbox-container {
+  visibility: visible;
+  transition: none;
+}
diff --git a/src/zen/compact-mode/windows-captions-fix-default.inc.css b/src/zen/compact-mode/windows-captions-fix-default.inc.css
new file mode 100644
index 000000000..586949124
--- /dev/null
+++ b/src/zen/compact-mode/windows-captions-fix-default.inc.css
@@ -0,0 +1,13 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/.
+ */
+
+& .titlebar-buttonbox-container {
+  display: collapse;
+  /* We need to hide them since on Windows the native
+   * panels when hovering over them can interfere with the
+   * web content */
+  transition: visibility var(--zen-hidden-toolbar-transition);
+}
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
index 2251b02d8..fede2685a 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
@@ -12,11 +12,13 @@ z-index: 1;
 }
 
 @media -moz-pref('zen.view.hide-window-controls') {
-  transition: height 0.1s ease, opacity 0.1s ease;
+  transition: height var(--zen-hidden-toolbar-transition), opacity var(--zen-hidden-toolbar-transition);
   will-change: height, opacity;
   transition-delay: 0.2s;
   overflow: clip;
 
+%include ../../compact-mode/windows-captions-fix-active.inc.css
+
   &:not([zen-has-hover='true']):not([has-popup-menu]):not(:focus-within):not(
       :has(*:is([panelopen='true'], [open='true']))
     ) {
@@ -26,6 +28,8 @@ z-index: 1;
       pointer-events: none;
     }
 
+%include ../../compact-mode/windows-captions-fix-default.inc.css
+
     & .titlebar-button {
       padding-top: 0 !important;
       padding-bottom: 0 !important;
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index 6a7591340..557e769ba 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -1531,6 +1531,13 @@
           'color'
         ];
         rgb = rawRgb.match(/\d+/g).map(Number);
+        // Match our theme a bit more, since we can't always expect the OS
+        // to give us a color matching our theme scheme
+        rgb = this.blendColors(
+          rgb,
+          this.getToolbarModifiedBaseRaw().slice(0, 3),
+          this.isDarkMode ? 80 : 50
+        );
       } else {
         rgb = this.hexToRgb(accentColor);
       }

From ec227452e98003e82f3ba735e186624122cf0598 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 17 Oct 2025 00:23:04 +0200
Subject: [PATCH 103/111] chore: Revert setting a custom toolbar height for
 sidebar mode, b=no-bug, c=tabs

---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index f64cdd504..925b25a01 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -30,8 +30,6 @@
    Single Toolbar Mode Specific Styles (`zen-single-toolbar='true'`)
    ========================================================================== */
 :root[zen-single-toolbar='true'] {
-  --zen-toolbar-height: 32px;
-
   @media (-moz-platform: macos) and (not -moz-pref('zen.view.mac.show-three-dot-menu')) {
     &:not([customizing]) #PanelUI-button:not([open]):not([panelopen]) {
       position: absolute;
@@ -117,7 +115,7 @@
   }
 
   & #zen-sidebar-top-buttons {
-    margin: var(--zen-toolbox-padding) 0;
+    margin: var(--zen-toolbox-padding) 0 calc(var(--zen-toolbox-padding) / 2) 0;
   }
 
   & #PanelUI-menu-button {

From b0e3606382742e7a08a7a108aad3a5bf6baa2330 Mon Sep 17 00:00:00 2001
From: atharva kamble <60008419+athkdev@users.noreply.github.com>
Date: Thu, 16 Oct 2025 18:24:12 -0400
Subject: [PATCH 104/111] tests: add unit tests for unloading workspaces,
 p=#10840

---
 .../workspaces/browser_workspace_unload.js    | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 src/zen/tests/workspaces/browser_workspace_unload.js

diff --git a/src/zen/tests/workspaces/browser_workspace_unload.js b/src/zen/tests/workspaces/browser_workspace_unload.js
new file mode 100644
index 000000000..7f2c60f99
--- /dev/null
+++ b/src/zen/tests/workspaces/browser_workspace_unload.js
@@ -0,0 +1,113 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+'use strict';
+
+// verify that workspace unloading works
+add_task(async function test_UnloadWorkspace_WithMultipleTabs() {
+  const workspaceId = await gZenWorkspaces.createAndSaveWorkspace('Test Workspace 1');
+  const tabs = [];
+  for (let i = 0; i < 3; i++) {
+    const tab = await BrowserTestUtils.openNewForegroundTab(
+      window.gBrowser,
+      `data:text/html,<title>Workspace Tab ${i}</title>`,
+      true,
+      { skipAnimation: true }
+    );
+    tab.setAttribute('zen-workspace-id', workspaceId);
+    tabs.push(tab);
+  }
+
+  for (const tab of tabs) {
+    ok(!tab.hasAttribute('pending'), 'Tab should not be pending before unload');
+    ok(tab.linkedPanel, 'Tab should have linked panel before unload');
+  }
+
+  await gZenWorkspaces.unloadWorkspace();
+
+  for (const tab of tabs) {
+    ok(tab.hasAttribute('pending'), 'Tab should be pending after unload');
+    ok(!tab.linkedPanel, 'Tab should not have linked panel after unload');
+  }
+
+  await gZenWorkspaces.removeWorkspace(workspaceId);
+});
+
+// verify that essential tabs are not unloaded
+add_task(async function test_UnloadWorkspace_WithEssentialTabs() {
+  const workspaceId = await gZenWorkspaces.createAndSaveWorkspace('Test Workspace 2');
+
+  const regularTab = await BrowserTestUtils.openNewForegroundTab(
+    window.gBrowser,
+    'data:text/html,<title>Hi! I am a Regular Tab</title>',
+    true,
+    { skipAnimation: true }
+  );
+  regularTab.setAttribute('zen-workspace-id', workspaceId);
+
+  const essentialTab = await BrowserTestUtils.openNewForegroundTab(
+    window.gBrowser,
+    'data:text/html,<title>Hi! I am an Essential Tab</title>',
+    true,
+    { skipAnimation: true }
+  );
+  essentialTab.setAttribute('zen-workspace-id', workspaceId);
+  essentialTab.setAttribute('zen-essential', 'true');
+
+  await gZenWorkspaces.unloadWorkspace();
+
+  ok(regularTab.hasAttribute('pending'), 'Regular tab should be unloaded');
+  ok(!regularTab.linkedPanel, 'Regular tab should not have linked panel');
+
+  ok(!essentialTab.hasAttribute('pending'), 'Essential tab should not be unloaded');
+  ok(essentialTab.linkedPanel, 'Essential tab should still have linked panel');
+
+  await gZenWorkspaces.removeWorkspace(workspaceId);
+});
+
+// only tabs from the targeted workspace should be unloaded
+add_task(async function test_UnloadWorkspace_TargetedWorkspaceIsolation() {
+  const inActiveWorkspaceId = await gZenWorkspaces.createAndSaveWorkspace(
+    'Test In-Active Workspace'
+  );
+  const activeWorkspaceId = await gZenWorkspaces.createAndSaveWorkspace('Test Active Workspace');
+
+  const inActiveWorkspaceTabs = [];
+  for (let i = 0; i < 2; i++) {
+    const tab = await BrowserTestUtils.openNewForegroundTab(
+      window.gBrowser,
+      `data:text/html,<title>In-Active Workspace Tab ${i}</title>`,
+      true,
+      { skipAnimation: true }
+    );
+    tab.setAttribute('zen-workspace-id', inActiveWorkspaceId);
+    inActiveWorkspaceTabs.push(tab);
+  }
+
+  const activeWorkspaceTabs = [];
+  for (let i = 0; i < 2; i++) {
+    const tab = await BrowserTestUtils.openNewForegroundTab(
+      window.gBrowser,
+      `data:text/html,<title>Active Workspace Tab ${i}</title>`,
+      true,
+      { skipAnimation: true }
+    );
+    tab.setAttribute('zen-workspace-id', activeWorkspaceId);
+    activeWorkspaceTabs.push(tab);
+  }
+
+  await gZenWorkspaces.unloadWorkspace(); // this unloads the latest created workspace -> activeWorkspaceId
+
+  for (const tab of activeWorkspaceTabs) {
+    ok(tab.hasAttribute('pending'), 'Active workspace tab should be pending after unload');
+    ok(!tab.linkedPanel, 'Active workspace tab should not have linked panel after unload');
+  }
+
+  for (const tab of inActiveWorkspaceTabs) {
+    ok(!tab.hasAttribute('pending'), 'In-Active workspace tab should NOT be pending after unload');
+    ok(tab.linkedPanel, 'In-Active workspace tab should still have linked panel after unload');
+  }
+
+  await gZenWorkspaces.removeWorkspace(inActiveWorkspaceId);
+  await gZenWorkspaces.removeWorkspace(activeWorkspaceId);
+});

From e0358d784b71453d0d3e4c29917fb3317a48313b Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 17 Oct 2025 11:53:37 +0200
Subject: [PATCH 105/111] feat: Start using native accent color for about
 pages, p=#10847, c=common, tabs

---
 src/zen/common/styles/zen-theme.css                | 3 +--
 src/zen/tabs/zen-tabs.css                          | 4 +---
 src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 859e08293..0baacf3c9 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -12,13 +12,12 @@
 :root {
   /* Default values */
   --zen-border-radius: 7px;
-  --zen-primary-color: #ffb787;
+  --zen-primary-color: AccentColor;
 
   --zen-background-opacity: 1;
 
   /* Branding */
   --zen-branding-dark: #1d1d1d;
-  --zen-branding-coral: #f76f53;
   --zen-branding-paper: #ebebeb;
 
   --zen-branding-bg: light-dark(var(--zen-branding-paper), var(--zen-branding-dark));
diff --git a/src/zen/tabs/zen-tabs.css b/src/zen/tabs/zen-tabs.css
index aa71f65a7..a195b4e44 100644
--- a/src/zen/tabs/zen-tabs.css
+++ b/src/zen/tabs/zen-tabs.css
@@ -36,9 +36,7 @@
       * - Bookmarks toolbar is visible OR
       * - The container is explicitly marked to hide controls (e.g., on Linux with reversed controls)
       */
-    :root[zen-has-bookmarks] & {
-%include zen-tabs/vertical-tabs-topbar.inc.css
-    }
+    :root[zen-has-bookmarks] &,
     &[should-hide='true'] {
 %include zen-tabs/vertical-tabs-topbar.inc.css
     }
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
index fede2685a..791d52044 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
@@ -3,6 +3,9 @@
  * 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/.
  */
+
+--zen-toolbar-height: 34px;
+
 height: var(--zen-toolbar-height);
 z-index: 1;
 

From e64a10b9d695b68743b80e41995ddc3c039b4df0 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 17 Oct 2025 13:46:08 +0200
Subject: [PATCH 106/111] feat: Copy current url now strips tracking
 parameters, b=no-bug, c=common, tabs

---
 .../CustomizableUI-sys-mjs.patch              | 11 ++-
 .../urlbar/UrlbarInput-sys-mjs.patch          | 55 ++++++++------
 src/zen/common/ZenCommonUtils.mjs             | 72 +++++++------------
 src/zen/common/styles/zen-browser-ui.css      |  6 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css       |  3 +
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       |  2 +-
 6 files changed, 79 insertions(+), 70 deletions(-)

diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index 6625364c3..be5a545f9 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index d9a059f608779fea7cd8c595a432f6fe95183e0c..97fbe5f7ac2c5bf18526528a8f50dcf4466fcafd 100644
+index d9a059f608779fea7cd8c595a432f6fe95183e0c..09a7c4045afd0b96027d0bbbad22e02e52fd7b22 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -153,6 +153,15 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..97fbe5f7ac2c5bf18526528a8f50dcf4
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
+@@ -7866,7 +7866,7 @@ class OverflowableToolbar {
+         ) {
+           continue;
+         }
+-        sum += parseFloat(style.marginLeft) + parseFloat(style.marginRight);
++        sum += parseFloat(style.marginLeft) + Math.max(0, parseFloat(style.marginRight));
+         if (child != aExceptChild) {
+           sum += getInlineSize(child);
+         }
 @@ -7890,11 +7890,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 944fd80e1..9e15ed0fb 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2b69f0cf7 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3a28e1f97 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -75,7 +75,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      }
  
      if (isCanonized) {
-@@ -2298,6 +2330,17 @@ export class UrlbarInput {
+@@ -2298,6 +2330,32 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -89,11 +89,26 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
 +    }
 +    return lazy.ZEN_URLBAR_BEHAVIOR;
 +  }
++
++  get zenStrippedURI() {
++    let strippedURI = null;
++
++    // Error check occurs during isClipboardURIValid
++    let uri = this.window.gBrowser.currentURI;
++    try {
++      strippedURI = lazy.QueryStringStripper.stripForCopyOrShare(uri);
++    } catch (e) {
++      console.warn(`stripForCopyOrShare: ${e.message}`);
++      return [uri, lazy.ClipboardHelper];
++    }
++
++    return [strippedURI ? this.makeURIReadable(strippedURI) : uri, lazy.ClipboardHelper];
++  }
 +
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2312,6 +2355,12 @@ export class UrlbarInput {
+@@ -2312,6 +2370,12 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -106,7 +121,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2331,6 +2380,24 @@ export class UrlbarInput {
+@@ -2331,6 +2395,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -131,7 +146,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2660,7 +2727,7 @@ export class UrlbarInput {
+@@ -2660,7 +2742,7 @@ export class UrlbarInput {
  
          this.textbox.parentNode.style.setProperty(
            "--urlbar-container-height",
@@ -140,7 +155,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -3093,6 +3160,7 @@ export class UrlbarInput {
+@@ -3093,6 +3175,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -148,7 +163,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3197,7 +3265,7 @@ export class UrlbarInput {
+@@ -3197,7 +3280,7 @@ export class UrlbarInput {
        return val;
      }
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -157,7 +172,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3501,6 +3569,7 @@ export class UrlbarInput {
+@@ -3501,6 +3584,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -165,7 +180,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      if (this.isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -3608,6 +3677,10 @@ export class UrlbarInput {
+@@ -3608,6 +3692,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -176,7 +191,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3615,6 +3688,9 @@ export class UrlbarInput {
+@@ -3615,6 +3703,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -186,7 +201,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      return where;
    }
  
-@@ -3872,6 +3948,7 @@ export class UrlbarInput {
+@@ -3872,6 +3963,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -194,7 +209,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
  
        this._suppressStartQuery = false;
      });
-@@ -3879,7 +3956,6 @@ export class UrlbarInput {
+@@ -3879,7 +3971,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -202,7 +217,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3991,7 +4067,11 @@ export class UrlbarInput {
+@@ -3991,7 +4082,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -215,7 +230,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4302,6 +4382,7 @@ export class UrlbarInput {
+@@ -4302,6 +4397,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -223,7 +238,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4413,6 +4494,11 @@ export class UrlbarInput {
+@@ -4413,6 +4509,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -235,7 +250,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4485,7 +4571,7 @@ export class UrlbarInput {
+@@ -4485,7 +4586,7 @@ export class UrlbarInput {
        }
      }
  
@@ -244,7 +259,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4525,9 +4611,16 @@ export class UrlbarInput {
+@@ -4525,9 +4626,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -262,7 +277,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
  
          if (
            event.target != this.inputField &&
-@@ -4538,6 +4631,10 @@ export class UrlbarInput {
+@@ -4538,6 +4646,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -273,7 +288,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4573,7 +4670,7 @@ export class UrlbarInput {
+@@ -4573,7 +4685,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
@@ -282,7 +297,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..a2494f2c0f3e4fc50cbe2fe3bf6e2bd2
            break;
          }
  
-@@ -4890,7 +4987,7 @@ export class UrlbarInput {
+@@ -4890,7 +5002,7 @@ export class UrlbarInput {
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =
diff --git a/src/zen/common/ZenCommonUtils.mjs b/src/zen/common/ZenCommonUtils.mjs
index e35178936..4f2058fc9 100644
--- a/src/zen/common/ZenCommonUtils.mjs
+++ b/src/zen/common/ZenCommonUtils.mjs
@@ -68,58 +68,36 @@ class nsZenPreloadedFeature {
 
 var gZenCommonActions = {
   copyCurrentURLToClipboard() {
-    const currentUrl = gBrowser.currentURI.spec;
-    if (currentUrl) {
-      let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-      str.data = currentUrl;
-      let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(
-        Ci.nsITransferable
-      );
-      transferable.init(window.docShell.QueryInterface(Ci.nsILoadContext));
-      transferable.addDataFlavor('text/plain');
-      transferable.setTransferData('text/plain', str);
-      Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-      let button;
-      if (
-        Services.zen.canShare() &&
-        (currentUrl.startsWith('http://') || currentUrl.startsWith('https://'))
-      ) {
-        button = {
-          id: 'zen-copy-current-url-button',
-          command: (event) => {
-            const buttonRect = event.target.getBoundingClientRect();
-            Services.zen.share(
-              Services.io.newURI(currentUrl),
-              '',
-              '',
-              buttonRect.left,
-              window.innerHeight - buttonRect.bottom,
-              buttonRect.width,
-              buttonRect.height
-            );
-          },
-        };
-      }
-      gZenUIManager.showToast('zen-copy-current-url-confirmation', { button, timeout: 3000 });
+    const [currentUrl, ClipboardHelper] = gURLBar.zenStrippedURI;
+    const displaySpec = currentUrl.displaySpec;
+    ClipboardHelper.copyString(displaySpec);
+    let button;
+    if (Services.zen.canShare() && displaySpec.startsWith('http')) {
+      button = {
+        id: 'zen-copy-current-url-button',
+        command: (event) => {
+          const buttonRect = event.target.getBoundingClientRect();
+          Services.zen.share(
+            currentUrl,
+            '',
+            '',
+            buttonRect.left,
+            window.innerHeight - buttonRect.bottom,
+            buttonRect.width,
+            buttonRect.height
+          );
+        },
+      };
     }
+    gZenUIManager.showToast('zen-copy-current-url-confirmation', { button, timeout: 3000 });
   },
 
   copyCurrentURLAsMarkdownToClipboard() {
-    const currentUrl = gBrowser.currentURI.spec;
+    const [currentUrl, ClipboardHelper] = gURLBar.zenStrippedURI;
     const tabTitle = gBrowser.selectedTab.label;
-    if (currentUrl && tabTitle) {
-      const markdownLink = `[${tabTitle}](${currentUrl})`;
-      let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-      str.data = markdownLink;
-      let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(
-        Ci.nsITransferable
-      );
-      transferable.init(window.docShell.QueryInterface(Ci.nsILoadContext));
-      transferable.addDataFlavor('text/plain');
-      transferable.setTransferData('text/plain', str);
-      Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-      gZenUIManager.showToast('zen-copy-current-url-confirmation');
-    }
+    const markdownLink = `[${tabTitle}](${currentUrl.displaySpec})`;
+    ClipboardHelper.copyString(markdownLink);
+    gZenUIManager.showToast('zen-copy-current-url-confirmation', { timeout: 3000 });
   },
 
   throttle(f, delay) {
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index c85a3c78d..2ecf54fab 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -336,6 +336,10 @@
 #zen-appcontent-navbar-wrapper #zen-sidebar-top-buttons {
   max-width: fit-content;
   :root[zen-right-side='true'] & {
-    order: 999;
+    order: 1;
   }
 }
+
+:root[zen-right-side='true'] #zen-appcontent-navbar-wrapper #PanelUI-button {
+  order: 2;
+}
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 925b25a01..90901c862 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -116,6 +116,9 @@
 
   & #zen-sidebar-top-buttons {
     margin: var(--zen-toolbox-padding) 0 calc(var(--zen-toolbox-padding) / 2) 0;
+    :root[zen-right-side='true']:not([zen-window-buttons-reversed='true']) & {
+      margin-top: 0;
+    }
   }
 
   & #PanelUI-menu-button {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 48cf7aebb..ec2bda8c1 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -337,7 +337,7 @@ export class nsZenSiteDataPanel {
     }
 
     separator.hidden = !settingElements.length || !crossSiteCookieElements.length;
-    section.hidden = list.childElementCount == 0;
+    section.hidden = list.childElementCount < 2; // only the separator
   }
 
   #getPermissionStateLabelId(permission) {

From 4f5ad8e8fcebc084f8ae53ead66763e036ef9dbe Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 17 Oct 2025 16:02:23 +0200
Subject: [PATCH 107/111] feat: Allow popups to be opened on the urlbar,
 p=#10849, c=common

---
 src/zen/common/styles/zen-omnibox.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index e0cef344d..b94418f1f 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -134,9 +134,10 @@
   #zen-copy-url-button {
     opacity: 0;
     transition:
-      opacity 0.2s,
-      visibility 0.2s;
+      opacity 0.15s,
+      visibility 0.15s;
     visibility: collapse;
+    height: 100%; /* To still be able to open popups */
 
     #navigator-toolbox:hover &,
     &[open],

From dc7455c4e4c7df13c29fd7c0ae5b903cd94401c5 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 17 Oct 2025 21:29:33 +0200
Subject: [PATCH 108/111] feat: Invert the omnibox buttons on double toolbar,
 b=no-bug, c=common

---
 src/zen/common/styles/zen-omnibox.css | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index e0cef344d..3a2cd6d70 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -147,6 +147,22 @@
   }
 }
 
+:root:not([zen-single-toolbar='true'])
+  #urlbar:not([breakout-extend='true'])
+  .urlbar-input-container:not([pageproxystate='invalid']) {
+  flex-direction: row-reverse;
+  gap: 2px;
+  padding: 2px;
+
+  & .urlbar-page-action {
+    height: 100%;
+  }
+
+  & #identity-box {
+    margin: 0px !important;
+  }
+}
+
 .urlbar-page-action,
 #tracking-protection-icon-container {
   padding: 0 !important;
@@ -196,6 +212,7 @@
 
   & #identity-box {
     margin-right: calc(var(--urlbar-margin-inline) - 1px);
+    height: 100%;
   }
 
   & .urlbar-background {

From 33285ed1b60be4970db447457896b44762b7494d Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 17 Oct 2025 21:30:01 +0200
Subject: [PATCH 109/111] chore: New Crowdin updates, p=#10851

* New translations zen-general.ftl (French)

* New translations zen-preferences.ftl (German)

* New translations zen-workspaces.ftl (German)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (German)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Korean)

* New translations zen-general.ftl (Portuguese)

* New translations zen-general.ftl (Indonesian)
---
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/de/browser/browser/zen-general.ftl    | 40 +++++++++----------
 locales/de/browser/browser/zen-workspaces.ftl |  2 +-
 locales/es-ES/browser/browser/zen-general.ftl |  4 +-
 locales/fr/browser/browser/zen-general.ftl    |  4 +-
 locales/ga-IE/browser/browser/zen-general.ftl |  4 +-
 locales/hu/browser/browser/zen-general.ftl    |  4 +-
 locales/id/browser/browser/zen-general.ftl    |  4 +-
 locales/ko/browser/browser/zen-general.ftl    | 10 ++---
 locales/pt-PT/browser/browser/zen-general.ftl |  4 +-
 10 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index 53c9f5cd7..19651bc1e 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -72,7 +72,7 @@ zen-settings-workspaces-enabled =
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Standard-Container-Anzeige in der Tab-Leiste ausblenden
 zen-key-unsaved = Nicht gespeichertes Tastenkürzel! Bitte speichern Sie es, indem Sie nach der Neueingabe die "Escape"-Taste drücken.
-zen-key-conflict = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Konflikt mit { $group } -> { $shortcut }
 pane-zen-theme-title = Design-Einstellungen
 zen-vertical-tabs-title = Seitenleiste und Tab-Layout
 zen-vertical-tabs-header = Vertikale Tabs
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 7ee1d0f50..ac70d5555 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = Minimieren
 zen-panel-ui-gradient-generator-custom-color = Benutzerdefinierte Farbe
 zen-panel-ui-gradient-generator-saved-message = Farbverlauf erfolgreich gespeichert!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = Aktuelle URL kopiert!
 zen-general-cancel-label = 
     .label = Abbrechen
 zen-general-confirm = 
@@ -39,7 +39,7 @@ zen-library-sidebar-mods =
     .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Compact Mode
-    .tooltiptext = Toggle Compact Mode
+    .tooltiptext = Compact Mode umschalten
 
 # note: Do not translate the "<br/>" tags in the following string
 
@@ -52,33 +52,33 @@ zen-icons-picker-emoji =
 zen-icons-picker-svg = 
     .label = Symbole
 urlbar-search-mode-zen_actions = Aktionen
-zen-site-data-settings = Settings
-zen-generic-manage = Manage
-zen-generic-more = More
-zen-generic-next = Next
+zen-site-data-settings = Einstellungen
+zen-generic-manage = Verwalten
+zen-generic-more = Mehr
+zen-generic-next = Weiter
 # These labels will be used for the site data panel settings
-zen-site-data-setting-allow = Allowed
-zen-site-data-setting-block = Blocked
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-allow = Erlaubt
+zen-site-data-setting-block = Blockiert
+zen-site-data-setting-cross-site = Cross-Site-Cookie
 zen-site-data-security-info-extension = 
-    .label = Extension
+    .label = Erweiterung
 zen-site-data-security-info-secure = 
-    .label = Secure
+    .label = Sicher
 zen-site-data-security-info-not-secure = 
-    .label = Not Secure
+    .label = Nicht sicher
 zen-site-data-manage-addons = 
-    .label = Manage Extensions
+    .label = Erweiterungen verwalten
 zen-site-data-get-addons = 
-    .label = Add Extensions
+    .label = Erweiterungen hinzufügen
 zen-site-data-site-settings = 
-    .label = All Site Settings
+    .label = Alle Website-Einstellungen
 zen-site-data-share = 
-    .label = Share This Page
+    .label = Diese Seite teilen
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = URL kopieren
+zen-site-data-setting-site-protection = Tracking-Schutz
 
 # Section: Feature callouts
 
-zen-site-data-panel-feature-callout-title = A new home for add-ons, permissions, and more
-zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-site-data-panel-feature-callout-title = Eine neue Heimat für Add-ons, Berechtigungen und mehr
+zen-site-data-panel-feature-callout-subtitle = Klicken Sie auf das Symbol, um Website-Einstellungen zu verwalten, Sicherheitsinformationen anzuzeigen, auf Erweiterungen zuzugreifen und häufige Aktionen auszuführen.
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index 1d69583d9..071228c99 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -15,7 +15,7 @@ zen-workspaces-panel-change-icon =
 zen-workspaces-panel-context-default-profile = 
     .label = Profil festlegen
 zen-workspaces-panel-unload = 
-    .label = Unload Space
+    .label = Arbeitsbereich entladen
 zen-workspaces-how-to-reorder-title = Wie Arbeitsbereiche neu angeordnet werden
 zen-workspaces-how-to-reorder-desc = Ziehen Sie die Arbeitsbereich-Symbole am unteren Rand der Seitenleiste, um sie neu anzuordnen
 zen-workspaces-change-theme = 
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index 2ad98e52a..fe0588c8b 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -59,7 +59,7 @@ zen-generic-next = Siguiente
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-cross-site = Cookie de terceros
 zen-site-data-security-info-extension = 
     .label = Extensión
 zen-site-data-security-info-secure = 
@@ -76,7 +76,7 @@ zen-site-data-share =
     .label = Compartir esta página
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Protección contra el rastreo
 
 # Section: Feature callouts
 
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index b0fc3d154..a22ad1afe 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -59,7 +59,7 @@ zen-generic-next = Suivant
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Autorisé
 zen-site-data-setting-block = Bloqué
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-cross-site = cookie intersite
 zen-site-data-security-info-extension = 
     .label = Extension
 zen-site-data-security-info-secure = 
@@ -76,7 +76,7 @@ zen-site-data-share =
     .label = Partager cette page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copier l'URL
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Protection contre le pistage
 
 # Section: Feature callouts
 
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index f49593590..0996ffa2b 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -59,7 +59,7 @@ zen-generic-next = Ar Aghaidh
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Ceadaithe
 zen-site-data-setting-block = Blocáilte
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-cross-site = Fianán Tras-Láithreáin
 zen-site-data-security-info-extension = 
     .label = Síneadh
 zen-site-data-security-info-secure = 
@@ -76,7 +76,7 @@ zen-site-data-share =
     .label = Comhroinn an Leathanach seo
 zen-urlbar-copy-url-button = 
     .tooltiptext = Cóipeáil URL
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Cosaint Rianaithe
 
 # Section: Feature callouts
 
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index b48bba8a5..3c75ef5da 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -59,7 +59,7 @@ zen-generic-next = Következő
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Engedélyezve
 zen-site-data-setting-block = Letiltva
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-cross-site = Webhelyek közötti sütik
 zen-site-data-security-info-extension = 
     .label = Kiegészítő
 zen-site-data-security-info-secure = 
@@ -76,7 +76,7 @@ zen-site-data-share =
     .label = Oldal megosztása
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL másolása
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Nyomkövetés védelem
 
 # Section: Feature callouts
 
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 1186a839a..7cc80dab9 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -59,7 +59,7 @@ zen-generic-next = Lanjut
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Diizinkan
 zen-site-data-setting-block = Diblokir
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-cross-site = Kuki Lintas Situs
 zen-site-data-security-info-extension = 
     .label = Ekstensi
 zen-site-data-security-info-secure = 
@@ -76,7 +76,7 @@ zen-site-data-share =
     .label = Bagikan Halaman Ini
 zen-urlbar-copy-url-button = 
     .tooltiptext = Salin URL
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Perlindungan Pelacakan
 
 # Section: Feature callouts
 
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index a0e04b030..2d98c1b11 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -24,7 +24,7 @@ pictureinpicture-minimize-btn =
     .tooltip = 최소화
 zen-panel-ui-gradient-generator-custom-color = 커스텀 색상
 zen-panel-ui-gradient-generator-saved-message = 성공적으로 그라데이션을 저장했습니다!
-zen-copy-current-url-confirmation = Copied current URL!
+zen-copy-current-url-confirmation = 현재 URL을 복사했습니다!
 zen-general-cancel-label = 
     .label = 취소
 zen-general-confirm = 
@@ -55,11 +55,11 @@ urlbar-search-mode-zen_actions = 액션
 zen-site-data-settings = 설정
 zen-generic-manage = 관리
 zen-generic-more = 더 보기
-zen-generic-next = Next
+zen-generic-next = 다음
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = 허용됨
 zen-site-data-setting-block = 금지됨
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-cross-site = 사이트 간 공유 쿠키
 zen-site-data-security-info-extension = 
     .label = 확장
 zen-site-data-security-info-secure = 
@@ -73,10 +73,10 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = 모든 사이트 설정
 zen-site-data-share = 
-    .label = Share This Page
+    .label = 이 페이지 공유
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL 복사
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = 추적 보호
 
 # Section: Feature callouts
 
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 88d67713d..8ae46244e 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -59,7 +59,7 @@ zen-generic-next = Seguinte
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Permitido
 zen-site-data-setting-block = Bloqueado
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-cross-site = Cookies entre sites
 zen-site-data-security-info-extension = 
     .label = Extensão
 zen-site-data-security-info-secure = 
@@ -76,7 +76,7 @@ zen-site-data-share =
     .label = Partilhar Esta Página
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Proteção contra rastreio
 
 # Section: Feature callouts
 

From 741c3251ea59c7e851ac933e5aa9e59d02c87925 Mon Sep 17 00:00:00 2001
From: Mingyuan Zhao <17zhaomingyuan@gmail.com>
Date: Sat, 18 Oct 2025 07:36:32 -0400
Subject: [PATCH 110/111] fix: add requests to requirements.txt, p=#10855

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 20fc10ae6..d01dcfa80 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,4 @@ packaging==24.2
 pathspec==0.12.1
 platformdirs==4.3.6
 pycodestyle==2.12.1
+requests==2.32.5

From 3801696adcc4e012a4b1d1f72d2791c812be60ef Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 18 Oct 2025 15:45:23 +0200
Subject: [PATCH 111/111] feat: Improved double toolbar urlbar twitching,
 b=no-bug, c=common, compact-mode

---
 .../urlbar/UrlbarInput-sys-mjs.patch          | 47 +++++++++++------
 .../identity-block/identity-block-css.patch   | 23 ++++----
 src/browser/themes/shared/zen-icons/icons.css | 17 +-----
 .../themes/shared/zen-icons/jar.inc.mn        |  6 ---
 .../shared/zen-icons/lin/reload-to-stop.svg   | 32 ------------
 .../shared/zen-icons/lin/stop-to-reload.svg   | 39 --------------
 src/zen/common/ZenCustomizableUI.sys.mjs      |  1 +
 .../common/styles/zen-browser-container.css   |  1 +
 src/zen/common/styles/zen-omnibox.css         | 32 ++++++++++--
 src/zen/compact-mode/ZenCompactMode.mjs       | 52 +++++++++++++++++--
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       | 20 +++++--
 11 files changed, 137 insertions(+), 133 deletions(-)
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/reload-to-stop.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/stop-to-reload.svg

diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 9e15ed0fb..eb7ef3cd2 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3a28e1f97 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1acfd896f 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -146,7 +146,20 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2660,7 +2742,7 @@ export class UrlbarInput {
+@@ -2595,10 +2677,12 @@ export class UrlbarInput {
+       return;
+     }
+     this.textbox.style.top = px(
++      this.window.gZenVerticalTabsManager._hasSetSingleToolbar ?
+       this.textbox.parentNode.getBoxQuads({
+         ignoreTransforms: true,
+         flush: false,
+       })[0].p1.y
++      : -5
+     );
+   }
+ 
+@@ -2660,7 +2744,7 @@ export class UrlbarInput {
  
          this.textbox.parentNode.style.setProperty(
            "--urlbar-container-height",
@@ -155,7 +168,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -3093,6 +3175,7 @@ export class UrlbarInput {
+@@ -3093,6 +3177,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -163,7 +176,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3197,7 +3280,7 @@ export class UrlbarInput {
+@@ -3197,7 +3282,7 @@ export class UrlbarInput {
        return val;
      }
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -172,7 +185,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3501,6 +3584,7 @@ export class UrlbarInput {
+@@ -3501,6 +3586,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -180,7 +193,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
      if (this.isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -3608,6 +3692,10 @@ export class UrlbarInput {
+@@ -3608,6 +3694,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -191,7 +204,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3615,6 +3703,9 @@ export class UrlbarInput {
+@@ -3615,6 +3705,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -201,7 +214,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
      return where;
    }
  
-@@ -3872,6 +3963,7 @@ export class UrlbarInput {
+@@ -3872,6 +3965,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -209,7 +222,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
  
        this._suppressStartQuery = false;
      });
-@@ -3879,7 +3971,6 @@ export class UrlbarInput {
+@@ -3879,7 +3973,6 @@ export class UrlbarInput {
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -217,7 +230,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3991,7 +4082,11 @@ export class UrlbarInput {
+@@ -3991,7 +4084,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -230,7 +243,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4302,6 +4397,7 @@ export class UrlbarInput {
+@@ -4302,6 +4399,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -238,7 +251,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4413,6 +4509,11 @@ export class UrlbarInput {
+@@ -4413,6 +4511,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -250,7 +263,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4485,7 +4586,7 @@ export class UrlbarInput {
+@@ -4485,7 +4588,7 @@ export class UrlbarInput {
        }
      }
  
@@ -259,7 +272,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4525,9 +4626,16 @@ export class UrlbarInput {
+@@ -4525,9 +4628,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -277,7 +290,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
  
          if (
            event.target != this.inputField &&
-@@ -4538,6 +4646,10 @@ export class UrlbarInput {
+@@ -4538,6 +4648,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -288,7 +301,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4573,7 +4685,7 @@ export class UrlbarInput {
+@@ -4573,7 +4687,7 @@ export class UrlbarInput {
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
@@ -297,7 +310,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ea4f649026077fb6ce9d02b5fe3785c3
            break;
          }
  
-@@ -4890,7 +5002,7 @@ export class UrlbarInput {
+@@ -4890,7 +5004,7 @@ export class UrlbarInput {
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =
diff --git a/src/browser/themes/shared/identity-block/identity-block-css.patch b/src/browser/themes/shared/identity-block/identity-block-css.patch
index 32a0bd35f..13df820cf 100644
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,17 +1,22 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index 8edca63dc52ec207475ed9965559d28c06e27971..884343473857c6b6256922d47085fac6eabe74fb 100644
+index 8edca63dc52ec207475ed9965559d28c06e27971..a5a949be1868af5d0bb04747a9f5b737c00ae49c 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
-@@ -83,7 +83,7 @@
+@@ -81,13 +81,6 @@
+   }
+ }
  
- #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
- #urlbar-label-box {
+-#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
+-#urlbar-label-box {
 -  background-color: var(--urlbar-box-bgcolor);
-+  background-color: transparent;
-   color: var(--urlbar-box-text-color);
-   padding-inline: 8px;
-   border-radius: var(--urlbar-icon-border-radius);
-@@ -178,16 +178,17 @@
+-  color: var(--urlbar-box-text-color);
+-  padding-inline: 8px;
+-  border-radius: var(--urlbar-icon-border-radius);
+-}
+ 
+ #urlbar[focused] {
+   #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:not(:hover, [open]),
+@@ -178,16 +171,17 @@
    }
  
    #identity-icon {
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index ca3d21e8b..9cddd5e1f 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -662,22 +662,6 @@
   list-style-image: url('tab-audio-blocked-small.svg') !important;
 }
 
-/* reload/stop animation */
-#stop-reload-button[animate]
-  > #reload-button[displaystop]
-  + #stop-button
-  > .toolbarbutton-animatable-box
-  > .toolbarbutton-animatable-image {
-  background-image: url('reload-to-stop.svg') !important;
-}
-
-#stop-reload-button[animate]
-  > #reload-button
-  > .toolbarbutton-animatable-box
-  > .toolbarbutton-animatable-image {
-  background-image: url('stop-to-reload.svg') !important;
-}
-
 #reader-mode-button > .urlbar-icon,
 #zen-site-data-header-reader-mode {
   list-style-image: url('reader-mode.svg') !important;
@@ -950,4 +934,5 @@
 
 #zen-copy-url-button image {
   list-style-image: url('link.svg');
+  fill-opacity: 0.7;
 }
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index e27e79524..b97b3837b 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -111,7 +111,6 @@
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/lin/private-window.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/lin/reader-mode.svg) 
-*  skin/classic/browser/zen-icons/reload-to-stop.svg                      (../shared/zen-icons/lin/reload-to-stop.svg) 
 *  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/report.svg                      (../shared/zen-icons/lin/report.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/lin/save.svg) 
@@ -134,7 +133,6 @@
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/lin/spell-check.svg) 
 *  skin/classic/browser/zen-icons/split.svg                      (../shared/zen-icons/lin/split.svg) 
-*  skin/classic/browser/zen-icons/stop-to-reload.svg                      (../shared/zen-icons/lin/stop-to-reload.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-blocked-small.svg                      (../shared/zen-icons/lin/tab-audio-blocked-small.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-muted-small.svg                      (../shared/zen-icons/lin/tab-audio-muted-small.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-playing-small.svg                      (../shared/zen-icons/lin/tab-audio-playing-small.svg) 
@@ -265,7 +263,6 @@
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/lin/private-window.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/lin/reader-mode.svg) 
-*  skin/classic/browser/zen-icons/reload-to-stop.svg                      (../shared/zen-icons/lin/reload-to-stop.svg) 
 *  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/report.svg                      (../shared/zen-icons/lin/report.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/lin/save.svg) 
@@ -288,7 +285,6 @@
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/lin/spell-check.svg) 
 *  skin/classic/browser/zen-icons/split.svg                      (../shared/zen-icons/lin/split.svg) 
-*  skin/classic/browser/zen-icons/stop-to-reload.svg                      (../shared/zen-icons/lin/stop-to-reload.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-blocked-small.svg                      (../shared/zen-icons/lin/tab-audio-blocked-small.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-muted-small.svg                      (../shared/zen-icons/lin/tab-audio-muted-small.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-playing-small.svg                      (../shared/zen-icons/lin/tab-audio-playing-small.svg) 
@@ -419,7 +415,6 @@
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/lin/private-window.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/lin/reader-mode.svg) 
-*  skin/classic/browser/zen-icons/reload-to-stop.svg                      (../shared/zen-icons/lin/reload-to-stop.svg) 
 *  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/lin/reload.svg) 
 *  skin/classic/browser/zen-icons/report.svg                      (../shared/zen-icons/lin/report.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/lin/save.svg) 
@@ -442,7 +437,6 @@
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/lin/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/lin/spell-check.svg) 
 *  skin/classic/browser/zen-icons/split.svg                      (../shared/zen-icons/lin/split.svg) 
-*  skin/classic/browser/zen-icons/stop-to-reload.svg                      (../shared/zen-icons/lin/stop-to-reload.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-blocked-small.svg                      (../shared/zen-icons/lin/tab-audio-blocked-small.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-muted-small.svg                      (../shared/zen-icons/lin/tab-audio-muted-small.svg) 
 *  skin/classic/browser/zen-icons/tab-audio-playing-small.svg                      (../shared/zen-icons/lin/tab-audio-playing-small.svg) 
diff --git a/src/browser/themes/shared/zen-icons/lin/reload-to-stop.svg b/src/browser/themes/shared/zen-icons/lin/reload-to-stop.svg
deleted file mode 100644
index e4c0f09cc..000000000
--- a/src/browser/themes/shared/zen-icons/lin/reload-to-stop.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-#filter dumbComments emptyLines substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-<!-- do not round the stroke-width -->
-<svg xmlns="http://www.w3.org/2000/svg" stroke-width="1.001" stroke="context-fill" stroke-opacity="context-fill-opacity" width="260" height="20" fill="none" stroke-linecap="round" stroke-linejoin="round">
-  <defs>
-    <clipPath id="a"><path d="M0 3h6l8 7 5 1v9H0z"/></clipPath>
-    <clipPath id="b"><path d="M9 0v12l-5 8H0V0z"/></clipPath>
-    <clipPath id="c"><path d="m5 3 2 4h5V0H5z"/></clipPath>
-    <clipPath id="d"><path d="m10 8-2 2-5-5 2-2z"/></clipPath>
-    <clipPath id="e"><path d="m5 3 10 10-2 2L3 5z"/></clipPath>
-    <clipPath id="f"><path d="m5 3 12 12-2 2L3 5z"/></clipPath>
-    <clipPath id="g"><path d="m3 1 16 16H3z"/></clipPath>
-    <clipPath id="h"><path d="M3 3h7l7 7v7H3z"/></clipPath>
-    <path id="reload" d="M17.48 9.5v.5c0 4.1-3.4 7.5-7.5 7.5s-7.5-3.4-7.5-7.5 3.4-7.5 7.5-7.5c2.8 0 5.2 1.5 6.5 3.8m.02-3.8v4h-4"/>
-    <path id="close" d="m4.5 4.5 11 11m-11 0 11-11"/>
-  </defs>
-  <svg><use href="#reload"/></svg>
-  <svg x="20"><use href="#reload" transform="rotate(45 10 10)"/></svg>
-  <svg x="40"><use href="#reload" transform="rotate(125 10 10)"/></svg>
-  <svg x="60"><use href="#reload" transform="rotate(195 10 10)"/></svg>
-  <svg x="80"><use href="#reload" transform="rotate(235 10 10)"/></svg>
-  <svg x="100"><g clip-path="url(#a)"><use href="#reload" transform="rotate(260 10 10)"/></g></svg>
-  <svg x="120"><g clip-path="url(#b)"><use href="#reload" transform="rotate(280 10 10)"/></g></svg>
-  <svg x="140"><g clip-path="url(#c)"><use href="#reload" transform="rotate(300 10 10)"/></g><use href="#close" clip-path="url(#d)"/></svg>
-  <svg x="160"><use href="#close" clip-path="url(#e)"/></svg>
-  <svg x="180"><use href="#close" clip-path="url(#f)"/></svg>
-  <svg x="200"><use href="#close" clip-path="url(#g)"/></svg>
-  <svg x="220"><use href="#close" clip-path="url(#h)"/></svg>
-  <svg x="240"><use href="#close"/></svg>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/stop-to-reload.svg b/src/browser/themes/shared/zen-icons/lin/stop-to-reload.svg
deleted file mode 100644
index ac36f0afa..000000000
--- a/src/browser/themes/shared/zen-icons/lin/stop-to-reload.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-#filter dumbComments emptyLines substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-<!-- do not round the stroke-width -->
-<svg xmlns="http://www.w3.org/2000/svg" stroke-width="1.001" stroke="context-fill" stroke-opacity="context-fill-opacity" fill="none" stroke-linecap="round" stroke-linejoin="round">
-  <defs>
-    <clipPath id="a"><path d="m3 6 11 11h3V3H3Z"/></clipPath>
-    <clipPath id="b"><path d="M5 3 3 5l12 12 2-2L5 3zm10 0-2 2 2 2 2-2-2-2z"/></clipPath>
-    <clipPath id="c"><path d="m5 3 12 12-2 2L3 5Z"/></clipPath>
-    <clipPath id="d"><path d="m5 3 7 7-2 2-7-7z"/></clipPath>
-    <clipPath id="e"><path d="m5 3 2 2-2 2-2-2Z"/></clipPath>
-    <clipPath id="f"><path d="m16 3-4 6h10Z"/></clipPath>
-    <clipPath id="g"><path d="m11 11 8 6V4h-4z"/></clipPath>
-    <clipPath id="h"><path d="m11 11-1 9h9V0l-7 8z"/></clipPath>
-    <clipPath id="i"><path d="M16 3 3 17v3h16V3Z"/></clipPath>
-    <clipPath id="j"><path d="m16 3-3 4-13 3v10h19V3Z"/></clipPath>
-    <clipPath id="k"><path d="m16 3-3 4L0 2v18h20V3Z"/></clipPath>
-    <clipPath id="l"><path d="m16 3-3 4-8-7H0v20h20V3Z"/></clipPath>
-    <clipPath id="m"><path d="m16 3-3 4-2-7H0v20h20V3Z"/></clipPath>
-    <path id="reload" d="M17.48 9.5v.5c0 4.1-3.4 7.5-7.5 7.5s-7.5-3.4-7.5-7.5 3.4-7.5 7.5-7.5c2.8 0 5.2 1.5 6.5 3.8m.02-3.8v4h-4"/>
-    <path id="close" d="m4.5 4.5 11 11m-11 0 11-11"/>
-  </defs>
-  <svg><use href="#close"/></svg>
-  <svg x="20"><use href="#close" clip-path="url(#a)"/></svg>
-  <svg x="40"><use href="#close" clip-path="url(#b)"/></svg>
-  <svg x="60"><g clip-path="url(#f)"><use href="#reload" transform="rotate(40 10 10)"/></g><use href="#close" clip-path="url(#c)"/></svg>
-  <svg x="80"><g clip-path="url(#g)"><use href="#reload" transform="rotate(80 10 10)"/></g><use href="#close" clip-path="url(#d)"/></svg>
-  <svg x="100"><g clip-path="url(#h)"><use href="#reload" transform="rotate(120 10 10)"/></g><use href="#close" clip-path="url(#e)"/></svg>
-  <svg x="120"><g clip-path="url(#i)"><use href="#reload" transform="rotate(160 10 10)"/></g></svg>
-  <svg x="140"><g clip-path="url(#j)"><use href="#reload" transform="rotate(200 10 10)"/></g></svg>
-  <svg x="160"><g clip-path="url(#k)"><use href="#reload" transform="rotate(250 10 10)"/></g></svg>
-  <svg x="180"><g clip-path="url(#l)"><use href="#reload" transform="rotate(270 10 10)"/></g></svg>
-  <svg x="200"><g clip-path="url(#m)"><use href="#reload" transform="rotate(300 10 10)"/></g></svg>
-  <svg x="220"><use href="#reload" transform="rotate(335 10 10)"/></svg>
-  <svg x="240"><use href="#reload" transform="rotate(345 10 10)"/></svg>
-  <svg x="260"><use href="#reload" transform="rotate(355 10 10)"/></svg>
-  <svg x="280"><use href="#reload"/></svg>
-</svg>
diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index 81359f7ed..e748b5b71 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -71,6 +71,7 @@ export var ZenCustomizableUI = new (class {
             <toolbarbutton
               class="toolbarbutton-1"
               command="cmd_toggleCompactModeIgnoreHover"
+              flex="1"
               data-l10n-id="zen-toggle-compact-mode-button" />
           </toolbaritem>
           <html:div id="zen-sidebar-top-buttons-separator" skipintoolbarset="true" overflows="false"></html:div>
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index c06def63c..db466d89c 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -49,6 +49,7 @@
 
       :root[zen-single-toolbar='true'] & {
         transition-delay: 0.2s;
+        --zen-toolbar-height: 34px;
       }
 
       #tabbrowser-tabpanels[has-toolbar-hovered] & {
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index ce465f3a5..3cefc3856 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -114,7 +114,7 @@
   border-radius: 0px !important;
 }
 
-#urlbar:not([breakout-extend='true']) .urlbar-input-box {
+#urlbar .urlbar-input-box {
   font-weight: 500;
 }
 
@@ -151,19 +151,35 @@
 :root:not([zen-single-toolbar='true'])
   #urlbar:not([breakout-extend='true'])
   .urlbar-input-container:not([pageproxystate='invalid']) {
-  flex-direction: row-reverse;
+  padding: 2px 3px;
   gap: 2px;
-  padding: 2px;
 
   & .urlbar-page-action {
     height: 100%;
   }
 
+  & #zen-copy-url-button {
+    order: -1;
+  }
+
   & #identity-box {
+    order: 999;
     margin: 0px !important;
   }
 }
 
+#zen-copy-url-button[disabled] {
+  opacity: 0.3;
+  background: transparent !important;
+}
+
+:root[zen-single-toolbar='true'],
+#urlbar:is([breakout-extend='true'], [pageproxystate='invalid']) {
+  #zen-copy-url-button[disabled] {
+    display: none !important;
+  }
+}
+
 .urlbar-page-action,
 #tracking-protection-icon-container {
   padding: 0 !important;
@@ -204,7 +220,8 @@
 #urlbar[breakout-extend='true'] {
   z-index: 2;
 
-  & .urlbar-input-container {
+  :root[zen-single-toolbar='true'] & .urlbar-input-box,
+  &[zen-floating-urlbar='true'] .urlbar-input-box {
     font-weight: 400;
     @media (-moz-platform: windows) {
       font-weight: 500;
@@ -212,10 +229,15 @@
   }
 
   & #identity-box {
-    margin-right: calc(var(--urlbar-margin-inline) - 1px);
     height: 100%;
   }
 
+  :root:not([zen-single-toolbar='true'])
+    &:not([zen-floating-urlbar='true'])
+    #identity-box:not([pageproxystate='invalid']) {
+    margin-inline-end: 0;
+  }
+
   & .urlbar-background {
     --zen-urlbar-background-base: light-dark(
       #fbfbfb,
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 83f8303be..6e691f507 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -202,6 +202,7 @@ var gZenCompactModeManager = {
   },
 
   updateCompactModeContext(isSingleToolbar) {
+    isSingleToolbar ||= this.checkIfIllegalState();
     const menuitem = document.getElementById('zen-context-menu-compact-mode-toggle');
     const menu = document.getElementById('zen-context-menu-compact-mode');
     if (isSingleToolbar) {
@@ -231,6 +232,37 @@ var gZenCompactModeManager = {
     this.callAllEventListeners();
   },
 
+  /* Check for illegal states and fix them
+   * @returns {boolean} If the context menu should just show the "toggle" item
+   *    instead of a submenu with hide options
+   */
+  checkIfIllegalState() {
+    // Due to how we layout the sidebar and toolbar, there are some states
+    // that are not allowed mainly due to the caption buttons not being accessible
+    // at the top left/right of the window.
+    const isSidebarExpanded = gZenVerticalTabsManager._prefsSidebarExpanded;
+    if (isSidebarExpanded) {
+      // Fast exit if the sidebar is expanded, as we dont have illegal states then
+      return false;
+    }
+    const canHideSidebar = this.canHideSidebar;
+    const canHideToolbar = this.canHideToolbar;
+    const isLeftSideButtons = !gZenVerticalTabsManager.isWindowsStyledButtons;
+    const isRightSidebar = gZenVerticalTabsManager._prefsRightSide;
+    // on macos: collapsed + left side + only toolbar
+    // on windows: collapsed + right side + only toolbar
+    const closelyIllegalState =
+      (isLeftSideButtons && !isRightSidebar) || (!isLeftSideButtons && isRightSidebar);
+    if (closelyIllegalState && canHideToolbar && !canHideSidebar) {
+      // This state is illegal
+      Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
+      Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', false);
+      this.callAllEventListeners();
+      return true;
+    }
+    return closelyIllegalState;
+  },
+
   callAllEventListeners() {
     this._eventListeners.forEach((callback) => callback());
   },
@@ -309,6 +341,13 @@ var gZenCompactModeManager = {
     );
   },
 
+  get canHideToolbar() {
+    return (
+      Services.prefs.getBoolPref('zen.view.compact.hide-toolbar') &&
+      !gZenVerticalTabsManager._hasSetSingleToolbar
+    );
+  },
+
   animateCompactMode() {
     // Get the splitter width before hiding it (we need to hide it before animating on right)
     document.documentElement.setAttribute('zen-compact-animating', 'true');
@@ -464,14 +503,17 @@ var gZenCompactModeManager = {
       .getElementById('zen-context-menu-compact-mode-toggle')
       .setAttribute('checked', this.preference);
 
-    const hideTabBar = Services.prefs.getBoolPref('zen.view.compact.hide-tabbar', false);
-    const hideToolbar = Services.prefs.getBoolPref('zen.view.compact.hide-toolbar', false);
+    const hideTabBar = this.canHideSidebar;
+    const hideToolbar = this.canHideToolbar;
     const hideBoth = hideTabBar && hideToolbar;
 
     const idName = 'zen-context-menu-compact-mode-hide-';
-    document.getElementById(idName + 'sidebar').setAttribute('checked', !hideBoth && hideTabBar);
-    document.getElementById(idName + 'toolbar').setAttribute('checked', !hideBoth && hideToolbar);
-    document.getElementById(idName + 'both').setAttribute('checked', hideBoth);
+    const sidebarItem = document.getElementById(idName + 'sidebar');
+    const toolbarItem = document.getElementById(idName + 'toolbar');
+    const bothItem = document.getElementById(idName + 'both');
+    sidebarItem.setAttribute('checked', !hideBoth && hideTabBar);
+    toolbarItem.setAttribute('checked', !hideBoth && hideToolbar);
+    bothItem.setAttribute('checked', hideBoth);
   },
 
   _removeOpenStateOnUnifiedExtensions() {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index ec2bda8c1..91f648636 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -76,21 +76,29 @@ export class nsZenSiteDataPanel {
             class="urlbar-page-action"
             role="button"
             data-l10n-id="zen-urlbar-copy-url-button"
-            hidden="true">
+            disabled="true">
         <image class="urlbar-icon"/>
       </hbox>
     `);
-    container.appendChild(fragment);
+    container.after(fragment);
 
     const aElement = this.document.getElementById('zen-copy-url-button');
     aElement.addEventListener('click', () => {
+      if (aElement.hasAttribute('disabled')) {
+        return;
+      }
       this.document.getElementById('cmd_zenCopyCurrentURL').doCommand();
     });
 
     this.window.gBrowser.addProgressListener({
       onLocationChange: (aWebProgress, aRequest, aLocation) => {
         if (aWebProgress.isTopLevel) {
-          aElement.hidden = !this.#canCopyUrl(aLocation);
+          const disabled = !this.#canCopyUrl(aLocation);
+          if (disabled) {
+            aElement.setAttribute('disabled', true);
+          } else {
+            aElement.removeAttribute('disabled');
+          }
         }
       },
     });
@@ -524,7 +532,11 @@ export class nsZenSiteDataPanel {
         break;
       }
       default: {
-        const label = event.target.closest('.permission-popup-permission-label-container');
+        const item = event.target.closest('.permission-popup-permission-item');
+        if (!item) {
+          break;
+        }
+        const label = item.querySelector('.permission-popup-permission-label-container');
         if (label?._permission) {
           this.#onPermissionClick(label);
         }