From e449fc6e2e89fa7bdbea89e0fa8e8a914186f24d Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 21 Oct 2025 12:22:55 +0200
Subject: [PATCH 001/162] fix: Titlebar shouldn't clip the background anymore,
 p=#10895, c=tabs

---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 7b97ab7ac..200cd98f8 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -706,7 +706,6 @@
 
   & #titlebar {
     display: grid;
-    overflow: clip;
   }
 
   & #zen-sidebar-top-buttons-customization-target {

From c59f7fdbc035792f4559cde63303249b3139cd14 Mon Sep 17 00:00:00 2001
From: Ryosuke <88011751+nrysk@users.noreply.github.com>
Date: Tue, 21 Oct 2025 22:57:01 +0900
Subject: [PATCH 002/162] fix: Hide 'Change Name' for Spaces in collapsed
 toolbar mode, p=#10896, c=workspaces

* fix: Hide 'Change Name' for Spaces in collapsed toolbar mode

* fix: remove CSS, move comment and run lint:fix
---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 6 ------
 src/zen/workspaces/ZenWorkspaces.mjs    | 8 ++++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 200cd98f8..79c97db00 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -618,12 +618,6 @@
   --tab-min-width: 48px !important;
   --zen-toolbox-padding: 6px !important;
   --zen-toolbox-max-width: calc(var(--tab-min-width) + var(--zen-toolbox-padding) * 2);
-
-  /* We can't show the rename input properly in collapsed state,
-     so hide the workspace edit input */
-  #context_zenEditWorkspace {
-    display: none;
-  }
 }
 
 #navigator-toolbox:not([zen-sidebar-expanded='true']) {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 3f8f614e4..7a50b72bb 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1225,9 +1225,13 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     };
     const workspaceName = document.getElementById('context_zenEditWorkspace');
     const themePicker = document.getElementById('context_zenChangeWorkspaceTheme');
+    /* We can't show the rename input properly in collapsed state,
+    so hide the workspace edit input */
+    const isCollapsed = !Services.prefs.getBoolPref('zen.view.sidebar-expanded');
     workspaceName.hidden =
-      this.#contextMenuData.workspaceId &&
-      this.#contextMenuData.workspaceId !== this.activeWorkspace;
+      isCollapsed ||
+      (this.#contextMenuData.workspaceId &&
+        this.#contextMenuData.workspaceId !== this.activeWorkspace);
     themePicker.hidden =
       this.#contextMenuData.workspaceId &&
       this.#contextMenuData.workspaceId !== this.activeWorkspace;

From eb30fba6d3f4bfa4323615ef53e881021fd49abd Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 21 Oct 2025 17:10:51 +0200
Subject: [PATCH 003/162] chore: Add funding known url, b=no-bug,
 c=no-component

---
 .well-known/funding-manifest-urls | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .well-known/funding-manifest-urls

diff --git a/.well-known/funding-manifest-urls b/.well-known/funding-manifest-urls
new file mode 100644
index 000000000..e77da4919
--- /dev/null
+++ b/.well-known/funding-manifest-urls
@@ -0,0 +1 @@
+https://zen-browser.app/funding.json
\ No newline at end of file

From 1e7eaff92efb58d0c0705eb96746d7e99c2bc53d Mon Sep 17 00:00:00 2001
From: boobachad <83977152+boobachad@users.noreply.github.com>
Date: Tue, 21 Oct 2025 22:39:50 +0530
Subject: [PATCH 004/162] fix: Update maxEssentialTabs in context menu item,
 p=#10901

Signed-off-by: boobachad <83977152+boobachad@users.noreply.github.com>
---
 src/zen/tabs/ZenPinnedTabManager.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 3a200ac1a..2bce92145 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -1098,7 +1098,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", "max": "12"}'
+                      data-l10n-args='{"num": "0", "max": "${this.maxEssentialTabs}"}'
                       hidden="true"
                       disabled="true"
                       command="cmd_contextZenAddToEssentials"/>

From eff1c1d031095da71d12ea0f0d4f5d7b97519da1 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 01:41:30 +0200
Subject: [PATCH 005/162] fix: Fixed addons warnings looking broken, b=closes
 #10907, c=common, glance

---
 src/browser/base/content/zen-panels/site-data.inc |  7 +++----
 src/zen/common/styles/zen-single-components.css   |  4 ----
 src/zen/glance/ZenGlanceManager.mjs               | 11 ++---------
 surfer.json                                       |  2 +-
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index e5a774b88..50103b89d 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -35,10 +35,6 @@
           <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>
@@ -82,6 +78,9 @@
                        closemenu="none"
                        context="zenSiteDataActions" />
       </hbox>
+      <html:div id="unified-extensions-messages-container">
+        <!-- messages will be inserted here -->
+      </html:div>
     </panelview>
   </panelmultiview>
 </panel>
\ No newline at end of file
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 3b528b05f..22f781a18 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -290,10 +290,6 @@ body > #confetti {
   --arrowpanel-menuitem-border-radius: 10px;
 }
 
-#unified-extensions-messages-container {
-  display: none;
-}
-
 #zen-site-data-addons {
   display: flex;
   flex-wrap: wrap;
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 954b03f6c..6e8a1d667 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -448,9 +448,6 @@
       imageDataElement.setAttribute('src', data.elementData);
       imageDataElement.classList.add('zen-glance-element-preview');
 
-      // 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;
 
@@ -948,7 +945,7 @@
         const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
         const elementImageData = this.#glances.get(this.#currentGlanceID).elementImageData;
 
-        this.#addElementPreview(elementImageData, originalPosition);
+        this.#addElementPreview(elementImageData);
 
         // Create curved closing animation sequence
         const closingData = this.#createClosingDataFromOriginalPosition(originalPosition);
@@ -990,17 +987,13 @@
     /**
      * Add element preview if available, used for the closing animation
      * @param {string} elementImageData - The element image data
-     * @param {Object} rect - The rectangle data
      */
-    #addElementPreview(elementImageData, rect) {
+    #addElementPreview(elementImageData) {
       if (elementImageData) {
         const imageDataElement = document.createXULElement('image');
         imageDataElement.setAttribute('src', elementImageData);
         imageDataElement.classList.add('zen-glance-element-preview');
 
-        // 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/surfer.json b/surfer.json
index d2baf90a9..7a78c22bf 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17b",
+        "displayVersion": "1.17.1b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 30ed837ad859e8237aa560178ee1f0e2e086033d Mon Sep 17 00:00:00 2001
From: Mingyuan Zhao <17zhaomingyuan@gmail.com>
Date: Tue, 21 Oct 2025 19:43:37 -0400
Subject: [PATCH 006/162] fix: remove mozilla services from app menu, p=#10890

---
 src/zen/common/styles/zen-single-components.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 22f781a18..78de1ee9a 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -33,6 +33,12 @@
   display: none !important;
 }
 
+/* hide Mozilla services from the app menu */
+#PanelUI-fxa-menu-services,
+#PanelUI-fxa-cta-menu {
+  display: none !important;
+}
+
 body > #confetti {
   z-index: 1;
 }

From 39e63e302d2230ea1b0a6c9b96940332e6919592 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 22 Oct 2025 08:37:42 +0200
Subject: [PATCH 007/162] chore: New translations zen-general.ftl (Ukrainian),
 p=#10899

---
 locales/uk/browser/browser/zen-general.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index ae3fab0b3..31b30e480 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -59,7 +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-setting-cross-site = Міжсайтові cookie
 zen-site-data-security-info-extension = 
     .label = Розширення
 zen-site-data-security-info-secure = 
@@ -76,7 +76,7 @@ zen-site-data-share =
     .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
 

From 4080d07bcc3d64bc894dda648e76d8e18cccb2ee Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 08:39:54 +0200
Subject: [PATCH 008/162] feat: Add different UI for non-macos devices and
 other small tweaks, b=no-bug, c=common, glance

---
 src/zen/common/styles/zen-browser-ui.css      | 10 ++++--
 .../common/styles/zen-single-components.css   | 31 ++++++++++++-------
 src/zen/glance/ZenGlanceManager.mjs           |  2 +-
 src/zen/glance/zen-glance.css                 |  1 +
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       |  1 -
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index 0d5ecd5a7..a456ef2b3 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -136,9 +136,13 @@
   z-index: 2;
 }
 
-:root[zen-single-toolbar='true'] #nav-bar {
-  border-top: none !important;
-  --zen-toolbar-height: 37px;
+#nav-bar {
+  border-top-color: transparent !important;
+
+  :root[zen-single-toolbar='true'] & {
+    border-top: none !important;
+    --zen-toolbar-height: 37px;
+  }
 }
 
 #zen-main-app-wrapper {
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 22f781a18..82733464f 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -511,18 +511,27 @@ body > #confetti {
       position: absolute;
       width: 100%;
       height: 100%;
-      background: linear-gradient(
-        to bottom,
-        light-dark(rgb(255, 255, 255), rgb(34, 34, 34)),
-        light-dark(rgb(246, 246, 246), rgb(21, 21, 21))
-      );
+      @media (-moz-platform: macos) {
+        background: linear-gradient(
+          to bottom,
+          light-dark(rgb(255, 255, 255), rgb(34, 34, 34)),
+          light-dark(rgb(246, 246, 246), rgb(21, 21, 21))
+        );
+
+        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.175), rgba(255, 255, 255, 0.1));
+        border: 1px solid light-dark(var(--base-border-color), rgb(21, 21, 21));
+      }
+
+      @media not (-moz-platform: macos) {
+        border-radius: 6px;
+        background-color: color-mix(in srgb, currentcolor 6%, transparent);
+      }
+
       transition: transform 0.12s ease-in-out;
-      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.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;
     }
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 6e8a1d667..343d1ffd9 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -457,7 +457,7 @@
           opacity: [1, 0],
         },
         {
-          duration: 0.3,
+          duration: 0.25,
           easing: 'easeInOut',
         }
       );
diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css
index 92ac15c9e..f5f9fb0b4 100644
--- a/src/zen/glance/zen-glance.css
+++ b/src/zen/glance/zen-glance.css
@@ -176,5 +176,6 @@
   top: 0%;
   left: 50%;
   translate: -50% 0%;
+  max-height: 100%;
   will-change: transform, opacity;
 }
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 63fe006a3..49084fe3f 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -580,7 +580,6 @@ export class nsZenSiteDataPanel {
       };
       checkEmptyTab();
     });
-    this.anchor.setAttribute('open', 'true');
     const callout = new FeatureCallout({
       win: this.window,
       location: 'chrome',

From 3774a856cf7b1cbb6e5a9926a9f295d00b39599a Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 08:58:28 +0200
Subject: [PATCH 009/162] fix: Fixed too many addons overflowing the screen,
 b=closes #10918, c=common

---
 src/zen/common/styles/zen-single-components.css |  6 ++++++
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs         | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index a160ba5ac..845e3f78c 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -302,6 +302,12 @@ body > #confetti {
   gap: 8px;
   overflow: visible;
 
+  &[overflowing='true'] {
+    overflow-x: auto;
+    max-height: 420px;
+    mask-image: linear-gradient(to top, transparent, black 5%);
+  }
+
   .unified-extensions-item-name,
   .unified-extensions-item-message,
   .unified-extensions-item-message-hover,
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 49084fe3f..98180dca6 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -127,6 +127,16 @@ export class nsZenSiteDataPanel {
     this.#setSitePermissions();
     this.#setSiteSecurityInfo();
     this.#setSiteHeader();
+    this.#setAddonsOverflow();
+  }
+
+  #setAddonsOverflow() {
+    const addons = this.document.getElementById('zen-site-data-addons');
+    if (addons.getBoundingClientRect().height > 420) {
+      addons.setAttribute('overflowing', 'true');
+    } else {
+      addons.removeAttribute('overflowing');
+    }
   }
 
   #setSiteHeader() {

From d06a83b623f5ac8fa81be4eccc7c2234431a45f7 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 09:57:33 +0200
Subject: [PATCH 010/162] feat: Hide the extensions messages if they are empty,
 b=no-bug, c=common

---
 src/zen/common/styles/zen-single-components.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 845e3f78c..630bbd2d0 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -570,6 +570,10 @@ body > #confetti {
   margin: 6px 0;
 }
 
+#unified-extensions-messages-container:empty {
+  display: none;
+}
+
 /* Overflow panel */
 #widget-overflow-mainView {
   --menu-panel-width-wide: 200px;

From e7dce7123937f7dd4369c204519bf2c2bc45ce57 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 10:11:31 +0200
Subject: [PATCH 011/162] fix: Prevent the media focus button from overflowing
 at certain width, b=no-bug, c=media

---
 src/zen/media/zen-media-controls.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/media/zen-media-controls.css b/src/zen/media/zen-media-controls.css
index d65e9e1b0..e3e1e451f 100644
--- a/src/zen/media/zen-media-controls.css
+++ b/src/zen/media/zen-media-controls.css
@@ -294,7 +294,7 @@
 }
 
 /* Hide #zen-media-focus-button if it doesn't fit in the toolbar */
-@container media-controls (max-width: 150px) {
+@container media-controls (max-width: 165px) {
   #zen-media-focus-button {
     display: none;
   }

From a069093314ac6e4ac5f301ff43fa5631928ffd66 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 16:43:14 +0200
Subject: [PATCH 012/162] chore: Add tooltips for control center, b=no-bug,
 c=no-component

---
 locales/en-US/browser/browser/zen-general.ftl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index a1d427124..f98b6469e 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -91,8 +91,16 @@ 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-site-data-header-share =
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode =
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot =
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark =
+    .tooltiptext = Bookmark This Page
 
 zen-urlbar-copy-url-button =
   .tooltiptext = Copy URL

From be417381edd7d4a4a907d3cf1c7a31fa24263bb9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 16:54:11 +0200
Subject: [PATCH 013/162] fix: Fixed various regressions from 1.17b, b=closes
 #10924, closes #10928, closes #10933, c=common, split-view, tabs

---
 locales/en-US/browser/browser/zen-general.ftl     |  2 ++
 src/browser/base/content/zen-panels/site-data.inc | 11 +++++++----
 src/zen/common/ZenUIManager.mjs                   |  6 ++----
 src/zen/common/styles/zen-browser-ui.css          |  2 +-
 src/zen/split-view/zen-split-group.inc.css        |  5 ++++-
 src/zen/tabs/zen-tabs.css                         | 12 ++++++++++++
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs           | 10 ++++++++--
 7 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index f98b6469e..0b2f5641d 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -77,6 +77,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension =
     .label = Extension
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index 50103b89d..9b39392cf 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -16,16 +16,19 @@
                 mainview-with-header="true">
       <hbox id="zen-site-data-header">
         <toolbarbutton id="zen-site-data-header-share"
-                        data-l10n-id="zen-site-data-share"
+                        data-l10n-id="zen-site-data-header-share"
                         flex="1"
                         closemenu="none" />
         <toolbarbutton id="zen-site-data-header-reader-mode"
+                        data-l10n-id="zen-site-data-header-reader-mode"
                         command="View:ReaderView"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-screenshot"
+                        data-l10n-id="zen-site-data-header-screenshot"
                         command="Browser:Screenshot"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-bookmark"
+                        data-l10n-id="zen-site-data-header-bookmark"
                         command="Browser:AddBookmarkAs"
                         flex="1" />
       </hbox>
@@ -78,9 +81,9 @@
                        closemenu="none"
                        context="zenSiteDataActions" />
       </hbox>
-      <html:div id="unified-extensions-messages-container">
-        <!-- messages will be inserted here -->
-      </html:div>
+# Messages will be inserted here.
+# Dont write anything directly here, even comments, as this may break the layout
+      <html:div id="unified-extensions-messages-container"></html:div>
     </panelview>
   </panelmultiview>
 </panel>
\ No newline at end of file
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index fb2705959..ed6ba32f4 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -275,14 +275,12 @@ var gZenUIManager = {
   // Section: URL bar
 
   onUrlbarOpen() {
-    gURLBar.setAttribute('had-proxystate', gURLBar.getAttribute('pageproxystate'));
     gURLBar.setPageProxyState('invalid', false);
   },
 
   onUrlbarClose() {
-    if (gURLBar.hasAttribute('had-proxystate')) {
-      gURLBar.setURI();
-      gURLBar.removeAttribute('had-proxystate');
+    if (!gURLBar.valueIsTyped && gURLBar._untrimmedValue !== gURLBar.value) {
+      gURLBar.handleRevert();
     }
   },
 
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index a456ef2b3..3cdc0cda6 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -133,7 +133,7 @@
 }
 
 :root:not([zen-single-toolbar='true']) #zen-appcontent-wrapper {
-  z-index: 2;
+  z-index: 3;
 }
 
 #nav-bar {
diff --git a/src/zen/split-view/zen-split-group.inc.css b/src/zen/split-view/zen-split-group.inc.css
index e5e5e84de..ae048f8e4 100644
--- a/src/zen/split-view/zen-split-group.inc.css
+++ b/src/zen/split-view/zen-split-group.inc.css
@@ -133,8 +133,11 @@ tab-group[split-view-group] {
     }
 
     @container browser-tab (min-width: 70px) {
-      :root[zen-sidebar-expanded='true'] &:hover > .tabbrowser-tab:not([pinned]) .tab-close-button {
+      :root[zen-sidebar-expanded='true'] &:hover > .tabbrowser-tab:not([pinned]:not([pending])) .tab-close-button {
         display: block !important;
+
+        /* This is from Firefox itself, but we need to always override it */
+        margin-inline-end: 0 !important;
       }
     }
 
diff --git a/src/zen/tabs/zen-tabs.css b/src/zen/tabs/zen-tabs.css
index a195b4e44..e82625d2f 100644
--- a/src/zen/tabs/zen-tabs.css
+++ b/src/zen/tabs/zen-tabs.css
@@ -112,5 +112,17 @@
     & #titlebar {
       padding-top: var(--zen-toolbar-height);
     }
+
+    & #nav-bar {
+      width: calc(100% + var(--zen-toolbox-max-width) - var(--zen-element-separation));
+
+      /**
+       * We only want it when the window buttons are on the left side, in other
+       * words, the first of the two selectors above.
+       */
+      :root:not([zen-window-buttons-reversed='true']) & {
+        margin-left: calc(-1 * var(--zen-toolbox-max-width) + var(--zen-element-separation));
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 98180dca6..f3aa7f6ef 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -363,9 +363,15 @@ export class nsZenSiteDataPanel {
     switch (permission.state) {
       // There should only be these types being displayed in the panel.
       case SitePermissions.ALLOW:
+        if (permission.id === 'site-protection') {
+          return 'zen-site-data-protections-enabled';
+        }
         return 'zen-site-data-setting-allow';
       case SitePermissions.BLOCK:
       case SitePermissions.AUTOPLAY_BLOCKED_ALL:
+        if (permission.id === 'site-protection') {
+          return 'zen-site-data-protections-disabled';
+        }
         return 'zen-site-data-setting-block';
       default:
         return null;
@@ -521,12 +527,12 @@ export class nsZenSiteDataPanel {
 
     const isCrossSiteCookie = permission.id.startsWith('3rdPartyStorage');
     label.parentNode.setAttribute('state', newState == SitePermissions.ALLOW ? 'allow' : 'block');
+    label._permission.state = newState;
     if (!isCrossSiteCookie) {
       label
         .querySelector('.zen-permission-popup-permission-state-label')
-        .setAttribute('data-l10n-id', this.#getPermissionStateLabelId({ state: newState }));
+        .setAttribute('data-l10n-id', this.#getPermissionStateLabelId(label._permission));
     }
-    label._permission.state = newState;
   }
 
   #onClickEvent(event) {

From 443919ab315e4d9b4eaffdddb675d46e364155b2 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:02:40 +0200
Subject: [PATCH 014/162] chore: New Crowdin updates, p=#10943

* Update source file zen-general.ftl

* Update source file zen-general.ftl

* 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    | 12 ++++++++++--
 locales/ca/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/cs/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/cy/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/da/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/de/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/el/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/en-GB/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/es-ES/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/et/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/fa/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/fi/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/fr/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/ga-IE/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/he/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/hu/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/id/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/is/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/it/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/ja/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/ko/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/lt/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/nl/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/nn-NO/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/pl/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/pt-BR/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/pt-PT/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/ru/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/sv-SE/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/th/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/tr/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/uk/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/vi/browser/browser/zen-general.ftl    | 12 ++++++++++--
 locales/zh-CN/browser/browser/zen-general.ftl | 12 ++++++++++--
 locales/zh-TW/browser/browser/zen-general.ftl | 12 ++++++++++--
 35 files changed, 350 insertions(+), 70 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 1999f49b0..c927e3e22 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 20ec77018..3b7a34fc1 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Galetes entre llocs
 zen-site-data-security-info-extension = 
     .label = Extensió
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Afegeix extensions
 zen-site-data-site-settings = 
     .label = Totes les configuracions del lloc
-zen-site-data-share = 
-    .label = Comparteix aquesta pàgina
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia l'URL
 zen-site-data-setting-site-protection = Protecció contra el seguiment
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 26dcdadf6..132e16b93 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Rozšíření
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index d060f96fc..412657243 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index ce9ca9519..dfbd50cc0 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Udvidelse
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Tilføj udvidelser
 zen-site-data-site-settings = 
     .label = All Site Settings
-zen-site-data-share = 
-    .label = Del denne side
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Kopiér URL
 zen-site-data-setting-site-protection = Sporingsbeskyttelse
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index d62119a31..22f87a17a 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ zen-generic-next = Weiter
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Erlaubt
 zen-site-data-setting-block = Blockiert
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site-Cookie
 zen-site-data-security-info-extension = 
     .label = Erweiterung
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Erweiterungen hinzufügen
 zen-site-data-site-settings = 
     .label = Alle Website-Einstellungen
-zen-site-data-share = 
-    .label = Diese Seite teilen
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL kopieren
 zen-site-data-setting-site-protection = Tracking-Schutz
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 5e93572b0..0fe28d0e4 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index 93bb3bb33..8e038ee99 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -57,6 +57,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -70,8 +72,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index fe0588c8b..d7bfee3d3 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cookie de terceros
 zen-site-data-security-info-extension = 
     .label = Extensión
@@ -72,8 +74,14 @@ 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 = Compartir esta página
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Protección contra el rastreo
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index 62789f896..a06ab17af 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Laiendus
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index a46966e24..61de37875 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 241971b29..98ceca1ec 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 093021985..92d291038 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cookie intersite
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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 = Partager cette page
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copier l'URL
 zen-site-data-setting-site-protection = Protection contre le pistage
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 0996ffa2b..0e345c0d9 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Fianán Tras-Láithreáin
 zen-site-data-security-info-extension = 
     .label = Síneadh
@@ -72,8 +74,14 @@ 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 = Comhroinn an Leathanach seo
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Cóipeáil URL
 zen-site-data-setting-site-protection = Cosaint Rianaithe
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index d15ba51f0..981e9c32b 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = תוספים
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = הוספת תוספים
 zen-site-data-site-settings = 
     .label = כל הגדרות אתר
-zen-site-data-share = 
-    .label = Share This Page
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 3c75ef5da..3adade6f7 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Webhelyek közötti sütik
 zen-site-data-security-info-extension = 
     .label = Kiegészítő
@@ -72,8 +74,14 @@ 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 = Oldal megosztása
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL másolása
 zen-site-data-setting-site-protection = Nyomkövetés védelem
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 7cc80dab9..e248866a8 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Kuki Lintas Situs
 zen-site-data-security-info-extension = 
     .label = Ekstensi
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Tambahkan Ekstensi
 zen-site-data-site-settings = 
     .label = Semua Pengaturan Situs
-zen-site-data-share = 
-    .label = Bagikan Halaman Ini
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Salin URL
 zen-site-data-setting-site-protection = Perlindungan Pelacakan
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index af3320150..6cb7d0eb5 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 5b9a31dc6..a98db9a20 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -57,6 +57,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Estensione
@@ -70,8 +72,14 @@ zen-site-data-get-addons =
     .label = Aggiungi estensioni
 zen-site-data-site-settings = 
     .label = Tutte le impostazioni del sito
-zen-site-data-share = 
-    .label = Condividi questa pagina
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index f35f070c2..5bd484f54 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 2d98c1b11..d0ac6eb0a 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = 사이트 간 공유 쿠키
 zen-site-data-security-info-extension = 
     .label = 확장
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = 확장 프로그램 추가
 zen-site-data-site-settings = 
     .label = 모든 사이트 설정
-zen-site-data-share = 
-    .label = 이 페이지 공유
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark 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 03afe42a7..a9c874e38 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Plėtinys
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 10bee75cd..41b7410e5 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index b4ce133cf..b7bc7966a 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 9c8b82b2c..21a34e903 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 9f48fcd14..d3f8e9e9d 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -57,6 +57,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extensão
@@ -70,8 +72,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 8ae46244e..4d8ffd3b5 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cookies entre sites
 zen-site-data-security-info-extension = 
     .label = Extensão
@@ -72,8 +74,14 @@ 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 = Partilhar Esta Página
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Proteção contra rastreio
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 154f6c9d5..2fd8098ae 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Расширение
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Добавить расширения
 zen-site-data-site-settings = 
     .label = Все настройки сайта
-zen-site-data-share = 
-    .label = Поделиться этой страницей
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Скопировать URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 6bfeca164..e6b8a4e78 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index b4ce133cf..b7bc7966a 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 9c5dd7dba..06a67f683 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 31b30e480..623cbb4cc 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Міжсайтові cookie
 zen-site-data-security-info-extension = 
     .label = Розширення
@@ -72,8 +74,14 @@ zen-site-data-get-addons =
     .label = Додати розширення
 zen-site-data-site-settings = 
     .label = Усі налаштування сайту
-zen-site-data-share = 
-    .label = Поділитися цією сторінкою
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Копіювати URL-адресу
 zen-site-data-setting-site-protection = Захист від відстеження
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index dfd0650c7..d3e636e4c 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -59,6 +59,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -72,8 +74,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index 556104f6b..ddc8ba3aa 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -57,6 +57,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -70,8 +72,14 @@ zen-site-data-get-addons =
     .label = 添加扩展
 zen-site-data-site-settings = 
     .label = 所有站点设置
-zen-site-data-share = 
-    .label = Share This Page
+zen-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index 0574bc55c..c8d007dce 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -57,6 +57,8 @@ 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-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -70,8 +72,14 @@ 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-site-data-header-share = 
+    .tooltiptext = Share This Page
+zen-site-data-header-reader-mode = 
+    .tooltiptext = Enter Reader Mode
+zen-site-data-header-screenshot = 
+    .tooltiptext = Take a Screenshot
+zen-site-data-header-bookmark = 
+    .tooltiptext = Bookmark This Page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copy URL
 zen-site-data-setting-site-protection = Tracking Protection

From 0670ba8a2ccdbd11e4ecae3d17a884e8caea85a0 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 22 Oct 2025 19:13:15 +0200
Subject: [PATCH 015/162] fix: Wait for the next cycle to change the proxy
 state, b=no-bug, c=common

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

diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index ed6ba32f4..5c8166f7f 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -275,7 +275,9 @@ var gZenUIManager = {
   // Section: URL bar
 
   onUrlbarOpen() {
-    gURLBar.setPageProxyState('invalid', false);
+    setTimeout(() => {
+      gURLBar.setPageProxyState('invalid', false);
+    }, 0);
   },
 
   onUrlbarClose() {

From 43209411b9f376653f88717dd8fa8e194257029c Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 23 Oct 2025 15:01:28 +0200
Subject: [PATCH 016/162] fix: Fixed single buttons overflowing the sid ebar,
 b=closes #10968, c=common, tabs

---
 .../CustomizableUI-sys-mjs.patch              | 16 +++++---
 .../urlbar/UrlbarInput-sys-mjs.patch          | 41 +++++++++----------
 src/zen/common/ZenCustomizableUI.sys.mjs      |  6 +--
 src/zen/common/styles/zen-omnibox.css         |  9 +---
 src/zen/tabs/ZenPinnedTabManager.mjs          |  2 +-
 src/zen/tabs/zen-tabs.css                     |  2 +-
 surfer.json                                   |  2 +-
 7 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index e3a48d688..c21b3604e 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..31c43bc3d5b05713299c1b822b9774909445e862 100644
+index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aab438565f 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -176,17 +176,23 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..31c43bc3d5b05713299c1b822b977490
      });
  
      lazy.log.debug(
-@@ -7909,7 +7909,8 @@ class OverflowableToolbar {
+@@ -7909,7 +7909,14 @@ 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 = targetContentWidth + (win.gZenVerticalTabsManager._hasSetSingleToolbar ? 0.1 : 0) > totalAvailWidth;
++    if (win.gZenVerticalTabsManager._hasSetSingleToolbar &&
++      this.#target.id == 'zen-sidebar-top-buttons-customization-target' &&
++      Array.from(this.#target.children).filter(child => child.getAttribute("overflows") != "false").length == 1 &&
++      this.#overflowedInfo.size == 0) {
++      isOverflowing = false;
++    }
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -7970,7 +7971,11 @@ class OverflowableToolbar {
+@@ -7970,7 +7977,11 @@ class OverflowableToolbar {
              return;
            }
          }
@@ -199,7 +205,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..31c43bc3d5b05713299c1b822b977490
            lazy.log.debug(
              `Need ${minSize} but width is ${totalAvailWidth} so bailing`
            );
-@@ -8003,7 +8008,7 @@ class OverflowableToolbar {
+@@ -8003,7 +8014,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -208,7 +214,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..31c43bc3d5b05713299c1b822b977490
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8348,7 +8353,7 @@ class OverflowableToolbar {
+@@ -8348,7 +8359,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index dd1b40c6b..69fa4ed46 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..b286fc5b40a6e32a3af0bb0f209e58c64ab7bed9 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ef88cc762969f206c9b16274c4af526c738c5704 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -122,14 +122,13 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      // 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 +2396,25 @@ export class UrlbarInput {
+@@ -2331,6 +2396,24 @@ export class UrlbarInput {
        return;
      }
  
 +    if (this._zenHandleUrlbarClose) {
 +      this._zenHandleUrlbarClose();
 +    }
-+    this.window.gZenUIManager.onUrlbarClose();
 +    
 +    // Arc like URLbar: Blur the input on exit
 +    const zenToolbox = this.document.getElementById("navigator-toolbox");
@@ -142,13 +141,13 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.window.document.documentElement.removeAttribute("supress-primary-adjustment");
 +    }, 100);
-+    
++    this.window.gZenUIManager.onUrlbarClose();
 +    this.removeAttribute("zen-floating-urlbar");
 +
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2595,10 +2679,12 @@ export class UrlbarInput {
+@@ -2595,10 +2678,12 @@ export class UrlbarInput {
        return;
      }
      this.textbox.style.top = px(
@@ -161,7 +160,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      );
    }
  
-@@ -2658,9 +2744,10 @@ export class UrlbarInput {
+@@ -2658,9 +2743,10 @@ export class UrlbarInput {
            return;
          }
  
@@ -173,7 +172,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -3093,6 +3180,7 @@ export class UrlbarInput {
+@@ -3093,6 +3179,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -181,7 +180,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3197,7 +3285,7 @@ export class UrlbarInput {
+@@ -3197,7 +3284,7 @@ export class UrlbarInput {
        return val;
      }
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -190,7 +189,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3501,6 +3589,7 @@ export class UrlbarInput {
+@@ -3501,6 +3588,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -198,7 +197,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (this.isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -3608,6 +3697,10 @@ export class UrlbarInput {
+@@ -3608,6 +3696,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -209,7 +208,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3615,6 +3708,9 @@ export class UrlbarInput {
+@@ -3615,6 +3707,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -219,7 +218,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      return where;
    }
  
-@@ -3872,6 +3968,7 @@ export class UrlbarInput {
+@@ -3872,6 +3967,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -227,7 +226,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
        this._suppressStartQuery = false;
      });
-@@ -3879,7 +3976,6 @@ export class UrlbarInput {
+@@ -3879,7 +3975,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.
@@ -235,7 +234,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3991,7 +4087,11 @@ export class UrlbarInput {
+@@ -3991,7 +4086,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -248,7 +247,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4302,6 +4402,7 @@ export class UrlbarInput {
+@@ -4302,6 +4401,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -256,7 +255,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4413,6 +4514,11 @@ export class UrlbarInput {
+@@ -4413,6 +4513,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -268,7 +267,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4485,7 +4591,7 @@ export class UrlbarInput {
+@@ -4485,7 +4590,7 @@ export class UrlbarInput {
        }
      }
  
@@ -277,7 +276,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4525,9 +4631,16 @@ export class UrlbarInput {
+@@ -4525,9 +4630,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -295,7 +294,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
          if (
            event.target != this.inputField &&
-@@ -4538,6 +4651,10 @@ export class UrlbarInput {
+@@ -4538,6 +4650,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -306,7 +305,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4573,7 +4690,7 @@ export class UrlbarInput {
+@@ -4573,7 +4689,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.
@@ -315,7 +314,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c6
            break;
          }
  
-@@ -4890,7 +5007,7 @@ export class UrlbarInput {
+@@ -4890,7 +5006,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/ZenCustomizableUI.sys.mjs b/src/zen/common/ZenCustomizableUI.sys.mjs
index 6ac1f3f2c..4e5646ee8 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/ZenCustomizableUI.sys.mjs
@@ -69,12 +69,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">
-          <toolbaritem id="zen-toggle-compact-mode" removable="true">
+          <toolbaritem id="zen-toggle-compact-mode" removable="true" data-l10n-id="zen-toggle-compact-mode-button">
             <toolbarbutton
               class="toolbarbutton-1"
               command="cmd_toggleCompactModeIgnoreHover"
-              flex="1"
-              data-l10n-id="zen-toggle-compact-mode-button" />
+              data-l10n-id="zen-toggle-compact-mode-button"
+              flex="1" />
           </toolbaritem>
           <html:div id="zen-sidebar-top-buttons-separator" skipintoolbarset="true" overflows="false"></html:div>
         </hbox>
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 5340fd464..87dbdf796 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -296,13 +296,6 @@
 :root[zen-single-toolbar='true'] {
   --urlbar-icon-border-radius: 8px !important;
 
-  .urlbar-page-action:not([open]):not([showing]):not(
-      :is(#zen-copy-url-button, #identity-permission-box)
-    ),
-  #tracking-protection-icon-container {
-    display: none;
-  }
-
   #identity-permission-box > *:not(#zen-site-data-icon-button) {
     visibility: collapse;
   }
@@ -313,7 +306,7 @@
 
   #urlbar:not([breakout-extend='true']) {
     #identity-box:not([pageproxystate='invalid']) {
-      order: 9;
+      order: 2;
     }
   }
 
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 2bce92145..779f3566b 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -883,7 +883,7 @@
               );
               for (const tab of pinnedTabs) {
                 if (allAreUnloaded && closeIfPending) {
-                  return await this._onCloseTabShortcut(event, tab, { behavior: 'close' });
+                  return await this.onCloseTabShortcut(event, tab, { behavior: 'close' });
                 }
               }
               await gBrowser.explicitUnloadTabs(pinnedTabs);
diff --git a/src/zen/tabs/zen-tabs.css b/src/zen/tabs/zen-tabs.css
index e82625d2f..c285f0801 100644
--- a/src/zen/tabs/zen-tabs.css
+++ b/src/zen/tabs/zen-tabs.css
@@ -121,7 +121,7 @@
        * words, the first of the two selectors above.
        */
       :root:not([zen-window-buttons-reversed='true']) & {
-        margin-left: calc(-1 * var(--zen-toolbox-max-width) + var(--zen-element-separation));
+        margin-left: calc(-1 * var(--zen-toolbox-max-width) + var(--zen-element-separation) + 4px);
       }
     }
   }
diff --git a/surfer.json b/surfer.json
index 7a78c22bf..9932075e3 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.1b",
+        "displayVersion": "1.17.2b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 460f255fd475a2eed5028312186e5e54b6caf1a9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 23 Oct 2025 17:41:41 +0200
Subject: [PATCH 017/162] fix: Fixed native caption buttons not updating
 position when hiding, b=closes #10973, c=common, compact-mode

---
 src/zen/common/styles/zen-browser-ui.css                  | 1 +
 src/zen/common/styles/zen-single-components.css           | 5 +++++
 src/zen/common/styles/zen-theme.css                       | 3 ++-
 src/zen/compact-mode/windows-captions-fix-active.inc.css  | 2 +-
 src/zen/compact-mode/windows-captions-fix-default.inc.css | 5 +++--
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index 3cdc0cda6..8bb7c6f97 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -247,6 +247,7 @@
 @media (-moz-platform: macos) {
   :root[zen-window-buttons-reversed='true'][zen-right-side='true'] .titlebar-buttonbox-container {
     margin-inline-start: max(calc(var(--zen-element-separation) - 3px), 4px);
+    margin-block: auto;
   }
 }
 
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 630bbd2d0..92bd65a36 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -302,6 +302,11 @@ body > #confetti {
   gap: 8px;
   overflow: visible;
 
+  unified-extensions-item-messagebar-wrapper,
+  .unified-extensions-item-contents {
+    display: none !important;
+  }
+
   &[overflowing='true'] {
     overflow-x: auto;
     max-height: 420px;
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index f32bad074..8dda42371 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -195,7 +195,8 @@
 
   /* Transitions */
   --zen-tabbox-element-indent-transition: margin-inline-start 0.1s ease-in-out;
-  --zen-hidden-toolbar-transition: 0.15s ease-in-out;
+  --zen-hidden-toolbar-transition-duration: 0.15s;
+  --zen-hidden-toolbar-transition: var(--zen-hidden-toolbar-transition-duration) ease-in-out;
 
   /* XUL */
   --zen-main-browser-background: light-dark(rgb(235, 235, 235), #1b1b1b);
diff --git a/src/zen/compact-mode/windows-captions-fix-active.inc.css b/src/zen/compact-mode/windows-captions-fix-active.inc.css
index 252de7bf4..2f18ba5ce 100644
--- a/src/zen/compact-mode/windows-captions-fix-active.inc.css
+++ b/src/zen/compact-mode/windows-captions-fix-active.inc.css
@@ -5,6 +5,6 @@
  */
 
 & .titlebar-buttonbox-container {
-  visibility: visible;
+  max-height: 100%;
   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
index 586949124..e649c990e 100644
--- a/src/zen/compact-mode/windows-captions-fix-default.inc.css
+++ b/src/zen/compact-mode/windows-captions-fix-default.inc.css
@@ -5,9 +5,10 @@
  */
 
 & .titlebar-buttonbox-container {
-  display: collapse;
+  max-height: 0px;
   /* 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);
+  transition: max-height 0s;
+  transition-delay: calc(var(--zen-hidden-toolbar-transition-duration) + 0.2s);
 }

From 0dbfca8c295b7839bde5a58261d83160dd190281 Mon Sep 17 00:00:00 2001
From: Ryosuke <88011751+nrysk@users.noreply.github.com>
Date: Fri, 24 Oct 2025 02:00:33 +0900
Subject: [PATCH 018/162] fix: prevent horizontal overflow on Look and Feel
 page, p=#10980

---
 src/browser/themes/shared/preferences/zen-preferences.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index 622ff2781..14f88a823 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -544,6 +544,12 @@ groupbox h2 {
   }
 }
 
+@media (max-width: 1320px) {
+  #zenLayoutList {
+    flex-wrap: wrap;
+  }
+}
+
 /* Disable mozilla's settings */
 
 #dataCollectionCategory,

From ff71ee10819dd8ceddb9753e20c664084e63ecba Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 24 Oct 2025 20:11:58 +0200
Subject: [PATCH 019/162] chore: Small quality fixes, b=no-bug, c=common,
 glance

---
 .../base/content/browser-pageActions-js.patch | 11 +++++-----
 .../base/content/zen-panels/site-data.inc     |  1 +
 .../modules/FeatureCallout-sys-mjs.patch      | 12 ++++++++++
 .../tabbrowser/AsyncTabSwitcher-sys-mjs.patch | 12 ++++++++++
 .../urlbar/UrlbarInput-sys-mjs.patch          | 11 +++++++++-
 src/zen/common/ZenUIManager.mjs               |  7 ++++--
 .../common/styles/zen-single-components.css   | 11 +++++++++-
 src/zen/glance/ZenGlanceManager.mjs           | 22 +++++++++++--------
 src/zen/glance/zen-glance.css                 |  8 ++++++-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       |  7 ------
 10 files changed, 76 insertions(+), 26 deletions(-)
 create mode 100644 src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
 create mode 100644 src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch

diff --git a/src/browser/base/content/browser-pageActions-js.patch b/src/browser/base/content/browser-pageActions-js.patch
index 197789f45..d4c64166e 100644
--- a/src/browser/base/content/browser-pageActions-js.patch
+++ b/src/browser/base/content/browser-pageActions-js.patch
@@ -1,12 +1,13 @@
 diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js
-index 00da33bc11189db17b6a2e656acb3a778531197c..9571155baccad9a886cbe9c7bf0bd76a135331c4 100644
+index 00da33bc11189db17b6a2e656acb3a778531197c..bdca62e9ed5513e1e1922f1f9498755f5459e0c2 100644
 --- a/browser/base/content/browser-pageActions.js
 +++ b/browser/base/content/browser-pageActions.js
-@@ -451,6 +451,7 @@ var BrowserPageActions = {
+@@ -449,7 +449,7 @@ var BrowserPageActions = {
+       document.getElementById(
+         action && this.urlbarButtonNodeIDForActionID(action.id)
        ),
-       document.getElementById(this.mainButtonNode.id),
-       document.getElementById("identity-icon"),
+-      document.getElementById(this.mainButtonNode.id),
 +      document.getElementById("zen-site-data-icon-button"),
+       document.getElementById("identity-icon"),
      ];
      for (let node of potentialAnchorNodes) {
-       if (node && !node.hidden) {
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index 9b39392cf..bf310982b 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -22,6 +22,7 @@
         <toolbarbutton id="zen-site-data-header-reader-mode"
                         data-l10n-id="zen-site-data-header-reader-mode"
                         command="View:ReaderView"
+                        tooltip="dynamic-shortcut-tooltip"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-screenshot"
                         data-l10n-id="zen-site-data-header-screenshot"
diff --git a/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
new file mode 100644
index 000000000..d2dabc56e
--- /dev/null
+++ b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/asrouter/modules/FeatureCallout.sys.mjs b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
+index 2a2c5a6fe903694abbac0be86c7b3c8adc1d0275..5571b827198474a2635a9bd968adbc8c96dbc353 100644
+--- a/browser/components/asrouter/modules/FeatureCallout.sys.mjs
++++ b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
+@@ -776,6 +776,7 @@ export class FeatureCallout {
+     ) {
+       return false;
+     }
++    if (el?.id === "zen-site-data-icon-button") return true;
+ 
+     const style = this.win.getComputedStyle(el);
+     return style?.visibility === "visible" && style?.display !== "none";
diff --git a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
new file mode 100644
index 000000000..85d1fbde2
--- /dev/null
+++ b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
+index 773f595e89e268578ba153907babec95b58a155a..abe86fc3d243a85c4a8dbee854a2d0130f7270fd 100644
+--- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
++++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
+@@ -937,6 +937,7 @@ export class AsyncTabSwitcher {
+     return !(
+       this.tabbrowser._printPreviewBrowsers.has(browser) ||
+       lazy.PictureInPicture.isOriginatingBrowser(browser)
++      || browser?.hasAttribute('zen-glance-background')
+     );
+   }
+ 
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 69fa4ed46..274325f5b 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..ef88cc762969f206c9b16274c4af526c738c5704 100644
+index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d355858bcf37b 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -147,6 +147,15 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..ef88cc762969f206c9b16274c4af526c
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
+@@ -2361,7 +2444,7 @@ export class UrlbarInput {
+     forceUnifiedSearchButtonAvailable = false
+   ) {
+     let prevState = this.getAttribute("pageproxystate");
+-
++    this.removeAttribute("had-proxystate");
+     this.setAttribute("pageproxystate", state);
+     this._inputContainer.setAttribute("pageproxystate", state);
+     this._identityBox?.setAttribute("pageproxystate", state);
 @@ -2595,10 +2678,12 @@ export class UrlbarInput {
        return;
      }
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 5c8166f7f..b522dcfc6 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -276,14 +276,17 @@ var gZenUIManager = {
 
   onUrlbarOpen() {
     setTimeout(() => {
+      const hadValid = gURLBar.getAttribute('pageproxystate') === 'valid';
       gURLBar.setPageProxyState('invalid', false);
+      gURLBar.setAttribute('had-proxystate', hadValid);
     }, 0);
   },
 
   onUrlbarClose() {
-    if (!gURLBar.valueIsTyped && gURLBar._untrimmedValue !== gURLBar.value) {
-      gURLBar.handleRevert();
+    if (gURLBar.getAttribute('had-proxystate') == 'true') {
+      gURLBar.setPageProxyState('valid', false);
     }
+    gURLBar.removeAttribute('had-proxystate');
   },
 
   onUrlbarSearchModeChanged(event) {
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 92bd65a36..4c5473872 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -339,6 +339,11 @@ body > #confetti {
       justify-content: center;
       align-items: center;
       border-radius: 6px;
+
+      @media not (-moz-platform: macos) {
+        border-radius: 4px;
+      }
+
       transition:
         background-color 0.1s ease-in-out,
         transform 0.12s ease-in-out;
@@ -498,6 +503,10 @@ body > #confetti {
   padding: 8px;
   padding-bottom: 0;
 
+  :root[zen-single-toolbar='true']:not([zen-right-side='true']) & {
+    flex-direction: row-reverse;
+  }
+
   & toolbarbutton {
     margin: 0;
     appearance: none;
@@ -544,7 +553,7 @@ body > #confetti {
       }
 
       @media not (-moz-platform: macos) {
-        border-radius: 6px;
+        border-radius: 4px;
         background-color: color-mix(in srgb, currentcolor 6%, transparent);
       }
 
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 343d1ffd9..667c09c53 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -247,7 +247,7 @@
         {
           duration: 0.3,
           type: 'spring',
-          delay: 0.15,
+          delay: 0.2,
           bounce: 0,
         }
       );
@@ -434,6 +434,16 @@
       };
     }
 
+    #createGlancePreviewElement(src) {
+      const imageDataElement = document.createXULElement('image');
+      imageDataElement.setAttribute('src', src);
+
+      const parent = document.createElement('div');
+      parent.classList.add('zen-glance-element-preview');
+      parent.appendChild(imageDataElement);
+      return parent;
+    }
+
     /**
      * Handle element preview if provided
      * @param {Object} data - Glance data
@@ -444,10 +454,7 @@
         return null;
       }
 
-      const imageDataElement = document.createXULElement('image');
-      imageDataElement.setAttribute('src', data.elementData);
-      imageDataElement.classList.add('zen-glance-element-preview');
-
+      const imageDataElement = this.#createGlancePreviewElement(data.elementData);
       this.browserWrapper.prepend(imageDataElement);
       this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
 
@@ -990,10 +997,7 @@
      */
     #addElementPreview(elementImageData) {
       if (elementImageData) {
-        const imageDataElement = document.createXULElement('image');
-        imageDataElement.setAttribute('src', elementImageData);
-        imageDataElement.classList.add('zen-glance-element-preview');
-
+        const imageDataElement = this.#createGlancePreviewElement(elementImageData);
         this.browserWrapper.prepend(imageDataElement);
       }
     }
diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css
index f5f9fb0b4..1a9188295 100644
--- a/src/zen/glance/zen-glance.css
+++ b/src/zen/glance/zen-glance.css
@@ -171,11 +171,17 @@
   position: absolute;
   pointer-events: none;
   width: 100%;
+  height: 100%;
   z-index: 0;
   border-radius: var(--zen-native-inner-radius);
   top: 0%;
   left: 50%;
   translate: -50% 0%;
-  max-height: 100%;
   will-change: transform, opacity;
+  background: rgba(255, 255, 255, 0.1);
+
+  & image {
+    width: 100%;
+    max-width: 100%;
+  }
 }
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index f3aa7f6ef..ad3382a11 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -624,13 +624,6 @@ export class nsZenSiteDataPanel {
                     callout_attachment: 'topleft',
                   },
                 },
-                {
-                  selector: '#identity-icon-box',
-                  panel_position: {
-                    anchor_attachment: 'bottomcenter',
-                    callout_attachment: 'topleft',
-                  },
-                },
               ],
               content: {
                 position: 'callout',

From ee6c2f68c6de1173c89ccf48f859e586df061c6e Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 24 Oct 2025 22:39:15 +0200
Subject: [PATCH 020/162] feat: Dont collapse the urlbar buttons if a popup is
 opened, b=no-bug, c=common

---
 src/toolkit/content/widgets/panel-js.patch | 24 ++++++++++++++++++++++
 src/zen/common/styles/zen-omnibox.css      | 18 ++++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 src/toolkit/content/widgets/panel-js.patch

diff --git a/src/toolkit/content/widgets/panel-js.patch b/src/toolkit/content/widgets/panel-js.patch
new file mode 100644
index 000000000..baa70cc0c
--- /dev/null
+++ b/src/toolkit/content/widgets/panel-js.patch
@@ -0,0 +1,24 @@
+diff --git a/toolkit/content/widgets/panel.js b/toolkit/content/widgets/panel.js
+index 1dd4fc2a839fc6fde1ce2fc6437625e8d22bbb90..04fcb049225148f1b1f9c4b16cf2d2537887fbec 100644
+--- a/toolkit/content/widgets/panel.js
++++ b/toolkit/content/widgets/panel.js
+@@ -138,6 +138,9 @@
+             this.anchorNode.closest("toolbarbutton, .anchor-root") ||
+             this.anchorNode;
+           anchorRoot.setAttribute("open", "true");
++          if (anchorRoot.closest("#urlbar") && window.gURLBar) {
++            gURLBar.setAttribute("has-popup-open", "true");
++          }
+         }
+ 
+         if (this.getAttribute("animate") != "false") {
+@@ -208,6 +211,9 @@
+             this.anchorNode.closest("toolbarbutton, .anchor-root") ||
+             this.anchorNode;
+           anchorRoot.removeAttribute("open");
++          if (anchorRoot.closest("#urlbar") && window.gURLBar) {
++            gURLBar.removeAttribute("has-popup-open");
++          }
+         }
+       }
+ 
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 87dbdf796..c9ab0ce07 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -136,16 +136,20 @@
   }
 
   .identity-box-button,
-  #zen-copy-url-button {
+  .urlbar-page-action {
     opacity: 0;
-    transition:
-      opacity 0.15s,
-      visibility 0.15s;
-    visibility: collapse;
     height: 100%; /* To still be able to open popups */
+    visibility: collapse;
+
+    :root:not([supress-primary-adjustment='true']) & {
+      transition:
+        opacity 0.15s,
+        visibility 0.15s;
+    }
 
     #navigator-toolbox:hover &,
     &[open],
+    #urlbar[has-popup-open='true'] &,
     #identity-box[pageproxystate='invalid'] & {
       opacity: 1;
       visibility: visible;
@@ -735,7 +739,9 @@
  * them into a single, unified button */
 #reader-mode-button,
 #urlbar-go-button,
-#star-button-box {
+#star-button-box,
+#picture-in-picture-button,
+#pageActionButton:not([open]) {
   display: none !important;
 }
 

From bf8dc55deb8c7a2071424f383e923549fe87f21d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 24 Oct 2025 22:40:12 +0200
Subject: [PATCH 021/162] chore: Bump, 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 9932075e3..c224008c8 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.2b",
+        "displayVersion": "1.17.3b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 5500ee92504f92f3cca671021c37f9e3bdd464d5 Mon Sep 17 00:00:00 2001
From: Jai A P <jai.jap.318@gmail.com>
Date: Sat, 25 Oct 2025 02:13:03 +0530
Subject: [PATCH 022/162] fix: Fixed closing tab count for all edge cases,
 p=#9599

---
 src/browser/base/content/browser-js.patch | 29 ++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index 33bd7cf81..374b89d06 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 32b67f846b9942ad3da4276bb8748fee915eb485..f77d5df7c8ef49c0366ada8b3153c5a6c676239b 100644
+index 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64225e42b0 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -31,6 +31,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -19,6 +19,33 @@ index 32b67f846b9942ad3da4276bb8748fee915eb485..f77d5df7c8ef49c0366ada8b3153c5a6
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
+@@ -3795,7 +3798,7 @@ function warnAboutClosingWindow() {
+ 
+   if (!isPBWindow && !toolbar.visible) {
+     return gBrowser.warnAboutClosingTabs(
+-      gBrowser.openTabs.length,
++      gBrowser.visibleTabs.filter(t => t.getAttribute("pending")!=="true").length,
+       gBrowser.closingTabsEnum.ALL
+     );
+   }
+@@ -3835,7 +3838,7 @@ function warnAboutClosingWindow() {
+     return (
+       isPBWindow ||
+       gBrowser.warnAboutClosingTabs(
+-        gBrowser.openTabs.length,
++        gBrowser.visibleTabs.filter(t => t.getAttribute("pending")!=="true").length,
+         gBrowser.closingTabsEnum.ALL
+       )
+     );
+@@ -3860,7 +3863,7 @@ function warnAboutClosingWindow() {
+     AppConstants.platform != "macosx" ||
+     isPBWindow ||
+     gBrowser.warnAboutClosingTabs(
+-      gBrowser.openTabs.length,
++      gBrowser.visibleTabs.filter(t => t.getAttribute("pending")!=="true").length,
+       gBrowser.closingTabsEnum.ALL
+     )
+   );
 @@ -4782,6 +4785,9 @@ var ConfirmationHint = {
      MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
      MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");

From 83cda121c35628cc1645965d62ccdb989450eae0 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 25 Oct 2025 01:54:35 +0200
Subject: [PATCH 023/162] fix: Fixed caption buttons showing native panel when
 hidden, b=closes #10973, c=compact-mode, tabs

---
 src/zen/compact-mode/windows-captions-fix-default.inc.css | 5 +++++
 src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css        | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/zen/compact-mode/windows-captions-fix-default.inc.css b/src/zen/compact-mode/windows-captions-fix-default.inc.css
index e649c990e..4b2ecfa22 100644
--- a/src/zen/compact-mode/windows-captions-fix-default.inc.css
+++ b/src/zen/compact-mode/windows-captions-fix-default.inc.css
@@ -11,4 +11,9 @@
    * web content */
   transition: max-height 0s;
   transition-delay: calc(var(--zen-hidden-toolbar-transition-duration) + 0.2s);
+
+  & .titlebar-button {
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+  }
 }
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 1ceac456b..ee1867037 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
@@ -30,11 +30,6 @@ z-index: 1;
     }
 
 %include ../../compact-mode/windows-captions-fix-default.inc.css
-
-    & .titlebar-button {
-      padding-top: 0 !important;
-      padding-bottom: 0 !important;
-    }
   }
 
   @media -moz-pref('zen.view.experimental-no-window-controls') {

From 8df8a1e6576456ca968c426421606035fb57d4cc Mon Sep 17 00:00:00 2001
From: CosmoCreeper <179134799+CosmoCreeper@users.noreply.github.com>
Date: Sat, 25 Oct 2025 04:49:29 -0400
Subject: [PATCH 024/162] fix: Fix cursor height in input field, p=#11006

Fix cursor height on first character in the name input field of creating a space.

Signed-off-by: CosmoCreeper <179134799+CosmoCreeper@users.noreply.github.com>
---
 src/zen/workspaces/create-workspace-form.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zen/workspaces/create-workspace-form.css b/src/zen/workspaces/create-workspace-form.css
index 1576b3bd9..33d79eca7 100644
--- a/src/zen/workspaces/create-workspace-form.css
+++ b/src/zen/workspaces/create-workspace-form.css
@@ -109,6 +109,7 @@ zen-workspace-creation {
           padding: 0 !important;
           width: 100%;
           outline: none;
+          border-radius: 0;
         }
       }
 

From 7902dfb3ef7808e05fe4d54a3a3782170218c41c Mon Sep 17 00:00:00 2001
From: p-sage <171166538+p-sage@users.noreply.github.com>
Date: Sat, 25 Oct 2025 21:11:01 +0200
Subject: [PATCH 025/162] fix: Change icon for 'Copy Current URL' action,
 p=#11018

This PR simply changes the icon of 'Copy Current URL' action to match the one used in the new 'Copy URL' button in the URL Bar

Signed-off-by: p-sage <171166538+p-sage@users.noreply.github.com>
---
 src/zen/urlbar/ZenUBGlobalActions.sys.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/urlbar/ZenUBGlobalActions.sys.mjs b/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
index 8418e14be..5f09607d4 100644
--- a/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
+++ b/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
@@ -30,7 +30,7 @@ const globalActionsTemplate = [
   {
     label: 'Copy Current URL',
     command: 'cmd_zenCopyCurrentURL',
-    icon: 'chrome://browser/skin/zen-icons/edit-copy.svg',
+    icon: 'chrome://browser/skin/zen-icons/link.svg',
   },
   {
     label: 'Settings',

From 28f1243fb4177dd38657e12b38f7f36c89fd0a84 Mon Sep 17 00:00:00 2001
From: ryawa <22625346+ryawa@users.noreply.github.com>
Date: Sun, 26 Oct 2025 13:52:41 -0400
Subject: [PATCH 026/162] chore: Change ffmpeg version to 24.08, p=#11031

---
 build/flatpak/app.zen_browser.zen.yml.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/flatpak/app.zen_browser.zen.yml.template b/build/flatpak/app.zen_browser.zen.yml.template
index 821b0f1e6..d18329c46 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.26'
+    version: '24.08'
     add-ld-path: .
   app.zen_browser.zen.systemconfig:
     directory: etc/zen

From 031644c1b03a0cbd1fcabdeb613af23b631702e1 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 27 Oct 2025 11:45:02 +0100
Subject: [PATCH 027/162] feat: Hide PiP urlbar button via a pref instead of
 overriding styles, b=no-bug, c=common

---
 prefs/firefox/urlbar.yaml             | 3 +++
 src/zen/common/styles/zen-omnibox.css | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/prefs/firefox/urlbar.yaml b/prefs/firefox/urlbar.yaml
index e47a3274b..cdb951402 100644
--- a/prefs/firefox/urlbar.yaml
+++ b/prefs/firefox/urlbar.yaml
@@ -22,6 +22,9 @@
 - name: browser.urlbar.untrimOnUserInteraction.featureGate
   value: true
 
+- name: media.videocontrols.picture-in-picture.urlbar-button.enabled
+  value: false
+
 # Enable private suggestions
 - name: browser.search.suggest.enabled
   value: false
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index c9ab0ce07..e85ac7d25 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -740,7 +740,6 @@
 #reader-mode-button,
 #urlbar-go-button,
 #star-button-box,
-#picture-in-picture-button,
 #pageActionButton:not([open]) {
   display: none !important;
 }

From 6f63c550a6e9765e58af9e291553d0643a1750f7 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 28 Oct 2025 13:30:18 +0100
Subject: [PATCH 028/162] feat: Stop blending colors on compact mode, b=bug
 #11035, c=common, compact-mode, glance

---
 src/zen/common/styles/zen-browser-ui.css  |  5 -----
 src/zen/compact-mode/zen-compact-mode.css |  2 +-
 src/zen/glance/ZenGlanceManager.mjs       | 12 ++++++------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index 8bb7c6f97..959c16d4e 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -78,11 +78,6 @@
         background: var(--zen-main-browser-background-toolbar-old);
       }
     }
-
-    &::after,
-    &::before {
-      mix-blend-mode: plus-lighter;
-    }
   }
 
   :root:not([animating-background='true']) &::before {
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index d87f09dde..7058bcf44 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -11,7 +11,7 @@
 
   overflow: clip;
   z-index: -1;
-  background: black; /* Any color thats not white */
+  background: light-dark(#e9e9e9, #131313);
   box-shadow: var(--zen-big-shadow);
   @media -moz-pref('zen.theme.acrylic-elements') {
     background: transparent;
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 667c09c53..7f1c60680 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -245,7 +245,7 @@
           x: [xOffset, 0],
         },
         {
-          duration: 0.3,
+          duration: 0.2,
           type: 'spring',
           delay: 0.2,
           bounce: 0,
@@ -392,7 +392,7 @@
         parentSidebarContainer,
         {
           scale: [1, 0.98],
-          opacity: [1, 0.5],
+          opacity: [1, 0.4],
         },
         {
           duration: 0.3,
@@ -464,7 +464,7 @@
           opacity: [1, 0],
         },
         {
-          duration: 0.25,
+          duration: 0.1,
           easing: 'easeInOut',
         }
       );
@@ -540,7 +540,7 @@
       this.#animateParentBackground();
       gZenUIManager.motion
         .animate(this.browserWrapper, arcSequence, {
-          duration: gZenUIManager.testingEnabled ? 0 : 0.4,
+          duration: gZenUIManager.testingEnabled ? 0 : 0.3,
           ease: 'easeInOut',
         })
         .then(() => {
@@ -926,7 +926,7 @@
           browserSidebarContainer,
           {
             scale: [0.98, 1],
-            opacity: [0.5, 1],
+            opacity: [0.4, 1],
           },
           {
             duration: 0.3,
@@ -959,7 +959,7 @@
         const arcSequence = this.#createGlanceArcSequence(closingData, 'closing');
 
         gZenUIManager.motion
-          .animate(this.browserWrapper, arcSequence, { duration: 0.4, ease: 'easeOut' })
+          .animate(this.browserWrapper, arcSequence, { duration: 0.3, ease: 'easeOut' })
           .then(() => {
             // Remove element preview after closing animation
             const elementPreview = this.browserWrapper.querySelector('.zen-glance-element-preview');

From ad98452cbf37b6f23832903d3c9312caf41a2657 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 28 Oct 2025 13:31:50 +0100
Subject: [PATCH 029/162] chore: New Crowdin updates, p=#10977

* New translations zen-general.ftl (French)

* New translations zen-preferences.ftl (Italian)

* New translations zen-preferences.ftl (Polish)

* New translations zen-workspaces.ftl (Italian)

* New translations zen-workspaces.ftl (Polish)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Italian)

* New translations zen-general.ftl (Polish)

* New translations zen-general.ftl (Russian)

* New translations zen-general.ftl (Ukrainian)

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

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

* New translations zen-folders.ftl (Polish)

* New translations zen-preferences.ftl (Indonesian)

* New translations zen-general.ftl (Indonesian)

* New translations zen-general.ftl (Portuguese)
---
 locales/ca/browser/browser/zen-general.ftl    | 12 ++--
 locales/es-ES/browser/browser/zen-general.ftl | 14 ++--
 locales/fr/browser/browser/zen-general.ftl    | 12 ++--
 locales/ga-IE/browser/browser/zen-general.ftl | 12 ++--
 locales/hu/browser/browser/zen-general.ftl    | 14 ++--
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/id/browser/browser/zen-general.ftl    | 12 ++--
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/it/browser/browser/zen-general.ftl    | 18 ++---
 locales/it/browser/browser/zen-workspaces.ftl |  2 +-
 .../browser/preferences/zen-preferences.ftl   | 10 +--
 locales/pl/browser/browser/zen-folders.ftl    | 20 +++---
 locales/pl/browser/browser/zen-general.ftl    | 68 +++++++++----------
 locales/pl/browser/browser/zen-split-view.ftl |  4 +-
 .../pl/browser/browser/zen-vertical-tabs.ftl  |  2 +-
 locales/pl/browser/browser/zen-workspaces.ftl |  8 +--
 locales/pt-PT/browser/browser/zen-general.ftl | 12 ++--
 locales/ru/browser/browser/zen-general.ftl    | 16 ++---
 locales/uk/browser/browser/zen-general.ftl    | 12 ++--
 19 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 3b7a34fc1..4146eac0b 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -59,8 +59,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Habilitat
+zen-site-data-protections-disabled = Deshabilitat
 zen-site-data-setting-cross-site = Galetes entre llocs
 zen-site-data-security-info-extension = 
     .label = Extensió
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Totes les configuracions del lloc
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Comparteix aquesta pàgina
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Accedeix al mode lectura
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Fes una captura de pantalla
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Afegeix la pàgina a les adreces d'interès
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia l'URL
 zen-site-data-setting-site-protection = Protecció contra el seguiment
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index d7bfee3d3..9eddca930 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -51,7 +51,7 @@ zen-icons-picker-emoji =
     .label = Emojis
 zen-icons-picker-svg = 
     .label = Iconos
-urlbar-search-mode-zen_actions = Actions
+urlbar-search-mode-zen_actions = Acciones
 zen-site-data-settings = Ajustes
 zen-generic-manage = Administrar
 zen-generic-more = Más
@@ -59,8 +59,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Activada
+zen-site-data-protections-disabled = Desactivada
 zen-site-data-setting-cross-site = Cookie de terceros
 zen-site-data-security-info-extension = 
     .label = Extensión
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Todas las configuraciones del sitio
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Compartir esta página
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Entrar en modo lectura
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Tomar una captura de pantalla
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Añadir esta página a marcadores
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Protección contra el rastreo
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 92d291038..05854c8ff 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -59,8 +59,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Activé
+zen-site-data-protections-disabled = Désactivé
 zen-site-data-setting-cross-site = Cookie intersite
 zen-site-data-security-info-extension = 
     .label = Extension
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Tous les paramètres du site
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Partager cette page
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Entrer en mode lecture
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Prendre une capture d'écran
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Marquer cette page
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copier l'URL
 zen-site-data-setting-site-protection = Protection contre le pistage
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 0e345c0d9..897ca19f4 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -59,8 +59,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Cumasaithe
+zen-site-data-protections-disabled = Díchumasaithe
 zen-site-data-setting-cross-site = Fianán Tras-Láithreáin
 zen-site-data-security-info-extension = 
     .label = Síneadh
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Gach Socrú Suímh
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Comhroinn an Leathanach seo
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Téigh isteach i Mód Léitheora
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Glac Seat scáileáin
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Leabharmharc an Leathanach seo
 zen-urlbar-copy-url-button = 
     .tooltiptext = Cóipeáil URL
 zen-site-data-setting-site-protection = Cosaint Rianaithe
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 3adade6f7..1537deafc 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -58,9 +58,9 @@ zen-generic-more = Több
 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-setting-block = Blokkolva
+zen-site-data-protections-enabled = Engedélyezve
+zen-site-data-protections-disabled = Letiltva
 zen-site-data-setting-cross-site = Webhelyek közötti sütik
 zen-site-data-security-info-extension = 
     .label = Kiegészítő
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Minden webhelybeállítás
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Oldal megosztása
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Olvasó módba lépés
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Képernyőkép készítése
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Oldal mentése a könyvjelzők közé
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL másolása
 zen-site-data-setting-site-protection = Nyomkövetés védelem
diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl
index 0192c9643..6b8a713b9 100644
--- a/locales/id/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/id/browser/browser/preferences/zen-preferences.ftl
@@ -272,7 +272,7 @@ zen-split-view-shortcut-grid = Beralih ke Panel terbagi
 zen-split-view-shortcut-vertical = Beralih ke Panel vertikal
 zen-split-view-shortcut-horizontal = Beralih ke Panel horizontal
 zen-split-view-shortcut-unsplit = Tutup Tampilan Belah
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Tampilan Split Kosong Baru
 zen-key-select-tab-1 = Pilih tab #1
 zen-key-select-tab-2 = Pilih tab #2
 zen-key-select-tab-3 = Pilih tab #3
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index e248866a8..0aaf9af83 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -59,8 +59,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Diaktifkan
+zen-site-data-protections-disabled = Dinonaktifkan
 zen-site-data-setting-cross-site = Kuki Lintas Situs
 zen-site-data-security-info-extension = 
     .label = Ekstensi
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Semua Pengaturan Situs
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Bagikan Halaman Ini
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Masuki Mode Membaca
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Ambil Tangkapan Layar
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Markahi Laman Ini
 zen-urlbar-copy-url-button = 
     .tooltiptext = Salin URL
 zen-site-data-setting-site-protection = Perlindungan Pelacakan
diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl
index 22d8c54f5..c4a7830ec 100644
--- a/locales/it/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/it/browser/browser/preferences/zen-preferences.ftl
@@ -219,7 +219,7 @@ zen-key-exit-full-screen = Esci Da Schermo Intero
 zen-ai-chatbot-sidebar-shortcut = Attiva/Disattiva La Barra Laterale Chat AI
 zen-key-inspector-mac = Attiva/Disattiva Ispeziona Elemento (Mac)
 zen-toggle-sidebar-shortcut = Attiva/Disattiva La Barra Laterale di Firefox
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-toggle-pin-tab-shortcut = Attiva/Disattiva Scheda Pin
 zen-reader-mode-toggle-shortcut-other = Attiva/Disattiva Modalità Lettore
 zen-picture-in-picture-toggle-shortcut = Attiva/Disattiva Immagine
 zen-nav-reload-shortcut-2 = Ricarica Pagina
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index a98db9a20..a8d62cdc7 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -53,13 +53,13 @@ urlbar-search-mode-zen_actions = Azioni
 zen-site-data-settings = Impostazioni
 zen-generic-manage = Gestisci
 zen-generic-more = Altro
-zen-generic-next = Next
+zen-generic-next = Successivo
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-protections-enabled = Attivato
+zen-site-data-protections-disabled = Disattivato
+zen-site-data-setting-cross-site = Cookie Cross-Site
 zen-site-data-security-info-extension = 
     .label = Estensione
 zen-site-data-security-info-secure = 
@@ -73,16 +73,16 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Tutte le impostazioni del sito
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Condividi questa pagina
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Entra nella Modalità Lettura
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Cattura schermata
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Aggiungi questa pagina ai segnalibri
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copia URL
-zen-site-data-setting-site-protection = Tracking Protection
+zen-site-data-setting-site-protection = Protezione Tracciamento
 
 # Section: Feature callouts
 
diff --git a/locales/it/browser/browser/zen-workspaces.ftl b/locales/it/browser/browser/zen-workspaces.ftl
index aaacebfa4..7c9706b5f 100644
--- a/locales/it/browser/browser/zen-workspaces.ftl
+++ b/locales/it/browser/browser/zen-workspaces.ftl
@@ -4,7 +4,7 @@ zen-panel-ui-workspaces-create =
 zen-panel-ui-folder-create = 
     .label = Crea Cartella
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Nuova Divisione
 zen-workspaces-panel-context-delete = 
     .label = Elimina lo Spazio
     .accesskey = D
diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl
index 390737a02..474ab927d 100644
--- a/locales/pl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl
@@ -41,7 +41,7 @@ pane-settings-workspaces-title = Obszary robocze
 zen-tabs-unloader-enabled = 
     .label = Włącz rozładowywanie kart
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Użyj tła motywu dla kompaktowego paska narzędzi
 zen-workspace-continue-where-left-off = 
     .label = Kontynuuj od miejsca, w którym zakończyłęś/aś
 pane-zen-pinned-tab-manager-title = Przypięte karty
@@ -72,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 = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Konflikty z { $group } -> { $shortcut }
 pane-zen-theme-title = Ustawienia Motywu
 zen-vertical-tabs-title = Pasek boczny i układ kart
 zen-vertical-tabs-header = Pionowe karty
@@ -219,7 +219,7 @@ zen-key-exit-full-screen = Zamknij pełny ekran
 zen-ai-chatbot-sidebar-shortcut = Przełącz panel boczny Czatbotów AI
 zen-key-inspector-mac = Przełącz tryb Inspektora (Mac)
 zen-toggle-sidebar-shortcut = Przełącz pasek boczny Firefoksa
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-toggle-pin-tab-shortcut = Przełącz zakładkę pinów
 zen-reader-mode-toggle-shortcut-other = Przełącz tryb czytnika
 zen-picture-in-picture-toggle-shortcut = Przełącz obraz w zdjęciu
 zen-nav-reload-shortcut-2 = Odśwież stronę
@@ -253,7 +253,7 @@ zen-close-tab-shortcut = Zamknij kartę
 zen-compact-mode-shortcut-show-sidebar = Przełącz pływający pasek boczny
 zen-compact-mode-shortcut-show-toolbar = Przełącz pływający pasek narzędzi
 zen-compact-mode-shortcut-toggle = Przełącz tryb kompaktowy
-zen-glance-expand = Expand Glance
+zen-glance-expand = Rozwiń podgląd
 zen-workspace-shortcut-switch-1 = Przełącz na obszar roboczy 1
 zen-workspace-shortcut-switch-2 = Przełącz na obszar roboczy 2
 zen-workspace-shortcut-switch-3 = Przełącz na obszar roboczy 3
@@ -272,7 +272,7 @@ zen-split-view-shortcut-grid = Przełącz siatkę widoku dzielonego
 zen-split-view-shortcut-vertical = Przełącz Podziel Widok Pionowy
 zen-split-view-shortcut-horizontal = Przełącz Podziel Widok Poziomo
 zen-split-view-shortcut-unsplit = Zamknij Podziel Widok
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Nowy pusty widok podziału
 zen-key-select-tab-1 = Wybierz kartę #1
 zen-key-select-tab-2 = Wybierz kartę #2
 zen-key-select-tab-3 = Wybierz kartę #3
diff --git a/locales/pl/browser/browser/zen-folders.ftl b/locales/pl/browser/browser/zen-folders.ftl
index 7bc2588f6..8a4077aa6 100644
--- a/locales/pl/browser/browser/zen-folders.ftl
+++ b/locales/pl/browser/browser/zen-folders.ftl
@@ -1,21 +1,21 @@
 zen-folders-search-placeholder = 
     .placeholder = Wyszukaj { $folder-name }...
 zen-folders-panel-rename-folder = 
-    .label = Rename Folder
+    .label = Zmień nazwę folderu
 zen-folders-panel-unpack-folder = 
-    .label = Unpack Folder
+    .label = Rozpakuj folder
 zen-folders-new-subfolder = 
-    .label = New Subfolder
+    .label = Nowy folder
 zen-folders-panel-delete-folder = 
-    .label = Delete Folder
+    .label = Usuń folder
 zen-folders-panel-convert-folder-to-space = 
-    .label = Convert folder to Space
+    .label = Konwertuj folder na przestrzeń
 zen-folders-panel-change-folder-space = 
-    .label = Change Space...
+    .label = Zmień nazwę przestrzeni...
 zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
+    .label = Zmień ikonę
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = Wyładuj aktywne w tym folderze
 zen-folders-unload-folder = 
-    .label = Unload All Tabs
-zen-folders-search-no-results = No tabs matching that search 🤔
+    .label = Wyładuj wszystkie karty
+zen-folders-search-no-results = Brak kart pasujących do wyszukiwania 🤔
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 21a34e903..67422838c 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -1,5 +1,5 @@
 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 }.
+unified-extensions-description = Rozszerzenia są używane do dodatkowej funkcjonalności { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
     .label = Resetuj przypiętą kartę
     .accesskey = R
@@ -12,24 +12,24 @@ tab-context-zen-remove-essential =
 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.
+zen-themes-corrupted = Twój plik modyfikacji { -brand-short-name } jest uszkodzony. Zostały one zresetowane do domyślnego stanu.
 zen-shortcuts-corrupted = Twój plik skrótów { -brand-short-name } jest popsuty. Skróty zostały zresetowane do domyślnych.
 # note: Do not translate the "<br/>" tags in the following string
 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!
+    Nowy pasek adresu został aktywowany, strona nowej karty nie jest już potrzebna.<br/><br/>
+    Wypróbuj nowy pasek URL otwierając nową kartę!
 zen-disable = Deaktywuj
 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 = Copied current URL!
+zen-copy-current-url-confirmation = Skopiowano bieżący URL
 zen-general-cancel-label = 
     .label = Anuluj
 zen-general-confirm = 
     .label = Potwierdź
-zen-pinned-tab-replaced = URL przypiętej karty został zastąpiony bieżącym adresem.
+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!
@@ -38,8 +38,8 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods = 
     .label = Modyfikacje
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
-    .tooltiptext = Toggle Compact Mode
+    .label = Tryb kompaktowy
+    .tooltiptext = Przełącz tryb kompaktowy
 
 # note: Do not translate the "<br/>" tags in the following string
 
@@ -48,45 +48,45 @@ zen-close-label = Zamknij
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Szukaj...
 zen-icons-picker-emoji = 
-    .label = Emojis
+    .label = Emotikony
 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
-zen-generic-next = Next
+    .label = Ikony
+urlbar-search-mode-zen_actions = Akcje
+zen-site-data-settings = Ustawienia
+zen-generic-manage = Zarządzaj
+zen-generic-more = Więcej
+zen-generic-next = Następne
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-allow = Dozwolone
+zen-site-data-setting-block = Zablokowane
+zen-site-data-protections-enabled = Włączone
+zen-site-data-protections-disabled = Wyłączone
+zen-site-data-setting-cross-site = Ciasteczka międzydomenowe
 zen-site-data-security-info-extension = 
-    .label = Extension
+    .label = Rozszerzenie
 zen-site-data-security-info-secure = 
-    .label = Secure
+    .label = Zabezpieczone
 zen-site-data-security-info-not-secure = 
-    .label = Not Secure
+    .label = Nie zabezpieczone
 zen-site-data-manage-addons = 
-    .label = Manage Extensions
+    .label = Zarządzaj rozszerzeniami
 zen-site-data-get-addons = 
-    .label = Add Extensions
+    .label = Dodaj rozszerzenia
 zen-site-data-site-settings = 
-    .label = All Site Settings
+    .label = Wszystkie ustawienia strony
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Udostępnij tę stronę
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Wejdź do trybu czytnika
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Zrzut ekranu
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Dodaj tę stronę do zakładek
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = Kopiuj URL
+zen-site-data-setting-site-protection = Ochrona przed śledzeniem
 
 # 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 = Nowy dom dla dodatków, uprawnień i więcej
+zen-site-data-panel-feature-callout-subtitle = Kliknij ikonę, aby zarządzać ustawieniami witryny, wyświetlić informacje o zabezpieczeniach, rozszerzeniach i wykonać akcje.
diff --git a/locales/pl/browser/browser/zen-split-view.ftl b/locales/pl/browser/browser/zen-split-view.ftl
index fe4ee0dfa..5a0adbbc7 100644
--- a/locales/pl/browser/browser/zen-split-view.ftl
+++ b/locales/pl/browser/browser/zen-split-view.ftl
@@ -12,5 +12,5 @@ zen-split-view-modifier-header = Podziel widok
 zen-split-view-modifier-activate-reallocation = 
     .label = Aktywuj realokację
 zen-split-view-modifier-enabled-toast = Podziel kolejność widoku jest włączona.
-zen-split-view-modifier-enabled-toast-description = Przeciągnij i upuść widok aby zmienić kolejność. Naciśnij Esc, aby wyjść.
-zen-split-view-modifier-disabled-toast = Rozdziel zmianę kolejności widoku jest WYŁĄCZONa.
+zen-split-view-modifier-enabled-toast-description = Przeciągnij i upuść widok, aby zmienić kolejność. Naciśnij Esc, aby wyjść.
+zen-split-view-modifier-disabled-toast = Rearanżacja widoku dzielonego jest wyłączona.
diff --git a/locales/pl/browser/browser/zen-vertical-tabs.ftl b/locales/pl/browser/browser/zen-vertical-tabs.ftl
index b260030c3..936727ae0 100644
--- a/locales/pl/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/pl/browser/browser/zen-vertical-tabs.ftl
@@ -14,7 +14,7 @@ zen-toolbar-context-compact-mode-hide-both =
     .label = Ukryj oba
     .accesskey = H
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = Nowy folder
     .accesskey = N
 sidebar-zen-expand = 
     .label = Rozwiń panel boczny
diff --git a/locales/pl/browser/browser/zen-workspaces.ftl b/locales/pl/browser/browser/zen-workspaces.ftl
index 48592dcda..eaca53793 100644
--- a/locales/pl/browser/browser/zen-workspaces.ftl
+++ b/locales/pl/browser/browser/zen-workspaces.ftl
@@ -2,9 +2,9 @@ zen-panel-ui-workspaces-text = Obszary robocze
 zen-panel-ui-workspaces-create = 
     .label = Utwórz Przestrzeń
 zen-panel-ui-folder-create = 
-    .label = Create Folder
+    .label = Utwórz folder
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Nowy podział
 zen-workspaces-panel-context-delete = 
     .label = Usuń obszar roboczy
     .accesskey = D
@@ -15,7 +15,7 @@ zen-workspaces-panel-change-icon =
 zen-workspaces-panel-context-default-profile = 
     .label = Ustaw profil
 zen-workspaces-panel-unload = 
-    .label = Unload Space
+    .label = Wyładuj przestrzeń
 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 = 
@@ -52,4 +52,4 @@ zen-workspace-creation-profile = Profil
 zen-workspace-creation-header = Utwórz Przestrzeń
 zen-workspace-creation-label = Przestrzenie są wykorzystywane do zorganizowania kart i sesji.
 zen-workspaces-delete-workspace-title = Usunąć Przestrzeń roboczą?
-zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+zen-workspaces-delete-workspace-body = Czy na pewno chcesz usunąć { $name }? Tej czynności nie można cofnąć.
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 4d8ffd3b5..753f909f9 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -59,8 +59,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Ativado
+zen-site-data-protections-disabled = Desativado
 zen-site-data-setting-cross-site = Cookies entre sites
 zen-site-data-security-info-extension = 
     .label = Extensão
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Todas as Definições do Site
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Partilhar Esta Página
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Entrar no Modo Leitura
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Tirar uma Captura de Ecrã
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Adicionar esta Página aos Favoritos
 zen-urlbar-copy-url-button = 
     .tooltiptext = Copiar URL
 zen-site-data-setting-site-protection = Proteção contra rastreio
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 2fd8098ae..71dc41d8a 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -59,9 +59,9 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-protections-enabled = Включено
+zen-site-data-protections-disabled = Отключено
+zen-site-data-setting-cross-site = Межсайтовые куки
 zen-site-data-security-info-extension = 
     .label = Расширение
 zen-site-data-security-info-secure = 
@@ -75,16 +75,16 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Все настройки сайта
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Поделиться страницей
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Режим чтения
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Сделать снимок экрана
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Добавить в закладки
 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/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 623cbb4cc..a6a47ec35 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -59,8 +59,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Увімкнено
+zen-site-data-protections-disabled = Вимкнено
 zen-site-data-setting-cross-site = Міжсайтові cookie
 zen-site-data-security-info-extension = 
     .label = Розширення
@@ -75,13 +75,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Усі налаштування сайту
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Поділитися цією сторінкою
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Увійти у режим читання
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Зробити знімок екрана
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Додати цю сторінку в закладки
 zen-urlbar-copy-url-button = 
     .tooltiptext = Копіювати URL-адресу
 zen-site-data-setting-site-protection = Захист від відстеження

From d89d667f8f183d5a819294504ad14cb742d985ee Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 28 Oct 2025 13:36:03 +0100
Subject: [PATCH 030/162] fix: Fixed toggling sidebar not hiding compact mode,
 b=closes #11049, c=common

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

diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index b522dcfc6..a95f7e60d 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -712,6 +712,7 @@ var gZenVerticalTabsManager = {
   toggleExpand() {
     const newVal = !Services.prefs.getBoolPref('zen.view.sidebar-expanded');
     Services.prefs.setBoolPref('zen.view.sidebar-expanded', newVal);
+    Services.prefs.setBoolPref('zen.view.use-single-toolbar', false);
   },
 
   get navigatorToolbox() {

From c21f927f010c0837332ec5b51b43922a803cfcfc Mon Sep 17 00:00:00 2001
From: Santhosh C <csesanthosh15@gmail.com>
Date: Tue, 28 Oct 2025 20:18:36 +0530
Subject: [PATCH 031/162] feat: close all unpinned tabs in active workspace,
 p=#10739

* feat: close all unpinned tabs using keyboard shortcut

* feat: use toast instead of prompt

* feat: add toolbarbutton to close all unpinned tabs in a workspace

* feat: Fix bootstraping and other small nitpicks, b=no-bug, c=common, tabs, workspaces

* 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

* chore: Better organize preferences files, b=no-bug, c=compact-mode, folders, glance, kbs, media, mods, split-view, welcome, workspaces

* feat: improve the site popup ui (part 2), p=#10768

* feat: Add a bounce to the glance element float and format, b=no-bug, c=common, glance

* chore: Update workflows to use macos 26 SDK, b=no-bug, c=workflows

* 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)

* list shortcut in settings page, refactor code based on PR review

* feat: show restore tabs shortcut in toast message

* feat: Add toggle compact mode to the default placements, b=no-bug, c=common, glance

* chore: Only run autopep8 if python files changed, b=no-bug, c=workflows

* chore: Revert to the new folder animation, p=#10783, c=folders

* feat: Use close icon for pinned reset if the preference says so, p=#10786, c=no-component

* feat: Improve glance animation, p=#10790, c=glance

* update l10n string

* feat: Finished UI, b=no-bug, c=workspaces, common, tabs

* chore: Fix lint, b=no-bug, c=workspaces

---------

Co-authored-by: mr. m <mr.m@tuta.com>
Co-authored-by: reizumi <reizumichan@protonmail.com>
Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 .../browser/preferences/zen-preferences.ftl   |  1 +
 .../en-US/browser/browser/zen-workspaces.ftl  |  7 ++
 .../base/content/zen-commands.inc.xhtml       |  1 +
 src/browser/themes/shared/zen-icons/icons.css |  7 +-
 .../themes/shared/zen-icons/jar.inc.mn        |  3 +
 .../themes/shared/zen-icons/lin/dart-down.svg |  5 ++
 src/zen/common/styles/zen-omnibox.css         |  2 +-
 src/zen/common/styles/zen-popup.css           | 10 +++
 src/zen/common/zen-sets.js                    |  3 +
 src/zen/kbs/ZenKeyboardShortcuts.mjs          | 17 ++++-
 src/zen/tabs/zen-tabs/vertical-tabs.css       | 69 +++++++++++++++----
 src/zen/workspaces/ZenWorkspace.mjs           |  8 ++-
 src/zen/workspaces/ZenWorkspaces.mjs          | 32 +++++++++
 src/zen/zen.globals.js                        |  1 +
 14 files changed, 150 insertions(+), 16 deletions(-)
 create mode 100644 src/browser/themes/shared/zen-icons/lin/dart-down.svg

diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
index 43f48460d..d2e2c7589 100644
--- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
@@ -337,3 +337,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/en-US/browser/browser/zen-workspaces.ftl b/locales/en-US/browser/browser/zen-workspaces.ftl
index 0933f225c..db5bf6574 100644
--- a/locales/en-US/browser/browser/zen-workspaces.ftl
+++ b/locales/en-US/browser/browser/zen-workspaces.ftl
@@ -73,3 +73,10 @@ zen-workspace-creation-label = Spaces are used to organize your tabs and session
 
 zen-workspaces-delete-workspace-title = Delete Space?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/src/browser/base/content/zen-commands.inc.xhtml b/src/browser/base/content/zen-commands.inc.xhtml
index d1cbacd7a..66cfe1c5b 100644
--- a/src/browser/base/content/zen-commands.inc.xhtml
+++ b/src/browser/base/content/zen-commands.inc.xhtml
@@ -60,4 +60,5 @@
   <command id="cmd_zenOpenFolderCreation" />
 
   <command id="cmd_zenTogglePinTab" />
+  <command id="cmd_zenCloseUnpinnedTabs" />
 </commandset>
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 9cddd5e1f..dd9b5451c 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -6,7 +6,8 @@
 
 .subviewbutton,
 #zen-welcome-start-button,
-.zen-toast button {
+.zen-toast button,
+.pinned-tabs-container-separator toolbarbutton {
   -moz-context-properties: fill, fill-opacity !important;
   fill: currentColor !important;
 }
@@ -392,6 +393,10 @@
   list-style-image: url('arrow-down.svg') !important;
 }
 
+.zen-workspace-close-unpinned-tabs-button {
+  list-style-image: url('dart-down.svg') !important;
+}
+
 .zen-workspace-actions-reorder-icon,
 .zen-tab-rearrange-button {
   list-style-image: url('drag-indicator.svg') !important;
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index b97b3837b..d52bde3b5 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -29,6 +29,7 @@
 *  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/dart-down.svg                      (../shared/zen-icons/lin/dart-down.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) 
@@ -181,6 +182,7 @@
 *  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/dart-down.svg                      (../shared/zen-icons/lin/dart-down.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) 
@@ -333,6 +335,7 @@
 *  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/dart-down.svg                      (../shared/zen-icons/lin/dart-down.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) 
diff --git a/src/browser/themes/shared/zen-icons/lin/dart-down.svg b/src/browser/themes/shared/zen-icons/lin/dart-down.svg
new file mode 100644
index 000000000..5ab92a59b
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/dart-down.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="12" width="12" viewBox="0 0 12 12"><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="6" y1="1" x2="6" y2="10.75" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" data-color="color-2"/><polyline points="2.75 7.75 6 11 9.25 7.75" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/></g></svg>
\ No newline at end of file
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index e85ac7d25..98b157154 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -147,7 +147,7 @@
         visibility 0.15s;
     }
 
-    #navigator-toolbox:hover &,
+    #navigator-toolbox[zen-has-hover='true'] &,
     &[open],
     #urlbar[has-popup-open='true'] &,
     #identity-box[pageproxystate='invalid'] & {
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index 54cd9e60b..e1194594d 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -381,6 +381,16 @@ menuseparator {
 
     & label {
       margin: 0 4px;
+
+      & span {
+        background: light-dark(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
+        border-radius: 4px;
+        padding: 5px 7px;
+        font-size: 12px;
+        font-weight: 600;
+        margin: 0 2px;
+        word-spacing: 2px;
+      }
     }
 
     & button {
diff --git a/src/zen/common/zen-sets.js b/src/zen/common/zen-sets.js
index e9ca4b8bc..b7b6c00ad 100644
--- a/src/zen/common/zen-sets.js
+++ b/src/zen/common/zen-sets.js
@@ -122,6 +122,9 @@ document.addEventListener(
             }
             break;
           }
+          case 'cmd_zenCloseUnpinnedTabs':
+            gZenWorkspaces.closeAllUnpinnedTabs();
+            break;
           case 'cmd_zenUnloadWorkspace': {
             gZenWorkspaces.unloadWorkspace();
             break;
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index 0fb29b239..777d1fbfe 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -49,6 +49,7 @@ const defaultKeyboardGroups = {
     'zen-key-enter-full-screen',
     'zen-key-exit-full-screen',
     'zen-quit-app-shortcut',
+    'zen-close-all-unpinned-tabs-shortcut',
     'zen-close-tab-shortcut',
     'zen-close-shortcut',
     'id:key_selectTab1',
@@ -799,7 +800,7 @@ class nsZenKeyboardShortcutsLoader {
 }
 
 class nsZenKeyboardShortcutsVersioner {
-  static LATEST_KBS_VERSION = 12;
+  static LATEST_KBS_VERSION = 13;
 
   constructor() {}
 
@@ -1081,6 +1082,20 @@ class nsZenKeyboardShortcutsVersioner {
       data = data.filter((shortcut) => shortcut.getID() != 'zen-compact-mode-show-toolbar');
     }
 
+    if (version < 13) {
+      data.push(
+        new KeyShortcut(
+          'zen-close-all-unpinned-tabs',
+          'K',
+          '',
+          ZEN_WORKSPACE_SHORTCUTS_GROUP,
+          nsKeyShortcutModifiers.fromObject({ accel: true, shift: true }),
+          'cmd_zenCloseUnpinnedTabs',
+          'zen-close-all-unpinned-tabs-shortcut'
+        )
+      );
+    }
+
     return data;
   }
 }
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 79c97db00..240e16eb5 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -130,31 +130,76 @@
    Pinned Tabs Separator
    ========================================================================== */
 .pinned-tabs-container-separator {
-  background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
-  margin: 8px auto;
+  height: 24px;
   border: none;
-  height: 1px;
-  max-height: 1px;
   width: 98%;
   transition:
-    margin 0.1s ease-in-out,
-    background 0.1s ease-in-out,
-    max-height 0.1s ease-in-out;
+    height 0.08s ease-in-out,
+    opacity 0.08s ease-in-out;
   overflow: hidden;
   position: relative;
   opacity: 1;
+  align-items: center;
+
+  & toolbarseparator {
+    height: 1px;
+    background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
+    padding: 0;
+    margin: auto 4px;
+
+    &::before {
+      border-inline-start: none;
+    }
+  }
 
   #tabbrowser-tabs[movingtab] & {
     transition:
-      margin 0.1s ease-in-out,
-      background 0.1s ease-in-out,
-      max-height 0.1s ease-in-out,
+      height 0.08s ease-in-out,
+      opacity 0.08s ease-in-out,
       transform 0.1s ease-in-out;
   }
 
   .zen-workspace-pinned-tabs-section[hide-separator] & {
-    max-height: 0;
-    margin: 0 auto;
+    height: 0px;
+    opacity: 0;
+  }
+
+  & toolbarbutton {
+    appearance: none;
+    opacity: 0;
+    visibility: collapse;
+    transition:
+      opacity 0.15s,
+      visibility 0.15s;
+    font-size: 10px;
+    font-weight: 500;
+    gap: 2px;
+
+    #navigator-toolbox[zen-has-hover='true'] & {
+      visibility: visible;
+      opacity: 0.5;
+    }
+
+    &:hover {
+      opacity: 1 !important;
+    }
+
+    :root:not([zen-sidebar-expanded='true']) & {
+      display: none;
+    }
+
+    & .toolbarbutton-text {
+      display: flex;
+    }
+
+    & .toolbarbutton-icon {
+      width: 10px;
+      transition: transform 0.15s ease-in-out;
+    }
+
+    &:active:hover .toolbarbutton-icon {
+      transform: translateY(2px);
+    }
   }
 }
 
diff --git a/src/zen/workspaces/ZenWorkspace.mjs b/src/zen/workspaces/ZenWorkspace.mjs
index a7d1eee3d..aa92b13f7 100644
--- a/src/zen/workspaces/ZenWorkspace.mjs
+++ b/src/zen/workspaces/ZenWorkspace.mjs
@@ -12,7 +12,13 @@
         </vbox>
         <arrowscrollbox orient="vertical" class="workspace-arrowscrollbox">
           <vbox class="zen-workspace-tabs-section zen-workspace-pinned-tabs-section" hide-separator="true">
-            <html:div class="pinned-tabs-container-separator"></html:div>
+            <hbox class="pinned-tabs-container-separator">
+              <toolbarseparator flex="1" />
+              <toolbarbutton command="cmd_zenCloseUnpinnedTabs"
+                             tooltip="dynamic-shortcut-tooltip"
+                             data-l10n-id="zen-workspaces-close-all-unpinned-tabs-title"
+                             class="zen-workspace-close-unpinned-tabs-button" />
+            </hbox>
           </vbox>
           <vbox class="zen-workspace-tabs-section zen-workspace-normal-tabs-section">
             <!-- Let it as an ID to mantain compatibility with firefox's tabbrowser -->
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 7a50b72bb..6ee9386ff 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1483,6 +1483,19 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     });
   }
 
+  unpinnedTabsInWorkspace(workspaceID) {
+    return Array.from(this.allStoredTabs).filter(
+      (tab) => tab.getAttribute('zen-workspace-id') === workspaceID && tab.visible && !tab.pinned
+    );
+  }
+
+  #deleteAllUnpinnedTabsInWorkspace(tabs) {
+    gBrowser.removeTabs(tabs, {
+      animate: false,
+      closeWindowWithLastTab: false,
+    });
+  }
+
   async unloadWorkspace() {
     const workspaceId = this.#contextMenuData?.workspaceId || this.activeWorkspace;
 
@@ -2654,6 +2667,25 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     this.tabContainer._invalidateCachedTabs();
   }
 
+  async closeAllUnpinnedTabs() {
+    const workspaceId = this.#contextMenuData?.workspaceId || this.activeWorkspace;
+    const unpinnedTabs = await this.unpinnedTabsInWorkspace(workspaceId);
+
+    if (!unpinnedTabs.length) return;
+
+    this.#deleteAllUnpinnedTabsInWorkspace(unpinnedTabs);
+
+    const restoreClosedTabsShortcut = gZenKeyboardShortcutsManager.getShortcutDisplayFromCommand(
+      'History:RestoreLastClosedTabOrWindowOrSession'
+    );
+
+    gZenUIManager.showToast('zen-workspaces-close-all-unpinned-tabs-toast', {
+      l10nArgs: {
+        shortcut: restoreClosedTabsShortcut,
+      },
+    });
+  }
+
   async contextDeleteWorkspace() {
     const workspaceId = this.#contextMenuData?.workspaceId || this.activeWorkspace;
     const [title, body] = await document.l10n.formatValues([
diff --git a/src/zen/zen.globals.js b/src/zen/zen.globals.js
index a225ca767..ce22cd4a8 100644
--- a/src/zen/zen.globals.js
+++ b/src/zen/zen.globals.js
@@ -22,6 +22,7 @@ export default [
   'gZenStartup',
 
   'gZenWorkspaces',
+  'gZenKeyboardShortcutsManager',
   'ZenWorkspacesEngine',
   'ZenWorkspacesStorage',
   'ZenWorkspaceBookmarksStorage',

From adffeda273aa8656a0cdca788e68614aa67bb6f4 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:10:27 +0100
Subject: [PATCH 032/162] chore: New Crowdin updates, p=#11052

* Update source file zen-workspaces.ftl

* Update source file zen-preferences.ftl

* 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-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)
---
 locales/ar/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/ar/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/ca/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/ca/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/cs/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/cs/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/cy/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/cy/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/da/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/da/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/de/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/de/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/el/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/el/browser/browser/zen-workspaces.ftl               | 6 ++++++
 .../en-GB/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/en-GB/browser/browser/zen-workspaces.ftl            | 6 ++++++
 .../es-ES/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/es-ES/browser/browser/zen-workspaces.ftl            | 6 ++++++
 locales/et/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/et/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/fa/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/fa/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/fi/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/fi/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/fr/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/fr/browser/browser/zen-workspaces.ftl               | 6 ++++++
 .../ga-IE/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/ga-IE/browser/browser/zen-workspaces.ftl            | 6 ++++++
 locales/he/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/he/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/hu/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/hu/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/id/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/id/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/is/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/is/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/it/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/it/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/ja/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/ja/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/ko/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/ko/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/lt/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/lt/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/nl/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/nl/browser/browser/zen-workspaces.ftl               | 6 ++++++
 .../nn-NO/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/nn-NO/browser/browser/zen-workspaces.ftl            | 6 ++++++
 locales/pl/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/pl/browser/browser/zen-workspaces.ftl               | 6 ++++++
 .../pt-BR/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/pt-BR/browser/browser/zen-workspaces.ftl            | 6 ++++++
 .../pt-PT/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/pt-PT/browser/browser/zen-workspaces.ftl            | 6 ++++++
 locales/ru/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/ru/browser/browser/zen-workspaces.ftl               | 6 ++++++
 .../sv-SE/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/sv-SE/browser/browser/zen-workspaces.ftl            | 6 ++++++
 locales/th/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/th/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/tr/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/tr/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/uk/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/uk/browser/browser/zen-workspaces.ftl               | 6 ++++++
 locales/vi/browser/browser/preferences/zen-preferences.ftl  | 1 +
 locales/vi/browser/browser/zen-workspaces.ftl               | 6 ++++++
 .../zh-CN/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/zh-CN/browser/browser/zen-workspaces.ftl            | 6 ++++++
 .../zh-TW/browser/browser/preferences/zen-preferences.ftl   | 1 +
 locales/zh-TW/browser/browser/zen-workspaces.ftl            | 6 ++++++
 70 files changed, 245 insertions(+)

diff --git a/locales/ar/browser/browser/preferences/zen-preferences.ftl b/locales/ar/browser/browser/preferences/zen-preferences.ftl
index 4484acdfc..b43492c69 100644
--- a/locales/ar/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ar/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/ar/browser/browser/zen-workspaces.ftl b/locales/ar/browser/browser/zen-workspaces.ftl
index ff9f422ef..5d61ebb10 100644
--- a/locales/ar/browser/browser/zen-workspaces.ftl
+++ b/locales/ar/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl
index 0813471cf..8fb8adbd2 100644
--- a/locales/ca/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Commuta el rendiment
 zen-devtools-toggle-storage-shortcut = Commuta l'emmagatzematge
 zen-devtools-toggle-dom-shortcut = Commuta el DOM
 zen-devtools-toggle-accessibility-shortcut = Commuta l'accessibilitat
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/ca/browser/browser/zen-workspaces.ftl b/locales/ca/browser/browser/zen-workspaces.ftl
index 971cb7fc6..d6ece9131 100644
--- a/locales/ca/browser/browser/zen-workspaces.ftl
+++ b/locales/ca/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Creació d'un espai
 zen-workspace-creation-label = Els espais s'utilitzen per organitzar les pestanyes i les sessions.
 zen-workspaces-delete-workspace-title = Voleu suprimir l'espai de treball?
 zen-workspaces-delete-workspace-body = Esteu segur que voleu suprimir { $name }? Aquesta acció no es pot desfer.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/cs/browser/browser/preferences/zen-preferences.ftl b/locales/cs/browser/browser/preferences/zen-preferences.ftl
index 764d88da9..647241821 100644
--- a/locales/cs/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cs/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Přepnout výkon
 zen-devtools-toggle-storage-shortcut = Přepnout úložiště
 zen-devtools-toggle-dom-shortcut = Přepnout DOM
 zen-devtools-toggle-accessibility-shortcut = Přepnout přístupnost
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/cs/browser/browser/zen-workspaces.ftl b/locales/cs/browser/browser/zen-workspaces.ftl
index 66a3bb7b0..955506205 100644
--- a/locales/cs/browser/browser/zen-workspaces.ftl
+++ b/locales/cs/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Vytvořte si prostor
 zen-workspace-creation-label = Prostory slouží k organizaci Vašich karet a relací.
 zen-workspaces-delete-workspace-title = Odstranit prostor?
 zen-workspaces-delete-workspace-body = Opravdu chcete smazat { $name }? Tuto akci nelze vrátit zpět.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/cy/browser/browser/preferences/zen-preferences.ftl b/locales/cy/browser/browser/preferences/zen-preferences.ftl
index 55ac59b49..22affc6a0 100644
--- a/locales/cy/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cy/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/cy/browser/browser/zen-workspaces.ftl b/locales/cy/browser/browser/zen-workspaces.ftl
index 452a5e9bc..b68eda596 100644
--- a/locales/cy/browser/browser/zen-workspaces.ftl
+++ b/locales/cy/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/da/browser/browser/preferences/zen-preferences.ftl b/locales/da/browser/browser/preferences/zen-preferences.ftl
index 26e9a8e0e..41fba980b 100644
--- a/locales/da/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/da/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Vis/skjul Ydeevne
 zen-devtools-toggle-storage-shortcut = Vis/skjul Lager
 zen-devtools-toggle-dom-shortcut = Vis/skjul DOM
 zen-devtools-toggle-accessibility-shortcut = Vis/skjul Tilgængelighed
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/da/browser/browser/zen-workspaces.ftl b/locales/da/browser/browser/zen-workspaces.ftl
index 2dba98bab..8a48aff06 100644
--- a/locales/da/browser/browser/zen-workspaces.ftl
+++ b/locales/da/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Opret et rum
 zen-workspace-creation-label = Rum bruges til at organisere dine faner og sessioner.
 zen-workspaces-delete-workspace-title = Slet arbejdsområde?
 zen-workspaces-delete-workspace-body = Er du sikker på, at du vil slette { $name }? Dette kan ikke fortrydes.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index 19651bc1e..c7e176791 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Performance umschalten
 zen-devtools-toggle-storage-shortcut = Speicher umschalten
 zen-devtools-toggle-dom-shortcut = DOM umschalten
 zen-devtools-toggle-accessibility-shortcut = Barrierefreiheit umschalten
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index 071228c99..bfdff13a4 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Arbeitsbereich erstellen
 zen-workspace-creation-label = Arbeitsbereiche werden verwendet, um Ihre Tabs und Sitzungen zu organisieren.
 zen-workspaces-delete-workspace-title = Arbeitsbereich löschen?
 zen-workspaces-delete-workspace-body = Sind Sie sicher, dass Sie { $name } löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl
index fc8b527a6..720b6e4b0 100644
--- a/locales/el/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/el/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Εναλλαγή Επιδόσεων
 zen-devtools-toggle-storage-shortcut = Εναλλαγή Αποθηκευτικού Χώρου
 zen-devtools-toggle-dom-shortcut = Εναλλαγή DOM
 zen-devtools-toggle-accessibility-shortcut = Εναλλαγή Προσβασιμότητας
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/el/browser/browser/zen-workspaces.ftl b/locales/el/browser/browser/zen-workspaces.ftl
index c70cc2c30..3eb790094 100644
--- a/locales/el/browser/browser/zen-workspaces.ftl
+++ b/locales/el/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ 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.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
index f88081893..c30861606 100644
--- a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/en-GB/browser/browser/zen-workspaces.ftl b/locales/en-GB/browser/browser/zen-workspaces.ftl
index 299057041..cfc6588c7 100644
--- a/locales/en-GB/browser/browser/zen-workspaces.ftl
+++ b/locales/en-GB/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
index ec05a3f90..b45b28a56 100644
--- a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Alternar rendimiento
 zen-devtools-toggle-storage-shortcut = Alternar almacenamiento
 zen-devtools-toggle-dom-shortcut = Alternar DOM
 zen-devtools-toggle-accessibility-shortcut = Alternar accesibilidad
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/es-ES/browser/browser/zen-workspaces.ftl b/locales/es-ES/browser/browser/zen-workspaces.ftl
index 3346d48ea..d16a03549 100644
--- a/locales/es-ES/browser/browser/zen-workspaces.ftl
+++ b/locales/es-ES/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Crear un espacio
 zen-workspace-creation-label = Los espacios se utilizan para organizar sus pestañas y sesiones.
 zen-workspaces-delete-workspace-title = ¿Eliminar espacio de trabajo?
 zen-workspaces-delete-workspace-body = ¿Seguro que quiere eliminar { $name }? Esta acción no se puede deshacer.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/et/browser/browser/preferences/zen-preferences.ftl b/locales/et/browser/browser/preferences/zen-preferences.ftl
index 0e89e8121..7e7f70874 100644
--- a/locales/et/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/et/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Lülita jõudluse sektsioon sisse/vä
 zen-devtools-toggle-storage-shortcut = Lülita mälu sektsioon sisse/välja
 zen-devtools-toggle-dom-shortcut = Lülita DOM sisse/välja
 zen-devtools-toggle-accessibility-shortcut = Lülita ligipääsetavuse sektsioon sisse/välja
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/et/browser/browser/zen-workspaces.ftl b/locales/et/browser/browser/zen-workspaces.ftl
index ee416e641..4f897962c 100644
--- a/locales/et/browser/browser/zen-workspaces.ftl
+++ b/locales/et/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Loo uus tööruum
 zen-workspace-creation-label = Tööruume kasutatakse kaartide ja sessioonide organiseerimiseks.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Kas oled kindel, et soovid kustutada tööruumi { $name }? Seda tegevust ei saa tagasi võtta.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/fa/browser/browser/preferences/zen-preferences.ftl b/locales/fa/browser/browser/preferences/zen-preferences.ftl
index 4759f937c..daf1749be 100644
--- a/locales/fa/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fa/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/fa/browser/browser/zen-workspaces.ftl b/locales/fa/browser/browser/zen-workspaces.ftl
index 93e3ebac9..ccfae412c 100644
--- a/locales/fa/browser/browser/zen-workspaces.ftl
+++ b/locales/fa/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl
index 877e8753e..6fe88329d 100644
--- a/locales/fi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/fi/browser/browser/zen-workspaces.ftl b/locales/fi/browser/browser/zen-workspaces.ftl
index a4ce573ff..c122e1ade 100644
--- a/locales/fi/browser/browser/zen-workspaces.ftl
+++ b/locales/fi/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl
index 148b9ec72..e3d0f5fa3 100644
--- a/locales/fr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Afficher l’onglet Performances
 zen-devtools-toggle-storage-shortcut = Afficher l’onglet Stockage
 zen-devtools-toggle-dom-shortcut = Afficher l’onglet DOM
 zen-devtools-toggle-accessibility-shortcut = Afficher l’onglet Accessibilité
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/fr/browser/browser/zen-workspaces.ftl b/locales/fr/browser/browser/zen-workspaces.ftl
index 7d4a98b63..115dbfde5 100644
--- a/locales/fr/browser/browser/zen-workspaces.ftl
+++ b/locales/fr/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Créer un espace
 zen-workspace-creation-label = Les espaces sont utilisés pour organiser vos onglets et sessions.
 zen-workspaces-delete-workspace-title = Supprimer l’espace ?
 zen-workspaces-delete-workspace-body = Êtes-vous sûr de vouloir supprimer { $name } ? Cette action ne peut pas être annulée.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
index de1d4cb77..41d82b2f5 100644
--- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Scoránaigh Feidhmíochta
 zen-devtools-toggle-storage-shortcut = Scoránaigh Stóráil
 zen-devtools-toggle-dom-shortcut = Scoránaigh DOM
 zen-devtools-toggle-accessibility-shortcut = Scoránaigh Inrochtaineacht
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/ga-IE/browser/browser/zen-workspaces.ftl b/locales/ga-IE/browser/browser/zen-workspaces.ftl
index 33f9e1b2c..b607793c2 100644
--- a/locales/ga-IE/browser/browser/zen-workspaces.ftl
+++ b/locales/ga-IE/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Cruthaigh Spás
 zen-workspace-creation-label = Úsáidtear spásanna chun do chluaisíní agus do sheisiúin a eagrú.
 zen-workspaces-delete-workspace-title = Scrios an spás?
 zen-workspaces-delete-workspace-body = An bhfuil tú cinnte gur mian leat { $name } a scriosadh? Ní féidir an gníomh seo a chealú.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/he/browser/browser/preferences/zen-preferences.ftl b/locales/he/browser/browser/preferences/zen-preferences.ftl
index 8081799a3..4d26fabb8 100644
--- a/locales/he/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/he/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = הפעל/כבה ביצועים
 zen-devtools-toggle-storage-shortcut = הפעל/כבה אחסון
 zen-devtools-toggle-dom-shortcut = הפעל/כבה DOM
 zen-devtools-toggle-accessibility-shortcut = הפעל/כבה נגישות
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/he/browser/browser/zen-workspaces.ftl b/locales/he/browser/browser/zen-workspaces.ftl
index 89fd0dbe7..8da257d10 100644
--- a/locales/he/browser/browser/zen-workspaces.ftl
+++ b/locales/he/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = צור סביבה
 zen-workspace-creation-label = סביבות משומשות לסידור כרטיסיות והפעלות.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = האם ברצונך למחוק { $name }? פעולה זו לא ניתנת לביטול.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl
index 941ba12f3..1f2315ef9 100644
--- a/locales/hu/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Teljesítmény kapcsolása
 zen-devtools-toggle-storage-shortcut = Tároló kapcsolása
 zen-devtools-toggle-dom-shortcut = DOM kapcsolása
 zen-devtools-toggle-accessibility-shortcut = Hozzáférhetőség kapcsolása
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/hu/browser/browser/zen-workspaces.ftl b/locales/hu/browser/browser/zen-workspaces.ftl
index c26bc5a16..bb4f908c7 100644
--- a/locales/hu/browser/browser/zen-workspaces.ftl
+++ b/locales/hu/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Környezet létrehozása
 zen-workspace-creation-label = A munkakörnyezetek a lapok és munkamenetek rendszerezésére szolgálnak.
 zen-workspaces-delete-workspace-title = Munkakörnyezet törlése?
 zen-workspaces-delete-workspace-body = Biztosan törölni szeretnéd ezt: { $name }? Ez a művelet visszafordíthatatlan.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl
index 6b8a713b9..da04cd2f4 100644
--- a/locales/id/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/id/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Ubah Performance
 zen-devtools-toggle-storage-shortcut = Ubah Penyimpanan
 zen-devtools-toggle-dom-shortcut = Ubah DOM
 zen-devtools-toggle-accessibility-shortcut = Ubah Aksesibilitas
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/id/browser/browser/zen-workspaces.ftl b/locales/id/browser/browser/zen-workspaces.ftl
index 084c2a0f6..517f12082 100644
--- a/locales/id/browser/browser/zen-workspaces.ftl
+++ b/locales/id/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Buat sebuah Ruang
 zen-workspace-creation-label = Ruang digunakan untuk mengorganisasikan tab dan sesi Anda.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Apakah Anda yakin ingin menghapus { $name }? Tindakan ini tidak bisa dibatalkan.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/is/browser/browser/preferences/zen-preferences.ftl b/locales/is/browser/browser/preferences/zen-preferences.ftl
index 8a6c65792..1c048346d 100644
--- a/locales/is/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/is/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/is/browser/browser/zen-workspaces.ftl b/locales/is/browser/browser/zen-workspaces.ftl
index 452a5e9bc..b68eda596 100644
--- a/locales/is/browser/browser/zen-workspaces.ftl
+++ b/locales/is/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl
index c4a7830ec..f50895424 100644
--- a/locales/it/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/it/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Attiva/disattiva Prestazioni
 zen-devtools-toggle-storage-shortcut = Attiva/Disattiva Archiviazione
 zen-devtools-toggle-dom-shortcut = Attiva/Disattiva DOM
 zen-devtools-toggle-accessibility-shortcut = Attiva/Disattiva Accessibilità
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/it/browser/browser/zen-workspaces.ftl b/locales/it/browser/browser/zen-workspaces.ftl
index 7c9706b5f..e140c036f 100644
--- a/locales/it/browser/browser/zen-workspaces.ftl
+++ b/locales/it/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ 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 = Eliminare Spazio?
 zen-workspaces-delete-workspace-body = Sei sicuro di voler cancellare { $name }? Questa azione non può essere annullata.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/ja/browser/browser/preferences/zen-preferences.ftl b/locales/ja/browser/browser/preferences/zen-preferences.ftl
index 078ac2f41..685393d27 100644
--- a/locales/ja/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ja/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/ja/browser/browser/zen-workspaces.ftl b/locales/ja/browser/browser/zen-workspaces.ftl
index 28c02917b..d15942cbe 100644
--- a/locales/ja/browser/browser/zen-workspaces.ftl
+++ b/locales/ja/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/ko/browser/browser/preferences/zen-preferences.ftl b/locales/ko/browser/browser/preferences/zen-preferences.ftl
index a08b26c11..17e86242b 100644
--- a/locales/ko/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ko/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = 성능 탭 전환
 zen-devtools-toggle-storage-shortcut = 저장소 탭 전환
 zen-devtools-toggle-dom-shortcut = DOM 탭 전환
 zen-devtools-toggle-accessibility-shortcut = 접근성 탭 전환
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/ko/browser/browser/zen-workspaces.ftl b/locales/ko/browser/browser/zen-workspaces.ftl
index 6e300360d..5f0dde5fd 100644
--- a/locales/ko/browser/browser/zen-workspaces.ftl
+++ b/locales/ko/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = 스페이스 생성
 zen-workspace-creation-label = 스페이스는 탭과 세션을 정리하기 위해 사용됩니다.
 zen-workspaces-delete-workspace-title = 워크스페이스를 삭제하시겠습니까?
 zen-workspaces-delete-workspace-body = 정말 { $name }을 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl
index bd5c567ae..c2f87f56d 100644
--- a/locales/lt/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Perjungti našumą
 zen-devtools-toggle-storage-shortcut = Perjungti saugyklą
 zen-devtools-toggle-dom-shortcut = Perjungti DOM
 zen-devtools-toggle-accessibility-shortcut = Perjungti prieinamumą
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/lt/browser/browser/zen-workspaces.ftl b/locales/lt/browser/browser/zen-workspaces.ftl
index 27ec93263..9c371670e 100644
--- a/locales/lt/browser/browser/zen-workspaces.ftl
+++ b/locales/lt/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Kurti erdvę
 zen-workspace-creation-label = Erdvės naudojamos tvarkyti jūsų korteles ir seansus.
 zen-workspaces-delete-workspace-title = Ištrinti erdvę?
 zen-workspaces-delete-workspace-body = Ar tikrai norite ištrinti „{ $name }“? Šio veiksmo anuliuoti negalima.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/nl/browser/browser/preferences/zen-preferences.ftl b/locales/nl/browser/browser/preferences/zen-preferences.ftl
index c0106766b..346956afb 100644
--- a/locales/nl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nl/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Prestaties togglen
 zen-devtools-toggle-storage-shortcut = Opslag togglen
 zen-devtools-toggle-dom-shortcut = DOM togglen
 zen-devtools-toggle-accessibility-shortcut = Toegankelijkheid togglen
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/nl/browser/browser/zen-workspaces.ftl b/locales/nl/browser/browser/zen-workspaces.ftl
index 95d2e37e6..41d8e48af 100644
--- a/locales/nl/browser/browser/zen-workspaces.ftl
+++ b/locales/nl/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Maak een ruimte
 zen-workspace-creation-label = Ruimtes worden gebruikt om je tabbladen en sessies te organiseren.
 zen-workspaces-delete-workspace-title = Ruimte verwijderen?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
index 85e53500d..043b6ec83 100644
--- a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/nn-NO/browser/browser/zen-workspaces.ftl b/locales/nn-NO/browser/browser/zen-workspaces.ftl
index ac5baadd4..18ee8171f 100644
--- a/locales/nn-NO/browser/browser/zen-workspaces.ftl
+++ b/locales/nn-NO/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl
index 474ab927d..9797ee87e 100644
--- a/locales/pl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Włącz Wydajność
 zen-devtools-toggle-storage-shortcut = Włącz Pamięć
 zen-devtools-toggle-dom-shortcut = Włącz DOM
 zen-devtools-toggle-accessibility-shortcut = Włącz Dostępność
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/pl/browser/browser/zen-workspaces.ftl b/locales/pl/browser/browser/zen-workspaces.ftl
index eaca53793..ab8e2bb84 100644
--- a/locales/pl/browser/browser/zen-workspaces.ftl
+++ b/locales/pl/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Utwórz Przestrzeń
 zen-workspace-creation-label = Przestrzenie są wykorzystywane do zorganizowania kart i sesji.
 zen-workspaces-delete-workspace-title = Usunąć Przestrzeń roboczą?
 zen-workspaces-delete-workspace-body = Czy na pewno chcesz usunąć { $name }? Tej czynności nie można cofnąć.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
index fe1197646..a79c6020a 100644
--- a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Ativar/Desativar Desempenho
 zen-devtools-toggle-storage-shortcut = Ativar/Desativar Armazenamento
 zen-devtools-toggle-dom-shortcut = Ativar/Desativar DOM
 zen-devtools-toggle-accessibility-shortcut = Ativar/Desativar Acessibilidade
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/pt-BR/browser/browser/zen-workspaces.ftl b/locales/pt-BR/browser/browser/zen-workspaces.ftl
index 95d57fc06..f79a544e5 100644
--- a/locales/pt-BR/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-BR/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Crie um Espaço
 zen-workspace-creation-label = Espaços são usados para organizar suas guias e sessões.
 zen-workspaces-delete-workspace-title = Excluir Espaço?
 zen-workspaces-delete-workspace-body = Tem certeza que deseja excluir { $name }? Esta ação não pode ser desfeita.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
index 9edb55b1e..c0c23cf20 100644
--- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Alternar Desempenho
 zen-devtools-toggle-storage-shortcut = Alternar Armazenamento
 zen-devtools-toggle-dom-shortcut = Alternar DOM
 zen-devtools-toggle-accessibility-shortcut = Alternar Acessibilidade
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/pt-PT/browser/browser/zen-workspaces.ftl b/locales/pt-PT/browser/browser/zen-workspaces.ftl
index 9394615ed..1d3f236c4 100644
--- a/locales/pt-PT/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-PT/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Criar um Espaço
 zen-workspace-creation-label = Os espaços são usados para organizar os seus separadores e sessões.
 zen-workspaces-delete-workspace-title = Eliminar Espaço de Trabalho?
 zen-workspaces-delete-workspace-body = Tem certeza que deseja eliminar { $name }? Esta ação não pode ser desfeita.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/ru/browser/browser/preferences/zen-preferences.ftl b/locales/ru/browser/browser/preferences/zen-preferences.ftl
index 10787834d..9089392fe 100644
--- a/locales/ru/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ru/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Переключить произво
 zen-devtools-toggle-storage-shortcut = Переключить хранилище
 zen-devtools-toggle-dom-shortcut = Переключить DOM
 zen-devtools-toggle-accessibility-shortcut = Включить/выключить специальные возможности
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/ru/browser/browser/zen-workspaces.ftl b/locales/ru/browser/browser/zen-workspaces.ftl
index 554aab913..302607e35 100644
--- a/locales/ru/browser/browser/zen-workspaces.ftl
+++ b/locales/ru/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Создать пространство
 zen-workspace-creation-label = Пространства используются для организации ваших вкладок и сеансов.
 zen-workspaces-delete-workspace-title = Удалить пространство?
 zen-workspaces-delete-workspace-body = Вы уверены, что хотите удалить { $name }? Это действие необратимо.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
index c66d08cca..669589406 100644
--- a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/sv-SE/browser/browser/zen-workspaces.ftl b/locales/sv-SE/browser/browser/zen-workspaces.ftl
index 56735f244..a1cfaad1c 100644
--- a/locales/sv-SE/browser/browser/zen-workspaces.ftl
+++ b/locales/sv-SE/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Ta bort arbetsyta?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/th/browser/browser/preferences/zen-preferences.ftl b/locales/th/browser/browser/preferences/zen-preferences.ftl
index 85e53500d..043b6ec83 100644
--- a/locales/th/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/th/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Toggle Performance
 zen-devtools-toggle-storage-shortcut = Toggle Storage
 zen-devtools-toggle-dom-shortcut = Toggle DOM
 zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/th/browser/browser/zen-workspaces.ftl b/locales/th/browser/browser/zen-workspaces.ftl
index ac5baadd4..18ee8171f 100644
--- a/locales/th/browser/browser/zen-workspaces.ftl
+++ b/locales/th/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/tr/browser/browser/preferences/zen-preferences.ftl b/locales/tr/browser/browser/preferences/zen-preferences.ftl
index 2c71e5801..532656784 100644
--- a/locales/tr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/tr/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Performansı Aç/Kapat
 zen-devtools-toggle-storage-shortcut = Depolamayı Aç/Kapat
 zen-devtools-toggle-dom-shortcut = DOM'u Aç/Kapat
 zen-devtools-toggle-accessibility-shortcut = Erişilebilirliği Aç/Kapat
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/tr/browser/browser/zen-workspaces.ftl b/locales/tr/browser/browser/zen-workspaces.ftl
index ec4ae1750..00dc010e6 100644
--- a/locales/tr/browser/browser/zen-workspaces.ftl
+++ b/locales/tr/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl
index 206429694..bd01e7dec 100644
--- a/locales/uk/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Увімк. / Вимк. продук
 zen-devtools-toggle-storage-shortcut = Увімк. / Вимк. сховище
 zen-devtools-toggle-dom-shortcut = Увімк. / Вимк. DOM
 zen-devtools-toggle-accessibility-shortcut = Увімк. / Вимк. доступ
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/uk/browser/browser/zen-workspaces.ftl b/locales/uk/browser/browser/zen-workspaces.ftl
index 3dc3115b6..7f433b53d 100644
--- a/locales/uk/browser/browser/zen-workspaces.ftl
+++ b/locales/uk/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Створити простір
 zen-workspace-creation-label = Простори використовуються для організації ваших вкладок та сеансів.
 zen-workspaces-delete-workspace-title = Видалити простір?
 zen-workspaces-delete-workspace-body = Упевнені, що хочете видалити { $name }? Цю дію неможливо скасувати.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/vi/browser/browser/preferences/zen-preferences.ftl b/locales/vi/browser/browser/preferences/zen-preferences.ftl
index 38bfc6398..5d88a73a4 100644
--- a/locales/vi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/vi/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = Bật tối ưu Hiệu năng
 zen-devtools-toggle-storage-shortcut = Bật lưu trữ
 zen-devtools-toggle-dom-shortcut = Bật DOM
 zen-devtools-toggle-accessibility-shortcut = Bật trợ năng
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/vi/browser/browser/zen-workspaces.ftl b/locales/vi/browser/browser/zen-workspaces.ftl
index b781169ff..a7433ca16 100644
--- a/locales/vi/browser/browser/zen-workspaces.ftl
+++ b/locales/vi/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = Tạo không gian làm việc
 zen-workspace-creation-label = Không gian làm việc sẽ là nơi để bạn chứa các trang web và lượt truy cập của bạn.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Bạn có chắc là bạn muốn xóa { $name }? Thao tác này sẽ không được hoàn lại.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
index 5d2cffd86..011231623 100644
--- a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = 切换性能
 zen-devtools-toggle-storage-shortcut = 切换存储
 zen-devtools-toggle-dom-shortcut = 切换 DOM
 zen-devtools-toggle-accessibility-shortcut = 切换无障碍环境
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/zh-CN/browser/browser/zen-workspaces.ftl b/locales/zh-CN/browser/browser/zen-workspaces.ftl
index 7a9c3841f..4de4c8227 100644
--- a/locales/zh-CN/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-CN/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = 创建工作区
 zen-workspace-creation-label = 工作区用于组织标签页和会话。
 zen-workspaces-delete-workspace-title = 删除工作区？
 zen-workspaces-delete-workspace-body = 你确定要删除 { $name } 吗？这个操作无法撤销。
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs
diff --git a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
index af9de897d..c60dc5903 100644
--- a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
@@ -300,3 +300,4 @@ zen-devtools-toggle-performance-shortcut = 開啟效能檢測器
 zen-devtools-toggle-storage-shortcut = 開啟儲存空間檢測器
 zen-devtools-toggle-dom-shortcut = 開啟 DOM
 zen-devtools-toggle-accessibility-shortcut = 開啟輔助功能
+zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
diff --git a/locales/zh-TW/browser/browser/zen-workspaces.ftl b/locales/zh-TW/browser/browser/zen-workspaces.ftl
index 18f96eaa4..fe3944b13 100644
--- a/locales/zh-TW/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-TW/browser/browser/zen-workspaces.ftl
@@ -53,3 +53,9 @@ zen-workspace-creation-header = 建立工作區
 zen-workspace-creation-label = 工作區用於組織您的分頁與工作階段。
 zen-workspaces-delete-workspace-title = 刪除工作區？
 zen-workspaces-delete-workspace-body = 您確定要刪除 { $name } 嗎？此操錯無法復原。
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-title = 
+    .label = Clear
+    .tooltiptext = Close all unpinned tabs

From 7fdef3b40f1477e93bf2ac5596435b477e1e878f Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 28 Oct 2025 19:36:57 +0100
Subject: [PATCH 033/162] chore: Updated to Firefox `144.0.2`, b=no-bug,
 c=l10n, tabs, workspaces

---
 README.md                                     |  4 +-
 build/firefox-cache/l10n-last-commit-hash     |  2 +-
 src/browser/themes/shared/zen-icons/icons.css |  6 ++-
 .../ff-145-tahoe-upgrade.patch                | 36 ---------------
 src/zen/tabs/zen-tabs/vertical-tabs.css       | 17 +++++--
 src/zen/workspaces/ZenWorkspaces.mjs          | 45 ++++++++++++++++---
 surfer.json                                   |  4 +-
 7 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index f9166612c..aa71c3917 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 `144.0`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 144.0`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `144.0.2`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 144.0.2`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 34eb47c39..26d328f6d 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-16e978d10b8a1c49267e8f1574f52c3e0d5089ae
\ No newline at end of file
+860c37a26622f61c74c7cbb93f7e0ae759fcbfe1
\ 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 dd9b5451c..082e5b7c8 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -394,7 +394,11 @@
 }
 
 .zen-workspace-close-unpinned-tabs-button {
-  list-style-image: url('dart-down.svg') !important;
+  list-style-image: url('dart-down.svg');
+
+  &:not([can-close='true']) .toolbarbutton-icon {
+    display: none;
+  }
 }
 
 .zen-workspace-actions-reorder-icon,
diff --git a/src/firefox-patches/ff-145-tahoe-upgrade.patch b/src/firefox-patches/ff-145-tahoe-upgrade.patch
index 9caa99615..ff27f9aca 100644
--- a/src/firefox-patches/ff-145-tahoe-upgrade.patch
+++ b/src/firefox-patches/ff-145-tahoe-upgrade.patch
@@ -197,42 +197,6 @@ index fc1e28206ac2..1661476a75f0 100644
      /*
       * 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
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 240e16eb5..258ea20f6 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -130,12 +130,14 @@
    Pinned Tabs Separator
    ========================================================================== */
 .pinned-tabs-container-separator {
-  height: 24px;
+  height: 22px;
+  padding-bottom: 2px;
   border: none;
-  width: 98%;
+  width: 100%;
   transition:
     height 0.08s ease-in-out,
-    opacity 0.08s ease-in-out;
+    padding 0.08s ease-in-out,
+    opacity 0.06s ease-in-out;
   overflow: hidden;
   position: relative;
   opacity: 1;
@@ -155,13 +157,15 @@
   #tabbrowser-tabs[movingtab] & {
     transition:
       height 0.08s ease-in-out,
-      opacity 0.08s ease-in-out,
+      padding 0.08s ease-in-out,
+      opacity 0.06s ease-in-out,
       transform 0.1s ease-in-out;
   }
 
   .zen-workspace-pinned-tabs-section[hide-separator] & {
     height: 0px;
     opacity: 0;
+    padding-bottom: 0px;
   }
 
   & toolbarbutton {
@@ -195,6 +199,11 @@
     & .toolbarbutton-icon {
       width: 10px;
       transition: transform 0.15s ease-in-out;
+      transform: translateY(0px);
+
+      @starting-style {
+        transform: translateY(-2px);
+      }
     }
 
     &:active:hover .toolbarbutton-icon {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 6ee9386ff..45e12adfc 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1483,15 +1483,37 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     });
   }
 
-  unpinnedTabsInWorkspace(workspaceID) {
+  #unpinnedTabsInWorkspace(workspaceID) {
     return Array.from(this.allStoredTabs).filter(
       (tab) => tab.getAttribute('zen-workspace-id') === workspaceID && tab.visible && !tab.pinned
     );
   }
 
+  #getClosableTabs(tabs) {
+    const remainingTabs = tabs.filter((tab) => {
+      const attributes = ['selected', 'multiselected', 'pictureinpicture', 'soundplaying'];
+      for (const attr of attributes) {
+        if (tab.hasAttribute(attr)) {
+          return false;
+        }
+      }
+      const browser = tab.linkedBrowser;
+      if (
+        window.webrtcUI.browserHasStreams(browser) ||
+        browser?.browsingContext?.currentWindowGlobal?.hasActivePeerConnections()
+      ) {
+        return false;
+      }
+      return true;
+    });
+    if (remainingTabs.length === 0) {
+      return tabs; // If no tabs are safe to close, return all to force close
+    }
+    return remainingTabs;
+  }
+
   #deleteAllUnpinnedTabsInWorkspace(tabs) {
     gBrowser.removeTabs(tabs, {
-      animate: false,
       closeWindowWithLastTab: false,
     });
   }
@@ -2480,7 +2502,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     }
     // Only animate if it's from an event
     let animateContainer = target && target.target instanceof EventTarget;
-    if (target?.type === 'TabClose') {
+    if (target?.type === 'TabClose' || target?.type === 'TabOpened') {
       animateContainer = target.target.pinned;
     }
     await this.onPinnedTabsResize(
@@ -2503,6 +2525,15 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     if (shouldHideSeparator) {
       pinnedContainer.setAttribute('hide-separator', 'true');
     } else {
+      const workspaceID = pinnedContainer.getAttribute('zen-workspace-id');
+      const tabs = this.#unpinnedTabsInWorkspace(workspaceID);
+      const closableTabs = this.#getClosableTabs(tabs);
+      const button = pinnedContainer.querySelector('.zen-workspace-close-unpinned-tabs-button');
+      if (tabs.length === closableTabs.length) {
+        button.setAttribute('can-close', 'true');
+      } else {
+        button.removeAttribute('can-close');
+      }
       pinnedContainer.removeAttribute('hide-separator');
     }
   }
@@ -2669,11 +2700,11 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
 
   async closeAllUnpinnedTabs() {
     const workspaceId = this.#contextMenuData?.workspaceId || this.activeWorkspace;
-    const unpinnedTabs = await this.unpinnedTabsInWorkspace(workspaceId);
+    const unpinnedTabs = this.#unpinnedTabsInWorkspace(workspaceId);
+    const closableTabs = this.#getClosableTabs(unpinnedTabs);
 
-    if (!unpinnedTabs.length) return;
-
-    this.#deleteAllUnpinnedTabsInWorkspace(unpinnedTabs);
+    if (!closableTabs.length) return;
+    this.#deleteAllUnpinnedTabsInWorkspace(closableTabs);
 
     const restoreClosedTabsShortcut = gZenKeyboardShortcutsManager.getShortcutDisplayFromCommand(
       'History:RestoreLastClosedTabOrWindowOrSession'
diff --git a/surfer.json b/surfer.json
index c224008c8..a45c167bc 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "144.0",
-    "candidate": "144.0"
+    "version": "144.0.2",
+    "candidate": "144.0.2"
   },
   "buildOptions": {
     "generateBranding": true

From d7462f2f9d8eb3b0fa71306831756195e355bea6 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 28 Oct 2025 20:41:48 +0100
Subject: [PATCH 034/162] chore: Bump version, b=no-bug

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 surfer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/surfer.json b/surfer.json
index a45c167bc..282528c9d 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.3b",
+        "displayVersion": "1.17.4b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}

From 0503bd73aef895bbfccb4a3f1ed56ed4f22eaf05 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 28 Oct 2025 22:54:45 +0100
Subject: [PATCH 035/162] chore: Update rustc version, b=no-bug, c=no-component

---
 .rust-toolchain | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rust-toolchain b/.rust-toolchain
index a92432a8a..5e49e6ba1 100644
--- a/.rust-toolchain
+++ b/.rust-toolchain
@@ -1 +1 @@
-1.82
+1.83
\ No newline at end of file

From 47ca48e5a5a15728c9ec2fddf80ba146021a2e15 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 29 Oct 2025 10:53:53 +0100
Subject: [PATCH 036/162] feat: Add a preference for site overlap and glance
 durations, b=closes #11056, c=glance, common

---
 prefs/zen/glance.yaml                         |  5 ++-
 prefs/zen/view.yaml                           |  3 ++
 .../common/styles/zen-browser-container.css   |  2 +-
 src/zen/glance/ZenGlanceManager.mjs           | 36 +++++++++----------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/prefs/zen/glance.yaml b/prefs/zen/glance.yaml
index 49125fe30..0d3b15742 100644
--- a/prefs/zen/glance.yaml
+++ b/prefs/zen/glance.yaml
@@ -12,4 +12,7 @@
   value: true
 
 - name: zen.glance.activation-method
-  value: 'alt' # ctrl, alt, shift, none, hold
+  value: 'alt' # ctrl, alt, shift
+
+- name: zen.glance.animation-duration
+  value: 400 # in milliseconds
diff --git a/prefs/zen/view.yaml b/prefs/zen/view.yaml
index ff34b01d0..c5970430e 100644
--- a/prefs/zen/view.yaml
+++ b/prefs/zen/view.yaml
@@ -54,3 +54,6 @@
 
 - name: zen.view.borderless-fullscreen
   value: true
+
+- name: zen.view.shift-down-site-on-hover
+  value: false
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index db466d89c..3bde84f83 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.shift-down-site-on-hover')) and (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 var(--zen-hidden-toolbar-transition);
 
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 7f1c60680..388ac7461 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -34,6 +34,8 @@
       ARC_HEIGHT_RATIO: 0.2, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
     });
 
+    #GLANCE_ANIMATION_DURATION = Services.prefs.getIntPref('zen.glance.animation-duration') / 1000;
+
     init() {
       this.#setupEventListeners();
       this.#setupPreferences();
@@ -247,7 +249,7 @@
         {
           duration: 0.2,
           type: 'spring',
-          delay: 0.2,
+          delay: this.#GLANCE_ANIMATION_DURATION - 0.2,
           bounce: 0,
         }
       );
@@ -395,7 +397,7 @@
           opacity: [1, 0.4],
         },
         {
-          duration: 0.3,
+          duration: this.#GLANCE_ANIMATION_DURATION,
           type: 'spring',
           bounce: 0.2,
         }
@@ -464,7 +466,7 @@
           opacity: [1, 0],
         },
         {
-          duration: 0.1,
+          duration: this.#GLANCE_ANIMATION_DURATION / 2,
           easing: 'easeInOut',
         }
       );
@@ -491,17 +493,8 @@
      * @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}`;
+      const { clientX, clientY } = data;
+      return `${clientX}px ${clientY}px`;
     }
 
     /**
@@ -528,7 +521,7 @@
             this.contentWrapper,
             { opacity: [0, 1] },
             {
-              duration: 0.1,
+              duration: this.#GLANCE_ANIMATION_DURATION / 2,
               easing: 'easeInOut',
             }
           )
@@ -540,7 +533,7 @@
       this.#animateParentBackground();
       gZenUIManager.motion
         .animate(this.browserWrapper, arcSequence, {
-          duration: gZenUIManager.testingEnabled ? 0 : 0.3,
+          duration: gZenUIManager.testingEnabled ? 0 : this.#GLANCE_ANIMATION_DURATION,
           ease: 'easeInOut',
         })
         .then(() => {
@@ -892,7 +885,7 @@
             {
               duration: 0.2,
               type: 'spring',
-              bounce: 0.2,
+              bounce: this.#GLANCE_ANIMATION_DURATION - 0.1,
             }
           )
           .then(() => {
@@ -929,7 +922,7 @@
             opacity: [0.4, 1],
           },
           {
-            duration: 0.3,
+            duration: this.#GLANCE_ANIMATION_DURATION,
             type: 'spring',
             bounce: 0,
           }
@@ -959,7 +952,10 @@
         const arcSequence = this.#createGlanceArcSequence(closingData, 'closing');
 
         gZenUIManager.motion
-          .animate(this.browserWrapper, arcSequence, { duration: 0.3, ease: 'easeOut' })
+          .animate(this.browserWrapper, arcSequence, {
+            duration: this.#GLANCE_ANIMATION_DURATION,
+            ease: 'easeOut',
+          })
           .then(() => {
             // Remove element preview after closing animation
             const elementPreview = this.browserWrapper.querySelector('.zen-glance-element-preview');
@@ -1490,7 +1486,7 @@
           height: ['100%', '100%'],
         },
         {
-          duration: 0.3,
+          duration: this.#GLANCE_ANIMATION_DURATION,
           type: 'spring',
           bounce: 0,
         }

From d7faa543e234655ca2fa18d7adf377dd833b9f76 Mon Sep 17 00:00:00 2001
From: Syed_Sibteali_Baqar <sibteali786@gmail.com>
Date: Wed, 29 Oct 2025 15:29:50 +0500
Subject: [PATCH 037/162] fix: Sidebar flickering during drag operations in
 compact mode, b=bug https://github.com/zen-browser/desktop/issues/10942,
 p=#11015

* fix:sidebar flickering during drag operations in compact mode

* fix: streamline drag state cleanup in compact mode

* fix: remove redundant event listener tracking for drag state cleanup

* fix: refactor drag state cleanup for improved readability and consistency

* feat: Dont check for child elemenets, b=no-bug, c=compact-mode
---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 src/zen/compact-mode/ZenCompactMode.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 514bc9aea..14ba11e0c 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -715,7 +715,10 @@ var gZenCompactModeManager = {
             (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' &&
               gZenVerticalTabsManager._hasSetSingleToolbar) ||
             this._hasHoveredUrlbar ||
-            this._ignoreNextHover
+            this._ignoreNextHover ||
+            (event.type === 'dragleave' &&
+              event.explicitOriginalTarget !== target &&
+              target.contains?.(event.explicitOriginalTarget))
           ) {
             return;
           }

From 3930dae56a20f62fda93d169a04ff2959c1b493f Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 29 Oct 2025 18:43:46 +0100
Subject: [PATCH 038/162] chore: Add licenses to locales, b=no-bug, c=folders,
 split-view, tabs, workspaces

---
 .../browser/browser/preferences/zen-preferences.ftl      | 3 +++
 locales/en-US/browser/browser/zen-folders.ftl            | 3 +++
 locales/en-US/browser/browser/zen-general.ftl            | 3 +++
 locales/en-US/browser/browser/zen-split-view.ftl         | 3 +++
 locales/en-US/browser/browser/zen-vertical-tabs.ftl      | 3 +++
 locales/en-US/browser/browser/zen-workspaces.ftl         | 9 ++++++---
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
index d2e2c7589..ea49e2517 100644
--- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,6 @@
+# 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/.
 
 pane-zen-looks-title = Look and Feel
 category-zen-looks =
diff --git a/locales/en-US/browser/browser/zen-folders.ftl b/locales/en-US/browser/browser/zen-folders.ftl
index 6cd7d72cf..ebeeaf33c 100644
--- a/locales/en-US/browser/browser/zen-folders.ftl
+++ b/locales/en-US/browser/browser/zen-folders.ftl
@@ -1,3 +1,6 @@
+# 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/.
 
 zen-folders-search-placeholder =
     .placeholder = Search { $folder-name }...
diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 0b2f5641d..49fe38cf0 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -1,3 +1,6 @@
+# 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/.
 
 zen-panel-ui-current-profile-text = current profile
 
diff --git a/locales/en-US/browser/browser/zen-split-view.ftl b/locales/en-US/browser/browser/zen-split-view.ftl
index 0319f26d0..2f1bafedc 100644
--- a/locales/en-US/browser/browser/zen-split-view.ftl
+++ b/locales/en-US/browser/browser/zen-split-view.ftl
@@ -1,3 +1,6 @@
+# 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/.
 
 tab-zen-split-tabs =
     .label =
diff --git a/locales/en-US/browser/browser/zen-vertical-tabs.ftl b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
index 1a40fa77a..cc9791f7f 100644
--- a/locales/en-US/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/en-US/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,6 @@
+# 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/.
 
 zen-toolbar-context-tabs-right =
     .label = Tabs on the right
diff --git a/locales/en-US/browser/browser/zen-workspaces.ftl b/locales/en-US/browser/browser/zen-workspaces.ftl
index db5bf6574..67f43f7fe 100644
--- a/locales/en-US/browser/browser/zen-workspaces.ftl
+++ b/locales/en-US/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,6 @@
+# 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/.
 
 zen-panel-ui-workspaces-text = Spaces
 
@@ -74,9 +77,9 @@ zen-workspace-creation-label = Spaces are used to organize your tabs and session
 zen-workspaces-delete-workspace-title = Delete Space?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
 
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
-zen-workspaces-close-all-unpinned-tabs-title = 
+zen-workspaces-close-all-unpinned-tabs-title =
     .label = Clear
     .tooltiptext = Close all unpinned tabs

From 8edc9bee06f2ff5e0a0879f135ebbe722eaab935 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 29 Oct 2025 19:08:47 +0100
Subject: [PATCH 039/162] feat: Improved glance closing animation, b=no-bug,
 c=glance

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

diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 388ac7461..3720448fa 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -30,7 +30,7 @@
     // Arc animation configuration
     #ARC_CONFIG = Object.freeze({
       ARC_STEPS: 70, // Increased for smoother bounce
-      MAX_ARC_HEIGHT: 30,
+      MAX_ARC_HEIGHT: 25,
       ARC_HEIGHT_RATIO: 0.2, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
     });
 
@@ -348,6 +348,7 @@
      * @returns {Promise<Tab>} Promise that resolves to the glance tab
      */
     #animateGlanceOpening(data, browserElement) {
+      this.#prepareGlanceAnimation(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.
@@ -356,7 +357,6 @@
         // Recalculate location. When opening from pinned tabs,
         // view splitter doesn't catch if the tab is a glance tab or not.
         gZenViewSplitter.onLocationChange(browserElement);
-        this.#prepareGlanceAnimation(data, browserElement);
         if (data.width && data.height) {
           // It is guaranteed that we will animate this opacity later on
           // when we start animating the glance.
@@ -578,8 +578,8 @@
           height: tabPanelsRect.height,
         };
         endPosition = {
-          x: clientX + width / 2,
-          y: clientY + height / 2,
+          x: Math.floor(clientX + width / 2),
+          y: Math.floor(clientY + height / 2),
           width: width,
           height: height,
         };
@@ -646,7 +646,7 @@
         for (let i = 0; i < bounceSteps; i++) {
           const progress = i / bounceSteps;
           // Scale up slightly then back to normal
-          scale = 1 + 0.004 * Math.sin(progress * Math.PI);
+          scale = 1 + 0.003 * Math.sin(progress * Math.PI);
           // If we are at the last step, ensure scale is exactly 1
           if (i === bounceSteps - 1) {
             scale = 1;

From aef96da99485ea3671e100bf5e1bdf249b8d420b Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 29 Oct 2025 19:13:16 +0100
Subject: [PATCH 040/162] chore: New Crowdin updates, p=#11064

* New translations zen-workspaces.ftl (French)

* New translations zen-preferences.ftl (French)

* New translations zen-preferences.ftl (Spanish)

* New translations zen-preferences.ftl (Catalan)

* New translations zen-preferences.ftl (Irish)

* New translations zen-preferences.ftl (Hungarian)

* New translations zen-preferences.ftl (Italian)

* New translations zen-preferences.ftl (Russian)

* New translations zen-workspaces.ftl (Spanish)

* New translations zen-workspaces.ftl (Catalan)

* New translations zen-workspaces.ftl (Irish)

* New translations zen-workspaces.ftl (Hungarian)

* New translations zen-workspaces.ftl (Italian)

* New translations zen-workspaces.ftl (Russian)

* New translations zen-folders.ftl (Dutch)

* Update source file zen-general.ftl

* Update source file zen-split-view.ftl

* Update source file zen-vertical-tabs.ftl

* Update source file zen-workspaces.ftl

* Update source file zen-preferences.ftl

* Update source file zen-folders.ftl

* New translations zen-general.ftl (French)

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

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

* New translations zen-split-view.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-folders.ftl (French)

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

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

* New translations zen-folders.ftl (Indonesian)

* 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-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 (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-split-view.ftl (French)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations zen-split-view.ftl (Chinese Simplified)

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

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

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

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

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

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

* New translations zen-split-view.ftl (Norwegian Nynorsk)

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

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

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

* 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 (Spanish)

* New translations zen-folders.ftl (Arabic)

* New translations zen-folders.ftl (Catalan)

* New translations zen-folders.ftl (Czech)

* New translations zen-folders.ftl (Danish)

* New translations zen-folders.ftl (German)

* New translations zen-folders.ftl (Greek)

* New translations zen-folders.ftl (Finnish)

* New translations zen-folders.ftl (Irish)

* New translations zen-folders.ftl (Hebrew)

* New translations zen-folders.ftl (Hungarian)

* New translations zen-folders.ftl (Italian)

* New translations zen-folders.ftl (Japanese)

* New translations zen-folders.ftl (Korean)

* New translations zen-folders.ftl (Lithuanian)

* New translations zen-folders.ftl (Dutch)

* New translations zen-folders.ftl (Polish)

* New translations zen-folders.ftl (Portuguese)

* New translations zen-folders.ftl (Russian)

* New translations zen-folders.ftl (Swedish)

* New translations zen-folders.ftl (Turkish)

* New translations zen-folders.ftl (Ukrainian)

* New translations zen-folders.ftl (Vietnamese)

* New translations zen-folders.ftl (Icelandic)

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

* New translations zen-folders.ftl (Persian)

* New translations zen-folders.ftl (Thai)

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

* New translations zen-folders.ftl (Estonian)

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

* New translations zen-folders.ftl (Welsh)
---
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/ar/browser/browser/zen-folders.ftl     |  4 ++++
 locales/ar/browser/browser/zen-general.ftl     |  4 ++++
 locales/ar/browser/browser/zen-split-view.ftl  |  4 ++++
 .../ar/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/ar/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  6 +++++-
 locales/ca/browser/browser/zen-folders.ftl     |  4 ++++
 locales/ca/browser/browser/zen-general.ftl     |  4 ++++
 locales/ca/browser/browser/zen-split-view.ftl  |  4 ++++
 .../ca/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/ca/browser/browser/zen-workspaces.ftl  | 14 +++++++++-----
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/cs/browser/browser/zen-folders.ftl     |  4 ++++
 locales/cs/browser/browser/zen-general.ftl     |  4 ++++
 locales/cs/browser/browser/zen-split-view.ftl  |  4 ++++
 .../cs/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/cs/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/cy/browser/browser/zen-folders.ftl     |  4 ++++
 locales/cy/browser/browser/zen-general.ftl     |  4 ++++
 locales/cy/browser/browser/zen-split-view.ftl  |  4 ++++
 .../cy/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/cy/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/da/browser/browser/zen-folders.ftl     |  4 ++++
 locales/da/browser/browser/zen-general.ftl     |  4 ++++
 locales/da/browser/browser/zen-split-view.ftl  |  4 ++++
 .../da/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/da/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/de/browser/browser/zen-folders.ftl     |  4 ++++
 locales/de/browser/browser/zen-general.ftl     |  4 ++++
 locales/de/browser/browser/zen-split-view.ftl  |  4 ++++
 .../de/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/de/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/el/browser/browser/zen-folders.ftl     |  4 ++++
 locales/el/browser/browser/zen-general.ftl     |  4 ++++
 locales/el/browser/browser/zen-split-view.ftl  |  4 ++++
 .../el/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/el/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/en-GB/browser/browser/zen-folders.ftl  |  4 ++++
 locales/en-GB/browser/browser/zen-general.ftl  |  4 ++++
 .../en-GB/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../en-GB/browser/browser/zen-workspaces.ftl   |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  6 +++++-
 locales/es-ES/browser/browser/zen-folders.ftl  |  4 ++++
 locales/es-ES/browser/browser/zen-general.ftl  |  4 ++++
 .../es-ES/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../es-ES/browser/browser/zen-workspaces.ftl   | 14 +++++++++-----
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/et/browser/browser/zen-folders.ftl     |  4 ++++
 locales/et/browser/browser/zen-general.ftl     |  4 ++++
 locales/et/browser/browser/zen-split-view.ftl  |  4 ++++
 .../et/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/et/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/fa/browser/browser/zen-folders.ftl     |  4 ++++
 locales/fa/browser/browser/zen-general.ftl     |  4 ++++
 locales/fa/browser/browser/zen-split-view.ftl  |  4 ++++
 .../fa/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/fa/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/fi/browser/browser/zen-folders.ftl     |  4 ++++
 locales/fi/browser/browser/zen-general.ftl     |  4 ++++
 locales/fi/browser/browser/zen-split-view.ftl  |  4 ++++
 .../fi/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/fi/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  6 +++++-
 locales/fr/browser/browser/zen-folders.ftl     |  4 ++++
 locales/fr/browser/browser/zen-general.ftl     |  4 ++++
 locales/fr/browser/browser/zen-split-view.ftl  |  4 ++++
 .../fr/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/fr/browser/browser/zen-workspaces.ftl  | 14 +++++++++-----
 .../browser/preferences/zen-preferences.ftl    |  6 +++++-
 locales/ga-IE/browser/browser/zen-folders.ftl  |  4 ++++
 locales/ga-IE/browser/browser/zen-general.ftl  |  4 ++++
 .../ga-IE/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../ga-IE/browser/browser/zen-workspaces.ftl   | 14 +++++++++-----
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/he/browser/browser/zen-folders.ftl     |  4 ++++
 locales/he/browser/browser/zen-general.ftl     |  4 ++++
 locales/he/browser/browser/zen-split-view.ftl  |  4 ++++
 .../he/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/he/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  6 +++++-
 locales/hu/browser/browser/zen-folders.ftl     |  4 ++++
 locales/hu/browser/browser/zen-general.ftl     |  4 ++++
 locales/hu/browser/browser/zen-split-view.ftl  |  4 ++++
 .../hu/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/hu/browser/browser/zen-workspaces.ftl  | 14 +++++++++-----
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/id/browser/browser/zen-folders.ftl     |  4 ++++
 locales/id/browser/browser/zen-general.ftl     |  4 ++++
 locales/id/browser/browser/zen-split-view.ftl  |  4 ++++
 .../id/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/id/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/is/browser/browser/zen-folders.ftl     |  4 ++++
 locales/is/browser/browser/zen-general.ftl     |  4 ++++
 locales/is/browser/browser/zen-split-view.ftl  |  4 ++++
 .../is/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/is/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  6 +++++-
 locales/it/browser/browser/zen-folders.ftl     |  4 ++++
 locales/it/browser/browser/zen-general.ftl     |  4 ++++
 locales/it/browser/browser/zen-split-view.ftl  |  4 ++++
 .../it/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/it/browser/browser/zen-workspaces.ftl  | 14 +++++++++-----
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/ja/browser/browser/zen-folders.ftl     |  4 ++++
 locales/ja/browser/browser/zen-general.ftl     |  4 ++++
 locales/ja/browser/browser/zen-split-view.ftl  |  4 ++++
 .../ja/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/ja/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/ko/browser/browser/zen-folders.ftl     |  4 ++++
 locales/ko/browser/browser/zen-general.ftl     |  4 ++++
 locales/ko/browser/browser/zen-split-view.ftl  |  4 ++++
 .../ko/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/ko/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/lt/browser/browser/zen-folders.ftl     |  4 ++++
 locales/lt/browser/browser/zen-general.ftl     |  4 ++++
 locales/lt/browser/browser/zen-split-view.ftl  |  4 ++++
 .../lt/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/lt/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/nl/browser/browser/zen-folders.ftl     | 18 +++++++++++-------
 locales/nl/browser/browser/zen-general.ftl     |  4 ++++
 locales/nl/browser/browser/zen-split-view.ftl  |  4 ++++
 .../nl/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/nl/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/nn-NO/browser/browser/zen-folders.ftl  |  4 ++++
 locales/nn-NO/browser/browser/zen-general.ftl  |  4 ++++
 .../nn-NO/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../nn-NO/browser/browser/zen-workspaces.ftl   |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/pl/browser/browser/zen-folders.ftl     |  4 ++++
 locales/pl/browser/browser/zen-general.ftl     |  4 ++++
 locales/pl/browser/browser/zen-split-view.ftl  |  4 ++++
 .../pl/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/pl/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/pt-BR/browser/browser/zen-folders.ftl  |  4 ++++
 locales/pt-BR/browser/browser/zen-general.ftl  |  4 ++++
 .../pt-BR/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../pt-BR/browser/browser/zen-workspaces.ftl   |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/pt-PT/browser/browser/zen-folders.ftl  |  4 ++++
 locales/pt-PT/browser/browser/zen-general.ftl  |  4 ++++
 .../pt-PT/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../pt-PT/browser/browser/zen-workspaces.ftl   |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  6 +++++-
 locales/ru/browser/browser/zen-folders.ftl     |  4 ++++
 locales/ru/browser/browser/zen-general.ftl     |  4 ++++
 locales/ru/browser/browser/zen-split-view.ftl  |  4 ++++
 .../ru/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/ru/browser/browser/zen-workspaces.ftl  | 14 +++++++++-----
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/sv-SE/browser/browser/zen-folders.ftl  |  4 ++++
 locales/sv-SE/browser/browser/zen-general.ftl  |  4 ++++
 .../sv-SE/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../sv-SE/browser/browser/zen-workspaces.ftl   |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/th/browser/browser/zen-folders.ftl     |  4 ++++
 locales/th/browser/browser/zen-general.ftl     |  4 ++++
 locales/th/browser/browser/zen-split-view.ftl  |  4 ++++
 .../th/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/th/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/tr/browser/browser/zen-folders.ftl     |  4 ++++
 locales/tr/browser/browser/zen-general.ftl     |  4 ++++
 locales/tr/browser/browser/zen-split-view.ftl  |  4 ++++
 .../tr/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/tr/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/uk/browser/browser/zen-folders.ftl     |  4 ++++
 locales/uk/browser/browser/zen-general.ftl     |  4 ++++
 locales/uk/browser/browser/zen-split-view.ftl  |  4 ++++
 .../uk/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/uk/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/vi/browser/browser/zen-folders.ftl     |  4 ++++
 locales/vi/browser/browser/zen-general.ftl     |  4 ++++
 locales/vi/browser/browser/zen-split-view.ftl  |  4 ++++
 .../vi/browser/browser/zen-vertical-tabs.ftl   |  4 ++++
 locales/vi/browser/browser/zen-workspaces.ftl  |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/zh-CN/browser/browser/zen-folders.ftl  |  4 ++++
 locales/zh-CN/browser/browser/zen-general.ftl  |  4 ++++
 .../zh-CN/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../zh-CN/browser/browser/zen-workspaces.ftl   |  8 ++++++--
 .../browser/preferences/zen-preferences.ftl    |  4 ++++
 locales/zh-TW/browser/browser/zen-folders.ftl  |  4 ++++
 locales/zh-TW/browser/browser/zen-general.ftl  |  4 ++++
 .../zh-TW/browser/browser/zen-split-view.ftl   |  4 ++++
 .../browser/browser/zen-vertical-tabs.ftl      |  4 ++++
 .../zh-TW/browser/browser/zen-workspaces.ftl   |  8 ++++++--
 210 files changed, 945 insertions(+), 105 deletions(-)

diff --git a/locales/ar/browser/browser/preferences/zen-preferences.ftl b/locales/ar/browser/browser/preferences/zen-preferences.ftl
index b43492c69..14b1a242a 100644
--- a/locales/ar/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ar/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = مظهر وشعور
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/ar/browser/browser/zen-folders.ftl b/locales/ar/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/ar/browser/browser/zen-folders.ftl
+++ b/locales/ar/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index c927e3e22..2fd882720 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = الملف الشخصي الحالي
 unified-extensions-description = تستخدم الإضافات لجلب المزيد من الوظائف الإضافية إلى { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/ar/browser/browser/zen-split-view.ftl b/locales/ar/browser/browser/zen-split-view.ftl
index fa7c9c2f6..8159b52f7 100644
--- a/locales/ar/browser/browser/zen-split-view.ftl
+++ b/locales/ar/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/ar/browser/browser/zen-vertical-tabs.ftl b/locales/ar/browser/browser/zen-vertical-tabs.ftl
index 0a10972f8..5daa70014 100644
--- a/locales/ar/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ar/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = علامات التبويب على اليمين
     .accesskey = ر
diff --git a/locales/ar/browser/browser/zen-workspaces.ftl b/locales/ar/browser/browser/zen-workspaces.ftl
index 5d61ebb10..200d6c4ab 100644
--- a/locales/ar/browser/browser/zen-workspaces.ftl
+++ b/locales/ar/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = مساحات العمل
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl
index 8fb8adbd2..73d535c4c 100644
--- a/locales/ca/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Aspecte i comportament
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
@@ -300,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Commuta el rendiment
 zen-devtools-toggle-storage-shortcut = Commuta l'emmagatzematge
 zen-devtools-toggle-dom-shortcut = Commuta el DOM
 zen-devtools-toggle-accessibility-shortcut = Commuta l'accessibilitat
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Tanca totes les pestanyes no fixades
diff --git a/locales/ca/browser/browser/zen-folders.ftl b/locales/ca/browser/browser/zen-folders.ftl
index 7b1ee7cb7..18da738fa 100644
--- a/locales/ca/browser/browser/zen-folders.ftl
+++ b/locales/ca/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Cerca { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 4146eac0b..fcb31c108 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/ca/browser/browser/zen-split-view.ftl b/locales/ca/browser/browser/zen-split-view.ftl
index e760bca9c..f18c292b4 100644
--- a/locales/ca/browser/browser/zen-split-view.ftl
+++ b/locales/ca/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/ca/browser/browser/zen-vertical-tabs.ftl b/locales/ca/browser/browser/zen-vertical-tabs.ftl
index 8b2ed3f1d..8e19dd63f 100644
--- a/locales/ca/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ca/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Pestanyes a la dreta
     .accesskey = R
diff --git a/locales/ca/browser/browser/zen-workspaces.ftl b/locales/ca/browser/browser/zen-workspaces.ftl
index d6ece9131..c3eb29b6a 100644
--- a/locales/ca/browser/browser/zen-workspaces.ftl
+++ b/locales/ca/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Espais de treball
 zen-panel-ui-workspaces-create = 
     .label = Crea un espai
@@ -53,9 +57,9 @@ zen-workspace-creation-header = Creació d'un espai
 zen-workspace-creation-label = Els espais s'utilitzen per organitzar les pestanyes i les sessions.
 zen-workspaces-delete-workspace-title = Voleu suprimir l'espai de treball?
 zen-workspaces-delete-workspace-body = Esteu segur que voleu suprimir { $name }? Aquesta acció no es pot desfer.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Pestanyes tancades. Feu servir <span>{ $shortcut }</span> per desfer-ho.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Esborra
+    .tooltiptext = Tanca totes les pestanyes no fixades
diff --git a/locales/cs/browser/browser/preferences/zen-preferences.ftl b/locales/cs/browser/browser/preferences/zen-preferences.ftl
index 647241821..766d80f23 100644
--- a/locales/cs/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cs/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Vzhled a dojem
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/cs/browser/browser/zen-folders.ftl b/locales/cs/browser/browser/zen-folders.ftl
index 8e2aa8471..915ec1f28 100644
--- a/locales/cs/browser/browser/zen-folders.ftl
+++ b/locales/cs/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Hledat v { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 132e16b93..e2a6b9e1e 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/cs/browser/browser/zen-split-view.ftl b/locales/cs/browser/browser/zen-split-view.ftl
index 2d82b9fae..c8b61faec 100644
--- a/locales/cs/browser/browser/zen-split-view.ftl
+++ b/locales/cs/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/cs/browser/browser/zen-vertical-tabs.ftl b/locales/cs/browser/browser/zen-vertical-tabs.ftl
index ec5f0dc50..d3141a7b9 100644
--- a/locales/cs/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/cs/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Karty napravo
     .accesskey = R
diff --git a/locales/cs/browser/browser/zen-workspaces.ftl b/locales/cs/browser/browser/zen-workspaces.ftl
index 955506205..57716f91b 100644
--- a/locales/cs/browser/browser/zen-workspaces.ftl
+++ b/locales/cs/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Prostory
 zen-panel-ui-workspaces-create = 
     .label = Vytvořit prostor
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Vytvořte si prostor
 zen-workspace-creation-label = Prostory slouží k organizaci Vašich karet a relací.
 zen-workspaces-delete-workspace-title = Odstranit prostor?
 zen-workspaces-delete-workspace-body = Opravdu chcete smazat { $name }? Tuto akci nelze vrátit zpět.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/cy/browser/browser/preferences/zen-preferences.ftl b/locales/cy/browser/browser/preferences/zen-preferences.ftl
index 22affc6a0..5bc04fc62 100644
--- a/locales/cy/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cy/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Look and Feel
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/cy/browser/browser/zen-folders.ftl b/locales/cy/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/cy/browser/browser/zen-folders.ftl
+++ b/locales/cy/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index 412657243..6895e3b57 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/cy/browser/browser/zen-split-view.ftl b/locales/cy/browser/browser/zen-split-view.ftl
index 767fd07fa..5eb6b4995 100644
--- a/locales/cy/browser/browser/zen-split-view.ftl
+++ b/locales/cy/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/cy/browser/browser/zen-vertical-tabs.ftl b/locales/cy/browser/browser/zen-vertical-tabs.ftl
index 9c71802d2..0e7f93fd3 100644
--- a/locales/cy/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/cy/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabs on the right
     .accesskey = R
diff --git a/locales/cy/browser/browser/zen-workspaces.ftl b/locales/cy/browser/browser/zen-workspaces.ftl
index b68eda596..819788061 100644
--- a/locales/cy/browser/browser/zen-workspaces.ftl
+++ b/locales/cy/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/da/browser/browser/preferences/zen-preferences.ftl b/locales/da/browser/browser/preferences/zen-preferences.ftl
index 41fba980b..78172279f 100644
--- a/locales/da/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/da/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Udseende
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/da/browser/browser/zen-folders.ftl b/locales/da/browser/browser/zen-folders.ftl
index f763aa4d2..d2e558a15 100644
--- a/locales/da/browser/browser/zen-folders.ftl
+++ b/locales/da/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Søg i { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index dfbd50cc0..70406a818 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/da/browser/browser/zen-split-view.ftl b/locales/da/browser/browser/zen-split-view.ftl
index d25ced800..5b87c5487 100644
--- a/locales/da/browser/browser/zen-split-view.ftl
+++ b/locales/da/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/da/browser/browser/zen-vertical-tabs.ftl b/locales/da/browser/browser/zen-vertical-tabs.ftl
index 255b40f9a..32af5c5d8 100644
--- a/locales/da/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/da/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Faner til højre
     .accesskey = R
diff --git a/locales/da/browser/browser/zen-workspaces.ftl b/locales/da/browser/browser/zen-workspaces.ftl
index 8a48aff06..71ae2d818 100644
--- a/locales/da/browser/browser/zen-workspaces.ftl
+++ b/locales/da/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Arbejdsområder
 zen-panel-ui-workspaces-create = 
     .label = Opret rum
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Opret et rum
 zen-workspace-creation-label = Rum bruges til at organisere dine faner og sessioner.
 zen-workspaces-delete-workspace-title = Slet arbejdsområde?
 zen-workspaces-delete-workspace-body = Er du sikker på, at du vil slette { $name }? Dette kan ikke fortrydes.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index c7e176791..8bfea60c9 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Erscheinungsbild
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/de/browser/browser/zen-folders.ftl b/locales/de/browser/browser/zen-folders.ftl
index 676d9290b..a295a8ac9 100644
--- a/locales/de/browser/browser/zen-folders.ftl
+++ b/locales/de/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = { $folder-name } durchsuchen...
 zen-folders-panel-rename-folder = 
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 22f87a17a..fb06a3b31 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/de/browser/browser/zen-split-view.ftl b/locales/de/browser/browser/zen-split-view.ftl
index 2a4be1d17..33422e9db 100644
--- a/locales/de/browser/browser/zen-split-view.ftl
+++ b/locales/de/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/de/browser/browser/zen-vertical-tabs.ftl b/locales/de/browser/browser/zen-vertical-tabs.ftl
index 2c9b6bb10..2540c82da 100644
--- a/locales/de/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/de/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabs rechts
     .accesskey = R
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index bfdff13a4..a6975eb99 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Arbeitsbereiche
 zen-panel-ui-workspaces-create = 
     .label = Arbeitsbereich erstellen
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Arbeitsbereich erstellen
 zen-workspace-creation-label = Arbeitsbereiche werden verwendet, um Ihre Tabs und Sitzungen zu organisieren.
 zen-workspaces-delete-workspace-title = Arbeitsbereich löschen?
 zen-workspaces-delete-workspace-body = Sind Sie sicher, dass Sie { $name } löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl
index 720b6e4b0..309bbdfa2 100644
--- a/locales/el/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/el/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Εμφάνιση και Αίσθηση
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/el/browser/browser/zen-folders.ftl b/locales/el/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/el/browser/browser/zen-folders.ftl
+++ b/locales/el/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 0fe28d0e4..284dd95f2 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = τρέχον προφίλ
 unified-extensions-description = Οι επεκτάσεις χρησιμοποιούνται για να φέρουν περισσότερη επιπλέον λειτουργικότητα στο { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/el/browser/browser/zen-split-view.ftl b/locales/el/browser/browser/zen-split-view.ftl
index 902838d45..3883071a1 100644
--- a/locales/el/browser/browser/zen-split-view.ftl
+++ b/locales/el/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/el/browser/browser/zen-vertical-tabs.ftl b/locales/el/browser/browser/zen-vertical-tabs.ftl
index 20144a1b3..9e595ff78 100644
--- a/locales/el/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/el/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Καρτέλες στα δεξιά
     .accesskey = R
diff --git a/locales/el/browser/browser/zen-workspaces.ftl b/locales/el/browser/browser/zen-workspaces.ftl
index 3eb790094..13e31782b 100644
--- a/locales/el/browser/browser/zen-workspaces.ftl
+++ b/locales/el/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Χώροι Εργασίας
 zen-panel-ui-workspaces-create = 
     .label = Δημιουργία Χώρου
@@ -53,8 +57,8 @@ 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.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
index c30861606..9d58dfbd3 100644
--- a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Look and Feel
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/en-GB/browser/browser/zen-folders.ftl b/locales/en-GB/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/en-GB/browser/browser/zen-folders.ftl
+++ b/locales/en-GB/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index 8e038ee99..d186a8cf4 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/en-GB/browser/browser/zen-split-view.ftl b/locales/en-GB/browser/browser/zen-split-view.ftl
index fd15fac16..3abff91fe 100644
--- a/locales/en-GB/browser/browser/zen-split-view.ftl
+++ b/locales/en-GB/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/en-GB/browser/browser/zen-vertical-tabs.ftl b/locales/en-GB/browser/browser/zen-vertical-tabs.ftl
index 24d43dbfe..ad9fa2602 100644
--- a/locales/en-GB/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/en-GB/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabs on the right
     .accesskey = R
diff --git a/locales/en-GB/browser/browser/zen-workspaces.ftl b/locales/en-GB/browser/browser/zen-workspaces.ftl
index cfc6588c7..043955635 100644
--- a/locales/en-GB/browser/browser/zen-workspaces.ftl
+++ b/locales/en-GB/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Other workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
index b45b28a56..21eaa8d09 100644
--- a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Apariencia
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
@@ -300,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Alternar rendimiento
 zen-devtools-toggle-storage-shortcut = Alternar almacenamiento
 zen-devtools-toggle-dom-shortcut = Alternar DOM
 zen-devtools-toggle-accessibility-shortcut = Alternar accesibilidad
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Cerrar todas las pestañas sin fijar
diff --git a/locales/es-ES/browser/browser/zen-folders.ftl b/locales/es-ES/browser/browser/zen-folders.ftl
index c2637b0ce..5a4e753c5 100644
--- a/locales/es-ES/browser/browser/zen-folders.ftl
+++ b/locales/es-ES/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Buscar { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index 9eddca930..c0c3da85b 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/es-ES/browser/browser/zen-split-view.ftl b/locales/es-ES/browser/browser/zen-split-view.ftl
index 40487732f..32d36ea80 100644
--- a/locales/es-ES/browser/browser/zen-split-view.ftl
+++ b/locales/es-ES/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/es-ES/browser/browser/zen-vertical-tabs.ftl b/locales/es-ES/browser/browser/zen-vertical-tabs.ftl
index 5e8217d50..1f109279a 100644
--- a/locales/es-ES/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/es-ES/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Pestañas a la derecha
     .accesskey = R
diff --git a/locales/es-ES/browser/browser/zen-workspaces.ftl b/locales/es-ES/browser/browser/zen-workspaces.ftl
index d16a03549..3b0b7e636 100644
--- a/locales/es-ES/browser/browser/zen-workspaces.ftl
+++ b/locales/es-ES/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Espacios de trabajo
 zen-panel-ui-workspaces-create = 
     .label = Crear espacio
@@ -53,9 +57,9 @@ zen-workspace-creation-header = Crear un espacio
 zen-workspace-creation-label = Los espacios se utilizan para organizar sus pestañas y sesiones.
 zen-workspaces-delete-workspace-title = ¿Eliminar espacio de trabajo?
 zen-workspaces-delete-workspace-body = ¿Seguro que quiere eliminar { $name }? Esta acción no se puede deshacer.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = ¡Pestañas cerradas! Use <span>{ $shortcut }</span> para deshacerlo.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Limpiar
+    .tooltiptext = Cerrar todas las pestañas sin fijar
diff --git a/locales/et/browser/browser/preferences/zen-preferences.ftl b/locales/et/browser/browser/preferences/zen-preferences.ftl
index 7e7f70874..8de131140 100644
--- a/locales/et/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/et/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Ilme
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/et/browser/browser/zen-folders.ftl b/locales/et/browser/browser/zen-folders.ftl
index 2aa775f07..b3438e618 100644
--- a/locales/et/browser/browser/zen-folders.ftl
+++ b/locales/et/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Otsi kaustast { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index a06ab17af..d94ba4549 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/et/browser/browser/zen-split-view.ftl b/locales/et/browser/browser/zen-split-view.ftl
index fe26e6e37..ada977d7b 100644
--- a/locales/et/browser/browser/zen-split-view.ftl
+++ b/locales/et/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/et/browser/browser/zen-vertical-tabs.ftl b/locales/et/browser/browser/zen-vertical-tabs.ftl
index 30609ee0d..201629628 100644
--- a/locales/et/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/et/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Kaardid paremal
     .accesskey = p
diff --git a/locales/et/browser/browser/zen-workspaces.ftl b/locales/et/browser/browser/zen-workspaces.ftl
index 4f897962c..c82f7bfa5 100644
--- a/locales/et/browser/browser/zen-workspaces.ftl
+++ b/locales/et/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Tööruumid
 zen-panel-ui-workspaces-create = 
     .label = Uus tööruum
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Loo uus tööruum
 zen-workspace-creation-label = Tööruume kasutatakse kaartide ja sessioonide organiseerimiseks.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Kas oled kindel, et soovid kustutada tööruumi { $name }? Seda tegevust ei saa tagasi võtta.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/fa/browser/browser/preferences/zen-preferences.ftl b/locales/fa/browser/browser/preferences/zen-preferences.ftl
index daf1749be..c65dc03e1 100644
--- a/locales/fa/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fa/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Look and Feel
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/fa/browser/browser/zen-folders.ftl b/locales/fa/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/fa/browser/browser/zen-folders.ftl
+++ b/locales/fa/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index 61de37875..1533ebfe3 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = نمایهٔ کنونی
 unified-extensions-description = افزونه‌های در حال استفاده عملکردهای بیشتری به { -brand-short-name } می‌دهند.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/fa/browser/browser/zen-split-view.ftl b/locales/fa/browser/browser/zen-split-view.ftl
index ad4ec8266..9e11cc72d 100644
--- a/locales/fa/browser/browser/zen-split-view.ftl
+++ b/locales/fa/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/fa/browser/browser/zen-vertical-tabs.ftl b/locales/fa/browser/browser/zen-vertical-tabs.ftl
index 9c71802d2..0e7f93fd3 100644
--- a/locales/fa/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/fa/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabs on the right
     .accesskey = R
diff --git a/locales/fa/browser/browser/zen-workspaces.ftl b/locales/fa/browser/browser/zen-workspaces.ftl
index ccfae412c..ff73365f6 100644
--- a/locales/fa/browser/browser/zen-workspaces.ftl
+++ b/locales/fa/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = دیگر فضاهای کاری
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl
index 6fe88329d..301292da4 100644
--- a/locales/fi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Katso ja tunne
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/fi/browser/browser/zen-folders.ftl b/locales/fi/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/fi/browser/browser/zen-folders.ftl
+++ b/locales/fi/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 98ceca1ec..c864d7904 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/fi/browser/browser/zen-split-view.ftl b/locales/fi/browser/browser/zen-split-view.ftl
index 2a4f112f2..4b235d670 100644
--- a/locales/fi/browser/browser/zen-split-view.ftl
+++ b/locales/fi/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/fi/browser/browser/zen-vertical-tabs.ftl b/locales/fi/browser/browser/zen-vertical-tabs.ftl
index 4fd1556f6..c4680d671 100644
--- a/locales/fi/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/fi/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Välilehdet oikealla puolella
     .accesskey = R
diff --git a/locales/fi/browser/browser/zen-workspaces.ftl b/locales/fi/browser/browser/zen-workspaces.ftl
index c122e1ade..3d722b080 100644
--- a/locales/fi/browser/browser/zen-workspaces.ftl
+++ b/locales/fi/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Työtilat
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl
index e3d0f5fa3..f35b281aa 100644
--- a/locales/fr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Apparence
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
@@ -300,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Afficher l’onglet Performances
 zen-devtools-toggle-storage-shortcut = Afficher l’onglet Stockage
 zen-devtools-toggle-dom-shortcut = Afficher l’onglet DOM
 zen-devtools-toggle-accessibility-shortcut = Afficher l’onglet Accessibilité
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Fermer tous les onglets non épinglés
diff --git a/locales/fr/browser/browser/zen-folders.ftl b/locales/fr/browser/browser/zen-folders.ftl
index 72df16ae6..476ecfc95 100644
--- a/locales/fr/browser/browser/zen-folders.ftl
+++ b/locales/fr/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Rechercher dans { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 05854c8ff..48f68f781 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/fr/browser/browser/zen-split-view.ftl b/locales/fr/browser/browser/zen-split-view.ftl
index 7b634df8c..781ce40f9 100644
--- a/locales/fr/browser/browser/zen-split-view.ftl
+++ b/locales/fr/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/fr/browser/browser/zen-vertical-tabs.ftl b/locales/fr/browser/browser/zen-vertical-tabs.ftl
index 2e2f81be2..b3ff47157 100644
--- a/locales/fr/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/fr/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Onglets à droite
     .accesskey = R
diff --git a/locales/fr/browser/browser/zen-workspaces.ftl b/locales/fr/browser/browser/zen-workspaces.ftl
index 115dbfde5..f56643c6f 100644
--- a/locales/fr/browser/browser/zen-workspaces.ftl
+++ b/locales/fr/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Espaces
 zen-panel-ui-workspaces-create = 
     .label = Créer un espace
@@ -53,9 +57,9 @@ zen-workspace-creation-header = Créer un espace
 zen-workspace-creation-label = Les espaces sont utilisés pour organiser vos onglets et sessions.
 zen-workspaces-delete-workspace-title = Supprimer l’espace ?
 zen-workspaces-delete-workspace-body = Êtes-vous sûr de vouloir supprimer { $name } ? Cette action ne peut pas être annulée.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Onglets fermés ! Utiliser <span>{ $shortcut }</span> pour annuler.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Nettoyer
+    .tooltiptext = Fermer tous les onglets non épinglés
diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
index 41d82b2f5..a54a4f937 100644
--- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Cuma agus Mothú
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
@@ -300,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Scoránaigh Feidhmíochta
 zen-devtools-toggle-storage-shortcut = Scoránaigh Stóráil
 zen-devtools-toggle-dom-shortcut = Scoránaigh DOM
 zen-devtools-toggle-accessibility-shortcut = Scoránaigh Inrochtaineacht
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Dún Gach Cluaisín Gan Phionáil
diff --git a/locales/ga-IE/browser/browser/zen-folders.ftl b/locales/ga-IE/browser/browser/zen-folders.ftl
index 14e7b5b3f..de52267ac 100644
--- a/locales/ga-IE/browser/browser/zen-folders.ftl
+++ b/locales/ga-IE/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Cuardaigh { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 897ca19f4..43024dfc6 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/ga-IE/browser/browser/zen-split-view.ftl b/locales/ga-IE/browser/browser/zen-split-view.ftl
index be8cece5e..843e9452d 100644
--- a/locales/ga-IE/browser/browser/zen-split-view.ftl
+++ b/locales/ga-IE/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl b/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl
index f98223ee5..977ec5783 100644
--- a/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ga-IE/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Cluaisíní ar an dheis
     .accesskey = R
diff --git a/locales/ga-IE/browser/browser/zen-workspaces.ftl b/locales/ga-IE/browser/browser/zen-workspaces.ftl
index b607793c2..57adf5d12 100644
--- a/locales/ga-IE/browser/browser/zen-workspaces.ftl
+++ b/locales/ga-IE/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Spásanna
 zen-panel-ui-workspaces-create = 
     .label = Cruthaigh Spás
@@ -53,9 +57,9 @@ zen-workspace-creation-header = Cruthaigh Spás
 zen-workspace-creation-label = Úsáidtear spásanna chun do chluaisíní agus do sheisiúin a eagrú.
 zen-workspaces-delete-workspace-title = Scrios an spás?
 zen-workspaces-delete-workspace-body = An bhfuil tú cinnte gur mian leat { $name } a scriosadh? Ní féidir an gníomh seo a chealú.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Cluaisíní Dúnta! Úsáid <span>{ $shortcut }</span> chun é a chealú.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Glan
+    .tooltiptext = Dún gach cluaisín neamhphionáilte
diff --git a/locales/he/browser/browser/preferences/zen-preferences.ftl b/locales/he/browser/browser/preferences/zen-preferences.ftl
index 4d26fabb8..2c0483d8b 100644
--- a/locales/he/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/he/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = מראה ותחושה
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/he/browser/browser/zen-folders.ftl b/locales/he/browser/browser/zen-folders.ftl
index 15f540fb2..df726adcd 100644
--- a/locales/he/browser/browser/zen-folders.ftl
+++ b/locales/he/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = חיפוש { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index 981e9c32b..6ac86ed5e 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = פרופיל נוכחי
 unified-extensions-description = הרחבות מוסיפות פונקציונליות נוספת ל{ -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/he/browser/browser/zen-split-view.ftl b/locales/he/browser/browser/zen-split-view.ftl
index 82b3c89a5..d8c58055f 100644
--- a/locales/he/browser/browser/zen-split-view.ftl
+++ b/locales/he/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/he/browser/browser/zen-vertical-tabs.ftl b/locales/he/browser/browser/zen-vertical-tabs.ftl
index 4e8e2b706..94ffbfb66 100644
--- a/locales/he/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/he/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = כרטיסיות בצד ימין
     .accesskey = ר
diff --git a/locales/he/browser/browser/zen-workspaces.ftl b/locales/he/browser/browser/zen-workspaces.ftl
index 8da257d10..a28c72310 100644
--- a/locales/he/browser/browser/zen-workspaces.ftl
+++ b/locales/he/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = סביבות עבודה
 zen-panel-ui-workspaces-create = 
     .label = צור סביבה
@@ -53,8 +57,8 @@ zen-workspace-creation-header = צור סביבה
 zen-workspace-creation-label = סביבות משומשות לסידור כרטיסיות והפעלות.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = האם ברצונך למחוק { $name }? פעולה זו לא ניתנת לביטול.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl
index 1f2315ef9..efa7ac046 100644
--- a/locales/hu/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Megjelenés és hangulat
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
@@ -300,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Teljesítmény kapcsolása
 zen-devtools-toggle-storage-shortcut = Tároló kapcsolása
 zen-devtools-toggle-dom-shortcut = DOM kapcsolása
 zen-devtools-toggle-accessibility-shortcut = Hozzáférhetőség kapcsolása
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Összes rögzítetlen lap bezárása
diff --git a/locales/hu/browser/browser/zen-folders.ftl b/locales/hu/browser/browser/zen-folders.ftl
index eb0bf047a..d696f4137 100644
--- a/locales/hu/browser/browser/zen-folders.ftl
+++ b/locales/hu/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Keresés { $folder-name } mappában...
 zen-folders-panel-rename-folder = 
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 1537deafc..2e861ddbb 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/hu/browser/browser/zen-split-view.ftl b/locales/hu/browser/browser/zen-split-view.ftl
index 75d42891b..81ecdc17c 100644
--- a/locales/hu/browser/browser/zen-split-view.ftl
+++ b/locales/hu/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/hu/browser/browser/zen-vertical-tabs.ftl b/locales/hu/browser/browser/zen-vertical-tabs.ftl
index 138a4223c..19d449b3a 100644
--- a/locales/hu/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/hu/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Lapok a jobb oldalon
     .accesskey = R
diff --git a/locales/hu/browser/browser/zen-workspaces.ftl b/locales/hu/browser/browser/zen-workspaces.ftl
index bb4f908c7..6ef01351d 100644
--- a/locales/hu/browser/browser/zen-workspaces.ftl
+++ b/locales/hu/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Más munkakörnyezetek
 zen-panel-ui-workspaces-create = 
     .label = Környezet létrehozása
@@ -53,9 +57,9 @@ zen-workspace-creation-header = Környezet létrehozása
 zen-workspace-creation-label = A munkakörnyezetek a lapok és munkamenetek rendszerezésére szolgálnak.
 zen-workspaces-delete-workspace-title = Munkakörnyezet törlése?
 zen-workspaces-delete-workspace-body = Biztosan törölni szeretnéd ezt: { $name }? Ez a művelet visszafordíthatatlan.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Lapok bezárva! A visszavonáshoz használd a(z) <span>{ $shortcut }</span>.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Törlés
+    .tooltiptext = Összes rögzítetlen lap bezárása
diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl
index da04cd2f4..e6dd6f3a7 100644
--- a/locales/id/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/id/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Tampilan dan Nuansa
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/id/browser/browser/zen-folders.ftl b/locales/id/browser/browser/zen-folders.ftl
index 169439392..83bf18c50 100644
--- a/locales/id/browser/browser/zen-folders.ftl
+++ b/locales/id/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Cari { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 0aaf9af83..156697f48 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/id/browser/browser/zen-split-view.ftl b/locales/id/browser/browser/zen-split-view.ftl
index 2b384de2c..c5d790168 100644
--- a/locales/id/browser/browser/zen-split-view.ftl
+++ b/locales/id/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/id/browser/browser/zen-vertical-tabs.ftl b/locales/id/browser/browser/zen-vertical-tabs.ftl
index 2621be1e0..e577b904a 100644
--- a/locales/id/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/id/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tab Di Sisi Kanan
     .accesskey = R
diff --git a/locales/id/browser/browser/zen-workspaces.ftl b/locales/id/browser/browser/zen-workspaces.ftl
index 517f12082..25a94b3c3 100644
--- a/locales/id/browser/browser/zen-workspaces.ftl
+++ b/locales/id/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Ruang Kerja Lainnya
 zen-panel-ui-workspaces-create = 
     .label = Buat Ruang
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Buat sebuah Ruang
 zen-workspace-creation-label = Ruang digunakan untuk mengorganisasikan tab dan sesi Anda.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Apakah Anda yakin ingin menghapus { $name }? Tindakan ini tidak bisa dibatalkan.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/is/browser/browser/preferences/zen-preferences.ftl b/locales/is/browser/browser/preferences/zen-preferences.ftl
index 1c048346d..ad28de9f0 100644
--- a/locales/is/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/is/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Útlit og tilfinning
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/is/browser/browser/zen-folders.ftl b/locales/is/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/is/browser/browser/zen-folders.ftl
+++ b/locales/is/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index 6cb7d0eb5..c2a063ddd 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/is/browser/browser/zen-split-view.ftl b/locales/is/browser/browser/zen-split-view.ftl
index 56668381b..d5b56099c 100644
--- a/locales/is/browser/browser/zen-split-view.ftl
+++ b/locales/is/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/is/browser/browser/zen-vertical-tabs.ftl b/locales/is/browser/browser/zen-vertical-tabs.ftl
index 9c71802d2..0e7f93fd3 100644
--- a/locales/is/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/is/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabs on the right
     .accesskey = R
diff --git a/locales/is/browser/browser/zen-workspaces.ftl b/locales/is/browser/browser/zen-workspaces.ftl
index b68eda596..819788061 100644
--- a/locales/is/browser/browser/zen-workspaces.ftl
+++ b/locales/is/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl
index f50895424..6939c4cc1 100644
--- a/locales/it/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/it/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Aspetto
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
@@ -300,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Attiva/disattiva Prestazioni
 zen-devtools-toggle-storage-shortcut = Attiva/Disattiva Archiviazione
 zen-devtools-toggle-dom-shortcut = Attiva/Disattiva DOM
 zen-devtools-toggle-accessibility-shortcut = Attiva/Disattiva Accessibilità
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Chiudi Tutte Le Schede Non Bloccate
diff --git a/locales/it/browser/browser/zen-folders.ftl b/locales/it/browser/browser/zen-folders.ftl
index fa5a5b795..827bdd2c6 100644
--- a/locales/it/browser/browser/zen-folders.ftl
+++ b/locales/it/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Cerca { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index a8d62cdc7..70185a708 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/it/browser/browser/zen-split-view.ftl b/locales/it/browser/browser/zen-split-view.ftl
index b684a5570..0b5634e69 100644
--- a/locales/it/browser/browser/zen-split-view.ftl
+++ b/locales/it/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/it/browser/browser/zen-vertical-tabs.ftl b/locales/it/browser/browser/zen-vertical-tabs.ftl
index db92bb5f0..8a94970bf 100644
--- a/locales/it/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/it/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Schede a destra
     .accesskey = R
diff --git a/locales/it/browser/browser/zen-workspaces.ftl b/locales/it/browser/browser/zen-workspaces.ftl
index e140c036f..45eb15dbc 100644
--- a/locales/it/browser/browser/zen-workspaces.ftl
+++ b/locales/it/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Spazi
 zen-panel-ui-workspaces-create = 
     .label = Crea Spazio
@@ -53,9 +57,9 @@ 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 = Eliminare Spazio?
 zen-workspaces-delete-workspace-body = Sei sicuro di voler cancellare { $name }? Questa azione non può essere annullata.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Scheda chiusa! Usa <span>{ $shortcut }</span> per riaprirla.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Pulisci
+    .tooltiptext = Chiudi tutte le schede non bloccate
diff --git a/locales/ja/browser/browser/preferences/zen-preferences.ftl b/locales/ja/browser/browser/preferences/zen-preferences.ftl
index 685393d27..0f1138fe1 100644
--- a/locales/ja/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ja/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = 外観
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/ja/browser/browser/zen-folders.ftl b/locales/ja/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/ja/browser/browser/zen-folders.ftl
+++ b/locales/ja/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 5bd484f54..faebd450d 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = 使用中のプロファイル
 unified-extensions-description = 拡張機能は、 { -brand-short-name } に多くの追加機能をもたらすために使用されます。
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/ja/browser/browser/zen-split-view.ftl b/locales/ja/browser/browser/zen-split-view.ftl
index 046589b9f..006999122 100644
--- a/locales/ja/browser/browser/zen-split-view.ftl
+++ b/locales/ja/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/ja/browser/browser/zen-vertical-tabs.ftl b/locales/ja/browser/browser/zen-vertical-tabs.ftl
index 278ea1494..a606f59f3 100644
--- a/locales/ja/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ja/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = タブバーを右側に表示
     .accesskey = R
diff --git a/locales/ja/browser/browser/zen-workspaces.ftl b/locales/ja/browser/browser/zen-workspaces.ftl
index d15942cbe..7dd9c3d60 100644
--- a/locales/ja/browser/browser/zen-workspaces.ftl
+++ b/locales/ja/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = ワークスペース
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/ko/browser/browser/preferences/zen-preferences.ftl b/locales/ko/browser/browser/preferences/zen-preferences.ftl
index 17e86242b..853382131 100644
--- a/locales/ko/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ko/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = 모양
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/ko/browser/browser/zen-folders.ftl b/locales/ko/browser/browser/zen-folders.ftl
index 0f834eeba..6fc3bfa31 100644
--- a/locales/ko/browser/browser/zen-folders.ftl
+++ b/locales/ko/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = { $folder-name } 검색...
 zen-folders-panel-rename-folder = 
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index d0ac6eb0a..456953faa 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = 현재 프로필
 unified-extensions-description = 확장 프로그램은 { -brand-short-name }에 더 많은 추가 기능을 제공하는 데 사용됩니다.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/ko/browser/browser/zen-split-view.ftl b/locales/ko/browser/browser/zen-split-view.ftl
index 84fcf18b0..fd89ef1a1 100644
--- a/locales/ko/browser/browser/zen-split-view.ftl
+++ b/locales/ko/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/ko/browser/browser/zen-vertical-tabs.ftl b/locales/ko/browser/browser/zen-vertical-tabs.ftl
index c25da40d4..987543d97 100644
--- a/locales/ko/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ko/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = 탭을 우측으로 놓기
     .accesskey = R
diff --git a/locales/ko/browser/browser/zen-workspaces.ftl b/locales/ko/browser/browser/zen-workspaces.ftl
index 5f0dde5fd..105cbf911 100644
--- a/locales/ko/browser/browser/zen-workspaces.ftl
+++ b/locales/ko/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = 다른 워크스페이스
 zen-panel-ui-workspaces-create = 
     .label = 스페이스 만들기
@@ -53,8 +57,8 @@ zen-workspace-creation-header = 스페이스 생성
 zen-workspace-creation-label = 스페이스는 탭과 세션을 정리하기 위해 사용됩니다.
 zen-workspaces-delete-workspace-title = 워크스페이스를 삭제하시겠습니까?
 zen-workspaces-delete-workspace-body = 정말 { $name }을 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl
index c2f87f56d..d78493dd1 100644
--- a/locales/lt/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Išvaizda ir turinys
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/lt/browser/browser/zen-folders.ftl b/locales/lt/browser/browser/zen-folders.ftl
index 2deb44013..56ff1cd16 100644
--- a/locales/lt/browser/browser/zen-folders.ftl
+++ b/locales/lt/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Ieškoti „{ $folder-name }“...
 zen-folders-panel-rename-folder = 
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index a9c874e38..f3af1aeb8 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/lt/browser/browser/zen-split-view.ftl b/locales/lt/browser/browser/zen-split-view.ftl
index dcc69436b..8f0e1c9bf 100644
--- a/locales/lt/browser/browser/zen-split-view.ftl
+++ b/locales/lt/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/lt/browser/browser/zen-vertical-tabs.ftl b/locales/lt/browser/browser/zen-vertical-tabs.ftl
index 5b6b37e53..ade88fd02 100644
--- a/locales/lt/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/lt/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Kortelės dešinėje
     .accesskey = R
diff --git a/locales/lt/browser/browser/zen-workspaces.ftl b/locales/lt/browser/browser/zen-workspaces.ftl
index 9c371670e..9027e7a36 100644
--- a/locales/lt/browser/browser/zen-workspaces.ftl
+++ b/locales/lt/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Erdvės
 zen-panel-ui-workspaces-create = 
     .label = Kurti erdvę
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Kurti erdvę
 zen-workspace-creation-label = Erdvės naudojamos tvarkyti jūsų korteles ir seansus.
 zen-workspaces-delete-workspace-title = Ištrinti erdvę?
 zen-workspaces-delete-workspace-body = Ar tikrai norite ištrinti „{ $name }“? Šio veiksmo anuliuoti negalima.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/nl/browser/browser/preferences/zen-preferences.ftl b/locales/nl/browser/browser/preferences/zen-preferences.ftl
index 346956afb..010497161 100644
--- a/locales/nl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nl/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Uiterlijk en gevoel
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/nl/browser/browser/zen-folders.ftl b/locales/nl/browser/browser/zen-folders.ftl
index fb91efce2..7b537e981 100644
--- a/locales/nl/browser/browser/zen-folders.ftl
+++ b/locales/nl/browser/browser/zen-folders.ftl
@@ -1,19 +1,23 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Zoek { $folder-name }...
 zen-folders-panel-rename-folder = 
-    .label = Rename Folder
+    .label = Map hernoemen
 zen-folders-panel-unpack-folder = 
-    .label = Unpack Folder
+    .label = Map uitpakken
 zen-folders-new-subfolder = 
-    .label = New Subfolder
+    .label = Nieuwe submap
 zen-folders-panel-delete-folder = 
-    .label = Delete Folder
+    .label = Map verwijderen
 zen-folders-panel-convert-folder-to-space = 
-    .label = Convert folder to Space
+    .label = Map omzetten naar ruimte
 zen-folders-panel-change-folder-space = 
-    .label = Change Space...
+    .label = Wijzig ruimte...
 zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
+    .label = Wijzig pictogram
 zen-folders-unload-all-tooltip = 
     .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 41b7410e5..f3bd6f4a0 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/nl/browser/browser/zen-split-view.ftl b/locales/nl/browser/browser/zen-split-view.ftl
index 69f779d35..d0f5b1eec 100644
--- a/locales/nl/browser/browser/zen-split-view.ftl
+++ b/locales/nl/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/nl/browser/browser/zen-vertical-tabs.ftl b/locales/nl/browser/browser/zen-vertical-tabs.ftl
index c1e21a740..57df55699 100644
--- a/locales/nl/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/nl/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabbladen aan de rechterkant
     .accesskey = R
diff --git a/locales/nl/browser/browser/zen-workspaces.ftl b/locales/nl/browser/browser/zen-workspaces.ftl
index 41d8e48af..f6e77c336 100644
--- a/locales/nl/browser/browser/zen-workspaces.ftl
+++ b/locales/nl/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Ruimtes
 zen-panel-ui-workspaces-create = 
     .label = Ruimte aanmaken
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Maak een ruimte
 zen-workspace-creation-label = Ruimtes worden gebruikt om je tabbladen en sessies te organiseren.
 zen-workspaces-delete-workspace-title = Ruimte verwijderen?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
index 043b6ec83..7f2b86dc4 100644
--- a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Look and Feel
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/nn-NO/browser/browser/zen-folders.ftl b/locales/nn-NO/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/nn-NO/browser/browser/zen-folders.ftl
+++ b/locales/nn-NO/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index b7bc7966a..18df1b71c 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/nn-NO/browser/browser/zen-split-view.ftl b/locales/nn-NO/browser/browser/zen-split-view.ftl
index 56668381b..d5b56099c 100644
--- a/locales/nn-NO/browser/browser/zen-split-view.ftl
+++ b/locales/nn-NO/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl b/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl
index 9c71802d2..0e7f93fd3 100644
--- a/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/nn-NO/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabs on the right
     .accesskey = R
diff --git a/locales/nn-NO/browser/browser/zen-workspaces.ftl b/locales/nn-NO/browser/browser/zen-workspaces.ftl
index 18ee8171f..dd038fe97 100644
--- a/locales/nn-NO/browser/browser/zen-workspaces.ftl
+++ b/locales/nn-NO/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Other Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl
index 9797ee87e..da9f785fd 100644
--- a/locales/pl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Wygląd i działanie
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/pl/browser/browser/zen-folders.ftl b/locales/pl/browser/browser/zen-folders.ftl
index 8a4077aa6..24c9d1634 100644
--- a/locales/pl/browser/browser/zen-folders.ftl
+++ b/locales/pl/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Wyszukaj { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 67422838c..810b6339c 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = Aktualny profil
 unified-extensions-description = Rozszerzenia są używane do dodatkowej funkcjonalności { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/pl/browser/browser/zen-split-view.ftl b/locales/pl/browser/browser/zen-split-view.ftl
index 5a0adbbc7..f1ecfb258 100644
--- a/locales/pl/browser/browser/zen-split-view.ftl
+++ b/locales/pl/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/pl/browser/browser/zen-vertical-tabs.ftl b/locales/pl/browser/browser/zen-vertical-tabs.ftl
index 936727ae0..bde11f637 100644
--- a/locales/pl/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/pl/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Zakładki po prawej
     .accesskey = R
diff --git a/locales/pl/browser/browser/zen-workspaces.ftl b/locales/pl/browser/browser/zen-workspaces.ftl
index ab8e2bb84..8e473a525 100644
--- a/locales/pl/browser/browser/zen-workspaces.ftl
+++ b/locales/pl/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Obszary robocze
 zen-panel-ui-workspaces-create = 
     .label = Utwórz Przestrzeń
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Utwórz Przestrzeń
 zen-workspace-creation-label = Przestrzenie są wykorzystywane do zorganizowania kart i sesji.
 zen-workspaces-delete-workspace-title = Usunąć Przestrzeń roboczą?
 zen-workspaces-delete-workspace-body = Czy na pewno chcesz usunąć { $name }? Tej czynności nie można cofnąć.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
index a79c6020a..8cc5f1c4c 100644
--- a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Aparência e Comportamento
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/pt-BR/browser/browser/zen-folders.ftl b/locales/pt-BR/browser/browser/zen-folders.ftl
index d1210c748..954f20343 100644
--- a/locales/pt-BR/browser/browser/zen-folders.ftl
+++ b/locales/pt-BR/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Pesquisar em { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index d3f8e9e9d..48eef77f8 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/pt-BR/browser/browser/zen-split-view.ftl b/locales/pt-BR/browser/browser/zen-split-view.ftl
index e5f5de3d6..f911322ff 100644
--- a/locales/pt-BR/browser/browser/zen-split-view.ftl
+++ b/locales/pt-BR/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl b/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl
index 5d3b30d0d..8a0b9a2c5 100644
--- a/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/pt-BR/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Abas à direita
     .accesskey = R
diff --git a/locales/pt-BR/browser/browser/zen-workspaces.ftl b/locales/pt-BR/browser/browser/zen-workspaces.ftl
index f79a544e5..7b032e85d 100644
--- a/locales/pt-BR/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-BR/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Espaços
 zen-panel-ui-workspaces-create = 
     .label = Criar Espaço
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Crie um Espaço
 zen-workspace-creation-label = Espaços são usados para organizar suas guias e sessões.
 zen-workspaces-delete-workspace-title = Excluir Espaço?
 zen-workspaces-delete-workspace-body = Tem certeza que deseja excluir { $name }? Esta ação não pode ser desfeita.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
index c0c23cf20..5d46462a5 100644
--- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Aparência
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/pt-PT/browser/browser/zen-folders.ftl b/locales/pt-PT/browser/browser/zen-folders.ftl
index 760f00465..43a2f5c27 100644
--- a/locales/pt-PT/browser/browser/zen-folders.ftl
+++ b/locales/pt-PT/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Pesquisar em { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 753f909f9..b2e5b8253 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/pt-PT/browser/browser/zen-split-view.ftl b/locales/pt-PT/browser/browser/zen-split-view.ftl
index 9ad72800b..e0c2092d9 100644
--- a/locales/pt-PT/browser/browser/zen-split-view.ftl
+++ b/locales/pt-PT/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl b/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl
index 1fa65f89f..011ec7287 100644
--- a/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/pt-PT/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Separadores à direita
     .accesskey = R
diff --git a/locales/pt-PT/browser/browser/zen-workspaces.ftl b/locales/pt-PT/browser/browser/zen-workspaces.ftl
index 1d3f236c4..d6af3ae11 100644
--- a/locales/pt-PT/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-PT/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Espaços de Trabalho
 zen-panel-ui-workspaces-create = 
     .label = Criar Espaço
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Criar um Espaço
 zen-workspace-creation-label = Os espaços são usados para organizar os seus separadores e sessões.
 zen-workspaces-delete-workspace-title = Eliminar Espaço de Trabalho?
 zen-workspaces-delete-workspace-body = Tem certeza que deseja eliminar { $name }? Esta ação não pode ser desfeita.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/ru/browser/browser/preferences/zen-preferences.ftl b/locales/ru/browser/browser/preferences/zen-preferences.ftl
index 9089392fe..a4a668209 100644
--- a/locales/ru/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ru/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Внешний вид
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
@@ -300,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Переключить произво
 zen-devtools-toggle-storage-shortcut = Переключить хранилище
 zen-devtools-toggle-dom-shortcut = Переключить DOM
 zen-devtools-toggle-accessibility-shortcut = Включить/выключить специальные возможности
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Закрыть все не закреплённые вкладки
diff --git a/locales/ru/browser/browser/zen-folders.ftl b/locales/ru/browser/browser/zen-folders.ftl
index c673b1acb..1d04d09b6 100644
--- a/locales/ru/browser/browser/zen-folders.ftl
+++ b/locales/ru/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Искать в { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 71dc41d8a..95ac862dd 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = текущий профиль
 unified-extensions-description = Расширения дополняют функционал { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/ru/browser/browser/zen-split-view.ftl b/locales/ru/browser/browser/zen-split-view.ftl
index 88d3d207f..7dc4ad3f9 100644
--- a/locales/ru/browser/browser/zen-split-view.ftl
+++ b/locales/ru/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/ru/browser/browser/zen-vertical-tabs.ftl b/locales/ru/browser/browser/zen-vertical-tabs.ftl
index f9c47ec4e..17554f272 100644
--- a/locales/ru/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/ru/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Вкладки справа
     .accesskey = Р
diff --git a/locales/ru/browser/browser/zen-workspaces.ftl b/locales/ru/browser/browser/zen-workspaces.ftl
index 302607e35..3b2b30c6d 100644
--- a/locales/ru/browser/browser/zen-workspaces.ftl
+++ b/locales/ru/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Пространства
 zen-panel-ui-workspaces-create = 
     .label = Создать пространство
@@ -53,9 +57,9 @@ zen-workspace-creation-header = Создать пространство
 zen-workspace-creation-label = Пространства используются для организации ваших вкладок и сеансов.
 zen-workspaces-delete-workspace-title = Удалить пространство?
 zen-workspaces-delete-workspace-body = Вы уверены, что хотите удалить { $name }? Это действие необратимо.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
+zen-workspaces-close-all-unpinned-tabs-toast = Вкладки закрыты! Нажмите <span>{ $shortcut }</span> для отмены.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Очистить
+    .tooltiptext = Закрыть все не закреплённые вкладки
diff --git a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
index 669589406..76dd28409 100644
--- a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Utseende och känsla
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/sv-SE/browser/browser/zen-folders.ftl b/locales/sv-SE/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/sv-SE/browser/browser/zen-folders.ftl
+++ b/locales/sv-SE/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index e6b8a4e78..cf1cfc04f 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/sv-SE/browser/browser/zen-split-view.ftl b/locales/sv-SE/browser/browser/zen-split-view.ftl
index 732cdf1dc..d7ce81a55 100644
--- a/locales/sv-SE/browser/browser/zen-split-view.ftl
+++ b/locales/sv-SE/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl b/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl
index 13d31444e..ae4651ea7 100644
--- a/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/sv-SE/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Flikar till höger
     .accesskey = R
diff --git a/locales/sv-SE/browser/browser/zen-workspaces.ftl b/locales/sv-SE/browser/browser/zen-workspaces.ftl
index a1cfaad1c..a651424c4 100644
--- a/locales/sv-SE/browser/browser/zen-workspaces.ftl
+++ b/locales/sv-SE/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Arbetsytor
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Ta bort arbetsyta?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/th/browser/browser/preferences/zen-preferences.ftl b/locales/th/browser/browser/preferences/zen-preferences.ftl
index 043b6ec83..7f2b86dc4 100644
--- a/locales/th/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/th/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Look and Feel
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/th/browser/browser/zen-folders.ftl b/locales/th/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/th/browser/browser/zen-folders.ftl
+++ b/locales/th/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index b7bc7966a..18df1b71c 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/th/browser/browser/zen-split-view.ftl b/locales/th/browser/browser/zen-split-view.ftl
index 56668381b..d5b56099c 100644
--- a/locales/th/browser/browser/zen-split-view.ftl
+++ b/locales/th/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/th/browser/browser/zen-vertical-tabs.ftl b/locales/th/browser/browser/zen-vertical-tabs.ftl
index 9c71802d2..0e7f93fd3 100644
--- a/locales/th/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/th/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Tabs on the right
     .accesskey = R
diff --git a/locales/th/browser/browser/zen-workspaces.ftl b/locales/th/browser/browser/zen-workspaces.ftl
index 18ee8171f..dd038fe97 100644
--- a/locales/th/browser/browser/zen-workspaces.ftl
+++ b/locales/th/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Other Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/tr/browser/browser/preferences/zen-preferences.ftl b/locales/tr/browser/browser/preferences/zen-preferences.ftl
index 532656784..ac89e0d8d 100644
--- a/locales/tr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/tr/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Görünüm ve Hissiyat
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/tr/browser/browser/zen-folders.ftl b/locales/tr/browser/browser/zen-folders.ftl
index 409703d2a..37a8b2cfe 100644
--- a/locales/tr/browser/browser/zen-folders.ftl
+++ b/locales/tr/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 06a67f683..83c9b7734 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/tr/browser/browser/zen-split-view.ftl b/locales/tr/browser/browser/zen-split-view.ftl
index ef73b2c31..a1aab05ea 100644
--- a/locales/tr/browser/browser/zen-split-view.ftl
+++ b/locales/tr/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/tr/browser/browser/zen-vertical-tabs.ftl b/locales/tr/browser/browser/zen-vertical-tabs.ftl
index 5a384585a..7174517c7 100644
--- a/locales/tr/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/tr/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Sağdaki sekmeler
     .accesskey = R
diff --git a/locales/tr/browser/browser/zen-workspaces.ftl b/locales/tr/browser/browser/zen-workspaces.ftl
index 00dc010e6..51d28272b 100644
--- a/locales/tr/browser/browser/zen-workspaces.ftl
+++ b/locales/tr/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Diğer Çalışma Alanları
 zen-panel-ui-workspaces-create = 
     .label = Create Space
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl
index bd01e7dec..efb5d6a38 100644
--- a/locales/uk/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Інтерфейс
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/uk/browser/browser/zen-folders.ftl b/locales/uk/browser/browser/zen-folders.ftl
index f3d524415..4ce1a1329 100644
--- a/locales/uk/browser/browser/zen-folders.ftl
+++ b/locales/uk/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Знайти { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index a6a47ec35..2d869b20d 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = поточний профіль
 unified-extensions-description = Розширення використовуються, щоб додати більше функціональних можливостей до { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/uk/browser/browser/zen-split-view.ftl b/locales/uk/browser/browser/zen-split-view.ftl
index 8b8777b02..adb2d8d7f 100644
--- a/locales/uk/browser/browser/zen-split-view.ftl
+++ b/locales/uk/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/uk/browser/browser/zen-vertical-tabs.ftl b/locales/uk/browser/browser/zen-vertical-tabs.ftl
index 7ae28454d..df3bf988a 100644
--- a/locales/uk/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/uk/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Вкладки праворуч
     .accesskey = Р
diff --git a/locales/uk/browser/browser/zen-workspaces.ftl b/locales/uk/browser/browser/zen-workspaces.ftl
index 7f433b53d..524f1a96a 100644
--- a/locales/uk/browser/browser/zen-workspaces.ftl
+++ b/locales/uk/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Простори
 zen-panel-ui-workspaces-create = 
     .label = Створити простір
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Створити простір
 zen-workspace-creation-label = Простори використовуються для організації ваших вкладок та сеансів.
 zen-workspaces-delete-workspace-title = Видалити простір?
 zen-workspaces-delete-workspace-body = Упевнені, що хочете видалити { $name }? Цю дію неможливо скасувати.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/vi/browser/browser/preferences/zen-preferences.ftl b/locales/vi/browser/browser/preferences/zen-preferences.ftl
index 5d88a73a4..9d83b2f56 100644
--- a/locales/vi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/vi/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = Giao diện
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/vi/browser/browser/zen-folders.ftl b/locales/vi/browser/browser/zen-folders.ftl
index 021bcbf26..953611723 100644
--- a/locales/vi/browser/browser/zen-folders.ftl
+++ b/locales/vi/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = Tìm kiếm { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index d3e636e4c..e037f71c2 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 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 = 
diff --git a/locales/vi/browser/browser/zen-split-view.ftl b/locales/vi/browser/browser/zen-split-view.ftl
index 7dd975577..527668e36 100644
--- a/locales/vi/browser/browser/zen-split-view.ftl
+++ b/locales/vi/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/vi/browser/browser/zen-vertical-tabs.ftl b/locales/vi/browser/browser/zen-vertical-tabs.ftl
index 2e519f8f3..879a1ad5c 100644
--- a/locales/vi/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/vi/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = Thẻ ở bên phải
     .accesskey = R
diff --git a/locales/vi/browser/browser/zen-workspaces.ftl b/locales/vi/browser/browser/zen-workspaces.ftl
index a7433ca16..98cf11c50 100644
--- a/locales/vi/browser/browser/zen-workspaces.ftl
+++ b/locales/vi/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = Các không gian làm việc
 zen-panel-ui-workspaces-create = 
     .label = Tạo không gian làm việc
@@ -53,8 +57,8 @@ zen-workspace-creation-header = Tạo không gian làm việc
 zen-workspace-creation-label = Không gian làm việc sẽ là nơi để bạn chứa các trang web và lượt truy cập của bạn.
 zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Bạn có chắc là bạn muốn xóa { $name }? Thao tác này sẽ không được hoàn lại.
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
index 011231623..916ab321f 100644
--- a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = 界面外观
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/zh-CN/browser/browser/zen-folders.ftl b/locales/zh-CN/browser/browser/zen-folders.ftl
index 97c93bf2e..8a247612f 100644
--- a/locales/zh-CN/browser/browser/zen-folders.ftl
+++ b/locales/zh-CN/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = 搜索 { $folder-name }…
 zen-folders-panel-rename-folder = 
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index ddc8ba3aa..1ccd4b04b 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = 当前配置
 unified-extensions-description = 扩展用于为 { -brand-short-name } 带来更多额外功能。
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/zh-CN/browser/browser/zen-split-view.ftl b/locales/zh-CN/browser/browser/zen-split-view.ftl
index 3d565d6a2..92f82bea1 100644
--- a/locales/zh-CN/browser/browser/zen-split-view.ftl
+++ b/locales/zh-CN/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl b/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl
index 5da8c55cd..ca7874f14 100644
--- a/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/zh-CN/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = 右侧标签页
     .accesskey = R
diff --git a/locales/zh-CN/browser/browser/zen-workspaces.ftl b/locales/zh-CN/browser/browser/zen-workspaces.ftl
index 4de4c8227..20fe0fa97 100644
--- a/locales/zh-CN/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-CN/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = 工作区
 zen-panel-ui-workspaces-create = 
     .label = 创建工作区
@@ -53,8 +57,8 @@ zen-workspace-creation-header = 创建工作区
 zen-workspace-creation-label = 工作区用于组织标签页和会话。
 zen-workspaces-delete-workspace-title = 删除工作区？
 zen-workspaces-delete-workspace-body = 你确定要删除 { $name } 吗？这个操作无法撤销。
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear
diff --git a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
index c60dc5903..0d7c5162d 100644
--- a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 pane-zen-looks-title = 外觀與樣式
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
diff --git a/locales/zh-TW/browser/browser/zen-folders.ftl b/locales/zh-TW/browser/browser/zen-folders.ftl
index 629509b69..59a2af1f8 100644
--- a/locales/zh-TW/browser/browser/zen-folders.ftl
+++ b/locales/zh-TW/browser/browser/zen-folders.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-folders-search-placeholder = 
     .placeholder = 搜尋 { $folder-name }...
 zen-folders-panel-rename-folder = 
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index c8d007dce..4fa3e031c 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-current-profile-text = 當前設定檔
 unified-extensions-description = 擴充功能可為 { -brand-short-name } 帶來更多額外功能。
 tab-context-zen-reset-pinned-tab = 
diff --git a/locales/zh-TW/browser/browser/zen-split-view.ftl b/locales/zh-TW/browser/browser/zen-split-view.ftl
index d7701d89a..751a1551e 100644
--- a/locales/zh-TW/browser/browser/zen-split-view.ftl
+++ b/locales/zh-TW/browser/browser/zen-split-view.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
diff --git a/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl b/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
index 5be0b8652..b677b0a52 100644
--- a/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/zh-TW/browser/browser/zen-vertical-tabs.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-toolbar-context-tabs-right = 
     .label = 右側分頁欄
     .accesskey = R
diff --git a/locales/zh-TW/browser/browser/zen-workspaces.ftl b/locales/zh-TW/browser/browser/zen-workspaces.ftl
index fe3944b13..2a5b867b1 100644
--- a/locales/zh-TW/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-TW/browser/browser/zen-workspaces.ftl
@@ -1,3 +1,7 @@
+# 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/.
+
 zen-panel-ui-workspaces-text = 工作區
 zen-panel-ui-workspaces-create = 
     .label = 建立工作區
@@ -53,8 +57,8 @@ zen-workspace-creation-header = 建立工作區
 zen-workspace-creation-label = 工作區用於組織您的分頁與工作階段。
 zen-workspaces-delete-workspace-title = 刪除工作區？
 zen-workspaces-delete-workspace-body = 您確定要刪除 { $name } 嗎？此操錯無法復原。
-# Note that the html tag MUST not be changed or removed, as it is used to better
-# display the shortcut in the toast notification.
+# Note that the html tag MUST not be changed or removed, as it is used to better
+# display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Clear

From aa06744c4b7725d41cfff6f7cf58f0553868dfbd Mon Sep 17 00:00:00 2001
From: Ivaon <155267770+Ivaon@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:48:57 +0100
Subject: [PATCH 041/162] fix: notification popup icons are not centered in
 multiple toolbars layout, p=#11075

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

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 98b157154..7d07cc6dc 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -346,6 +346,7 @@
   #notification-popup-box {
     margin: 0 4px 0 0 !important;
     justify-content: center;
+    height: unset !important;
     gap: 8px;
     background: transparent;
 

From 98d63904e9c37957f06f589a10371188352b3add Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 30 Oct 2025 14:15:09 +0100
Subject: [PATCH 042/162] feat: Reduce scroll threshold for workspace change,
 c=workspaces

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 src/zen/workspaces/ZenWorkspaces.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 45e12adfc..a54c1ebfe 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -597,7 +597,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     const toolbox = gNavToolbox;
 
     const scrollCooldown = 200; // Milliseconds to wait before allowing another scroll
-    const scrollThreshold = 2; // Minimum scroll delta to trigger workspace change
+    const scrollThreshold = 1; // Minimum scroll delta to trigger workspace change
 
     toolbox.addEventListener(
       'wheel',

From d005b970421173ccc1add2f90afcdd2be41a5e1c Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Fri, 31 Oct 2025 10:24:12 +0100
Subject: [PATCH 043/162] chore: Refactor JS actors into their own modules,
 b=no-bug, c=common, glance, mods

---
 .../base/content/zen-assets.jar.inc.mn        |  1 -
 .../base/content/zen-preloaded.inc.xhtml      |  1 -
 src/zen/ZenComponents.manifest                | 15 +++++
 src/zen/common/Components.manifest            |  5 ++
 src/zen/common/ZenActorsManager.mjs           | 34 -----------
 src/zen/common/ZenActorsManager.sys.mjs       | 61 +++++++++++++++++++
 src/zen/common/moz.build                      |  1 +
 src/zen/glance/ZenGlanceManager.mjs           | 25 --------
 src/zen/mods/ZenMods.mjs                      | 16 -----
 src/zen/moz.build                             |  4 ++
 src/zen/zen.globals.js                        |  1 -
 11 files changed, 86 insertions(+), 78 deletions(-)
 create mode 100644 src/zen/ZenComponents.manifest
 create mode 100644 src/zen/common/Components.manifest
 delete mode 100644 src/zen/common/ZenActorsManager.mjs
 create mode 100644 src/zen/common/ZenActorsManager.sys.mjs

diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index fc3908376..d8ee81f6e 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -7,7 +7,6 @@
         content/browser/ZenPreloadedScripts.js                                  (../../zen/common/ZenPreloadedScripts.js)
         content/browser/zen-sets.js                                             (../../zen/common/zen-sets.js)
         content/browser/ZenUIManager.mjs                                        (../../zen/common/ZenUIManager.mjs)
-        content/browser/zen-components/ZenActorsManager.mjs                     (../../zen/common/ZenActorsManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs                       (../../zen/common/ZenCommonUtils.mjs)
         content/browser/zen-components/ZenSessionStore.mjs                      (../../zen/common/ZenSessionStore.mjs)
         content/browser/zen-components/ZenEmojisData.min.mjs                    (../../zen/common/emojis/ZenEmojisData.min.mjs)
diff --git a/src/browser/base/content/zen-preloaded.inc.xhtml b/src/browser/base/content/zen-preloaded.inc.xhtml
index 4d4f56661..83e73ef9d 100644
--- a/src/browser/base/content/zen-preloaded.inc.xhtml
+++ b/src/browser/base/content/zen-preloaded.inc.xhtml
@@ -13,5 +13,4 @@
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspace.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaces.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenActorsManager.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenSessionStore.mjs"></script>
diff --git a/src/zen/ZenComponents.manifest b/src/zen/ZenComponents.manifest
new file mode 100644
index 000000000..74c0232b8
--- /dev/null
+++ b/src/zen/ZenComponents.manifest
@@ -0,0 +1,15 @@
+# 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/.
+
+# 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}
+
+category app-startup nsBrowserGlue @mozilla.org/browser/browserglue;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+
+#include common/Components.manifest
diff --git a/src/zen/common/Components.manifest b/src/zen/common/Components.manifest
new file mode 100644
index 000000000..ee1759fff
--- /dev/null
+++ b/src/zen/common/Components.manifest
@@ -0,0 +1,5 @@
+# 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/.
+
+category browser-before-ui-startup resource:///modules/ZenActorsManager.sys.mjs gZenActorsManager.init
diff --git a/src/zen/common/ZenActorsManager.mjs b/src/zen/common/ZenActorsManager.mjs
deleted file mode 100644
index af43cf303..000000000
--- a/src/zen/common/ZenActorsManager.mjs
+++ /dev/null
@@ -1,34 +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/.
-// Utility to register JSWindowActors
-
-window.gZenActorsManager = {
-  _actors: new Set(),
-  _lazy: {},
-
-  init() {
-    ChromeUtils.defineESModuleGetters(this._lazy, {
-      ActorManagerParent: 'resource://gre/modules/ActorManagerParent.sys.mjs',
-    });
-  },
-
-  addJSWindowActor(name, data) {
-    if (!this._lazy.ActorManagerParent) {
-      this.init();
-    }
-    if (this._actors.has(name)) {
-      // Actor already registered, nothing to do
-      return;
-    }
-
-    const decl = {};
-    decl[name] = data;
-    try {
-      this._lazy.ActorManagerParent.addJSWindowActors(decl);
-      this._actors.add(name);
-    } catch (e) {
-      console.warn(`Failed to register JSWindowActor: ${e}`);
-    }
-  },
-};
diff --git a/src/zen/common/ZenActorsManager.sys.mjs b/src/zen/common/ZenActorsManager.sys.mjs
new file mode 100644
index 000000000..817cfef79
--- /dev/null
+++ b/src/zen/common/ZenActorsManager.sys.mjs
@@ -0,0 +1,61 @@
+// 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/.
+// Utility to register JSWindowActors
+
+import { ActorManagerParent } from 'resource://gre/modules/ActorManagerParent.sys.mjs';
+
+/**
+ * Fission-compatible JSProcess implementations.
+ * Each actor options object takes the form of a ProcessActorOptions dictionary.
+ * Detailed documentation of these options is in dom/docs/ipc/jsactors.rst,
+ * available at https://firefox-source-docs.mozilla.org/dom/ipc/jsactors.html
+ */
+let JSPROCESSACTORS = {};
+
+/**
+ * Fission-compatible JSWindowActor implementations.
+ * Detailed documentation of these options is in dom/docs/ipc/jsactors.rst,
+ * available at https://firefox-source-docs.mozilla.org/dom/ipc/jsactors.html
+ */
+let JSWINDOWACTORS = {
+  ZenModsMarketplace: {
+    parent: {
+      esModuleURI: 'resource:///actors/ZenModsMarketplaceParent.sys.mjs',
+    },
+    child: {
+      esModuleURI: 'resource:///actors/ZenModsMarketplaceChild.sys.mjs',
+      events: {
+        DOMContentLoaded: {},
+      },
+    },
+    matches: [
+      ...Services.prefs.getStringPref('zen.injections.match-urls').split(','),
+      'about:preferences',
+    ],
+  },
+  ZenGlance: {
+    parent: {
+      esModuleURI: 'resource:///actors/ZenGlanceParent.sys.mjs',
+    },
+    child: {
+      esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
+      events: {
+        DOMContentLoaded: {},
+        keydown: {
+          capture: true,
+        },
+      },
+    },
+    allFrames: true,
+    matches: ['*://*/*'],
+    enablePreference: 'zen.glance.enabled',
+  },
+};
+
+export let gZenActorsManager = {
+  init() {
+    ActorManagerParent.addJSProcessActors(JSPROCESSACTORS);
+    ActorManagerParent.addJSWindowActors(JSWINDOWACTORS);
+  },
+};
diff --git a/src/zen/common/moz.build b/src/zen/common/moz.build
index 2de29514c..fa6ec309c 100644
--- a/src/zen/common/moz.build
+++ b/src/zen/common/moz.build
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
+  "ZenActorsManager.sys.mjs",
   "ZenCustomizableUI.sys.mjs",
   "ZenUIMigration.sys.mjs",
 ]
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 3720448fa..a8fc9fcc6 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -1716,29 +1716,4 @@
   }
 
   window.gZenGlanceManager = new nsZenGlanceManager();
-
-  /**
-   * Register window actors for glance functionality
-   */
-  function registerWindowActors() {
-    gZenActorsManager.addJSWindowActor('ZenGlance', {
-      parent: {
-        esModuleURI: 'resource:///actors/ZenGlanceParent.sys.mjs',
-      },
-      child: {
-        esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
-        events: {
-          DOMContentLoaded: {},
-          keydown: {
-            capture: true,
-          },
-        },
-      },
-      allFrames: true,
-      matches: ['*://*/*'],
-      enablePreference: 'zen.glance.enabled',
-    });
-  }
-
-  registerWindowActors();
 }
diff --git a/src/zen/mods/ZenMods.mjs b/src/zen/mods/ZenMods.mjs
index bf5461d2f..762a2c826 100644
--- a/src/zen/mods/ZenMods.mjs
+++ b/src/zen/mods/ZenMods.mjs
@@ -667,20 +667,4 @@
   }
 
   window.gZenMods = new nsZenMods();
-
-  gZenActorsManager.addJSWindowActor('ZenModsMarketplace', {
-    parent: {
-      esModuleURI: 'resource:///actors/ZenModsMarketplaceParent.sys.mjs',
-    },
-    child: {
-      esModuleURI: 'resource:///actors/ZenModsMarketplaceChild.sys.mjs',
-      events: {
-        DOMContentLoaded: {},
-      },
-    },
-    matches: [
-      ...Services.prefs.getStringPref('zen.injections.match-urls').split(','),
-      'about:preferences',
-    ],
-  });
 }
diff --git a/src/zen/moz.build b/src/zen/moz.build
index 56782122f..21915a69a 100644
--- a/src/zen/moz.build
+++ b/src/zen/moz.build
@@ -2,6 +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/.
 
+EXTRA_PP_COMPONENTS += [
+  "ZenComponents.manifest",
+]
+
 DIRS += [
     "common",
     "glance",
diff --git a/src/zen/zen.globals.js b/src/zen/zen.globals.js
index ce22cd4a8..93f2484d1 100644
--- a/src/zen/zen.globals.js
+++ b/src/zen/zen.globals.js
@@ -45,7 +45,6 @@ export default [
   'Cu',
   'Cc',
 
-  'gZenActorsManager',
   'JSWindowActorParent',
   'JSWindowActorChild',
 

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

---
 .../2025_2025-10-01..2025-10-31.md            | 276 ++++++++++++++++++
 1 file changed, 276 insertions(+)
 create mode 100644 docs/issue-metrics/2025_2025-10-01..2025-10-31.md

diff --git a/docs/issue-metrics/2025_2025-10-01..2025-10-31.md b/docs/issue-metrics/2025_2025-10-01..2025-10-31.md
new file mode 100644
index 000000000..3e808ca88
--- /dev/null
+++ b/docs/issue-metrics/2025_2025-10-01..2025-10-31.md
@@ -0,0 +1,276 @@
+# Issue Metrics
+
+| Metric | Average | Median | 90th percentile |
+| --- | --- | --- | ---: |
+| Time to first response | 15:19:48 | 2:42:07 | 1 day, 0:05:54 |
+| Time to close | 22:10:13 | 4:42:08 | 2 days, 0:56:21 |
+
+| Metric | Count |
+| --- | ---: |
+| Number of items that remain open | 108 |
+| Number of items closed | 150 |
+| Total number of items created | 258 |
+
+| Title | URL | Time to first response | Time to close |
+| --- | --- | --- | --- |
+| The right click menu goes beyond the app border sometimes on arch hyprland | https://github.com/zen-browser/desktop/issues/11103 | None | None |
+| Zen glance doesn't respect --margin-top-fix | https://github.com/zen-browser/desktop/issues/11098 | None | None |
+| Security info button missing in url bar | https://github.com/zen-browser/desktop/issues/11093 | None | None |
+| OS dark mode not detected by browser | https://github.com/zen-browser/desktop/issues/11092 | None | None |
+| Zen menu is somehow showing on the "wrong" side of the app | https://github.com/zen-browser/desktop/issues/11091 | None | None |
+| Volume is very low in YouTube videos. | https://github.com/zen-browser/desktop/issues/11089 | None | None |
+| Opening Sidebar by Dragging URL in Compact Mode May Prevent Sidebar from Hiding | https://github.com/zen-browser/desktop/issues/11088 | None | None |
+| Collapsed sidebar tab icons are misaligned when tabs are overflown | https://github.com/zen-browser/desktop/issues/11087 | 2:13:10 | None |
+| Screensharing Teams over Zen instantly caused the system to hard crash | https://github.com/zen-browser/desktop/issues/11086 | None | None |
+| Can't use KeePassXC-Browser in Zen (Flatpak) with KeePassXC (not FlatPak) | https://github.com/zen-browser/desktop/issues/11084 | None | None |
+| PiP video reproduction makes the tab crash after a while | https://github.com/zen-browser/desktop/issues/11083 | None | None |
+| Elements above the essentials tabs are in the toolbar instead of the sidebar in compact mode | https://github.com/zen-browser/desktop/issues/11082 | 1:11:28 | None |
+| Select Tag missing background makes content not visible | https://github.com/zen-browser/desktop/issues/11081 | 15:01:49 | 19:55:32 |
+| Hovering bookmarks toolbar causes vertical wiggle of website | https://github.com/zen-browser/desktop/issues/11080 | 0:32:11 | None |
+| Custom Wallpaper on new tab does not loads in any Container | https://github.com/zen-browser/desktop/issues/11079 | 4:25:50 | 4:25:50 |
+| Unable to activate the option to clear the history without the Zen interface being down. | https://github.com/zen-browser/desktop/issues/11078 | None | None |
+| Zen sometimes hangs when a context menu or overlay is triggered | https://github.com/zen-browser/desktop/issues/11077 | None | None |
+| Theme Editor fails to render the colour picker | https://github.com/zen-browser/desktop/issues/11076 | 1:55:40 | 19:38:53 |
+| Tabs lost when closing main window before Library window | https://github.com/zen-browser/desktop/issues/11073 | None | None |
+| The topbar doesn't hide in compact when the browser is closed and opening a link from outside | https://github.com/zen-browser/desktop/issues/11070 | None | None |
+| Essentials tabs are no longer colored to icon accent (zen.theme.essentials-favicon-bg) | https://github.com/zen-browser/desktop/issues/11069 | None | None |
+| Browser Gets Stuck in workspace. and upon restart deletes all current tabs & history. | https://github.com/zen-browser/desktop/issues/11068 | None | None |
+| Unloaded tabs logos aren't dimmed | https://github.com/zen-browser/desktop/issues/11065 | None | None |
+| url bar disappearing and stuttering after last update | https://github.com/zen-browser/desktop/issues/11063 | 1:01:34 | 5:21:04 |
+| Unable to install any mods from the store / mods do not work anymore | https://github.com/zen-browser/desktop/issues/11062 | None | None |
+| Page missing space without compact mode | https://github.com/zen-browser/desktop/issues/11060 | None | None |
+| Unable to drop new tabs when using auto-hide menu | https://github.com/zen-browser/desktop/issues/11059 | None | 0:23:34 |
+| Window top bar overlaps contents when expanded on hover | https://github.com/zen-browser/desktop/issues/11056 | 2:37:18 | 4:47:35 |
+| SAVED WEBSITES NOT SHOWING FAVICONS ON STARTUP | https://github.com/zen-browser/desktop/issues/11050 | 5:08:35 | 6:19:52 |
+| On single toolbar mode shortcut "toggle sidebar's width" doesnt change zen.view.use-single-toolbar, causing you to never be able to not hide sidebar in compact mode | https://github.com/zen-browser/desktop/issues/11049 | None | 2:09:48 |
+| After every Zen Browser update, the browser automatically redirects all HTTP requests to HTTPS | https://github.com/zen-browser/desktop/issues/11048 | 1 day, 3:16:04 | None |
+| Sidebar keeps moving when dragging a link to the sidebar in compact mode | https://github.com/zen-browser/desktop/issues/11045 | 1:26:22 | 1:26:22 |
+| Browser auto force quits when sharing screen on Google meet | https://github.com/zen-browser/desktop/issues/11044 | 1 day, 0:37:45 | None |
+| bookmark icon missing from address bar. Extenision cannot be pinned to toolbar | https://github.com/zen-browser/desktop/issues/11043 | 0:08:08 | 18:47:26 |
+| Folder bug because of browser.tabs.groups.enabled was set to true when the first update about folders came out. | https://github.com/zen-browser/desktop/issues/11042 | 6:09:21 | 6:09:21 |
+| Very confusing behaviour: Zen changes some keyboards keys | https://github.com/zen-browser/desktop/issues/11039 | None | None |
+| Floating URL bar is off-center in Compact Mode | https://github.com/zen-browser/desktop/issues/11036 | 5:43:02 | 9:06:12 |
+| severe lag when Compact Tabs mode is enabled | https://github.com/zen-browser/desktop/issues/11035 | None | None |
+| Pinned/Essentials tabs are not individual for each window on restart | https://github.com/zen-browser/desktop/issues/11034 | 20:23:59 | None |
+| Issue with toolbar after the update | https://github.com/zen-browser/desktop/issues/11033 | 0:30:05 | 0:30:05 |
+| Url bar sometimes overlaps page | https://github.com/zen-browser/desktop/issues/11032 | 0:40:02 | None |
+| Sluggish Scrolling With Winodws 11 Dynamic Refresh Rate | https://github.com/zen-browser/desktop/issues/11030 | 0:36:58 | 2:14:02 |
+| [Bug] Picture-in-Picture (PiP) icon disappears from the URL bar | https://github.com/zen-browser/desktop/issues/11029 | 2:02:15 | 2 days, 1:05:37 |
+| Splitter barely visible when Split View + Compact Mode are active | https://github.com/zen-browser/desktop/issues/11027 | 0:11:40 | None |
+| The new unified panel has significantly affected the dragging link behavior (For example, drag and drop to save bookmarks）. | https://github.com/zen-browser/desktop/issues/11026 | None | None |
+| Nextcloud passwords plugin fails to keep connection to nextcloud | https://github.com/zen-browser/desktop/issues/11025 | None | None |
+| Extension symbol in toolbar | https://github.com/zen-browser/desktop/issues/11024 | 1:04:53 | None |
+| bookmark is bugged | https://github.com/zen-browser/desktop/issues/11023 | None | 2:09:24 |
+| Essential tab background color not adapting to icon color | https://github.com/zen-browser/desktop/issues/11022 | None | None |
+| Extensions button is missing if Removed from toolbar | https://github.com/zen-browser/desktop/issues/11021 | 0:12:48 | 0:12:48 |
+| Zen icon not appearing in sidebar in "only sidebar" mode in macOS | https://github.com/zen-browser/desktop/issues/11020 | 1:19:03 | None |
+| White background websites render as transparent | https://github.com/zen-browser/desktop/issues/11019 | 2:00:20 | 5 days, 10:00:50 |
+| Extensions menu (and its "jigsaw" button) need to be an option | https://github.com/zen-browser/desktop/issues/11013 | 1:10:36 | 1:10:36 |
+| sign in with google failing | https://github.com/zen-browser/desktop/issues/11010 | 0:15:42 | None |
+| Stuttering when playing 4K videos on Bilibili | https://github.com/zen-browser/desktop/issues/11007 | 0:27:17 | 1 day, 17:54:57 |
+| Cannot access extension icons on sites that have DRM content in version 1.17.2b | https://github.com/zen-browser/desktop/issues/11004 | 1:05:25 | None |
+| URL bar in a wrong place | https://github.com/zen-browser/desktop/issues/11002 | 1:34:49 | 1:34:49 |
+| Zen slow on Linux after v1.17b | https://github.com/zen-browser/desktop/issues/11001 | None | 20:41:15 |
+| Extension flagged by Mozilla as risky display broken | https://github.com/zen-browser/desktop/issues/11000 | 1:46:25 | 1:46:25 |
+| Title bar of zen browser | https://github.com/zen-browser/desktop/issues/10998 | 0:46:49 | 0:47:07 |
+| Glance buttons not appearing on the left side | https://github.com/zen-browser/desktop/issues/10997 | 1:06:43 | 1:06:43 |
+| Compact Mode Sidebar Obfuscats Favorites (Top) in New Window | https://github.com/zen-browser/desktop/issues/10994 | None | 0:10:54 |
+| Video issues (constant stuttering) On Flatpack version of Zen browser | https://github.com/zen-browser/desktop/issues/10993 | 0:10:08 | 2 days, 8:24:55 |
+| Update to 1.17.2b wiped the session data | https://github.com/zen-browser/desktop/issues/10992 | 2:11:53 | None |
+| Zen freezes when an image is copied on Linux | https://github.com/zen-browser/desktop/issues/10991 | 4:55:17 | None |
+| Toolbar items becomes overflow menu | https://github.com/zen-browser/desktop/issues/10990 | 6:38:06 | 8:17:57 |
+| Compact mode double toolbar slide over webview not appearing correctly | https://github.com/zen-browser/desktop/issues/10987 | 0:23:29 | 10:55:15 |
+| Middle clicking on a pinned tab no longer removes it | https://github.com/zen-browser/desktop/issues/10984 | 2:11:56 | 2:11:56 |
+| Page Reload icon | https://github.com/zen-browser/desktop/issues/10983 | 2:35:26 | 2:35:26 |
+| v1.17 broke CamelCamelCamel extension | https://github.com/zen-browser/desktop/issues/10982 | 2:42:07 | 2:42:07 |
+| Closing last tab individually prevents restoring window/session | https://github.com/zen-browser/desktop/issues/10981 | None | None |
+| Cannot drag image to the left panel when in compact mode | https://github.com/zen-browser/desktop/issues/10979 | 0:30:59 | 6:10:19 |
+| Suddenly my tabs deleted | https://github.com/zen-browser/desktop/issues/10978 | None | None |
+| Release Notes tab always opens at the top of the tabs' list | https://github.com/zen-browser/desktop/issues/10976 | 0:01:36 | None |
+| I cannot use the "hide toolbar" option on compact mode | https://github.com/zen-browser/desktop/issues/10975 | None | 0:12:57 |
+| Mouse events not firing correctly for items under control buttons when the bar is hidden | https://github.com/zen-browser/desktop/issues/10973 | 0:36:05 | 1 day, 9:12:42 |
+| Container tab name removed from URL bar | https://github.com/zen-browser/desktop/issues/10972 | 0:16:56 | 1:13:15 |
+| Extensions (Puzzle Piece) Icon Missing After Update | https://github.com/zen-browser/desktop/issues/10971 | 0:12:24 | 0:28:02 |
+| Top toolbar in multi-toolbar mode is shown when it shouldn’t | https://github.com/zen-browser/desktop/issues/10970 | None | 2:08:34 |
+| Middle clicking on pending tab no longer closes it | https://github.com/zen-browser/desktop/issues/10969 | None | 0:01:44 |
+| Reload button is hidden under menu when it is the only item in the menu | https://github.com/zen-browser/desktop/issues/10968 | None | 0:44:47 |
+| Compact Mode sidebar is on the bottom of the screen rather than being in the middle. | https://github.com/zen-browser/desktop/issues/10965 | None | 0:08:13 |
+| Youtube video player cropped in fullscreen | https://github.com/zen-browser/desktop/issues/10964 | None | 0:02:31 |
+| New Site Control Center renders add-on warnings vertically on top of the rest of the UI | https://github.com/zen-browser/desktop/issues/10963 | None | 0:02:07 |
+| Media keys (Previous, Pause, Next) don't work | https://github.com/zen-browser/desktop/issues/10962 | 0:01:20 | 6:30:56 |
+| [UI] Container IDs removed from URL bar | https://github.com/zen-browser/desktop/issues/10961 | 0:09:33 | 0:12:33 |
+| History | https://github.com/zen-browser/desktop/issues/10960 | 0:22:22 | 0:58:14 |
+| The toolbar remains visible after following specific steps in compact mode | https://github.com/zen-browser/desktop/issues/10959 | 2:31:24 | None |
+| New extensions' interface in address bar still broken for some extensions | https://github.com/zen-browser/desktop/issues/10958 | None | 8:26:44 |
+| Copy current URL pop up doesn't disappear | https://github.com/zen-browser/desktop/issues/10956 | 8:56:54 | 10:51:44 |
+| The icon for "Enable compact mode" is a duplicate in the sidebar. | https://github.com/zen-browser/desktop/issues/10955 | 10:48:59 | None |
+| Wrong style on 4 buttons | https://github.com/zen-browser/desktop/issues/10954 | 0:27:06 | 0:27:06 |
+| Poor formatting in extensions control panel | https://github.com/zen-browser/desktop/issues/10953 | 0:32:14 | 0:32:14 |
+| New top border line at top of browser application window | https://github.com/zen-browser/desktop/issues/10952 | None | 0:58:56 |
+| "Hide Top bar" compact mode is greyed out / impossible to select | https://github.com/zen-browser/desktop/issues/10951 | 0:07:47 | 14:26:57 |
+| Cannot hide "forward" button from toolbar | https://github.com/zen-browser/desktop/issues/10949 | 0:28:05 | 0:28:05 |
+| Top toolbar now covers up top of webpages | https://github.com/zen-browser/desktop/issues/10948 | 0:34:17 | 14:55:39 |
+| Missing the Extensions "Jigsaw" icon next to the URL bar. | https://github.com/zen-browser/desktop/issues/10947 | 0:45:52 | 4:36:42 |
+| Can't place Home button to left upper corner | https://github.com/zen-browser/desktop/issues/10946 | None | None |
+| All tabs close and disappear when you open a private window | https://github.com/zen-browser/desktop/issues/10945 | None | 1:03:19 |
+| Youtube Controls Only Partially Visible in Fullscreen Mode | https://github.com/zen-browser/desktop/issues/10944 | 1:21:37 | 1:21:37 |
+| Sidebar Flickers/Flaps Rapidly When Dragging Text/URL to Window Edge in Compact Mode | https://github.com/zen-browser/desktop/issues/10942 | 2:43:13 | 6 days, 19:36:33 |
+| Dragging tab out of window opens a new blank window instead of a new tabbed window | https://github.com/zen-browser/desktop/issues/10941 | 0:15:32 | 0:15:32 |
+| Compact Mode "Hide toolbar" only works with tabs on right | https://github.com/zen-browser/desktop/issues/10940 | 0:25:59 | 0:25:58 |
+| Floating URL bar not appearing on focus in compact mode | https://github.com/zen-browser/desktop/issues/10938 | 1:53:52 | None |
+| Extension area layout breaks after switching between toolbar layouts | https://github.com/zen-browser/desktop/issues/10936 | 3:14:21 | 10:14:36 |
+| No option to revert "new" extensions + site settings menu | https://github.com/zen-browser/desktop/issues/10935 | 3:14:19 | 3:14:19 |
+| Search bar bug while compact mode on macos | https://github.com/zen-browser/desktop/issues/10934 | 1:01:13 | 1:17:41 |
+| Tooltips missing for unified panel quick actions | https://github.com/zen-browser/desktop/issues/10933 | None | 4:13:23 |
+| In collapsed sidebar mode you are no longer able to hide toolbar | https://github.com/zen-browser/desktop/issues/10932 | 1:51:58 | 3:53:59 |
+| playerctl metadata shows firefox instead of zen browser | https://github.com/zen-browser/desktop/issues/10931 | 8:32:21 | None |
+| Zen doesn't retrieve correct accent color from OS | https://github.com/zen-browser/desktop/issues/10930 | 4:19:46 | None |
+| Compact Mode Issue on Windows | https://github.com/zen-browser/desktop/issues/10929 | 3:39:31 | 4:10:59 |
+| Layout inconsistency between Look and Feel preview and the actual collapsed toolbar | https://github.com/zen-browser/desktop/issues/10928 | 0:30:59 | 5:17:10 |
+| about:logo has wrong logo | https://github.com/zen-browser/desktop/issues/10926 | None | None |
+| pinned split view tabs don't have "X" near them on hover | https://github.com/zen-browser/desktop/issues/10924 | None | 5:40:27 |
+| New extention tab doesnt render right if one of the extentions violate mozilla policy | https://github.com/zen-browser/desktop/issues/10922 | None | 5:16:46 |
+| Line above URL bar but not sidebar | https://github.com/zen-browser/desktop/issues/10921 | 5:57:13 | 5:57:13 |
+| New menu for extensions, etc. overflows the window. | https://github.com/zen-browser/desktop/issues/10918 | 0:37:05 | 0:53:30 |
+| [UI Bug?] Horizontal scrollbar appears in "Looks and Feel" settings on smaller window widths (e.g. 1280px) | https://github.com/zen-browser/desktop/issues/10915 | 3:43:21 | 1 day, 13:46:48 |
+| 'New tab' button no longer at the top of unpinned tabs | https://github.com/zen-browser/desktop/issues/10914 | 3:19:00 | 11:13:57 |
+| Top toolbar adopts Transparent Zen mod format in Compact Mode Double Toolbar | https://github.com/zen-browser/desktop/issues/10913 | 3:34:48 | 3:34:48 |
+| Compact Mode formatting bugs when switching between Toolbar settings | https://github.com/zen-browser/desktop/issues/10912 | 3:58:57 | None |
+| Compact Mode Collapsed Sidebar on hover endlessly expands | https://github.com/zen-browser/desktop/issues/10911 | None | 4:09:14 |
+| Compact Mode Sidebar Only won't hide. | https://github.com/zen-browser/desktop/issues/10910 | 3:45:10 | None |
+| Compact Mode Double Toolbar, Top Toolbar doesn't hide. | https://github.com/zen-browser/desktop/issues/10909 | None | 0:29:10 |
+| Compact mode hide toolbar option Broken if 'Tabs on Right' | https://github.com/zen-browser/desktop/issues/10908 | 5:35:04 | 5:35:04 |
+| New extensions' interface in address bar broken for some extensions | https://github.com/zen-browser/desktop/issues/10907 | 0:12:05 | 3 days, 15:02:25 |
+| Missing tabs when closing and reopening Zen browser with multiple windows | https://github.com/zen-browser/desktop/issues/10906 | 0:09:30 | 0:09:30 |
+| missing theme/accent settings (linux, flathub) (?) | https://github.com/zen-browser/desktop/issues/10905 | 1:06:10 | 1:06:10 |
+| Battery consumption | https://github.com/zen-browser/desktop/issues/10903 | 0:29:10 | 0:29:10 |
+| browser-init-js.patch error while building from zero on arch linux | https://github.com/zen-browser/desktop/issues/10902 | 3:53:18 | None |
+| Addon popup window broken when no tabs opened | https://github.com/zen-browser/desktop/issues/10900 | None | 1:43:44 |
+| Udemy Crash | https://github.com/zen-browser/desktop/issues/10898 | None | 0:04:29 |
+| Text in sidebar becomes unreadable after switching system theme | https://github.com/zen-browser/desktop/issues/10893 | 12:10:14 | 12:11:00 |
+| Extensions popup failing to render when zen is recently launched | https://github.com/zen-browser/desktop/issues/10892 | 0:06:10 | 0:33:28 |
+| New tab URL popup doesn’t appear when opening a new tab using Ctrl+T while watching videos in fullscreen | https://github.com/zen-browser/desktop/issues/10891 | 9:44:27 | 15:42:30 |
+| Zen Browser’s RAM usage on Arch Linux suddenly completely blew up after waking up from sleep (64GB of RAM + 32GB of Zram) | https://github.com/zen-browser/desktop/issues/10889 | 11:05:26 | 4 days, 0:26:42 |
+| Holy GPU Usage (I have a 6750xt for reference {12GB VRAM} ) | https://github.com/zen-browser/desktop/issues/10888 | 13:36:41 | 5 days, 21:19:18 |
+| Dragging tabs across multi-screens | https://github.com/zen-browser/desktop/issues/10875 | None | None |
+| Sidbery Conflict in Zen Browser only | https://github.com/zen-browser/desktop/issues/10871 | None | 2 days, 5:59:58 |
+| Bookmarks Bar Folders is incorrectly redundantly displayed | https://github.com/zen-browser/desktop/issues/10866 | 2 days, 17:12:01 | None |
+| Source tarball should include zen locales | https://github.com/zen-browser/desktop/issues/10865 | None | 15:18:10 |
+| Simplify extension login breaking | https://github.com/zen-browser/desktop/issues/10864 | 0:12:31 | 1:06:05 |
+| Open site in container sites cannot be added to essentials | https://github.com/zen-browser/desktop/issues/10862 | 1:07:05 | None |
+| 1password addon integration fails to show unlock window | https://github.com/zen-browser/desktop/issues/10859 | 0:39:20 | None |
+| duplicated letters or conflict with Vietnamese keyboards | https://github.com/zen-browser/desktop/issues/10858 | 1:29:34 | 1:35:14 |
+| Creating a space with multiple windows open freezes other windows | https://github.com/zen-browser/desktop/issues/10857 | 8:08:55 | None |
+| Mozilla services miscredited in user menu | https://github.com/zen-browser/desktop/issues/10854 | None | 4 days, 2:52:29 |
+| Website's icons not showing if not loaded | https://github.com/zen-browser/desktop/issues/10853 | 0:06:20 | 0:06:20 |
+| Bookmarks Toolbar is completely blank (flatpak install) | https://github.com/zen-browser/desktop/issues/10852 | 0:58:24 | 2:24:04 |
+| Closing a tab switches to a particular previously visited tab instead of the immediately previous | https://github.com/zen-browser/desktop/issues/10848 | None | None |
+| A resize cursor appears. | https://github.com/zen-browser/desktop/issues/10846 | 10:28:06 | None |
+| Bookmarks Toolbar can not "only show on new tab" | https://github.com/zen-browser/desktop/issues/10845 | 9:18:48 | None |
+| Sound not working on browser | https://github.com/zen-browser/desktop/issues/10844 | 9:25:58 | None |
+| Theme issue on the UI | https://github.com/zen-browser/desktop/issues/10835 | None | None |
+| Zombie processes | https://github.com/zen-browser/desktop/issues/10834 | 0:22:17 | None |
+| The URL bar flashes too often | https://github.com/zen-browser/desktop/issues/10832 | None | 0:04:01 |
+| Fixed or anchored website in browser can't be removed | https://github.com/zen-browser/desktop/issues/10828 | 0:15:40 | 6:35:29 |
+| The media controls at the bottom overlap important elements. | https://github.com/zen-browser/desktop/issues/10824 | 9:33:17 | 17:48:58 |
+| [Twilight] Compact mode button causing top toolbar to not hide/to not appear when hovering | https://github.com/zen-browser/desktop/issues/10821 | None | 17:59:30 |
+| the top bar is not functional as expexted. | https://github.com/zen-browser/desktop/issues/10820 | 0:22:50 | 14:40:32 |
+| Browser Screen Goes Blank (Them color ) Randomly –No UI Visible, Audio Still play . | https://github.com/zen-browser/desktop/issues/10817 | None | None |
+| Sidebar Gets Stuck After Interacting With an Exntension in Compact Mode | https://github.com/zen-browser/desktop/issues/10812 | 2:15:35 | 10:54:25 |
+| website setting lost | https://github.com/zen-browser/desktop/issues/10811 | None | None |
+| Scrolling cause GPU spikes | https://github.com/zen-browser/desktop/issues/10810 | 0:02:36 | 3:39:42 |
+| No such native application org.gnome.chrome_gnome_shell | https://github.com/zen-browser/desktop/issues/10806 | 2:20:05 | None |
+| keep crashing | https://github.com/zen-browser/desktop/issues/10804 | 1 day, 0:05:54 | None |
+| Workspace-aware restore closed tab behavior for reopening tabs | https://github.com/zen-browser/desktop/issues/10803 | 1 day, 20:48:51 | 1 day, 20:48:51 |
+| After activation "Zen will never remember history" all toolbars are black and the font color is also black | https://github.com/zen-browser/desktop/issues/10802 | 9:08:32 | None |
+| Fullscreen mode doesn't hide toolbar and sidebar | https://github.com/zen-browser/desktop/issues/10800 | 7:38:33 | 7:38:33 |
+| DOH: Zen loose connectivity when network changes | https://github.com/zen-browser/desktop/issues/10799 | None | None |
+| Large Memory Leak Issue (zen.exe not properly exiting) | https://github.com/zen-browser/desktop/issues/10797 | 10:46:25 | 10:46:25 |
+| Absolutely broken compact mode 1.17t | https://github.com/zen-browser/desktop/issues/10796 | 10:56:37 | 1 day, 11:24:34 |
+| I am being randomly logged out of websites | https://github.com/zen-browser/desktop/issues/10792 | None | None |
+| 1Password desktop app integration not working in Zen Browser | https://github.com/zen-browser/desktop/issues/10788 | 0:44:13 | 0:44:13 |
+| [Bug] WebRender content becomes blurry at 5120x1440 with NVIDIA eGPU on Linux (X11) - Upstream Firefox has this issue too but not as badly | https://github.com/zen-browser/desktop/issues/10787 | None | None |
+| Tab Icons not rendering for certain tabs | https://github.com/zen-browser/desktop/issues/10782 | 0:09:03 | 0:09:03 |
+| Dragging sidebar moves the window | https://github.com/zen-browser/desktop/issues/10781 | 1:56:10 | 1:56:10 |
+| blinking caret bug | https://github.com/zen-browser/desktop/issues/10780 | 3:09:48 | 3:09:48 |
+| Freezing youtube videos when i change screens | https://github.com/zen-browser/desktop/issues/10779 | None | None |
+| Browser Icons Not Showing on Toolbar or Favorites in KDE Plasma on Fedora Linux | https://github.com/zen-browser/desktop/issues/10778 | None | None |
+| AUR version of Zen Browser glitches/pauses continuously | https://github.com/zen-browser/desktop/issues/10777 | 12:31:55 | None |
+| When tab changes while sub-folder is closing, does not fold the tab opened | https://github.com/zen-browser/desktop/issues/10772 | 9:29:58 | 9:29:58 |
+| Green artifacts appear on the scrollbar while scrolling some webpages | https://github.com/zen-browser/desktop/issues/10766 | 6:41:23 | None |
+| no newtab wallpaper apart from Default Workspace with no set profile container. | https://github.com/zen-browser/desktop/issues/10764 | 1:01:42 | 5:12:31 |
+| Zen is slow to update and restart on macOS | https://github.com/zen-browser/desktop/issues/10763 | None | None |
+| Layout issue: Preventing window from closing, minimizing, or resizing | https://github.com/zen-browser/desktop/issues/10762 | None | 18 days, 0:27:20 |
+| Url bar overflow when click fullscreen | https://github.com/zen-browser/desktop/issues/10760 | None | None |
+| Updates Failing | https://github.com/zen-browser/desktop/issues/10759 | 1 day, 9:15:55 | 1 day, 10:06:37 |
+| Youtube video playback noticeably dropping frames | https://github.com/zen-browser/desktop/issues/10756 | 7:33:59 | None |
+| Some websites' background is missing, uses Zen's theme color instead | https://github.com/zen-browser/desktop/issues/10755 | None | 0:02:35 |
+| Toolbar History icon nonfunctional | https://github.com/zen-browser/desktop/issues/10752 | 20:34:15 | None |
+| Video and audio playback error after recent pacman update | https://github.com/zen-browser/desktop/issues/10751 | None | 3:41:57 |
+| Twitch.tv Login Issue on Zen Browser | https://github.com/zen-browser/desktop/issues/10750 | 5:49:14 | 1 day, 1:42:41 |
+| Missing translations | https://github.com/zen-browser/desktop/issues/10749 | 3:28:20 | None |
+| Passbolt Password Manager doesn't work properly | https://github.com/zen-browser/desktop/issues/10748 | 12:48:48 | 12:48:48 |
+| Update are broken on macos since 1.16.4b | https://github.com/zen-browser/desktop/issues/10746 | 2 days, 16:23:56 | None |
+| Blank Context Menu | https://github.com/zen-browser/desktop/issues/10745 | 10:19:37 | 11:46:43 |
+| Cant load beehiv login page | https://github.com/zen-browser/desktop/issues/10744 | 14:48:10 | 14:48:10 |
+| Ctrl+Shift+T after deleting a folder breaks Zen | https://github.com/zen-browser/desktop/issues/10743 | None | None |
+| Settings: Search -> Address bar with browsing history negates open tabs selection | https://github.com/zen-browser/desktop/issues/10741 | None | None |
+| NGINX 404 of some sites | https://github.com/zen-browser/desktop/issues/10740 | 3:51:13 | 18:34:43 |
+| no pop up edit bookmark pages after triggered with 1) shortcut and 2)   star icon after right click. setting "Sidebar only" of the 3 sidebar modes | https://github.com/zen-browser/desktop/issues/10738 | 4 days, 5:09:44 | 16 days, 22:20:24 |
+| Sidebar resize issue when dragging the cursor beyond smallest size | https://github.com/zen-browser/desktop/issues/10737 | 1:03:24 | None |
+| Can't access extensions menu from New Tab | https://github.com/zen-browser/desktop/issues/10733 | 1:46:53 | 2 days, 1:20:18 |
+| Regular window tabs lost on closing if Incognito window is open | https://github.com/zen-browser/desktop/issues/10732 | 1:48:17 | 2:00:03 |
+| Nested folders go back to root of workspace when opening Zen. | https://github.com/zen-browser/desktop/issues/10730 | 3:57:00 | None |
+| Youtube videoplay laggy | https://github.com/zen-browser/desktop/issues/10729 | 6:03:54 | 2 days, 2:00:09 |
+| Stay on page doesn't work in pinned/essential tabs | https://github.com/zen-browser/desktop/issues/10728 | None | None |
+| Touch Keyboard Does Not Show | https://github.com/zen-browser/desktop/issues/10727 | 18 days, 12:51:30 | None |
+| No page info in compact mode if clicked on URL | https://github.com/zen-browser/desktop/issues/10724 | None | 1:10:01 |
+| Search Bar Problem | https://github.com/zen-browser/desktop/issues/10723 | 3:29:09 | 19:52:36 |
+| Can't disable Hide Tab bar | https://github.com/zen-browser/desktop/issues/10722 | 0:12:09 | 2:23:39 |
+| Compact Mode - Customize Toolbar - Sidebar cannot have Items | https://github.com/zen-browser/desktop/issues/10721 | 4:31:48 | 4:31:48 |
+| [macOS] File upload dialog freezes Zen Browser for several seconds | https://github.com/zen-browser/desktop/issues/10719 | None | 1:29:55 |
+| Mouse hover breaks Ctrl + Tab (tab switching) | https://github.com/zen-browser/desktop/issues/10715 | 4 days, 19:04:17 | 5 days, 4:09:28 |
+| Spotify not working after updating to 1.16.3b | https://github.com/zen-browser/desktop/issues/10714 | 0:12:47 | 2:11:45 |
+| Cursor dissapears in most online text editors | https://github.com/zen-browser/desktop/issues/10713 | 5:37:12 | None |
+| Tabs dont close | https://github.com/zen-browser/desktop/issues/10710 | None | None |
+| Address Bar opens on keypress right after starting zen | https://github.com/zen-browser/desktop/issues/10709 | None | None |
+| Search bar wont fully disappear when trying to close it | https://github.com/zen-browser/desktop/issues/10708 | 9:51:49 | 9:51:49 |
+| [Twilight] Tabs' area is reduced when enabling compact mode in collapsed toolbars layout | https://github.com/zen-browser/desktop/issues/10706 | 15:58:04 | 15:58:04 |
+| Is not possible expand de tabs side bar | https://github.com/zen-browser/desktop/issues/10705 | 0:19:09 | 12:56:28 |
+| Missing tab navigation keyboard shortcut | https://github.com/zen-browser/desktop/issues/10704 | 2:47:17 | 1 day, 1:48:51 |
+| Switching workspace hotkey slow to repeat. | https://github.com/zen-browser/desktop/issues/10703 | 4:59:37 | None |
+| DevTools warning: connected browser newer than Zen (unsupported setup message) | https://github.com/zen-browser/desktop/issues/10702 | None | 0:07:32 |
+| - [Bug] High Memory & Disk Consumption on Snapdragon X Plus Device | https://github.com/zen-browser/desktop/issues/10701 | None | None |
+| Youtube Live Streams Are Not Working After The Update | https://github.com/zen-browser/desktop/issues/10698 | 3:17:57 | 1 day, 3:35:02 |
+| Very low performance | https://github.com/zen-browser/desktop/issues/10695 | 1:40:48 | 1:40:48 |
+| Can you fucing fix the ctrashing???? | https://github.com/zen-browser/desktop/issues/10693 | 0:42:11 | 3:45:23 |
+| Strange Behaviour with Context Menu Clicks | https://github.com/zen-browser/desktop/issues/10691 | 6:58:32 | None |
+| Can't play DRM content on the latest release 1.16.3b | https://github.com/zen-browser/desktop/issues/10689 | 15:28:49 | None |
+| On macOS, workspace swipe actions require "Swipe between pages" to be enabled in system settings | https://github.com/zen-browser/desktop/issues/10687 | None | None |
+| macOS Altcodes / Modifier Keys Cause Keyboard Shortcut Issues | https://github.com/zen-browser/desktop/issues/10686 | 11 days, 13:05:50 | None |
+| Mute button simply stopped functioning. | https://github.com/zen-browser/desktop/issues/10685 | None | None |
+| Linux: 1Password desktop integration fails for Flatpak and Tarball installs | https://github.com/zen-browser/desktop/issues/10684 | None | None |
+| Entire Program Constantly Crashes With No Discernible Reproduction Method, Making it Unusable | https://github.com/zen-browser/desktop/issues/10683 | 4:17:45 | 1 day, 10:38:49 |
+| URL Bar appears cut off and onto the side (Floating URL Bar Issue) | https://github.com/zen-browser/desktop/issues/10682 | 1:31:06 | 0:02:30 |
+| All tabs keep crashing on Windows | https://github.com/zen-browser/desktop/issues/10681 | 1 day, 7:25:22 | None |
+| Failure to Update Zen Browser from Version 1.16.1b-1 to 1.16.2b-1 | https://github.com/zen-browser/desktop/issues/10678 | 2:02:51 | 5:04:58 |
+| Cannot set hotkey for "Stop Loading" (Browser:Stop). | https://github.com/zen-browser/desktop/issues/10677 | 2 days, 0:55:20 | 2 days, 0:55:19 |
+| Zen has suddenly overriden default Bitwarden keyboard shortcut and even when unbound it cannot be used for bitwarden | https://github.com/zen-browser/desktop/issues/10676 | None | None |
+| Zen Browser blocks Macbook from sleep | https://github.com/zen-browser/desktop/issues/10673 | None | None |
+| Cannot select text in URL bar by dragging mouse | https://github.com/zen-browser/desktop/issues/10671 | None | 1 day, 20:37:27 |
+| Bookmarks bar partially obscured by sidebar | https://github.com/zen-browser/desktop/issues/10667 | 19 days, 23:45:50 | None |
+| Browser freezes when tab is opened by external app with workspace switching enabled | https://github.com/zen-browser/desktop/issues/10666 | 1 day, 1:33:52 | None |
+| The bookmarks bar disappears in full screen mode | https://github.com/zen-browser/desktop/issues/10665 | 18:54:47 | 20:41:21 |
+| Websites rendering broken for me in 1.16 (fixed but reporting for clarity) | https://github.com/zen-browser/desktop/issues/10664 | None | None |
+| cmd + option + M interferes with macOS cmd + option + H + M global command | https://github.com/zen-browser/desktop/issues/10663 | None | None |
+| Zen freezes for ~3 seconds when downloading a file | https://github.com/zen-browser/desktop/issues/10657 | 18:33:18 | None |
+| Twitch Video Stuttering | https://github.com/zen-browser/desktop/issues/10653 | 1 day, 0:24:44 | None |
+| Recent Update Made Zen crash when using NVIDIA HW Acceleration (X11, Linux) | https://github.com/zen-browser/desktop/issues/10652 | 5 days, 18:32:13 | None |
+| Search bar does not hide and stays stuck on screen | https://github.com/zen-browser/desktop/issues/10650 | 0:10:53 | 2:43:42 |
+| browser stutter/halts/unresponsive | https://github.com/zen-browser/desktop/issues/10649 | 11:29:19 | None |
+| Issue with `1.16.2b-1` | https://github.com/zen-browser/desktop/issues/10648 | 6:46:15 | 6:46:15 |
+| Zen Sync not working | https://github.com/zen-browser/desktop/issues/10647 | 1 day, 7:52:54 | 12 days, 4:07:32 |
+| Stability issue: random crashes after v1.16.2b update | https://github.com/zen-browser/desktop/issues/10646 | 3:44:53 | 10:49:23 |
+
+_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-10-01..2025-10-31`

From 8097b402aad2c845193fb3f3b7754e87511a9cbc Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 2 Nov 2025 00:36:23 +0100
Subject: [PATCH 045/162] chore: New Crowdin updates, p=#11102

---
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/ko/browser/browser/zen-general.ftl    | 12 ++---
 locales/ko/browser/browser/zen-workspaces.ftl |  6 +--
 .../browser/preferences/zen-preferences.ftl   | 52 +++++++++----------
 locales/lt/browser/browser/zen-general.ftl    | 22 ++++----
 locales/lt/browser/browser/zen-split-view.ftl |  2 +-
 locales/lt/browser/browser/zen-welcome.ftl    |  2 +-
 locales/lt/browser/browser/zen-workspaces.ftl |  6 +--
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/uk/browser/browser/zen-workspaces.ftl |  6 +--
 10 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/locales/ko/browser/browser/preferences/zen-preferences.ftl b/locales/ko/browser/browser/preferences/zen-preferences.ftl
index 853382131..7044951b2 100644
--- a/locales/ko/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ko/browser/browser/preferences/zen-preferences.ftl
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = 성능 탭 전환
 zen-devtools-toggle-storage-shortcut = 저장소 탭 전환
 zen-devtools-toggle-dom-shortcut = DOM 탭 전환
 zen-devtools-toggle-accessibility-shortcut = 접근성 탭 전환
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = 모든 고정되지 않은 탭 닫기
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 456953faa..77c7c86bb 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -63,8 +63,8 @@ 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = 활성화됨
+zen-site-data-protections-disabled = 비활성화됨
 zen-site-data-setting-cross-site = 사이트 간 공유 쿠키
 zen-site-data-security-info-extension = 
     .label = 확장
@@ -79,13 +79,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = 모든 사이트 설정
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = 이 페이지 공유
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = 읽기 모드 켜기
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = 화면 캡쳐
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = 이 페이지 북마크
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL 복사
 zen-site-data-setting-site-protection = 추적 보호
diff --git a/locales/ko/browser/browser/zen-workspaces.ftl b/locales/ko/browser/browser/zen-workspaces.ftl
index 105cbf911..dcaf818b3 100644
--- a/locales/ko/browser/browser/zen-workspaces.ftl
+++ b/locales/ko/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = 워크스페이스를 삭제하시겠습
 zen-workspaces-delete-workspace-body = 정말 { $name }을 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = 탭을 닫았습니다! 되돌리려면 <span>{ $shortcut }</span>을 사용하세요.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = 탭 정리
+    .tooltiptext = 고정되지 않은 모든 탭을 닫습니다
diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl
index d78493dd1..8cc320b86 100644
--- a/locales/lt/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl
@@ -16,12 +16,12 @@ sync-engine-workspaces =
     .label = Darbo sritys
     .tooltiptext = Sinchronizuokite savo darbo sritis tarp įrenginių
     .accesskey = W
-zen-glance-title = Greitasis pažiūrėjimas
-zen-glance-header = Bendrieji greitojo pažiūrėjimo nustatymai
-zen-glance-description = Gaukite greitą nuorodų apžvalgą neatidarydami jų naujoje kortelėje
+zen-glance-title = Spartusis pažiūrėjimas
+zen-glance-header = Bendrieji sparčiojo pažiūrėjimo nustatymai
+zen-glance-description = Gaukite sparčią savo nuorodų apžvalgą neatverdami jų naujoje kortelėje.
 zen-glance-trigger-label = Paleidimo būdas
 zen-glance-enabled = 
-    .label = Įjungti greitą pažiūrėjimą
+    .label = Įjungti spartų pažiūrėjimą
 zen-glance-trigger-ctrl-click = 
     .label = Vald + spausti
 zen-glance-trigger-alt-click = 
@@ -29,15 +29,15 @@ zen-glance-trigger-alt-click =
 zen-glance-trigger-shift-click = 
     .label = Lyg2 + spausti
 zen-glance-trigger-meta-click = 
-    .label = Meta (Komanda) + spausti
+    .label = „Meta“ (komanda) + spausti
 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-description = Rodyti tik tas įrankių juostas, kurias naudojate.
 zen-look-and-feel-compact-view-enabled = 
     .label = Įjungti „{ -brand-short-name }“ kompaktinį režimą
 zen-look-and-feel-compact-view-top-toolbar = 
     .label = Slėpti viršutinę įrankių juostą ir kompaktiniu režimu
 zen-look-and-feel-compact-toolbar-flash-popup = 
-    .label = Trumpai padaryti, kad įrankių juosta iškyltų perjungiant arba atidarant naujas korteles kompaktiniu režimu
+    .label = Trumpai padaryti, kad įrankių juosta iškiltų perjungiant arba atidarant naujas korteles kompaktiniu režimu
 pane-zen-tabs-title = Kortelių tvarkymas
 category-zen-workspaces = 
     .tooltiptext = { pane-zen-tabs-title }
@@ -50,29 +50,29 @@ zen-workspace-continue-where-left-off =
     .label = Tęskite, kur baigėte
 pane-zen-pinned-tab-manager-title = Prisegtos kortelės
 zen-pinned-tab-manager-header = Bendrieji prisegtų kortelių nustatymai
-zen-pinned-tab-manager-description = Tvarkykite papildomą prisegtų kortelių elgseną
+zen-pinned-tab-manager-description = Tvarkykite papildomą prisegtų kortelių elgseną.
 zen-pinned-tab-manager-restore-pinned-tabs-to-pinned-url = 
     .label = Atkurti prisegtas korteles į jų originalų prisegtą URL paleidimo metu
 zen-pinned-tab-manager-container-specific-essentials-enabled = 
     .label = Įjungti konkrečiam konteineriui būtinuosius
-zen-pinned-tab-manager-close-shortcut-behavior-label = Užverti kortelę sparčiųjų klavišų elgsena
+zen-pinned-tab-manager-close-shortcut-behavior-label = Užvėrimo kortelę sparčiųjų klavišų elgsena
 zen-pinned-tab-manager-reset-unload-switch-close-shortcut-option = 
-    .label = Atkurti URL, iškelti ir perjungti į kitą kortelę
+    .label = Atkurti URL, iškelti ir perjungti į sekančią kortelę
 zen-pinned-tab-manager-unload-switch-close-shortcut-option = 
-    .label = Iškelti ir perjungti į kitą kortelę
+    .label = Iškelti ir perjungti į sekančią kortelę
 zen-pinned-tab-manager-reset-switch-close-shortcut-option = 
-    .label = Atkurti URL ir perjungti į kitą kortelę
+    .label = Atkurti URL ir perjungti į sekančią kortelę
 zen-pinned-tab-manager-switch-close-shortcut-option = 
-    .label = Perjungti į kitą kortelę
+    .label = Perjungti į sekančią kortelę
 zen-pinned-tab-manager-reset-close-shortcut-option = 
     .label = Atkurti URL
 zen-pinned-tab-manager-close-close-shortcut-option = 
     .label = Užverti kortelę
 pane-zen-workspaces-header = Darbo sritys
 zen-settings-workspaces-header = Bendrieji darbo sričių nustatymai
-zen-settings-workspaces-description = Su darbo sritimis galite vienu metu atlikti kelias naršymo seansus!
+zen-settings-workspaces-description = Su darbo sritimis galite vienu metu atlikti kelias naršymo seansus.
 zen-settings-workspaces-enabled = 
-    .label = Įjungti darbo sritis (eksperimentinė)
+    .label = Įjungti darbo sritis
 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šą.
@@ -80,18 +80,18 @@ 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
-zen-vertical-tabs-description = Tvarkykite korteles vertikaliame išdėstyme
+zen-vertical-tabs-description = Tvarkykite korteles vertikaliame išdėstyme.
 zen-vertical-tabs-show-expand-button = 
     .label = Rodyti išskleidimo mygtuką
 zen-vertical-tabs-newtab-on-tab-list = 
     .label = Rodyti naujos kortelės mygtuką kortelių sąraše
 zen-vertical-tabs-newtab-top-button-up = 
     .label = Perkelti naujos kortelės mygtuką į viršų
-zen-vertical-tabs-expand-tabs-by-default = Išskleisti korteles pagal numatytąją nustatymą
-zen-vertical-tabs-dont-expand-tabs-by-default = Neišskleisti kortelių pagal numatytąją nustatymą
+zen-vertical-tabs-expand-tabs-by-default = Išskleisti korteles pagal numatytąją
+zen-vertical-tabs-dont-expand-tabs-by-default = Neišskleisti kortelių pagal numatytąją
 zen-vertical-tabs-expand-tabs-on-hover = Išskleisti korteles užvedus (neveikia kompaktiniame režime)
 zen-vertical-tabs-expand-tabs-header = Kaip išskleisti korteles
-zen-vertical-tabs-expand-tabs-description = Pasirinkite, kaip išskleisti kortelės šoninėje juostoje
+zen-vertical-tabs-expand-tabs-description = Pasirinkite, kaip išskleisti kortelės šoninėje juostoje.
 zen-theme-marketplace-header = „Zen“ modifikacijos
 zen-theme-disable-all-enabled = 
     .title = Išjungti visus modifikacijas
@@ -128,10 +128,10 @@ pane-zen-marketplace-title = „Zen“ modifikacijos
 zen-themes-auto-update = 
     .label = Automatiškai atnaujinti įdiegtas modifikacijas paleidimo metu
 zen-settings-workspaces-force-container-tabs-to-workspace = 
-    .label = Perjungti į darbo sritį, kurioje konteineris nustatytas kaip numatytasis, atidarant konteinerio korteles
+    .label = Perjungti į darbo sritį, kurioje konteineris nustatytas kaip numatytasis, atveriant konteinerio korteles
 zen-theme-marketplace-link = Aplankyti parduotuvę
 zen-dark-theme-styles-header = Tamsios temos stiliai
-zen-dark-theme-styles-description = Tinkinkite tamsią temą pagal savo poreikius
+zen-dark-theme-styles-description = Tinkinkite tamsią temą pagal savo poreikius.
 zen-dark-theme-styles-amoled = Naktinė tema
 zen-dark-theme-styles-default = Numatytoji tamsi tema
 zen-dark-theme-styles-colorful = Spalvinga tamsi tema
@@ -153,13 +153,13 @@ category-zen-CKS =
     .tooltiptext = { pane-zen-CKS-title }
 pane-settings-CKS-title = „{ -brand-short-name }“ klaviatūros spartieji klavišai
 zen-settings-CKS-header = Tinkinkite klaviatūros sparčiuosius klavišus
-zen-settings-CKS-description = Keiskite numatytąsias klaviatūros sparčiąsias klavišus pagal savo pageidavimus ir patobulinkite naršymo potyrį
+zen-settings-CKS-description = Keiskite numatytąsias klaviatūros sparčiąsias klavišus pagal savo pageidavimus ir patobulinkite naršymo patirtį.
 zen-settings-CKS-disable-firefox = 
     .label = Išjungti „{ -brand-short-name }“ numatytuosius klaviatūros sparčiuosius klavišus
 zen-settings-CKS-duplicate-shortcut = 
     .label = Dubliuoti spartųjį klavišą
 zen-settings-CKS-reset-shortcuts = 
-    .label = Atkurti į numatytuosius nustatymus
+    .label = Atkurti į numatytuosius
 zenCKSOption-group-other = Kita
 zenCKSOption-group-windowAndTabManagement = Langų ir kortelių tvarkymas
 zenCKSOption-group-navigation = Naršymas
@@ -234,7 +234,7 @@ zen-find-shortcut = Rasti puslapyje
 zen-search-find-again-shortcut = Rasti dar kartą
 zen-search-find-again-shortcut-prev = Rasti ankstesnį
 zen-search-find-again-shortcut-2 = Rasti dar kartą (Alt)
-zen-bookmark-this-page-shortcut = Pridėti šį puslapį prie adresyno
+zen-bookmark-this-page-shortcut = Įtraukti šį puslapį į adresyną
 zen-bookmark-show-library-shortcut = Rodyti adresyno biblioteką
 zen-key-stop = Stabdyti įkėlimą
 zen-full-zoom-reduce-shortcut = Sumažinti
@@ -257,7 +257,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 = Išskleisti greitą pažiūrėjimą
+zen-glance-expand = Išskleisti spartų 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į
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Perjungti našumą
 zen-devtools-toggle-storage-shortcut = Perjungti saugyklą
 zen-devtools-toggle-dom-shortcut = Perjungti DOM
 zen-devtools-toggle-accessibility-shortcut = Perjungti prieinamumą
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Užverti visas neprisegtas korteles
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index f3af1aeb8..8a2d80b79 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -28,7 +28,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 = Copied current URL!
+zen-copy-current-url-confirmation = Nukopijuotas dabartinis URL.
 zen-general-cancel-label = 
     .label = Atšaukti
 zen-general-confirm = 
@@ -59,13 +59,13 @@ urlbar-search-mode-zen_actions = Veiksmai
 zen-site-data-settings = Nustatymai
 zen-generic-manage = Tvarkyti
 zen-generic-more = Daugiau
-zen-generic-next = Next
+zen-generic-next = Sekantis
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-protections-enabled = Įjungta
+zen-site-data-protections-disabled = Išjungta
+zen-site-data-setting-cross-site = Tarpusavio svetainės slapukas
 zen-site-data-security-info-extension = 
     .label = Plėtinys
 zen-site-data-security-info-secure = 
@@ -79,16 +79,16 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Visi svetainės nustatymai
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Bendrinti šį puslapį
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Įeiti į skaitytojo režimą
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Daryti ekrano kopiją
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Įtraukti šį puslapį į adresyną
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = Kopijuoti URL
+zen-site-data-setting-site-protection = Stebėjimo apsauga
 
 # Section: Feature callouts
 
diff --git a/locales/lt/browser/browser/zen-split-view.ftl b/locales/lt/browser/browser/zen-split-view.ftl
index 8f0e1c9bf..6c0f705d1 100644
--- a/locales/lt/browser/browser/zen-split-view.ftl
+++ b/locales/lt/browser/browser/zen-split-view.ftl
@@ -19,5 +19,5 @@ zen-split-view-modifier-header = Skaidymo rodinys
 zen-split-view-modifier-activate-reallocation = 
     .label = Aktyvuoti perskyrimą
 zen-split-view-modifier-enabled-toast = Skaidymo rodinio pertvarkymas įjungtas.
-zen-split-view-modifier-enabled-toast-description = Nutempkite rodinį, kad jį pertvarkytumėte. Paspauskite Gr, kad išeitumėte.
+zen-split-view-modifier-enabled-toast-description = Nutempkite rodinį, kad pertvarkytumėte. Paspauskite Gr, kad išeitumėte.
 zen-split-view-modifier-disabled-toast = Skaidymo rodinio pertvarkymas išjungtas.
diff --git a/locales/lt/browser/browser/zen-welcome.ftl b/locales/lt/browser/browser/zen-welcome.ftl
index 03ceb5b64..2cbeb06b5 100644
--- a/locales/lt/browser/browser/zen-welcome.ftl
+++ b/locales/lt/browser/browser/zen-welcome.ftl
@@ -18,7 +18,7 @@ zen-welcome-workspace-colors-description = Suasmeninkite savo naršyklę, suteik
 zen-welcome-start-browsing-title =
     Viskas parengta?<br/>
     Pradėkime veikti!
-zen-welcome-start-browsing-description-1 = Viskas parengta ir gali veikti. Spustelėkite toliau esantį mygtuką, kad pradėtumėte naršyti su „{ -brand-short-name }“.
+zen-welcome-start-browsing-description-1 = Viskas parengta ir gali veikti. Spustelėkite žemiau esantį mygtuką, kad pradėtumėte naršyti su „{ -brand-short-name }“.
 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!
diff --git a/locales/lt/browser/browser/zen-workspaces.ftl b/locales/lt/browser/browser/zen-workspaces.ftl
index 9027e7a36..710690274 100644
--- a/locales/lt/browser/browser/zen-workspaces.ftl
+++ b/locales/lt/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Ištrinti erdvę?
 zen-workspaces-delete-workspace-body = Ar tikrai norite ištrinti „{ $name }“? Šio veiksmo anuliuoti negalima.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Kortelės užvertos! Naudokite <span>{ $shortcut }</span>, kad atšauktumėte.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Valyti
+    .tooltiptext = Užverti visas neprisegtas korteles
diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl
index efb5d6a38..bbb5a6832 100644
--- a/locales/uk/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Увімк. / Вимк. продук
 zen-devtools-toggle-storage-shortcut = Увімк. / Вимк. сховище
 zen-devtools-toggle-dom-shortcut = Увімк. / Вимк. DOM
 zen-devtools-toggle-accessibility-shortcut = Увімк. / Вимк. доступ
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Закрити всі відкріплені вкладки
diff --git a/locales/uk/browser/browser/zen-workspaces.ftl b/locales/uk/browser/browser/zen-workspaces.ftl
index 524f1a96a..f5101512b 100644
--- a/locales/uk/browser/browser/zen-workspaces.ftl
+++ b/locales/uk/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Видалити простір?
 zen-workspaces-delete-workspace-body = Упевнені, що хочете видалити { $name }? Цю дію неможливо скасувати.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Вкладки закрито! Скористайтеся <span>{ $shortcut }</span>, аби повернути їх.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Очистити
+    .tooltiptext = Закрити всі відкріплені вкладки

From be561ec8dc4ef9fa2f88702a8decc77c44c3b207 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 2 Nov 2025 01:35:46 +0100
Subject: [PATCH 046/162] chore: Several QA fixes and options added, b=closes
 #11105, closes https://github.com/zen-browser/desktop/issues/11020, closes
 https://github.com/zen-browser/desktop/issues/11105,
 https://github.com/zen-browser/desktop/issues/10752, c=common, compact-mode,
 workspaces

---
 prefs/zen/view.yaml                           |  3 +
 prefs/zen/zen-urlbar.yaml                     |  3 +
 .../base/content/browser-addons-js.patch      |  8 +--
 .../base/content/browser-places-js.patch      | 10 +++-
 .../base/content/navigator-toolbox-js.patch   | 20 +------
 .../base/content/zen-panels/site-data.inc     |  3 +-
 .../customizableui/content/panelUI-js.patch   |  4 +-
 .../modules/ExtensionsUI-sys-mjs.patch        |  4 +-
 src/browser/themes/shared/zen-icons/icons.css |  6 +-
 src/zen/common/ZenUIManager.mjs               | 57 +++++++++++++++++--
 src/zen/common/styles/zen-omnibox.css         |  6 ++
 src/zen/compact-mode/sidebar.inc.css          |  3 +-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       | 13 ++++-
 src/zen/workspaces/ZenWorkspaces.mjs          | 33 ++++++++---
 surfer.json                                   |  2 +-
 15 files changed, 128 insertions(+), 47 deletions(-)

diff --git a/prefs/zen/view.yaml b/prefs/zen/view.yaml
index c5970430e..8235e67fe 100644
--- a/prefs/zen/view.yaml
+++ b/prefs/zen/view.yaml
@@ -57,3 +57,6 @@
 
 - name: zen.view.shift-down-site-on-hover
   value: false
+
+- name: zen.view.show-clear-tabs-button
+  value: true
diff --git a/prefs/zen/zen-urlbar.yaml b/prefs/zen/zen-urlbar.yaml
index 97be59be9..4bd362402 100644
--- a/prefs/zen/zen-urlbar.yaml
+++ b/prefs/zen/zen-urlbar.yaml
@@ -26,6 +26,9 @@
 - name: zen.urlbar.enable-overrides
   value: false
 
+- name: zen.urlbar.single-toolbar-show-copy-url
+  value: true
+
 # Mark: Zen suggestions controls
 
 - name: zen.urlbar.suggestions.quick-actions
diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch
index 0264323c8..edd6cb122 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 754ce380ed233eb8764af07af3c8dc95d3f39d5c..29864ab59819271b7319b273c08bdc2736d40c93 100644
+index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc31266b08 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
 @@ -1071,7 +1071,7 @@ var gXPInstallObserver = {
@@ -7,7 +7,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..29864ab59819271b7319b273c08bdc27
        hideClose: true,
        popupOptions: {
 -        position: "bottomright topright",
-+        position: gZenUIManager.panelUIPosition,
++        position: gZenUIManager.panelUIPosition(),
        },
      };
  
@@ -16,7 +16,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..29864ab59819271b7319b273c08bdc27
        timeout: Date.now() + 30000,
        popupOptions: {
 -        position: "bottomright topright",
-+        position: gZenUIManager.panelUIPosition,
++        position: gZenUIManager.panelUIPosition(),
        },
      };
  
@@ -65,7 +65,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..29864ab59819271b7319b273c08bdc27
          this.ensureButtonShownBeforeAttachingPanel(panel);
          PanelMultiView.openPopup(panel, this._button, {
 -          position: "bottomright topright",
-+          position: gZenUIManager.panelUIPosition,
++          position: gZenUIManager.panelUIPosition(panel, this._button),
            triggerEvent: aEvent,
          });
        }
diff --git a/src/browser/base/content/browser-places-js.patch b/src/browser/base/content/browser-places-js.patch
index e302f2838..5425bd91e 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 79b4f6f8fb2f7dd8784920038784e6bb0c967e2d..1f3f4991b3ba7c00516e9708e89e8f95db25a36a 100644
+index 79b4f6f8fb2f7dd8784920038784e6bb0c967e2d..4db983dad9bea10c17b5ac166ba58b93fa2a4d56 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
 @@ -252,6 +252,8 @@ var StarUI = {
@@ -33,3 +33,11 @@ index 79b4f6f8fb2f7dd8784920038784e6bb0c967e2d..1f3f4991b3ba7c00516e9708e89e8f95
    removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() {
      this._removeBookmarksOnPopupHidden = true;
      this.panel.hidePopup();
+@@ -1800,6 +1817,7 @@ var BookmarkingUI = {
+       document.getElementById("context-bookmarkpage"),
+       PanelMultiView.getViewNode(document, "panelMenuBookmarkThisPage"),
+       document.getElementById("pageAction-panel-bookmark"),
++      document.getElementById("zen-site-data-icon-button"),
+     ]) {
+       if (!element) {
+         // The page action panel element may not have been created yet.
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index 167525ff8..829800da2 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..472eab5d3bca2bc665920707a71105167cbe75ec 100644
+index 413bad2a62058a1c434d6a44e927e44eb397289d..d28116ffacb0ddb6fdb421db5d6498e455356b4a 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -8,7 +8,7 @@
@@ -11,24 +11,6 @@ index 413bad2a62058a1c434d6a44e927e44eb397289d..472eab5d3bca2bc665920707a7110516
      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,
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index bf310982b..b3b99dc06 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -5,8 +5,7 @@
 <panel id="zen-unified-site-data-panel"
         role="group"
         type="arrow"
-        noautofocus="true"
-        position="bottomright topright">
+        noautofocus="true">
   <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
diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch
index c20733de9..23ea8bef7 100644
--- a/src/browser/components/customizableui/content/panelUI-js.patch
+++ b/src/browser/components/customizableui/content/panelUI-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index 7156397d597579f745ea20ae2b9327433a31c8ec..13b844a63e79e227c96faf153ee5908759306407 100644
+index 7156397d597579f745ea20ae2b9327433a31c8ec..23c15c60acd77150ea89bd6f2fa1685a0cfc37fd 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
 @@ -518,8 +518,7 @@ const PanelUI = {
@@ -30,7 +30,7 @@ index 7156397d597579f745ea20ae2b9327433a31c8ec..13b844a63e79e227c96faf153ee59087
        });
  
 -    this.notificationPanel.openPopup(anchor, "bottomright topright");
-+    this.notificationPanel.openPopup(anchor, gZenUIManager.panelUIPosition);
++    this.notificationPanel.openPopup(anchor, gZenUIManager.panelUIPosition(this.notificationPanel, anchor));
    },
  
    _clearNotificationPanel() {
diff --git a/src/browser/modules/ExtensionsUI-sys-mjs.patch b/src/browser/modules/ExtensionsUI-sys-mjs.patch
index 9cb95334a..0466fcc51 100644
--- a/src/browser/modules/ExtensionsUI-sys-mjs.patch
+++ b/src/browser/modules/ExtensionsUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/modules/ExtensionsUI.sys.mjs b/browser/modules/ExtensionsUI.sys.mjs
-index 17cad7b3fbdd6dff862483892f37f72c00792c88..72d87d70182abfbf664b1dc86f4b4a3ecb2b1d01 100644
+index 17cad7b3fbdd6dff862483892f37f72c00792c88..90ea4d95738eb50d1a4a67ee7df087e7c2a68b3d 100644
 --- a/browser/modules/ExtensionsUI.sys.mjs
 +++ b/browser/modules/ExtensionsUI.sys.mjs
 @@ -478,7 +478,7 @@ export var ExtensionsUI = {
@@ -7,7 +7,7 @@ index 17cad7b3fbdd6dff862483892f37f72c00792c88..72d87d70182abfbf664b1dc86f4b4a3e
          removeOnDismissal: true,
          popupOptions: {
 -          position: "bottomright topright",
-+          position: window.gZenUIManager.panelUIPosition,
++          position: window.gZenUIManager.panelUIPosition(),
          },
          // Pass additional options used internally by the
          // addon-webext-permissions-notification custom element
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 082e5b7c8..71416c647 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -399,6 +399,10 @@
   &:not([can-close='true']) .toolbarbutton-icon {
     display: none;
   }
+
+  @media -moz-pref('zen.view.show-clear-tabs-button', false) {
+    display: none;
+  }
 }
 
 .zen-workspace-actions-reorder-icon,
@@ -513,7 +517,7 @@
     -moz-context-properties: fill, fill-opacity;
     pointer-events: none;
   }
-  &[open] image {
+  &:is([open], [starred]) image {
     list-style-image: url('permissions-fill.svg');
   }
 }
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index a95f7e60d..a65b9540f 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -610,10 +610,59 @@ var gZenUIManager = {
     this._toastTimeouts[messageId] = setTimeout(timeoutFunction, options.timeout || 2000);
   },
 
-  get panelUIPosition() {
-    return gZenVerticalTabsManager._hasSetSingleToolbar && !gZenVerticalTabsManager._prefsRightSide
-      ? 'bottomleft topleft'
-      : 'bottomright topright';
+  panelUIPosition(panel, anchor) {
+    void panel;
+    // The alignment position of the panel is determined during the "popuppositioned" event
+    // when the panel opens. The alignment positions help us determine in which orientation
+    // the panel is anchored to the screen space.
+    //
+    // *  "after_start": The panel is anchored at the top-left     corner in LTR locales, top-right    in RTL locales.
+    // *    "after_end": The panel is anchored at the top-right    corner in LTR locales, top-left     in RTL locales.
+    // * "before_start": The panel is anchored at the bottom-left  corner in LTR locales, bottom-right in RTL locales.
+    // *   "before_end": The panel is anchored at the bottom-right corner in LTR locales, bottom-left  in RTL locales.
+    //
+    //   ┌─Anchor(LTR)          ┌─Anchor(RTL)
+    //   │       Anchor(RTL)─┐  │       Anchor(LTR)─┐
+    //   │                   │  │                   │
+    //   x───────────────────x  x───────────────────x
+    //   │                   │  │                   │
+    //   │       Panel       │  │       Panel       │
+    //   │   "after_start"   │  │    "after_end"    │
+    //   │                   │  │                   │
+    //   └───────────────────┘  └───────────────────┘
+    //
+    //   ┌───────────────────┐  ┌───────────────────┐
+    //   │                   │  │                   │
+    //   │       Panel       │  │       Panel       │
+    //   │   "before_start"  │  │    "before_end"   │
+    //   │                   │  │                   │
+    //   x───────────────────x  x───────────────────x
+    //   │                   │  │                   │
+    //   │       Anchor(RTL)─┘  │       Anchor(LTR)─┘
+    //   └─Anchor(LTR)          └─Anchor(RTL)
+    //
+    // The default choice for the panel is "after_start", to match the content context menu's alignment. However, it is
+    // possible to end up with any of the four combinations. Before the panel is opened, the XUL popup manager needs to
+    // make a determination about the size of the panel and whether or not it will fit within the visible screen area with
+    // the intended alignment. The manager may change the panel's alignment before opening to ensure the panel is fully visible.
+    //
+    // For example, if the panel is opened such that the bottom edge would be rendered off screen, then the XUL popup manager
+    // will change the alignment from "after_start" to "before_start", anchoring the panel's bottom corner to the target screen
+    // location instead of its top corner. This transformation ensures that the whole of the panel is visible on the screen.
+    //
+    // When the panel is anchored by one of its bottom corners (the "before_..." options), then it causes unintentionally odd
+    // behavior where dragging the text-area resizer downward with the mouse actually grows the panel's top edge upward, since
+    // the bottom of the panel is anchored in place. We want to disable the resizer if the panel was positioned to be anchored
+    // from one of its bottom corners.
+    let block = 'before';
+    let inline = 'end';
+    if (anchor?.closest('#zen-sidebar-top-buttons')) {
+      block = 'after';
+    }
+    if (gZenVerticalTabsManager._hasSetSingleToolbar && !gZenVerticalTabsManager._prefsRightSide) {
+      inline = 'start';
+    }
+    return `${block}_${inline}`;
   },
 
   urlStringsDomainMatch(url1, url2) {
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 7d07cc6dc..a150a3aab 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -189,6 +189,12 @@
   }
 }
 
+@media -moz-pref('zen.urlbar.single-toolbar-show-copy-url', false) {
+  :root[zen-single-toolbar='true'] #zen-copy-url-button {
+    display: none !important;
+  }
+}
+
 .urlbar-page-action,
 #tracking-protection-icon-container {
   padding: 0 !important;
diff --git a/src/zen/compact-mode/sidebar.inc.css b/src/zen/compact-mode/sidebar.inc.css
index 62a906ce9..40fecdf51 100644
--- a/src/zen/compact-mode/sidebar.inc.css
+++ b/src/zen/compact-mode/sidebar.inc.css
@@ -42,6 +42,7 @@
  
     :root[zen-no-padding='true'] & {
       --zen-compact-float: 10px;
+      --zen-compact-top-toolbar-hidden-fix: var(--zen-compact-float);
       --zen-compact-mode-no-padding-radius-fix: 2px;
     }
 
@@ -68,7 +69,7 @@
         bottom: calc(var(--zen-compact-float) / 2);
         height: calc(100% - var(--zen-toolbar-height-with-bookmarks)); 
         @media -moz-pref('zen.view.compact.hide-toolbar') {
-          height: 100%;
+          height: calc(100% - var(--zen-compact-top-toolbar-hidden-fix, 0px));
         }
       }
       & #zen-sidebar-top-buttons {
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index ad3382a11..48b94bace 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -52,6 +52,7 @@ export class nsZenSiteDataPanel {
     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);
+    this.anchor.addEventListener('click', this);
     const kCommandIDs = [
       'zen-site-data-header-share',
       'zen-site-data-header-bookmark',
@@ -139,6 +140,12 @@ export class nsZenSiteDataPanel {
     }
   }
 
+  get #currentPageIsBookmarked() {
+    // A hacky way to check if the current page is bookmarked, but
+    // it works for our purposes.
+    return this.window.BookmarkingUI.star?.hasAttribute('starred');
+  }
+
   #setSiteHeader() {
     {
       const button = this.document.getElementById('zen-site-data-header-reader-mode');
@@ -156,7 +163,7 @@ export class nsZenSiteDataPanel {
     }
     {
       const button = this.document.getElementById('zen-site-data-header-bookmark');
-      const isPageBookmarked = this.window.BookmarkingUI.star?.hasAttribute('starred');
+      const isPageBookmarked = this.#currentPageIsBookmarked;
 
       if (isPageBookmarked) {
         button.classList.add('active');
@@ -548,6 +555,10 @@ export class nsZenSiteDataPanel {
         BrowserCommands.pageInfo(null, 'permTab');
         break;
       }
+      case 'zen-site-data-icon-button': {
+        this.window.gUnifiedExtensions.togglePanel(event);
+        break;
+      }
       default: {
         const item = event.target.closest('.permission-popup-permission-item');
         if (!item) {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index a54c1ebfe..8bce5d7e7 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2502,7 +2502,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     }
     // Only animate if it's from an event
     let animateContainer = target && target.target instanceof EventTarget;
-    if (target?.type === 'TabClose' || target?.type === 'TabOpened') {
+    if (target?.type === 'TabClose' || target?.type === 'TabOpen') {
       animateContainer = target.target.pinned;
     }
     await this.onPinnedTabsResize(
@@ -2514,14 +2514,29 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     );
   }
 
-  updateShouldHideSeparator(arrowScrollbox, pinnedContainer) {
+  updateShouldHideSeparator(arrowScrollbox, pinnedContainer, fromTabSelection = false) {
+    const visibleTabsFound = () => {
+      let count = 0;
+      for (const child of arrowScrollbox.children) {
+        if (
+          !child.hasAttribute('hidden') &&
+          !child.closing &&
+          !child.hasAttribute('zen-empty-tab')
+        ) {
+          count++;
+          if (count > 1) {
+            // Early return
+            return true;
+          }
+        }
+      }
+      return false;
+    };
+
     // <= 2 because we have the empty tab and the new tab button
-    const shouldHideSeparator =
-      pinnedContainer.children.length === 1 ||
-      Array.from(arrowScrollbox.children).filter(
-        (child) =>
-          !child.hasAttribute('hidden') && !child.closing && !child.hasAttribute('zen-empty-tab')
-      ).length <= 1;
+    const shouldHideSeparator = fromTabSelection
+      ? pinnedContainer.hasAttribute('hide-separator')
+      : pinnedContainer.children.length === 1 || !visibleTabsFound();
     if (shouldHideSeparator) {
       pinnedContainer.setAttribute('hide-separator', 'true');
     } else {
@@ -2656,7 +2671,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     }
     const workspaceID = tab.getAttribute('zen-workspace-id');
     const isEssential = tab.getAttribute('zen-essential') === 'true';
-
+    this.updateShouldHideSeparator(this.activeWorkspaceStrip, this.pinnedTabsContainer, true);
     if (tab.hasAttribute('zen-empty-tab')) {
       return;
     }
diff --git a/surfer.json b/surfer.json
index 282528c9d..e88c81e65 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.4b",
+        "displayVersion": "1.17.5b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 42752f814546926c7e2e3f6b34ff26b11843aef8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 3 Nov 2025 22:49:14 +0100
Subject: [PATCH 047/162] fix: Fixed pip button not appearing on the media
 manager, b=closes https://github.com/zen-browser/desktop/issues/11132,
 c=urlbar

---
 prefs/firefox/urlbar.yaml                       | 3 ++-
 prefs/zen/zen-urlbar.yaml                       | 3 +++
 src/zen/common/styles/zen-omnibox.css           | 6 ++++++
 src/zen/common/styles/zen-single-components.css | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/prefs/firefox/urlbar.yaml b/prefs/firefox/urlbar.yaml
index cdb951402..76eb974a6 100644
--- a/prefs/firefox/urlbar.yaml
+++ b/prefs/firefox/urlbar.yaml
@@ -23,7 +23,8 @@
   value: true
 
 - name: media.videocontrols.picture-in-picture.urlbar-button.enabled
-  value: false
+  value: true
+  locked: true
 
 # Enable private suggestions
 - name: browser.search.suggest.enabled
diff --git a/prefs/zen/zen-urlbar.yaml b/prefs/zen/zen-urlbar.yaml
index 97be59be9..ba97595fe 100644
--- a/prefs/zen/zen-urlbar.yaml
+++ b/prefs/zen/zen-urlbar.yaml
@@ -26,6 +26,9 @@
 - name: zen.urlbar.enable-overrides
   value: false
 
+- name: zen.urlbar.show-pip-button
+  value: true
+
 # Mark: Zen suggestions controls
 
 - name: zen.urlbar.suggestions.quick-actions
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 98b157154..782afbeac 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -189,6 +189,12 @@
   }
 }
 
+@media not -moz-pref('zen.urlbar.show-pip-button') {
+  #picture-in-picture-button {
+    display: none !important;
+  }
+}
+
 .urlbar-page-action,
 #tracking-protection-icon-container {
   padding: 0 !important;
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 4c5473872..077cb2b72 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -500,7 +500,7 @@ body > #confetti {
 #zen-site-data-header {
   gap: 8px;
   align-items: center;
-  padding: 8px;
+  padding: 10px 9px;
   padding-bottom: 0;
 
   :root[zen-single-toolbar='true']:not([zen-right-side='true']) & {

From 424de1bf913a68e547a8a3676bdbb041f7189ff8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 3 Nov 2025 22:49:46 +0100
Subject: [PATCH 048/162] fix: Fixed glance close animation replay, b=closes
 #11130, c=glance

---
 .../components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch    | 4 ++--
 src/zen/glance/ZenGlanceManager.mjs                         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
index 85d1fbde2..99f83d192 100644
--- a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-index 773f595e89e268578ba153907babec95b58a155a..abe86fc3d243a85c4a8dbee854a2d0130f7270fd 100644
+index 773f595e89e268578ba153907babec95b58a155a..7cb99cde00c19f50fd9aa48ab1efcfaeaef89771 100644
 --- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 +++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 @@ -937,6 +937,7 @@ export class AsyncTabSwitcher {
      return !(
        this.tabbrowser._printPreviewBrowsers.has(browser) ||
        lazy.PictureInPicture.isOriginatingBrowser(browser)
-+      || browser?.hasAttribute('zen-glance-background')
++      || browser?.parentNode?.parentNode?.parentNode?.classList?.contains("zen-glance-background")
      );
    }
  
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 3720448fa..5a9fcbaca 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -844,6 +844,10 @@
      * @returns {Promise} Promise that resolves when closing is complete
      */
     #animateGlanceClosing(onTabClose, browserSidebarContainer, sidebarButtons, setNewID) {
+      if (this.closingGlance) {
+        return;
+      }
+
       this.closingGlance = true;
       this._animating = true;
 
@@ -1008,6 +1012,7 @@
       this.browserWrapper.removeAttribute('animate');
 
       if (!this.#currentParentTab) {
+        this.closingGlance = false;
         return;
       }
 
@@ -1063,7 +1068,6 @@
       this.contentWrapper = null;
 
       lastCurrentTab.removeAttribute('zen-glance-tab');
-      lastCurrentTab._closingGlance = true;
 
       this.#ignoreClose = true;
       lastCurrentTab.dispatchEvent(new Event('GlanceClose', { bubbles: true }));

From 40af25998ff8b2d3ee9d139117b94bc808289060 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 4 Nov 2025 21:35:02 +0100
Subject: [PATCH 049/162] chore: Handle use implicit event function calls for
 glance, b=no-bug, c=common, glance

---
 src/zen/common/ZenActorsManager.sys.mjs      |  3 ++
 src/zen/glance/actors/ZenGlanceChild.sys.mjs | 30 +++++++-------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/zen/common/ZenActorsManager.sys.mjs b/src/zen/common/ZenActorsManager.sys.mjs
index 817cfef79..bfaf184af 100644
--- a/src/zen/common/ZenActorsManager.sys.mjs
+++ b/src/zen/common/ZenActorsManager.sys.mjs
@@ -42,6 +42,9 @@ let JSWINDOWACTORS = {
       esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
       events: {
         DOMContentLoaded: {},
+        click: {
+          capture: true,
+        },
         keydown: {
           capture: true,
         },
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index 51cd6cb17..8ebf72eaa 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -6,18 +6,12 @@ export class ZenGlanceChild extends JSWindowActorChild {
 
   constructor() {
     super();
-    this.clickListener = this.handleClick.bind(this);
   }
 
   async handleEvent(event) {
-    switch (event.type) {
-      case 'DOMContentLoaded':
-        await this.initiateGlance();
-        break;
-      case 'keydown':
-        this.onKeyDown(event);
-        break;
-      default:
+    const handler = this[`on_${event.type}`];
+    if (typeof handler === 'function') {
+      await handler.call(this, event);
     }
   }
 
@@ -25,13 +19,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     this.#activationMethod = await this.sendQuery('ZenGlance:GetActivationMethod');
   }
 
-  async initiateGlance() {
-    this.mouseIsDown = false;
-    await this.#initActivationMethod();
-    this.contentWindow.document.addEventListener('click', this.clickListener, { capture: true });
-  }
-
-  ensureOnlyKeyModifiers(event) {
+  #ensureOnlyKeyModifiers(event) {
     return !(event.ctrlKey ^ event.altKey ^ event.shiftKey ^ event.metaKey);
   }
 
@@ -66,7 +54,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     });
   }
 
-  handleClick(event) {
+  on_click(event) {
     if (event.button !== 0 || event.defaultPrevented) {
       return;
     }
@@ -79,7 +67,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     // The problem is that at that stage we don't know the rect or even what
     // element has been clicked, so we send the data here.
     this.#sendClickDataToParent(target, elementToRecord);
-    if (this.ensureOnlyKeyModifiers(event)) {
+    if (this.#ensureOnlyKeyModifiers(event)) {
       return;
     }
     const activationMethod = this.#activationMethod;
@@ -100,7 +88,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     }
   }
 
-  onKeyDown(event) {
+  on_keydown(event) {
     if (event.defaultPrevented || event.key !== 'Escape') {
       return;
     }
@@ -108,4 +96,8 @@ export class ZenGlanceChild extends JSWindowActorChild {
       hasFocused: this.contentWindow.document.activeElement !== this.contentWindow.document.body,
     });
   }
+
+  async on_DOMContentLoaded() {
+    await this.#initActivationMethod();
+  }
 }

From 87e249f2a49f37233d911b2e9b5bfcf086852bf3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 4 Nov 2025 23:38:35 +0100
Subject: [PATCH 050/162] feat: Disable omnibox PiP button by default,
 b=no-bug, c=no-component

---
 prefs/zen/zen-urlbar.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prefs/zen/zen-urlbar.yaml b/prefs/zen/zen-urlbar.yaml
index bcc6ba7c7..748c77d27 100644
--- a/prefs/zen/zen-urlbar.yaml
+++ b/prefs/zen/zen-urlbar.yaml
@@ -30,7 +30,7 @@
   value: true
 
 - name: zen.urlbar.show-pip-button
-  value: true
+  value: false
 
 # Mark: Zen suggestions controls
 

From 37eb6f85ebc81d079c7569a57ecec03398e2905f Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 5 Nov 2025 00:08:18 +0100
Subject: [PATCH 051/162] chore: Fixed using the wrong location for wine,
 b=no-bug, c=configs

---
 configs/windows/mozconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 408d8884e..66a65ff7e 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -6,7 +6,7 @@ if test "$ZEN_CROSS_COMPILING"; then
 
   export WINSYSROOT="$(echo ~)/win-cross/vs2022"
 
-  export WINE="$(echo ~)/win-cross/wine/bin/wine64"
+  export WINE="$(echo ~)/win-cross/wine/bin/wine"
   export WINEDEBUG=-all
 
   export MOZ_STUB_INSTALLER=1

From 3a9e20573035d161f18ce9a2c25fe57a26e08e9a Mon Sep 17 00:00:00 2001
From: Ivaon <155267770+Ivaon@users.noreply.github.com>
Date: Wed, 5 Nov 2025 12:59:52 +0100
Subject: [PATCH 052/162] fix: New container tab popup menu displayed
 incorrectly (#11160)

---
 src/zen/common/styles/zen-single-components.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 077cb2b72..4ab836e02 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -609,3 +609,13 @@ body > #confetti {
 #widget-overflow-list {
   flex-direction: column-reverse;
 }
+
+/* Contextual new tab popup menu */
+#tabs-newtab-button > .new-tab-popup > menuitem {
+  & > :is(.menu-highlightable-text, .menu-accel) {
+    display: none !important;
+  }
+  & > label {
+    opacity: 1 !important;
+  }
+}

From 5ca4553e70ae77b3c125b5fab22963ba29412992 Mon Sep 17 00:00:00 2001
From: Ivaon <155267770+Ivaon@users.noreply.github.com>
Date: Wed, 5 Nov 2025 23:36:48 +0100
Subject: [PATCH 053/162] fix: targeting new container tab context menu with a
 higher specificity and removing opacity rule, p=#11166

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

diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 4ab836e02..8c7fa89cd 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -611,11 +611,8 @@ body > #confetti {
 }
 
 /* Contextual new tab popup menu */
-#tabs-newtab-button > .new-tab-popup > menuitem {
+#navigator-toolbox #titlebar #TabsToolbar #tabs-newtab-button > .new-tab-popup > menuitem {
   & > :is(.menu-highlightable-text, .menu-accel) {
-    display: none !important;
-  }
-  & > label {
-    opacity: 1 !important;
+    display: none;
   }
 }

From 11e339742150dcc87570841ebfeafbad6a530c20 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 6 Nov 2025 23:02:07 +0100
Subject: [PATCH 054/162] fix: Fixed addons menu being off-screen, b=closes
 #11177, c=common

---
 src/browser/base/content/zen-panels/site-data.inc |  5 +++--
 src/zen/common/ZenUIManager.mjs                   | 11 ++++++-----
 surfer.json                                       |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index b3b99dc06..e413d2c1e 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -5,10 +5,11 @@
 <panel id="zen-unified-site-data-panel"
         role="group"
         type="arrow"
-        noautofocus="true">
+        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
+# 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"
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index a65b9540f..1333a34ba 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -654,15 +654,16 @@ var gZenUIManager = {
     // behavior where dragging the text-area resizer downward with the mouse actually grows the panel's top edge upward, since
     // the bottom of the panel is anchored in place. We want to disable the resizer if the panel was positioned to be anchored
     // from one of its bottom corners.
-    let block = 'before';
-    let inline = 'end';
+    let block = 'bottomleft';
+    let inline = 'topleft';
     if (anchor?.closest('#zen-sidebar-top-buttons')) {
-      block = 'after';
+      block = 'topleft';
     }
     if (gZenVerticalTabsManager._hasSetSingleToolbar && !gZenVerticalTabsManager._prefsRightSide) {
-      inline = 'start';
+      block = 'bottomright';
+      inline = 'topright';
     }
-    return `${block}_${inline}`;
+    return `${block} ${inline}`;
   },
 
   urlStringsDomainMatch(url1, url2) {
diff --git a/surfer.json b/surfer.json
index e88c81e65..9687e3680 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.5b",
+        "displayVersion": "1.17.6b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 1cf50e863df92c05e64b8379cc9ed78e3101505c Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 6 Nov 2025 23:07:06 +0100
Subject: [PATCH 055/162] chore: Increase the speed for glance background
 animation, b=no-bug, c=glance

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

diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 70c7da14e..a35d4e021 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -926,7 +926,7 @@
             opacity: [0.4, 1],
           },
           {
-            duration: this.#GLANCE_ANIMATION_DURATION,
+            duration: this.#GLANCE_ANIMATION_DURATION / 2,
             type: 'spring',
             bounce: 0,
           }

From a0f282a7598c2d5649646263675ee045461283bd Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 7 Nov 2025 10:35:15 +0100
Subject: [PATCH 056/162] feat: Increase the duration for glance close
 animation, p=#11184, c=glance

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

diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index a35d4e021..52e452175 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -926,7 +926,7 @@
             opacity: [0.4, 1],
           },
           {
-            duration: this.#GLANCE_ANIMATION_DURATION / 2,
+            duration: this.#GLANCE_ANIMATION_DURATION / 1.5,
             type: 'spring',
             bounce: 0,
           }

From 96c6ec658cff4ec8b69192375ce8fbfc68737a29 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sat, 8 Nov 2025 11:40:06 +0100
Subject: [PATCH 057/162] chore: Update to Firefox `145.0`, p=#11167

---
 README.md                                     |   2 +-
 build/firefox-cache/l10n-last-commit-hash     |   2 +-
 src/.hgignore                                 |   3 +
 src/Cargo-lock.patch                          |   4 +-
 src/Cargo-toml.patch                          |   4 +-
 src/browser/actors/WebRTCParent-sys-mjs.patch |   2 +-
 .../base/content/browser-addons-js.patch      |  33 +-
 .../base/content/browser-commands-js.patch    |   8 +-
 .../browser-fullScreenAndPointerLock-js.patch |   4 +-
 src/browser/base/content/browser-js.patch     |  12 +-
 .../base/content/browser-places-js.patch      |   8 +-
 .../content/browser-siteIdentity-js.patch     |   8 +-
 src/browser/base/content/browser-xhtml.patch  |   2 +-
 .../content/main-popupset-inc-xhtml.patch     |   4 +-
 .../base/content/navigator-toolbox-js.patch   |  12 +-
 .../base/content/nsContextMenu-sys-mjs.patch  |   4 +-
 .../base/content/zen-panels/site-data.inc     |  11 +
 .../components/BrowserGlue-sys-mjs.patch      |   6 +-
 .../modules/FeatureCallout-sys-mjs.patch      |   4 +-
 .../ToolbarContextMenu-sys-mjs.patch          |  16 +-
 .../content/panelUI-inc-xhtml.patch           |   4 +-
 .../customizableui/content/panelUI-js.patch   |  16 +-
 .../extensions/parent/ext-browser-js.patch    |   4 +-
 .../content/browserPlacesViews-js.patch       |  16 +-
 .../components/preferences/jar-mn.patch       |  11 +-
 .../preferences/main-inc-xhtml.patch          |  18 +-
 .../components/preferences/main-js.patch      |  16 +-
 .../preferences/preferences-js.patch          |   8 +-
 .../preferences/preferences-xhtml.patch       |  10 +-
 .../preferences/sync-inc-xhtml.patch          |   2 +-
 .../components/preferences/zen-settings.js    |   5 +
 .../search/SearchUIUtils-sys-mjs.patch        |   4 +-
 .../sessionstore/SessionStore-sys-mjs.patch   |  36 +-
 .../sidebar/browser-sidebar-js.patch          |   4 +-
 .../tabbrowser/AsyncTabSwitcher-sys-mjs.patch |   6 +-
 .../tabbrowser/TabsList-sys-mjs.patch         |   2 +-
 .../content/browser-ctrlTab-js.patch          |  10 +-
 .../tabbrowser/content/drag-and-drop-js.patch | 439 +++++++++++++++
 .../tabbrowser/content/tab-js.patch           |  20 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 138 ++---
 .../tabbrowser/content/tabgroup-js.patch      |  20 +-
 .../tabbrowser/content/tabs-js.patch          | 505 +-----------------
 .../urlbar/UrlbarController-sys-mjs.patch     |   6 +-
 .../urlbar/UrlbarInput-sys-mjs.patch          |  54 +-
 .../urlbar/UrlbarMuxerStandard-sys-mjs.patch  |   6 +-
 .../urlbar/UrlbarPrefs-sys-mjs.patch          |   2 +-
 .../urlbar/UrlbarProviderPlaces-sys-mjs.patch |   4 +-
 .../UrlbarProvidersManager-sys-mjs.patch      |   4 +-
 .../urlbar/UrlbarUtils-sys-mjs.patch          |   8 +-
 .../urlbar/UrlbarValueFormatter-sys-mjs.patch |   2 +-
 .../urlbar/UrlbarView-sys-mjs.patch           |   6 +-
 .../newtab/lib/ActivityStream-sys-mjs.patch   |   4 +-
 .../installer/package-manifest-in.patch       |   4 +-
 .../windows/nsis/defines-nsi-in.patch         |   4 +-
 .../windows/nsis/installer-nsi.patch          |   6 +-
 .../windows/nsis/uninstaller-nsi.patch        |   4 +-
 .../modules/BrowserDOMWindow-sys-mjs.patch    |  12 +-
 .../modules/ExtensionsUI-sys-mjs.patch        |   4 +-
 .../modules/URILoadingHelper-sys-mjs.patch    |   2 +-
 src/browser/themes/osx/browser-css.patch      |   2 +-
 .../themes/shared/browser-shared-css.patch    |  12 +-
 .../identity-block/identity-block-css.patch   |   4 +-
 src/browser/themes/shared/jar-inc-mn.patch    |   4 +-
 .../shared/tabbrowser/content-area-css.patch  |   6 +-
 .../shared/tabbrowser/ctrlTab-css.patch       |   2 +-
 .../themes/shared/tabbrowser/tabs-css.patch   |  32 +-
 .../themes/shared/urlbar-searchbar-css.patch  |   4 +-
 .../themes/shared/urlbarView-css.patch        |   6 +-
 .../actors/animation-type-longhand-js.patch   |   4 +-
 .../startup/DevToolsStartup-sys-mjs.patch     |   2 +-
 src/docshell/base/nsAboutRedirector-cpp.patch |   4 +-
 src/dom/base/Document-cpp.patch               |   6 +-
 src/dom/base/use_counter_metrics-yaml.patch   |   6 +-
 .../mediaelement/HTMLMediaElement-cpp.patch   |   4 +-
 .../ff-145-tahoe-upgrade.patch                | 336 ------------
 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/netwerk/protocol/http/moz-build.patch     |   4 +-
 .../style/gecko/media_features-rs.patch       |   2 +-
 src/testing/mochitest/browser-test-js.patch   |  57 +-
 .../PictureInPictureChild-sys-mjs.patch       |   4 +-
 src/toolkit/content/widgets/findbar-js.patch  |   2 +-
 src/toolkit/content/widgets/tabbox-js.patch   |  10 +-
 src/toolkit/content/xul-css.patch             |   8 +-
 .../modules/ShortcutUtils-sys-mjs.patch       |  12 +-
 src/toolkit/modules/moz-build.patch           |   2 +-
 src/toolkit/moz-configure.patch               |   2 +-
 .../extensions/AddonManager-sys-mjs.patch     |   4 +-
 .../themes/shared/aboutReader-css.patch       |   2 +-
 .../shared/in-content/common-shared-css.patch |   2 +-
 src/toolkit/themes/shared/menulist-css.patch  |   4 +-
 .../shared/pictureinpicture/player-css.patch  |   2 +-
 src/toolkit/themes/shared/popup-css.patch     |   2 +-
 src/toolkit/themes/shared/tree/tree-css.patch |   2 +-
 .../signing/macos/mach_commands-py.patch      |   4 +-
 src/widget/cocoa/nsCocoaWindow-mm.patch       |  13 -
 src/zen/@types/lib.gecko.dom.d.ts             |  59 +-
 src/zen/@types/lib.gecko.glean.d.ts           | 232 +++++---
 src/zen/@types/lib.gecko.linux.d.ts           |   2 -
 src/zen/@types/lib.gecko.modules.d.ts         | 402 ++++++++++++--
 src/zen/@types/lib.gecko.services.d.ts        |   1 -
 src/zen/@types/lib.gecko.xpcom.d.ts           | 305 +++++------
 .../common/styles/zen-browser-container.css   |  48 +-
 src/zen/common/styles/zen-omnibox.css         |   8 +-
 .../common/styles/zen-single-components.css   |   5 +
 src/zen/split-view/ZenViewSplitter.mjs        |   2 +-
 src/zen/tabs/ZenPinnedTabManager.mjs          |   4 +
 src/zen/urlbar/ZenUBActionsProvider.sys.mjs   |  23 +-
 src/zen/urlbar/ZenUBProvider.sys.mjs          |   2 +-
 surfer.json                                   |   4 +-
 112 files changed, 1635 insertions(+), 1627 deletions(-)
 create mode 100644 src/.hgignore
 create mode 100644 src/browser/components/tabbrowser/content/drag-and-drop-js.patch
 delete mode 100644 src/firefox-patches/ff-145-tahoe-upgrade.patch
 delete mode 100644 src/widget/cocoa/nsCocoaWindow-mm.patch

diff --git a/README.md b/README.md
index aa71c3917..670da32b8 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 `144.0.2`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 144.0.2`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 26d328f6d..f451058a7 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-860c37a26622f61c74c7cbb93f7e0ae759fcbfe1
\ No newline at end of file
+7bc0bd3b3f84dddd16bc84ddb01bc55782177f5e
\ No newline at end of file
diff --git a/src/.hgignore b/src/.hgignore
new file mode 100644
index 000000000..6fbe8159b
--- /dev/null
+++ b/src/.hgignore
@@ -0,0 +1,3 @@
+# 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/.
diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch
index 0f9223905..9d6b283dd 100644
--- a/src/Cargo-lock.patch
+++ b/src/Cargo-lock.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index c079ef11880c5338c4498a0e5b3eb4cf4bfb6e02..ecd06b05381be740197c07c8cf0743dc882727f5 100644
+index 4386724a82baa72678b7228ef3af9fabc2da318e..01f7ac42ff96f8f96984537f19bde4bbc8cd8d72 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -4069,8 +4069,6 @@ dependencies = [
+@@ -4167,8 +4167,6 @@ dependencies = [
  [[package]]
  name = "mime_guess"
  version = "2.0.4"
diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch
index 563622667..81b7afcbe 100644
--- a/src/Cargo-toml.patch
+++ b/src/Cargo-toml.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 2331ff5733d39e26c0a16301cb83d46ca970f632..777dbd5fb8546466e4a349772ccba254c7ffd691 100644
+index 772a74e7439d87e9c5486abcf003617240190710..522b5459b30b943832369ff7a73755ad4c7d8140 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -224,6 +224,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
+@@ -227,6 +227,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 cee359785..7a99c8301 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 80fd2177c7112c958ff51bbf7a18ebea39e50fbf..24f62810901dc558e25ee874bd49736bd64fd358 100644
+index 4ff6ae4d6f272936f0aa1c80a488df16159b42f2..85e4d7bf500603fcd5724658e96c7fd0a04432d3 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-addons-js.patch b/src/browser/base/content/browser-addons-js.patch
index edd6cb122..acb98ccc7 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 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc31266b08 100644
+index f33a300eb0eed74e286da24919ad3e8505f632c3..9f400e887424693d0ecceb9db79fccf2bd5a757d 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
-@@ -1071,7 +1071,7 @@ var gXPInstallObserver = {
+@@ -1069,7 +1069,7 @@ var gXPInstallObserver = {
        persistent: true,
        hideClose: true,
        popupOptions: {
@@ -11,7 +11,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc
        },
      };
  
-@@ -1280,7 +1280,7 @@ var gXPInstallObserver = {
+@@ -1279,7 +1279,7 @@ var gXPInstallObserver = {
        hideClose: true,
        timeout: Date.now() + 30000,
        popupOptions: {
@@ -20,7 +20,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc
        },
      };
  
-@@ -2212,7 +2212,7 @@ var gUnifiedExtensions = {
+@@ -2211,7 +2211,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 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc
      const attr = anchorID + "popupnotificationanchor";
  
      if (!aBrowser[attr]) {
-@@ -2223,7 +2223,7 @@ var gUnifiedExtensions = {
+@@ -2222,7 +2222,7 @@ var gUnifiedExtensions = {
          anchorID
          // Anchor on the toolbar icon to position the popup right below the
          // button.
@@ -38,7 +38,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc
      }
  
      return anchorID;
-@@ -2516,11 +2516,7 @@ var gUnifiedExtensions = {
+@@ -2646,11 +2646,7 @@ var gUnifiedExtensions = {
      // Lazy load the unified-extensions-panel panel the first time we need to
      // display it.
      if (!this._panel) {
@@ -51,16 +51,15 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc
        let customizationArea = this._panel.querySelector(
          "#unified-extensions-area"
        );
-@@ -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 = {
+@@ -2703,6 +2699,7 @@ var gUnifiedExtensions = {
+         // and no alternative content is available for display in the panel.
+         const policies = this.getActivePolicies();
+         if (
++          false &&
+           policies.length &&
+           !this.hasExtensionsInPanel(policies) &&
+           !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
+@@ -2743,7 +2740,7 @@ var gUnifiedExtensions = {
          this.recordButtonTelemetry(reason || "extensions_panel_showing");
          this.ensureButtonShownBeforeAttachingPanel(panel);
          PanelMultiView.openPopup(panel, this._button, {
@@ -69,7 +68,7 @@ index 754ce380ed233eb8764af07af3c8dc95d3f39d5c..ed3062bab0b80db3b456cdad03e7efcc
            triggerEvent: aEvent,
          });
        }
-@@ -2802,18 +2798,20 @@ var gUnifiedExtensions = {
+@@ -2930,18 +2927,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  
diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch
index b6d37eec0..a475e0749 100644
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index 74aae01ddcdc4b6460ebbe174355ca129a89010b..52dd4e6aa49929394ed6afa6b25f4ee4954b8b94 100644
+index 939ca497b882b3f4200141ba1b6764fb5c846f45..36c830a503b004c0a332340f686c86cad68e9381 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
-@@ -317,6 +317,10 @@ var BrowserCommands = {
+@@ -315,6 +315,10 @@ var BrowserCommands = {
        }
      }
  
@@ -13,7 +13,7 @@ index 74aae01ddcdc4b6460ebbe174355ca129a89010b..52dd4e6aa49929394ed6afa6b25f4ee4
      // A notification intended to be useful for modular peformance tracking
      // starting as close as is reasonably possible to the time when the user
      // expressed the intent to open a new tab.  Since there are a lot of
-@@ -401,6 +405,11 @@ var BrowserCommands = {
+@@ -399,6 +403,11 @@ var BrowserCommands = {
        return;
      }
  
@@ -25,7 +25,7 @@ index 74aae01ddcdc4b6460ebbe174355ca129a89010b..52dd4e6aa49929394ed6afa6b25f4ee4
      // Keyboard shortcuts that would close a tab that is pinned select the first
      // unpinned tab instead.
      if (
-@@ -408,8 +417,8 @@ var BrowserCommands = {
+@@ -406,8 +415,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {
diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
index db1354d84..ce5b0041f 100644
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index b41449d4c4bc373a4c9cf449c0bb370bfdbc20d6..f1166929397dd39b7f44bd9cb0d62a45d67f0e1d 100644
+index bef746dc594ad974c91075cf3657c199f8f8830f..bb671341b6715c42df76f7298ba55e1fac73f33b 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -427,10 +427,10 @@ var FullScreen = {
+@@ -424,10 +424,10 @@ var FullScreen = {
      gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
  
      let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index 374b89d06..8d2658275 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 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64225e42b0 100644
+index b4b79e7fb3228ba91bd8afa08659be0d88883725..9e1d59b6a736107e55bda73686a4a627e4c0ba7c 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 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -2293,6 +2294,8 @@ var XULBrowserWindow = {
+@@ -2298,6 +2299,8 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
@@ -19,7 +19,7 @@ index 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -3795,7 +3798,7 @@ function warnAboutClosingWindow() {
+@@ -3809,7 +3812,7 @@ function warnAboutClosingWindow() {
  
    if (!isPBWindow && !toolbar.visible) {
      return gBrowser.warnAboutClosingTabs(
@@ -28,7 +28,7 @@ index 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64
        gBrowser.closingTabsEnum.ALL
      );
    }
-@@ -3835,7 +3838,7 @@ function warnAboutClosingWindow() {
+@@ -3849,7 +3852,7 @@ function warnAboutClosingWindow() {
      return (
        isPBWindow ||
        gBrowser.warnAboutClosingTabs(
@@ -37,7 +37,7 @@ index 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64
          gBrowser.closingTabsEnum.ALL
        )
      );
-@@ -3860,7 +3863,7 @@ function warnAboutClosingWindow() {
+@@ -3874,7 +3877,7 @@ function warnAboutClosingWindow() {
      AppConstants.platform != "macosx" ||
      isPBWindow ||
      gBrowser.warnAboutClosingTabs(
@@ -46,7 +46,7 @@ index 32b67f846b9942ad3da4276bb8748fee915eb485..529ef8895d2ab01b4cbebd2992fd3b64
        gBrowser.closingTabsEnum.ALL
      )
    );
-@@ -4782,6 +4785,9 @@ var ConfirmationHint = {
+@@ -4796,6 +4799,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 5425bd91e..8fb826e25 100644
--- a/src/browser/base/content/browser-places-js.patch
+++ b/src/browser/base/content/browser-places-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
-index 79b4f6f8fb2f7dd8784920038784e6bb0c967e2d..4db983dad9bea10c17b5ac166ba58b93fa2a4d56 100644
+index 3bd7b8f6025a7df4ce5cfb66916125bce9ef3991..c408ef829b7540aec72b2307e5d4bfa34109d6cd 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
-@@ -252,6 +252,8 @@ var StarUI = {
+@@ -249,6 +249,8 @@ var StarUI = {
        });
      }
  
@@ -11,7 +11,7 @@ index 79b4f6f8fb2f7dd8784920038784e6bb0c967e2d..4db983dad9bea10c17b5ac166ba58b93
      let onPanelReady = fn => {
        let target = this.panel;
        if (target.parentNode) {
-@@ -303,6 +305,21 @@ var StarUI = {
+@@ -300,6 +302,21 @@ var StarUI = {
      }
    },
  
@@ -33,7 +33,7 @@ index 79b4f6f8fb2f7dd8784920038784e6bb0c967e2d..4db983dad9bea10c17b5ac166ba58b93
    removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() {
      this._removeBookmarksOnPopupHidden = true;
      this.panel.hidePopup();
-@@ -1800,6 +1817,7 @@ var BookmarkingUI = {
+@@ -1797,6 +1814,7 @@ var BookmarkingUI = {
        document.getElementById("context-bookmarkpage"),
        PanelMultiView.getViewNode(document, "panelMenuBookmarkThisPage"),
        document.getElementById("pageAction-panel-bookmark"),
diff --git a/src/browser/base/content/browser-siteIdentity-js.patch b/src/browser/base/content/browser-siteIdentity-js.patch
index ac751474b..694f10ecd 100644
--- a/src/browser/base/content/browser-siteIdentity-js.patch
+++ b/src/browser/base/content/browser-siteIdentity-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
-index 65354e0ad3097e10de72f36e257c94472524baf7..866cf5672f30f81a1d8e061c9af0c1af5fbb5fb2 100644
+index 8369e546866aa313e62f808acb8d51afa8da4f9b..7a4b20dd5922425cebfac542893a52cd68a26449 100644
 --- a/browser/base/content/browser-siteIdentity.js
 +++ b/browser/base/content/browser-siteIdentity.js
-@@ -453,11 +453,6 @@ var gIdentityHandler = {
+@@ -451,11 +451,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.
@@ -14,7 +14,7 @@ index 65354e0ad3097e10de72f36e257c94472524baf7..866cf5672f30f81a1d8e061c9af0c1af
  
      let baseDomain = SiteDataManager.getBaseDomainFromHost(this._uri.host);
      if (SiteDataManager.promptSiteDataRemoval(window, [baseDomain])) {
-@@ -834,7 +829,7 @@ var gIdentityHandler = {
+@@ -832,7 +827,7 @@ var gIdentityHandler = {
        // This is a secure internal Firefox page.
        this._identityBox.className = "chromeUI";
        let brandBundle = document.getElementById("bundle_brand");
@@ -23,7 +23,7 @@ index 65354e0ad3097e10de72f36e257c94472524baf7..866cf5672f30f81a1d8e061c9af0c1af
      } else if (this._pageExtensionPolicy) {
        // This is a WebExtension page.
        this._identityBox.className = "extensionPage";
-@@ -1163,6 +1158,12 @@ var gIdentityHandler = {
+@@ -1161,6 +1156,12 @@ var gIdentityHandler = {
        }
      }
  
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index 413da9a2a..8b473bbd3 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index ffddea280e2edffa2531b4b129489c2be0e2c3d2..f03db9e2db0dec06f997740337f28e76a08a3bdb 100644
+index 246d23a77960d25f78b163429a3ed28c7180ccd7..1c26485d8464413689767c8a38aadbcadcecae4d 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -19,6 +19,7 @@
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index 45cdf904f..9adb099f4 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 69b83857f40bab6a7298c1416989df2d929d78c1..4ac9f02eb31f58a72d4c58c239ebeadcb66d1e16 100644
+index 78030413c4125362e056a8ec249b597292be050b..90fc935e105d594cd4cc925c70c29b18b8dffccd 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 69b83857f40bab6a7298c1416989df2d929d78c1..4ac9f02eb31f58a72d4c58c239ebeadc
      </panel>
    </html:template>
  
-@@ -615,6 +620,8 @@
+@@ -628,6 +633,8 @@
  
  #include popup-notifications.inc.xhtml
  
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index 829800da2..9dc57d082 100644
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 413bad2a62058a1c434d6a44e927e44eb397289d..d28116ffacb0ddb6fdb421db5d6498e455356b4a 100644
+index 7b776b15d52367a008ce6bf53dcfcbbe007b7453..d9a3404905b73db7c8f202ab166d5f3c625351f6 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
-@@ -8,7 +8,7 @@
+@@ -6,7 +6,7 @@
  document.addEventListener(
    "DOMContentLoaded",
    () => {
@@ -11,7 +11,7 @@ index 413bad2a62058a1c434d6a44e927e44eb397289d..d28116ffacb0ddb6fdb421db5d6498e4
      const widgetOverflow = document.getElementById("widget-overflow");
  
      function onPopupShowing(event) {
-@@ -187,6 +187,7 @@ document.addEventListener(
+@@ -185,6 +185,7 @@ document.addEventListener(
          #reload-button ,
          #urlbar-go-button,
          #reader-mode-button,
@@ -19,7 +19,7 @@ index 413bad2a62058a1c434d6a44e927e44eb397289d..d28116ffacb0ddb6fdb421db5d6498e4
          #picture-in-picture-button,
          #urlbar-zoom-button,
          #star-button-box,
-@@ -208,6 +209,7 @@ document.addEventListener(
+@@ -206,6 +207,7 @@ document.addEventListener(
          case "vertical-tabs-newtab-button":
          case "tabs-newtab-button":
          case "new-tab-button":
@@ -27,7 +27,7 @@ index 413bad2a62058a1c434d6a44e927e44eb397289d..d28116ffacb0ddb6fdb421db5d6498e4
            gBrowser.handleNewTabMiddleClick(element, event);
            break;
  
-@@ -317,7 +319,7 @@ document.addEventListener(
+@@ -315,7 +317,7 @@ document.addEventListener(
          #pageActionButton,
          #downloads-button,
          #fxa-toolbar-menu-button,
@@ -36,7 +36,7 @@ index 413bad2a62058a1c434d6a44e927e44eb397289d..d28116ffacb0ddb6fdb421db5d6498e4
          #library-button
        `);
        if (!element) {
-@@ -396,7 +398,7 @@ document.addEventListener(
+@@ -394,7 +396,7 @@ document.addEventListener(
            gSync.toggleAccountPanel(element, event);
            break;
  
diff --git a/src/browser/base/content/nsContextMenu-sys-mjs.patch b/src/browser/base/content/nsContextMenu-sys-mjs.patch
index d5ddb503a..d705ed870 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 b4fe996f9685a085c14324a35a1d51e2fed569b7..c83d5e9bf92f8f2e3d96b121ba3b758dd124393b 100644
+index 259b440375c7e84d373a134fea20cdbc1c1bae4b..a9ce22a2391b4ec0bf82ceedd35f4c9d9626bb28 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1105,6 +1105,8 @@ export class nsContextMenu {
+@@ -1104,6 +1104,8 @@ export class nsContextMenu {
          !this.isSecureAboutPage()
      );
  
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index e413d2c1e..0f7695264 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -55,6 +55,17 @@
             <toolbarbutton id="zen-site-data-new-addon-button"
                   class="subviewbutton toolbarbutton-1" />
           </vbox>
+
+# We don't really use this, but again, to keep firefox happy
+# in case they decide to change something for this specific
+# empty state, we keep it on the DOM
+# https://searchfox.org/firefox-main/rev/e613f4df351a21871cfeadf7d5b4043ffad157b1/browser/components/customizableui/content/panelUI.inc.xhtml#101-106
+          <vbox id="unified-extensions-empty-state" context="">
+            <!-- Shown when no extensions are listed. -->
+            <html:img src="chrome://browser/skin/addons/extensions-panel-empty-illustration.svg" loading="lazy" />
+            <html:h2 class="subview-subheader" />
+            <description />
+          </vbox>
         </hbox>
 
 # Keep this button on the DOM even though we hide it for ever,
diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch
index 7d280fdcd..1b6d97eba 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 67b2806835baba3070f295d6b96f97077639995a..5f28e0073c893c57c1d6c37deaacf7b097351d60 100644
+index f1cabb13ca4f86a2bafc1d93b7f882218a108eb2..2389b1addf24d17bd41fca65cfeb6f944479076d 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 67b2806835baba3070f295d6b96f97077639995a..5f28e0073c893c57c1d6c37deaacf7b0
    AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
    AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
    ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
-@@ -1458,7 +1459,7 @@ BrowserGlue.prototype = {
+@@ -1452,7 +1453,7 @@ BrowserGlue.prototype = {
        windowcount++;
        let tabbrowser = win.gBrowser;
        if (tabbrowser) {
@@ -19,7 +19,7 @@ index 67b2806835baba3070f295d6b96f97077639995a..5f28e0073c893c57c1d6c37deaacf7b0
        }
      }
  
-@@ -1623,6 +1624,8 @@ BrowserGlue.prototype = {
+@@ -1617,6 +1618,8 @@ BrowserGlue.prototype = {
      } else if (profileDataVersion < APP_DATA_VERSION) {
        lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION);
      }
diff --git a/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
index d2dabc56e..7bf648687 100644
--- a/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
+++ b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/asrouter/modules/FeatureCallout.sys.mjs b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
-index 2a2c5a6fe903694abbac0be86c7b3c8adc1d0275..5571b827198474a2635a9bd968adbc8c96dbc353 100644
+index 4ea9c9e88a1831dad7e42ebd8d0dd507102e8280..316aa626e525f05caac7f315e0ea7ae9d822b6af 100644
 --- a/browser/components/asrouter/modules/FeatureCallout.sys.mjs
 +++ b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
-@@ -776,6 +776,7 @@ export class FeatureCallout {
+@@ -777,6 +777,7 @@ export class FeatureCallout {
      ) {
        return false;
      }
diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
index 7cee05643..628fc23d9 100644
--- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
+++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
@@ -1,15 +1,13 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index 852cf2eee9113753fa0797be6dec80dcb9207703..93bb093e679320033a37b2af14e8e0e3c7621f94 100644
+index 95621ae202378fb1ebceca5623a98b790b9eb5ff..fe6901f53f863bca20a514df0490499402d669ae 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-@@ -242,8 +242,8 @@ export var ToolbarContextMenu = {
-     // Show/hide sidebar and vertical tabs menu items
-     let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
+@@ -244,7 +244,7 @@ export var ToolbarContextMenu = {
      let showSidebarActions =
--      ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
--      toolbarItem?.localName == "toolbarspring";
-+      (["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
-+      toolbarItem?.localName == "toolbarspring") && false;
+       ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
+       toolbarItem?.localName == "toolbarspring" ||
+-      isTitlebarSpacer;
++      isTitlebarSpacer && false;
+ 
      let toggleVerticalTabsItem = document.getElementById(
        "toolbar-context-toggle-vertical-tabs"
-     );
diff --git a/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch b/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch
index 1fb4adb95..2bf8a2602 100644
--- a/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch
+++ b/src/browser/components/customizableui/content/panelUI-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.inc.xhtml b/browser/components/customizableui/content/panelUI.inc.xhtml
-index 85acb96a3deefed708ea768b2f163e7fd6480b97..bb3aed53758da7dafcfed4492acb0cbf2b80cd2f 100644
+index 6cb22be6526b17d952a90fd414c49a31e9afde7a..84f8156e88027a79a40f14c77c83d6a2d19c8a72 100644
 --- a/browser/components/customizableui/content/panelUI.inc.xhtml
 +++ b/browser/components/customizableui/content/panelUI.inc.xhtml
-@@ -132,7 +132,7 @@
+@@ -139,7 +139,7 @@
    <panel id="appMenu-notification-popup"
           class="popup-notification-panel panel-no-padding"
           type="arrow"
diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch
index 23ea8bef7..86f016da1 100644
--- a/src/browser/components/customizableui/content/panelUI-js.patch
+++ b/src/browser/components/customizableui/content/panelUI-js.patch
@@ -1,18 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index 7156397d597579f745ea20ae2b9327433a31c8ec..23c15c60acd77150ea89bd6f2fa1685a0cfc37fd 100644
+index d6393080aa8aff6c0f7b2043fd408b6f6249d0c4..bf37b46c4743b7619393c730720204380635666a 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -518,8 +518,7 @@ const PanelUI = {
-         tempPanel.setAttribute("animate", "false");
-       }
-       tempPanel.setAttribute("context", "");
--      document
--        .getElementById(CustomizableUI.AREA_NAVBAR)
-+      aAnchor.closest("toolbar")
-         .appendChild(tempPanel);
- 
-       let multiView = document.createXULElement("panelmultiview");
-@@ -610,10 +609,12 @@ const PanelUI = {
+@@ -608,10 +608,12 @@ const PanelUI = {
      if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
        this.navbar.setAttribute("nonemptyoverflow", "true");
        this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -25,7 +15,7 @@ index 7156397d597579f745ea20ae2b9327433a31c8ec..23c15c60acd77150ea89bd6f2fa1685a
      }
    },
  
-@@ -961,7 +962,7 @@ const PanelUI = {
+@@ -959,7 +961,7 @@ const PanelUI = {
          el.removeAttribute("data-lazy-l10n-id");
        });
  
diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch
index 68c720930..73708e882 100644
--- a/src/browser/components/extensions/parent/ext-browser-js.patch
+++ b/src/browser/components/extensions/parent/ext-browser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index 89b0bb3b92c15b89499ffc6cf35dcee7ebb89e48..327afaea3821cdca8d7f58bfaa65c7ce3dbfa7a3 100644
+index 2488267f4be5142bcacf984635d9e9ecdb5f02e9..03127808b3cae28850cc276fac0f1acbca85d326 100644
 --- a/browser/components/extensions/parent/ext-browser.js
 +++ b/browser/components/extensions/parent/ext-browser.js
 @@ -354,6 +354,7 @@ class TabTracker extends TabTrackerBase {
@@ -18,7 +18,7 @@ index 89b0bb3b92c15b89499ffc6cf35dcee7ebb89e48..327afaea3821cdca8d7f58bfaa65c7ce
  
      this._tabs.set(nativeTab, id);
      if (nativeTab.linkedBrowser) {
-@@ -1271,6 +1273,10 @@ class TabManager extends TabManagerBase {
+@@ -1273,6 +1275,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 334efc46f..b71b2f5bd 100644
--- a/src/browser/components/places/content/browserPlacesViews-js.patch
+++ b/src/browser/components/places/content/browserPlacesViews-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
-index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3ed3a3058e 100644
+index bbfbe9c703dff25bf939369f5b99cdaa76a5ae24..c28688d488960c1de73baf4c0e69b9f8401e4226 100644
 --- a/browser/components/places/content/browserPlacesViews.js
 +++ b/browser/components/places/content/browserPlacesViews.js
-@@ -330,12 +330,23 @@ class PlacesViewBase {
+@@ -328,12 +328,23 @@ class PlacesViewBase {
  
      this._cleanPopup(aPopup);
  
@@ -29,7 +29,7 @@ index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3e
          this._insertNewItemToPopup(child, fragment);
        }
        aPopup.insertBefore(fragment, aPopup._endMarker);
-@@ -393,6 +404,7 @@ class PlacesViewBase {
+@@ -391,6 +402,7 @@ class PlacesViewBase {
            "scheme",
            PlacesUIUtils.guessUrlSchemeForUI(aPlacesNode.uri)
          );
@@ -37,7 +37,7 @@ index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3e
        } else if (PlacesUtils.containerTypes.includes(type)) {
          element = document.createXULElement("menu");
          element.setAttribute("container", "true");
-@@ -980,25 +992,33 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1014,25 +1026,33 @@ class PlacesToolbar extends PlacesViewBase {
        this._rootElt.firstChild.remove();
      }
  
@@ -82,7 +82,7 @@ index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3e
            );
            ++startIndex;
            if (elt.localName != "toolbarseparator") {
-@@ -1006,15 +1026,12 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1040,15 +1060,12 @@ class PlacesToolbar extends PlacesViewBase {
            }
          }
          if (!elt) {
@@ -101,7 +101,7 @@ index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3e
          });
        });
  
-@@ -1024,7 +1041,7 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1058,7 +1075,7 @@ class PlacesToolbar extends PlacesViewBase {
  
        let fragment = document.createDocumentFragment();
        for (let i = startIndex; i < limit; ++i) {
@@ -110,7 +110,7 @@ index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3e
        }
        await new Promise(resolve => window.requestAnimationFrame(resolve));
        if (!this._isAlive) {
-@@ -1086,6 +1103,8 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1120,6 +1137,8 @@ class PlacesToolbar extends PlacesViewBase {
            "scheme",
            PlacesUIUtils.guessUrlSchemeForUI(aChild.uri)
          );
@@ -119,7 +119,7 @@ index ee6050d411df009d8b61e49d7fdaba79f1bc5db1..0149528329dad3d48449175a35d96d3e
        }
      }
  
-@@ -2234,7 +2253,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
+@@ -2268,7 +2287,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
          PlacesUIUtils.guessUrlSchemeForUI(placesNode.uri)
        );
        element.setAttribute("label", PlacesUIUtils.getBestTitle(placesNode));
diff --git a/src/browser/components/preferences/jar-mn.patch b/src/browser/components/preferences/jar-mn.patch
index 1f1b5e52a..59429d78a 100644
--- a/src/browser/components/preferences/jar-mn.patch
+++ b/src/browser/components/preferences/jar-mn.patch
@@ -1,10 +1,11 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index a786155d80a9f1f09d209f2da11437ee2d662739..2e422b48b452698275118d336d1b16af6a221577 100644
+index 65efb0666785cc79e58015e19ec55216bf4ec9c4..95941c52ffd4c9ee36f584413fb96d59721113db 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -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)
+@@ -33,3 +33,5 @@ browser.jar:
+    content/browser/preferences/widgets/setting-pane.mjs                 (widgets/setting-pane/setting-pane.mjs)
+    content/browser/preferences/widgets/security-privacy-card.mjs        (widgets/security-privacy/security-privacy-card/security-privacy-card.mjs)
+    content/browser/preferences/widgets/security-privacy-card.css        (widgets/security-privacy/security-privacy-card/security-privacy-card.css)
 +
 +   content/browser/preferences/zen-settings.js
+\ No newline at end of file
diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch
index de244411a..a0683e114 100644
--- a/src/browser/components/preferences/main-inc-xhtml.patch
+++ b/src/browser/components/preferences/main-inc-xhtml.patch
@@ -1,20 +1,8 @@
 diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index 891cf7108cf4606c99a902afa420e744b9690b87..2bdbc1f0b6ac2c883dcbd706aed0615fad5e0760 100644
+index ff577c035ff6128f7ae948bc810082c92b3a624c..40f94fff53c63bdff28eaa68f9b0736d53c5b4f8 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 class="indent">
-+      <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 +194,8 @@
+@@ -141,7 +141,8 @@
  <!-- Browser layout -->
  <groupbox data-category="paneGeneral"
            data-subcategory="layout"
@@ -24,7 +12,7 @@ index 891cf7108cf4606c99a902afa420e744b9690b87..2bdbc1f0b6ac2c883dcbd706aed0615f
    <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 +426,7 @@
+@@ -346,6 +347,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 fedbfaded..ece242110 100644
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,8 +1,20 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 259bc260328af1b1f2b95866e7cf92dec341a4b0..3cebff51774b2542a8d4d888aa99dc10929c80be 100644
+index 46283d3eacfea0f419afa3bdfd2a51e411502a20..4fe229706eb0145a21042b8b3cca323682e89e76 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -443,7 +443,7 @@ function getBundleForLocales(newLocales) {
+@@ -1117,6 +1117,11 @@ let SETTINGS_CONFIG = {
+         id: "browserRestoreSession",
+         l10nId: "startup-restore-windows-and-tabs",
+       },
++      {
++        id: "zenWorkspaceContinueWhereLeftOff",
++        l10nId: "zen-workspace-continue-where-left-off",
++        control: "moz-checkbox",
++      },
+       {
+         id: "windowsLaunchOnLogin",
+         l10nId: "windows-launch-on-login",
+@@ -1611,7 +1616,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 c85a728be..8b2db49d4 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 1fb8a954f61e89736b369f5fa01bb4f89fff16ad..3030c32cb66529f14e575428654778abd312dfd8 100644
+index c949c1800cb4c200c273c4019a61553b0e236994..0846ab1a348d3c5904e967aeb36eb846ba3cffa9 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -117,6 +117,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
@@ -10,7 +10,7 @@ index 1fb8a954f61e89736b369f5fa01bb4f89fff16ad..3030c32cb66529f14e575428654778ab
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -196,6 +197,10 @@ function init_all() {
+@@ -224,6 +225,10 @@ function init_all() {
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);
    register_module("paneContainers", gContainersPane);
@@ -19,5 +19,5 @@ index 1fb8a954f61e89736b369f5fa01bb4f89fff16ad..3030c32cb66529f14e575428654778ab
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
  
-   if (Services.prefs.getBoolPref("browser.translations.newSettingsUI.enable")) {
-     register_module("paneTranslations", gTranslationsPane);
+   for (let [subPane, config] of Object.entries(CONFIG_PANES)) {
+     subPane = friendlyPrefCategoryNameToInternalName(subPane);
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
index 8e8ee9e12..4227b80db 100644
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 0081bb470c9b15b39441ff844680e5e91b05fb86..3e4e7c43cf0e4feffb80623491de6222bb88a64b 100644
+index 4500e3a3a7d54bd7647cd09ab0e11df782fb7a69..9506e860966e974b377b3e2e71c91f9d2c4a0c92 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -45,6 +45,8 @@
@@ -11,7 +11,7 @@ index 0081bb470c9b15b39441ff844680e5e91b05fb86..3e4e7c43cf0e4feffb80623491de6222
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -106,6 +108,11 @@
+@@ -109,6 +111,11 @@
    <hbox flex="1">
  
      <vbox class="navigation">
@@ -23,7 +23,7 @@ index 0081bb470c9b15b39441ff844680e5e91b05fb86..3e4e7c43cf0e4feffb80623491de6222
        <!-- category list -->
        <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
          <richlistitem id="category-general"
-@@ -118,6 +125,50 @@
+@@ -121,6 +128,50 @@
            <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
          </richlistitem>
  
@@ -74,7 +74,7 @@ index 0081bb470c9b15b39441ff844680e5e91b05fb86..3e4e7c43cf0e4feffb80623491de6222
          <richlistitem id="category-home"
                        class="category"
                        value="paneHome"
-@@ -229,11 +280,6 @@
+@@ -232,11 +283,6 @@
                  <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
                </hbox>
              </hbox>
@@ -86,7 +86,7 @@ index 0081bb470c9b15b39441ff844680e5e91b05fb86..3e4e7c43cf0e4feffb80623491de6222
            </hbox>
          </hbox>
          <vbox id="mainPrefPane">
-@@ -247,6 +293,10 @@
+@@ -250,6 +296,10 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml
diff --git a/src/browser/components/preferences/sync-inc-xhtml.patch b/src/browser/components/preferences/sync-inc-xhtml.patch
index d712db631..406ca8fe2 100644
--- a/src/browser/components/preferences/sync-inc-xhtml.patch
+++ b/src/browser/components/preferences/sync-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
-index e59c536fc2fa06b11be9378a28285ac16fd16958..cf17ee3b6347b950fcf5bf260cd0631c77ffd1d3 100644
+index 31b95644f820eda3267d3b52913ed0845abc1c80..1c8869418f7c88ed33601860dafd2c4eb0d5731f 100644
 --- a/browser/components/preferences/sync.inc.xhtml
 +++ b/browser/components/preferences/sync.inc.xhtml
 @@ -223,6 +223,10 @@
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 553ddc109..a126c8a38 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1136,3 +1136,8 @@ Preferences.addAll([
     default: true,
   },
 ]);
+
+Preferences.addSetting({
+  id: 'zenWorkspaceContinueWhereLeftOff',
+  pref: 'zen.workspaces.continue-where-left-off',
+});
diff --git a/src/browser/components/search/SearchUIUtils-sys-mjs.patch b/src/browser/components/search/SearchUIUtils-sys-mjs.patch
index c384b1151..fbe2c38aa 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 55f90f4e802480728bbd5ef962b507183e017997..2a83f861fe6edee2b127c8d7946abcdcdbf677f5 100644
+index 15fdb0cd7664c2b49977902d7f4c7a117d82cf15..6aedbc18de6604b63b2586e7d9745a4c4e7e38ae 100644
 --- a/browser/components/search/SearchUIUtils.sys.mjs
 +++ b/browser/components/search/SearchUIUtils.sys.mjs
-@@ -430,7 +430,7 @@ export var SearchUIUtils = {
+@@ -434,7 +434,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 79c5bcfcf..df250c095 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d89fb95494 100644
+index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10540eb659 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -126,6 +126,8 @@ const TAB_EVENTS = [
-   "TabUngrouped",
+@@ -127,6 +127,8 @@ const TAB_EVENTS = [
    "TabGroupCollapse",
    "TabGroupExpand",
+   "TabSplitViewActivate",
 +  "TabAddedToEssentials",
 +  "TabRemovedFromEssentials",
  ];
  
  const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-@@ -1904,6 +1906,8 @@ var SessionStoreInternal = {
+@@ -1911,6 +1913,8 @@ var SessionStoreInternal = {
        case "TabPinned":
        case "TabUnpinned":
        case "SwapDocShells":
@@ -20,7 +20,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
          this.saveStateDelayed(win);
          break;
        case "TabGroupCreate":
-@@ -2139,7 +2143,6 @@ var SessionStoreInternal = {
+@@ -2151,7 +2155,6 @@ var SessionStoreInternal = {
        if (closedWindowState) {
          let newWindowState;
          if (
@@ -28,7 +28,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
            !lazy.SessionStartup.willRestore()
          ) {
            // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2372,11 +2375,9 @@ var SessionStoreInternal = {
+@@ -2384,11 +2387,9 @@ var SessionStoreInternal = {
            tabbrowser.selectedTab.label;
        }
  
@@ -40,7 +40,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
  
        // 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
-@@ -3361,7 +3362,7 @@ var SessionStoreInternal = {
+@@ -3373,7 +3374,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -49,7 +49,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
        return;
      }
  
-@@ -4073,6 +4074,11 @@ var SessionStoreInternal = {
+@@ -4089,6 +4090,11 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -61,7 +61,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4509,6 +4515,7 @@ var SessionStoreInternal = {
+@@ -4525,6 +4531,7 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -69,7 +69,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5358,7 +5365,7 @@ var SessionStoreInternal = {
+@@ -5374,7 +5381,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -78,7 +78,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
          removableTabs.push(tab);
        }
      }
-@@ -5418,7 +5425,7 @@ var SessionStoreInternal = {
+@@ -5434,7 +5441,7 @@ var SessionStoreInternal = {
      }
  
      let workspaceID = aWindow.getWorkspaceID();
@@ -87,7 +87,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
        winData.workspaceID = workspaceID;
      }
    },
-@@ -5609,11 +5616,12 @@ var SessionStoreInternal = {
+@@ -5625,11 +5632,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -101,7 +101,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5624,6 +5632,7 @@ var SessionStoreInternal = {
+@@ -5640,6 +5648,7 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -109,7 +109,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5636,7 +5645,7 @@ var SessionStoreInternal = {
+@@ -5652,7 +5661,7 @@ var SessionStoreInternal = {
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
      if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -118,7 +118,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5748,8 +5757,8 @@ var SessionStoreInternal = {
+@@ -5764,8 +5773,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -129,7 +129,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5792,6 +5801,8 @@ var SessionStoreInternal = {
+@@ -5808,6 +5817,8 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -138,7 +138,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6348,6 +6359,25 @@ var SessionStoreInternal = {
+@@ -6371,6 +6382,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -164,7 +164,7 @@ index eb62ff3e733e43fdaa299babddea3ba0125abb06..8f20ba50b06f5b75d7de08eb4d1b27d8
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -7263,7 +7293,7 @@ var SessionStoreInternal = {
+@@ -7289,7 +7319,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 a04592bf8..215f98bae 100644
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index c4edb5442e5243b7d9fe35e1774b2fc651903601..d58076fedafe07d3401ab1723eaa837fabbae09f 100644
+index 220c3c83fa09daaec433803a4655a20114a137a6..1ef8adc3ecfa61839bb993f7fc090133bffe77db 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
-@@ -779,7 +779,7 @@ var SidebarController = {
+@@ -793,7 +793,7 @@ var SidebarController = {
    setPosition() {
      // First reset all ordinals to match DOM ordering.
      let contentArea = document.getElementById("tabbrowser-tabbox");
diff --git a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
index 99f83d192..eba2ec3d1 100644
--- a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-index 773f595e89e268578ba153907babec95b58a155a..7cb99cde00c19f50fd9aa48ab1efcfaeaef89771 100644
+index bcd7689e9d68ef8b171c327188174334c4271e21..f69180acb87644f109aa91b871e347f1b1835f53 100644
 --- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 +++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-@@ -937,6 +937,7 @@ export class AsyncTabSwitcher {
-     return !(
+@@ -938,6 +938,7 @@ export class AsyncTabSwitcher {
        this.tabbrowser._printPreviewBrowsers.has(browser) ||
+       this.tabbrowser.splitViewBrowsers.includes(browser) ||
        lazy.PictureInPicture.isOriginatingBrowser(browser)
 +      || browser?.parentNode?.parentNode?.parentNode?.classList?.contains("zen-glance-background")
      );
diff --git a/src/browser/components/tabbrowser/TabsList-sys-mjs.patch b/src/browser/components/tabbrowser/TabsList-sys-mjs.patch
index 5ac1788da..6a7c9e503 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 20a543dede6bf4428c8af19c5d0589788ddd8eaa..27a378e70f5b280b720c95ba8dac2cc4e88985be 100644
+index b394a980869d5e5df01b6afdd81e0f41c090e6ec..236c99db0dfa5ebcba50d55c1e4eb6ab7b8110b2 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/browser-ctrlTab-js.patch b/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
index cb6c9b42f..af58c3dd3 100644
--- a/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
+++ b/src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/browser-ctrlTab.js b/browser/components/tabbrowser/content/browser-ctrlTab.js
-index 22db482e62e754135d8a6cf824914a3e3e06c45c..bdc18d575b33e788f9628b4cb648d5c3e8781666 100644
+index 958728cde19dd7cc24692baa89e11fcab816ab82..32e2b6af2536133f170bd5e14c47392ded8440eb 100644
 --- a/browser/components/tabbrowser/content/browser-ctrlTab.js
 +++ b/browser/components/tabbrowser/content/browser-ctrlTab.js
-@@ -252,7 +252,8 @@ var ctrlTab = {
+@@ -249,7 +249,8 @@ var ctrlTab = {
    },
  
    get tabList() {
@@ -12,7 +12,7 @@ index 22db482e62e754135d8a6cf824914a3e3e06c45c..bdc18d575b33e788f9628b4cb648d5c3
    },
  
    init: function ctrlTab_init() {
-@@ -463,7 +464,7 @@ var ctrlTab = {
+@@ -460,7 +461,7 @@ var ctrlTab = {
      // If the tab is hidden, don't add it to the list unless it's selected
      // (Normally hidden tabs would be unhidden when selected, but that doesn't
      // happen for Firefox View).
@@ -21,7 +21,7 @@ index 22db482e62e754135d8a6cf824914a3e3e06c45c..bdc18d575b33e788f9628b4cb648d5c3
        return;
      }
  
-@@ -487,7 +488,7 @@ var ctrlTab = {
+@@ -484,7 +485,7 @@ var ctrlTab = {
    },
  
    open: function ctrlTab_open() {
@@ -30,7 +30,7 @@ index 22db482e62e754135d8a6cf824914a3e3e06c45c..bdc18d575b33e788f9628b4cb648d5c3
        return;
      }
  
-@@ -765,7 +766,7 @@ var ctrlTab = {
+@@ -763,7 +764,7 @@ var ctrlTab = {
    _initRecentlyUsedTabs() {
      this._recentlyUsedTabs = Array.prototype.filter.call(
        gBrowser.tabs,
diff --git a/src/browser/components/tabbrowser/content/drag-and-drop-js.patch b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
new file mode 100644
index 000000000..7e4ed9cf2
--- /dev/null
+++ b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
@@ -0,0 +1,439 @@
+diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js
+index c97c661656868bc7faaf7c66c9702eea056aafe1..aa9f0ed071e4898cac2b98a4d81e95df6a41b8dd 100644
+--- a/browser/components/tabbrowser/content/drag-and-drop.js
++++ b/browser/components/tabbrowser/content/drag-and-drop.js
+@@ -32,6 +32,9 @@
+    * @returns {MozTabbrowserTab|vbox}
+    */
+   const elementToMove = element => {
++    if (element.group?.hasAttribute("split-view-group")) {
++      return element.group;
++    }
+     if (isTab(element)) {
+       return element;
+     }
+@@ -118,6 +121,10 @@
+       }
+ 
+       let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
++      if (draggedTab && dropEffect === "move") {
++        gZenPinnedTabManager.applyDragoverClass(event, draggedTab);
++        gZenViewSplitter.onBrowserDragEndToSplit(event);
++      }
+       if (
+         (dropEffect == "move" || dropEffect == "copy") &&
+         document == draggedTab.ownerDocument &&
+@@ -272,6 +279,18 @@
+ 
+       this.#tabDropIndicator.hidden = true;
+       event.stopPropagation();
++      if (draggedTab?.hasAttribute("zen-has-splitted")) {
++        draggedTab.removeAttribute("zen-has-splitted");
++        draggedTab._visuallySelected = false;
++      }
++      if (draggedTab && dropEffect == "move") {
++        let moved = gZenPinnedTabManager.moveToAnotherTabContainerIfNecessary(event, movingTabs);
++
++        if (moved) {
++          this.finishMoveTogetherSelectedTabs(draggedTab);
++          return;
++        }
++      }
+       if (draggedTab && dropEffect == "copy") {
+         let duplicatedDraggedTab;
+         let duplicatedTabs = [];
+@@ -297,8 +316,9 @@
+         let translateOffsetY = oldTranslateY % tabHeight;
+         let newTranslateX = oldTranslateX - translateOffsetX;
+         let newTranslateY = oldTranslateY - translateOffsetY;
+-        let isPinned = draggedTab.pinned;
+-        let numPinned = gBrowser.pinnedTabCount;
++        let isPinned = draggedTab?.group ? draggedTab.group.pinned : draggedTab.pinned;
++        let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
++        let essential = draggedTab.hasAttribute("zen-essential");
+ 
+         if (this.#isContainerVerticalPinnedGrid(draggedTab)) {
+           // Update both translate axis for pinned vertical expanded tabs
+@@ -314,8 +334,8 @@
+           }
+         } else {
+           let tabs = this.#tabbrowserTabs.ariaFocusableItems.slice(
+-            isPinned ? 0 : numPinned,
+-            isPinned ? numPinned : undefined
++            isPinned ? (essential ? 0 : gBrowser._numZenEssentials) : numPinned,
++            isPinned ? (essential ? gBrowser._numZenEssentials : numPinned) : undefined 
+           );
+           let size = this.#tabbrowserTabs.verticalMode ? "height" : "width";
+           let screenAxis = this.#tabbrowserTabs.verticalMode
+@@ -368,11 +388,13 @@
+           this.#dragToPinPromoCard,
+         ];
+         let shouldPin =
++          false &&  
+           isTab(draggedTab) &&
+           !draggedTab.pinned &&
+           (overPinnedDropIndicator ||
+             dragToPinTargets.some(el => el.contains(event.target)));
+         let shouldUnpin =
++          false &&
+           isTab(draggedTab) &&
+           draggedTab.pinned &&
+           this.#tabbrowserTabs.arrowScrollbox.contains(event.target);
+@@ -390,6 +412,7 @@
+             (oldTranslateY && oldTranslateY != newTranslateY);
+         } else if (this.#tabbrowserTabs.verticalMode) {
+           shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
++          shouldTranslate = false;
+         } else {
+           shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
+         }
+@@ -446,7 +469,7 @@
+                 item.removeAttribute("tabdrop-samewindow");
+                 resolve();
+               };
+-              if (gReduceMotion) {
++              if (true || gReduceMotion) {
+                 postTransitionCleanup();
+               } else {
+                 let onTransitionEnd = transitionendEvent => {
+@@ -586,6 +609,7 @@
+ 
+           let nextItem = this.#tabbrowserTabs.ariaFocusableItems[newIndex];
+           let tabGroup = isTab(nextItem) && nextItem.group;
++          if (gZenViewSplitter.handleTabDrop(event, urls, replace, inBackground)) return;
+           gBrowser.loadTabs(urls, {
+             inBackground,
+             replace,
+@@ -623,7 +647,16 @@
+         this.#expandGroupOnDrop(draggedTab);
+       }
+       this.#resetTabsAfterDrop(draggedTab.ownerDocument);
+-
++      if (!dt.mozUserCancelled && dt.dropEffect == "none" && !this._isCustomizing) {
++        const moved = gZenViewSplitter.moveTabToSplitView(event, draggedTab);
++        if (moved) {
++          delete draggedTab._dragData;
++          return;
++        }
++      } else if (dt.mozUserCancelled) {
++        gZenViewSplitter.onBrowserDragEndToSplit(event, true);
++        if (gZenViewSplitter._lastOpenedTab) gZenViewSplitter._lastOpenedTab._visuallySelected = false;
++      }
+       if (
+         dt.mozUserCancelled ||
+         dt.dropEffect != "none" ||
+@@ -827,7 +860,10 @@
+     #getDragTarget(event, { ignoreSides = false } = {}) {
+       let { target } = event;
+       while (target) {
+-        if (isTab(target) || isTabGroupLabel(target)) {
++        if (isTab(target) || isTabGroupLabel(target) || target?.classList?.contains("tab-group-label-container")) {
++          if (target.classList?.contains("tab-group-label-container")) {
++            target = target.querySelector(".tab-group-label");
++          }
+           break;
+         }
+         target = target.parentNode;
+@@ -844,14 +880,17 @@
+           return null;
+         }
+       }
++      if (target?.group?.hasAttribute("split-view-group")) {
++        target = target.group.labelElement;
++      }
+       return target;
+     }
+ 
+     #isContainerVerticalPinnedGrid(tab) {
+       return (
+         this.#tabbrowserTabs.verticalMode &&
+-        tab.pinned &&
+-        this.#tabbrowserTabs.hasAttribute("expanded") &&
++        (tab.hasAttribute("zen-essential")) &&
++        (this.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
+         !this.#tabbrowserTabs.expandOnHover
+       );
+     }
+@@ -882,7 +921,8 @@
+         isTabGroupLabel(draggedTab) &&
+         draggedTab._dragData?.expandGroupOnDrop
+       ) {
+-        draggedTab.group.collapsed = false;
++        draggedTab.group.collapsed = draggedTab.group.hasAttribute("has-active");
++        gZenFolders.animateGroupMove(draggedTab.group, true);
+       }
+     }
+ 
+@@ -947,10 +987,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
+-        let pinnedTabs = this.#tabbrowserTabs.visibleTabs.slice(
+-          0,
+-          gBrowser.pinnedTabCount
+-        );
++        let pinnedTabs = this.#tabbrowserTabs.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
+         let tabsPerRow = 0;
+         let position = RTL_UI
+           ? window.windowUtils.getBoundsWithoutFlushing(
+@@ -1117,7 +1154,7 @@
+       let dropEffect = this.getDropEffectForTabDrag(event);
+       let isMovingInTabStrip = !fromTabList && dropEffect == "move";
+       let collapseTabGroupDuringDrag =
+-        isMovingInTabStrip && isTabGroupLabel(tab) && !tab.group.collapsed;
++        isMovingInTabStrip && isTabGroupLabel(tab) && (!tab.group.collapsed || tab.group.hasAttribute("has-active"));
+ 
+       tab._dragData = {
+         offsetX: this.#tabbrowserTabs.verticalMode
+@@ -1127,7 +1164,7 @@
+           ? event.screenY - window.screenY - tabOffset
+           : event.screenY - window.screenY,
+         scrollPos:
+-          this.#tabbrowserTabs.verticalMode && tab.pinned
++          this.#tabbrowserTabs.verticalMode && tab.pinned && false
+             ? this.#tabbrowserTabs.pinnedTabsContainer.scrollPosition
+             : this.#tabbrowserTabs.arrowScrollbox.scrollPosition,
+         screenX: event.screenX,
+@@ -1156,6 +1193,7 @@
+ 
+           if (collapseTabGroupDuringDrag) {
+             tab.group.collapsed = true;
++            gZenFolders.animateGroupMove(tab.group);
+           }
+         }
+       }
+@@ -1174,6 +1212,16 @@
+       when the tab is first selected to be dragged.
+     */
+     #updateTabStylesOnDrag(tab) {
++      let { movingTabs: zenMovingTabs } = tab._dragData;
++      for (let movingTab of zenMovingTabs.slice(zenMovingTabs.findIndex(t => t._tPos == tab._tPos))) {
++        if (isTabGroupLabel(tab)) {
++          movingTab = movingTab.parentElement;
++        }
++        // "dragtarget" contains the following rules which must only be set AFTER the above
++        // elements have been adjusted. {z-index: 3 !important, position: absolute !important}
++        movingTab.setAttribute("zen-dragtarget", "");
++      }
++      return;
+       let isPinned = tab.pinned;
+       let numPinned = gBrowser.pinnedTabCount;
+       let allTabs = this.#tabbrowserTabs.ariaFocusableItems;
+@@ -1624,10 +1672,7 @@
+         return;
+       }
+ 
+-      let tabs = this.#tabbrowserTabs.visibleTabs.slice(
+-        0,
+-        gBrowser.pinnedTabCount
+-      );
++      let tabs = this.#tabbrowserTabs.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
+ 
+       let directionX = screenX > dragData.animLastScreenX;
+       let directionY = screenY > dragData.animLastScreenY;
+@@ -1636,6 +1681,8 @@
+ 
+       let { width: tabWidth, height: tabHeight } =
+         draggedTab.getBoundingClientRect();
++      tabWidth += 4; // Add 4px to account for the gap
++      tabHeight += 4;
+       let shiftSizeX = tabWidth * movingTabs.length;
+       let shiftSizeY = tabHeight;
+       dragData.tabWidth = tabWidth;
+@@ -1672,8 +1719,8 @@
+       let lastBoundX =
+         lastTabInRow.screenX +
+         lastTabInRow.getBoundingClientRect().width -
+-        (lastMovingTabScreenX + tabWidth);
+-      let lastBoundY = periphery.screenY - (lastMovingTabScreenY + tabHeight);
++        (lastMovingTabScreenX + tabWidth) + 4;
++      let lastBoundY = lastTab.screenY - lastMovingTabScreenY;
+       translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX);
+       translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
+ 
+@@ -1833,13 +1880,18 @@
+       this.#clearDragOverGroupingTimer();
+       this.#clearPinnedDropIndicatorTimer();
+ 
+-      let isPinned = draggedTab.pinned;
+-      let numPinned = gBrowser.pinnedTabCount;
++      let isPinned = draggedTab?.group ? draggedTab.group.pinned : draggedTab.pinned;
++      let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
++      let essential = draggedTab.hasAttribute("zen-essential");
++      const isDraggingFolder = isTabGroupLabel(draggedTab) && draggedTab.group?.isZenFolder;
+       let allTabs = this.#tabbrowserTabs.ariaFocusableItems;
+       let tabs = allTabs.slice(
+-        isPinned ? 0 : numPinned,
+-        isPinned ? numPinned : undefined
++        (isPinned && essential) ? 0 : gBrowser._numZenEssentials,
++        isPinned ? (essential ? gBrowser._numZenEssentials : (isDraggingFolder ? numPinned : undefined)) : undefined
+       );
++      if (draggedTab.group?.hasAttribute("split-view-group")) {
++        draggedTab = draggedTab.group.labelElement;
++      }
+ 
+       if (this.#rtlMode) {
+         tabs.reverse();
+@@ -1854,7 +1906,7 @@
+       let translateAxis = this.#tabbrowserTabs.verticalMode
+         ? "translateY"
+         : "translateX";
+-      let { width: tabWidth, height: tabHeight } = bounds(draggedTab);
++      let { width: tabWidth, height: tabHeight } = bounds(draggedTab.group?.hasAttribute("split-view-group") ? draggedTab.group : draggedTab);
+       let tabSize = this.#tabbrowserTabs.verticalMode ? tabHeight : tabWidth;
+       let translateX = event.screenX - dragData.screenX;
+       let translateY = event.screenY - dragData.screenY;
+@@ -1870,6 +1922,12 @@
+       );
+       let lastMovingTab = movingTabs.at(-1);
+       let firstMovingTab = movingTabs[0];
++      if (lastMovingTab.group?.hasAttribute("split-view-group")) {
++        lastMovingTab = lastMovingTab.group;
++      }
++      if (firstMovingTab.group?.hasAttribute("split-view-group")) {
++        firstMovingTab = firstMovingTab.group;
++      }
+       let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
+       let lastMovingTabScreen = endEdge(lastMovingTab);
+       let firstMovingTabScreen = firstMovingTab[screenAxis];
+@@ -1884,6 +1942,13 @@
+       let endBound = this.#rtlMode
+         ? endEdge(this.#tabbrowserTabs) - lastMovingTabScreen
+         : periphery[screenAxis] - 1 - lastMovingTabScreen;
++      {
++        let firstTab = tabs.at(this.#rtlMode ? -1 : 0);
++        let lastTab = tabs.at(this.#rtlMode ? 0 : -1);
++        startBound = firstTab[screenAxis] - firstMovingTabScreen;
++        endBound = endEdge(lastTab) - lastMovingTabScreen;
++        endBound = gZenPinnedTabManager.getLastTabBound(endBound, lastTab, isDraggingFolder);
++      }
+       translate = Math.min(Math.max(translate, startBound), endBound);
+ 
+       // Center the tab under the cursor if the tab is not under the cursor while dragging
+@@ -2075,6 +2140,8 @@
+       };
+ 
+       let dropElement = getOverlappedElement();
++      if (dropElement?.hasAttribute("split-view-group")) dropElement = dropElement.labelElement;
++      gZenPinnedTabManager.animateSeparatorMove(movingTabs, dropElement, isPinned, event);
+ 
+       let newDropElementIndex;
+       if (dropElement) {
+@@ -2157,7 +2224,7 @@
+           ? Services.prefs.getIntPref(
+               "browser.tabs.dragDrop.moveOverThresholdPercent"
+             ) / 100
+-          : 0.5;
++          : Services.prefs.getIntPref('zen.view.drag-and-drop.move-over-threshold') / 100;
+         moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
+         let shouldMoveOver = overlapPercent > moveOverThreshold;
+         if (logicalForward && shouldMoveOver) {
+@@ -2190,6 +2257,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 (
++          false &&
+           isTabGroupLabel(draggedTab) &&
+           dropElement?.group &&
+           (!dropElement.group.collapsed ||
+@@ -2216,20 +2284,13 @@
+         let isOutOfBounds = isPinned
+           ? dropElement.elementIndex >= numPinned
+           : dropElement.elementIndex < numPinned;
+-        if (isOutOfBounds) {
+-          // Drop after last pinned tab
+-          dropElement = this.#tabbrowserTabs.ariaFocusableItems[numPinned - 1];
+-          dropBefore = false;
+-        }
+       }
+ 
+-      if (
+-        gBrowser._tabGroupsEnabled &&
+-        isTab(draggedTab) &&
+-        !isPinned &&
+-        (!numPinned || newDropElementIndex > numPinned)
+-      ) {
++      if (isTab(draggedTab) || isTabGroupLabel(draggedTab)) {
+         let dragOverGroupingThreshold = 1 - moveOverThreshold;
++        if (draggedTab && !dropElement?.group) {
++          gZenFolders.highlightGroupOnDragOver(null);
++        }
+         let groupingDelay = Services.prefs.getIntPref(
+           "browser.tabs.dragDrop.createGroup.delayMS"
+         );
+@@ -2237,6 +2298,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 =
++          false &&
+           !movingTabsSet.has(dropElement) &&
+           isTab(dropElement) &&
+           !dropElement?.group &&
+@@ -2245,6 +2307,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 =
++          false &&
+           isTabGroupLabel(dropElement) &&
+           dropElement.group.collapsed &&
+           overlapPercent > dragOverGroupingThreshold;
+@@ -2302,6 +2365,14 @@
+               dropElement = dropElementGroup.tabs[0];
+               dropBefore = true;
+             }
++            ({ dropElement, colorCode, dropBefore } = gZenFolders.handleDragOverTabGroupLabel(
++              dropElement,
++              draggedTab,
++              overlapPercent,
++              movingTabs,
++              dropBefore,
++              colorCode
++            ));
+           }
+           this.#setDragOverGroupColor(colorCode);
+           this.#tabbrowserTabs.toggleAttribute(
+@@ -2324,10 +2395,11 @@
+       dragData.dropBefore = dropBefore;
+       dragData.animDropElementIndex = newDropElementIndex;
+ 
++      gZenFolders.setFolderIndentation(movingTabs, dropElement);
+       // Shift background tabs to leave a gap where the dragged tab
+       // would currently be dropped.
+       for (let item of tabs) {
+-        if (item == draggedTab) {
++        if (item == draggedTab || (item.group?.hasAttribute("split-view-group") && item.group == draggedTab.group)) {
+           continue;
+         }
+ 
+@@ -2417,11 +2489,13 @@
+     }
+ 
+     finishAnimateTabMove() {
++      gZenPinnedTabManager.onDragFinish();
+       if (!this.#isMovingTab()) {
+         return;
+       }
+ 
+       this.#setMovingTabMode(false);
++      gZenFolders.highlightGroupOnDragOver(null);
+ 
+       for (let item of this.#tabbrowserTabs.ariaFocusableItems) {
+         this.#resetGroupTarget(item);
+@@ -2457,7 +2531,7 @@
+         tab.style.left = "";
+         tab.style.top = "";
+         tab.style.maxWidth = "";
+-        tab.removeAttribute("dragtarget");
++        tab.removeAttribute("zen-dragtarget");
+       }
+       for (let label of draggedTabDocument.getElementsByClassName(
+         "tab-group-label-container"
+@@ -2467,7 +2541,7 @@
+         label.style.left = "";
+         label.style.top = "";
+         label.style.maxWidth = "";
+-        label.removeAttribute("dragtarget");
++        label.removeAttribute("zen-dragtarget");
+       }
+       let periphery = draggedTabDocument.getElementById(
+         "tabbrowser-arrowscrollbox-periphery"
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 997098854..3452bced0 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..12988986c4cf00990c1d1b2e4be362efc001afdd 100644
+index 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577b5fad08c 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -42,7 +42,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
          ".tab-label-container":
            "pinned,selected=visuallyselected,labeldirection",
          ".tab-label":
-@@ -184,7 +187,7 @@
+@@ -186,7 +189,7 @@
      }
  
      set _visuallySelected(val) {
@@ -51,7 +51,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
          return;
        }
  
-@@ -220,11 +223,21 @@
+@@ -222,11 +225,21 @@
      }
  
      get visible() {
@@ -78,7 +78,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
      }
  
      get hidden() {
-@@ -295,7 +308,7 @@
+@@ -297,7 +310,7 @@
          return false;
        }
  
@@ -87,7 +87,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
      }
  
      get lastAccessed() {
-@@ -372,8 +385,11 @@
+@@ -374,8 +387,11 @@
      }
  
      get group() {
@@ -101,7 +101,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
        }
        return null;
      }
-@@ -468,6 +484,8 @@
+@@ -470,6 +486,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (
          event.target.classList.contains("tab-close-button") ||
@@ -110,7 +110,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
          event.target.classList.contains("tab-icon-overlay") ||
          event.target.classList.contains("tab-audio-button")
        ) {
-@@ -522,6 +540,10 @@
+@@ -524,6 +542,10 @@
        this.style.MozUserFocus = "";
      }
  
@@ -121,7 +121,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
      on_click(event) {
        if (event.button != 0) {
          return;
-@@ -570,6 +592,7 @@
+@@ -572,6 +594,7 @@
              )
            );
          } else {
@@ -129,7 +129,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
            gBrowser.removeTab(this, {
              animate: true,
              triggeringEvent: event,
-@@ -582,6 +605,14 @@
+@@ -584,6 +607,14 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
@@ -144,7 +144,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362ef
      }
  
      on_dblclick(event) {
-@@ -605,6 +636,8 @@
+@@ -607,6 +638,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 11561149a..407e111dc 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 c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394b7dbc6a7 100644
+index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc349868d0d0 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -432,15 +432,64 @@
+@@ -450,15 +450,64 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -69,7 +69,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -588,6 +637,7 @@
+@@ -613,6 +662,7 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -77,7 +77,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -873,13 +923,17 @@
+@@ -898,13 +948,17 @@
        }
  
        this.showTab(aTab);
@@ -96,7 +96,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -892,11 +946,15 @@
+@@ -917,11 +971,15 @@
        }
  
        this.#handleTabMove(aTab, () => {
@@ -113,7 +113,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1073,6 +1131,8 @@
+@@ -1098,6 +1156,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -122,7 +122,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        if (
          aIconURL &&
          !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1082,6 +1142,9 @@
+@@ -1107,6 +1167,9 @@
          );
          return;
        }
@@ -132,7 +132,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1445,6 +1508,7 @@
+@@ -1470,6 +1533,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -140,7 +140,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1597,6 +1661,9 @@
+@@ -1622,6 +1686,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -150,7 +150,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1920,7 +1987,8 @@
+@@ -1945,7 +2012,8 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -160,7 +160,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          return false;
        }
  
-@@ -2028,7 +2096,7 @@
+@@ -2053,7 +2121,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -169,7 +169,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2303,6 +2371,7 @@
+@@ -2328,6 +2396,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -177,7 +177,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2376,8 +2445,7 @@
+@@ -2401,8 +2470,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -187,7 +187,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          b.setAttribute("transparent", "true");
        }
  
-@@ -2542,7 +2610,7 @@
+@@ -2567,7 +2635,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -196,7 +196,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2601,8 +2669,8 @@
+@@ -2626,8 +2694,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) {
@@ -207,7 +207,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2779,7 +2847,6 @@
+@@ -2814,7 +2882,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -215,7 +215,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -2859,6 +2926,8 @@
+@@ -2923,6 +2990,8 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -224,7 +224,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2869,6 +2938,12 @@
+@@ -2933,6 +3002,12 @@
          );
        }
  
@@ -237,7 +237,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2932,6 +3007,19 @@
+@@ -2996,6 +3071,19 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -257,7 +257,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -2940,6 +3028,7 @@
+@@ -3004,6 +3092,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -265,7 +265,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -2958,6 +3047,7 @@
+@@ -3022,6 +3111,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -273,7 +273,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          }));
  
          if (focusUrlBar) {
-@@ -3078,6 +3168,12 @@
+@@ -3146,6 +3236,12 @@
          }
        }
  
@@ -286,7 +286,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3248,10 +3344,10 @@
+@@ -3330,10 +3426,10 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -298,7 +298,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        }
  
        if (!color) {
-@@ -3272,9 +3368,14 @@
+@@ -3354,9 +3450,14 @@
          label,
          isAdoptingGroup
        );
@@ -315,7 +315,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        );
        group.addTabs(tabs);
  
-@@ -3395,7 +3496,7 @@
+@@ -3477,7 +3578,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -324,7 +324,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        );
      }
  
-@@ -3597,6 +3698,7 @@
+@@ -3679,6 +3780,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -332,7 +332,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3666,6 +3768,7 @@
+@@ -3748,6 +3850,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -340,7 +340,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          });
        }
  
-@@ -3853,7 +3956,7 @@
+@@ -3935,7 +4038,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -349,7 +349,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -3890,8 +3993,10 @@
+@@ -3972,8 +4075,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -361,7 +361,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
            if (select) {
              tabToSelect = tab;
            }
-@@ -3903,7 +4008,8 @@
+@@ -3985,7 +4090,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -371,7 +371,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3917,7 +4023,10 @@
+@@ -3999,7 +4105,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -383,7 +383,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -3962,9 +4071,23 @@
+@@ -4044,9 +4153,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -407,7 +407,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4155,11 +4278,14 @@
+@@ -4237,11 +4360,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -423,7 +423,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4171,7 +4297,7 @@
+@@ -4253,7 +4379,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -432,7 +432,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
              tabGroup = previousTab.group;
            }
            if (
-@@ -4182,7 +4308,7 @@
+@@ -4264,7 +4390,7 @@
            ) {
              elementIndex = Infinity;
            } else if (previousTab.visible) {
@@ -441,7 +441,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4210,14 +4336,14 @@
+@@ -4292,14 +4418,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -460,7 +460,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4228,7 +4354,7 @@
+@@ -4310,7 +4436,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -469,7 +469,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          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);
-@@ -4264,6 +4390,7 @@
+@@ -4346,6 +4472,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -477,7 +477,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
        TabBarVisibility.update();
      }
-@@ -4553,6 +4680,9 @@
+@@ -4635,6 +4762,9 @@
          return;
        }
  
@@ -487,7 +487,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
      }
  
-@@ -4814,6 +4944,7 @@
+@@ -4896,6 +5026,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -495,7 +495,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4903,6 +5034,7 @@
+@@ -4985,6 +5116,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -503,7 +503,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        } catch (e) {
          console.error(e);
        }
-@@ -4941,6 +5073,12 @@
+@@ -5023,6 +5155,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -516,7 +516,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4955,6 +5093,9 @@
+@@ -5037,6 +5175,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -526,7 +526,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5003,7 +5144,13 @@
+@@ -5085,7 +5226,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -541,7 +541,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          return;
        }
  
-@@ -5137,7 +5284,7 @@
+@@ -5219,7 +5366,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -550,7 +550,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5161,6 +5308,7 @@
+@@ -5243,6 +5390,7 @@
  
          newTab = true;
        }
@@ -558,7 +558,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5201,13 +5349,7 @@
+@@ -5283,13 +5431,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -573,7 +573,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        } else {
          TabBarVisibility.update();
        }
-@@ -5340,6 +5482,7 @@
+@@ -5422,6 +5564,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -581,7 +581,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5552,6 +5695,7 @@
+@@ -5643,6 +5786,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -589,7 +589,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5564,13 +5708,13 @@
+@@ -5655,13 +5799,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -605,7 +605,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5586,7 +5730,7 @@
+@@ -5677,7 +5821,7 @@
        }
  
        if (tab) {
@@ -614,7 +614,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5607,7 +5751,7 @@
+@@ -5698,7 +5842,7 @@
          });
        }
  
@@ -623,7 +623,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
      }
  
      _blurTab(aTab) {
-@@ -6013,10 +6157,10 @@
+@@ -6104,10 +6248,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -636,7 +636,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6075,6 +6219,7 @@
+@@ -6166,6 +6310,7 @@
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
      replaceTabWithWindow(aTab, aOptions) {
@@ -644,7 +644,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6208,7 +6353,7 @@
+@@ -6299,7 +6444,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -653,7 +653,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
      }
  
      /**
-@@ -6284,8 +6429,8 @@
+@@ -6375,8 +6520,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -664,7 +664,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6311,10 +6456,16 @@
+@@ -6402,10 +6547,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -683,7 +683,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6372,23 +6523,28 @@
+@@ -6463,23 +6614,28 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -718,7 +718,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        } 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
-@@ -6401,14 +6557,34 @@
+@@ -6492,14 +6648,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.
@@ -754,7 +754,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6417,7 +6593,7 @@
+@@ -6508,7 +6684,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -763,7 +763,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6489,10 +6665,10 @@
+@@ -6580,10 +6756,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -776,7 +776,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6522,6 +6698,7 @@
+@@ -6613,6 +6789,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -784,7 +784,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6548,7 +6725,7 @@
+@@ -6639,7 +6816,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -793,7 +793,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6585,6 +6762,10 @@
+@@ -6676,6 +6853,10 @@
  
        moveActionCallback();
  
@@ -804,7 +804,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7486,7 +7667,7 @@
+@@ -7576,7 +7757,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -813,7 +813,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7501,7 +7682,6 @@
+@@ -7593,7 +7774,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -821,7 +821,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
            });
            break;
          case "TabGroupCreateByUser":
-@@ -8442,6 +8622,7 @@
+@@ -8542,6 +8722,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -829,7 +829,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9443,7 +9624,7 @@ var TabContextMenu = {
+@@ -9543,7 +9724,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -838,7 +838,7 @@ index c099e8646b9341a3ff55bf394037c8fc2769969b..0d524a0519bbbdf304a594d1fb56c394
      // Build Ask Chat items
      TabContextMenu.GenAI.buildTabMenu(
        document.getElementById("context_askChat"),
-@@ -9763,6 +9944,7 @@ var TabContextMenu = {
+@@ -9863,6 +10044,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 2c3e80263..49d3342cf 100644
--- a/src/browser/components/tabbrowser/content/tabgroup-js.patch
+++ b/src/browser/components/tabbrowser/content/tabgroup-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b424098ba3e7b 100644
+index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41fbf97ac20 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -14,11 +14,11 @@
@@ -77,8 +77,8 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
 +      };
  
        this.#updateLabelAriaAttributes();
-       this.#updateCollapsedAriaAttributes();
-@@ -144,6 +163,8 @@
+ 
+@@ -143,6 +162,8 @@
        // mounts after getting created by `Tabbrowser.adoptTabGroup`.
        this.#wasCreatedByAdoption = false;
      }
@@ -87,7 +87,7 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
  
      resetDefaultGroupName = () => {
        this.#defaultGroupName = "";
-@@ -228,7 +249,10 @@
+@@ -227,7 +248,10 @@
            }
          });
        }
@@ -99,7 +99,7 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
      }
  
      get color() {
-@@ -322,6 +346,9 @@
+@@ -321,6 +345,9 @@
      }
  
      set collapsed(val) {
@@ -109,7 +109,7 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
        if (!!val == this.collapsed) {
          return;
        }
-@@ -399,7 +426,6 @@
+@@ -406,7 +433,6 @@
            tabGroupName,
          })
          .then(result => {
@@ -117,7 +117,7 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
          });
      }
  
-@@ -418,7 +444,57 @@
+@@ -425,7 +451,57 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
@@ -176,7 +176,7 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
      }
  
      /**
-@@ -498,7 +574,6 @@
+@@ -506,7 +582,6 @@
      addTabs(tabs, metricsContext) {
        for (let tab of tabs) {
          if (tab.pinned) {
@@ -184,7 +184,7 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
          }
          let tabToMove =
            this.ownerGlobal === tab.ownerGlobal
-@@ -561,7 +636,7 @@
+@@ -569,7 +644,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -193,7 +193,7 @@ index 1b4f6bf4ed6556492f84476d33e9103fbb1c74e9..77bd8738db6f2e65c2bfcae8347b4240
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -630,5 +705,6 @@
+@@ -638,5 +713,6 @@
      }
    }
  
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index ec1bebfc1..b8834ec23 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,18 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78bec02d253a 100644
+index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2a736d9f8 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
-@@ -44,6 +44,9 @@
-    * @returns {MozTabbrowserTab|vbox}
-    */
-   const elementToMove = element => {
-+    if (element.group?.hasAttribute("split-view-group")) {
-+      return element.group;
-+    }
-     if (isTab(element)) {
-       return element;
-     }
-@@ -423,7 +426,7 @@
+@@ -411,7 +411,7 @@
        // and we're not hitting the scroll buttons.
        if (
          event.button != 0 ||
@@ -21,7 +11,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;
-@@ -504,7 +507,6 @@
+@@ -492,7 +492,6 @@
              });
            }
          } else if (isTabGroupLabel(event.target)) {
@@ -29,7 +19,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
          } else if (
            event.originalTarget.closest("scrollbox") &&
            !Services.prefs.getBoolPref(
-@@ -540,6 +542,9 @@
+@@ -528,6 +527,9 @@
      }
  
      on_keydown(event) {
@@ -39,153 +29,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
        let { altKey, shiftKey } = event;
        let [accel, nonAccel] =
          AppConstants.platform == "macosx"
-@@ -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
--        let pinnedTabs = this.visibleTabs.slice(0, gBrowser.pinnedTabCount);
-+        let pinnedTabs = this.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
-         let tabsPerRow = 0;
-         let position = RTL_UI
-           ? window.windowUtils.getBoundsWithoutFlushing(
-@@ -942,7 +947,7 @@
-       let dropEffect = this.getDropEffectForTabDrag(event);
-       let isMovingInTabStrip = !fromTabList && dropEffect == "move";
-       let collapseTabGroupDuringDrag =
--        isMovingInTabStrip && isTabGroupLabel(tab) && !tab.group.collapsed;
-+        isMovingInTabStrip && isTabGroupLabel(tab) && (!tab.group.collapsed || tab.group.hasAttribute("has-active"));
- 
-       tab._dragData = {
-         offsetX: this.verticalMode
-@@ -952,7 +957,7 @@
-           ? event.screenY - window.screenY - tabOffset
-           : event.screenY - window.screenY,
-         scrollPos:
--          this.verticalMode && tab.pinned
-+          this.verticalMode && tab.pinned && false
-             ? this.pinnedTabsContainer.scrollPosition
-             : this.arrowScrollbox.scrollPosition,
-         screenX: event.screenX,
-@@ -981,6 +986,7 @@
- 
-           if (collapseTabGroupDuringDrag) {
-             tab.group.collapsed = true;
-+            gZenFolders.animateGroupMove(tab.group);
-           }
-         }
-       }
-@@ -1027,6 +1033,10 @@
-       }
- 
-       let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
-+      if (draggedTab && dropEffect === "move") {
-+        gZenPinnedTabManager.applyDragoverClass(event, draggedTab);
-+        gZenViewSplitter.onBrowserDragEndToSplit(event);
-+      }
-       if (
-         (dropEffect == "move" || dropEffect == "copy") &&
-         document == draggedTab.ownerDocument &&
-@@ -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();
-+      if (draggedTab?.hasAttribute("zen-has-splitted")) {
-+        draggedTab.removeAttribute("zen-has-splitted");
-+        draggedTab._visuallySelected = false;
-+      }
-+      if (draggedTab && dropEffect == "move") {
-+        let moved = gZenPinnedTabManager.moveToAnotherTabContainerIfNecessary(event, movingTabs);
-+
-+        if (moved) {
-+          this.finishMoveTogetherSelectedTabs(draggedTab);
-+          return;
-+        }
-+      }
-       if (draggedTab && dropEffect == "copy") {
-         let duplicatedDraggedTab;
-         let duplicatedTabs = [];
-@@ -1232,8 +1255,9 @@
-         let translateOffsetY = oldTranslateY % tabHeight;
-         let newTranslateX = oldTranslateX - translateOffsetX;
-         let newTranslateY = oldTranslateY - translateOffsetY;
--        let isPinned = draggedTab.pinned;
--        let numPinned = gBrowser.pinnedTabCount;
-+        let isPinned = draggedTab?.group ? draggedTab.group.pinned : draggedTab.pinned;
-+        let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
-+        let essential = draggedTab.hasAttribute("zen-essential");
- 
-         if (this.#isContainerVerticalPinnedGrid(draggedTab)) {
-           // Update both translate axis for pinned vertical expanded tabs
-@@ -1249,8 +1273,8 @@
-           }
-         } else {
-           let tabs = this.ariaFocusableItems.slice(
--            isPinned ? 0 : numPinned,
--            isPinned ? numPinned : undefined
-+            isPinned ? (essential ? 0 : gBrowser._numZenEssentials) : numPinned,
-+            isPinned ? (essential ? gBrowser._numZenEssentials : numPinned) : undefined
-           );
-           let size = this.verticalMode ? "height" : "width";
-           let screenAxis = this.verticalMode ? "screenY" : "screenX";
-@@ -1299,11 +1323,13 @@
-           this.dragToPinPromoCard,
-         ];
-         let shouldPin =
-+          false &&
-           isTab(draggedTab) &&
-           !draggedTab.pinned &&
-           (overPinnedDropIndicator ||
-             dragToPinTargets.some(el => el.contains(event.target)));
-         let shouldUnpin =
-+          false &&
-           isTab(draggedTab) &&
-           draggedTab.pinned &&
-           this.arrowScrollbox.contains(event.target);
-@@ -1321,6 +1347,7 @@
-             (oldTranslateY && oldTranslateY != newTranslateY);
-         } else if (this.verticalMode) {
-           shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
-+          shouldTranslate = false;
-         } else {
-           shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
-         }
-@@ -1515,6 +1542,7 @@
- 
-           let nextItem = this.ariaFocusableItems[newIndex];
-           let tabGroup = isTab(nextItem) && nextItem.group;
-+          if (gZenViewSplitter.handleTabDrop(event, urls, replace, inBackground)) return;
-           gBrowser.loadTabs(urls, {
-             inBackground,
-             replace,
-@@ -1553,6 +1581,17 @@
-       }
-       this.#resetTabsAfterDrop(draggedTab.ownerDocument);
- 
-+      if (!dt.mozUserCancelled && dt.dropEffect == "none" && !this._isCustomizing) {
-+        const moved = gZenViewSplitter.moveTabToSplitView(event, draggedTab);
-+        if (moved) {
-+          delete draggedTab._dragData;
-+          return;
-+        }
-+      } else if (dt.mozUserCancelled) {
-+        gZenViewSplitter.onBrowserDragEndToSplit(event, true);
-+        if (gZenViewSplitter._lastOpenedTab) gZenViewSplitter._lastOpenedTab._visuallySelected = false;
-+      }
-+
-       if (
-         dt.mozUserCancelled ||
-         dt.dropEffect != "none" ||
-@@ -1719,7 +1758,6 @@
+@@ -720,7 +722,6 @@
  
        this.toggleAttribute("overflow", true);
        this._updateCloseButtons();
@@ -193,7 +37,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
  
        document
          .getElementById("tab-preview-panel")
-@@ -1777,7 +1815,7 @@
+@@ -780,7 +781,7 @@
      }
  
      get newTabButton() {
@@ -202,7 +46,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
      }
  
      get verticalMode() {
-@@ -1793,6 +1831,7 @@
+@@ -796,6 +797,7 @@
      }
  
      get overflowing() {
@@ -210,7 +54,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
        return this.hasAttribute("overflow");
      }
  
-@@ -1806,29 +1845,54 @@
+@@ -809,29 +811,54 @@
        if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
          pinnedChildren.pop();
        }
@@ -275,7 +119,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
      }
  
      /**
-@@ -1895,29 +1959,23 @@
+@@ -898,17 +925,10 @@
  
        let elementIndex = 0;
  
@@ -295,26 +139,22 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
          if (isTab(child) && child.visible) {
            child.elementIndex = elementIndex++;
            focusableItems.push(child);
-         } else if (isTabGroup(child)) {
+@@ -916,11 +936,13 @@
            child.labelElement.elementIndex = elementIndex++;
            focusableItems.push(child.labelElement);
--
--          let visibleTabsInGroup = child.tabs.filter(tab => tab.visible);
--          visibleTabsInGroup.forEach(tab => {
--            tab.elementIndex = elementIndex++;
--          });
--          focusableItems.push(...visibleTabsInGroup);
-+          if (!child.hasAttribute("split-view-group")) {
-+            let visibleTabsInGroup = child.childGroupsAndTabs.filter(tab => tab.visible);
-+            visibleTabsInGroup.forEach(tab => {
-+              tab.elementIndex = elementIndex++;
-+            });
-+           focusableItems.push(...visibleTabsInGroup);
-+          }
-         }
-       }
  
-@@ -1929,6 +1987,7 @@
+-          let visibleTabsInGroup = child.tabs.filter(tab => tab.visible);
++        if (!child.hasAttribute("split-view-group")) {
++          let visibleTabsInGroup = child.childGroupsAndTabs.filter(tab => tab.visible);
+           visibleTabsInGroup.forEach(tab => {
+             tab.elementIndex = elementIndex++;
+           });
+           focusableItems.push(...visibleTabsInGroup);
++        }
+         } else if (child.tagName == "tab-split-view-wrapper") {
+           let visibleTabsInSplitView = child.tabs.filter(tab => tab.visible);
+           visibleTabsInSplitView.forEach(tab => {
+@@ -964,6 +986,7 @@
      _invalidateCachedTabs() {
        this.#allTabs = null;
        this._invalidateCachedVisibleTabs();
@@ -322,18 +162,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
      }
  
      _invalidateCachedVisibleTabs() {
-@@ -1944,8 +2003,8 @@
-     #isContainerVerticalPinnedGrid(tab) {
-       return (
-         this.verticalMode &&
--        tab.pinned &&
--        this.hasAttribute("expanded") &&
-+        (tab.hasAttribute("zen-essential")) &&
-+        (this.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
-         !this.expandOnHover
-       );
-     }
-@@ -1961,7 +2020,7 @@
+@@ -1067,7 +1090,7 @@
  
        if (node == null) {
          // We have a container for non-tab elements at the end of the scrollbox.
@@ -342,7 +171,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
        }
  
        node.before(tab);
-@@ -2056,7 +2115,7 @@
+@@ -1162,7 +1185,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.
@@ -351,7 +180,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
            const newTab2 = this.newTabButton;
            const newTabVertical = document.getElementById(
              "vertical-tabs-newtab-button"
-@@ -2156,8 +2215,10 @@
+@@ -1263,8 +1286,10 @@
       */
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
@@ -362,7 +191,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -2166,7 +2227,7 @@
+@@ -1273,7 +1298,7 @@
       * @param {boolean} [shouldScrollInstantly=false]
       */
      #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
@@ -371,265 +200,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
        if (arrowScrollbox?.overflowing) {
          arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
        }
-@@ -2305,6 +2366,16 @@
-       when the tab is first selected to be dragged.
-     */
-     #updateTabStylesOnDrag(tab) {
-+      let { movingTabs: zenMovingTabs } = tab._dragData;
-+      for (let movingTab of zenMovingTabs.slice(zenMovingTabs.findIndex(t => t._tPos == tab._tPos))) {
-+        if (isTabGroupLabel(tab)) {
-+          movingTab = movingTab.parentElement;
-+        }
-+        // "dragtarget" contains the following rules which must only be set AFTER the above
-+        // elements have been adjusted. {z-index: 3 !important, position: absolute !important}
-+        movingTab.setAttribute("zen-dragtarget", "");
-+      }
-+      return;
-       let isPinned = tab.pinned;
-       let numPinned = gBrowser.pinnedTabCount;
-       let allTabs = this.ariaFocusableItems;
-@@ -2578,7 +2649,7 @@
-         return;
-       }
- 
--      let tabs = this.visibleTabs.slice(0, gBrowser.pinnedTabCount);
-+      let tabs = this.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
- 
-       let directionX = screenX > dragData.animLastScreenX;
-       let directionY = screenY > dragData.animLastScreenY;
-@@ -2587,6 +2658,8 @@
- 
-       let { width: tabWidth, height: tabHeight } =
-         draggedTab.getBoundingClientRect();
-+      tabWidth += 4; // Add 4px to account for the gap
-+      tabHeight += 4;
-       let shiftSizeX = tabWidth * movingTabs.length;
-       let shiftSizeY = tabHeight;
-       dragData.tabWidth = tabWidth;
-@@ -2623,8 +2696,8 @@
-       let lastBoundX =
-         lastTabInRow.screenX +
-         lastTabInRow.getBoundingClientRect().width -
--        (lastMovingTabScreenX + tabWidth);
--      let lastBoundY = periphery.screenY - (lastMovingTabScreenY + tabHeight);
-+        (lastMovingTabScreenX + tabWidth) + 4;
-+      let lastBoundY = lastTab.screenY - lastMovingTabScreenY;
-       translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX);
-       translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
- 
-@@ -2782,13 +2855,18 @@
-       this.#clearDragOverGroupingTimer();
-       this.#clearPinnedDropIndicatorTimer();
- 
--      let isPinned = draggedTab.pinned;
--      let numPinned = gBrowser.pinnedTabCount;
-+      let isPinned = draggedTab?.group ? draggedTab.group.pinned : draggedTab.pinned;
-+      let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
-+      let essential = draggedTab.hasAttribute("zen-essential");
-+      const isDraggingFolder = isTabGroupLabel(draggedTab) && draggedTab.group?.isZenFolder;
-       let allTabs = this.ariaFocusableItems;
-       let tabs = allTabs.slice(
--        isPinned ? 0 : numPinned,
--        isPinned ? numPinned : undefined
-+        (isPinned && essential) ? 0 : gBrowser._numZenEssentials,
-+        isPinned ? (essential ? gBrowser._numZenEssentials : (isDraggingFolder ? numPinned : undefined)) : undefined
-       );
-+      if (draggedTab.group?.hasAttribute("split-view-group")) {
-+        draggedTab = draggedTab.group.labelElement;
-+      }
- 
-       if (this.#rtlMode) {
-         tabs.reverse();
-@@ -2799,7 +2877,7 @@
-       let screenAxis = this.verticalMode ? "screenY" : "screenX";
-       let size = this.verticalMode ? "height" : "width";
-       let translateAxis = this.verticalMode ? "translateY" : "translateX";
--      let { width: tabWidth, height: tabHeight } = bounds(draggedTab);
-+      let { width: tabWidth, height: tabHeight } = bounds(draggedTab.group?.hasAttribute("split-view-group") ? draggedTab.group : draggedTab);
-       let tabSize = this.verticalMode ? tabHeight : tabWidth;
-       let translateX = event.screenX - dragData.screenX;
-       let translateY = event.screenY - dragData.screenY;
-@@ -2815,6 +2893,12 @@
-       );
-       let lastMovingTab = movingTabs.at(-1);
-       let firstMovingTab = movingTabs[0];
-+      if (lastMovingTab.group?.hasAttribute("split-view-group")) {
-+        lastMovingTab = lastMovingTab.group;
-+      }
-+      if (firstMovingTab.group?.hasAttribute("split-view-group")) {
-+        firstMovingTab = firstMovingTab.group;
-+      }
-       let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
-       let lastMovingTabScreen = endEdge(lastMovingTab);
-       let firstMovingTabScreen = firstMovingTab[screenAxis];
-@@ -2829,6 +2913,11 @@
-       let endBound = this.#rtlMode
-         ? endEdge(this) - lastMovingTabScreen
-         : periphery[screenAxis] - 1 - lastMovingTabScreen;
-+      let firstTab = tabs.at(this.#rtlMode ? -1 : 0);
-+      let lastTab = tabs.at(this.#rtlMode ? 0 : -1);
-+      startBound = firstTab[screenAxis] - firstMovingTabScreen;
-+      endBound = endEdge(lastTab) - lastMovingTabScreen;
-+      endBound = gZenPinnedTabManager.getLastTabBound(endBound, lastTab, isDraggingFolder);
-       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 +3107,8 @@
-       };
- 
-       let dropElement = getOverlappedElement();
-+      if (dropElement?.hasAttribute("split-view-group")) dropElement = dropElement.labelElement;
-+      gZenPinnedTabManager.animateSeparatorMove(movingTabs, dropElement, isPinned, event);
- 
-       let newDropElementIndex;
-       if (dropElement) {
-@@ -3099,7 +3190,7 @@
-           ? Services.prefs.getIntPref(
-               "browser.tabs.dragDrop.moveOverThresholdPercent"
-             ) / 100
--          : 0.5;
-+          : Services.prefs.getIntPref('zen.view.drag-and-drop.move-over-threshold') / 100;
-         moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
-         let shouldMoveOver = overlapPercent > moveOverThreshold;
-         if (logicalForward && shouldMoveOver) {
-@@ -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 (
-+          false &&
-           isTabGroupLabel(draggedTab) &&
-           dropElement?.group &&
-           (!dropElement.group.collapsed ||
-@@ -3158,20 +3250,13 @@
-         let isOutOfBounds = isPinned
-           ? dropElement.elementIndex >= numPinned
-           : dropElement.elementIndex < numPinned;
--        if (isOutOfBounds) {
--          // Drop after last pinned tab
--          dropElement = this.ariaFocusableItems[numPinned - 1];
--          dropBefore = false;
--        }
-       }
- 
--      if (
--        gBrowser._tabGroupsEnabled &&
--        isTab(draggedTab) &&
--        !isPinned &&
--        (!numPinned || newDropElementIndex > numPinned)
--      ) {
-+      if (isTab(draggedTab) || isTabGroupLabel(draggedTab)) {
-         let dragOverGroupingThreshold = 1 - moveOverThreshold;
-+        if (draggedTab && !dropElement?.group) {
-+          gZenFolders.highlightGroupOnDragOver(null);
-+        }
-         let groupingDelay = Services.prefs.getIntPref(
-           "browser.tabs.dragDrop.createGroup.delayMS"
-         );
-@@ -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 =
-+          false &&
-           !movingTabsSet.has(dropElement) &&
-           isTab(dropElement) &&
-           !dropElement?.group &&
-@@ -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 =
-+          false &&
-           isTabGroupLabel(dropElement) &&
-           dropElement.group.collapsed &&
-           overlapPercent > dragOverGroupingThreshold;
-@@ -3231,19 +3318,14 @@
-             dropElement = dropElementGroup;
-             colorCode = undefined;
-           } else if (isTabGroupLabel(dropElement)) {
--            if (dropBefore) {
--              // Dropping right before the tab group.
--              dropElement = dropElementGroup;
--              colorCode = undefined;
--            } else if (dropElementGroup.collapsed) {
--              // Dropping right after the collapsed tab group.
--              dropElement = dropElementGroup;
--              colorCode = undefined;
--            } else {
--              // Dropping right before the first tab in the tab group.
--              dropElement = dropElementGroup.tabs[0];
--              dropBefore = true;
--            }
-+            ({ dropElement, colorCode, dropBefore } = gZenFolders.handleDragOverTabGroupLabel(
-+              dropElement,
-+              draggedTab,
-+              overlapPercent,
-+              movingTabs,
-+              dropBefore,
-+              colorCode
-+            ));
-           }
-           this.#setDragOverGroupColor(colorCode);
-           this.toggleAttribute("movingtab-addToGroup", colorCode);
-@@ -3262,11 +3344,11 @@
-       dragData.dropElement = dropElement;
-       dragData.dropBefore = dropBefore;
-       dragData.animDropElementIndex = newDropElementIndex;
--
-+      gZenFolders.setFolderIndentation(movingTabs, dropElement);
-       // Shift background tabs to leave a gap where the dragged tab
-       // would currently be dropped.
-       for (let item of tabs) {
--        if (item == draggedTab) {
-+        if (item == draggedTab || (item.group?.hasAttribute("split-view-group") && item.group == draggedTab.group)) {
-           continue;
-         }
- 
-@@ -3388,12 +3470,14 @@
-       element?.removeAttribute("dragover-groupTarget");
-     }
- 
--    finishAnimateTabMove() {
--      if (!this.#isMovingTab()) {
-+    finishAnimateTabMove(always = false) {
-+      gZenPinnedTabManager.onDragFinish();
-+      if (!this.#isMovingTab() && !always) {
-         return;
-       }
- 
-       this.#setMovingTabMode(false);
-+      gZenFolders.highlightGroupOnDragOver(null);
- 
-       for (let item of this.ariaFocusableItems) {
-         this.#resetGroupTarget(item);
-@@ -3440,17 +3524,16 @@
-         tab.style.left = "";
-         tab.style.top = "";
-         tab.style.maxWidth = "";
--        tab.removeAttribute("dragtarget");
-+        tab.removeAttribute("zen-dragtarget");
-       }
-       for (let label of draggedTabDocument.getElementsByClassName(
-         "tab-group-label-container"
-       )) {
-         label.style.width = "";
--        label.style.height = "";
-         label.style.left = "";
-         label.style.top = "";
-         label.style.maxWidth = "";
--        label.removeAttribute("dragtarget");
-+        label.removeAttribute("zen-dragtarget");
-       }
-       let periphery = draggedTabDocument.getElementById(
-         "tabbrowser-arrowscrollbox-periphery"
-@@ -3522,7 +3605,7 @@
-         let postTransitionCleanup = () => {
-           movingTab._moveTogetherSelectedTabsData.animate = false;
-         };
--        if (gReduceMotion) {
-+        if (true || gReduceMotion) {
-           postTransitionCleanup();
-         } else {
-           let onTransitionEnd = transitionendEvent => {
-@@ -3686,7 +3769,7 @@
+@@ -1406,7 +1431,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -638,25 +209,3 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..97cdeaf7cde41f39d70bd50ac8ca78be
          return;
        }
  
-@@ -3795,7 +3878,10 @@
-     #getDragTarget(event, { ignoreSides = false } = {}) {
-       let { target } = event;
-       while (target) {
--        if (isTab(target) || isTabGroupLabel(target)) {
-+        if (isTab(target) || isTabGroupLabel(target) || target?.classList?.contains("tab-group-label-container")) {
-+          if (target.classList?.contains("tab-group-label-container")) {
-+            target = target.querySelector(".tab-group-label");
-+          }
-           break;
-         }
-         target = target.parentNode;
-@@ -3812,6 +3898,9 @@
-           return null;
-         }
-       }
-+      if (target?.group?.hasAttribute("split-view-group")) {
-+        target = target.group.labelElement;
-+      }
-       return target;
-     }
- 
diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
index 8ad0e02f6..dc004d516 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 a1faf7e4278c66865f267283515f22052769928d..297391205ab3cd96bed2e5a3e36a181c6da90098 100644
+index 880f65b493ba5e9b9750e84c2ba5d08b99e3dad9..c4a495887926fc6f13312a29998d03bfe907f0e2 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -297,7 +297,6 @@ export class UrlbarController {
+@@ -299,7 +299,6 @@ export class UrlbarController {
      const isMac = AppConstants.platform == "macosx";
      // Handle readline/emacs-style navigation bindings on Mac.
      if (
@@ -10,7 +10,7 @@ index a1faf7e4278c66865f267283515f22052769928d..297391205ab3cd96bed2e5a3e36a181c
        this.view.isOpen &&
        event.ctrlKey &&
        (event.key == "n" || event.key == "p")
-@@ -441,6 +440,8 @@ export class UrlbarController {
+@@ -443,6 +442,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 274325f5b..ac3e26172 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 afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d355858bcf37b 100644
+index 4b7232f3261f8589b734c2238170e6968d7ea0bf..d8c0b404724e9b0dc2b5a2d21420357586fb7f14 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
-@@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
+@@ -84,6 +84,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
    lazy.UrlbarUtils.getLogger({ prefix: "Input" })
  );
  
@@ -16,7 +16,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  
  const UNLIMITED_MAX_RESULTS = 99;
-@@ -437,7 +444,16 @@ export class UrlbarInput {
+@@ -454,7 +461,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 afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -513,6 +529,10 @@ export class UrlbarInput {
+@@ -530,6 +546,10 @@ export class UrlbarInput {
      hideSearchTerms = false,
      isSameDocument = false
    ) {
@@ -44,7 +44,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      if (!this.isAddressbar) {
        throw new Error(
          "Cannot set URI for UrlbarInput that is not an address bar"
-@@ -790,8 +810,16 @@ export class UrlbarInput {
+@@ -807,8 +827,16 @@ export class UrlbarInput {
          return;
        }
      }
@@ -62,7 +62,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
    }
  
    /**
-@@ -1207,7 +1235,11 @@ export class UrlbarInput {
+@@ -1224,7 +1252,11 @@ export class UrlbarInput {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      }
  
      if (isCanonized) {
-@@ -2298,6 +2330,32 @@ export class UrlbarInput {
+@@ -2347,6 +2379,32 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -108,7 +108,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2312,6 +2370,13 @@ export class UrlbarInput {
+@@ -2361,6 +2419,13 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -122,7 +122,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      // 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 +2396,24 @@ export class UrlbarInput {
+@@ -2380,6 +2445,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -147,7 +147,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2361,7 +2444,7 @@ export class UrlbarInput {
+@@ -2410,7 +2493,7 @@ export class UrlbarInput {
      forceUnifiedSearchButtonAvailable = false
    ) {
      let prevState = this.getAttribute("pageproxystate");
@@ -156,7 +156,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      this.setAttribute("pageproxystate", state);
      this._inputContainer.setAttribute("pageproxystate", state);
      this._identityBox?.setAttribute("pageproxystate", state);
-@@ -2595,10 +2678,12 @@ export class UrlbarInput {
+@@ -2646,10 +2729,12 @@ export class UrlbarInput {
        return;
      }
      this.textbox.style.top = px(
@@ -169,7 +169,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      );
    }
  
-@@ -2658,9 +2743,10 @@ export class UrlbarInput {
+@@ -2709,9 +2794,10 @@ export class UrlbarInput {
            return;
          }
  
@@ -181,7 +181,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -3093,6 +3179,7 @@ export class UrlbarInput {
+@@ -3144,6 +3230,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -189,7 +189,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3197,7 +3284,7 @@ export class UrlbarInput {
+@@ -3248,7 +3335,7 @@ export class UrlbarInput {
        return val;
      }
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -198,7 +198,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3501,6 +3588,7 @@ export class UrlbarInput {
+@@ -3552,6 +3639,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -206,7 +206,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      if (this.isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -3608,6 +3696,10 @@ export class UrlbarInput {
+@@ -3659,6 +3747,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -217,7 +217,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3615,6 +3707,9 @@ export class UrlbarInput {
+@@ -3666,6 +3758,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -227,7 +227,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      return where;
    }
  
-@@ -3872,6 +3967,7 @@ export class UrlbarInput {
+@@ -3923,6 +4018,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -235,7 +235,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
  
        this._suppressStartQuery = false;
      });
-@@ -3879,7 +3975,6 @@ export class UrlbarInput {
+@@ -3930,7 +4026,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.
@@ -243,7 +243,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -3991,7 +4086,11 @@ export class UrlbarInput {
+@@ -4040,7 +4135,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -256,7 +256,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4302,6 +4401,7 @@ export class UrlbarInput {
+@@ -4351,6 +4450,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -264,7 +264,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4413,6 +4513,11 @@ export class UrlbarInput {
+@@ -4462,6 +4562,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -276,7 +276,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4485,7 +4590,7 @@ export class UrlbarInput {
+@@ -4534,7 +4639,7 @@ export class UrlbarInput {
        }
      }
  
@@ -285,7 +285,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4525,9 +4630,16 @@ export class UrlbarInput {
+@@ -4574,9 +4679,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -303,7 +303,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
  
          if (
            event.target != this.inputField &&
-@@ -4538,6 +4650,10 @@ export class UrlbarInput {
+@@ -4587,6 +4699,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -314,7 +314,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4573,7 +4689,7 @@ export class UrlbarInput {
+@@ -4622,7 +4738,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.
@@ -323,7 +323,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..f28c9a1ac086af429a93bd01be5d3558
            break;
          }
  
-@@ -4890,7 +5006,7 @@ export class UrlbarInput {
+@@ -4939,7 +5055,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 c737569ca..c40310518 100644
--- a/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-index 20be2dbbb8471aeb43a9bf77888c9858a0b61186..a9f974a78c5676d1340a3543852e4126c1d32b04 100644
+index c12d875172650dddfe7de623a776149517c83302..66e923ed2c84e350dd7ba7a20e362666cec8f307 100644
 --- a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
 +++ b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-@@ -852,6 +852,7 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
+@@ -854,6 +854,7 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
      }
  
      if (result.providerName == "UrlbarProviderTabToSearch") {
@@ -10,7 +10,7 @@ index 20be2dbbb8471aeb43a9bf77888c9858a0b61186..a9f974a78c5676d1340a3543852e4126
        // Discard the result if a tab-to-search result was added already.
        if (!state.canAddTabToSearch) {
          return false;
-@@ -1498,7 +1499,9 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
+@@ -1500,7 +1501,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 539445412..b4a67ce95 100644
--- a/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-index 46ad55519aecd6c14034a9faa91c7ad8e5c1c422..e8d9c06499a2b273483edd21faf902c936462b59 100644
+index 531cecb9da3465d392ea82248e6ebb3fe6476b47..f3cce2a66bb8465ae022df0c1b9823e7e88cba21 100644
 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
 +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
 @@ -731,6 +731,7 @@ function makeResultGroups({ showSearchSuggestionsFirst }) {
diff --git a/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch b/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
index 7862a4a27..396ba65f0 100644
--- a/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
-index b2c3bfa6fbe83fceb019196c210baaa7b4881372..02f2c8be89f163e16c5fd29f9b7e145e16ea53ed 100644
+index 91abb674d26dc7e2a919c94087b180a6148248fd..80551acd18228f19cb179f71adc4f58bc893ac14 100644
 --- a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
 @@ -44,11 +44,13 @@ function defaultQuery(conditions = "") {
@@ -26,7 +26,7 @@ index b2c3bfa6fbe83fceb019196c210baaa7b4881372..02f2c8be89f163e16c5fd29f9b7e145e
                                h.visit_count, h.typed,
                                0, t.open_count,
                                :matchBehavior, :searchBehavior, NULL)
-@@ -1120,11 +1122,13 @@ Search.prototype = {
+@@ -1126,11 +1128,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 b06de00cf..d2dbed260 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 ece407214669009e263b507b5236ab28da33efe9..8f22426295e2b001438918f44d2c22ed7a697c2f 100644
+index b864cf9a9159d1f4e162ff5e8895a2bc95dee881..b30ee47b4f6d9025648ca5d93ee79f993cb6f4c2 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-@@ -845,6 +845,7 @@ export class Query {
+@@ -873,6 +873,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 12bdd6dba..f2d58b268 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 f38e860e46fa979b3e0c66ecd3eb88a64df60fc1..d130bbc7488ff3de926823974a1df13dc8e61fbc 100644
+index 079c9f18550b54b2a1cc030174849896fd23234e..605bb3433b61443037659d126ba17b033e5a4394 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -74,6 +74,7 @@ export var UrlbarUtils = {
+@@ -77,6 +77,7 @@ export var UrlbarUtils = {
      RESTRICT_SEARCH_KEYWORD: "restrictSearchKeyword",
      SUGGESTED_INDEX: "suggestedIndex",
      TAIL_SUGGESTION: "tailSuggestion",
@@ -10,7 +10,7 @@ index f38e860e46fa979b3e0c66ecd3eb88a64df60fc1..d130bbc7488ff3de926823974a1df13d
    }),
  
    // Defines provider types.
-@@ -133,6 +134,7 @@ export var UrlbarUtils = {
+@@ -136,6 +137,7 @@ export var UrlbarUtils = {
      OTHER_NETWORK: 6,
      ADDON: 7,
      ACTIONS: 8,
@@ -18,7 +18,7 @@ index f38e860e46fa979b3e0c66ecd3eb88a64df60fc1..d130bbc7488ff3de926823974a1df13d
    }),
  
    // Per-result exposure telemetry.
-@@ -544,6 +546,8 @@ export var UrlbarUtils = {
+@@ -547,6 +549,8 @@ export var UrlbarUtils = {
            return this.RESULT_GROUP.HEURISTIC_FALLBACK;
          case "UrlbarProviderHistoryUrlHeuristic":
            return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;
diff --git a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
index 81ea5fc30..4a44486be 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 50961e4beb75012ef0ed6f261a95854712cc69d7..93bcfca9270ff34dbe6386789fdae6066457438d 100644
+index beff1d41e47efad09256459589176d96c69f7a8a..c850dad31454d61c4edb6e183db07b2d51fb9fc8 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 26c99b0e8..ad96d3e95 100644
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index b3c7c8a995226e2cbe852d82515f9bc7077980e7..4c8611556f7f71e5f8860787ed1db9b50b9fa2e8 100644
+index 38e4987dc906cf3c668995aab79fc15a02834677..de9d69a4faab3cfa249de41ef573ae2ef873b348 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
 @@ -620,7 +620,7 @@ export class UrlbarView {
@@ -11,7 +11,7 @@ index b3c7c8a995226e2cbe852d82515f9bc7077980e7..4c8611556f7f71e5f8860787ed1db9b5
          // 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.
-@@ -2734,6 +2734,8 @@ export class UrlbarView {
+@@ -2751,6 +2751,8 @@ export class UrlbarView {
        if (row?.hasAttribute("row-selectable")) {
          row?.toggleAttribute("selected", true);
        }
@@ -20,7 +20,7 @@ index b3c7c8a995226e2cbe852d82515f9bc7077980e7..4c8611556f7f71e5f8860787ed1db9b5
        if (element != row) {
          row?.toggleAttribute("descendant-selected", true);
        }
-@@ -3215,7 +3217,7 @@ export class UrlbarView {
+@@ -3232,7 +3234,7 @@ export class UrlbarView {
    }
  
    #enableOrDisableRowWrap() {
diff --git a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
index fb2d74187..20abe082c 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 6207e6c8aa1e303ec151bc1e5c51c277ef776ee6..d3783a3c459c94880be1c95dc265a7d4887f67a1 100644
+index 7e50d7f5512cb4304d6fd2ecb6952fbff0b8f98e..ba09805f07b754b4b36d5a650252d5578184d031 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -223,7 +223,7 @@ export const PREFS_CONFIG = new Map([
+@@ -250,7 +250,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 2f18925ed..f4bb3e12d 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 b884f0167e5de87a45cf523436ceaceb710d35ae..eedc80278a5c93f81ce90c0d6198924549c07fc3 100644
+index bb06e9224a4e195122d8a47ccf97c3481342cf86..959862e95ec00c7dc18256bd2572c1d7285415d4 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -362,17 +362,17 @@ bin/libfreebl_64int_3.so
+@@ -372,17 +372,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
diff --git a/src/browser/installer/windows/nsis/defines-nsi-in.patch b/src/browser/installer/windows/nsis/defines-nsi-in.patch
index 2f7d2923e..09d60e5e3 100644
--- a/src/browser/installer/windows/nsis/defines-nsi-in.patch
+++ b/src/browser/installer/windows/nsis/defines-nsi-in.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
-index f78af1e3634dd503089ff8bdab5adba614a87892..4a19de8e89efadf2456011e2da2907a1135fe766 100644
+index 51743f6157d69e9303ed480254c199791f1a4db8..2e113512c2f0b094aa50a4f0499607ad9eb7eaf8 100644
 --- a/browser/installer/windows/nsis/defines.nsi.in
 +++ b/browser/installer/windows/nsis/defines.nsi.in
 @@ -90,7 +90,7 @@
@@ -11,7 +11,7 @@ index f78af1e3634dd503089ff8bdab5adba614a87892..4a19de8e89efadf2456011e2da2907a1
  
  # ARCH is used when it is necessary to differentiate the x64 registry keys from
  # the x86 registry keys (e.g. the uninstall registry key).
-@@ -154,7 +154,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
+@@ -153,7 +153,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
  !define APPROXIMATE_REQUIRED_SPACE_MB "145"
  
  # Constants for parts of the telemetry submission URL
diff --git a/src/browser/installer/windows/nsis/installer-nsi.patch b/src/browser/installer/windows/nsis/installer-nsi.patch
index e3a9aa0b8..5c43ebe60 100644
--- a/src/browser/installer/windows/nsis/installer-nsi.patch
+++ b/src/browser/installer/windows/nsis/installer-nsi.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
-index 92eb3f11ea8035ce72eb5b1e110c98b1ef8665d1..e6b91ecfa8f16d2b884c70468ec1d3a0197351d1 100755
+index 4ecf1ea7e325b23a901ec75687c6b959085c8207..28c4b462dab0c4830a4bfb4c9cdf82a8aa919456 100755
 --- a/browser/installer/windows/nsis/installer.nsi
 +++ b/browser/installer/windows/nsis/installer.nsi
-@@ -841,7 +841,7 @@ Section "-InstallEndCleanup"
+@@ -842,7 +842,7 @@ Section "-InstallEndCleanup"
    ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't
    ; invoked when we're running silently.
    ${If} ${Silent}
@@ -11,7 +11,7 @@ index 92eb3f11ea8035ce72eb5b1e110c98b1ef8665d1..e6b91ecfa8f16d2b884c70468ec1d3a0
    ${EndIf}
  SectionEnd
  
-@@ -1969,5 +1969,5 @@ FunctionEnd
+@@ -1970,5 +1970,5 @@ FunctionEnd
  
  Function .onGUIEnd
    ${OnEndCommon}
diff --git a/src/browser/installer/windows/nsis/uninstaller-nsi.patch b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
index efc934a82..2136ef157 100644
--- a/src/browser/installer/windows/nsis/uninstaller-nsi.patch
+++ b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
 old mode 100755
 new mode 100644
-index 559c8b46ee06bc42c91da49b5d9e397fe8ff6126..62094a5d98712a41a607ba01ca2adfa1e4f51ccd
+index fd104f8ab0bd51d6a99c121b60e2695a54b0dfd0..9b117e5a1f5e8adac7d22cd65154529418fd2e5b
 --- a/browser/installer/windows/nsis/uninstaller.nsi
 +++ b/browser/installer/windows/nsis/uninstaller.nsi
-@@ -507,6 +507,7 @@ Section "Uninstall"
+@@ -519,6 +519,7 @@ Section "Uninstall"
    ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
    ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"
    ${un.RegCleanFileHandler}  ".avif"  "FirefoxHTML-$AppUserModelID"
diff --git a/src/browser/modules/BrowserDOMWindow-sys-mjs.patch b/src/browser/modules/BrowserDOMWindow-sys-mjs.patch
index a0d49d806..053fb1028 100644
--- a/src/browser/modules/BrowserDOMWindow-sys-mjs.patch
+++ b/src/browser/modules/BrowserDOMWindow-sys-mjs.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/modules/BrowserDOMWindow.sys.mjs b/browser/modules/BrowserDOMWindow.sys.mjs
-index 534d23b3e66176ea77f3ef577bf9630626948b9d..752e229bbe725ae394b7648adb949635f2bd70e4 100644
+index e951af5edb966718ee20422c8e46d868c177cd1c..cd41305a4da8e675417eca7df5cd4a1ecee90c3d 100644
 --- a/browser/modules/BrowserDOMWindow.sys.mjs
 +++ b/browser/modules/BrowserDOMWindow.sys.mjs
-@@ -374,7 +374,7 @@ export class BrowserDOMWindow {
+@@ -437,7 +437,7 @@ export class BrowserDOMWindow {
      // Passing a null-URI to only create the content window,
      // and pass true for aSkipLoad to prevent loading of
      // about:blank
--    return this.getContentWindowOrOpenURIInFrame(
-+    let res = this.getContentWindowOrOpenURIInFrame(
+-    return this.#getContentWindowOrOpenURIInFrame(
++    let res = this.#getContentWindowOrOpenURIInFrame(
        null,
        aParams,
        aWhere,
-@@ -382,6 +382,10 @@ export class BrowserDOMWindow {
+@@ -445,6 +445,10 @@ export class BrowserDOMWindow {
        aName,
        true
      );
@@ -21,4 +21,4 @@ index 534d23b3e66176ea77f3ef577bf9630626948b9d..752e229bbe725ae394b7648adb949635
 +    return res;
    }
  
-   openURIInFrame(aURI, aParams, aWhere, aFlags, aName) {
+   /**
diff --git a/src/browser/modules/ExtensionsUI-sys-mjs.patch b/src/browser/modules/ExtensionsUI-sys-mjs.patch
index 0466fcc51..736ae6904 100644
--- a/src/browser/modules/ExtensionsUI-sys-mjs.patch
+++ b/src/browser/modules/ExtensionsUI-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/modules/ExtensionsUI.sys.mjs b/browser/modules/ExtensionsUI.sys.mjs
-index 17cad7b3fbdd6dff862483892f37f72c00792c88..90ea4d95738eb50d1a4a67ee7df087e7c2a68b3d 100644
+index 31229b3bc1b93565a57c2c0b0307ceeb594c3936..30456ef5d3c58e96717cd292f861a04a790d0ee1 100644
 --- a/browser/modules/ExtensionsUI.sys.mjs
 +++ b/browser/modules/ExtensionsUI.sys.mjs
-@@ -478,7 +478,7 @@ export var ExtensionsUI = {
+@@ -480,7 +480,7 @@ export var ExtensionsUI = {
          eventCallback,
          removeOnDismissal: true,
          popupOptions: {
diff --git a/src/browser/modules/URILoadingHelper-sys-mjs.patch b/src/browser/modules/URILoadingHelper-sys-mjs.patch
index ee763d2b8..d507c1852 100644
--- a/src/browser/modules/URILoadingHelper-sys-mjs.patch
+++ b/src/browser/modules/URILoadingHelper-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/modules/URILoadingHelper.sys.mjs b/browser/modules/URILoadingHelper.sys.mjs
-index f7a3e8272f1f22286a26bf50d78b23aa82b49df8..a690732012331dfc40cc08fef4453c28c6587a24 100644
+index 04d0b47099648cfd00e72ef260d44628718809ee..49cd0215778a33a80d1f45b8e2701410d016a5a3 100644
 --- a/browser/modules/URILoadingHelper.sys.mjs
 +++ b/browser/modules/URILoadingHelper.sys.mjs
 @@ -541,7 +541,7 @@ export const URILoadingHelper = {
diff --git a/src/browser/themes/osx/browser-css.patch b/src/browser/themes/osx/browser-css.patch
index cdaeb1877..7cf8f61bb 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 b1062108c6f6174a680e9b235ee9cb2037f94924..31aac7bdee4ebb07e9de58e7c3e5e6833c94e968 100644
+index 0a15e3d60d408f119bd03007567d5dd1fa178c36..443901657296d0d15a95e1d39e826b1c008aac4d 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 780f07a9b..2a7d63eb1 100644
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index c77a0e6388c4061d9e6ee5f396a3e3af8867e4fe..3da164d2414e8726675ac0184310c9363365387f 100644
+index 2b013ee77bb50db11e73152bd0265dd86e40b726..dc0ba2c8651470bcd81439953adbaca26a4a5b8c 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
 @@ -102,7 +102,7 @@ body {
-   --toolbarbutton-border-radius: 4px;
+   --toolbarbutton-border-radius: var(--button-border-radius);
    --identity-box-margin-inline: 4px;
    --urlbar-min-height: max(32px, 1.4em);
 -  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
 +  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 14px /* icon */) / 2);
  
-   /* 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 */
-@@ -170,8 +170,6 @@ body {
+   /* This should be used for icons and chiclets inside the input field, as well
+      as result rows. It makes the gap around them more uniform when they are
+@@ -171,8 +171,6 @@ body {
     */
    &.fullscreen-with-menubar {
      z-index: var(--browser-area-z-index-toolbox-while-animating);
@@ -20,7 +20,7 @@ index c77a0e6388c4061d9e6ee5f396a3e3af8867e4fe..3da164d2414e8726675ac0184310c936
    }
  
    /* Themes define a set of toolbox foreground and background colors which we
-@@ -281,13 +279,13 @@ body {
+@@ -282,13 +280,13 @@ body {
  
    @media (-moz-platform: macos) and (not (-moz-mac-rtl)) {
      &:-moz-locale-dir(ltr) {
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 13df820cf..2c5c54f64 100644
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index 8edca63dc52ec207475ed9965559d28c06e27971..a5a949be1868af5d0bb04747a9f5b737c00ae49c 100644
+index d542e962d42b17140888e299ed43a838047ee48c..5e0b72f147687924c48dfed0318f53b765a4d497 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
 @@ -81,13 +81,6 @@
@@ -11,7 +11,7 @@ index 8edca63dc52ec207475ed9965559d28c06e27971..a5a949be1868af5d0bb04747a9f5b737
 -  background-color: var(--urlbar-box-bgcolor);
 -  color: var(--urlbar-box-text-color);
 -  padding-inline: 8px;
--  border-radius: var(--urlbar-icon-border-radius);
+-  border-radius: var(--urlbar-inner-border-radius);
 -}
  
  #urlbar[focused] {
diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch
index 003aa4104..ca613d9f9 100644
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index 94036d036a64c8845c02d4ffbcf3f99b5d88576e..2ab3f060c9952f1b0c7bee3d5c3a1d7035e6736a 100644
+index 6085ce0614c9ea7d650c9526b295953f46b30cb6..06b4af758d9ae033dd0b7436f08e6748047c8bbe 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -316,3 +316,5 @@
+@@ -317,3 +317,5 @@
  
    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)
diff --git a/src/browser/themes/shared/tabbrowser/content-area-css.patch b/src/browser/themes/shared/tabbrowser/content-area-css.patch
index d7f0e2ec5..b719d9abf 100644
--- a/src/browser/themes/shared/tabbrowser/content-area-css.patch
+++ b/src/browser/themes/shared/tabbrowser/content-area-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index e06addf1602dc26ff4e75a8db6251231690f3f80..ffac005d5040852eda8f574f65f2eadf5ecbd642 100644
+index db68a04d85c12a383ed33b459b9c8d942fe916f7..2941cf4010e24b31a3d9b2194fe9536f23063dbd 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
-@@ -134,7 +134,6 @@
+@@ -140,7 +140,6 @@
    }
  
    browser:is([blank], [pendingpaint]) {
@@ -10,7 +10,7 @@ index e06addf1602dc26ff4e75a8db6251231690f3f80..ffac005d5040852eda8f574f65f2eadf
    }
  
    browser[type="content"] {
-@@ -276,7 +275,7 @@
+@@ -323,7 +322,7 @@
  
  .dialogStack {
    z-index: var(--browser-stack-z-index-dialog-stack);
diff --git a/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch b/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
index 57b20ea25..5393678e5 100644
--- a/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
+++ b/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/ctrlTab.css b/browser/themes/shared/tabbrowser/ctrlTab.css
-index aaeae8fd0e999aecda02bf287b39c4d96ad73f3c..d8196d9b1b5491d73b18a7c7d7fef55bc11fe31b 100644
+index 259e11f3c9a761e158dc32a3ecb9ee90c11d27c6..c5e30314090fe8f33b37c809bcf871c7b8c4d3da 100644
 --- a/browser/themes/shared/tabbrowser/ctrlTab.css
 +++ b/browser/themes/shared/tabbrowser/ctrlTab.css
 @@ -11,6 +11,7 @@
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index 1e127b19f..2bd6bb28d 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 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d85fc4c91a 100644
+index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2bff889716 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -21,7 +21,7 @@
@@ -23,7 +23,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
    --tab-selected-bgcolor: var(--toolbar-bgcolor);
    --tab-selected-color-scheme: var(--toolbar-color-scheme);
    &[lwt-tab-selected="light"] {
-@@ -259,7 +259,6 @@
+@@ -267,7 +267,6 @@
    }
  
    :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -31,7 +31,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
    }
  
    &:is([selected], [multiselected]) {
-@@ -273,6 +272,7 @@
+@@ -281,6 +280,7 @@
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -39,7 +39,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
  
      &::before {
        position: absolute;
-@@ -472,14 +472,11 @@
+@@ -480,14 +480,11 @@
  .tab-icon-image {
    -moz-context-properties: fill, stroke;
    fill: currentColor;
@@ -55,7 +55,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -496,10 +493,6 @@
+@@ -504,10 +501,6 @@
    /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
      &[pending][discarded] {
@@ -66,7 +66,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -572,7 +565,7 @@
+@@ -575,7 +568,7 @@
    z-index: 1; /* Overlay tab title */
  
    #tabbrowser-tabs[orient="vertical"] & {
@@ -75,7 +75,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
    }
  
    &[crashed] {
-@@ -580,7 +573,7 @@
+@@ -583,7 +576,7 @@
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -84,7 +84,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -637,7 +630,7 @@
+@@ -640,7 +633,7 @@
      }
    }
  
@@ -93,7 +93,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
    &[crashed] {
      display: revert;
    }
-@@ -738,7 +731,7 @@
+@@ -741,7 +734,7 @@
        has not been added to root. There are certain scenarios when that attribute is temporarily
        removed from root such as when toggling the sidebar to expand with the toolbar button. */
      #tabbrowser-tabs[orient="horizontal"] &:not([pinned]):not([crashed]),
@@ -102,7 +102,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1226,7 +1219,7 @@ tab-group {
+@@ -1245,7 +1238,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
@@ -111,7 +111,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
    &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -1685,7 +1678,7 @@ tab-group {
+@@ -1692,7 +1685,7 @@ tab-group {
    }
  }
  
@@ -120,7 +120,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -1696,7 +1689,7 @@ tab-group {
+@@ -1703,7 +1696,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -129,7 +129,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
    }
  
    &:hover {
-@@ -1720,7 +1713,7 @@ tab-group {
+@@ -1727,7 +1720,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 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
    margin-block: var(--tab-block-margin);
  }
  
-@@ -1913,7 +1906,6 @@ tab-group {
+@@ -1915,7 +1908,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -146,7 +146,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
      }
  
      .tab-background {
-@@ -1953,8 +1945,8 @@ tab-group {
+@@ -1955,8 +1947,8 @@ tab-group {
        display: block;
        position: absolute;
        inset: auto;
@@ -157,7 +157,7 @@ index 8a7499426a718a56c74daea562a50de20db706e7..7ee8d7e0bd98733341e1da0d2ff965d8
  
        &:-moz-window-inactive {
          background-image:
-@@ -2073,7 +2065,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2075,7 +2067,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  
diff --git a/src/browser/themes/shared/urlbar-searchbar-css.patch b/src/browser/themes/shared/urlbar-searchbar-css.patch
index 2d75c52f7..1c291ce84 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 1744e627bbcfc69ccccb207ad1cbf0c262afb9be..50cc9da2076d946771fb5aca1402f1cbe6a531c8 100644
+index 15dcfbc95afab9f28bd58379da0ef3e24d1b4595..73827cc5cffe47099feea36cbeffb547e955b37e 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
 @@ -6,7 +6,7 @@
@@ -20,7 +20,7 @@ index 1744e627bbcfc69ccccb207ad1cbf0c262afb9be..50cc9da2076d946771fb5aca1402f1cb
  }
  
  /* When rich suggestions are enabled the urlbar identity icon is given extra padding to
-@@ -321,10 +321,14 @@
+@@ -320,10 +320,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 9e692c3be..4c7e0779e 100644
--- a/src/browser/themes/shared/urlbarView-css.patch
+++ b/src/browser/themes/shared/urlbarView-css.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
-index ec849fc792572e75d12b9e7cd7e6b7f32c799fa9..17c7d442854b774817ef5b3b96e732c19bebef9d 100644
+index e0a05846eb0a329fc58b660f806912a1afe7c6c9..0d02e227a84ff4229104dd9cf9cd20f50a8d136c 100644
 --- a/browser/themes/shared/urlbarView.css
 +++ b/browser/themes/shared/urlbarView.css
 @@ -20,7 +20,7 @@
  
    --urlbarView-small-font-size: 0.85em;
  
--  --urlbarView-results-padding: 4px;
+-  --urlbarView-results-padding: 7px;
 +  --urlbarView-results-padding: 8px;
    --urlbarView-row-gutter: 2px;
    --urlbarView-item-inline-padding: var(--urlbar-icon-padding);
    --urlbarView-item-block-padding: 6px;
-@@ -173,7 +173,6 @@
+@@ -171,7 +171,6 @@
        min-height: 32px;
      }
      :root[uidensity="touch"] & {
diff --git a/src/devtools/server/actors/animation-type-longhand-js.patch b/src/devtools/server/actors/animation-type-longhand-js.patch
index 29e44807d..8ac01e934 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 ea27f1209ddb9b33ae044186c2b795685a0bde67..6d808a760885f0e26ff307a39d6977228359fe71 100644
+index a0026f953e8383741221d60ed5c02d0c12740f09..fd5c49d0b8997f29d3dee8dc23e2c373341eb972 100644
 --- a/devtools/server/actors/animation-type-longhand.js
 +++ b/devtools/server/actors/animation-type-longhand.js
-@@ -344,6 +344,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
+@@ -342,6 +342,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 9f7ea1c66..2293dd2d0 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 95de0614e392e00036500a5b3ef9976041f37ec6..2c842055ce1d7ffd94c8f21a82305a3a13d493e0 100644
+index 7d26af162be5620649ff36d7cf7d3835a8ac7a20..c0fbd46c22f1eacc82058919714174d15e8106f1 100644
 --- a/devtools/startup/DevToolsStartup.sys.mjs
 +++ b/devtools/startup/DevToolsStartup.sys.mjs
 @@ -816,6 +816,7 @@ DevToolsStartup.prototype = {
diff --git a/src/docshell/base/nsAboutRedirector-cpp.patch b/src/docshell/base/nsAboutRedirector-cpp.patch
index 61966825d..527a48635 100644
--- a/src/docshell/base/nsAboutRedirector-cpp.patch
+++ b/src/docshell/base/nsAboutRedirector-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index 83d84537f94863d47a30887362fa1ce5a9809427..104d170d5e5114f965b7698fc59d2bad12265261 100644
+index 625640eef45baba74255c00c603f0834e1f0aa2c..8b7893cf3848edf9121f7cbefcc3a1c76894fa37 100644
 --- a/docshell/base/nsAboutRedirector.cpp
 +++ b/docshell/base/nsAboutRedirector.cpp
-@@ -108,7 +108,7 @@ static const RedirEntry kRedirMap[] = {
+@@ -118,7 +118,7 @@ static const RedirEntry kRedirMap[] = {
      {"crashes", "chrome://global/content/crashes.html",
       nsIAboutModule::IS_SECURE_CHROME_UI},
  #endif
diff --git a/src/dom/base/Document-cpp.patch b/src/dom/base/Document-cpp.patch
index 37f0f667b..18ca663f2 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 0c2ef36f9765b6904659ac0ed4329468ca89225f..d06552e8d4ac102dd50a1afea10938ca32aeb788 100644
+index 55d24fe16311a286813f7668a227d2ef0cc7e5d7..1a7c2352daf1e04e38a8fb81f80a1f9a58ba2cb5 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -466,6 +466,7 @@
+@@ -465,6 +465,7 @@
  #include "prtime.h"
  #include "prtypes.h"
  #include "xpcpublic.h"
@@ -10,7 +10,7 @@ index 0c2ef36f9765b6904659ac0ed4329468ca89225f..d06552e8d4ac102dd50a1afea10938ca
  
  // clang-format off
  #include "mozilla/Encoding.h"
-@@ -3428,6 +3429,10 @@ void Document::FillStyleSetUserAndUASheets() {
+@@ -3442,6 +3443,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 eeac251f7..0ec931469 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 157d46c37d0a465f02f794eda4323f7e344c5e63..aec8b819dbcf853c2e6d5513000149449fae36fd 100644
+index 81d73c33af8c95e6f687c05354fb8a0e894dcd44..775742e1e4f84618dce45cbcb14229dc6c4f2b64 100644
 --- a/dom/base/use_counter_metrics.yaml
 +++ b/dom/base/use_counter_metrics.yaml
-@@ -21154,6 +21154,22 @@ use.counter.css.page:
+@@ -21086,6 +21086,22 @@ use.counter.css.page:
      send_in_pings:
        - use-counters
  
@@ -25,7 +25,7 @@ index 157d46c37d0a465f02f794eda4323f7e344c5e63..aec8b819dbcf853c2e6d551300014944
    css_transform_origin:
      type: counter
      description: >
-@@ -33175,6 +33191,22 @@ use.counter.css.doc:
+@@ -33056,6 +33072,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 da62b610d..19c73e158 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 741a8f1744f48e7db4dbda64c856efaf9f3564b0..f9a2c0878f8a923903ed8eb65cbd355d40b41715 100644
+index 3cb7a43dd9535ccf6ffaa60df39b487f07760208..ed3632e9f38ee88df39500356777ae5b3ba7202a 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 741a8f1744f48e7db4dbda64c856efaf9f3564b0..f9a2c0878f8a923903ed8eb65cbd355d
        NotifyAudibleStateChanged(mIsOwnerAudible
                                      ? MediaAudibleState::eAudible
                                      : MediaAudibleState::eInaudible);
-@@ -7191,6 +7192,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+@@ -7234,6 +7235,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
      QueueTask(std::move(runner));
      mQueueTimeUpdateRunnerTime = TimeStamp::Now();
      mLastCurrentTime = CurrentTime();
diff --git a/src/firefox-patches/ff-145-tahoe-upgrade.patch b/src/firefox-patches/ff-145-tahoe-upgrade.patch
deleted file mode 100644
index ff27f9aca..000000000
--- a/src/firefox-patches/ff-145-tahoe-upgrade.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-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/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/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/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/layout/generic/nsIFrame-cpp.patch b/src/layout/generic/nsIFrame-cpp.patch
index 3a9042a12..214996601 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 7c8f9c8c8ea4cc43825b388e7dd655a2ef34e75f..da5f48bb2d55ae306c72b062169a9758ad10c014 100644
+index a7b60e40e6947754374dcda2fc69cdb329c337ac..c7e025109c4c43865205cbd445d9d20305974974 100644
 --- a/layout/generic/nsIFrame.cpp
 +++ b/layout/generic/nsIFrame.cpp
-@@ -11912,6 +11912,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
+@@ -11899,6 +11899,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 f3c81c9a9..adc1c8369 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 2413696f643246a825e184732bfba6eb33f606fd..932d3c316ee60c59b5f999e5ddd65c6acee3129d 100644
+index 9f86fdfe6a70394c5fcd9e07177e5f325c2e4951..f9b3bc2e366f0cee2fbc992c4babce068b954413 100644
 --- a/layout/style/nsStyleStruct.cpp
 +++ b/layout/style/nsStyleStruct.cpp
-@@ -3273,6 +3273,9 @@ nsStyleUIReset::nsStyleUIReset()
+@@ -3233,6 +3233,9 @@ nsStyleUIReset::nsStyleUIReset()
        mWindowShadow(StyleWindowShadow::Auto),
        mWindowOpacity(1.0),
        mMozWindowInputRegionMargin(StyleLength::Zero()),
@@ -12,7 +12,7 @@ index 2413696f643246a825e184732bfba6eb33f606fd..932d3c316ee60c59b5f999e5ddd65c6a
        mTransitions(
            nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
        mTransitionTimingFunctionCount(1),
-@@ -3317,6 +3320,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
+@@ -3277,6 +3280,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 1e0c4aee3..dcc8877e3 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 f40f005606946b1149bfb7b67d1df9be04ddaf07..64da397ceb4192aacd24c4cd9fb0efbad2d363ed 100644
+index 46f9312292b6f332947e68586ae770acffe8c418..2408eb06ab466faba99e83b5c92759cf3277edad 100644
 --- a/layout/style/nsStyleStruct.h
 +++ b/layout/style/nsStyleStruct.h
-@@ -2094,6 +2094,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
+@@ -2055,6 +2055,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 4156b2b27..7fd0507a6 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 86dc55502b05eed6e4bb0a2ed489e1e8e76840cb..2c2918b2d3c76063662fe59d7fde745a36a92ab6 100644
+index 34f519ad1107736f47719679be7f4fa20cd718c1..7f886071259d6ddd971ca5c92180de0cca9a0f5d 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -19316,6 +19316,7 @@
+@@ -19496,6 +19496,7 @@
    mirror: always
  #endif
  
diff --git a/src/netwerk/protocol/http/moz-build.patch b/src/netwerk/protocol/http/moz-build.patch
index e77666bdc..19b407ac1 100644
--- a/src/netwerk/protocol/http/moz-build.patch
+++ b/src/netwerk/protocol/http/moz-build.patch
@@ -1,8 +1,8 @@
 diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
-index 906a2fcdcc2684ff4326aeb7f22f3441add7e56c..37e16b62d012498c66bc3a38f4ce48972298b6be 100644
+index d2330003caf35c43d6831fb0d356ece513906f78..76c2faf822ddaf645eb03d93380c58b4e3b510c0 100644
 --- a/netwerk/protocol/http/moz.build
 +++ b/netwerk/protocol/http/moz.build
-@@ -225,7 +225,7 @@ LOCAL_INCLUDES += [
+@@ -227,7 +227,7 @@ LOCAL_INCLUDES += [
      "/netwerk/url-classifier",
  ]
  
diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch
index 5763b5101..7c10d5265 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 b0082951254ad592c73caaa16c5b5c57127831a9..9b3566b08aacfcf2cfbf9941b2b3ca91a31ade59 100644
+index ddbcd495260b5bcc4f55ebf7c06fcb6b5dc595c7..c629ac40f4fe3e03ffc765d3b65f3d348f4b05c6 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};
diff --git a/src/testing/mochitest/browser-test-js.patch b/src/testing/mochitest/browser-test-js.patch
index ff99dd955..231a99e9b 100644
--- a/src/testing/mochitest/browser-test-js.patch
+++ b/src/testing/mochitest/browser-test-js.patch
@@ -1,37 +1,30 @@
 diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
-index 979c6a0960cb8c490b612649d0fac55cd7b7d0f7..f149f248f705484b3572ca462660932dd792e312 100644
+index d5f320c5e97aae9bfd43d28e3d4a274d9bbc0787..24dc32a5bf6ae9abaa8f3fe8c37b031a76fb4d60 100644
 --- a/testing/mochitest/browser-test.js
 +++ b/testing/mochitest/browser-test.js
-@@ -440,11 +440,11 @@ Tester.prototype = {
-       this.currentTest &&
-       window.gBrowser &&
-       AppConstants.MOZ_APP_NAME != "thunderbird" &&
--      gBrowser.tabs.length > 1
-+      gBrowser.tabs.length > 2
-     ) {
-       let lastURI = "";
-       let lastURIcount = 0;
--      while (gBrowser.tabs.length > 1) {
-+      while (gBrowser.tabs.length > 2) {
-         let lastTab = gBrowser.tabs[gBrowser.tabs.length - 1];
-         if (!lastTab.closing) {
-           // Report the stale tab as an error only when they're not closing.
-@@ -479,12 +479,12 @@ Tester.prototype = {
+@@ -438,10 +438,10 @@ Tester.prototype = {
+     // But not the Thunderbird window, it doesn't have these things!
+     if (AppConstants.MOZ_APP_NAME != "thunderbird") {
+       // Remove stale tabs
+-      if (this.currentTest && window.gBrowser && gBrowser.tabs.length > 1) {
++      if (this.currentTest && window.gBrowser && gBrowser.tabs.length > 2) {
+         let lastURI = "";
+         let lastURIcount = 0;
+-        while (gBrowser.tabs.length > 1) {
++        while (gBrowser.tabs.length > 2) {
+           let lastTab = gBrowser.tabs[gBrowser.tabs.length - 1];
+           if (!lastTab.closing) {
+             // Report the stale tab as an error only when they're not closing.
+@@ -476,12 +476,6 @@ Tester.prototype = {
  
-     // Replace the last tab with a fresh one
-     if (window.gBrowser && AppConstants.MOZ_APP_NAME != "thunderbird") {
--      gBrowser.addTab("about:blank", {
--        skipAnimation: true,
--        triggeringPrincipal:
--          Services.scriptSecurityManager.getSystemPrincipal(),
--      });
--      gBrowser.removeTab(gBrowser.selectedTab, { skipPermitUnload: true });
-+      // gBrowser.addTab("about:blank", {
-+      //   skipAnimation: true,
-+      //   triggeringPrincipal:
-+      //     Services.scriptSecurityManager.getSystemPrincipal(),
-+      // });
-+      // gBrowser.removeTab(gBrowser.selectedTab, { skipPermitUnload: true });
-       gBrowser.stop();
-     }
+       // Replace the last tab with a fresh one
+       if (window.gBrowser) {
+-        gBrowser.addTab("about:blank", {
+-          skipAnimation: true,
+-          triggeringPrincipal:
+-            Services.scriptSecurityManager.getSystemPrincipal(),
+-        });
+-        gBrowser.removeTab(gBrowser.selectedTab, { skipPermitUnload: true });
+         gBrowser.stop();
+       }
  
diff --git a/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch b/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
index 68ff066c2..11a3e7f28 100644
--- a/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
+++ b/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/actors/PictureInPictureChild.sys.mjs b/toolkit/actors/PictureInPictureChild.sys.mjs
-index 21b6295bf46336a70ed0a3797cf3210c8c0cb545..5a7018f1f923e977f63fae296ffdff1730ad1218 100644
+index ea47bd1029de4571a045c1ee17c313dc9d62cad8..0f8afca693e0fc112839cfb998fd8baa20227f06 100644
 --- a/toolkit/actors/PictureInPictureChild.sys.mjs
 +++ b/toolkit/actors/PictureInPictureChild.sys.mjs
-@@ -292,6 +292,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {
+@@ -295,6 +295,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {
        if (
          video &&
          PictureInPictureChild.videoIsPlaying(video) &&
diff --git a/src/toolkit/content/widgets/findbar-js.patch b/src/toolkit/content/widgets/findbar-js.patch
index 967c891d8..1390e7618 100644
--- a/src/toolkit/content/widgets/findbar-js.patch
+++ b/src/toolkit/content/widgets/findbar-js.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/findbar.js b/toolkit/content/widgets/findbar.js
-index 8ca512e0b212bb6e25ed37e7edb4f8e2587d5bb0..5abfff92b3a8df5d138082af96419668a2c8a9bb 100644
+index 589d96886b1c9a1bd0e819957978a8968402e98b..4df4be8dbbe67063f0e1920baa2db3f5b909b11b 100644
 --- a/toolkit/content/widgets/findbar.js
 +++ b/toolkit/content/widgets/findbar.js
 @@ -1188,6 +1188,7 @@
diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch
index 2cdd2d525..cc7dcea1c 100644
--- a/src/toolkit/content/widgets/tabbox-js.patch
+++ b/src/toolkit/content/widgets/tabbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
-index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2035222f4680e2eaa27b3072a12a9163b914adec 100644
+index cfe2da6e199667bd668f117cc8972212c7f57da2..bdd7dcc26139202e6e31afde47dc4d877f3db3c5 100644
 --- a/toolkit/content/widgets/tabbox.js
 +++ b/toolkit/content/widgets/tabbox.js
 @@ -213,7 +213,7 @@
@@ -11,7 +11,7 @@ index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2035222f4680e2eaa27b3072a12a9163
          this._selectedPanel?.classList.add("deck-selected");
        }
        this.setAttribute("selectedIndex", val);
-@@ -610,7 +610,7 @@
+@@ -697,7 +697,7 @@
        if (!tab) {
          return;
        }
@@ -20,7 +20,7 @@ index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2035222f4680e2eaa27b3072a12a9163
          if (otherTab != tab && otherTab.selected) {
            otherTab._selected = false;
          }
-@@ -646,6 +646,7 @@
+@@ -733,6 +733,7 @@
       * @param {MozTab|null} [val]
       */
      set selectedItem(val) {
@@ -28,7 +28,7 @@ index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2035222f4680e2eaa27b3072a12a9163
        if (val && !val.selected) {
          // The selectedIndex setter ignores invalid values
          // such as -1 if |val| isn't one of our child nodes.
-@@ -823,7 +824,7 @@
+@@ -910,7 +911,7 @@
          if (tab == startTab) {
            return null;
          }
@@ -37,7 +37,7 @@ index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2035222f4680e2eaa27b3072a12a9163
            return tab;
          }
        }
-@@ -885,10 +886,11 @@
+@@ -972,10 +973,11 @@
       * @param {boolean} [aWrap]
       */
      advanceSelectedTab(aDir, aWrap) {
diff --git a/src/toolkit/content/xul-css.patch b/src/toolkit/content/xul-css.patch
index 3f25b9b81..fb701787d 100644
--- a/src/toolkit/content/xul-css.patch
+++ b/src/toolkit/content/xul-css.patch
@@ -1,11 +1,11 @@
 diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
-index badef34e6072da6e0e1180f5f08ab201a89fa195..2842eee9d5655444ccac8c085f19df0247886d64 100644
+index 57dd6042d2620dd64c55e0e966913047a6c3502f..40d016a0a13596439046e2bbcfa59daa30f10b2d 100644
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -461,7 +461,8 @@ deck > *|*:not(:-moz-native-anonymous) {
- }
- 
+@@ -463,7 +463,8 @@ deck > *|*:not(:-moz-native-anonymous) {
  tabpanels > .deck-selected,
+ tabpanels > .split-view-panel,
+ tabpanels > .split-view-splitter,
 -deck > .deck-selected {
 +deck > .deck-selected,
 +tabpanels > [zen-split="true"] {
diff --git a/src/toolkit/modules/ShortcutUtils-sys-mjs.patch b/src/toolkit/modules/ShortcutUtils-sys-mjs.patch
index 8dcf961a9..d544c4f4b 100644
--- a/src/toolkit/modules/ShortcutUtils-sys-mjs.patch
+++ b/src/toolkit/modules/ShortcutUtils-sys-mjs.patch
@@ -1,16 +1,8 @@
 diff --git a/toolkit/modules/ShortcutUtils.sys.mjs b/toolkit/modules/ShortcutUtils.sys.mjs
-index 3e796cb6586ad39257a29c2a6da1d0415f4c2676..98b639c726efee850456a3af8a01f0ce66423ba0 100644
+index e52e88a09a281e69ecf15e7b84b8b98736e1dbdd..f47fbe24e0860195e11fe5231ab27e52aad96d0b 100644
 --- a/toolkit/modules/ShortcutUtils.sys.mjs
 +++ b/toolkit/modules/ShortcutUtils.sys.mjs
-@@ -140,6 +140,7 @@ export var ShortcutUtils = {
-         key = keyCode.replace(/^VK_/, "");
-       }
-     } else {
-+      if (!keyAttribute) return "";
-       key = keyAttribute.toUpperCase();
-     }
- 
-@@ -373,13 +374,11 @@ export var ShortcutUtils = {
+@@ -414,13 +414,11 @@ export var ShortcutUtils = {
          }
          break;
        case event.DOM_VK_UP: // fall through
diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch
index f7c21aa5f..ee6a3f71a 100644
--- a/src/toolkit/modules/moz-build.patch
+++ b/src/toolkit/modules/moz-build.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
-index e43870b10c5b35165fd21b48065980060104dc52..71e3db5618c834bc4ff9d481b1e667f2b02b183e 100644
+index a17e15c74c8e627cf805d1f026438759af7e4a97..fc6e1e6b2711e474d65a688b2481b7a26cad2a71 100644
 --- a/toolkit/modules/moz.build
 +++ b/toolkit/modules/moz.build
 @@ -280,6 +280,7 @@ for var in (
diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch
index 7cbc4274e..2427976d1 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 2fdcf62bde7805e52737cb06ec67908fa40524c9..b9f9e3abeb5cf770b29e1354615184fce2162ec7 100644
+index f3032042d34766b0e94c56872f91271f307ffc89..8c8540e8bf8d3df5b33e2f0da6b94a32e75684b5 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 3fd64f2b3..002478c6e 100644
--- a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-index 2c1e187d14bae0dcc17a1fa2de768e7c949b3776..c322b770bdc1a0786d8e3bf1af618e3d3d3dd26e 100644
+index 3562dfc61f6462a4e46ff321d4df4df23f48949d..2afc42cae98a24ecfd129c8a3dd1e7e0a94882ab 100644
 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
 +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-@@ -1227,12 +1227,12 @@ var AddonManagerInternal = {
+@@ -1243,12 +1243,12 @@ var AddonManagerInternal = {
          ITEM_VERSION: aAddon.version,
          ITEM_STATUS: addonStatus,
          APP_ID: Services.appinfo.ID,
diff --git a/src/toolkit/themes/shared/aboutReader-css.patch b/src/toolkit/themes/shared/aboutReader-css.patch
index 6ea618c2e..f037197ad 100644
--- a/src/toolkit/themes/shared/aboutReader-css.patch
+++ b/src/toolkit/themes/shared/aboutReader-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
-index 1eb2c44694bb4970134fb5d290e32c7053103461..8d8237029976960048cb9aceede918c9e20c523b 100644
+index e9dedcacb868fb0908c3432e1ccf3956b383aea7..6418c08550b9b4876df20ca5f93d093be0583f83 100644
 --- a/toolkit/themes/shared/aboutReader.css
 +++ b/toolkit/themes/shared/aboutReader.css
 @@ -1181,3 +1181,43 @@ pre code {
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 615b9a4e5..0f1788dfb 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 96129498de63153704711bf7a21fb10922e80917..83f7b5ee2f15197dc42ec02ec1a73cc2bfc19a4d 100644
+index 2d068aa3472887e089254834d92f75b9f6d9894b..1a6d5b87fdcfb338222475bb6362820e3915955d 100644
 --- a/toolkit/themes/shared/in-content/common-shared.css
 +++ b/toolkit/themes/shared/in-content/common-shared.css
 @@ -4,7 +4,7 @@
diff --git a/src/toolkit/themes/shared/menulist-css.patch b/src/toolkit/themes/shared/menulist-css.patch
index a8cd61158..d295c0745 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 8f9c006945e67f668075bd36ce83d5a772a9a796..08d68c015b001233548cd6c7babad17f3a638702 100644
+index 73149025f13e8805774c004820d57755d2bf89a9..f503e6bcd1c466757fc58e033aa0d68343685e28 100644
 --- a/toolkit/themes/shared/menulist.css
 +++ b/toolkit/themes/shared/menulist.css
 @@ -53,7 +53,7 @@
@@ -9,5 +9,5 @@ index 8f9c006945e67f668075bd36ce83d5a772a9a796..08d68c015b001233548cd6c7babad17f
 -  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: var(--border-radius-small);
+   border-radius: var(--button-border-radius);
    padding-block: 4px;
diff --git a/src/toolkit/themes/shared/pictureinpicture/player-css.patch b/src/toolkit/themes/shared/pictureinpicture/player-css.patch
index 798902248..1bdc8564d 100644
--- a/src/toolkit/themes/shared/pictureinpicture/player-css.patch
+++ b/src/toolkit/themes/shared/pictureinpicture/player-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/pictureinpicture/player.css b/toolkit/themes/shared/pictureinpicture/player.css
-index 33b10bebcdfe636d7ff0f61a11d5fa4664a31f78..83b53817c53f43cca3be40b490300109b4949f5b 100644
+index 12dba9ec5eee93476034b1e8b503a301fc18dbcb..b81c9e997d85e78cdf6ab460e14a5128117639bd 100644
 --- a/toolkit/themes/shared/pictureinpicture/player.css
 +++ b/toolkit/themes/shared/pictureinpicture/player.css
 @@ -738,3 +738,17 @@ input:checked + .slider::before {
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index c6400bc28..83a79dc5d 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index 9533f5e0fee5fb0805ae4b65e56307986ee26417..a3a06dce50142354b78561ecfb70ba45fe10b9c1 100644
+index c2618b86d7e8bb71f9f7f71ef9916c8140ca1ead..9e2006015e22f1ac043c46066c4c9a85fe053a21 100644
 --- a/toolkit/themes/shared/popup.css
 +++ b/toolkit/themes/shared/popup.css
 @@ -22,8 +22,8 @@ panel {
diff --git a/src/toolkit/themes/shared/tree/tree-css.patch b/src/toolkit/themes/shared/tree/tree-css.patch
index b5347977d..e60fffebe 100644
--- a/src/toolkit/themes/shared/tree/tree-css.patch
+++ b/src/toolkit/themes/shared/tree/tree-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/tree/tree.css b/toolkit/themes/shared/tree/tree.css
-index c50cab31785eecece2bf061b9770ba90c6ed0181..dfbd227ddab802d927b6897454a86fcd7252e96f 100644
+index ee8c5fc6399092cbb45657bb3ee49178f797349e..f30ff2db77854fb4acca6279369e313da0a6a4e2 100644
 --- a/toolkit/themes/shared/tree/tree.css
 +++ b/toolkit/themes/shared/tree/tree.css
 @@ -12,6 +12,7 @@
diff --git a/src/tools/signing/macos/mach_commands-py.patch b/src/tools/signing/macos/mach_commands-py.patch
index be02e1b77..b448eb9c3 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 721790b0d067ea1cdc6ddc9d220e423de9206d53..ca80e6f2c8bcd82eda24d03720a37a2bfdc50cfe 100644
+index 3bd0fa80c18b903e9828d2f61be3cfb71e2132e0..4d0fdd64d19cb429c19701ea008e02dc16489834 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 721790b0d067ea1cdc6ddc9d220e423de9206d53..ca80e6f2c8bcd82eda24d03720a37a2b
      if use_rcodesign_arg is True:
          sign_with_rcodesign(
              command_context,
-@@ -608,7 +611,7 @@ def sign_with_rcodesign(
+@@ -613,7 +616,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
deleted file mode 100644
index ee8b3bc7a..000000000
--- a/src/widget/cocoa/nsCocoaWindow-mm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
-index 6c80f33454503af0840af18cb88af44a006727ee..47b318814ddd57b1e73c66b576884b8e62093906 100644
---- a/widget/cocoa/nsCocoaWindow.mm
-+++ b/widget/cocoa/nsCocoaWindow.mm
-@@ -7588,7 +7588,7 @@ static NSMutableSet* gSwizzledFrameViewClasses = nil;
- 
- // Returns an autoreleased NSImage.
- static NSImage* GetMenuMaskImage() {
--  const CGFloat radius = 6.0f;
-+  const CGFloat radius = 10.0f;
-   const NSSize maskSize = {radius * 3.0f, radius * 3.0f};
-   NSImage* maskImage = [NSImage imageWithSize:maskSize
-                                       flipped:FALSE
diff --git a/src/zen/@types/lib.gecko.dom.d.ts b/src/zen/@types/lib.gecko.dom.d.ts
index 765ef7ca1..e45189432 100644
--- a/src/zen/@types/lib.gecko.dom.d.ts
+++ b/src/zen/@types/lib.gecko.dom.d.ts
@@ -1649,6 +1649,11 @@ interface InspectorFontFeature {
   tag: string;
 }
 
+interface InspectorNearestColor {
+  colorName: string;
+  exact: boolean;
+}
+
 interface InspectorRGBATuple {
   a?: number;
   b?: number;
@@ -1911,12 +1916,6 @@ interface MediaConfiguration {
   video?: VideoConfiguration;
 }
 
-interface MediaControllerPositionState {
-  duration: number;
-  playbackRate: number;
-  position: number;
-}
-
 interface MediaDecoderDebugInfo {
   PlayState?: string;
   channels?: number;
@@ -2884,7 +2883,7 @@ interface ProfilerMarkerOptions {
   captureStack?: boolean;
   category?: string;
   innerWindowId?: number;
-  startTime?: DOMHighResTimeStamp;
+  startTime?: number;
 }
 
 interface ProgressEventInit extends EventInit {
@@ -3823,6 +3822,23 @@ interface SvcOutputMetadata {
   temporalLayerId?: number;
 }
 
+interface SynthesizeMouseEventData {
+  button?: number;
+  buttons?: number;
+  clickCount?: number;
+  identifier?: number;
+  inputSource?: number;
+  modifiers?: number;
+  pressure?: number;
+}
+
+interface SynthesizeMouseEventOptions {
+  ignoreRootScrollFrame?: boolean;
+  isDOMEventSynthesized?: boolean;
+  isWidgetEventSynthesized?: boolean;
+  toWindow?: boolean;
+}
+
 interface TCPServerSocketEventInit extends EventInit {
   socket?: TCPSocket | null;
 }
@@ -6491,6 +6507,12 @@ interface CSSStyleRule extends CSSGroupingRule {
   selectorText: string;
   readonly style: CSSStyleDeclaration;
   readonly styleMap: StylePropertyMap;
+  getScopeRootFor(
+    selectorIndex: number,
+    element: Element,
+    pseudo?: string,
+    includeVisitedStyle?: boolean
+  ): Element | null;
   getSelectorWarnings(): SelectorWarning[];
   selectorMatchesElement(
     selectorIndex: number,
@@ -16331,7 +16353,6 @@ interface MediaController extends EventTarget {
   readonly id: number;
   readonly isActive: boolean;
   readonly isAudible: boolean;
-  readonly isBeingUsedInPIPModeOrFullscreen: boolean;
   readonly isPlaying: boolean;
   onactivated: ((this: MediaController, ev: Event) => any) | null;
   ondeactivated: ((this: MediaController, ev: Event) => any) | null;
@@ -16343,7 +16364,6 @@ interface MediaController extends EventTarget {
   readonly supportedKeys: MediaControlKey[];
   focus(): void;
   getMetadata(): MediaMetadataInit;
-  getPositionState(): MediaControllerPositionState;
   nextTrack(): void;
   pause(): void;
   play(): void;
@@ -30163,6 +30183,13 @@ interface Window
   shouldReportForServiceWorkerScope(aScope: string): boolean;
   sizeToContent(constraints?: SizeToContentConstraints): void;
   stop(): void;
+  synthesizeMouseEvent(
+    type: string,
+    offsetX: number,
+    offsetY: number,
+    mouseEventData?: SynthesizeMouseEventData,
+    options?: SynthesizeMouseEventOptions
+  ): boolean;
   updateCommands(action: string): void;
   readonly STATE_MAXIMIZED: 1;
   readonly STATE_MINIMIZED: 2;
@@ -31580,7 +31607,7 @@ declare namespace ChromeUtils {
   function CreateOriginAttributesFromOriginSuffix(suffix: string): OriginAttributesDictionary;
   function addProfilerMarker(
     name: string,
-    options?: ProfilerMarkerOptions | DOMHighResTimeStamp,
+    options?: ProfilerMarkerOptions | number,
     text?: string
   ): void;
   function androidMoveTaskToBack(): void;
@@ -31659,6 +31686,7 @@ declare namespace ChromeUtils {
   function nondeterministicGetWeakSetKeys(aSet: any): any;
   function notifyDevToolsClosed(): void;
   function notifyDevToolsOpened(): void;
+  function now(): number;
   function originAttributesMatchPattern(
     originAttrs?: OriginAttributesDictionary,
     pattern?: OriginAttributesPatternDictionary
@@ -31796,6 +31824,7 @@ declare namespace InspectorUtils {
   ): InspectorFontFace[];
   function hasPseudoClassLock(element: Element, pseudoClass: string): boolean;
   function hasRulesModifiedByCSSOM(sheet: CSSStyleSheet): boolean;
+  function hsvToRgb(r: number, g: number, b: number): number[] | Float32Array;
   function isCustomElementName(name: string | null, namespaceURI: string | null): boolean;
   function isElementThemed(element: Element): boolean;
   function isIgnorableWhitespace(dataNode: CharacterData): boolean;
@@ -31803,6 +31832,7 @@ declare namespace InspectorUtils {
   function isUsedColorSchemeDark(element: Element): boolean;
   function isValidCSSColor(colorString: string): boolean;
   function parseStyleSheet(sheet: CSSStyleSheet, input: string): void;
+  function relativeLuminance(r: number, g: number, b: number): number;
   function removeContentState(
     element: Element,
     state: number,
@@ -31816,6 +31846,8 @@ declare namespace InspectorUtils {
     newBodyText: string
   ): string | null;
   function rgbToColorName(r: number, g: number, b: number): string;
+  function rgbToHsv(r: number, g: number, b: number): number[] | Float32Array;
+  function rgbToNearestColorName(r: number, g: number, b: number): InspectorNearestColor;
   function setContentState(element: Element, state: number): boolean;
   function setDynamicToolbarMaxHeight(aContext: BrowsingContext | null, aHeight: number): void;
   function setVerticalClipping(aContext: BrowsingContext | null, aOffset: number): void;
@@ -32624,6 +32656,13 @@ declare function setScrollMarks(marks: number[], onHorizontalScrollbar?: boolean
 declare function shouldReportForServiceWorkerScope(aScope: string): boolean;
 declare function sizeToContent(constraints?: SizeToContentConstraints): void;
 declare function stop(): void;
+declare function synthesizeMouseEvent(
+  type: string,
+  offsetX: number,
+  offsetY: number,
+  mouseEventData?: SynthesizeMouseEventData,
+  options?: SynthesizeMouseEventOptions
+): boolean;
 declare function updateCommands(action: string): void;
 declare function toString(): string;
 declare var ownerGlobal: WindowProxy | null;
diff --git a/src/zen/@types/lib.gecko.glean.d.ts b/src/zen/@types/lib.gecko.glean.d.ts
index fc46b3b26..6b62c5590 100644
--- a/src/zen/@types/lib.gecko.glean.d.ts
+++ b/src/zen/@types/lib.gecko.glean.d.ts
@@ -88,7 +88,6 @@ interface GleanImpl {
     >;
     cookieAccessFixupDiff: GleanCustomDistribution;
     cookieChipsPartitionLimitOverflow: GleanCustomDistribution;
-    cookieCountInvalidFirstPartyPartitionedInDb: GleanCounter;
     cookieCountPartByKey: GleanCustomDistribution;
     cookieCountPartitioned: GleanCustomDistribution;
     cookieCountTotal: GleanCustomDistribution;
@@ -318,8 +317,6 @@ interface GleanImpl {
     httpContentOndatafinishedToOnstopDelay: GleanTimingDistribution;
     httpContentOnstartDelay: GleanTimingDistribution;
     httpContentOnstopDelay: GleanTimingDistribution;
-    httpIpAddrAnyCount: Record<'blocked_requests' | 'not_blocked_requests', GleanCounter>;
-    httpIpAddrAnyHostnames: Record<'failure' | 'success', GleanCounter>;
     httpOnstartSuspendTotalTime: GleanTimingDistribution;
     httpRedirectToSchemeSubresource: Record<string, GleanCounter>;
     httpRedirectToSchemeTopLevel: Record<string, GleanCounter>;
@@ -380,6 +377,7 @@ interface GleanImpl {
       GleanCounter
     >;
     localNetworkAccessPort: GleanCustomDistribution;
+    localNetworkAccessPromptsShown: Record<'local_network' | 'localhost', GleanCounter>;
     localNetworkBlockedTracker: GleanCounter;
     osSocketLimitReached: GleanCounter;
     prcloseTcpBlockingTimeConnectivityChange: GleanTimingDistribution;
@@ -417,7 +415,6 @@ interface GleanImpl {
     setCookieForeign: GleanNumerator;
     setCookieForeignPartitioned: GleanNumerator;
     setCookiePartitioned: GleanNumerator;
-    setInvalidFirstPartyPartitionedCookie: GleanCounter;
     speculativeConnectOutcome: Record<
       'aborted_https_not_enabled' | 'aborted_socket_fail' | 'aborted_socket_limit' | 'successful',
       GleanCounter
@@ -817,19 +814,6 @@ interface GleanImpl {
     userActionOnBlockedDownload: Record<string, GleanCustomDistribution>;
   };
 
-  glamExperiment: {
-    panelShown: GleanCounter;
-    activeTicks: GleanCounter;
-    largestContentfulPaint: GleanTimingDistribution;
-    protectTime: GleanTimingDistribution;
-    httpContentHtml5parserOndatafinishedToOnstopDelay: GleanTimingDistribution;
-    osSocketLimitReached: GleanCounter;
-    subCompleteLoadNet: GleanTimingDistribution;
-    used: GleanCounter;
-    cpuTimeBogusValues: GleanCounter;
-    totalCpuTimeMs: GleanCounter;
-  };
-
   extensionsButton: {
     openViaAppMenu: GleanEventWithExtras<{
       is_extensions_button_visible?: string;
@@ -907,7 +891,6 @@ interface GleanImpl {
     onboardingFinish: GleanEventWithExtras<{ provider?: string; step?: string }>;
     onboardingLearnMore: GleanEventWithExtras<{ provider?: string; step?: string }>;
     onboardingProviderChoiceDisplayed: GleanEventWithExtras<{ provider?: string; step?: string }>;
-    onboardingProviderLearn: GleanEventWithExtras<{ provider?: string; step?: string }>;
     onboardingProviderSelection: GleanEventWithExtras<{ provider?: string; step?: string }>;
     onboardingProviderTerms: GleanEventWithExtras<{
       provider?: string;
@@ -1024,6 +1007,7 @@ interface GleanImpl {
     targetingExists: GleanBoolean;
     targetingVersion: GleanQuantity;
     throttled: GleanBoolean;
+    throttlingPreventedUpdates: GleanCounter;
   };
 
   browser: {
@@ -1761,6 +1745,7 @@ interface GleanImpl {
     sectionsImpression: GleanEventWithExtras<{
       content_redacted?: string;
       is_section_followed?: string;
+      layout_name?: string;
       newtab_visit_id?: string;
       section?: string;
       section_position?: string;
@@ -1934,6 +1919,7 @@ interface GleanImpl {
     }>;
     sectionsImpression: GleanEventWithExtras<{
       is_section_followed?: string;
+      layout_name?: string;
       section?: string;
       section_position?: string;
     }>;
@@ -1953,6 +1939,7 @@ interface GleanImpl {
       format?: string;
       is_list_card?: string;
       is_section_followed?: string;
+      position?: string;
       received_rank?: string;
       recommendation_id?: string;
       recommended_at?: string;
@@ -1976,6 +1963,7 @@ interface GleanImpl {
       is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
+      layout_name?: string;
       matches_selected_topic?: string;
       newtab_visit_id?: string;
       position?: string;
@@ -2014,6 +2002,7 @@ interface GleanImpl {
       is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
+      layout_name?: string;
       newtab_visit_id?: string;
       position?: string;
       received_rank?: string;
@@ -2056,6 +2045,7 @@ interface GleanImpl {
       is_list_card?: string;
       is_section_followed?: string;
       newtab_visit_id?: string;
+      position?: string;
       received_rank?: string;
       recommendation_id?: string;
       recommended_at?: string;
@@ -2090,10 +2080,12 @@ interface GleanImpl {
     }>;
     click: GleanEventWithExtras<{
       advertiser_name?: string;
+      is_pinned?: string;
       is_sponsored?: string;
       newtab_visit_id?: string;
       position?: string;
       tile_id?: string;
+      visible_topsites?: string;
     }>;
     dismiss: GleanEventWithExtras<{
       advertiser_name?: string;
@@ -2115,10 +2107,12 @@ interface GleanImpl {
     enabled: GleanBoolean;
     impression: GleanEventWithExtras<{
       advertiser_name?: string;
+      is_pinned?: string;
       is_sponsored?: string;
       newtab_visit_id?: string;
       position?: string;
       tile_id?: string;
+      visible_topsites?: string;
     }>;
     pin: GleanEventWithExtras<{
       advertiser_name?: string;
@@ -2690,7 +2684,12 @@ interface GleanImpl {
 
   tabgroup: {
     activeGroups: Record<'collapsed' | 'expanded', GleanQuantity>;
-    addTab: GleanEventWithExtras<{ layout?: string; source?: string; tabs?: string }>;
+    addTab: GleanEventWithExtras<{
+      group_type?: string;
+      layout?: string;
+      source?: string;
+      tabs?: string;
+    }>;
     createGroup: GleanEventWithExtras<{
       id?: string;
       layout?: string;
@@ -2703,6 +2702,7 @@ interface GleanImpl {
       | 'collapse'
       | 'delete'
       | 'expand'
+      | 'hover_preview'
       | 'move_window'
       | 'open_recent'
       | 'open_suggest'
@@ -2743,7 +2743,8 @@ interface GleanImpl {
     }>;
     tabCountInGroups: Record<'inside' | 'outside', GleanQuantity>;
     tabInteractions: Record<
-      | 'activate'
+      | 'activate_collapsed'
+      | 'activate_expanded'
       | 'add'
       | 'close_tab_other'
       | 'close_tabmenu'
@@ -2901,6 +2902,7 @@ interface GleanImpl {
     prefSuggestNonsponsored: GleanBoolean;
     prefSuggestSponsored: GleanBoolean;
     prefSuggestTopsites: GleanBoolean;
+    prefSwitchTabsSearchAllContainers: GleanBoolean;
     quickSuggestContextualOptIn: GleanEventWithExtras<{
       interaction?: string;
       say_hello?: string;
@@ -2936,6 +2938,18 @@ interface GleanImpl {
     exposure: GleanCounter;
   };
 
+  dataLeakBlocker: {
+    reportV1: GleanEventWithExtras<{
+      addon_id?: string;
+      blocked?: string;
+      content_policy_type?: string;
+      is_addon_loading?: string;
+      is_addon_triggering?: string;
+      is_content_script?: string;
+      method?: string;
+    }>;
+  };
+
   addonsSearchDetection: {
     etldChangeOther: GleanEventWithExtras<{
       addonId?: string;
@@ -2954,6 +2968,7 @@ interface GleanImpl {
     sameSiteRedirect: GleanEventWithExtras<{
       addonId?: string;
       addonVersion?: string;
+      origin?: string;
       paramChanged?: string;
     }>;
   };
@@ -4166,6 +4181,7 @@ interface GleanImpl {
     cssMaskType: GleanCounter;
     cssMasonryAutoFlow: GleanCounter;
     cssMathDepth: GleanCounter;
+    cssMathShift: GleanCounter;
     cssMathStyle: GleanCounter;
     cssMaxBlockSize: GleanCounter;
     cssMaxHeight: GleanCounter;
@@ -4503,7 +4519,6 @@ interface GleanImpl {
     cssXTextScale: GleanCounter;
     cssY: GleanCounter;
     cssZIndex: GleanCounter;
-    cssZenWindowTransformOrigin: GleanCounter;
     cssZoom: GleanCounter;
     maxZoom: GleanCounter;
     minZoom: GleanCounter;
@@ -4876,6 +4891,7 @@ interface GleanImpl {
     cssMaskType: GleanCounter;
     cssMasonryAutoFlow: GleanCounter;
     cssMathDepth: GleanCounter;
+    cssMathShift: GleanCounter;
     cssMathStyle: GleanCounter;
     cssMaxBlockSize: GleanCounter;
     cssMaxHeight: GleanCounter;
@@ -5213,7 +5229,6 @@ interface GleanImpl {
     cssXTextScale: GleanCounter;
     cssY: GleanCounter;
     cssZIndex: GleanCounter;
-    cssZenWindowTransformOrigin: GleanCounter;
     cssZoom: GleanCounter;
     maxZoom: GleanCounter;
     minZoom: GleanCounter;
@@ -5324,14 +5339,7 @@ interface GleanImpl {
     deprecatedTestingInterface: GleanCounter;
     deprecatedTestingMethod: GleanCounter;
     documentReleaseCapture: GleanCounter;
-    domattrModified: GleanCounter;
-    domcharacterDataModified: GleanCounter;
-    domnodeInserted: GleanCounter;
-    domnodeInsertedIntoDocument: GleanCounter;
-    domnodeRemoved: GleanCounter;
-    domnodeRemovedFromDocument: GleanCounter;
     domquadBoundsAttr: GleanCounter;
-    domsubtreeModified: GleanCounter;
     drawWindowCanvasRenderingContext2D: GleanCounter;
     elementReleaseCapture: GleanCounter;
     elementSetCapture: GleanCounter;
@@ -5344,12 +5352,10 @@ interface GleanImpl {
     initMouseEvent: GleanCounter;
     initNsmouseEvent: GleanCounter;
     installTriggerDeprecated: GleanCounter;
-    installTriggerInstallDeprecated: GleanCounter;
     lenientSetter: GleanCounter;
     lenientThis: GleanCounter;
     mathMlDeprecatedMathSpaceValue2: GleanCounter;
     mathMlDeprecatedMathVariant: GleanCounter;
-    mathMlDeprecatedStixgeneralOperatorStretching: GleanCounter;
     motionEvent: GleanCounter;
     mouseEventMozPressure: GleanCounter;
     mozInputSource: GleanCounter;
@@ -5382,14 +5388,7 @@ interface GleanImpl {
     deprecatedTestingInterface: GleanCounter;
     deprecatedTestingMethod: GleanCounter;
     documentReleaseCapture: GleanCounter;
-    domattrModified: GleanCounter;
-    domcharacterDataModified: GleanCounter;
-    domnodeInserted: GleanCounter;
-    domnodeInsertedIntoDocument: GleanCounter;
-    domnodeRemoved: GleanCounter;
-    domnodeRemovedFromDocument: GleanCounter;
     domquadBoundsAttr: GleanCounter;
-    domsubtreeModified: GleanCounter;
     drawWindowCanvasRenderingContext2D: GleanCounter;
     elementReleaseCapture: GleanCounter;
     elementSetCapture: GleanCounter;
@@ -5402,12 +5401,10 @@ interface GleanImpl {
     initMouseEvent: GleanCounter;
     initNsmouseEvent: GleanCounter;
     installTriggerDeprecated: GleanCounter;
-    installTriggerInstallDeprecated: GleanCounter;
     lenientSetter: GleanCounter;
     lenientThis: GleanCounter;
     mathMlDeprecatedMathSpaceValue2: GleanCounter;
     mathMlDeprecatedMathVariant: GleanCounter;
-    mathMlDeprecatedStixgeneralOperatorStretching: GleanCounter;
     motionEvent: GleanCounter;
     mouseEventMozPressure: GleanCounter;
     mozInputSource: GleanCounter;
@@ -5542,9 +5539,6 @@ interface GleanImpl {
     jsAsmjs: GleanCounter;
     jsDateparse: GleanCounter;
     jsDateparseImplDef: GleanCounter;
-    jsErrorCapturestacktrace: GleanCounter;
-    jsErrorCapturestacktraceCtor: GleanCounter;
-    jsErrorCapturestacktraceUncallableCtor: GleanCounter;
     jsIcStubOom: GleanCounter;
     jsIcStubTooLarge: GleanCounter;
     jsIsHtmlddaFuse: GleanCounter;
@@ -5903,9 +5897,6 @@ interface GleanImpl {
     jsAsmjs: GleanCounter;
     jsDateparse: GleanCounter;
     jsDateparseImplDef: GleanCounter;
-    jsErrorCapturestacktrace: GleanCounter;
-    jsErrorCapturestacktraceCtor: GleanCounter;
-    jsErrorCapturestacktraceUncallableCtor: GleanCounter;
     jsIcStubOom: GleanCounter;
     jsIcStubTooLarge: GleanCounter;
     jsIsHtmlddaFuse: GleanCounter;
@@ -6418,6 +6409,22 @@ interface GleanImpl {
     elementInPageCount: GleanCounter;
     error: GleanEventWithExtras<{ error_name?: string; error_type?: string; key_system?: string }>;
     mediaPlayTime: Record<string, GleanTimingDistribution>;
+    mkvCodecType: Record<
+      | 'AudioAac'
+      | 'AudioFlac'
+      | 'AudioMp3'
+      | 'AudioOpus'
+      | 'AudioPcm'
+      | 'AudioVorbis'
+      | 'NoCodecSpecified'
+      | 'VideoAv1'
+      | 'VideoAvc'
+      | 'VideoHevc'
+      | 'VideoVp8'
+      | 'VideoVp9',
+      GleanCounter
+    >;
+    mkvContentCount: GleanCounter;
     mseSourceBufferType: Record<
       | 'AudioAac'
       | 'AudioMp2t'
@@ -6634,6 +6641,7 @@ interface GleanImpl {
     cipher: Record<string, GleanCounter>;
     clientHandshakeResult: Record<string, GleanCounter>;
     clientHandshakeStartedCounter: GleanCounter;
+    keyExchangeAlgorithm: GleanCustomDistribution;
     protocolVersion: Record<string, GleanCounter>;
     serverHandshakeResult: Record<string, GleanCounter>;
     serverHandshakeStartedCounter: GleanCounter;
@@ -6647,7 +6655,6 @@ interface GleanImpl {
     fullscreenTransitionBlack: GleanTimingDistribution;
     gcInProgress: GleanTimingDistribution;
     gcSliceDuringIdle: GleanCustomDistribution;
-    innerwindowsWithMutationListeners: Record<'false' | 'true', GleanCounter>;
     scriptLoadingSource: Record<'AltData' | 'Inline' | 'Source' | 'SourceFallback', GleanCounter>;
     slowScriptNoticeCount: GleanCounter;
     slowScriptPageCount: GleanCounter;
@@ -6682,15 +6689,20 @@ interface GleanImpl {
   };
 
   perf: {
+    coldApplinkMainToLoadUri: GleanTimingDistribution;
+    coldApplinkProcessLaunchToLoadUri: GleanTimingDistribution;
     dnsFirstByte: Record<string, GleanTimingDistribution>;
     dnsFirstContentfulPaint: Record<string, GleanTimingDistribution>;
     h3pFirstContentfulPaint: Record<string, GleanTimingDistribution>;
     h3pPageLoadTime: Record<string, GleanTimingDistribution>;
     http3FirstContentfulPaint: Record<string, GleanTimingDistribution>;
     http3PageLoadTime: Record<string, GleanTimingDistribution>;
+    jsExecAsmJs: GleanTimingDistribution;
     largestContentfulPaint: GleanTimingDistribution;
     largestContentfulPaintFromResponseStart: GleanTimingDistribution;
     pageLoad: GleanEventWithExtras<{
+      android_app_link_launch_type?: string;
+      android_app_link_to_navigation_start?: string;
       cache_disposition?: string;
       delazify_time?: string;
       dns_lookup_time?: string;
@@ -6812,6 +6824,7 @@ interface GleanImpl {
   };
 
   quotamanagerInitializeTemporarystorage: {
+    nonPersistedZeroUsageOrigins: GleanCustomDistribution;
     totalTimeExcludingSuspend: GleanTimingDistribution;
   };
 
@@ -6903,7 +6916,6 @@ interface GleanImpl {
   htmleditors: {
     overriddenByBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
     withBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
-    withMutationListenersWithoutBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
     withMutationObserversWithoutBeforeinputListeners: Record<'false' | 'true', GleanCounter>;
   };
 
@@ -7865,15 +7877,6 @@ interface GleanImpl {
     >;
     raceCacheWithNetworkOcecOnStartDiff: GleanTimingDistribution;
     raceCacheWithNetworkSavedTime: GleanTimingDistribution;
-    raceCacheWithNetworkUsage: Record<
-      | 'CacheDelayedRace'
-      | 'CacheNoRace'
-      | 'CacheRace'
-      | 'NetworkDelayedRace'
-      | 'NetworkNoRace'
-      | 'NetworkRace',
-      GleanCounter
-    >;
     responseEndParentToContent: Record<string, GleanTimingDistribution>;
     responseStartParentToContentExp: Record<string, GleanTimingDistribution>;
     retriedSystemChannelAddonStatus: Record<
@@ -8181,7 +8184,6 @@ interface GleanImpl {
     byTypePrematureEviction: GleanTimingDistribution;
     byTypeSucceededLookupTime: GleanTimingDistribution;
     cleanupAge: GleanTimingDistribution;
-    gracePeriodRenewal: Record<'different_record' | 'same_record', GleanCounter>;
     lookupAlgorithm: Record<
       'nativeOnly' | 'trrFirst' | 'trrOnly' | 'trrRace' | 'trrShadow',
       GleanCounter
@@ -8270,21 +8272,7 @@ interface GleanImpl {
     waitTime: GleanTimingDistribution;
   };
 
-  hpack: {
-    bytesEvictedCompressor: GleanMemoryDistribution;
-    bytesEvictedDecompressor: GleanMemoryDistribution;
-    bytesEvictedRatioCompressor: GleanCustomDistribution;
-    bytesEvictedRatioDecompressor: GleanCustomDistribution;
-    elementsEvictedCompressor: GleanCustomDistribution;
-    elementsEvictedDecompressor: GleanCustomDistribution;
-    peakCountCompressor: GleanCustomDistribution;
-    peakCountDecompressor: GleanCustomDistribution;
-    peakSizeCompressor: GleanMemoryDistribution;
-    peakSizeDecompressor: GleanMemoryDistribution;
-  };
-
   http: {
-    altsvcEntriesPerHeader: GleanCustomDistribution;
     altsvcMappingChangedTarget: Record<'false' | 'true', GleanCounter>;
     cacheDisposition: GleanDualLabeledCounter;
     cacheLmInconsistent: Record<'false' | 'true', GleanCounter>;
@@ -8309,7 +8297,6 @@ interface GleanImpl {
     requestPerPage: GleanCustomDistribution;
     requestPerPageFromCache: GleanCustomDistribution;
     responseVersion: GleanCustomDistribution;
-    sawQuicAltProtocol: GleanCustomDistribution;
     scriptBlockIncorrectMime: Record<
       | 'CORS_origin'
       | 'app_json'
@@ -8443,7 +8430,6 @@ interface GleanImpl {
   };
 
   spdy: {
-    chunkRecvd: GleanMemoryDistribution;
     continuedHeaders: GleanMemoryDistribution;
     goawayLocal: GleanCustomDistribution;
     goawayPeer: GleanCustomDistribution;
@@ -8451,12 +8437,7 @@ interface GleanImpl {
     parallelStreams: GleanCustomDistribution;
     requestPerConn: GleanCustomDistribution;
     serverInitiatedStreams: GleanCustomDistribution;
-    settingsIw: GleanMemoryDistribution;
     settingsMaxStreams: GleanCustomDistribution;
-    synRatio: GleanCustomDistribution;
-    synReplyRatio: GleanCustomDistribution;
-    synReplySize: GleanMemoryDistribution;
-    synSize: GleanMemoryDistribution;
   };
 
   websockets: {
@@ -8587,6 +8568,7 @@ interface GleanImpl {
     permanentCertErrorOverrides: GleanCustomDistribution;
     reasonsForNotFalseStarting: GleanCustomDistribution;
     resumedSession: Record<'false' | 'true', GleanCounter>;
+    sctsFromTiledLogsPerConnection: GleanCustomDistribution;
     sctsOrigin: GleanCustomDistribution;
     sctsPerConnection: GleanCustomDistribution;
     sctsVerificationStatus: GleanCustomDistribution;
@@ -8655,7 +8637,6 @@ interface GleanImpl {
     contentWin32kLockdownState: GleanQuantity;
     effectiveContentProcessLevel: GleanQuantity;
     failedLaunchKeyed: Record<string, GleanCustomDistribution>;
-    hasUserNamespaces: Record<'false' | 'true', GleanCounter>;
     rejectedSyscalls: Record<string, GleanCounter>;
   };
 
@@ -9692,12 +9673,19 @@ interface GleanImpl {
     autofillProfilesCount: GleanQuantity;
   };
 
+  geckoTrace: {
+    traces: GleanObject;
+  };
+
   fog: {
     dataDirectoryInfo: GleanObject;
     failedIdleRegistration: GleanBoolean;
     initializations: GleanTimingDistribution;
     initsDuringShutdown: GleanCounter;
     maxPingsPerMinute: GleanQuantity;
+    subdirEntryErr: Record<'db' | 'events' | 'pending_pings', GleanCounter>;
+    subdirEntryMetadataErr: Record<'db' | 'events' | 'pending_pings', GleanCounter>;
+    subdirErr: Record<'db' | 'events' | 'pending_pings', GleanBoolean>;
   };
 
   fogIpc: {
@@ -10453,6 +10441,7 @@ interface GleanImpl {
     mgmtMenuItemUsedImportFromBrowser: GleanEventNoExtras;
     mgmtMenuItemUsedImportFromCsv: GleanEventNoExtras;
     mgmtMenuItemUsedPreferences: GleanEventNoExtras;
+    migration: GleanEventWithExtras<{ error?: string; value?: string }>;
     newNewLogin: GleanEventNoExtras;
     numImprovedGeneratedPasswords: Record<'false' | 'true', GleanCounter>;
     numSavedPasswords: GleanQuantity;
@@ -10502,6 +10491,7 @@ interface GleanImpl {
     enabledOptInPanel: GleanEventWithExtras<{ value?: string }>;
     enabledPrefChange: GleanEventNoExtras;
     getUnlimitedMasksReusePanel: GleanEventWithExtras<{ value?: string }>;
+    placedEmailMask: GleanEventWithExtras<{ error_code?: string; value?: string }>;
     postponedOptInPanel: GleanEventWithExtras<{ value?: string }>;
     reuseMaskReusePanel: GleanEventWithExtras<{ value?: string }>;
     shownFillUsername: GleanEventWithExtras<{ error_code?: string; value?: string }>;
@@ -10711,7 +10701,9 @@ interface GleanImpl {
     bookmarksCount: GleanCustomDistribution;
     databaseFaviconsFilesize: GleanMemoryDistribution;
     databaseFilesize: GleanMemoryDistribution;
+    databaseSemanticHistoryDefragmentTime: GleanTimingDistribution;
     databaseSemanticHistoryFilesize: GleanMemoryDistribution;
+    databaseSemanticHistoryWastedPercentage: GleanQuantity;
     expirationStepsToClean: GleanCustomDistribution;
     exportTohtml: GleanTimingDistribution;
     frecencyRecalcChunkTime: GleanTimingDistribution;
@@ -12042,6 +12034,7 @@ interface GleanImpl {
 
   brokenSiteReportTabInfoAntitracking: {
     blockList: GleanString;
+    blockedOrigins: GleanStringList;
     btpHasPurgedSite: GleanBoolean;
     etpCategory: GleanString;
     hasMixedActiveContentBlocked: GleanBoolean;
@@ -12421,10 +12414,6 @@ interface GleanImpl {
     secureOpensearchUpdateCount: GleanQuantity;
   };
 
-  search: {
-    suggestionsLatency: Record<string, GleanTimingDistribution>;
-  };
-
   searchEngineDefault: {
     changed: GleanEventWithExtras<{
       change_reason?: string;
@@ -12477,9 +12466,16 @@ interface GleanImpl {
   searchSuggestions: {
     abortedRequests: Record<string, GleanCounter>;
     failedRequests: Record<string, GleanCounter>;
+    latency: Record<string, GleanTimingDistribution>;
     successfulRequests: Record<string, GleanCounter>;
   };
 
+  searchSuggestionsOhttp: {
+    enabled: GleanBoolean;
+    latency: Record<string, GleanTimingDistribution>;
+    requestCounter: GleanDualLabeledCounter;
+  };
+
   legacyTelemetry: {
     clientId: GleanUuid;
     profileGroupId: GleanUuid;
@@ -12721,7 +12717,72 @@ interface GleanImpl {
     completeRemoteStatus2: Record<string, GleanCustomDistribution>;
     completeServerResponseTime: Record<string, GleanTimingDistribution>;
     completeTimeout: GleanDualLabeledCounter;
+    completion: GleanEventWithExtras<{ hit?: string; table_name?: string }>;
     completionError: GleanCustomDistribution;
+    lookupHit: Record<
+      | 'ads-track-digest256'
+      | 'analytics-track-digest256'
+      | 'anti-fraud-track-digest256'
+      | 'base-cryptomining-track-digest256'
+      | 'base-email-track-digest256'
+      | 'base-fingerprinting-track-digest256'
+      | 'base-track-digest256'
+      | 'consent-manager-track-digest256'
+      | 'content-cryptomining-track-digest256'
+      | 'content-email-track-digest256'
+      | 'content-fingerprinting-track-digest256'
+      | 'content-track-digest256'
+      | 'goog-badbinurl-proto'
+      | 'goog-downloadwhite-proto'
+      | 'goog-harmful-proto'
+      | 'goog-malware-proto'
+      | 'goog-phish-proto'
+      | 'goog-unwanted-proto'
+      | 'google-trackwhite-digest256'
+      | 'googpub-phish-proto'
+      | 'mozplugin-block-digest256'
+      | 'mozstd-trackwhite-digest256'
+      | 'social-track-digest256'
+      | 'social-tracking-protection-digest256'
+      | 'social-tracking-protection-facebook-digest256'
+      | 'social-tracking-protection-linkedin-digest256'
+      | 'social-tracking-protection-twitter-digest256'
+      | 'test-malware-simple'
+      | 'test-unwanted-simple',
+      GleanCounter
+    >;
+    lookupMiss: Record<
+      | 'ads-track-digest256'
+      | 'analytics-track-digest256'
+      | 'anti-fraud-track-digest256'
+      | 'base-cryptomining-track-digest256'
+      | 'base-email-track-digest256'
+      | 'base-fingerprinting-track-digest256'
+      | 'base-track-digest256'
+      | 'consent-manager-track-digest256'
+      | 'content-cryptomining-track-digest256'
+      | 'content-email-track-digest256'
+      | 'content-fingerprinting-track-digest256'
+      | 'content-track-digest256'
+      | 'goog-badbinurl-proto'
+      | 'goog-downloadwhite-proto'
+      | 'goog-harmful-proto'
+      | 'goog-malware-proto'
+      | 'goog-phish-proto'
+      | 'goog-unwanted-proto'
+      | 'google-trackwhite-digest256'
+      | 'googpub-phish-proto'
+      | 'mozplugin-block-digest256'
+      | 'mozstd-trackwhite-digest256'
+      | 'social-track-digest256'
+      | 'social-tracking-protection-digest256'
+      | 'social-tracking-protection-facebook-digest256'
+      | 'social-tracking-protection-linkedin-digest256'
+      | 'social-tracking-protection-twitter-digest256'
+      | 'test-malware-simple'
+      | 'test-unwanted-simple',
+      GleanCounter
+    >;
     lookupTime2: GleanTimingDistribution;
     shutdownTime: GleanTimingDistribution;
     threathitNetworkError: GleanCustomDistribution;
@@ -12915,7 +12976,6 @@ interface GleanImpl {
     isWow64: GleanBoolean;
     isWowArm64: GleanBoolean;
     memory: GleanQuantity;
-    specialDirectoryAppdataFallback: Record<'appdata' | 'localappdata', GleanBoolean>;
     virtualMemory: GleanQuantity;
     winPackageFamilyName: GleanString;
   };
@@ -13813,6 +13873,7 @@ interface GleanPingsImpl {
   quickSuggest: GleanPingNoReason;
   quickSuggestDeletionRequest: GleanPingNoReason;
   urlbarKeywordExposure: GleanPingNoReason;
+  dataLeakBlocker: GleanPingNoReason;
   contextIdDeletionRequest: GleanPingNoReason;
   prototypeNoCodeEvents: GleanPingNoReason;
   pageload: GleanPingWithReason<'startup' | 'threshold'>;
@@ -13826,6 +13887,7 @@ interface GleanPingsImpl {
   backgroundTasks: GleanPingNoReason;
   captchaDetection: GleanPingNoReason;
   crash: GleanPingWithReason<'crash' | 'event_found'>;
+  traces: GleanPingWithReason<'buffer_full' | 'idle' | 'shutdown'>;
   dauReporting: GleanPingWithReason<'active' | 'dirty_startup' | 'inactive'>;
   tempFogInitialState: GleanPingWithReason<'startup'>;
   collectionDisabledPing: GleanPingNoReason;
diff --git a/src/zen/@types/lib.gecko.linux.d.ts b/src/zen/@types/lib.gecko.linux.d.ts
index d38d49d38..7308bb544 100644
--- a/src/zen/@types/lib.gecko.linux.d.ts
+++ b/src/zen/@types/lib.gecko.linux.d.ts
@@ -13,8 +13,6 @@ declare global {
   interface nsIGNOMEShellService extends nsIShellService {
     readonly canSetDesktopBackground: boolean;
     isDefaultForScheme(aScheme: string): boolean;
-    getGSettingsString(aScheme: string, aKey: string): string;
-    setGSettingsString(aScheme: string, aKey: string, aValue: string): void;
   }
 
   // https://searchfox.org/mozilla-central/source/browser/components/shell/nsIOpenTabsProvider.idl
diff --git a/src/zen/@types/lib.gecko.modules.d.ts b/src/zen/@types/lib.gecko.modules.d.ts
index 39e78034a..baaabf92f 100644
--- a/src/zen/@types/lib.gecko.modules.d.ts
+++ b/src/zen/@types/lib.gecko.modules.d.ts
@@ -7,27 +7,62 @@
  */
 
 export interface Modules {
+  'chrome://browser/content/aboutlogins/aboutLoginsUtils.mjs': typeof import('chrome://browser/content/aboutlogins/aboutLoginsUtils.mjs');
+  'chrome://browser/content/asrouter/components/fxa-menu-message.mjs': typeof import('chrome://browser/content/asrouter/components/fxa-menu-message.mjs');
   'chrome://browser/content/backup/backup-constants.mjs': typeof import('chrome://browser/content/backup/backup-constants.mjs');
+  'chrome://browser/content/genai/content/link-preview-card-onboarding.mjs': typeof import('chrome://browser/content/genai/content/link-preview-card-onboarding.mjs');
+  'chrome://browser/content/genai/content/link-preview-card.mjs': typeof import('chrome://browser/content/genai/content/link-preview-card.mjs');
+  'chrome://browser/content/genai/content/model-optin.mjs': typeof import('chrome://browser/content/genai/content/model-optin.mjs');
+  'chrome://browser/content/ipprotection/ipprotection-constants.mjs': typeof import('chrome://browser/content/ipprotection/ipprotection-constants.mjs');
   'chrome://browser/content/migration/migration-wizard-constants.mjs': typeof import('chrome://browser/content/migration/migration-wizard-constants.mjs');
   'chrome://browser/content/nsContextMenu.sys.mjs': typeof import('chrome://browser/content/nsContextMenu.sys.mjs');
+  'chrome://browser/content/screenshots/fileHelpers.mjs': typeof import('chrome://browser/content/screenshots/fileHelpers.mjs');
+  'chrome://browser/content/sidebar/sidebar-main.mjs': typeof import('chrome://browser/content/sidebar/sidebar-main.mjs');
+  'chrome://browser/content/sidebar/sidebar-panel-header.mjs': typeof import('chrome://browser/content/sidebar/sidebar-panel-header.mjs');
+  'chrome://browser/content/tabbrowser/tab-hover-preview.mjs': typeof import('chrome://browser/content/tabbrowser/tab-hover-preview.mjs');
+  'chrome://browser/content/translations/TranslationsPanelShared.sys.mjs': typeof import('chrome://browser/content/translations/TranslationsPanelShared.sys.mjs');
+  'chrome://browser/content/webrtc/webrtc-preview.mjs': typeof import('chrome://browser/content/webrtc/webrtc-preview.mjs');
   'chrome://devtools-startup/content/DevToolsShim.sys.mjs': typeof import('chrome://devtools-startup/content/DevToolsShim.sys.mjs');
+  'chrome://formautofill/content/manageDialog.mjs': typeof import('chrome://formautofill/content/manageDialog.mjs');
+  'chrome://global/content/aboutLogging/profileStorage.mjs': typeof import('chrome://global/content/aboutLogging/profileStorage.mjs');
+  'chrome://global/content/certviewer/certDecoder.mjs': typeof import('chrome://global/content/certviewer/certDecoder.mjs');
+  'chrome://global/content/elements/browser-custom-element.mjs': typeof import('chrome://global/content/elements/browser-custom-element.mjs');
   'chrome://global/content/ml/BlockWords.sys.mjs': typeof import('chrome://global/content/ml/BlockWords.sys.mjs');
+  'chrome://global/content/ml/ClusterAlgos.sys.mjs': typeof import('chrome://global/content/ml/ClusterAlgos.sys.mjs');
   'chrome://global/content/ml/EmbeddingsGenerator.sys.mjs': typeof import('chrome://global/content/ml/EmbeddingsGenerator.sys.mjs');
   'chrome://global/content/ml/EngineProcess.sys.mjs': typeof import('chrome://global/content/ml/EngineProcess.sys.mjs');
-  'chrome://global/content/ml/HttpInference.sys.mjs': typeof import('chrome://global/content/ml/HttpInference.sys.mjs');
   'chrome://global/content/ml/ModelHub.sys.mjs': typeof import('chrome://global/content/ml/ModelHub.sys.mjs');
+  'chrome://global/content/ml/NLPUtils.sys.mjs': typeof import('chrome://global/content/ml/NLPUtils.sys.mjs');
   'chrome://global/content/ml/OPFS.sys.mjs': typeof import('chrome://global/content/ml/OPFS.sys.mjs');
-  'chrome://global/content/ml/ThomSample.sys.mjs': typeof import('chrome://global/content/ml/ThomSample.sys.mjs');
+  'chrome://global/content/ml/StopWords.sys.mjs': typeof import('chrome://global/content/ml/StopWords.sys.mjs');
   'chrome://global/content/ml/Utils.sys.mjs': typeof import('chrome://global/content/ml/Utils.sys.mjs');
+  'chrome://global/content/ml/backends/LlamaCppPipeline.mjs': typeof import('chrome://global/content/ml/backends/LlamaCppPipeline.mjs');
   'chrome://global/content/ml/backends/LlamaPipeline.mjs': typeof import('chrome://global/content/ml/backends/LlamaPipeline.mjs');
   'chrome://global/content/ml/backends/ONNXPipeline.mjs': typeof import('chrome://global/content/ml/backends/ONNXPipeline.mjs');
+  'chrome://global/content/ml/backends/OpenAIPipeline.mjs': typeof import('chrome://global/content/ml/backends/OpenAIPipeline.mjs');
   'chrome://global/content/ml/backends/Pipeline.mjs': typeof import('chrome://global/content/ml/backends/Pipeline.mjs');
+  'chrome://global/content/ml/backends/StaticEmbeddingsPipeline.mjs': typeof import('chrome://global/content/ml/backends/StaticEmbeddingsPipeline.mjs');
+  'chrome://global/content/preferences/Preferences.mjs': typeof import('chrome://global/content/preferences/Preferences.mjs');
   'chrome://global/content/translations/TranslationsTelemetry.sys.mjs': typeof import('chrome://global/content/translations/TranslationsTelemetry.sys.mjs');
   'chrome://global/content/translations/TranslationsUtils.mjs': typeof import('chrome://global/content/translations/TranslationsUtils.mjs');
   'chrome://global/content/translations/translations-document.sys.mjs': typeof import('chrome://global/content/translations/translations-document.sys.mjs');
   'chrome://global/content/translations/translations-engine.sys.mjs': typeof import('chrome://global/content/translations/translations-engine.sys.mjs');
+  'chrome://mochikit/content/ShutdownLeaksCollector.sys.mjs': typeof import('chrome://mochikit/content/ShutdownLeaksCollector.sys.mjs');
+  'chrome://mochikit/content/tests/SimpleTest/DragSourceChildContext.sys.mjs': typeof import('chrome://mochikit/content/tests/SimpleTest/DragSourceChildContext.sys.mjs');
+  'chrome://mochikit/content/tests/SimpleTest/DragSourceParentContext.sys.mjs': typeof import('chrome://mochikit/content/tests/SimpleTest/DragSourceParentContext.sys.mjs');
+  'chrome://mochikit/content/tests/SimpleTest/DragTargetChildContext.sys.mjs': typeof import('chrome://mochikit/content/tests/SimpleTest/DragTargetChildContext.sys.mjs');
+  'chrome://mochikit/content/tests/SimpleTest/DragTargetParentContext.sys.mjs': typeof import('chrome://mochikit/content/tests/SimpleTest/DragTargetParentContext.sys.mjs');
+  'chrome://mochitests/content/browser/accessible/tests/browser/Common.sys.mjs': typeof import('chrome://mochitests/content/browser/accessible/tests/browser/Common.sys.mjs');
+  'chrome://mochitests/content/browser/accessible/tests/browser/Layout.sys.mjs': typeof import('chrome://mochitests/content/browser/accessible/tests/browser/Layout.sys.mjs');
+  'chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/examples/worker-esm-dep.mjs': typeof import('chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/examples/worker-esm-dep.mjs');
+  'chrome://mochitests/content/browser/js/xpconnect/tests/browser/worker_source.mjs': typeof import('chrome://mochitests/content/browser/js/xpconnect/tests/browser/worker_source.mjs');
   'chrome://mochitests/content/browser/remote/shared/messagehandler/test/browser/resources/modules/ModuleRegistry.sys.mjs': typeof import('chrome://mochitests/content/browser/remote/shared/messagehandler/test/browser/resources/modules/ModuleRegistry.sys.mjs');
-  'chrome://pocket/content/pktApi.sys.mjs': typeof import('chrome://pocket/content/pktApi.sys.mjs');
+  'chrome://mochitests/content/browser/toolkit/components/translations/tests/browser/translations-test.mjs': typeof import('chrome://mochitests/content/browser/toolkit/components/translations/tests/browser/translations-test.mjs');
+  'chrome://mochitests/content/browser/tools/profiler/tests/browser/value_summary_reader.mjs': typeof import('chrome://mochitests/content/browser/tools/profiler/tests/browser/value_summary_reader.mjs');
+  'chrome://mochitests/content/chrome/dom/network/tests/tcpsocket_test.sys.mjs': typeof import('chrome://mochitests/content/chrome/dom/network/tests/tcpsocket_test.sys.mjs');
+  'chrome://mochitests/content/chrome/dom/url/tests/file_worker_url.sys.mjs': typeof import('chrome://mochitests/content/chrome/dom/url/tests/file_worker_url.sys.mjs');
+  'chrome://mochitests/content/chrome/dom/url/tests/test_bug883784.sys.mjs': typeof import('chrome://mochitests/content/chrome/dom/url/tests/test_bug883784.sys.mjs');
+  'chrome://mochitests/content/chrome/dom/workers/test/WorkerTest.sys.mjs': typeof import('chrome://mochitests/content/chrome/dom/workers/test/WorkerTest.sys.mjs');
   'chrome://remote/content/components/Marionette.sys.mjs': typeof import('chrome://remote/content/components/Marionette.sys.mjs');
   'chrome://remote/content/components/RemoteAgent.sys.mjs': typeof import('chrome://remote/content/components/RemoteAgent.sys.mjs');
   'chrome://remote/content/marionette/actors/MarionetteCommandsParent.sys.mjs': typeof import('chrome://remote/content/marionette/actors/MarionetteCommandsParent.sys.mjs');
@@ -75,6 +110,7 @@ export interface Modules {
   'chrome://remote/content/shared/Prompt.sys.mjs': typeof import('chrome://remote/content/shared/Prompt.sys.mjs');
   'chrome://remote/content/shared/Realm.sys.mjs': typeof import('chrome://remote/content/shared/Realm.sys.mjs');
   'chrome://remote/content/shared/RecommendedPreferences.sys.mjs': typeof import('chrome://remote/content/shared/RecommendedPreferences.sys.mjs');
+  'chrome://remote/content/shared/RemoteError.sys.mjs': typeof import('chrome://remote/content/shared/RemoteError.sys.mjs');
   'chrome://remote/content/shared/Stack.sys.mjs': typeof import('chrome://remote/content/shared/Stack.sys.mjs');
   'chrome://remote/content/shared/Sync.sys.mjs': typeof import('chrome://remote/content/shared/Sync.sys.mjs');
   'chrome://remote/content/shared/TabManager.sys.mjs': typeof import('chrome://remote/content/shared/TabManager.sys.mjs');
@@ -82,7 +118,6 @@ export interface Modules {
   'chrome://remote/content/shared/UserContextManager.sys.mjs': typeof import('chrome://remote/content/shared/UserContextManager.sys.mjs');
   'chrome://remote/content/shared/WindowManager.sys.mjs': typeof import('chrome://remote/content/shared/WindowManager.sys.mjs');
   'chrome://remote/content/shared/js-process-actors/WebDriverDocumentInsertedActor.sys.mjs': typeof import('chrome://remote/content/shared/js-process-actors/WebDriverDocumentInsertedActor.sys.mjs');
-  'chrome://remote/content/shared/js-window-actors/WebProgressListenerActor.sys.mjs': typeof import('chrome://remote/content/shared/js-window-actors/WebProgressListenerActor.sys.mjs');
   'chrome://remote/content/shared/listeners/BeforeStopRequestListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/BeforeStopRequestListener.sys.mjs');
   'chrome://remote/content/shared/listeners/BrowsingContextListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/BrowsingContextListener.sys.mjs');
   'chrome://remote/content/shared/listeners/CachedResourceListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/CachedResourceListener.sys.mjs');
@@ -90,6 +125,7 @@ export interface Modules {
   'chrome://remote/content/shared/listeners/ConsoleListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/ConsoleListener.sys.mjs');
   'chrome://remote/content/shared/listeners/ContextualIdentityListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/ContextualIdentityListener.sys.mjs');
   'chrome://remote/content/shared/listeners/DataChannelListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/DataChannelListener.sys.mjs');
+  'chrome://remote/content/shared/listeners/DownloadListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/DownloadListener.sys.mjs');
   'chrome://remote/content/shared/listeners/LoadListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/LoadListener.sys.mjs');
   'chrome://remote/content/shared/listeners/NavigationListener.sys.mjs': typeof import('chrome://remote/content/shared/listeners/NavigationListener.sys.mjs');
   'chrome://remote/content/shared/listeners/NetworkEventRecord.sys.mjs': typeof import('chrome://remote/content/shared/listeners/NetworkEventRecord.sys.mjs');
@@ -155,21 +191,30 @@ export interface Modules {
   'moz-src:///browser/components/DefaultBrowserCheck.sys.mjs': typeof import('moz-src:///browser/components/DefaultBrowserCheck.sys.mjs');
   'moz-src:///browser/components/DesktopActorRegistry.sys.mjs': typeof import('moz-src:///browser/components/DesktopActorRegistry.sys.mjs');
   'moz-src:///browser/components/ProfileDataUpgrader.sys.mjs': typeof import('moz-src:///browser/components/ProfileDataUpgrader.sys.mjs');
+  'moz-src:///browser/components/StartupTelemetry.sys.mjs': typeof import('moz-src:///browser/components/StartupTelemetry.sys.mjs');
   'moz-src:///browser/components/attribution/AttributionCode.sys.mjs': typeof import('moz-src:///browser/components/attribution/AttributionCode.sys.mjs');
   'moz-src:///browser/components/attribution/MacAttribution.sys.mjs': typeof import('moz-src:///browser/components/attribution/MacAttribution.sys.mjs');
   'moz-src:///browser/components/contentanalysis/content/ContentAnalysis.sys.mjs': typeof import('moz-src:///browser/components/contentanalysis/content/ContentAnalysis.sys.mjs');
   'moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs': typeof import('moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs');
   'moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs': typeof import('moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs');
+  'moz-src:///browser/components/customizableui/CustomizeMode.sys.mjs': typeof import('moz-src:///browser/components/customizableui/CustomizeMode.sys.mjs');
   'moz-src:///browser/components/customizableui/DragPositionManager.sys.mjs': typeof import('moz-src:///browser/components/customizableui/DragPositionManager.sys.mjs');
   'moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs': typeof import('moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs');
+  'moz-src:///browser/components/customizableui/SearchWidgetTracker.sys.mjs': typeof import('moz-src:///browser/components/customizableui/SearchWidgetTracker.sys.mjs');
   'moz-src:///browser/components/customizableui/ToolbarContextMenu.sys.mjs': typeof import('moz-src:///browser/components/customizableui/ToolbarContextMenu.sys.mjs');
   'moz-src:///browser/components/customizableui/ToolbarDropHandler.sys.mjs': typeof import('moz-src:///browser/components/customizableui/ToolbarDropHandler.sys.mjs');
   'moz-src:///browser/components/downloads/DownloadSpamProtection.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadSpamProtection.sys.mjs');
   'moz-src:///browser/components/downloads/DownloadsCommon.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsCommon.sys.mjs');
+  'moz-src:///browser/components/downloads/DownloadsMacFinderProgress.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsMacFinderProgress.sys.mjs');
+  'moz-src:///browser/components/downloads/DownloadsTaskbar.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsTaskbar.sys.mjs');
   'moz-src:///browser/components/downloads/DownloadsViewUI.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsViewUI.sys.mjs');
   'moz-src:///browser/components/downloads/DownloadsViewableInternally.sys.mjs': typeof import('moz-src:///browser/components/downloads/DownloadsViewableInternally.sys.mjs');
   'moz-src:///browser/components/genai/LinkPreview.sys.mjs': typeof import('moz-src:///browser/components/genai/LinkPreview.sys.mjs');
   'moz-src:///browser/components/genai/LinkPreviewModel.sys.mjs': typeof import('moz-src:///browser/components/genai/LinkPreviewModel.sys.mjs');
+  'moz-src:///browser/components/genai/PageAssist.sys.mjs': typeof import('moz-src:///browser/components/genai/PageAssist.sys.mjs');
+  'moz-src:///browser/components/genai/SmartAssistEngine.sys.mjs': typeof import('moz-src:///browser/components/genai/SmartAssistEngine.sys.mjs');
+  'moz-src:///browser/components/mozcachedohttp/MozCachedOHTTPProtocolHandler.sys.mjs': typeof import('moz-src:///browser/components/mozcachedohttp/MozCachedOHTTPProtocolHandler.sys.mjs');
+  'moz-src:///browser/components/newtab/SponsorProtection.sys.mjs': typeof import('moz-src:///browser/components/newtab/SponsorProtection.sys.mjs');
   'moz-src:///browser/components/pagedata/OpenGraphPageData.sys.mjs': typeof import('moz-src:///browser/components/pagedata/OpenGraphPageData.sys.mjs');
   'moz-src:///browser/components/pagedata/PageDataSchema.sys.mjs': typeof import('moz-src:///browser/components/pagedata/PageDataSchema.sys.mjs');
   'moz-src:///browser/components/pagedata/PageDataService.sys.mjs': typeof import('moz-src:///browser/components/pagedata/PageDataService.sys.mjs');
@@ -200,14 +245,62 @@ export interface Modules {
   'moz-src:///browser/components/tabbrowser/OpenInTabsUtils.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/OpenInTabsUtils.sys.mjs');
   'moz-src:///browser/components/tabbrowser/SmartTabGrouping.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/SmartTabGrouping.sys.mjs');
   'moz-src:///browser/components/tabbrowser/TabMetrics.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/TabMetrics.sys.mjs');
+  'moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs');
   'moz-src:///browser/components/tabbrowser/TabsList.sys.mjs': typeof import('moz-src:///browser/components/tabbrowser/TabsList.sys.mjs');
   'moz-src:///browser/components/uitour/UITour.sys.mjs': typeof import('moz-src:///browser/components/uitour/UITour.sys.mjs');
+  'moz-src:///browser/components/uitour/UITourUtils.sys.mjs': typeof import('moz-src:///browser/components/uitour/UITourUtils.sys.mjs');
+  'moz-src:///browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs': typeof import('moz-src:///browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs');
+  'moz-src:///browser/components/urlbar/ActionsProviderQuickActions.sys.mjs': typeof import('moz-src:///browser/components/urlbar/ActionsProviderQuickActions.sys.mjs');
+  'moz-src:///browser/components/urlbar/MerinoClient.sys.mjs': typeof import('moz-src:///browser/components/urlbar/MerinoClient.sys.mjs');
+  'moz-src:///browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs': typeof import('moz-src:///browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs');
+  'moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs': typeof import('moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs');
+  'moz-src:///browser/components/urlbar/SearchModeSwitcher.sys.mjs': typeof import('moz-src:///browser/components/urlbar/SearchModeSwitcher.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarController.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarController.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarEventBufferer.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarEventBufferer.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarInput.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarInput.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarPrefs.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarPrefs.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderAutofill.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderAutofill.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderCalculator.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderCalculator.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderClipboard.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderClipboard.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderGlobalActions.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderGlobalActions.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderInterventions.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderInterventions.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderOpenTabs.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderOpenTabs.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderPlaces.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderPlaces.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderSemanticHistorySearch.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderSemanticHistorySearch.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderTopSites.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderTopSites.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarProvidersManager.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarProvidersManager.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarResult.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarResult.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarSearchTermsPersistence.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarSearchTermsPersistence.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarSearchUtils.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarSearchUtils.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarValueFormatter.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarValueFormatter.sys.mjs');
+  'moz-src:///browser/components/urlbar/UrlbarView.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarView.sys.mjs');
+  'moz-src:///browser/components/urlbar/private/AmpSuggestions.sys.mjs': typeof import('moz-src:///browser/components/urlbar/private/AmpSuggestions.sys.mjs');
+  'moz-src:///browser/components/urlbar/private/GeolocationUtils.sys.mjs': typeof import('moz-src:///browser/components/urlbar/private/GeolocationUtils.sys.mjs');
+  'moz-src:///browser/components/urlbar/private/MLSuggest.sys.mjs': typeof import('moz-src:///browser/components/urlbar/private/MLSuggest.sys.mjs');
+  'moz-src:///browser/components/urlbar/private/SuggestBackendRust.sys.mjs': typeof import('moz-src:///browser/components/urlbar/private/SuggestBackendRust.sys.mjs');
   'moz-src:///browser/modules/CanvasPermissionPromptHelper.sys.mjs': typeof import('moz-src:///browser/modules/CanvasPermissionPromptHelper.sys.mjs');
   'moz-src:///browser/modules/ContextId.sys.mjs': typeof import('moz-src:///browser/modules/ContextId.sys.mjs');
+  'moz-src:///browser/modules/PrivateBrowsingUI.sys.mjs': typeof import('moz-src:///browser/modules/PrivateBrowsingUI.sys.mjs');
+  'moz-src:///browser/modules/UnexpectedScriptObserver.sys.mjs': typeof import('moz-src:///browser/modules/UnexpectedScriptObserver.sys.mjs');
+  'moz-src:///browser/modules/WebAuthnPromptHelper.sys.mjs': typeof import('moz-src:///browser/modules/WebAuthnPromptHelper.sys.mjs');
   'moz-src:///browser/themes/ToolbarIconColor.sys.mjs': typeof import('moz-src:///browser/themes/ToolbarIconColor.sys.mjs');
+  'moz-src:///dom/notification/MemoryNotificationDB.sys.mjs': typeof import('moz-src:///dom/notification/MemoryNotificationDB.sys.mjs');
+  'moz-src:///dom/notification/NotificationDB.sys.mjs': typeof import('moz-src:///dom/notification/NotificationDB.sys.mjs');
+  'moz-src:///services/crypto/modules/WeaveCrypto.sys.mjs': typeof import('moz-src:///services/crypto/modules/WeaveCrypto.sys.mjs');
+  'moz-src:///services/crypto/modules/jwcrypto.sys.mjs': typeof import('moz-src:///services/crypto/modules/jwcrypto.sys.mjs');
+  'moz-src:///services/crypto/modules/utils.sys.mjs': typeof import('moz-src:///services/crypto/modules/utils.sys.mjs');
   'moz-src:///toolkit/components/doh/DoHConfig.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHConfig.sys.mjs');
   'moz-src:///toolkit/components/doh/DoHController.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHController.sys.mjs');
   'moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs');
+  'moz-src:///toolkit/components/doh/TRRPerformance.sys.mjs': typeof import('moz-src:///toolkit/components/doh/TRRPerformance.sys.mjs');
   'moz-src:///toolkit/components/reader/AboutReader.sys.mjs': typeof import('moz-src:///toolkit/components/reader/AboutReader.sys.mjs');
   'moz-src:///toolkit/components/reader/ReaderMode.sys.mjs': typeof import('moz-src:///toolkit/components/reader/ReaderMode.sys.mjs');
   'moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs': typeof import('moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs');
@@ -224,39 +317,55 @@ export interface Modules {
   'moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs');
   'moz-src:///toolkit/components/search/SearchUtils.sys.mjs': typeof import('moz-src:///toolkit/components/search/SearchUtils.sys.mjs');
   'moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs': typeof import('moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustFilterAdult.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustFilterAdult.sys.mjs');
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs');
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs');
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs');
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs');
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs');
+  'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs');
   'moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs': typeof import('moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs');
+  'resource:///actors/AboutLoginsParent.sys.mjs': typeof import('resource:///actors/AboutLoginsParent.sys.mjs');
   'resource:///actors/AboutNewTabParent.sys.mjs': typeof import('resource:///actors/AboutNewTabParent.sys.mjs');
+  'resource:///actors/AboutPrivateBrowsingParent.sys.mjs': typeof import('resource:///actors/AboutPrivateBrowsingParent.sys.mjs');
+  'resource:///actors/AboutProtectionsParent.sys.mjs': typeof import('resource:///actors/AboutProtectionsParent.sys.mjs');
   'resource:///actors/AboutReaderParent.sys.mjs': typeof import('resource:///actors/AboutReaderParent.sys.mjs');
   'resource:///actors/AboutWelcomeParent.sys.mjs': typeof import('resource:///actors/AboutWelcomeParent.sys.mjs');
   'resource:///actors/ClickHandlerParent.sys.mjs': typeof import('resource:///actors/ClickHandlerParent.sys.mjs');
   'resource:///actors/ContentSearchParent.sys.mjs': typeof import('resource:///actors/ContentSearchParent.sys.mjs');
   'resource:///actors/ContextMenuChild.sys.mjs': typeof import('resource:///actors/ContextMenuChild.sys.mjs');
   'resource:///actors/LinkHandlerParent.sys.mjs': typeof import('resource:///actors/LinkHandlerParent.sys.mjs');
+  'resource:///actors/LinkPreviewChild.sys.mjs': typeof import('resource:///actors/LinkPreviewChild.sys.mjs');
   'resource:///actors/PluginParent.sys.mjs': typeof import('resource:///actors/PluginParent.sys.mjs');
+  'resource:///actors/ScreenshotsComponentChild.sys.mjs': typeof import('resource:///actors/ScreenshotsComponentChild.sys.mjs');
   'resource:///actors/SearchSERPTelemetryChild.sys.mjs': typeof import('resource:///actors/SearchSERPTelemetryChild.sys.mjs');
   'resource:///actors/WebRTCChild.sys.mjs': typeof import('resource:///actors/WebRTCChild.sys.mjs');
+  'resource:///bar.sys.mjs': typeof import('resource:///bar.sys.mjs');
   'resource:///modules/360seMigrationUtils.sys.mjs': typeof import('resource:///modules/360seMigrationUtils.sys.mjs');
   'resource:///modules/AboutHomeStartupCache.sys.mjs': typeof import('resource:///modules/AboutHomeStartupCache.sys.mjs');
   'resource:///modules/AboutNewTab.sys.mjs': typeof import('resource:///modules/AboutNewTab.sys.mjs');
   'resource:///modules/AboutNewTabRedirector.sys.mjs': typeof import('resource:///modules/AboutNewTabRedirector.sys.mjs');
   'resource:///modules/AboutNewTabResourceMapping.sys.mjs': typeof import('resource:///modules/AboutNewTabResourceMapping.sys.mjs');
-  'resource:///modules/ActionsProviderContextualSearch.sys.mjs': typeof import('resource:///modules/ActionsProviderContextualSearch.sys.mjs');
-  'resource:///modules/ActionsProviderQuickActions.sys.mjs': typeof import('resource:///modules/ActionsProviderQuickActions.sys.mjs');
+  'resource:///modules/AccountsGlue.sys.mjs': typeof import('resource:///modules/AccountsGlue.sys.mjs');
   'resource:///modules/BrowserGlue.sys.mjs': typeof import('resource:///modules/BrowserGlue.sys.mjs');
   'resource:///modules/BrowserUIUtils.sys.mjs': typeof import('resource:///modules/BrowserUIUtils.sys.mjs');
   'resource:///modules/BrowserUsageTelemetry.sys.mjs': typeof import('resource:///modules/BrowserUsageTelemetry.sys.mjs');
   'resource:///modules/BrowserWindowTracker.sys.mjs': typeof import('resource:///modules/BrowserWindowTracker.sys.mjs');
   'resource:///modules/BuiltInThemeConfig.sys.mjs': typeof import('resource:///modules/BuiltInThemeConfig.sys.mjs');
   'resource:///modules/BuiltInThemes.sys.mjs': typeof import('resource:///modules/BuiltInThemes.sys.mjs');
+  'resource:///modules/ChromeMacOSLoginCrypto.sys.mjs': typeof import('resource:///modules/ChromeMacOSLoginCrypto.sys.mjs');
   'resource:///modules/ChromeMigrationUtils.sys.mjs': typeof import('resource:///modules/ChromeMigrationUtils.sys.mjs');
+  'resource:///modules/ChromeProfileMigrator.sys.mjs': typeof import('resource:///modules/ChromeProfileMigrator.sys.mjs');
+  'resource:///modules/ChromeWindowsLoginCrypto.sys.mjs': typeof import('resource:///modules/ChromeWindowsLoginCrypto.sys.mjs');
   'resource:///modules/ContentCrashHandlers.sys.mjs': typeof import('resource:///modules/ContentCrashHandlers.sys.mjs');
+  'resource:///modules/Dedupe.sys.mjs': typeof import('resource:///modules/Dedupe.sys.mjs');
+  'resource:///modules/DevToolsStartup.sys.mjs': typeof import('resource:///modules/DevToolsStartup.sys.mjs');
   'resource:///modules/Discovery.sys.mjs': typeof import('resource:///modules/Discovery.sys.mjs');
+  'resource:///modules/DownloadsCommon.sys.mjs': typeof import('resource:///modules/DownloadsCommon.sys.mjs');
+  'resource:///modules/DownloadsViewUI.sys.mjs': typeof import('resource:///modules/DownloadsViewUI.sys.mjs');
   'resource:///modules/ESEDBReader.sys.mjs': typeof import('resource:///modules/ESEDBReader.sys.mjs');
+  'resource:///modules/EdgeProfileMigrator.sys.mjs': typeof import('resource:///modules/EdgeProfileMigrator.sys.mjs');
   'resource:///modules/EveryWindow.sys.mjs': typeof import('resource:///modules/EveryWindow.sys.mjs');
   'resource:///modules/ExtensionBrowsingData.sys.mjs': typeof import('resource:///modules/ExtensionBrowsingData.sys.mjs');
   'resource:///modules/ExtensionControlledPopup.sys.mjs': typeof import('resource:///modules/ExtensionControlledPopup.sys.mjs');
@@ -271,25 +380,25 @@ export interface Modules {
   'resource:///modules/GenAI.sys.mjs': typeof import('resource:///modules/GenAI.sys.mjs');
   'resource:///modules/HistoryController.sys.mjs': typeof import('resource:///modules/HistoryController.sys.mjs');
   'resource:///modules/HomePage.sys.mjs': typeof import('resource:///modules/HomePage.sys.mjs');
+  'resource:///modules/InstallerPrefs.sys.mjs': typeof import('resource:///modules/InstallerPrefs.sys.mjs');
   'resource:///modules/InternalTestingProfileMigrator.sys.mjs': typeof import('resource:///modules/InternalTestingProfileMigrator.sys.mjs');
   'resource:///modules/LaterRun.sys.mjs': typeof import('resource:///modules/LaterRun.sys.mjs');
   'resource:///modules/LinksCache.sys.mjs': typeof import('resource:///modules/LinksCache.sys.mjs');
   'resource:///modules/LoginBreaches.sys.mjs': typeof import('resource:///modules/LoginBreaches.sys.mjs');
+  'resource:///modules/MSMigrationUtils.sys.mjs': typeof import('resource:///modules/MSMigrationUtils.sys.mjs');
   'resource:///modules/MerinoClient.sys.mjs': typeof import('resource:///modules/MerinoClient.sys.mjs');
   'resource:///modules/MigrationUtils.sys.mjs': typeof import('resource:///modules/MigrationUtils.sys.mjs');
+  'resource:///modules/MigratorBase.sys.mjs': typeof import('resource:///modules/MigratorBase.sys.mjs');
   'resource:///modules/OpenTabs.sys.mjs': typeof import('resource:///modules/OpenTabs.sys.mjs');
   'resource:///modules/PageActions.sys.mjs': typeof import('resource:///modules/PageActions.sys.mjs');
   'resource:///modules/PartnerLinkAttribution.sys.mjs': typeof import('resource:///modules/PartnerLinkAttribution.sys.mjs');
   'resource:///modules/PermissionUI.sys.mjs': typeof import('resource:///modules/PermissionUI.sys.mjs');
-  'resource:///modules/PopupBlockerObserver.sys.mjs': typeof import('resource:///modules/PopupBlockerObserver.sys.mjs');
+  'resource:///modules/PopupAndRedirectBlockerObserver.sys.mjs': typeof import('resource:///modules/PopupAndRedirectBlockerObserver.sys.mjs');
   'resource:///modules/ProcessHangMonitor.sys.mjs': typeof import('resource:///modules/ProcessHangMonitor.sys.mjs');
-  'resource:///modules/QuickActionsLoaderDefault.sys.mjs': typeof import('resource:///modules/QuickActionsLoaderDefault.sys.mjs');
-  'resource:///modules/QuickSuggest.sys.mjs': typeof import('resource:///modules/QuickSuggest.sys.mjs');
   'resource:///modules/SafariProfileMigrator.sys.mjs': typeof import('resource:///modules/SafariProfileMigrator.sys.mjs');
   'resource:///modules/Sanitizer.sys.mjs': typeof import('resource:///modules/Sanitizer.sys.mjs');
   'resource:///modules/ScreenshotsOverlayChild.sys.mjs': typeof import('resource:///modules/ScreenshotsOverlayChild.sys.mjs');
   'resource:///modules/ScreenshotsUtils.sys.mjs': typeof import('resource:///modules/ScreenshotsUtils.sys.mjs');
-  'resource:///modules/SearchModeSwitcher.sys.mjs': typeof import('resource:///modules/SearchModeSwitcher.sys.mjs');
   'resource:///modules/SelectionChangedMenulist.sys.mjs': typeof import('resource:///modules/SelectionChangedMenulist.sys.mjs');
   'resource:///modules/SharingUtils.sys.mjs': typeof import('resource:///modules/SharingUtils.sys.mjs');
   'resource:///modules/SiteDataManager.sys.mjs': typeof import('resource:///modules/SiteDataManager.sys.mjs');
@@ -299,37 +408,10 @@ export interface Modules {
   'resource:///modules/ThemeVariableMap.sys.mjs': typeof import('resource:///modules/ThemeVariableMap.sys.mjs');
   'resource:///modules/TransientPrefs.sys.mjs': typeof import('resource:///modules/TransientPrefs.sys.mjs');
   'resource:///modules/URILoadingHelper.sys.mjs': typeof import('resource:///modules/URILoadingHelper.sys.mjs');
-  'resource:///modules/UrlbarController.sys.mjs': typeof import('resource:///modules/UrlbarController.sys.mjs');
-  'resource:///modules/UrlbarEventBufferer.sys.mjs': typeof import('resource:///modules/UrlbarEventBufferer.sys.mjs');
-  'resource:///modules/UrlbarInput.sys.mjs': typeof import('resource:///modules/UrlbarInput.sys.mjs');
-  'resource:///modules/UrlbarPrefs.sys.mjs': typeof import('resource:///modules/UrlbarPrefs.sys.mjs');
-  'resource:///modules/UrlbarProviderAutofill.sys.mjs': typeof import('resource:///modules/UrlbarProviderAutofill.sys.mjs');
-  'resource:///modules/UrlbarProviderCalculator.sys.mjs': typeof import('resource:///modules/UrlbarProviderCalculator.sys.mjs');
-  'resource:///modules/UrlbarProviderClipboard.sys.mjs': typeof import('resource:///modules/UrlbarProviderClipboard.sys.mjs');
-  'resource:///modules/UrlbarProviderGlobalActions.sys.mjs': typeof import('resource:///modules/UrlbarProviderGlobalActions.sys.mjs');
-  'resource:///modules/UrlbarProviderInterventions.sys.mjs': typeof import('resource:///modules/UrlbarProviderInterventions.sys.mjs');
-  'resource:///modules/UrlbarProviderOpenTabs.sys.mjs': typeof import('resource:///modules/UrlbarProviderOpenTabs.sys.mjs');
-  'resource:///modules/UrlbarProviderPlaces.sys.mjs': typeof import('resource:///modules/UrlbarProviderPlaces.sys.mjs');
-  'resource:///modules/UrlbarProviderQuickSuggest.sys.mjs': typeof import('resource:///modules/UrlbarProviderQuickSuggest.sys.mjs');
-  'resource:///modules/UrlbarProviderQuickSuggestContextualOptIn.sys.mjs': typeof import('resource:///modules/UrlbarProviderQuickSuggestContextualOptIn.sys.mjs');
-  'resource:///modules/UrlbarProviderRecentSearches.sys.mjs': typeof import('resource:///modules/UrlbarProviderRecentSearches.sys.mjs');
-  'resource:///modules/UrlbarProviderSearchSuggestions.sys.mjs': typeof import('resource:///modules/UrlbarProviderSearchSuggestions.sys.mjs');
-  'resource:///modules/UrlbarProviderSearchTips.sys.mjs': typeof import('resource:///modules/UrlbarProviderSearchTips.sys.mjs');
-  'resource:///modules/UrlbarProviderSemanticHistorySearch.sys.mjs': typeof import('resource:///modules/UrlbarProviderSemanticHistorySearch.sys.mjs');
-  'resource:///modules/UrlbarProviderTabToSearch.sys.mjs': typeof import('resource:///modules/UrlbarProviderTabToSearch.sys.mjs');
-  'resource:///modules/UrlbarProviderTopSites.sys.mjs': typeof import('resource:///modules/UrlbarProviderTopSites.sys.mjs');
-  'resource:///modules/UrlbarProviderUnitConversion.sys.mjs': typeof import('resource:///modules/UrlbarProviderUnitConversion.sys.mjs');
-  'resource:///modules/UrlbarProvidersManager.sys.mjs': typeof import('resource:///modules/UrlbarProvidersManager.sys.mjs');
-  'resource:///modules/UrlbarResult.sys.mjs': typeof import('resource:///modules/UrlbarResult.sys.mjs');
-  'resource:///modules/UrlbarSearchOneOffs.sys.mjs': typeof import('resource:///modules/UrlbarSearchOneOffs.sys.mjs');
-  'resource:///modules/UrlbarSearchTermsPersistence.sys.mjs': typeof import('resource:///modules/UrlbarSearchTermsPersistence.sys.mjs');
-  'resource:///modules/UrlbarSearchUtils.sys.mjs': typeof import('resource:///modules/UrlbarSearchUtils.sys.mjs');
-  'resource:///modules/UrlbarTokenizer.sys.mjs': typeof import('resource:///modules/UrlbarTokenizer.sys.mjs');
   'resource:///modules/UrlbarUtils.sys.mjs': typeof import('resource:///modules/UrlbarUtils.sys.mjs');
-  'resource:///modules/UrlbarValueFormatter.sys.mjs': typeof import('resource:///modules/UrlbarValueFormatter.sys.mjs');
-  'resource:///modules/UrlbarView.sys.mjs': typeof import('resource:///modules/UrlbarView.sys.mjs');
   'resource:///modules/WebProtocolHandlerRegistrar.sys.mjs': typeof import('resource:///modules/WebProtocolHandlerRegistrar.sys.mjs');
   'resource:///modules/WindowsJumpLists.sys.mjs': typeof import('resource:///modules/WindowsJumpLists.sys.mjs');
+  'resource:///modules/WindowsPreviewPerTab.sys.mjs': typeof import('resource:///modules/WindowsPreviewPerTab.sys.mjs');
   'resource:///modules/ZoomUI.sys.mjs': typeof import('resource:///modules/ZoomUI.sys.mjs');
   'resource:///modules/aboutwelcome/AWScreenUtils.sys.mjs': typeof import('resource:///modules/aboutwelcome/AWScreenUtils.sys.mjs');
   'resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs': typeof import('resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs');
@@ -341,6 +423,7 @@ export interface Modules {
   'resource:///modules/asrouter/ASRouterPreferences.sys.mjs': typeof import('resource:///modules/asrouter/ASRouterPreferences.sys.mjs');
   'resource:///modules/asrouter/ASRouterStorage.sys.mjs': typeof import('resource:///modules/asrouter/ASRouterStorage.sys.mjs');
   'resource:///modules/asrouter/ASRouterTargeting.sys.mjs': typeof import('resource:///modules/asrouter/ASRouterTargeting.sys.mjs');
+  'resource:///modules/asrouter/ASRouterTelemetry.sys.mjs': typeof import('resource:///modules/asrouter/ASRouterTelemetry.sys.mjs');
   'resource:///modules/asrouter/ASRouterTriggerListeners.sys.mjs': typeof import('resource:///modules/asrouter/ASRouterTriggerListeners.sys.mjs');
   'resource:///modules/asrouter/ActorConstants.mjs': typeof import('resource:///modules/asrouter/ActorConstants.mjs');
   'resource:///modules/asrouter/BookmarksBarButton.sys.mjs': typeof import('resource:///modules/asrouter/BookmarksBarButton.sys.mjs');
@@ -359,22 +442,39 @@ export interface Modules {
   'resource:///modules/asrouter/Spotlight.sys.mjs': typeof import('resource:///modules/asrouter/Spotlight.sys.mjs');
   'resource:///modules/asrouter/ToastNotification.sys.mjs': typeof import('resource:///modules/asrouter/ToastNotification.sys.mjs');
   'resource:///modules/asrouter/ToolbarBadgeHub.sys.mjs': typeof import('resource:///modules/asrouter/ToolbarBadgeHub.sys.mjs');
+  'resource:///modules/backup/AddonsBackupResource.sys.mjs': typeof import('resource:///modules/backup/AddonsBackupResource.sys.mjs');
   'resource:///modules/backup/ArchiveEncryption.sys.mjs': typeof import('resource:///modules/backup/ArchiveEncryption.sys.mjs');
   'resource:///modules/backup/ArchiveEncryptionState.sys.mjs': typeof import('resource:///modules/backup/ArchiveEncryptionState.sys.mjs');
   'resource:///modules/backup/ArchiveUtils.sys.mjs': typeof import('resource:///modules/backup/ArchiveUtils.sys.mjs');
   'resource:///modules/backup/BackupError.mjs': typeof import('resource:///modules/backup/BackupError.mjs');
+  'resource:///modules/backup/BackupResource.sys.mjs': typeof import('resource:///modules/backup/BackupResource.sys.mjs');
   'resource:///modules/backup/BackupService.sys.mjs': typeof import('resource:///modules/backup/BackupService.sys.mjs');
+  'resource:///modules/backup/CookiesBackupResource.sys.mjs': typeof import('resource:///modules/backup/CookiesBackupResource.sys.mjs');
+  'resource:///modules/backup/CredentialsAndSecurityBackupResource.sys.mjs': typeof import('resource:///modules/backup/CredentialsAndSecurityBackupResource.sys.mjs');
+  'resource:///modules/backup/FormHistoryBackupResource.sys.mjs': typeof import('resource:///modules/backup/FormHistoryBackupResource.sys.mjs');
+  'resource:///modules/backup/MeasurementUtils.sys.mjs': typeof import('resource:///modules/backup/MeasurementUtils.sys.mjs');
+  'resource:///modules/backup/MiscDataBackupResource.sys.mjs': typeof import('resource:///modules/backup/MiscDataBackupResource.sys.mjs');
+  'resource:///modules/backup/PlacesBackupResource.sys.mjs': typeof import('resource:///modules/backup/PlacesBackupResource.sys.mjs');
+  'resource:///modules/backup/PreferencesBackupResource.sys.mjs': typeof import('resource:///modules/backup/PreferencesBackupResource.sys.mjs');
+  'resource:///modules/backup/SessionStoreBackupResource.sys.mjs': typeof import('resource:///modules/backup/SessionStoreBackupResource.sys.mjs');
   'resource:///modules/distribution.sys.mjs': typeof import('resource:///modules/distribution.sys.mjs');
   'resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs': typeof import('resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs');
   'resource:///modules/firefox-view-tabs-setup-manager.sys.mjs': typeof import('resource:///modules/firefox-view-tabs-setup-manager.sys.mjs');
+  'resource:///modules/ipprotection/GuardianClient.sys.mjs': typeof import('resource:///modules/ipprotection/GuardianClient.sys.mjs');
+  'resource:///modules/ipprotection/IPPChannelFilter.sys.mjs': typeof import('resource:///modules/ipprotection/IPPChannelFilter.sys.mjs');
+  'resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs': typeof import('resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs');
+  'resource:///modules/ipprotection/IPPProxyManager.sys.mjs': typeof import('resource:///modules/ipprotection/IPPProxyManager.sys.mjs');
   'resource:///modules/ipprotection/IPProtection.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtection.sys.mjs');
   'resource:///modules/ipprotection/IPProtectionPanel.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionPanel.sys.mjs');
+  'resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs');
   'resource:///modules/ipprotection/IPProtectionService.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionService.sys.mjs');
+  'resource:///modules/ipprotection/IPProtectionUsage.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionUsage.sys.mjs');
   'resource:///modules/policies/BookmarksPolicies.sys.mjs': typeof import('resource:///modules/policies/BookmarksPolicies.sys.mjs');
   'resource:///modules/policies/Policies.sys.mjs': typeof import('resource:///modules/policies/Policies.sys.mjs');
   'resource:///modules/policies/ProxyPolicies.sys.mjs': typeof import('resource:///modules/policies/ProxyPolicies.sys.mjs');
   'resource:///modules/policies/WebsiteFilter.sys.mjs': typeof import('resource:///modules/policies/WebsiteFilter.sys.mjs');
   'resource:///modules/policies/schema.sys.mjs': typeof import('resource:///modules/policies/schema.sys.mjs');
+  'resource:///modules/profiles/SelectableProfile.sys.mjs': typeof import('resource:///modules/profiles/SelectableProfile.sys.mjs');
   'resource:///modules/profiles/SelectableProfileService.sys.mjs': typeof import('resource:///modules/profiles/SelectableProfileService.sys.mjs');
   'resource:///modules/sessionstore/PageWireframes.sys.mjs': typeof import('resource:///modules/sessionstore/PageWireframes.sys.mjs');
   'resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs': typeof import('resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs');
@@ -394,6 +494,11 @@ export interface Modules {
   'resource:///modules/sessionstore/TabState.sys.mjs': typeof import('resource:///modules/sessionstore/TabState.sys.mjs');
   'resource:///modules/sessionstore/TabStateCache.sys.mjs': typeof import('resource:///modules/sessionstore/TabStateCache.sys.mjs');
   'resource:///modules/sessionstore/TabStateFlusher.sys.mjs': typeof import('resource:///modules/sessionstore/TabStateFlusher.sys.mjs');
+  'resource:///modules/syncedtabs/EventEmitter.sys.mjs': typeof import('resource:///modules/syncedtabs/EventEmitter.sys.mjs');
+  'resource:///modules/syncedtabs/SyncedTabsDeckComponent.sys.mjs': typeof import('resource:///modules/syncedtabs/SyncedTabsDeckComponent.sys.mjs');
+  'resource:///modules/syncedtabs/SyncedTabsDeckStore.sys.mjs': typeof import('resource:///modules/syncedtabs/SyncedTabsDeckStore.sys.mjs');
+  'resource:///modules/syncedtabs/SyncedTabsListStore.sys.mjs': typeof import('resource:///modules/syncedtabs/SyncedTabsListStore.sys.mjs');
+  'resource:///modules/syncedtabs/TabListComponent.sys.mjs': typeof import('resource:///modules/syncedtabs/TabListComponent.sys.mjs');
   'resource:///modules/taskbartabs/TaskbarTabs.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabs.sys.mjs');
   'resource:///modules/taskbartabs/TaskbarTabsChrome.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsChrome.sys.mjs');
   'resource:///modules/taskbartabs/TaskbarTabsPageAction.sys.mjs': typeof import('resource:///modules/taskbartabs/TaskbarTabsPageAction.sys.mjs');
@@ -404,24 +509,49 @@ export interface Modules {
   'resource:///modules/topsites/TippyTopProvider.sys.mjs': typeof import('resource:///modules/topsites/TippyTopProvider.sys.mjs');
   'resource:///modules/topsites/TopSites.sys.mjs': typeof import('resource:///modules/topsites/TopSites.sys.mjs');
   'resource:///modules/topsites/constants.mjs': typeof import('resource:///modules/topsites/constants.mjs');
-  'resource:///modules/urlbar/private/AmpSuggestions.sys.mjs': typeof import('resource:///modules/urlbar/private/AmpSuggestions.sys.mjs');
-  'resource:///modules/urlbar/private/GeolocationUtils.sys.mjs': typeof import('resource:///modules/urlbar/private/GeolocationUtils.sys.mjs');
-  'resource:///modules/urlbar/private/MLSuggest.sys.mjs': typeof import('resource:///modules/urlbar/private/MLSuggest.sys.mjs');
   'resource:///modules/webrtcUI.sys.mjs': typeof import('resource:///modules/webrtcUI.sys.mjs');
   'resource://autofill/FormAutofill.sys.mjs': typeof import('resource://autofill/FormAutofill.sys.mjs');
+  'resource://autofill/FormAutofillChild.ios.sys.mjs': typeof import('resource://autofill/FormAutofillChild.ios.sys.mjs');
+  'resource://autofill/FormAutofillChild.sys.mjs': typeof import('resource://autofill/FormAutofillChild.sys.mjs');
   'resource://autofill/FormAutofillContent.sys.mjs': typeof import('resource://autofill/FormAutofillContent.sys.mjs');
   'resource://autofill/FormAutofillParent.sys.mjs': typeof import('resource://autofill/FormAutofillParent.sys.mjs');
   'resource://autofill/FormAutofillPreferences.sys.mjs': typeof import('resource://autofill/FormAutofillPreferences.sys.mjs');
   'resource://autofill/FormAutofillPrompter.sys.mjs': typeof import('resource://autofill/FormAutofillPrompter.sys.mjs');
   'resource://autofill/FormAutofillStorage.sys.mjs': typeof import('resource://autofill/FormAutofillStorage.sys.mjs');
+  'resource://autofill/FormAutofillStorageBase.sys.mjs': typeof import('resource://autofill/FormAutofillStorageBase.sys.mjs');
+  'resource://autofill/FormAutofillSync.sys.mjs': typeof import('resource://autofill/FormAutofillSync.sys.mjs');
   'resource://autofill/ProfileAutoCompleteResult.sys.mjs': typeof import('resource://autofill/ProfileAutoCompleteResult.sys.mjs');
   'resource://devtools/client/framework/browser-toolbox/Launcher.sys.mjs': typeof import('resource://devtools/client/framework/browser-toolbox/Launcher.sys.mjs');
+  'resource://devtools/client/performance-new/popup/logic.sys.mjs': typeof import('resource://devtools/client/performance-new/popup/logic.sys.mjs');
   'resource://devtools/client/performance-new/popup/menu-button.sys.mjs': typeof import('resource://devtools/client/performance-new/popup/menu-button.sys.mjs');
+  'resource://devtools/client/performance-new/shared/background.sys.mjs': typeof import('resource://devtools/client/performance-new/shared/background.sys.mjs');
+  'resource://devtools/client/shared/components/reps/index.mjs': typeof import('resource://devtools/client/shared/components/reps/index.mjs');
+  'resource://devtools/client/shared/components/reps/reps/array.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/array.mjs');
+  'resource://devtools/client/shared/components/reps/reps/big-int.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/big-int.mjs');
   'resource://devtools/client/shared/components/reps/reps/constants.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/constants.mjs');
+  'resource://devtools/client/shared/components/reps/reps/element-node.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/element-node.mjs');
+  'resource://devtools/client/shared/components/reps/reps/error.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/error.mjs');
+  'resource://devtools/client/shared/components/reps/reps/grip-array.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/grip-array.mjs');
+  'resource://devtools/client/shared/components/reps/reps/grip-entry.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/grip-entry.mjs');
+  'resource://devtools/client/shared/components/reps/reps/grip-map.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/grip-map.mjs');
   'resource://devtools/client/shared/components/reps/reps/rep-utils.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/rep-utils.mjs');
+  'resource://devtools/client/shared/components/reps/reps/rep.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/rep.mjs');
+  'resource://devtools/client/shared/components/reps/reps/string.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/string.mjs');
+  'resource://devtools/client/shared/components/reps/reps/text-node.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/text-node.mjs');
+  'resource://devtools/client/shared/components/tabs/Tabs.mjs': typeof import('resource://devtools/client/shared/components/tabs/Tabs.mjs');
+  'resource://devtools/client/shared/components/tree/LabelCell.mjs': typeof import('resource://devtools/client/shared/components/tree/LabelCell.mjs');
+  'resource://devtools/client/shared/components/tree/ObjectProvider.mjs': typeof import('resource://devtools/client/shared/components/tree/ObjectProvider.mjs');
+  'resource://devtools/client/shared/components/tree/TreeRow.mjs': typeof import('resource://devtools/client/shared/components/tree/TreeRow.mjs');
+  'resource://devtools/client/shared/components/tree/TreeView.mjs': typeof import('resource://devtools/client/shared/components/tree/TreeView.mjs');
   'resource://devtools/client/shared/focus.mjs': typeof import('resource://devtools/client/shared/focus.mjs');
+  'resource://devtools/client/shared/scroll.mjs': typeof import('resource://devtools/client/shared/scroll.mjs');
+  'resource://devtools/client/shared/sourceeditor/codemirror6/codemirror6.bundle.mjs': typeof import('resource://devtools/client/shared/sourceeditor/codemirror6/codemirror6.bundle.mjs');
   'resource://devtools/client/storage/VariablesView.sys.mjs': typeof import('resource://devtools/client/storage/VariablesView.sys.mjs');
+  'resource://devtools/client/styleeditor/StyleEditorUI.sys.mjs': typeof import('resource://devtools/client/styleeditor/StyleEditorUI.sys.mjs');
+  'resource://devtools/client/styleeditor/StyleEditorUtil.sys.mjs': typeof import('resource://devtools/client/styleeditor/StyleEditorUtil.sys.mjs');
   'resource://devtools/server/actors/targets/target-actor-registry.sys.mjs': typeof import('resource://devtools/server/actors/targets/target-actor-registry.sys.mjs');
+  'resource://devtools/server/actors/utils/HTMLSourcesCache.sys.mjs': typeof import('resource://devtools/server/actors/utils/HTMLSourcesCache.sys.mjs');
+  'resource://devtools/server/actors/watcher/ParentProcessWatcherRegistry.sys.mjs': typeof import('resource://devtools/server/actors/watcher/ParentProcessWatcherRegistry.sys.mjs');
   'resource://devtools/server/actors/watcher/SessionDataHelpers.sys.mjs': typeof import('resource://devtools/server/actors/watcher/SessionDataHelpers.sys.mjs');
   'resource://devtools/server/actors/watcher/browsing-context-helpers.sys.mjs': typeof import('resource://devtools/server/actors/watcher/browsing-context-helpers.sys.mjs');
   'resource://devtools/server/connectors/js-process-actor/target-watchers/content_script.sys.mjs': typeof import('resource://devtools/server/connectors/js-process-actor/target-watchers/content_script.sys.mjs');
@@ -430,11 +560,15 @@ export interface Modules {
   'resource://devtools/server/connectors/js-process-actor/target-watchers/shared_worker.sys.mjs': typeof import('resource://devtools/server/connectors/js-process-actor/target-watchers/shared_worker.sys.mjs');
   'resource://devtools/server/connectors/js-process-actor/target-watchers/window-global.sys.mjs': typeof import('resource://devtools/server/connectors/js-process-actor/target-watchers/window-global.sys.mjs');
   'resource://devtools/server/connectors/js-process-actor/target-watchers/worker.sys.mjs': typeof import('resource://devtools/server/connectors/js-process-actor/target-watchers/worker.sys.mjs');
+  'resource://devtools/server/startup/content-process.sys.mjs': typeof import('resource://devtools/server/startup/content-process.sys.mjs');
+  'resource://devtools/server/startup/worker.sys.mjs': typeof import('resource://devtools/server/startup/worker.sys.mjs');
   'resource://devtools/server/tracer/tracer.sys.mjs': typeof import('resource://devtools/server/tracer/tracer.sys.mjs');
   'resource://devtools/shared/DevToolsInfaillibleUtils.sys.mjs': typeof import('resource://devtools/shared/DevToolsInfaillibleUtils.sys.mjs');
   'resource://devtools/shared/highlighters.mjs': typeof import('resource://devtools/shared/highlighters.mjs');
   'resource://devtools/shared/loader/DistinctSystemPrincipalLoader.sys.mjs': typeof import('resource://devtools/shared/loader/DistinctSystemPrincipalLoader.sys.mjs');
   'resource://devtools/shared/loader/Loader.sys.mjs': typeof import('resource://devtools/shared/loader/Loader.sys.mjs');
+  'resource://devtools/shared/loader/browser-loader.sys.mjs': typeof import('resource://devtools/shared/loader/browser-loader.sys.mjs');
+  'resource://devtools/shared/loader/worker-loader.sys.mjs': typeof import('resource://devtools/shared/loader/worker-loader.sys.mjs');
   'resource://devtools/shared/network-observer/ChannelMap.sys.mjs': typeof import('resource://devtools/shared/network-observer/ChannelMap.sys.mjs');
   'resource://devtools/shared/network-observer/NetworkAuthListener.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkAuthListener.sys.mjs');
   'resource://devtools/shared/network-observer/NetworkHelper.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkHelper.sys.mjs');
@@ -445,16 +579,22 @@ export interface Modules {
   'resource://devtools/shared/network-observer/NetworkTimings.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkTimings.sys.mjs');
   'resource://devtools/shared/network-observer/NetworkUtils.sys.mjs': typeof import('resource://devtools/shared/network-observer/NetworkUtils.sys.mjs');
   'resource://devtools/shared/network-observer/WildcardToRegexp.sys.mjs': typeof import('resource://devtools/shared/network-observer/WildcardToRegexp.sys.mjs');
+  'resource://devtools/shared/performance-new/errors.sys.mjs': typeof import('resource://devtools/shared/performance-new/errors.sys.mjs');
+  'resource://devtools/shared/performance-new/prefs-presets.sys.mjs': typeof import('resource://devtools/shared/performance-new/prefs-presets.sys.mjs');
   'resource://devtools/shared/performance-new/recording-utils.sys.mjs': typeof import('resource://devtools/shared/performance-new/recording-utils.sys.mjs');
   'resource://devtools/shared/performance-new/symbolication.sys.mjs': typeof import('resource://devtools/shared/performance-new/symbolication.sys.mjs');
   'resource://devtools/shared/platform/CacheEntry.sys.mjs': typeof import('resource://devtools/shared/platform/CacheEntry.sys.mjs');
   'resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs': typeof import('resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs');
+  'resource://devtools/shared/test-helpers/dump-scope.sys.mjs': typeof import('resource://devtools/shared/test-helpers/dump-scope.sys.mjs');
+  'resource://devtools/shared/test-helpers/tracked-objects.sys.mjs': typeof import('resource://devtools/shared/test-helpers/tracked-objects.sys.mjs');
   'resource://devtools/shared/validate-breakpoint.sys.mjs': typeof import('resource://devtools/shared/validate-breakpoint.sys.mjs');
   'resource://devtools/shared/worker/worker.sys.mjs': typeof import('resource://devtools/shared/worker/worker.sys.mjs');
   'resource://gre/actors/AutoCompleteParent.sys.mjs': typeof import('resource://gre/actors/AutoCompleteParent.sys.mjs');
   'resource://gre/actors/FormHandlerChild.sys.mjs': typeof import('resource://gre/actors/FormHandlerChild.sys.mjs');
   'resource://gre/actors/MLEngineParent.sys.mjs': typeof import('resource://gre/actors/MLEngineParent.sys.mjs');
-  'resource://gre/actors/PopupBlockingParent.sys.mjs': typeof import('resource://gre/actors/PopupBlockingParent.sys.mjs');
+  'resource://gre/actors/PictureInPictureChild.sys.mjs': typeof import('resource://gre/actors/PictureInPictureChild.sys.mjs');
+  'resource://gre/actors/PopupAndRedirectBlockingParent.sys.mjs': typeof import('resource://gre/actors/PopupAndRedirectBlockingParent.sys.mjs');
+  'resource://gre/actors/SelectChild.sys.mjs': typeof import('resource://gre/actors/SelectChild.sys.mjs');
   'resource://gre/actors/SelectParent.sys.mjs': typeof import('resource://gre/actors/SelectParent.sys.mjs');
   'resource://gre/actors/TranslationsParent.sys.mjs': typeof import('resource://gre/actors/TranslationsParent.sys.mjs');
   'resource://gre/actors/ViewSourcePageChild.sys.mjs': typeof import('resource://gre/actors/ViewSourcePageChild.sys.mjs');
@@ -467,12 +607,15 @@ export interface Modules {
   'resource://gre/modules/AppMenuNotifications.sys.mjs': typeof import('resource://gre/modules/AppMenuNotifications.sys.mjs');
   'resource://gre/modules/AppServicesTracing.sys.mjs': typeof import('resource://gre/modules/AppServicesTracing.sys.mjs');
   'resource://gre/modules/AppUpdater.sys.mjs': typeof import('resource://gre/modules/AppUpdater.sys.mjs');
+  'resource://gre/modules/AsanReporter.sys.mjs': typeof import('resource://gre/modules/AsanReporter.sys.mjs');
   'resource://gre/modules/AsyncPrefs.sys.mjs': typeof import('resource://gre/modules/AsyncPrefs.sys.mjs');
   'resource://gre/modules/AsyncShutdown.sys.mjs': typeof import('resource://gre/modules/AsyncShutdown.sys.mjs');
   'resource://gre/modules/BackgroundPageThumbs.sys.mjs': typeof import('resource://gre/modules/BackgroundPageThumbs.sys.mjs');
+  'resource://gre/modules/BackgroundTasksManager.sys.mjs': typeof import('resource://gre/modules/BackgroundTasksManager.sys.mjs');
   'resource://gre/modules/BackgroundTasksUtils.sys.mjs': typeof import('resource://gre/modules/BackgroundTasksUtils.sys.mjs');
   'resource://gre/modules/BackgroundUpdate.sys.mjs': typeof import('resource://gre/modules/BackgroundUpdate.sys.mjs');
   'resource://gre/modules/BinarySearch.sys.mjs': typeof import('resource://gre/modules/BinarySearch.sys.mjs');
+  'resource://gre/modules/Bits.sys.mjs': typeof import('resource://gre/modules/Bits.sys.mjs');
   'resource://gre/modules/Blocklist.sys.mjs': typeof import('resource://gre/modules/Blocklist.sys.mjs');
   'resource://gre/modules/BookmarkHTMLUtils.sys.mjs': typeof import('resource://gre/modules/BookmarkHTMLUtils.sys.mjs');
   'resource://gre/modules/BookmarkJSONUtils.sys.mjs': typeof import('resource://gre/modules/BookmarkJSONUtils.sys.mjs');
@@ -486,28 +629,38 @@ export interface Modules {
   'resource://gre/modules/CaptchaResponseObserver.sys.mjs': typeof import('resource://gre/modules/CaptchaResponseObserver.sys.mjs');
   'resource://gre/modules/CertUtils.sys.mjs': typeof import('resource://gre/modules/CertUtils.sys.mjs');
   'resource://gre/modules/ChildCrashHandler.sys.mjs': typeof import('resource://gre/modules/ChildCrashHandler.sys.mjs');
+  'resource://gre/modules/ChromePushSubscription.sys.mjs': typeof import('resource://gre/modules/ChromePushSubscription.sys.mjs');
   'resource://gre/modules/ClientID.sys.mjs': typeof import('resource://gre/modules/ClientID.sys.mjs');
   'resource://gre/modules/ClipboardContextMenu.sys.mjs': typeof import('resource://gre/modules/ClipboardContextMenu.sys.mjs');
   'resource://gre/modules/Color.sys.mjs': typeof import('resource://gre/modules/Color.sys.mjs');
   'resource://gre/modules/ColorwayThemeMigration.sys.mjs': typeof import('resource://gre/modules/ColorwayThemeMigration.sys.mjs');
   'resource://gre/modules/CommonDialog.sys.mjs': typeof import('resource://gre/modules/CommonDialog.sys.mjs');
+  'resource://gre/modules/ComponentUtils.sys.mjs': typeof import('resource://gre/modules/ComponentUtils.sys.mjs');
   'resource://gre/modules/ConduitsParent.sys.mjs': typeof import('resource://gre/modules/ConduitsParent.sys.mjs');
   'resource://gre/modules/Console.sys.mjs': typeof import('resource://gre/modules/Console.sys.mjs');
   'resource://gre/modules/ContentAnalysisUtils.sys.mjs': typeof import('resource://gre/modules/ContentAnalysisUtils.sys.mjs');
   'resource://gre/modules/ContentBlockingAllowList.sys.mjs': typeof import('resource://gre/modules/ContentBlockingAllowList.sys.mjs');
   'resource://gre/modules/ContentDOMReference.sys.mjs': typeof import('resource://gre/modules/ContentDOMReference.sys.mjs');
+  'resource://gre/modules/ContentPrefServiceChild.sys.mjs': typeof import('resource://gre/modules/ContentPrefServiceChild.sys.mjs');
   'resource://gre/modules/ContentPrefUtils.sys.mjs': typeof import('resource://gre/modules/ContentPrefUtils.sys.mjs');
   'resource://gre/modules/ContentRelevancyManager.sys.mjs': typeof import('resource://gre/modules/ContentRelevancyManager.sys.mjs');
   'resource://gre/modules/ContextualIdentityService.sys.mjs': typeof import('resource://gre/modules/ContextualIdentityService.sys.mjs');
   'resource://gre/modules/CoveragePing.sys.mjs': typeof import('resource://gre/modules/CoveragePing.sys.mjs');
+  'resource://gre/modules/CrashManager.sys.mjs': typeof import('resource://gre/modules/CrashManager.sys.mjs');
   'resource://gre/modules/CrashMonitor.sys.mjs': typeof import('resource://gre/modules/CrashMonitor.sys.mjs');
+  'resource://gre/modules/CrashReports.sys.mjs': typeof import('resource://gre/modules/CrashReports.sys.mjs');
   'resource://gre/modules/CrashService.sys.mjs': typeof import('resource://gre/modules/CrashService.sys.mjs');
   'resource://gre/modules/CrashSubmit.sys.mjs': typeof import('resource://gre/modules/CrashSubmit.sys.mjs');
+  'resource://gre/modules/Credentials.sys.mjs': typeof import('resource://gre/modules/Credentials.sys.mjs');
   'resource://gre/modules/CreditCard.sys.mjs': typeof import('resource://gre/modules/CreditCard.sys.mjs');
+  'resource://gre/modules/CustomElementsListener.sys.mjs': typeof import('resource://gre/modules/CustomElementsListener.sys.mjs');
+  'resource://gre/modules/DAPIncrementality.sys.mjs': typeof import('resource://gre/modules/DAPIncrementality.sys.mjs');
+  'resource://gre/modules/DAPReportController.sys.mjs': typeof import('resource://gre/modules/DAPReportController.sys.mjs');
   'resource://gre/modules/DAPTelemetrySender.sys.mjs': typeof import('resource://gre/modules/DAPTelemetrySender.sys.mjs');
   'resource://gre/modules/DAPVisitCounter.sys.mjs': typeof import('resource://gre/modules/DAPVisitCounter.sys.mjs');
   'resource://gre/modules/DateTimePickerPanel.sys.mjs': typeof import('resource://gre/modules/DateTimePickerPanel.sys.mjs');
   'resource://gre/modules/DeferredTask.sys.mjs': typeof import('resource://gre/modules/DeferredTask.sys.mjs');
+  'resource://gre/modules/DelayedInit.sys.mjs': typeof import('resource://gre/modules/DelayedInit.sys.mjs');
   'resource://gre/modules/DownloadCore.sys.mjs': typeof import('resource://gre/modules/DownloadCore.sys.mjs');
   'resource://gre/modules/DownloadHistory.sys.mjs': typeof import('resource://gre/modules/DownloadHistory.sys.mjs');
   'resource://gre/modules/DownloadIntegration.sys.mjs': typeof import('resource://gre/modules/DownloadIntegration.sys.mjs');
@@ -519,10 +672,13 @@ export interface Modules {
   'resource://gre/modules/DownloadUtils.sys.mjs': typeof import('resource://gre/modules/DownloadUtils.sys.mjs');
   'resource://gre/modules/Downloads.sys.mjs': typeof import('resource://gre/modules/Downloads.sys.mjs');
   'resource://gre/modules/E10SUtils.sys.mjs': typeof import('resource://gre/modules/E10SUtils.sys.mjs');
+  'resource://gre/modules/EnterprisePoliciesContent.sys.mjs': typeof import('resource://gre/modules/EnterprisePoliciesContent.sys.mjs');
+  'resource://gre/modules/EnterprisePoliciesParent.sys.mjs': typeof import('resource://gre/modules/EnterprisePoliciesParent.sys.mjs');
   'resource://gre/modules/EssentialDomainsRemoteSettings.sys.mjs': typeof import('resource://gre/modules/EssentialDomainsRemoteSettings.sys.mjs');
   'resource://gre/modules/EventEmitter.sys.mjs': typeof import('resource://gre/modules/EventEmitter.sys.mjs');
   'resource://gre/modules/EventPing.sys.mjs': typeof import('resource://gre/modules/EventPing.sys.mjs');
   'resource://gre/modules/Extension.sys.mjs': typeof import('resource://gre/modules/Extension.sys.mjs');
+  'resource://gre/modules/ExtensionActions.sys.mjs': typeof import('resource://gre/modules/ExtensionActions.sys.mjs');
   'resource://gre/modules/ExtensionActivityLog.sys.mjs': typeof import('resource://gre/modules/ExtensionActivityLog.sys.mjs');
   'resource://gre/modules/ExtensionChild.sys.mjs': typeof import('resource://gre/modules/ExtensionChild.sys.mjs');
   'resource://gre/modules/ExtensionChildDevToolsUtils.sys.mjs': typeof import('resource://gre/modules/ExtensionChildDevToolsUtils.sys.mjs');
@@ -547,6 +703,7 @@ export interface Modules {
   'resource://gre/modules/ExtensionStorageIDB.sys.mjs': typeof import('resource://gre/modules/ExtensionStorageIDB.sys.mjs');
   'resource://gre/modules/ExtensionStorageSync.sys.mjs': typeof import('resource://gre/modules/ExtensionStorageSync.sys.mjs');
   'resource://gre/modules/ExtensionStorageSyncKinto.sys.mjs': typeof import('resource://gre/modules/ExtensionStorageSyncKinto.sys.mjs');
+  'resource://gre/modules/ExtensionTaskScheduler.sys.mjs': typeof import('resource://gre/modules/ExtensionTaskScheduler.sys.mjs');
   'resource://gre/modules/ExtensionTelemetry.sys.mjs': typeof import('resource://gre/modules/ExtensionTelemetry.sys.mjs');
   'resource://gre/modules/ExtensionUserScripts.sys.mjs': typeof import('resource://gre/modules/ExtensionUserScripts.sys.mjs');
   'resource://gre/modules/ExtensionUserScriptsContent.sys.mjs': typeof import('resource://gre/modules/ExtensionUserScriptsContent.sys.mjs');
@@ -554,11 +711,13 @@ export interface Modules {
   'resource://gre/modules/ExtensionWorkerChild.sys.mjs': typeof import('resource://gre/modules/ExtensionWorkerChild.sys.mjs');
   'resource://gre/modules/FileUtils.sys.mjs': typeof import('resource://gre/modules/FileUtils.sys.mjs');
   'resource://gre/modules/FillHelpers.sys.mjs': typeof import('resource://gre/modules/FillHelpers.sys.mjs');
+  'resource://gre/modules/FindBarContent.sys.mjs': typeof import('resource://gre/modules/FindBarContent.sys.mjs');
   'resource://gre/modules/FindContent.sys.mjs': typeof import('resource://gre/modules/FindContent.sys.mjs');
   'resource://gre/modules/Finder.sys.mjs': typeof import('resource://gre/modules/Finder.sys.mjs');
   'resource://gre/modules/FinderHighlighter.sys.mjs': typeof import('resource://gre/modules/FinderHighlighter.sys.mjs');
   'resource://gre/modules/FinderIterator.sys.mjs': typeof import('resource://gre/modules/FinderIterator.sys.mjs');
   'resource://gre/modules/FinderParent.sys.mjs': typeof import('resource://gre/modules/FinderParent.sys.mjs');
+  'resource://gre/modules/FinderSound.sys.mjs': typeof import('resource://gre/modules/FinderSound.sys.mjs');
   'resource://gre/modules/FirefoxRelay.sys.mjs': typeof import('resource://gre/modules/FirefoxRelay.sys.mjs');
   'resource://gre/modules/FirstStartup.sys.mjs': typeof import('resource://gre/modules/FirstStartup.sys.mjs');
   'resource://gre/modules/ForgetAboutSite.sys.mjs': typeof import('resource://gre/modules/ForgetAboutSite.sys.mjs');
@@ -578,13 +737,16 @@ export interface Modules {
   'resource://gre/modules/FxAccountsPairingChannel.sys.mjs': typeof import('resource://gre/modules/FxAccountsPairingChannel.sys.mjs');
   'resource://gre/modules/FxAccountsProfile.sys.mjs': typeof import('resource://gre/modules/FxAccountsProfile.sys.mjs');
   'resource://gre/modules/FxAccountsProfileClient.sys.mjs': typeof import('resource://gre/modules/FxAccountsProfileClient.sys.mjs');
+  'resource://gre/modules/FxAccountsPush.sys.mjs': typeof import('resource://gre/modules/FxAccountsPush.sys.mjs');
   'resource://gre/modules/FxAccountsStorage.sys.mjs': typeof import('resource://gre/modules/FxAccountsStorage.sys.mjs');
   'resource://gre/modules/FxAccountsTelemetry.sys.mjs': typeof import('resource://gre/modules/FxAccountsTelemetry.sys.mjs');
   'resource://gre/modules/FxAccountsWebChannel.sys.mjs': typeof import('resource://gre/modules/FxAccountsWebChannel.sys.mjs');
   'resource://gre/modules/GMPInstallManager.sys.mjs': typeof import('resource://gre/modules/GMPInstallManager.sys.mjs');
+  'resource://gre/modules/GMPUtils.sys.mjs': typeof import('resource://gre/modules/GMPUtils.sys.mjs');
   'resource://gre/modules/GeckoViewActorManager.sys.mjs': typeof import('resource://gre/modules/GeckoViewActorManager.sys.mjs');
   'resource://gre/modules/GeckoViewAutocomplete.sys.mjs': typeof import('resource://gre/modules/GeckoViewAutocomplete.sys.mjs');
   'resource://gre/modules/GeckoViewAutofill.sys.mjs': typeof import('resource://gre/modules/GeckoViewAutofill.sys.mjs');
+  'resource://gre/modules/GeckoViewChildModule.sys.mjs': typeof import('resource://gre/modules/GeckoViewChildModule.sys.mjs');
   'resource://gre/modules/GeckoViewClipboardPermission.sys.mjs': typeof import('resource://gre/modules/GeckoViewClipboardPermission.sys.mjs');
   'resource://gre/modules/GeckoViewIdentityCredential.sys.mjs': typeof import('resource://gre/modules/GeckoViewIdentityCredential.sys.mjs');
   'resource://gre/modules/GeckoViewPrompter.sys.mjs': typeof import('resource://gre/modules/GeckoViewPrompter.sys.mjs');
@@ -615,19 +777,25 @@ export interface Modules {
   'resource://gre/modules/LoadURIDelegate.sys.mjs': typeof import('resource://gre/modules/LoadURIDelegate.sys.mjs');
   'resource://gre/modules/LocationHelper.sys.mjs': typeof import('resource://gre/modules/LocationHelper.sys.mjs');
   'resource://gre/modules/Log.sys.mjs': typeof import('resource://gre/modules/Log.sys.mjs');
+  'resource://gre/modules/LogManager.sys.mjs': typeof import('resource://gre/modules/LogManager.sys.mjs');
   'resource://gre/modules/LoginAutoComplete.sys.mjs': typeof import('resource://gre/modules/LoginAutoComplete.sys.mjs');
   'resource://gre/modules/LoginCSVImport.sys.mjs': typeof import('resource://gre/modules/LoginCSVImport.sys.mjs');
   'resource://gre/modules/LoginExport.sys.mjs': typeof import('resource://gre/modules/LoginExport.sys.mjs');
   'resource://gre/modules/LoginHelper.sys.mjs': typeof import('resource://gre/modules/LoginHelper.sys.mjs');
   'resource://gre/modules/LoginManager.shared.sys.mjs': typeof import('resource://gre/modules/LoginManager.shared.sys.mjs');
+  'resource://gre/modules/LoginManager.sys.mjs': typeof import('resource://gre/modules/LoginManager.sys.mjs');
   'resource://gre/modules/LoginManagerChild.sys.mjs': typeof import('resource://gre/modules/LoginManagerChild.sys.mjs');
   'resource://gre/modules/LoginManagerContextMenu.sys.mjs': typeof import('resource://gre/modules/LoginManagerContextMenu.sys.mjs');
   'resource://gre/modules/LoginManagerParent.sys.mjs': typeof import('resource://gre/modules/LoginManagerParent.sys.mjs');
+  'resource://gre/modules/LoginManagerPrompter.sys.mjs': typeof import('resource://gre/modules/LoginManagerPrompter.sys.mjs');
   'resource://gre/modules/LoginRecipes.sys.mjs': typeof import('resource://gre/modules/LoginRecipes.sys.mjs');
+  'resource://gre/modules/LoginRelatedRealms.sys.mjs': typeof import('resource://gre/modules/LoginRelatedRealms.sys.mjs');
   'resource://gre/modules/LoginStore.sys.mjs': typeof import('resource://gre/modules/LoginStore.sys.mjs');
+  'resource://gre/modules/Manifest.sys.mjs': typeof import('resource://gre/modules/Manifest.sys.mjs');
   'resource://gre/modules/ManifestFinder.sys.mjs': typeof import('resource://gre/modules/ManifestFinder.sys.mjs');
   'resource://gre/modules/ManifestIcons.sys.mjs': typeof import('resource://gre/modules/ManifestIcons.sys.mjs');
   'resource://gre/modules/ManifestObtainer.sys.mjs': typeof import('resource://gre/modules/ManifestObtainer.sys.mjs');
+  'resource://gre/modules/ManifestProcessor.sys.mjs': typeof import('resource://gre/modules/ManifestProcessor.sys.mjs');
   'resource://gre/modules/MatchURLFilters.sys.mjs': typeof import('resource://gre/modules/MatchURLFilters.sys.mjs');
   'resource://gre/modules/MediaUtils.sys.mjs': typeof import('resource://gre/modules/MediaUtils.sys.mjs');
   'resource://gre/modules/MessageManagerProxy.sys.mjs': typeof import('resource://gre/modules/MessageManagerProxy.sys.mjs');
@@ -644,6 +812,7 @@ export interface Modules {
   'resource://gre/modules/OsEnvironment.sys.mjs': typeof import('resource://gre/modules/OsEnvironment.sys.mjs');
   'resource://gre/modules/PageThumbUtils.sys.mjs': typeof import('resource://gre/modules/PageThumbUtils.sys.mjs');
   'resource://gre/modules/PageThumbs.sys.mjs': typeof import('resource://gre/modules/PageThumbs.sys.mjs');
+  'resource://gre/modules/PasswordRulesManager.sys.mjs': typeof import('resource://gre/modules/PasswordRulesManager.sys.mjs');
   'resource://gre/modules/PermissionsUtils.sys.mjs': typeof import('resource://gre/modules/PermissionsUtils.sys.mjs');
   'resource://gre/modules/PictureInPicture.sys.mjs': typeof import('resource://gre/modules/PictureInPicture.sys.mjs');
   'resource://gre/modules/PictureInPictureControls.sys.mjs': typeof import('resource://gre/modules/PictureInPictureControls.sys.mjs');
@@ -656,8 +825,10 @@ export interface Modules {
   'resource://gre/modules/PlacesSyncUtils.sys.mjs': typeof import('resource://gre/modules/PlacesSyncUtils.sys.mjs');
   'resource://gre/modules/PlacesTransactions.sys.mjs': typeof import('resource://gre/modules/PlacesTransactions.sys.mjs');
   'resource://gre/modules/PlacesUtils.sys.mjs': typeof import('resource://gre/modules/PlacesUtils.sys.mjs');
+  'resource://gre/modules/PopupNotifications.sys.mjs': typeof import('resource://gre/modules/PopupNotifications.sys.mjs');
   'resource://gre/modules/Preferences.sys.mjs': typeof import('resource://gre/modules/Preferences.sys.mjs');
   'resource://gre/modules/PrincipalsCollector.sys.mjs': typeof import('resource://gre/modules/PrincipalsCollector.sys.mjs');
+  'resource://gre/modules/PrivateAttributionService.sys.mjs': typeof import('resource://gre/modules/PrivateAttributionService.sys.mjs');
   'resource://gre/modules/PrivateBrowsingUtils.sys.mjs': typeof import('resource://gre/modules/PrivateBrowsingUtils.sys.mjs');
   'resource://gre/modules/ProcessType.sys.mjs': typeof import('resource://gre/modules/ProcessType.sys.mjs');
   'resource://gre/modules/ProfileAge.sys.mjs': typeof import('resource://gre/modules/ProfileAge.sys.mjs');
@@ -667,8 +838,10 @@ export interface Modules {
   'resource://gre/modules/ProxyChannelFilter.sys.mjs': typeof import('resource://gre/modules/ProxyChannelFilter.sys.mjs');
   'resource://gre/modules/PushBroadcastService.sys.mjs': typeof import('resource://gre/modules/PushBroadcastService.sys.mjs');
   'resource://gre/modules/PushCrypto.sys.mjs': typeof import('resource://gre/modules/PushCrypto.sys.mjs');
+  'resource://gre/modules/PushRecord.sys.mjs': typeof import('resource://gre/modules/PushRecord.sys.mjs');
   'resource://gre/modules/PushService.sys.mjs': typeof import('resource://gre/modules/PushService.sys.mjs');
   'resource://gre/modules/PushServiceWebSocket.sys.mjs': typeof import('resource://gre/modules/PushServiceWebSocket.sys.mjs');
+  'resource://gre/modules/RFPHelper.sys.mjs': typeof import('resource://gre/modules/RFPHelper.sys.mjs');
   'resource://gre/modules/Readerable.sys.mjs': typeof import('resource://gre/modules/Readerable.sys.mjs');
   'resource://gre/modules/Region.sys.mjs': typeof import('resource://gre/modules/Region.sys.mjs');
   'resource://gre/modules/RemotePageAccessManager.sys.mjs': typeof import('resource://gre/modules/RemotePageAccessManager.sys.mjs');
@@ -677,6 +850,7 @@ export interface Modules {
   'resource://gre/modules/ResetProfile.sys.mjs': typeof import('resource://gre/modules/ResetProfile.sys.mjs');
   'resource://gre/modules/RustSharedRemoteSettingsService.sys.mjs': typeof import('resource://gre/modules/RustSharedRemoteSettingsService.sys.mjs');
   'resource://gre/modules/SafeBrowsing.sys.mjs': typeof import('resource://gre/modules/SafeBrowsing.sys.mjs');
+  'resource://gre/modules/SandboxUtils.sys.mjs': typeof import('resource://gre/modules/SandboxUtils.sys.mjs');
   'resource://gre/modules/Schemas.sys.mjs': typeof import('resource://gre/modules/Schemas.sys.mjs');
   'resource://gre/modules/SearchService.sys.mjs': typeof import('resource://gre/modules/SearchService.sys.mjs');
   'resource://gre/modules/SecurityInfo.sys.mjs': typeof import('resource://gre/modules/SecurityInfo.sys.mjs');
@@ -693,6 +867,8 @@ export interface Modules {
   'resource://gre/modules/TaskSchedulerWinImpl.sys.mjs': typeof import('resource://gre/modules/TaskSchedulerWinImpl.sys.mjs');
   'resource://gre/modules/TelemetryArchive.sys.mjs': typeof import('resource://gre/modules/TelemetryArchive.sys.mjs');
   'resource://gre/modules/TelemetryController.sys.mjs': typeof import('resource://gre/modules/TelemetryController.sys.mjs');
+  'resource://gre/modules/TelemetryControllerContent.sys.mjs': typeof import('resource://gre/modules/TelemetryControllerContent.sys.mjs');
+  'resource://gre/modules/TelemetryControllerParent.sys.mjs': typeof import('resource://gre/modules/TelemetryControllerParent.sys.mjs');
   'resource://gre/modules/TelemetryEnvironment.sys.mjs': typeof import('resource://gre/modules/TelemetryEnvironment.sys.mjs');
   'resource://gre/modules/TelemetryReportingPolicy.sys.mjs': typeof import('resource://gre/modules/TelemetryReportingPolicy.sys.mjs');
   'resource://gre/modules/TelemetryScheduler.sys.mjs': typeof import('resource://gre/modules/TelemetryScheduler.sys.mjs');
@@ -702,14 +878,18 @@ export interface Modules {
   'resource://gre/modules/TelemetryTimestamps.sys.mjs': typeof import('resource://gre/modules/TelemetryTimestamps.sys.mjs');
   'resource://gre/modules/TelemetryUtils.sys.mjs': typeof import('resource://gre/modules/TelemetryUtils.sys.mjs');
   'resource://gre/modules/Timer.sys.mjs': typeof import('resource://gre/modules/Timer.sys.mjs');
+  'resource://gre/modules/Troubleshoot.sys.mjs': typeof import('resource://gre/modules/Troubleshoot.sys.mjs');
   'resource://gre/modules/UninstallPing.sys.mjs': typeof import('resource://gre/modules/UninstallPing.sys.mjs');
   'resource://gre/modules/UntrustedModulesPing.sys.mjs': typeof import('resource://gre/modules/UntrustedModulesPing.sys.mjs');
   'resource://gre/modules/UpdateListener.sys.mjs': typeof import('resource://gre/modules/UpdateListener.sys.mjs');
   'resource://gre/modules/UpdateLog.sys.mjs': typeof import('resource://gre/modules/UpdateLog.sys.mjs');
   'resource://gre/modules/UpdatePing.sys.mjs': typeof import('resource://gre/modules/UpdatePing.sys.mjs');
   'resource://gre/modules/UpdateService.sys.mjs': typeof import('resource://gre/modules/UpdateService.sys.mjs');
+  'resource://gre/modules/UpdateTimerManager.sys.mjs': typeof import('resource://gre/modules/UpdateTimerManager.sys.mjs');
   'resource://gre/modules/UpdateUtils.sys.mjs': typeof import('resource://gre/modules/UpdateUtils.sys.mjs');
+  'resource://gre/modules/UrlClassifierRemoteSettingsService.sys.mjs': typeof import('resource://gre/modules/UrlClassifierRemoteSettingsService.sys.mjs');
   'resource://gre/modules/UsageReporting.sys.mjs': typeof import('resource://gre/modules/UsageReporting.sys.mjs');
+  'resource://gre/modules/WPTEventsParent.sys.mjs': typeof import('resource://gre/modules/WPTEventsParent.sys.mjs');
   'resource://gre/modules/WebAuthnFeature.sys.mjs': typeof import('resource://gre/modules/WebAuthnFeature.sys.mjs');
   'resource://gre/modules/WebChannel.sys.mjs': typeof import('resource://gre/modules/WebChannel.sys.mjs');
   'resource://gre/modules/WebNavigation.sys.mjs': typeof import('resource://gre/modules/WebNavigation.sys.mjs');
@@ -718,14 +898,22 @@ export interface Modules {
   'resource://gre/modules/WebRequestUpload.sys.mjs': typeof import('resource://gre/modules/WebRequestUpload.sys.mjs');
   'resource://gre/modules/WindowsLaunchOnLogin.sys.mjs': typeof import('resource://gre/modules/WindowsLaunchOnLogin.sys.mjs');
   'resource://gre/modules/WindowsRegistry.sys.mjs': typeof import('resource://gre/modules/WindowsRegistry.sys.mjs');
+  'resource://gre/modules/XPCOMUtils.sys.mjs': typeof import('resource://gre/modules/XPCOMUtils.sys.mjs');
   'resource://gre/modules/addons/AddonRepository.sys.mjs': typeof import('resource://gre/modules/addons/AddonRepository.sys.mjs');
   'resource://gre/modules/addons/AddonSettings.sys.mjs': typeof import('resource://gre/modules/addons/AddonSettings.sys.mjs');
+  'resource://gre/modules/addons/AddonUpdateChecker.sys.mjs': typeof import('resource://gre/modules/addons/AddonUpdateChecker.sys.mjs');
+  'resource://gre/modules/addons/GMPProvider.sys.mjs': typeof import('resource://gre/modules/addons/GMPProvider.sys.mjs');
+  'resource://gre/modules/addons/ModelHubProvider.sys.mjs': typeof import('resource://gre/modules/addons/ModelHubProvider.sys.mjs');
   'resource://gre/modules/addons/ProductAddonChecker.sys.mjs': typeof import('resource://gre/modules/addons/ProductAddonChecker.sys.mjs');
+  'resource://gre/modules/addons/SitePermsAddonProvider.sys.mjs': typeof import('resource://gre/modules/addons/SitePermsAddonProvider.sys.mjs');
   'resource://gre/modules/addons/XPIDatabase.sys.mjs': typeof import('resource://gre/modules/addons/XPIDatabase.sys.mjs');
+  'resource://gre/modules/addons/XPIExports.sys.mjs': typeof import('resource://gre/modules/addons/XPIExports.sys.mjs');
   'resource://gre/modules/addons/XPIInstall.sys.mjs': typeof import('resource://gre/modules/addons/XPIInstall.sys.mjs');
   'resource://gre/modules/addons/XPIProvider.sys.mjs': typeof import('resource://gre/modules/addons/XPIProvider.sys.mjs');
   'resource://gre/modules/addons/crypto-utils.sys.mjs': typeof import('resource://gre/modules/addons/crypto-utils.sys.mjs');
   'resource://gre/modules/addons/siteperms-addon-utils.sys.mjs': typeof import('resource://gre/modules/addons/siteperms-addon-utils.sys.mjs');
+  'resource://gre/modules/backgroundtasks/BackgroundTask_backgroundupdate.sys.mjs': typeof import('resource://gre/modules/backgroundtasks/BackgroundTask_backgroundupdate.sys.mjs');
+  'resource://gre/modules/backgroundtasks/BackgroundTask_defaultagent.sys.mjs': typeof import('resource://gre/modules/backgroundtasks/BackgroundTask_defaultagent.sys.mjs');
   'resource://gre/modules/components-utils/ClientEnvironment.sys.mjs': typeof import('resource://gre/modules/components-utils/ClientEnvironment.sys.mjs');
   'resource://gre/modules/components-utils/FilterExpressions.sys.mjs': typeof import('resource://gre/modules/components-utils/FilterExpressions.sys.mjs');
   'resource://gre/modules/components-utils/JsonSchemaValidator.sys.mjs': typeof import('resource://gre/modules/components-utils/JsonSchemaValidator.sys.mjs');
@@ -740,11 +928,18 @@ export interface Modules {
   'resource://gre/modules/kvstore.sys.mjs': typeof import('resource://gre/modules/kvstore.sys.mjs');
   'resource://gre/modules/media/IdpSandbox.sys.mjs': typeof import('resource://gre/modules/media/IdpSandbox.sys.mjs');
   'resource://gre/modules/media/PeerConnectionIdp.sys.mjs': typeof import('resource://gre/modules/media/PeerConnectionIdp.sys.mjs');
+  'resource://gre/modules/megalist/MegalistViewModel.sys.mjs': typeof import('resource://gre/modules/megalist/MegalistViewModel.sys.mjs');
+  'resource://gre/modules/megalist/aggregator/Aggregator.sys.mjs': typeof import('resource://gre/modules/megalist/aggregator/Aggregator.sys.mjs');
+  'resource://gre/modules/megalist/aggregator/datasources/DataSourceBase.sys.mjs': typeof import('resource://gre/modules/megalist/aggregator/datasources/DataSourceBase.sys.mjs');
+  'resource://gre/modules/megalist/aggregator/datasources/LoginDataSource.sys.mjs': typeof import('resource://gre/modules/megalist/aggregator/datasources/LoginDataSource.sys.mjs');
   'resource://gre/modules/narrate/NarrateControls.sys.mjs': typeof import('resource://gre/modules/narrate/NarrateControls.sys.mjs');
   'resource://gre/modules/policies/WindowsGPOParser.sys.mjs': typeof import('resource://gre/modules/policies/WindowsGPOParser.sys.mjs');
   'resource://gre/modules/policies/macOSPoliciesParser.sys.mjs': typeof import('resource://gre/modules/policies/macOSPoliciesParser.sys.mjs');
   'resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs': typeof import('resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs');
+  'resource://gre/modules/psm/X509.sys.mjs': typeof import('resource://gre/modules/psm/X509.sys.mjs');
+  'resource://gre/modules/psm/pippki.sys.mjs': typeof import('resource://gre/modules/psm/pippki.sys.mjs');
   'resource://gre/modules/reflect.sys.mjs': typeof import('resource://gre/modules/reflect.sys.mjs');
+  'resource://gre/modules/services-automation/ServicesAutomation.sys.mjs': typeof import('resource://gre/modules/services-automation/ServicesAutomation.sys.mjs');
   'resource://gre/modules/sessionstore/PrivacyFilter.sys.mjs': typeof import('resource://gre/modules/sessionstore/PrivacyFilter.sys.mjs');
   'resource://gre/modules/sessionstore/PrivacyLevel.sys.mjs': typeof import('resource://gre/modules/sessionstore/PrivacyLevel.sys.mjs');
   'resource://gre/modules/sessionstore/SessionHistory.sys.mjs': typeof import('resource://gre/modules/sessionstore/SessionHistory.sys.mjs');
@@ -773,11 +968,16 @@ export interface Modules {
   'resource://gre/modules/shared/PhoneNumberNormalizer.sys.mjs': typeof import('resource://gre/modules/shared/PhoneNumberNormalizer.sys.mjs');
   'resource://gre/modules/subprocess/subprocess_unix.sys.mjs': typeof import('resource://gre/modules/subprocess/subprocess_unix.sys.mjs');
   'resource://gre/modules/subprocess/subprocess_win.sys.mjs': typeof import('resource://gre/modules/subprocess/subprocess_win.sys.mjs');
+  'resource://gre/modules/third_party/jsesc/jsesc.mjs': typeof import('resource://gre/modules/third_party/jsesc/jsesc.mjs');
   'resource://gre/modules/translations/LanguageDetector.sys.mjs': typeof import('resource://gre/modules/translations/LanguageDetector.sys.mjs');
+  'resource://gre/modules/vtt.sys.mjs': typeof import('resource://gre/modules/vtt.sys.mjs');
   'resource://gre/modules/workers/PromiseWorker.mjs': typeof import('resource://gre/modules/workers/PromiseWorker.mjs');
+  'resource://httpd-server/httpd.sys.mjs': typeof import('resource://httpd-server/httpd.sys.mjs');
+  'resource://messaging-system/lib/Logger.sys.mjs': typeof import('resource://messaging-system/lib/Logger.sys.mjs');
   'resource://messaging-system/lib/SpecialMessageActions.sys.mjs': typeof import('resource://messaging-system/lib/SpecialMessageActions.sys.mjs');
   'resource://messaging-system/targeting/Targeting.sys.mjs': typeof import('resource://messaging-system/targeting/Targeting.sys.mjs');
   'resource://mozscreenshots/Screenshot.sys.mjs': typeof import('resource://mozscreenshots/Screenshot.sys.mjs');
+  'resource://mozscreenshots/TestRunner.sys.mjs': typeof import('resource://mozscreenshots/TestRunner.sys.mjs');
   'resource://newtab/common/Actions.mjs': typeof import('resource://newtab/common/Actions.mjs');
   'resource://newtab/common/Reducers.sys.mjs': typeof import('resource://newtab/common/Reducers.sys.mjs');
   'resource://newtab/lib/AboutPreferences.sys.mjs': typeof import('resource://newtab/lib/AboutPreferences.sys.mjs');
@@ -791,6 +991,7 @@ export interface Modules {
   'resource://newtab/lib/FaviconFeed.sys.mjs': typeof import('resource://newtab/lib/FaviconFeed.sys.mjs');
   'resource://newtab/lib/HighlightsFeed.sys.mjs': typeof import('resource://newtab/lib/HighlightsFeed.sys.mjs');
   'resource://newtab/lib/InferredModel/FeatureModel.sys.mjs': typeof import('resource://newtab/lib/InferredModel/FeatureModel.sys.mjs');
+  'resource://newtab/lib/InferredModel/GreedyContentRanker.mjs': typeof import('resource://newtab/lib/InferredModel/GreedyContentRanker.mjs');
   'resource://newtab/lib/InferredPersonalizationFeed.sys.mjs': typeof import('resource://newtab/lib/InferredPersonalizationFeed.sys.mjs');
   'resource://newtab/lib/NewTabContentPing.sys.mjs': typeof import('resource://newtab/lib/NewTabContentPing.sys.mjs');
   'resource://newtab/lib/NewTabGleanUtils.sys.mjs': typeof import('resource://newtab/lib/NewTabGleanUtils.sys.mjs');
@@ -804,6 +1005,9 @@ export interface Modules {
   'resource://newtab/lib/Screenshots.sys.mjs': typeof import('resource://newtab/lib/Screenshots.sys.mjs');
   'resource://newtab/lib/SectionsManager.sys.mjs': typeof import('resource://newtab/lib/SectionsManager.sys.mjs');
   'resource://newtab/lib/SmartShortcutsFeed.sys.mjs': typeof import('resource://newtab/lib/SmartShortcutsFeed.sys.mjs');
+  'resource://newtab/lib/SmartShortcutsRanker/RankShortcuts.mjs': typeof import('resource://newtab/lib/SmartShortcutsRanker/RankShortcuts.mjs');
+  'resource://newtab/lib/SmartShortcutsRanker/RankShortcutsWorkerClass.mjs': typeof import('resource://newtab/lib/SmartShortcutsRanker/RankShortcutsWorkerClass.mjs');
+  'resource://newtab/lib/SmartShortcutsRanker/ThomSample.mjs': typeof import('resource://newtab/lib/SmartShortcutsRanker/ThomSample.mjs');
   'resource://newtab/lib/StartupCacheInit.sys.mjs': typeof import('resource://newtab/lib/StartupCacheInit.sys.mjs');
   'resource://newtab/lib/Store.sys.mjs': typeof import('resource://newtab/lib/Store.sys.mjs');
   'resource://newtab/lib/SystemTickFeed.sys.mjs': typeof import('resource://newtab/lib/SystemTickFeed.sys.mjs');
@@ -812,7 +1016,7 @@ export interface Modules {
   'resource://newtab/lib/TopStoriesFeed.sys.mjs': typeof import('resource://newtab/lib/TopStoriesFeed.sys.mjs');
   'resource://newtab/lib/TrendingSearchFeed.sys.mjs': typeof import('resource://newtab/lib/TrendingSearchFeed.sys.mjs');
   'resource://newtab/lib/UTEventReporting.sys.mjs': typeof import('resource://newtab/lib/UTEventReporting.sys.mjs');
-  'resource://newtab/lib/WallpaperFeed.sys.mjs': typeof import('resource://newtab/lib/WallpaperFeed.sys.mjs');
+  'resource://newtab/lib/Wallpapers/WallpaperFeed.sys.mjs': typeof import('resource://newtab/lib/Wallpapers/WallpaperFeed.sys.mjs');
   'resource://newtab/lib/WeatherFeed.sys.mjs': typeof import('resource://newtab/lib/WeatherFeed.sys.mjs');
   'resource://newtab/lib/Widgets/ListsFeed.sys.mjs': typeof import('resource://newtab/lib/Widgets/ListsFeed.sys.mjs');
   'resource://newtab/lib/Widgets/TimerFeed.sys.mjs': typeof import('resource://newtab/lib/Widgets/TimerFeed.sys.mjs');
@@ -824,6 +1028,7 @@ export interface Modules {
   'resource://nimbus/lib/ExperimentStore.sys.mjs': typeof import('resource://nimbus/lib/ExperimentStore.sys.mjs');
   'resource://nimbus/lib/Migrations.sys.mjs': typeof import('resource://nimbus/lib/Migrations.sys.mjs');
   'resource://nimbus/lib/RemoteSettingsExperimentLoader.sys.mjs': typeof import('resource://nimbus/lib/RemoteSettingsExperimentLoader.sys.mjs');
+  'resource://nimbus/lib/SharedDataMap.sys.mjs': typeof import('resource://nimbus/lib/SharedDataMap.sys.mjs');
   'resource://nimbus/lib/TargetingContextRecorder.sys.mjs': typeof import('resource://nimbus/lib/TargetingContextRecorder.sys.mjs');
   'resource://nimbus/lib/Telemetry.sys.mjs': typeof import('resource://nimbus/lib/Telemetry.sys.mjs');
   'resource://normandy-content/AboutPages.sys.mjs': typeof import('resource://normandy-content/AboutPages.sys.mjs');
@@ -832,6 +1037,7 @@ export interface Modules {
   'resource://normandy/actions/AddonRollbackAction.sys.mjs': typeof import('resource://normandy/actions/AddonRollbackAction.sys.mjs');
   'resource://normandy/actions/AddonRolloutAction.sys.mjs': typeof import('resource://normandy/actions/AddonRolloutAction.sys.mjs');
   'resource://normandy/actions/BaseAction.sys.mjs': typeof import('resource://normandy/actions/BaseAction.sys.mjs');
+  'resource://normandy/actions/BaseStudyAction.sys.mjs': typeof import('resource://normandy/actions/BaseStudyAction.sys.mjs');
   'resource://normandy/actions/BranchedAddonStudyAction.sys.mjs': typeof import('resource://normandy/actions/BranchedAddonStudyAction.sys.mjs');
   'resource://normandy/actions/ConsoleLogAction.sys.mjs': typeof import('resource://normandy/actions/ConsoleLogAction.sys.mjs');
   'resource://normandy/actions/PreferenceExperimentAction.sys.mjs': typeof import('resource://normandy/actions/PreferenceExperimentAction.sys.mjs');
@@ -844,6 +1050,7 @@ export interface Modules {
   'resource://normandy/lib/AddonStudies.sys.mjs': typeof import('resource://normandy/lib/AddonStudies.sys.mjs');
   'resource://normandy/lib/CleanupManager.sys.mjs': typeof import('resource://normandy/lib/CleanupManager.sys.mjs');
   'resource://normandy/lib/ClientEnvironment.sys.mjs': typeof import('resource://normandy/lib/ClientEnvironment.sys.mjs');
+  'resource://normandy/lib/EventEmitter.sys.mjs': typeof import('resource://normandy/lib/EventEmitter.sys.mjs');
   'resource://normandy/lib/Heartbeat.sys.mjs': typeof import('resource://normandy/lib/Heartbeat.sys.mjs');
   'resource://normandy/lib/LegacyHeartbeat.sys.mjs': typeof import('resource://normandy/lib/LegacyHeartbeat.sys.mjs');
   'resource://normandy/lib/LogManager.sys.mjs': typeof import('resource://normandy/lib/LogManager.sys.mjs');
@@ -863,15 +1070,20 @@ export interface Modules {
   'resource://pdf.js/PdfJsTelemetry.sys.mjs': typeof import('resource://pdf.js/PdfJsTelemetry.sys.mjs');
   'resource://pdf.js/PdfSandbox.sys.mjs': typeof import('resource://pdf.js/PdfSandbox.sys.mjs');
   'resource://pdf.js/PdfStreamConverter.sys.mjs': typeof import('resource://pdf.js/PdfStreamConverter.sys.mjs');
+  'resource://reftest/AsyncSpellCheckTestHelper.sys.mjs': typeof import('resource://reftest/AsyncSpellCheckTestHelper.sys.mjs');
+  'resource://reftest/PerTestCoverageUtils.sys.mjs': typeof import('resource://reftest/PerTestCoverageUtils.sys.mjs');
+  'resource://reftest/reftest.sys.mjs': typeof import('resource://reftest/reftest.sys.mjs');
   'resource://services-common/async.sys.mjs': typeof import('resource://services-common/async.sys.mjs');
+  'resource://services-common/hawkclient.sys.mjs': typeof import('resource://services-common/hawkclient.sys.mjs');
+  'resource://services-common/hawkrequest.sys.mjs': typeof import('resource://services-common/hawkrequest.sys.mjs');
   'resource://services-common/kinto-http-client.sys.mjs': typeof import('resource://services-common/kinto-http-client.sys.mjs');
   'resource://services-common/kinto-offline-client.sys.mjs': typeof import('resource://services-common/kinto-offline-client.sys.mjs');
   'resource://services-common/kinto-storage-adapter.sys.mjs': typeof import('resource://services-common/kinto-storage-adapter.sys.mjs');
   'resource://services-common/observers.sys.mjs': typeof import('resource://services-common/observers.sys.mjs');
+  'resource://services-common/rest.sys.mjs': typeof import('resource://services-common/rest.sys.mjs');
+  'resource://services-common/tokenserverclient.sys.mjs': typeof import('resource://services-common/tokenserverclient.sys.mjs');
   'resource://services-common/uptake-telemetry.sys.mjs': typeof import('resource://services-common/uptake-telemetry.sys.mjs');
   'resource://services-common/utils.sys.mjs': typeof import('resource://services-common/utils.sys.mjs');
-  'resource://services-crypto/jwcrypto.sys.mjs': typeof import('resource://services-crypto/jwcrypto.sys.mjs');
-  'resource://services-crypto/utils.sys.mjs': typeof import('resource://services-crypto/utils.sys.mjs');
   'resource://services-settings/Attachments.sys.mjs': typeof import('resource://services-settings/Attachments.sys.mjs');
   'resource://services-settings/Database.sys.mjs': typeof import('resource://services-settings/Database.sys.mjs');
   'resource://services-settings/IDBHelpers.sys.mjs': typeof import('resource://services-settings/IDBHelpers.sys.mjs');
@@ -881,58 +1093,127 @@ export interface Modules {
   'resource://services-settings/SyncHistory.sys.mjs': typeof import('resource://services-settings/SyncHistory.sys.mjs');
   'resource://services-settings/Utils.sys.mjs': typeof import('resource://services-settings/Utils.sys.mjs');
   'resource://services-settings/remote-settings.sys.mjs': typeof import('resource://services-settings/remote-settings.sys.mjs');
+  'resource://services-sync/SyncDisconnect.sys.mjs': typeof import('resource://services-sync/SyncDisconnect.sys.mjs');
   'resource://services-sync/SyncedTabs.sys.mjs': typeof import('resource://services-sync/SyncedTabs.sys.mjs');
   'resource://services-sync/TabsStore.sys.mjs': typeof import('resource://services-sync/TabsStore.sys.mjs');
   'resource://services-sync/UIState.sys.mjs': typeof import('resource://services-sync/UIState.sys.mjs');
+  'resource://services-sync/addonsreconciler.sys.mjs': typeof import('resource://services-sync/addonsreconciler.sys.mjs');
+  'resource://services-sync/addonutils.sys.mjs': typeof import('resource://services-sync/addonutils.sys.mjs');
+  'resource://services-sync/bridged_engine.sys.mjs': typeof import('resource://services-sync/bridged_engine.sys.mjs');
   'resource://services-sync/constants.sys.mjs': typeof import('resource://services-sync/constants.sys.mjs');
   'resource://services-sync/doctor.sys.mjs': typeof import('resource://services-sync/doctor.sys.mjs');
+  'resource://services-sync/engines.sys.mjs': typeof import('resource://services-sync/engines.sys.mjs');
   'resource://services-sync/engines/addons.sys.mjs': typeof import('resource://services-sync/engines/addons.sys.mjs');
+  'resource://services-sync/engines/bookmarks.sys.mjs': typeof import('resource://services-sync/engines/bookmarks.sys.mjs');
+  'resource://services-sync/engines/clients.sys.mjs': typeof import('resource://services-sync/engines/clients.sys.mjs');
+  'resource://services-sync/engines/extension-storage.sys.mjs': typeof import('resource://services-sync/engines/extension-storage.sys.mjs');
   'resource://services-sync/engines/forms.sys.mjs': typeof import('resource://services-sync/engines/forms.sys.mjs');
+  'resource://services-sync/engines/history.sys.mjs': typeof import('resource://services-sync/engines/history.sys.mjs');
   'resource://services-sync/engines/passwords.sys.mjs': typeof import('resource://services-sync/engines/passwords.sys.mjs');
+  'resource://services-sync/engines/prefs.sys.mjs': typeof import('resource://services-sync/engines/prefs.sys.mjs');
+  'resource://services-sync/engines/tabs.sys.mjs': typeof import('resource://services-sync/engines/tabs.sys.mjs');
   'resource://services-sync/keys.sys.mjs': typeof import('resource://services-sync/keys.sys.mjs');
   'resource://services-sync/main.sys.mjs': typeof import('resource://services-sync/main.sys.mjs');
+  'resource://services-sync/policies.sys.mjs': typeof import('resource://services-sync/policies.sys.mjs');
   'resource://services-sync/record.sys.mjs': typeof import('resource://services-sync/record.sys.mjs');
   'resource://services-sync/resource.sys.mjs': typeof import('resource://services-sync/resource.sys.mjs');
   'resource://services-sync/service.sys.mjs': typeof import('resource://services-sync/service.sys.mjs');
+  'resource://services-sync/stages/declined.sys.mjs': typeof import('resource://services-sync/stages/declined.sys.mjs');
+  'resource://services-sync/stages/enginesync.sys.mjs': typeof import('resource://services-sync/stages/enginesync.sys.mjs');
   'resource://services-sync/status.sys.mjs': typeof import('resource://services-sync/status.sys.mjs');
   'resource://services-sync/sync_auth.sys.mjs': typeof import('resource://services-sync/sync_auth.sys.mjs');
   'resource://services-sync/telemetry.sys.mjs': typeof import('resource://services-sync/telemetry.sys.mjs');
   'resource://services-sync/util.sys.mjs': typeof import('resource://services-sync/util.sys.mjs');
+  'resource://specialpowers/AppTestDelegate.sys.mjs': typeof import('resource://specialpowers/AppTestDelegate.sys.mjs');
   'resource://talos-powers/TalosParentProfiler.sys.mjs': typeof import('resource://talos-powers/TalosParentProfiler.sys.mjs');
+  'resource://test/AllowJavascriptParent.sys.mjs': typeof import('resource://test/AllowJavascriptParent.sys.mjs');
+  'resource://test/Census.sys.mjs': typeof import('resource://test/Census.sys.mjs');
+  'resource://test/CrashTestUtils.sys.mjs': typeof import('resource://test/CrashTestUtils.sys.mjs');
+  'resource://test/GlobalObjectsModule.sys.mjs': typeof import('resource://test/GlobalObjectsModule.sys.mjs');
+  'resource://test/Match.sys.mjs': typeof import('resource://test/Match.sys.mjs');
+  'resource://test/TestRunner.sys.mjs': typeof import('resource://test/TestRunner.sys.mjs');
+  'resource://test/broadcast_handler.sys.mjs': typeof import('resource://test/broadcast_handler.sys.mjs');
+  'resource://test/contextual.sys.mjs': typeof import('resource://test/contextual.sys.mjs');
+  'resource://test/es6module.js': typeof import('resource://test/es6module.js');
+  'resource://test/es6module_absolute.js': typeof import('resource://test/es6module_absolute.js');
+  'resource://test/es6module_absolute2.js': typeof import('resource://test/es6module_absolute2.js');
+  'resource://test/es6module_cycle_a.js': typeof import('resource://test/es6module_cycle_a.js');
+  'resource://test/es6module_cycle_b.js': typeof import('resource://test/es6module_cycle_b.js');
+  'resource://test/es6module_cycle_c.js': typeof import('resource://test/es6module_cycle_c.js');
   'resource://test/es6module_devtoolsLoader.js': typeof import('resource://test/es6module_devtoolsLoader.js');
+  'resource://test/es6module_devtoolsLoader_only.js': typeof import('resource://test/es6module_devtoolsLoader_only.js');
+  'resource://test/es6module_dynamic_import_runtime_error.js': typeof import('resource://test/es6module_dynamic_import_runtime_error.js');
+  'resource://test/es6module_dynamic_import_syntax_error.js': typeof import('resource://test/es6module_dynamic_import_syntax_error.js');
+  'resource://test/es6module_import_error.js': typeof import('resource://test/es6module_import_error.js');
+  'resource://test/es6module_parse_error.js': typeof import('resource://test/es6module_parse_error.js');
+  'resource://test/es6module_parse_error_in_import.js': typeof import('resource://test/es6module_parse_error_in_import.js');
+  'resource://test/es6module_throws.js': typeof import('resource://test/es6module_throws.js');
+  'resource://test/es6module_top_level_await.js': typeof import('resource://test/es6module_top_level_await.js');
   'resource://test/esm_lazy-1.sys.mjs': typeof import('resource://test/esm_lazy-1.sys.mjs');
   'resource://test/esm_lazy-2.sys.mjs': typeof import('resource://test/esm_lazy-2.sys.mjs');
   'resource://test/esmified-1.sys.mjs': typeof import('resource://test/esmified-1.sys.mjs');
+  'resource://test/esmified-3.sys.mjs': typeof import('resource://test/esmified-3.sys.mjs');
+  'resource://test/esmified-4.sys.mjs': typeof import('resource://test/esmified-4.sys.mjs');
+  'resource://test/import_non_shared_1.mjs': typeof import('resource://test/import_non_shared_1.mjs');
+  'resource://test/non_shared_1.mjs': typeof import('resource://test/non_shared_1.mjs');
+  'resource://test/non_shared_nest_import_non_shared_1.mjs': typeof import('resource://test/non_shared_nest_import_non_shared_1.mjs');
+  'resource://test/non_shared_nest_import_non_shared_2.mjs': typeof import('resource://test/non_shared_nest_import_non_shared_2.mjs');
+  'resource://test/non_shared_nest_import_non_shared_3.mjs': typeof import('resource://test/non_shared_nest_import_non_shared_3.mjs');
+  'resource://test/non_shared_nest_import_non_shared_target_1.mjs': typeof import('resource://test/non_shared_nest_import_non_shared_target_1.mjs');
+  'resource://test/non_shared_nest_import_non_shared_target_2.mjs': typeof import('resource://test/non_shared_nest_import_non_shared_target_2.mjs');
+  'resource://test/non_shared_nest_import_non_shared_target_3.mjs': typeof import('resource://test/non_shared_nest_import_non_shared_target_3.mjs');
+  'resource://test/non_shared_nest_import_shared_1.mjs': typeof import('resource://test/non_shared_nest_import_shared_1.mjs');
+  'resource://test/non_shared_nest_import_shared_target_1.sys.mjs': typeof import('resource://test/non_shared_nest_import_shared_target_1.sys.mjs');
+  'resource://test/non_shared_nest_import_shared_target_2.sys.mjs': typeof import('resource://test/non_shared_nest_import_shared_target_2.sys.mjs');
+  'resource://test/not_found.mjs': typeof import('resource://test/not_found.mjs');
   'resource://testing-common/AddonTestUtils.sys.mjs': typeof import('resource://testing-common/AddonTestUtils.sys.mjs');
+  'resource://testing-common/AllJavascriptTypes.mjs': typeof import('resource://testing-common/AllJavascriptTypes.mjs');
   'resource://testing-common/AppData.sys.mjs': typeof import('resource://testing-common/AppData.sys.mjs');
   'resource://testing-common/AppInfo.sys.mjs': typeof import('resource://testing-common/AppInfo.sys.mjs');
   'resource://testing-common/AppUiTestDelegate.sys.mjs': typeof import('resource://testing-common/AppUiTestDelegate.sys.mjs');
   'resource://testing-common/Assert.sys.mjs': typeof import('resource://testing-common/Assert.sys.mjs');
+  'resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs': typeof import('resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs');
+  'resource://testing-common/BackgroundTasksTestUtils.sys.mjs': typeof import('resource://testing-common/BackgroundTasksTestUtils.sys.mjs');
   'resource://testing-common/BrowserTestUtils.sys.mjs': typeof import('resource://testing-common/BrowserTestUtils.sys.mjs');
   'resource://testing-common/ContentTask.sys.mjs': typeof import('resource://testing-common/ContentTask.sys.mjs');
   'resource://testing-common/ContentTaskUtils.sys.mjs': typeof import('resource://testing-common/ContentTaskUtils.sys.mjs');
+  'resource://testing-common/CookieXPCShellUtils.sys.mjs': typeof import('resource://testing-common/CookieXPCShellUtils.sys.mjs');
+  'resource://testing-common/CoverageUtils.sys.mjs': typeof import('resource://testing-common/CoverageUtils.sys.mjs');
+  'resource://testing-common/CrashManagerTest.sys.mjs': typeof import('resource://testing-common/CrashManagerTest.sys.mjs');
   'resource://testing-common/CustomizableUITestUtils.sys.mjs': typeof import('resource://testing-common/CustomizableUITestUtils.sys.mjs');
+  'resource://testing-common/DOMFullscreenTestUtils.sys.mjs': typeof import('resource://testing-common/DOMFullscreenTestUtils.sys.mjs');
   'resource://testing-common/DoHTestUtils.sys.mjs': typeof import('resource://testing-common/DoHTestUtils.sys.mjs');
   'resource://testing-common/EnterprisePolicyTesting.sys.mjs': typeof import('resource://testing-common/EnterprisePolicyTesting.sys.mjs');
   'resource://testing-common/ExtensionTestCommon.sys.mjs': typeof import('resource://testing-common/ExtensionTestCommon.sys.mjs');
   'resource://testing-common/ExtensionXPCShellUtils.sys.mjs': typeof import('resource://testing-common/ExtensionXPCShellUtils.sys.mjs');
   'resource://testing-common/FileTestUtils.sys.mjs': typeof import('resource://testing-common/FileTestUtils.sys.mjs');
+  'resource://testing-common/FirefoxViewTestUtils.sys.mjs': typeof import('resource://testing-common/FirefoxViewTestUtils.sys.mjs');
   'resource://testing-common/FormHistoryTestUtils.sys.mjs': typeof import('resource://testing-common/FormHistoryTestUtils.sys.mjs');
+  'resource://testing-common/HandlerServiceTestUtils.sys.mjs': typeof import('resource://testing-common/HandlerServiceTestUtils.sys.mjs');
+  'resource://testing-common/InflightAssetsMessageProvider.sys.mjs': typeof import('resource://testing-common/InflightAssetsMessageProvider.sys.mjs');
+  'resource://testing-common/JSObjectsTestUtils.sys.mjs': typeof import('resource://testing-common/JSObjectsTestUtils.sys.mjs');
+  'resource://testing-common/LangPackMatcherTestUtils.sys.mjs': typeof import('resource://testing-common/LangPackMatcherTestUtils.sys.mjs');
+  'resource://testing-common/LoginTestUtils.sys.mjs': typeof import('resource://testing-common/LoginTestUtils.sys.mjs');
   'resource://testing-common/MerinoTestUtils.sys.mjs': typeof import('resource://testing-common/MerinoTestUtils.sys.mjs');
   'resource://testing-common/MessageChannel.sys.mjs': typeof import('resource://testing-common/MessageChannel.sys.mjs');
   'resource://testing-common/MockColorPicker.sys.mjs': typeof import('resource://testing-common/MockColorPicker.sys.mjs');
+  'resource://testing-common/MockDocument.sys.mjs': typeof import('resource://testing-common/MockDocument.sys.mjs');
   'resource://testing-common/MockFilePicker.sys.mjs': typeof import('resource://testing-common/MockFilePicker.sys.mjs');
   'resource://testing-common/MockPermissionPrompt.sys.mjs': typeof import('resource://testing-common/MockPermissionPrompt.sys.mjs');
   'resource://testing-common/MockPromptCollection.sys.mjs': typeof import('resource://testing-common/MockPromptCollection.sys.mjs');
   'resource://testing-common/MockRegistrar.sys.mjs': typeof import('resource://testing-common/MockRegistrar.sys.mjs');
   'resource://testing-common/MockRegistry.sys.mjs': typeof import('resource://testing-common/MockRegistry.sys.mjs');
   'resource://testing-common/MockSound.sys.mjs': typeof import('resource://testing-common/MockSound.sys.mjs');
+  'resource://testing-common/NimbusRolloutMessageProvider.sys.mjs': typeof import('resource://testing-common/NimbusRolloutMessageProvider.sys.mjs');
   'resource://testing-common/NimbusTestUtils.sys.mjs': typeof import('resource://testing-common/NimbusTestUtils.sys.mjs');
+  'resource://testing-common/NodeServer.sys.mjs': typeof import('resource://testing-common/NodeServer.sys.mjs');
   'resource://testing-common/NormandyTestUtils.sys.mjs': typeof import('resource://testing-common/NormandyTestUtils.sys.mjs');
+  'resource://testing-common/OSKeyStoreTestUtils.sys.mjs': typeof import('resource://testing-common/OSKeyStoreTestUtils.sys.mjs');
   'resource://testing-common/PerTestCoverageUtils.sys.mjs': typeof import('resource://testing-common/PerTestCoverageUtils.sys.mjs');
   'resource://testing-common/PerfTestHelpers.sys.mjs': typeof import('resource://testing-common/PerfTestHelpers.sys.mjs');
   'resource://testing-common/PermissionTestUtils.sys.mjs': typeof import('resource://testing-common/PermissionTestUtils.sys.mjs');
   'resource://testing-common/PlacesTestUtils.sys.mjs': typeof import('resource://testing-common/PlacesTestUtils.sys.mjs');
+  'resource://testing-common/ProfilerTestUtils.sys.mjs': typeof import('resource://testing-common/ProfilerTestUtils.sys.mjs');
   'resource://testing-common/PromiseTestUtils.sys.mjs': typeof import('resource://testing-common/PromiseTestUtils.sys.mjs');
   'resource://testing-common/PromptTestUtils.sys.mjs': typeof import('resource://testing-common/PromptTestUtils.sys.mjs');
   'resource://testing-common/QuickSuggestTestUtils.sys.mjs': typeof import('resource://testing-common/QuickSuggestTestUtils.sys.mjs');
@@ -940,20 +1221,48 @@ export interface Modules {
   'resource://testing-common/RemoteSettingsServer.sys.mjs': typeof import('resource://testing-common/RemoteSettingsServer.sys.mjs');
   'resource://testing-common/SearchTestUtils.sys.mjs': typeof import('resource://testing-common/SearchTestUtils.sys.mjs');
   'resource://testing-common/SearchUITestUtils.sys.mjs': typeof import('resource://testing-common/SearchUITestUtils.sys.mjs');
+  'resource://testing-common/SessionStoreTestUtils.sys.mjs': typeof import('resource://testing-common/SessionStoreTestUtils.sys.mjs');
   'resource://testing-common/Sinon.sys.mjs': typeof import('resource://testing-common/Sinon.sys.mjs');
   'resource://testing-common/SiteDataTestUtils.sys.mjs': typeof import('resource://testing-common/SiteDataTestUtils.sys.mjs');
   'resource://testing-common/SpecialPowersParent.sys.mjs': typeof import('resource://testing-common/SpecialPowersParent.sys.mjs');
   'resource://testing-common/SpecialPowersProcessActor.sys.mjs': typeof import('resource://testing-common/SpecialPowersProcessActor.sys.mjs');
   'resource://testing-common/SpecialPowersSandbox.sys.mjs': typeof import('resource://testing-common/SpecialPowersSandbox.sys.mjs');
+  'resource://testing-common/StructuredLog.sys.mjs': typeof import('resource://testing-common/StructuredLog.sys.mjs');
   'resource://testing-common/TabGroupTestUtils.sys.mjs': typeof import('resource://testing-common/TabGroupTestUtils.sys.mjs');
   'resource://testing-common/TelemetryArchiveTesting.sys.mjs': typeof import('resource://testing-common/TelemetryArchiveTesting.sys.mjs');
+  'resource://testing-common/TelemetryEnvironmentTesting.sys.mjs': typeof import('resource://testing-common/TelemetryEnvironmentTesting.sys.mjs');
   'resource://testing-common/TelemetryTestUtils.sys.mjs': typeof import('resource://testing-common/TelemetryTestUtils.sys.mjs');
   'resource://testing-common/TestIntegration.sys.mjs': typeof import('resource://testing-common/TestIntegration.sys.mjs');
   'resource://testing-common/TestUtils.sys.mjs': typeof import('resource://testing-common/TestUtils.sys.mjs');
+  'resource://testing-common/UrlClassifierTestUtils.sys.mjs': typeof import('resource://testing-common/UrlClassifierTestUtils.sys.mjs');
   'resource://testing-common/UrlbarTestUtils.sys.mjs': typeof import('resource://testing-common/UrlbarTestUtils.sys.mjs');
+  'resource://testing-common/VacuumParticipant.sys.mjs': typeof import('resource://testing-common/VacuumParticipant.sys.mjs');
   'resource://testing-common/WrapPrivileged.sys.mjs': typeof import('resource://testing-common/WrapPrivileged.sys.mjs');
   'resource://testing-common/XPCShellContentUtils.sys.mjs': typeof import('resource://testing-common/XPCShellContentUtils.sys.mjs');
+  'resource://testing-common/backgroundtasks/BackgroundTask_backgroundtask_specific_pref.sys.mjs': typeof import('resource://testing-common/backgroundtasks/BackgroundTask_backgroundtask_specific_pref.sys.mjs');
+  'resource://testing-common/backgroundtasks/BackgroundTask_shouldprocessupdates.sys.mjs': typeof import('resource://testing-common/backgroundtasks/BackgroundTask_shouldprocessupdates.sys.mjs');
+  'resource://testing-common/backgroundtasks/BackgroundTask_unique_profile.sys.mjs': typeof import('resource://testing-common/backgroundtasks/BackgroundTask_unique_profile.sys.mjs');
+  'resource://testing-common/cookie_filtering_helper.sys.mjs': typeof import('resource://testing-common/cookie_filtering_helper.sys.mjs');
+  'resource://testing-common/dom/indexedDB/test/modules/IndexedDBUtils.sys.mjs': typeof import('resource://testing-common/dom/indexedDB/test/modules/IndexedDBUtils.sys.mjs');
+  'resource://testing-common/dom/localstorage/test/modules/LocalStorageUtils.sys.mjs': typeof import('resource://testing-common/dom/localstorage/test/modules/LocalStorageUtils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/FileUtils.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/FileUtils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/ModuleLoader.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/ModuleLoader.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/PrefUtils.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/PrefUtils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/PrincipalUtils.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/PrincipalUtils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/ProcessUtils.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/ProcessUtils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/QuotaUtils.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/QuotaUtils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/StorageUtils.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/StorageUtils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/Utils.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/Utils.sys.mjs');
+  'resource://testing-common/dom/quota/test/modules/WorkerDriver.sys.mjs': typeof import('resource://testing-common/dom/quota/test/modules/WorkerDriver.sys.mjs');
+  'resource://testing-common/dom/simpledb/test/modules/SimpleDBUtils.sys.mjs': typeof import('resource://testing-common/dom/simpledb/test/modules/SimpleDBUtils.sys.mjs');
+  'resource://testing-common/early_hint_preload_test_helper.sys.mjs': typeof import('resource://testing-common/early_hint_preload_test_helper.sys.mjs');
   'resource://testing-common/httpd.sys.mjs': typeof import('resource://testing-common/httpd.sys.mjs');
+  'resource://testing-common/services/common/logging.sys.mjs': typeof import('resource://testing-common/services/common/logging.sys.mjs');
+  'resource://testing-common/services/sync/fakeservices.sys.mjs': typeof import('resource://testing-common/services/sync/fakeservices.sys.mjs');
+  'resource://testing-common/services/sync/fxa_utils.sys.mjs': typeof import('resource://testing-common/services/sync/fxa_utils.sys.mjs');
+  'resource://testing-common/services/sync/rotaryengine.sys.mjs': typeof import('resource://testing-common/services/sync/rotaryengine.sys.mjs');
+  'resource://testing-common/services/sync/utils.sys.mjs': typeof import('resource://testing-common/services/sync/utils.sys.mjs');
+  'resource://testing-common/simple_unknown_uri_helpers.sys.mjs': typeof import('resource://testing-common/simple_unknown_uri_helpers.sys.mjs');
   'resource://tps/auth/fxaccounts.sys.mjs': typeof import('resource://tps/auth/fxaccounts.sys.mjs');
   'resource://tps/logger.sys.mjs': typeof import('resource://tps/logger.sys.mjs');
   'resource://tps/modules/addons.sys.mjs': typeof import('resource://tps/modules/addons.sys.mjs');
@@ -966,4 +1275,7 @@ export interface Modules {
   'resource://tps/modules/prefs.sys.mjs': typeof import('resource://tps/modules/prefs.sys.mjs');
   'resource://tps/modules/tabs.sys.mjs': typeof import('resource://tps/modules/tabs.sys.mjs');
   'resource://tps/modules/windows.sys.mjs': typeof import('resource://tps/modules/windows.sys.mjs');
+  'resource://tps/quit.sys.mjs': typeof import('resource://tps/quit.sys.mjs');
+  'resource://tps/tps.sys.mjs': typeof import('resource://tps/tps.sys.mjs');
+  'resource://webcompat/AboutCompat.sys.mjs': typeof import('resource://webcompat/AboutCompat.sys.mjs');
 }
diff --git a/src/zen/@types/lib.gecko.services.d.ts b/src/zen/@types/lib.gecko.services.d.ts
index 35c3182ff..8fd3907d1 100644
--- a/src/zen/@types/lib.gecko.services.d.ts
+++ b/src/zen/@types/lib.gecko.services.d.ts
@@ -62,5 +62,4 @@ interface JSServices {
   wm: nsIWindowMediator;
   ww: nsIWindowWatcher;
   xulStore: nsIXULStore;
-  zen: nsIZenCommonUtils;
 }
diff --git a/src/zen/@types/lib.gecko.xpcom.d.ts b/src/zen/@types/lib.gecko.xpcom.d.ts
index 3786f6fbc..17b7fa253 100644
--- a/src/zen/@types/lib.gecko.xpcom.d.ts
+++ b/src/zen/@types/lib.gecko.xpcom.d.ts
@@ -1181,6 +1181,7 @@ declare global {
     searchString: string;
     setInitiallySelectedIndex(index: i32): void;
     resetInternalState(): void;
+    resetSession(): void;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/autocomplete/nsIAutoCompleteInput.idl
@@ -1275,6 +1276,7 @@ declare global {
       listener: nsIAutoCompleteObserver
     ): void;
     stopSearch(): void;
+    resetSession(): void;
   }
 
   interface nsIAutoCompleteObserver extends nsISupports {
@@ -1618,53 +1620,6 @@ declare global {
     removeValue(name: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/dom/commandhandler/nsIControllerCommand.idl
-
-  interface nsIControllerCommand extends nsISupports {
-    isCommandEnabled(aCommandName: string, aCommandContext: nsISupports): boolean;
-    getCommandStateParams(
-      aCommandName: string,
-      aParams: nsICommandParams,
-      aCommandContext: nsISupports
-    ): void;
-    doCommand(aCommandName: string, aCommandContext: nsISupports): void;
-    doCommandParams(
-      aCommandName: string,
-      aParams: nsICommandParams,
-      aCommandContext: nsISupports
-    ): void;
-  }
-
-  // https://searchfox.org/mozilla-central/source/dom/commandhandler/nsIControllerCommandTable.idl
-
-  interface nsIControllerCommandTable extends nsISupports {
-    makeImmutable(): void;
-    registerCommand(aCommandName: string, aCommand: nsIControllerCommand): void;
-    unregisterCommand(aCommandName: string, aCommand: nsIControllerCommand): void;
-    findCommandHandler(aCommandName: string): nsIControllerCommand;
-    isCommandEnabled(aCommandName: string, aCommandRefCon: nsISupports): boolean;
-    updateCommandState(aCommandName: string, aCommandRefCon: nsISupports): void;
-    supportsCommand(aCommandName: string, aCommandRefCon: nsISupports): boolean;
-    doCommand(aCommandName: string, aCommandRefCon: nsISupports): void;
-    doCommandParams(
-      aCommandName: string,
-      aParam: nsICommandParams,
-      aCommandRefCon: nsISupports
-    ): void;
-    getCommandState(
-      aCommandName: string,
-      aParam: nsICommandParams,
-      aCommandRefCon: nsISupports
-    ): void;
-    getSupportedCommands(): string[];
-  }
-
-  // https://searchfox.org/mozilla-central/source/dom/commandhandler/nsIControllerContext.idl
-
-  interface nsIControllerContext extends nsISupports {
-    setCommandContext(aCommandContext: nsISupports): void;
-  }
-
   // https://searchfox.org/mozilla-central/source/toolkit/components/commandlines/nsICommandLine.idl
 
   interface nsICommandLine extends nsISupports {
@@ -1998,8 +1953,9 @@ declare enum nsIDocumentViewer_PermitUnloadAction {
 }
 
 declare enum nsIDocumentViewer_PermitUnloadResult {
-  eAllowNavigation = 0,
-  eRequestBlockNavigation = 1,
+  eContinue = 0,
+  eCanceledByBeforeUnload = 1,
+  eCanceledByNavigate = 2,
 }
 
 declare global {
@@ -2692,6 +2648,7 @@ declare global {
     readonly OPEN_PRINT_BROWSER?: 4;
     readonly OPEN_NEWTAB_BACKGROUND?: 5;
     readonly OPEN_NEWTAB_FOREGROUND?: 6;
+    readonly OPEN_NEWTAB_AFTER_CURRENT?: 7;
     readonly OPEN_NEW?: 0;
     readonly OPEN_EXTERNAL?: 1;
     readonly OPEN_NO_OPENER?: 4;
@@ -3001,7 +2958,6 @@ declare global {
     readonly MOUSE_BUTTONS_MIDDLE_BUTTON?: 4;
     readonly MOUSE_BUTTONS_4TH_BUTTON?: 8;
     readonly MOUSE_BUTTONS_5TH_BUTTON?: 16;
-    readonly MOUSE_BUTTONS_NOT_SPECIFIED?: -1;
     readonly DIRECTION_LTR?: 0;
     readonly DIRECTION_RTL?: 1;
     readonly DIRECTION_NOT_SET?: 2;
@@ -3061,21 +3017,6 @@ declare global {
     isFirstPaint: boolean;
     getPresShellId(): u32;
     isCORSSafelistedRequestHeader(name: string, value: string): boolean;
-    sendMouseEvent(
-      aType: string,
-      aX: float,
-      aY: float,
-      aButton: i32,
-      aClickCount: i32,
-      aModifiers: i32,
-      aIgnoreRootScrollFrame?: boolean,
-      aPressure?: float,
-      aInputSourceArg?: u16,
-      aIsDOMEventSynthesized?: boolean,
-      aIsWidgetEventSynthesized?: boolean,
-      aButtons?: i32,
-      aIdentifier?: u32
-    ): boolean;
     sendTouchEvent(
       aType: string,
       aIdentifiers: u32[],
@@ -3106,21 +3047,6 @@ declare global {
       aModifier: i32,
       aAsyncEnabled?: nsIDOMWindowUtils.AsyncEnabledOption
     ): boolean;
-    sendMouseEventToWindow(
-      aType: string,
-      aX: float,
-      aY: float,
-      aButton: i32,
-      aClickCount: i32,
-      aModifiers: i32,
-      aIgnoreRootScrollFrame?: boolean,
-      aPressure?: float,
-      aInputSourceArg?: u16,
-      aIsDOMEventSynthesized?: boolean,
-      aIsWidgetEventSynthesized?: boolean,
-      aButtons?: i32,
-      aIdentifier?: u32
-    ): void;
     sendTouchEventToWindow(
       aType: string,
       aIdentifiers: u32[],
@@ -4722,7 +4648,7 @@ declare global {
       aParserCreated: boolean,
       aTriggeringElement: Element,
       aCSPEventListener: nsICSPEventListener,
-      aContentOfPseudoScript: string,
+      aSourceText: string,
       aLineNumber: u32,
       aColumnNumber: u32
     ): boolean;
@@ -6710,6 +6636,7 @@ declare global {
     removeAllLogins(): void;
     getAllLogins(): Promise<any>;
     getAllLoginsWithCallback(aCallback: nsILoginSearchCallback): void;
+    reencryptAllLogins(): Promise<any>;
     getAllDisabledHosts(): string[];
     getLoginSavingEnabled(aHost: string): boolean;
     setLoginSavingEnabled(aHost: string, isEnabled: boolean): void;
@@ -6921,6 +6848,7 @@ declare global {
     readonly totalPhysicalMemory: u64;
     readonly availablePhysicalMemory: u64;
     getOptimalCPUConcurrency(): u8;
+    canUseLlamaCpp(): boolean;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/find/nsIFind.idl
@@ -7755,6 +7683,8 @@ declare enum nsILoadInfo_StoragePermissionState {
   NoStoragePermission = 0,
   HasStoragePermission = 1,
   StoragePermissionAllowListed = 2,
+  DisabledStoragePermission = 3,
+  InactiveStoragePermission = 4,
 }
 
 declare enum nsILoadInfo_IPAddressSpace {
@@ -8517,6 +8447,17 @@ declare global {
       aFailoverTimeout: u32,
       aFailoverProxy: nsIProxyInfo
     ): nsIProxyInfo;
+    newMASQUEProxyInfo(
+      aHost: string,
+      aPort: i32,
+      aPathTemplate: string,
+      aAlpn: string,
+      aProxyAuthorizationHeader: string,
+      aConnectionIsolationKey: string,
+      aFlags: u32,
+      aFailoverTimeout: u32,
+      aFailoverProxy: nsIProxyInfo
+    ): nsIProxyInfo;
     getFailoverForProxy(aProxyInfo: nsIProxyInfo, aURI: nsIURI, aReason: nsresult): nsIProxyInfo;
     registerFilter(aFilter: nsIProtocolProxyFilter, aPosition: u32): void;
     registerChannelFilter(aFilter: nsIProtocolProxyChannelFilter, aPosition: u32): void;
@@ -8579,6 +8520,8 @@ declare global {
     sourceId: string;
     readonly proxyAuthorizationHeader: string;
     readonly connectionIsolationKey: string;
+    pathTemplate: string;
+    alpn: string;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsIRandomGenerator.idl
@@ -11186,6 +11129,7 @@ declare global {
     getErrorMessage(aXPCOMErrorCode: nsresult): string;
     getErrorName(aXPCOMErrorCode: nsresult): string;
     getErrorClass(aXPCOMErrorCode: nsresult): u32;
+    isErrorOverridable(aXPCOMErrorCode: nsresult): boolean;
   }
 
   // https://searchfox.org/mozilla-central/source/security/manager/ssl/nsINSSVersion.idl
@@ -11605,6 +11549,7 @@ declare global {
       aFlags: u32,
       aHostname: string,
       aTime: u64,
+      aSctsFromTls: u8[],
       aCallback: nsICertVerificationCallback
     ): void;
     clearOCSPCache(): void;
@@ -11770,6 +11715,13 @@ declare global {
   // https://searchfox.org/mozilla-central/source/toolkit/components/places/nsINavBookmarksService.idl
 } // global
 
+declare enum nsINavBookmarksService_BookmarkType {
+  TYPE_BOOKMARK = 1,
+  TYPE_FOLDER = 2,
+  TYPE_SEPARATOR = 3,
+  TYPE_DYNAMIC_CONTAINER = 4,
+}
+
 declare enum nsINavBookmarksService_ChangeSource {
   SOURCE_DEFAULT = 0,
   SOURCE_SYNC = 1,
@@ -11781,17 +11733,16 @@ declare enum nsINavBookmarksService_ChangeSource {
 
 declare global {
   namespace nsINavBookmarksService {
+    type BookmarkType = nsINavBookmarksService_BookmarkType;
     type ChangeSource = nsINavBookmarksService_ChangeSource;
   }
 
   interface nsINavBookmarksService
     extends nsISupports,
-      Enums<typeof nsINavBookmarksService_ChangeSource> {
+      Enums<
+        typeof nsINavBookmarksService_BookmarkType & typeof nsINavBookmarksService_ChangeSource
+      > {
     readonly DEFAULT_INDEX?: -1;
-    readonly TYPE_BOOKMARK?: 1;
-    readonly TYPE_FOLDER?: 2;
-    readonly TYPE_SEPARATOR?: 3;
-    readonly TYPE_DYNAMIC_CONTAINER?: 4;
     readonly SYNC_STATUS_UNKNOWN?: 0;
     readonly SYNC_STATUS_NEW?: 1;
     readonly SYNC_STATUS_NORMAL?: 2;
@@ -11956,34 +11907,51 @@ declare global {
     setParents(aGuids: string[]): void;
     clone(): nsINavHistoryQuery;
   }
+} // global
 
-  interface nsINavHistoryQueryOptions extends nsISupports {
-    readonly SORT_BY_NONE?: 0;
-    readonly SORT_BY_TITLE_ASCENDING?: 1;
-    readonly SORT_BY_TITLE_DESCENDING?: 2;
-    readonly SORT_BY_DATE_ASCENDING?: 3;
-    readonly SORT_BY_DATE_DESCENDING?: 4;
-    readonly SORT_BY_URI_ASCENDING?: 5;
-    readonly SORT_BY_URI_DESCENDING?: 6;
-    readonly SORT_BY_VISITCOUNT_ASCENDING?: 7;
-    readonly SORT_BY_VISITCOUNT_DESCENDING?: 8;
-    readonly SORT_BY_DATEADDED_ASCENDING?: 11;
-    readonly SORT_BY_DATEADDED_DESCENDING?: 12;
-    readonly SORT_BY_LASTMODIFIED_ASCENDING?: 13;
-    readonly SORT_BY_LASTMODIFIED_DESCENDING?: 14;
-    readonly SORT_BY_TAGS_ASCENDING?: 17;
-    readonly SORT_BY_TAGS_DESCENDING?: 18;
-    readonly SORT_BY_FRECENCY_ASCENDING?: 21;
-    readonly SORT_BY_FRECENCY_DESCENDING?: 22;
-    readonly RESULTS_AS_URI?: 0;
-    readonly RESULTS_AS_VISIT?: 1;
-    readonly RESULTS_AS_DATE_QUERY?: 3;
-    readonly RESULTS_AS_SITE_QUERY?: 4;
-    readonly RESULTS_AS_DATE_SITE_QUERY?: 5;
-    readonly RESULTS_AS_TAGS_ROOT?: 6;
-    readonly RESULTS_AS_TAG_CONTENTS?: 7;
-    readonly RESULTS_AS_ROOTS_QUERY?: 8;
-    readonly RESULTS_AS_LEFT_PANE_QUERY?: 9;
+declare enum nsINavHistoryQueryOptions_SortByType {
+  SORT_BY_NONE = 0,
+  SORT_BY_TITLE_ASCENDING = 1,
+  SORT_BY_TITLE_DESCENDING = 2,
+  SORT_BY_DATE_ASCENDING = 3,
+  SORT_BY_DATE_DESCENDING = 4,
+  SORT_BY_URI_ASCENDING = 5,
+  SORT_BY_URI_DESCENDING = 6,
+  SORT_BY_VISITCOUNT_ASCENDING = 7,
+  SORT_BY_VISITCOUNT_DESCENDING = 8,
+  SORT_BY_DATEADDED_ASCENDING = 11,
+  SORT_BY_DATEADDED_DESCENDING = 12,
+  SORT_BY_LASTMODIFIED_ASCENDING = 13,
+  SORT_BY_LASTMODIFIED_DESCENDING = 14,
+  SORT_BY_TAGS_ASCENDING = 17,
+  SORT_BY_TAGS_DESCENDING = 18,
+  SORT_BY_FRECENCY_ASCENDING = 21,
+  SORT_BY_FRECENCY_DESCENDING = 22,
+}
+
+declare enum nsINavHistoryQueryOptions_ResultType {
+  RESULTS_AS_URI = 0,
+  RESULTS_AS_VISIT = 1,
+  RESULTS_AS_DATE_QUERY = 3,
+  RESULTS_AS_SITE_QUERY = 4,
+  RESULTS_AS_DATE_SITE_QUERY = 5,
+  RESULTS_AS_TAGS_ROOT = 6,
+  RESULTS_AS_TAG_CONTENTS = 7,
+  RESULTS_AS_ROOTS_QUERY = 8,
+  RESULTS_AS_LEFT_PANE_QUERY = 9,
+}
+
+declare global {
+  namespace nsINavHistoryQueryOptions {
+    type SortByType = nsINavHistoryQueryOptions_SortByType;
+    type ResultType = nsINavHistoryQueryOptions_ResultType;
+  }
+
+  interface nsINavHistoryQueryOptions
+    extends nsISupports,
+      Enums<
+        typeof nsINavHistoryQueryOptions_SortByType & typeof nsINavHistoryQueryOptions_ResultType
+      > {
     readonly QUERY_TYPE_HISTORY?: 0;
     readonly QUERY_TYPE_BOOKMARKS?: 1;
 
@@ -12050,6 +12018,7 @@ declare global {
     queryToQueryString(aQuery: nsINavHistoryQuery, options: nsINavHistoryQueryOptions): string;
     readonly historyDisabled: boolean;
     makeGuid(): string;
+    pageFrecencyThreshold(aVisitAgeInDays: i32, aNumVisits: i32, aBookmarked: boolean): i64;
     hashURL(aSpec: string, aMode?: string): u64;
     isFrecencyDecaying: boolean;
     readonly isAlternativeFrecencyEnabled: boolean;
@@ -12116,6 +12085,13 @@ declare global {
 
   interface nsIPrefLocalizedString extends nsISupportsString {}
 
+  // https://searchfox.org/mozilla-central/source/modules/libpref/nsIPrefOverrideMap.idl
+
+  interface nsIPrefOverrideMap extends nsISupports {
+    addEntry(aPrefName: string, aPrefValue: any): void;
+    getEntry(aPrefName: string): any;
+  }
+
   // https://searchfox.org/mozilla-central/source/modules/libpref/nsIPrefService.idl
 
   type nsIPrefStatsCallback = Callable<{
@@ -12144,7 +12120,7 @@ declare global {
   interface nsIPrefService extends nsISupports {
     resetPrefs(): void;
     savePrefFile(aFile: nsIFile): void;
-    backupPrefFile(aFile: nsIFile): Promise<any>;
+    backupPrefFile(aFile: nsIFile, aOverrideMap?: nsIPrefOverrideMap): Promise<any>;
     getBranch(aPrefRoot: string): nsIPrefBranch;
     getDefaultBranch(aPrefRoot: string): nsIPrefBranch;
     readonly dirty: boolean;
@@ -12154,6 +12130,7 @@ declare global {
     resetStats(): void;
     parsePrefsFromBuffer(bytes: u8[], observer: nsIPrefObserver, pathLabel?: string): void;
     readonly userPrefsFileLastModifiedAtStartup: PRTime;
+    readonly prefsJsPreamble: string;
   }
 
   // https://searchfox.org/mozilla-central/source/modules/libpref/nsIRelativeFilePref.idl
@@ -12304,28 +12281,6 @@ declare global {
     readonly contentWin32kLockdownStateString: string;
   }
 
-  // https://searchfox.org/mozilla-central/source/security/sandbox/linux/interfaces/mozISandboxReporter.idl
-
-  interface mozISandboxReport extends nsISupports {
-    readonly msecAgo: u64;
-    readonly pid: i32;
-    readonly tid: i32;
-    readonly procType: string;
-    readonly syscall: u32;
-    readonly numArgs: u32;
-    getArg(aIndex: u32): string;
-  }
-
-  interface mozISandboxReportArray extends nsISupports {
-    readonly begin: u64;
-    readonly end: u64;
-    getElement(aIndex: u64): mozISandboxReport;
-  }
-
-  interface mozISandboxReporter extends nsISupports {
-    snapshot(): mozISandboxReportArray;
-  }
-
   // https://searchfox.org/mozilla-central/source/toolkit/components/satchel/nsIFormFillController.idl
 
   interface nsIFormFillController extends nsISupports {
@@ -13835,7 +13790,6 @@ declare global {
     readonly name: string;
     readonly id: string;
     readonly telemetryId: string;
-    readonly identifier: string;
     readonly loadPath: string;
     readonly isAppProvided: boolean;
     readonly isConfigEngine: boolean;
@@ -13899,7 +13853,7 @@ declare global {
     readonly hasSuccessfullyInitialized: boolean;
     runBackgroundChecks(): Promise<any>;
     resetToAppDefaultEngine(): void;
-    addOpenSearchEngine(engineURL: string, iconURL: string): Promise<any>;
+    addOpenSearchEngine(engineURL: string, iconURL: string, originAttributes?: any): Promise<any>;
     addUserEngine(formInfo: any): Promise<any>;
     addEnginesFromExtension(extension: any): Promise<any>;
     restoreDefaultEngines(): void;
@@ -14758,7 +14712,7 @@ declare global {
     getTables(c: nsIUrlClassifierCallback): void;
     setHashCompleter(tableName: string, completer: nsIUrlClassifierHashCompleter): void;
     clearLastResults(): void;
-    beginUpdate(updater: nsIUrlClassifierUpdateObserver, tables: string): void;
+    beginUpdate(updater: nsIUrlClassifierUpdateObserver, tables: string, provider: string): void;
     beginStream(table: string): void;
     updateStream(updateChunk: string): void;
     finishStream(): void;
@@ -14846,7 +14800,9 @@ declare global {
     downloadUpdates(
       aRequestTables: string,
       aRequestPayload: string,
+      aRequestQueryParameters: string,
       aIsPostRequest: boolean,
+      aProvider: string,
       aUpdateUrl: string,
       aSuccessCallback: nsIUrlClassifierCallback,
       aUpdateErrorCallback: nsIUrlClassifierCallback,
@@ -14854,6 +14810,15 @@ declare global {
     ): boolean;
   }
 
+  // https://searchfox.org/mozilla-central/source/toolkit/components/url-classifier/nsIUrlClassifierTestUtils.idl
+
+  interface nsIUrlClassifierTestUtils extends nsISupports {
+    makeUpdateResponseV5(aName: string, aSingleHash: u32): string;
+    makeFindFullHashResponseV5(aFullHash: string): string;
+    generateLookupHash(aFragment: string): u32;
+    generateFullHash(aFragment: string): string;
+  }
+
   // https://searchfox.org/mozilla-central/source/toolkit/components/url-classifier/nsIUrlClassifierUtils.idl
 
   interface nsIUrlClassifierParseFindFullHashCallback extends nsISupports {
@@ -14881,11 +14846,16 @@ declare global {
       aListStatesBase64: string[],
       aPrefixes: string[]
     ): string;
+    makeFindFullHashRequestV5(aHashPrefixes: string[]): string;
     makeThreatHitReport(aChannel: nsIChannel, aListName: string, aHashBase64: string): string;
     parseFindFullHashResponseV4(
       aResponse: string,
       aCallback: nsIUrlClassifierParseFindFullHashCallback
     ): void;
+    parseFindFullHashResponseV5(
+      aResponse: string,
+      aCallback: nsIUrlClassifierParseFindFullHashCallback
+    ): void;
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/url-classifier/nsIUrlListManager.idl
@@ -17732,15 +17702,24 @@ declare global {
   }
 
   // https://searchfox.org/mozilla-central/source/xpcom/threads/nsIEventTarget.idl
+} // global
 
-  interface nsIEventTarget extends nsISupports {
-    readonly DISPATCH_NORMAL?: 0;
-    readonly DISPATCH_AT_END?: 2;
-    readonly DISPATCH_EVENT_MAY_BLOCK?: 4;
-    readonly DISPATCH_IGNORE_BLOCK_DISPATCH?: 8;
+declare enum nsIEventTarget_DispatchFlags {
+  DISPATCH_NORMAL = 0,
+  DISPATCH_AT_END = 2,
+  DISPATCH_EVENT_MAY_BLOCK = 4,
+  DISPATCH_IGNORE_BLOCK_DISPATCH = 8,
+  DISPATCH_FALLIBLE = 16,
+}
 
+declare global {
+  namespace nsIEventTarget {
+    type DispatchFlags = nsIEventTarget_DispatchFlags;
+  }
+
+  interface nsIEventTarget extends nsISupports, Enums<typeof nsIEventTarget_DispatchFlags> {
     isOnCurrentThread(): boolean;
-    dispatch(event: nsIRunnable, flags: u32): void;
+    dispatch(event: nsIRunnable, flags: nsIEventTarget.DispatchFlags): void;
   }
 
   // https://searchfox.org/mozilla-central/source/xpcom/threads/nsIIdlePeriod.idl
@@ -17947,6 +17926,8 @@ declare global {
     getUAWidgetScope(principal: nsIPrincipal): any;
     getSandboxMetadata(sandbox: any): any;
     setSandboxMetadata(sandbox: any, metadata: any): void;
+    setSandboxLocaleOverride(sandbox: any, locale: string): void;
+    setSandboxTimezoneOverride(sandbox: any, timezone: string): void;
     isESModuleLoaded(aResourceURI: string): boolean;
     importGlobalProperties(aPropertyList: any): void;
     getWeakReference(obj: any): xpcIJSWeakReference;
@@ -17995,7 +17976,6 @@ declare global {
     getWebIDLCallerPrincipal(): nsIPrincipal;
     getObjectPrincipal(obj: any): nsIPrincipal;
     getRealmLocation(obj: any): string;
-    now(): double;
     readUTF8File(file: nsIFile): string;
     readUTF8URI(url: nsIURI): string;
     createSpellChecker(): nsIEditorSpellCheck;
@@ -18291,20 +18271,6 @@ declare global {
     getInstallHash(): string;
   }
 
-  // https://searchfox.org/mozilla-central/source/zen/toolkit/common/nsIZenCommonUtils.idl
-
-  interface nsIZenCommonUtils extends nsISupports {
-    share(url: nsIURI, title: string, text: string, x: u32, y: u32, width: u32, height: u32): void;
-    canShare(): boolean;
-    playHapticFeedback(): void;
-  }
-
-  // https://searchfox.org/mozilla-central/source/zen/mods/nsIZenModsBackend.idl
-
-  interface nsIZenModsBackend extends nsISupports {
-    rebuildModsStyles(aContents: string): void;
-  }
-
   // https://searchfox.org/mozilla-central/source/modules/libjar/zipwriter/nsIZipWriter.idl
 
   interface nsIZipWriter extends nsISupports {
@@ -18416,9 +18382,6 @@ declare global {
     nsIToolkitChromeRegistry: nsJSIID<nsIToolkitChromeRegistry>;
     nsICommandManager: nsJSIID<nsICommandManager>;
     nsICommandParams: nsJSIID<nsICommandParams>;
-    nsIControllerCommand: nsJSIID<nsIControllerCommand>;
-    nsIControllerCommandTable: nsJSIID<nsIControllerCommandTable>;
-    nsIControllerContext: nsJSIID<nsIControllerContext>;
     nsICommandLine: nsJSIID<nsICommandLine>;
     nsICommandLineHandler: nsJSIID<nsICommandLineHandler>;
     nsICommandLineValidator: nsJSIID<nsICommandLineValidator>;
@@ -19122,7 +19085,7 @@ declare global {
     nsIFavicon: nsJSIID<nsIFavicon>;
     nsINavBookmarksService: nsJSIID<
       nsINavBookmarksService,
-      typeof nsINavBookmarksService_ChangeSource
+      typeof nsINavBookmarksService_BookmarkType & typeof nsINavBookmarksService_ChangeSource
     >;
     nsINavHistoryResultNode: nsJSIID<
       nsINavHistoryResultNode,
@@ -19133,12 +19096,16 @@ declare global {
     nsINavHistoryResultObserver: nsJSIID<nsINavHistoryResultObserver>;
     nsINavHistoryResult: nsJSIID<nsINavHistoryResult>;
     nsINavHistoryQuery: nsJSIID<nsINavHistoryQuery>;
-    nsINavHistoryQueryOptions: nsJSIID<nsINavHistoryQueryOptions>;
+    nsINavHistoryQueryOptions: nsJSIID<
+      nsINavHistoryQueryOptions,
+      typeof nsINavHistoryQueryOptions_SortByType & typeof nsINavHistoryQueryOptions_ResultType
+    >;
     nsINavHistoryService: nsJSIID<nsINavHistoryService, typeof nsINavHistoryService_TransitionType>;
     nsIPlacesPreviewsHelperService: nsJSIID<nsIPlacesPreviewsHelperService>;
     nsITaggingService: nsJSIID<nsITaggingService>;
     nsIPrefBranch: nsJSIID<nsIPrefBranch>;
     nsIPrefLocalizedString: nsJSIID<nsIPrefLocalizedString>;
+    nsIPrefOverrideMap: nsJSIID<nsIPrefOverrideMap>;
     nsIPrefStatsCallback: nsJSIID<nsIPrefStatsCallback>;
     nsIPrefObserver: nsJSIID<nsIPrefObserver>;
     nsIPrefService: nsJSIID<nsIPrefService>;
@@ -19154,9 +19121,6 @@ declare global {
     nsIApplicationReputationQuery: nsJSIID<nsIApplicationReputationQuery>;
     nsIApplicationReputationCallback: nsJSIID<nsIApplicationReputationCallback>;
     mozISandboxSettings: nsJSIID<mozISandboxSettings>;
-    mozISandboxReport: nsJSIID<mozISandboxReport>;
-    mozISandboxReportArray: nsJSIID<mozISandboxReportArray>;
-    mozISandboxReporter: nsJSIID<mozISandboxReporter>;
     nsIFormFillController: nsJSIID<nsIFormFillController>;
     nsIFormFillCompleteObserver: nsJSIID<nsIFormFillCompleteObserver>;
     mozIBridgedSyncEngineCallback: nsJSIID<mozIBridgedSyncEngineCallback>;
@@ -19351,6 +19315,7 @@ declare global {
     nsIUrlClassifierPrefixSet: nsJSIID<nsIUrlClassifierPrefixSet>;
     nsIUrlClassifierRemoteSettingsService: nsJSIID<nsIUrlClassifierRemoteSettingsService>;
     nsIUrlClassifierStreamUpdater: nsJSIID<nsIUrlClassifierStreamUpdater>;
+    nsIUrlClassifierTestUtils: nsJSIID<nsIUrlClassifierTestUtils>;
     nsIUrlClassifierParseFindFullHashCallback: nsJSIID<nsIUrlClassifierParseFindFullHashCallback>;
     nsIUrlClassifierUtils: nsJSIID<nsIUrlClassifierUtils>;
     nsIUrlListManager: nsJSIID<nsIUrlListManager>;
@@ -19577,7 +19542,7 @@ declare global {
         typeof nsIXULRuntime_FissionDecisionStatus
     >;
     nsIEnvironment: nsJSIID<nsIEnvironment>;
-    nsIEventTarget: nsJSIID<nsIEventTarget>;
+    nsIEventTarget: nsJSIID<nsIEventTarget, typeof nsIEventTarget_DispatchFlags>;
     nsINamed: nsJSIID<nsINamed>;
     nsIProcess: nsJSIID<nsIProcess>;
     nsIRunnable: nsJSIID<nsIRunnable>;
@@ -19626,8 +19591,6 @@ declare global {
     nsIControllers: nsJSIID<nsIControllers>;
     nsINativeAppSupport: nsJSIID<nsINativeAppSupport>;
     nsIXREDirProvider: nsJSIID<nsIXREDirProvider>;
-    nsIZenCommonUtils: nsJSIID<nsIZenCommonUtils>;
-    nsIZenModsBackend: nsJSIID<nsIZenModsBackend>;
     nsIZipWriter: nsJSIID<nsIZipWriter>;
   }
 } // global
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index 3bde84f83..a1715df59 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -4,41 +4,35 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 :root:not([inDOMFullscreen='true']):not([chromehidden~='location']):not([chromehidden~='toolbar']) {
-  & #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer,
-  #tabbrowser-tabpanels[dragging-split='true'] {
-    width: -moz-available;
-    position: relative;
+  & #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
+    overflow: clip;
 
-    &.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);
+    }
 
-      :root:not([zen-no-padding='true']) &:not(.zen-glance-overlay) {
-        border-radius: var(--zen-native-inner-radius);
-        box-shadow: var(--zen-big-shadow);
+    & browser[type='content'] {
+      &: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) {
       & browser[type='content'] {
-        &: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));
-        }
+        color-scheme: env(-moz-content-preferred-color-scheme);
       }
+    }
 
-      @media not -moz-pref('layout.css.prefers-color-scheme.content-override', 2) {
-        & browser[type='content'] {
-          color-scheme: env(-moz-content-preferred-color-scheme);
-        }
-      }
-
-      @media -moz-pref('zen.theme.acrylic-elements') {
-        & browser[type='content'] {
-          /* For the rendering engine to apply layering optimizations. This
+    @media -moz-pref('zen.theme.acrylic-elements') {
+      & browser[type='content'] {
+        /* For the rendering engine to apply layering optimizations. This
            * is a hacky solution, but it works for now. */
-          will-change: transform;
-        }
+        will-change: transform;
       }
     }
   }
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 2634a302f..d7ee4295b 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -21,7 +21,7 @@
   --urlbarView-hover-background: var(--toolbarbutton-hover-background);
   --urlbarView-highlight-background: var(--toolbarbutton-hover-background);
   border-radius: calc(var(--toolbarbutton-border-radius) - 2px);
-  --urlbarView-results-padding: 6px !important;
+  --urlbarView-results-padding: 8px !important;
   --urlbar-container-height: 48px !important;
 
   --urlbar-margin-inline: 5px;
@@ -63,8 +63,6 @@
   outline: none !important;
 
   border: none !important;
-  margin: 1px;
-
   box-shadow: none !important;
 }
 
@@ -712,8 +710,8 @@
   max-height: 260px;
   overflow-y: auto;
   scrollbar-width: none;
-  margin-block-start: var(--urlbarView-results-padding);
-  margin-block-end: calc(var(--urlbarView-results-padding) + 2px);
+  margin-block-start: calc(var(--urlbarView-results-padding) - 2px);
+  margin-block-end: var(--urlbarView-results-padding);
   padding-block: 0 !important;
 
   & .action-contextualidentity {
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 8c7fa89cd..094841385 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -296,6 +296,11 @@ body > #confetti {
   --arrowpanel-menuitem-border-radius: 10px;
 }
 
+#unified-extensions-empty-state,
+#unified-extensions-discover-extensions {
+  display: none !important;
+}
+
 #zen-site-data-addons {
   display: flex;
   flex-wrap: wrap;
diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs
index 3fe62d6c1..5aeeaa67c 100644
--- a/src/zen/split-view/ZenViewSplitter.mjs
+++ b/src/zen/split-view/ZenViewSplitter.mjs
@@ -239,7 +239,7 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
       if (!draggedTab || gBrowser.selectedTab.hasAttribute('zen-empty-tab')) {
         return;
       }
-      draggedTab.container.finishMoveTogetherSelectedTabs(draggedTab);
+      gBrowser.tabContainer.tabDragAndDrop.finishMoveTogetherSelectedTabs(draggedTab);
     }
     if (
       !draggedTab ||
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 779f3566b..eebfadf06 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -778,6 +778,10 @@
         return;
       }
       const existingPin = this._pinsCache.find((p) => p.uuid === pin.uuid);
+      if (existingPin && existingPin === pin) {
+        // We want to avoid unnecessary writes
+        return;
+      }
       if (existingPin) {
         Object.assign(existingPin, pin);
       } else {
diff --git a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
index 898aa9373..0ace9dcba 100644
--- a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
+++ b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
@@ -3,7 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { XPCOMUtils } from 'resource://gre/modules/XPCOMUtils.sys.mjs';
-import { UrlbarProvider, UrlbarUtils } from 'resource:///modules/UrlbarUtils.sys.mjs';
+import {
+  UrlbarProvider,
+  UrlbarUtils,
+} from 'moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs';
 import { globalActions } from 'resource:///modules/ZenUBGlobalActions.sys.mjs';
 import { zenUrlbarResultsLearner } from './ZenUBResultsLearner.sys.mjs';
 
@@ -18,9 +21,9 @@ const MINIMUM_QUERY_SCORE = 92;
 const MINIMUM_PREFIXED_QUERY_SCORE = 30;
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  UrlbarResult: 'resource:///modules/UrlbarResult.sys.mjs',
-  UrlbarTokenizer: 'resource:///modules/UrlbarTokenizer.sys.mjs',
-  QueryScorer: 'resource:///modules/UrlbarProviderInterventions.sys.mjs',
+  UrlbarResult: 'moz-src:///browser/components/urlbar/UrlbarResult.sys.mjs',
+  UrlbarTokenizer: 'moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs',
+  QueryScorer: 'moz-src:///browser/components/urlbar/UrlbarProviderInterventions.sys.mjs',
   BrowserWindowTracker: 'resource:///modules/BrowserWindowTracker.sys.mjs',
   AddonManager: 'resource://gre/modules/AddonManager.sys.mjs',
   zenUrlbarResultsLearner: 'resource:///modules/ZenUBResultsLearner.sys.mjs',
@@ -244,7 +247,7 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
     const ownerGlobal = lazy.BrowserWindowTracker.getTopWindow();
     let finalResults = [];
     for (const action of actionsResults) {
-      const [payload, payloadHighlights] = lazy.UrlbarResult.payloadAndSimpleHighlights([], {
+      const { payload, payloadHighlights } = lazy.UrlbarResult.payloadAndSimpleHighlights([], {
         suggestion: action.label,
         title: action.label,
         zenCommand: action.command,
@@ -259,12 +262,12 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
         ...action.extraPayload,
       });
 
-      let result = new lazy.UrlbarResult(
-        UrlbarUtils.RESULT_TYPE.DYNAMIC,
-        UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS,
+      let result = new lazy.UrlbarResult({
+        type: UrlbarUtils.RESULT_TYPE.DYNAMIC,
+        source: UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS,
         payload,
-        payloadHighlights
-      );
+        payloadHighlights,
+      });
       if (zenUrlbarResultsLearner.shouldPrioritize(action.commandId) && !isPrefixed) {
         result.heuristic = true;
       } else {
diff --git a/src/zen/urlbar/ZenUBProvider.sys.mjs b/src/zen/urlbar/ZenUBProvider.sys.mjs
index 6ba14396e..740e5af4e 100644
--- a/src/zen/urlbar/ZenUBProvider.sys.mjs
+++ b/src/zen/urlbar/ZenUBProvider.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/. */
 
-import { UrlbarProvidersManager } from 'resource:///modules/UrlbarProvidersManager.sys.mjs';
+import { UrlbarProvidersManager } from 'moz-src:///browser/components/urlbar/UrlbarProvidersManager.sys.mjs';
 
 const providers = {};
 ChromeUtils.defineESModuleGetters(providers, {
diff --git a/surfer.json b/surfer.json
index 9687e3680..03e2cabec 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "144.0.2",
-    "candidate": "144.0.2"
+    "candidate": "145.0"
   },
   "buildOptions": {
     "generateBranding": true
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file

From 2ec45108500e1b29a6807208ada85aae9f54c78a Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sat, 8 Nov 2025 12:31:30 +0100
Subject: [PATCH 058/162] feat: Show the correct possition for new panels,
 b=no-bug, c=common

---
 .../actors/EncryptedMediaParent-sys-mjs.patch        | 12 ++++++++++++
 src/browser/base/content/zen-panels/site-data.inc    |  3 +--
 src/zen/common/ZenUIManager.mjs                      |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 src/browser/actors/EncryptedMediaParent-sys-mjs.patch

diff --git a/src/browser/actors/EncryptedMediaParent-sys-mjs.patch b/src/browser/actors/EncryptedMediaParent-sys-mjs.patch
new file mode 100644
index 000000000..a68cec8a1
--- /dev/null
+++ b/src/browser/actors/EncryptedMediaParent-sys-mjs.patch
@@ -0,0 +1,12 @@
+diff --git a/browser/actors/EncryptedMediaParent.sys.mjs b/browser/actors/EncryptedMediaParent.sys.mjs
+index 9d3d3db9761cf5b2fde1f70992e82b1733241863..3dc64dc395d5237bf2c290cb8588cf467fb8729a 100644
+--- a/browser/actors/EncryptedMediaParent.sys.mjs
++++ b/browser/actors/EncryptedMediaParent.sys.mjs
+@@ -200,6 +200,7 @@ export class EncryptedMediaParent extends JSWindowActorParent {
+         "drmContentPlaying",
+         aBrowser
+       )
++      || true // zen: We have some issues with this currently, so never show it
+     ) {
+       return;
+     }
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index 0f7695264..e149df52e 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -5,8 +5,7 @@
 <panel id="zen-unified-site-data-panel"
         role="group"
         type="arrow"
-        noautofocus="true"
-        position="bottomright topright">
+        noautofocus="true">
   <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
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 1333a34ba..f8c11d47a 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -659,7 +659,7 @@ var gZenUIManager = {
     if (anchor?.closest('#zen-sidebar-top-buttons')) {
       block = 'topleft';
     }
-    if (gZenVerticalTabsManager._hasSetSingleToolbar && !gZenVerticalTabsManager._prefsRightSide) {
+    if (gZenVerticalTabsManager._hasSetSingleToolbar && gZenVerticalTabsManager._prefsRightSide) {
       block = 'bottomright';
       inline = 'topright';
     }

From 879865e6258b84ae67792332cca664505226b693 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sat, 8 Nov 2025 12:36:48 +0100
Subject: [PATCH 059/162] fix: Add a margin to the urlbar only when closed,
 b=no-bug, c=common

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

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index d7ee4295b..24becb4bc 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -62,6 +62,10 @@
   border-radius: var(--border-radius-medium);
   outline: none !important;
 
+  #urlbar:not([breakout-extend='true']) & {
+    margin: 1px;
+  }
+
   border: none !important;
   box-shadow: none !important;
 }

From c5bc5c7f091a02284f9d6d2b908d00126dd73b7f Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sat, 8 Nov 2025 13:30:23 +0100
Subject: [PATCH 060/162] fix: Fixed tab border radius. Regression from `ff
 145.0`, b=no-bug, c=tabs

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

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 258ea20f6..e9de513cb 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -347,6 +347,7 @@
 
     & .tab-background {
       overflow: hidden;
+      border-radius: var(--border-radius-medium) !important;
 
       & .tab-context-line {
         margin: 0 0px !important;

From eeb8a78741febe9d37ee5981c417147fd85aea55 Mon Sep 17 00:00:00 2001
From: Ryosuke <88011751+nrysk@users.noreply.github.com>
Date: Sun, 9 Nov 2025 00:39:17 +0900
Subject: [PATCH 061/162] feat: Add three command bar actions for switching the
 Light/Dark Mode, p=#11122

---
 src/zen/urlbar/ZenUBGlobalActions.sys.mjs | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/zen/urlbar/ZenUBGlobalActions.sys.mjs b/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
index 5f09607d4..12d288346 100644
--- a/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
+++ b/src/zen/urlbar/ZenUBGlobalActions.sys.mjs
@@ -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/. */
 
+import { XPCOMUtils } from 'resource://gre/modules/XPCOMUtils.sys.mjs';
+
+const lazy = {};
+
+XPCOMUtils.defineLazyPreferenceGetter(lazy, 'currentTheme', 'zen.view.window.scheme', 2);
+
 function isNotEmptyTab(window) {
   return !window.gBrowser.selectedTab.hasAttribute('zen-empty-tab');
 }
@@ -153,6 +159,30 @@ const globalActionsTemplate = [
     command: 'Tools:Addons',
     icon: 'chrome://browser/skin/zen-icons/extension.svg',
   },
+  {
+    label: 'Switch to Automatic Appearance',
+    command: () => Services.prefs.setIntPref('zen.view.window.scheme', 2),
+    icon: 'chrome://browser/skin/zen-icons/sparkles.svg',
+    isAvailable: () => {
+      return lazy.currentTheme !== 2;
+    },
+  },
+  {
+    label: 'Switch to Light Mode',
+    command: () => Services.prefs.setIntPref('zen.view.window.scheme', 1),
+    icon: 'chrome://browser/skin/zen-icons/face-sun.svg',
+    isAvailable: () => {
+      return lazy.currentTheme !== 1;
+    },
+  },
+  {
+    label: 'Switch to Dark Mode',
+    command: () => Services.prefs.setIntPref('zen.view.window.scheme', 0),
+    icon: 'chrome://browser/skin/zen-icons/moon-stars.svg',
+    isAvailable: () => {
+      return lazy.currentTheme !== 0;
+    },
+  },
 ];
 
 export const globalActions = globalActionsTemplate.map((action) => ({

From 8b5325ba1c15cf8285a631292f204d63bd1dd2b0 Mon Sep 17 00:00:00 2001
From: Anodev-sudo <205236663+Anodev-sudo@users.noreply.github.com>
Date: Sun, 9 Nov 2025 04:26:03 -0600
Subject: [PATCH 062/162] fix: Update incorrect element picker tooltip
 description, b=closes #8998, p=#11213

---
 .../locales/en-US/toolbox-properties.patch     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/devtools/client/locales/en-US/toolbox-properties.patch

diff --git a/src/devtools/client/locales/en-US/toolbox-properties.patch b/src/devtools/client/locales/en-US/toolbox-properties.patch
new file mode 100644
index 000000000..3a8ae85fe
--- /dev/null
+++ b/src/devtools/client/locales/en-US/toolbox-properties.patch
@@ -0,0 +1,18 @@
+diff --git a/devtools/client/locales/en-US/toolbox.properties b/devtools/client/locales/en-US/toolbox.properties
+index d4f986b024d3505b8c151f8e0166a20ff1862c5d..b2fb69e8897abdacb090d5a6faca203656e7cd44 100644
+--- a/devtools/client/locales/en-US/toolbox.properties
++++ b/devtools/client/locales/en-US/toolbox.properties
+@@ -66,11 +66,11 @@ toolbox.androidElementPicker.mac.tooltip=Pick an element from the Android phone
+ 
+ # LOCALIZATION NOTE (toolbox.elementPicker.key)
+ # Key shortcut used to toggle the element picker.
+-toolbox.elementPicker.key=CmdOrCtrl+Shift+C
++toolbox.elementPicker.key=CmdOrCtrl+Shift+L
+ 
+ # LOCALIZATION NOTE (toolbox.elementPicker.mac.key)
+ # Key shortcut used to toggle the element picker for macOS.
+-toolbox.elementPicker.mac.key=Cmd+Opt+C
++toolbox.elementPicker.mac.key=Cmd+Opt+L
+ 
+ # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
+ # Used as a message in either tooltips or contextual menu items to open the

From c3820012537fe2616b3842521fde825050f0e517 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 9 Nov 2025 11:49:10 +0100
Subject: [PATCH 063/162] fix: Fixed pins not saving proprely, b=closes #11217,
 c=tabs

---
 src/zen/tabs/ZenPinnedTabManager.mjs  |  4 ----
 src/zen/tabs/ZenPinnedTabsStorage.mjs | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index eebfadf06..779f3566b 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -778,10 +778,6 @@
         return;
       }
       const existingPin = this._pinsCache.find((p) => p.uuid === pin.uuid);
-      if (existingPin && existingPin === pin) {
-        // We want to avoid unnecessary writes
-        return;
-      }
       if (existingPin) {
         Object.assign(existingPin, pin);
       } else {
diff --git a/src/zen/tabs/ZenPinnedTabsStorage.mjs b/src/zen/tabs/ZenPinnedTabsStorage.mjs
index 425dbf2d1..bc11213f7 100644
--- a/src/zen/tabs/ZenPinnedTabsStorage.mjs
+++ b/src/zen/tabs/ZenPinnedTabsStorage.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/.
 var ZenPinnedTabsStorage = {
+  _saveCache: [],
+
   async init() {
     await this._ensureTable();
   },
@@ -74,6 +76,22 @@ var ZenPinnedTabsStorage = {
   },
 
   async savePin(pin, notifyObservers = true) {
+    // If we find the exact same pin in the cache, skip saving
+    const existingIndex = this._saveCache.findIndex((cachedPin) => cachedPin.uuid === pin.uuid);
+    if (existingIndex !== -1) {
+      const existingPin = this._saveCache[existingIndex];
+      const isSame = Object.keys(pin).every((key) => pin[key] === existingPin[key]);
+      if (isSame) {
+        return; // No changes, skip saving
+      } else {
+        // Update the cached pin
+        this._saveCache[existingIndex] = pin;
+      }
+    } else {
+      // Add to cache
+      this._saveCache.push(pin);
+    }
+
     const changedUUIDs = new Set();
 
     await PlacesUtils.withConnectionWrapper('ZenPinnedTabsStorage.savePin', async (db) => {
@@ -389,6 +407,11 @@ var ZenPinnedTabsStorage = {
   },
 
   async removePin(uuid, notifyObservers = true) {
+    const cachedIndex = this._saveCache.findIndex((cachedPin) => cachedPin.uuid === uuid);
+    if (cachedIndex !== -1) {
+      this._saveCache.splice(cachedIndex, 1);
+    }
+
     const changedUUIDs = [uuid];
 
     await PlacesUtils.withConnectionWrapper('ZenPinnedTabsStorage.removePin', async (db) => {

From 421adade520932ab040a09dff4bded4241b7629a Mon Sep 17 00:00:00 2001
From: Kyle Kincer <69128842+KyleKincer@users.noreply.github.com>
Date: Sun, 9 Nov 2025 12:32:13 -0500
Subject: [PATCH 064/162] feat: Close tab and switch to recent tab when going
 back with no history, p=#11190

Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 .../browser/preferences/zen-preferences.ftl   |  3 +++
 prefs/zen/zen.yaml                            |  3 +++
 .../base/content/browser-commands-js.patch    | 19 +++++++++++---
 .../content/browser-gestureSupport-js.patch   | 13 ++++++++++
 src/browser/base/content/browser-js.patch     | 26 ++++++++++++++-----
 .../preferences/zenTabsManagement.inc.xhtml   |  3 +++
 src/zen/common/ZenCommonUtils.mjs             | 15 +++++++++++
 7 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 src/browser/base/content/browser-gestureSupport-js.patch

diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
index ea49e2517..d053124e2 100644
--- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
@@ -56,6 +56,9 @@ pane-settings-workspaces-title = Workspaces
 zen-tabs-unloader-enabled =
     .label = Enable Tab Unloader
 
+zen-tabs-close-on-back-with-no-history =
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+
 zen-look-and-feel-compact-toolbar-themed =
     .label = Use themed background for compact toolbar
 
diff --git a/prefs/zen/zen.yaml b/prefs/zen/zen.yaml
index 469622931..c44a0e626 100644
--- a/prefs/zen/zen.yaml
+++ b/prefs/zen/zen.yaml
@@ -34,3 +34,6 @@
 
 - name: zen.tabs.open-pinned-in-new-tab
   value: true
+
+- name: zen.tabs.close-on-back-with-no-history
+  value: true
diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch
index a475e0749..3c0aabfee 100644
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,8 +1,19 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index 939ca497b882b3f4200141ba1b6764fb5c846f45..36c830a503b004c0a332340f686c86cad68e9381 100644
+index 939ca497b882b3f4200141ba1b6764fb5c846f45..779cba5ff3df856a246321a36caa3725c054a314 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
-@@ -315,6 +315,10 @@ var BrowserCommands = {
+@@ -14,6 +14,10 @@ var BrowserCommands = {
+     const where = BrowserUtils.whereToOpenLink(aEvent, false, true);
+ 
+     if (where == "current") {
++      if (!gBrowser.webNavigation.canGoBack && gZenCommonActions.shouldCloseTabOnBack()) {
++        gBrowser.removeTab(gBrowser.selectedTab);
++        return;
++      }
+       try {
+         gBrowser.goBack();
+       } catch (ex) {}
+@@ -315,6 +319,10 @@ var BrowserCommands = {
        }
      }
  
@@ -13,7 +24,7 @@ index 939ca497b882b3f4200141ba1b6764fb5c846f45..36c830a503b004c0a332340f686c86ca
      // A notification intended to be useful for modular peformance tracking
      // starting as close as is reasonably possible to the time when the user
      // expressed the intent to open a new tab.  Since there are a lot of
-@@ -399,6 +403,11 @@ var BrowserCommands = {
+@@ -399,6 +407,11 @@ var BrowserCommands = {
        return;
      }
  
@@ -25,7 +36,7 @@ index 939ca497b882b3f4200141ba1b6764fb5c846f45..36c830a503b004c0a332340f686c86ca
      // Keyboard shortcuts that would close a tab that is pinned select the first
      // unpinned tab instead.
      if (
-@@ -406,8 +415,8 @@ var BrowserCommands = {
+@@ -406,8 +419,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {
diff --git a/src/browser/base/content/browser-gestureSupport-js.patch b/src/browser/base/content/browser-gestureSupport-js.patch
new file mode 100644
index 000000000..ef205d5df
--- /dev/null
+++ b/src/browser/base/content/browser-gestureSupport-js.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/base/content/browser-gestureSupport.js b/browser/base/content/browser-gestureSupport.js
+index a28d54bf72c0e6495b9586f220d1859aac794936..66154668b9f85ffbaacea1e8351370659260227b 100644
+--- a/browser/base/content/browser-gestureSupport.js
++++ b/browser/base/content/browser-gestureSupport.js
+@@ -832,7 +832,7 @@ var gHistorySwipeAnimation = {
+    * @return true if there is a previous page in history, false otherwise.
+    */
+   canGoBack: function HSA_canGoBack() {
+-    return gBrowser.webNavigation.canGoBack;
++    return gBrowser.webNavigation.canGoBack || gZenCommonActions.shouldCloseTabOnBack();
+   },
+ 
+   /**
diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index 8d2658275..4165d22e5 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 b4b79e7fb3228ba91bd8afa08659be0d88883725..9e1d59b6a736107e55bda73686a4a627e4c0ba7c 100644
+index b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd61ee1828 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -31,6 +31,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,7 +10,21 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..9e1d59b6a736107e55bda73686a4a627
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -2298,6 +2299,8 @@ var XULBrowserWindow = {
+@@ -822,7 +823,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
+ 
+   var backDisabled = backCommand.hasAttribute("disabled");
+   var forwardDisabled = forwardCommand.hasAttribute("disabled");
+-  if (backDisabled == aWebNavigation.canGoBack) {
++  var canGoBack = aWebNavigation.canGoBack;
++  if (!canGoBack) {
++    canGoBack = gZenCommonActions.shouldCloseTabOnBack();
++  }
++  
++  if (backDisabled == canGoBack) {
+     if (backDisabled) {
+       backCommand.removeAttribute("disabled");
+     } else {
+@@ -2298,6 +2304,8 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
@@ -19,7 +33,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..9e1d59b6a736107e55bda73686a4a627
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -3809,7 +3812,7 @@ function warnAboutClosingWindow() {
+@@ -3809,7 +3817,7 @@ function warnAboutClosingWindow() {
  
    if (!isPBWindow && !toolbar.visible) {
      return gBrowser.warnAboutClosingTabs(
@@ -28,7 +42,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..9e1d59b6a736107e55bda73686a4a627
        gBrowser.closingTabsEnum.ALL
      );
    }
-@@ -3849,7 +3852,7 @@ function warnAboutClosingWindow() {
+@@ -3849,7 +3857,7 @@ function warnAboutClosingWindow() {
      return (
        isPBWindow ||
        gBrowser.warnAboutClosingTabs(
@@ -37,7 +51,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..9e1d59b6a736107e55bda73686a4a627
          gBrowser.closingTabsEnum.ALL
        )
      );
-@@ -3874,7 +3877,7 @@ function warnAboutClosingWindow() {
+@@ -3874,7 +3882,7 @@ function warnAboutClosingWindow() {
      AppConstants.platform != "macosx" ||
      isPBWindow ||
      gBrowser.warnAboutClosingTabs(
@@ -46,7 +60,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..9e1d59b6a736107e55bda73686a4a627
        gBrowser.closingTabsEnum.ALL
      )
    );
-@@ -4796,6 +4799,9 @@ var ConfirmationHint = {
+@@ -4796,6 +4804,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/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index b8693566f..2943b863b 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -26,6 +26,9 @@
       <checkbox id="zenWorkspacesForceContainerTabsToWorkspace"
             data-l10n-id="zen-settings-workspaces-force-container-tabs-to-workspace"
             preference="zen.workspaces.force-container-workspace"/>
+      <checkbox id="zenTabsCloseOnBackWithNoHistory"
+            data-l10n-id="zen-tabs-close-on-back-with-no-history"
+            preference="zen.tabs.close-on-back-with-no-history"/>
 </groupbox>
 
 <hbox id="zenTabsUnloadCategory"
diff --git a/src/zen/common/ZenCommonUtils.mjs b/src/zen/common/ZenCommonUtils.mjs
index 4f2058fc9..f6b7cdc03 100644
--- a/src/zen/common/ZenCommonUtils.mjs
+++ b/src/zen/common/ZenCommonUtils.mjs
@@ -107,4 +107,19 @@ var gZenCommonActions = {
       timer = setTimeout(() => f.apply(this, args), delay);
     };
   },
+
+  /**
+   * Determines if a tab should be closed when navigating back with no history.
+   * Only tabs with an owner that are not pinned and not empty are eligible.
+   * Respects the user preference zen.tabs.close-on-back-with-no-history.
+   *
+   * @return {boolean} True if the tab should be closed on back
+   */
+  shouldCloseTabOnBack() {
+    if (!Services.prefs.getBoolPref('zen.tabs.close-on-back-with-no-history', true)) {
+      return false;
+    }
+    const tab = gBrowser.selectedTab;
+    return Boolean(tab.owner && !tab.pinned && !tab.hasAttribute('zen-empty-tab'));
+  },
 };

From 5ecfc745daa96e8f37737199dff156868581ecc1 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 10 Nov 2025 00:08:02 +0100
Subject: [PATCH 065/162] fix: Fixed border radius regresion with `ff 145.0`,
 b=no-bug, c=tabs

---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index e9de513cb..975acad6e 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -902,7 +902,8 @@
 }
 
 .tab-reset-button,
-.tab-reset-pin-button {
+.tab-reset-pin-button,
+.tab-close-button {
   display: none;
   -moz-context-properties: fill, fill-opacity;
   border-radius: var(--tab-border-radius);

From 57e63a44563f3c90bf3452575f75e76e8461d6a9 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Mon, 10 Nov 2025 01:48:47 +0100
Subject: [PATCH 066/162] chore: New Crowdin updates, p=#11127

* New translations zen-preferences.ftl (Polish)

* New translations zen-preferences.ftl (Portuguese)

* New translations zen-workspaces.ftl (Polish)

* New translations zen-workspaces.ftl (Portuguese)

* New translations zen-workspaces.ftl (Dutch)

* New translations zen-general.ftl (Dutch)

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

* New translations zen-preferences.ftl (German)

* New translations zen-preferences.ftl (Dutch)

* New translations zen-workspaces.ftl (German)

* New translations zen-workspaces.ftl (Dutch)

* New translations zen-general.ftl (German)

* New translations zen-general.ftl (Dutch)

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

* New translations zen-welcome.ftl (Dutch)

* New translations zen-folders.ftl (Dutch)

* New translations zen-preferences.ftl (Vietnamese)

* New translations zen-workspaces.ftl (Vietnamese)

* New translations zen-general.ftl (Vietnamese)

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

* New translations zen-welcome.ftl (Vietnamese)

* New translations zen-folders.ftl (Vietnamese)

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

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

* New translations zen-general.ftl (Portuguese, Brazilian)
---
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/de/browser/browser/zen-general.ftl    | 12 ++--
 locales/de/browser/browser/zen-workspaces.ftl |  6 +-
 .../browser/preferences/zen-preferences.ftl   | 28 ++++-----
 locales/nl/browser/browser/zen-folders.ftl    |  8 +--
 locales/nl/browser/browser/zen-general.ftl    | 58 +++++++++----------
 locales/nl/browser/browser/zen-split-view.ftl |  2 +-
 .../nl/browser/browser/zen-vertical-tabs.ftl  |  2 +-
 locales/nl/browser/browser/zen-welcome.ftl    |  2 +-
 locales/nl/browser/browser/zen-workspaces.ftl | 16 ++---
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/pl/browser/browser/zen-workspaces.ftl |  6 +-
 .../browser/preferences/zen-preferences.ftl   |  4 +-
 locales/pt-BR/browser/browser/zen-general.ftl | 26 ++++-----
 .../pt-BR/browser/browser/zen-workspaces.ftl  |  6 +-
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 .../pt-PT/browser/browser/zen-workspaces.ftl  |  6 +-
 .../browser/preferences/zen-preferences.ftl   |  6 +-
 locales/vi/browser/browser/zen-folders.ftl    |  2 +-
 locales/vi/browser/browser/zen-general.ftl    | 56 +++++++++---------
 .../vi/browser/browser/zen-vertical-tabs.ftl  |  6 +-
 locales/vi/browser/browser/zen-welcome.ftl    |  4 +-
 locales/vi/browser/browser/zen-workspaces.ftl | 10 ++--
 23 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index 8bfea60c9..e9160ee84 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Performance umschalten
 zen-devtools-toggle-storage-shortcut = Speicher umschalten
 zen-devtools-toggle-dom-shortcut = DOM umschalten
 zen-devtools-toggle-accessibility-shortcut = Barrierefreiheit umschalten
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Alle nicht angehefteten Tabs schließen
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index fb06a3b31..0fdabed61 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -63,8 +63,8 @@ zen-generic-next = Weiter
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Erlaubt
 zen-site-data-setting-block = Blockiert
-zen-site-data-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-protections-enabled = Aktiviert
+zen-site-data-protections-disabled = Deaktiviert
 zen-site-data-setting-cross-site = Cross-Site-Cookie
 zen-site-data-security-info-extension = 
     .label = Erweiterung
@@ -79,13 +79,13 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Alle Website-Einstellungen
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Diese Seite teilen
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Lesemodus aktivieren
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Screenshot erstellen
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Diese Seite als Lesezeichen hinzufügen
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL kopieren
 zen-site-data-setting-site-protection = Tracking-Schutz
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index a6975eb99..ac3ab82f7 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Arbeitsbereich löschen?
 zen-workspaces-delete-workspace-body = Sind Sie sicher, dass Sie { $name } löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs geschlossen! Nutze <span>{ $shortcut }</span> , um rückgängig zu machen.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Löschen
+    .tooltiptext = Alle nicht angehefteten Tabs schließen
diff --git a/locales/nl/browser/browser/preferences/zen-preferences.ftl b/locales/nl/browser/browser/preferences/zen-preferences.ftl
index 010497161..ce5e2d83b 100644
--- a/locales/nl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nl/browser/browser/preferences/zen-preferences.ftl
@@ -30,8 +30,8 @@ zen-glance-trigger-shift-click =
     .label = Shift + klik
 zen-glance-trigger-meta-click = 
     .label = Windows (Command) + klik
-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-header = Weergeven in compacte weergave
+zen-look-and-feel-compact-view-description = Alleen de werkbalken weergeven die je gebruikt!
 zen-look-and-feel-compact-view-enabled = 
     .label = { -brand-short-name }'s compacte modus inschakelen
 zen-look-and-feel-compact-view-top-toolbar = 
@@ -45,7 +45,7 @@ pane-settings-workspaces-title = Werkruimtes
 zen-tabs-unloader-enabled = 
     .label = Tabblad ontlader inschakelen
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Gebruik thema achtergrond voor compacte werkbalk
 zen-workspace-continue-where-left-off = 
     .label = Verdergaan waar je was gebleven
 pane-zen-pinned-tab-manager-title = Vastgezette tabbladen
@@ -76,7 +76,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 = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Conflicten met { $group } -> { $shortcut }
 pane-zen-theme-title = Thema instellingen
 zen-vertical-tabs-title = Zijbalk en tabbladen lay-out
 zen-vertical-tabs-header = Verticale tabbladen
@@ -84,9 +84,9 @@ zen-vertical-tabs-description = Beheer je tabbladen in een verticale lay-out
 zen-vertical-tabs-show-expand-button = 
     .label = Uitbreiden knop weergeven
 zen-vertical-tabs-newtab-on-tab-list = 
-    .label = Laat nieuwe tabblad knop zien op de tabblad lijst
+    .label = Laat nieuwe tabblad knop zien op de tabbladlijst
 zen-vertical-tabs-newtab-top-button-up = 
-    .label = Verplaats de nieuwe tab knop naar boven
+    .label = Verplaats de nieuwe tabblad knop naar boven
 zen-vertical-tabs-expand-tabs-by-default = Tabbladen standaard uitbreiden
 zen-vertical-tabs-dont-expand-tabs-by-default = Tabbladen niet standaard uitbreiden
 zen-vertical-tabs-expand-tabs-on-hover = Tabbladen uitbreiden bij hoveren (werkt niet in compacte modus)
@@ -130,7 +130,7 @@ zen-themes-auto-update =
 zen-settings-workspaces-force-container-tabs-to-workspace = 
     .label = Schakel over naar de werkruimte waar container als standaard is ingesteld bij het openen van container tabbladen
 zen-theme-marketplace-link = Winkel bezoeken
-zen-dark-theme-styles-header = Donkere thema stijlen
+zen-dark-theme-styles-header = Donker thema stijlen
 zen-dark-theme-styles-description = Pas het donker thema aan naar jouw voorkeur
 zen-dark-theme-styles-amoled = Nacht thema
 zen-dark-theme-styles-default = Standaard donker thema
@@ -223,7 +223,7 @@ zen-key-exit-full-screen = Volledig scherm afsluiten
 zen-ai-chatbot-sidebar-shortcut = AI-chatbot zijbalk togglen
 zen-key-inspector-mac = Inspector (Mac) togglen
 zen-toggle-sidebar-shortcut = Firefox zijbalk togglen
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-toggle-pin-tab-shortcut = Tabblad vastzetten togglen
 zen-reader-mode-toggle-shortcut-other = Leesmodus togglen
 zen-picture-in-picture-toggle-shortcut = Beeld-in-beeld togglen
 zen-nav-reload-shortcut-2 = Pagina opnieuw laden
@@ -234,7 +234,7 @@ zen-find-shortcut = Vinden op pagina
 zen-search-find-again-shortcut = Opnieuw zoeken
 zen-search-find-again-shortcut-prev = Vorige vinden
 zen-search-find-again-shortcut-2 = Opnieuw zoeken (alternatief)
-zen-bookmark-this-page-shortcut = Bladwijzer deze pagina
+zen-bookmark-this-page-shortcut = Bladwijzer toevoegen voor deze pagina
 zen-bookmark-show-library-shortcut = Bladwijzerbibliotheek weergeven
 zen-key-stop = Laden stoppen
 zen-full-zoom-reduce-shortcut = Uitzoomen
@@ -248,8 +248,8 @@ zen-private-browsing-shortcut = Privé browsen
 zen-screenshot-shortcut = Schermafbeelding maken
 zen-key-sanitize = Browsergegevens wissen
 zen-quit-app-shortcut = Applicatie afsluiten
-zen-key-wr-capture-cmd = WR opname opdracht
-zen-key-wr-toggle-capture-sequence-cmd = WR opnamereeks togglen
+zen-key-wr-capture-cmd = WR-opname opdracht
+zen-key-wr-toggle-capture-sequence-cmd = WR-opnamereeks togglen
 zen-nav-reload-shortcut = Pagina opnieuw laden
 zen-nav-reload-shortcut-skip-cache = Pagina opnieuw laden (Cache overslaan)
 zen-close-shortcut = Venster sluiten
@@ -257,7 +257,7 @@ zen-close-tab-shortcut = Tabblad sluiten
 zen-compact-mode-shortcut-show-sidebar = Zwevende zijbalk togglen
 zen-compact-mode-shortcut-show-toolbar = Zwevende werkbalk togglen
 zen-compact-mode-shortcut-toggle = Compacte modus togglen
-zen-glance-expand = Expand Glance
+zen-glance-expand = Snel bekijken uitbreiden
 zen-workspace-shortcut-switch-1 = Schakelen naar werkruimte 1
 zen-workspace-shortcut-switch-2 = Schakelen naar werkruimte 2
 zen-workspace-shortcut-switch-3 = Schakelen naar werkruimte 3
@@ -276,7 +276,7 @@ zen-split-view-shortcut-grid = Gesplitste weergave raster togglen
 zen-split-view-shortcut-vertical = Gesplitste weergave verticaal togglen
 zen-split-view-shortcut-horizontal = Gesplitste weergave horizontaal togglen
 zen-split-view-shortcut-unsplit = Gesplitste weergave sluiten
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Nieuwe lege gesplitste weergave
 zen-key-select-tab-1 = Selecteer tabblad #1
 zen-key-select-tab-2 = Selecteer tabblad #2
 zen-key-select-tab-3 = Selecteer tabblad #3
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Prestaties togglen
 zen-devtools-toggle-storage-shortcut = Opslag togglen
 zen-devtools-toggle-dom-shortcut = DOM togglen
 zen-devtools-toggle-accessibility-shortcut = Toegankelijkheid togglen
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Alle niet-vastgezette tabbladen sluiten
diff --git a/locales/nl/browser/browser/zen-folders.ftl b/locales/nl/browser/browser/zen-folders.ftl
index 7b537e981..eb7064a9a 100644
--- a/locales/nl/browser/browser/zen-folders.ftl
+++ b/locales/nl/browser/browser/zen-folders.ftl
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-folders-search-placeholder = 
-    .placeholder = Zoek { $folder-name }...
+    .placeholder = { $folder-name } zoeken...
 zen-folders-panel-rename-folder = 
     .label = Map hernoemen
 zen-folders-panel-unpack-folder = 
@@ -19,7 +19,7 @@ zen-folders-panel-change-folder-space =
 zen-folders-panel-change-icon-folder = 
     .label = Wijzig pictogram
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = Actieven ontladen in deze map
 zen-folders-unload-folder = 
-    .label = Unload All Tabs
-zen-folders-search-no-results = No tabs matching that search 🤔
+    .label = Alle tabbladen ontladen
+zen-folders-search-no-results = Geen tabbladen die overeenkomen met die zoekopdracht 🤔
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index f3bd6f4a0..7b96f0d81 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -28,7 +28,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 = Copied current URL!
+zen-copy-current-url-confirmation = Huidige URL gekopieerd!
 zen-general-cancel-label = 
     .label = Annuleren
 zen-general-confirm = 
@@ -42,8 +42,8 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods = 
     .label = Mods
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
-    .tooltiptext = Toggle Compact Mode
+    .label = Compacte modus
+    .tooltiptext = Compacte modus togglen
 
 # note: Do not translate the "<br/>" tags in the following string
 
@@ -52,45 +52,45 @@ zen-close-label = Sluiten
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Zoeken…
 zen-icons-picker-emoji = 
-    .label = Emojis
+    .label = Emoji's
 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
-zen-generic-next = Next
+    .label = Iconen
+urlbar-search-mode-zen_actions = Acties
+zen-site-data-settings = Instellingen
+zen-generic-manage = Beheren
+zen-generic-more = Meer
+zen-generic-next = Volgende
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-allow = Toegestaan
+zen-site-data-setting-block = Geblokkeerd
+zen-site-data-protections-enabled = Ingeschakeld
+zen-site-data-protections-disabled = Uitgeschakeld
+zen-site-data-setting-cross-site = Cross-site cookie
 zen-site-data-security-info-extension = 
-    .label = Extension
+    .label = Extensie
 zen-site-data-security-info-secure = 
-    .label = Secure
+    .label = Beveiligd
 zen-site-data-security-info-not-secure = 
-    .label = Not Secure
+    .label = Niet beveiligd
 zen-site-data-manage-addons = 
-    .label = Manage Extensions
+    .label = Extensies beheren
 zen-site-data-get-addons = 
-    .label = Add Extensions
+    .label = Extensies toevoegen
 zen-site-data-site-settings = 
-    .label = All Site Settings
+    .label = Alle site-instellingen
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Deze pagina delen
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Leesmodus openen
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Maak een schermafbeelding
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Bladwijzer toevoegen voor deze pagina
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = URL kopiëren
+zen-site-data-setting-site-protection = Tracking bescherming
 
 # 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 = Een nieuw thuis voor add-ons, machtigingen en meer
+zen-site-data-panel-feature-callout-subtitle = Klik op het icoon om de site-instellingen te beheren, beveiligingsinfo te bekijken, extensies te openen en gemeenschappelijke acties uit te voeren.
diff --git a/locales/nl/browser/browser/zen-split-view.ftl b/locales/nl/browser/browser/zen-split-view.ftl
index d0f5b1eec..d625c1de9 100644
--- a/locales/nl/browser/browser/zen-split-view.ftl
+++ b/locales/nl/browser/browser/zen-split-view.ftl
@@ -15,6 +15,6 @@ zen-split-link =
 zen-split-view-modifier-header = Gesplitste weergave
 zen-split-view-modifier-activate-reallocation = 
     .label = Herverdeling activeren
-zen-split-view-modifier-enabled-toast = Geplitste weergave herschikken staat AAN.
+zen-split-view-modifier-enabled-toast = Gesplitste weergave herschikken staat AAN.
 zen-split-view-modifier-enabled-toast-description = Sleep de tabbladen om de weergave te herschikken. Druk op Esc om af te sluiten.
 zen-split-view-modifier-disabled-toast = Geplitste weergave herschikken staat UIT.
diff --git a/locales/nl/browser/browser/zen-vertical-tabs.ftl b/locales/nl/browser/browser/zen-vertical-tabs.ftl
index 57df55699..49979e38c 100644
--- a/locales/nl/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/nl/browser/browser/zen-vertical-tabs.ftl
@@ -18,7 +18,7 @@ zen-toolbar-context-compact-mode-hide-both =
     .label = Beide verbergen
     .accesskey = U
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = Nieuwe map
     .accesskey = N
 sidebar-zen-expand = 
     .label = Zijbalk uitklappen
diff --git a/locales/nl/browser/browser/zen-welcome.ftl b/locales/nl/browser/browser/zen-welcome.ftl
index b1a2c3270..011213fb0 100644
--- a/locales/nl/browser/browser/zen-welcome.ftl
+++ b/locales/nl/browser/browser/zen-welcome.ftl
@@ -6,7 +6,7 @@ zen-welcome-title-line1 = Welkom bij
 zen-welcome-title-line2 = een rustiger internet
 zen-welcome-import-title = Een frisse start, dezelfde bladwijzers
 zen-welcome-import-description-1 = Je bladwijzers, geschiedenis en wachtwoorden zijn als een spoor van broodkruimels door het internet - laat ze niet achter!
-zen-welcome-import-description-2 = Easily bring them over from another browser and pick up right where you left off..
+zen-welcome-import-description-2 = Breng ze eenvoudig over vanuit een andere browser en ga verder waar je was gebleven.
 zen-welcome-import-button = Nu importeren
 zen-welcome-set-default-browser = { -brand-short-name } instellen als standaardbrowser
 zen-welcome-dont-set-default-browser = { -brand-short-name } NIET instellen als standaardbrowser
diff --git a/locales/nl/browser/browser/zen-workspaces.ftl b/locales/nl/browser/browser/zen-workspaces.ftl
index f6e77c336..a9f3b3f0e 100644
--- a/locales/nl/browser/browser/zen-workspaces.ftl
+++ b/locales/nl/browser/browser/zen-workspaces.ftl
@@ -6,20 +6,20 @@ zen-panel-ui-workspaces-text = Ruimtes
 zen-panel-ui-workspaces-create = 
     .label = Ruimte aanmaken
 zen-panel-ui-folder-create = 
-    .label = Create Folder
+    .label = Map aanmaken
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Nieuwe splitsing
 zen-workspaces-panel-context-delete = 
     .label = Ruimte verwijderen
     .accesskey = D
 zen-workspaces-panel-change-name = 
     .label = Naam wijzigen
 zen-workspaces-panel-change-icon = 
-    .label = Icon wijzigen
+    .label = Icoon wijzigen
 zen-workspaces-panel-context-default-profile = 
     .label = Profiel instellen
 zen-workspaces-panel-unload = 
-    .label = Unload Space
+    .label = Ruimte ontladen
 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 = 
@@ -56,10 +56,10 @@ zen-workspace-creation-profile = Profiel
 zen-workspace-creation-header = Maak een ruimte
 zen-workspace-creation-label = Ruimtes worden gebruikt om je tabbladen en sessies te organiseren.
 zen-workspaces-delete-workspace-title = Ruimte verwijderen?
-zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+zen-workspaces-delete-workspace-body = Weet je zeker dat je { $name } wilt verwijderen? Deze actie kan niet ongedaan gemaakt worden.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabbladen gesloten! Gebruik <span>{ $shortcut }</span> om ongedaan te maken.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Wissen
+    .tooltiptext = Alle niet-vastgezette tabbladen sluiten
diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl
index da9f785fd..18d5426b4 100644
--- a/locales/pl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Włącz Wydajność
 zen-devtools-toggle-storage-shortcut = Włącz Pamięć
 zen-devtools-toggle-dom-shortcut = Włącz DOM
 zen-devtools-toggle-accessibility-shortcut = Włącz Dostępność
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Zamknij wszystkie nieprzypięte karty
diff --git a/locales/pl/browser/browser/zen-workspaces.ftl b/locales/pl/browser/browser/zen-workspaces.ftl
index 8e473a525..1ac1d8c51 100644
--- a/locales/pl/browser/browser/zen-workspaces.ftl
+++ b/locales/pl/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Usunąć Przestrzeń roboczą?
 zen-workspaces-delete-workspace-body = Czy na pewno chcesz usunąć { $name }? Tej czynności nie można cofnąć.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Zamknięto karty! Użyj <span>{ $shortcut }</span> aby przywrócić.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Wyczyść
+    .tooltiptext = Zamknij wszystkie nieprzypięte karty
diff --git a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
index 8cc5f1c4c..b10064b75 100644
--- a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
@@ -76,7 +76,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 = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Conflitos com { $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
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Ativar/Desativar Desempenho
 zen-devtools-toggle-storage-shortcut = Ativar/Desativar Armazenamento
 zen-devtools-toggle-dom-shortcut = Ativar/Desativar DOM
 zen-devtools-toggle-accessibility-shortcut = Ativar/Desativar Acessibilidade
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Fechar Todas as Abas Não Fixadas
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 48eef77f8..26630077e 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -26,7 +26,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 = Copied current URL!
+zen-copy-current-url-confirmation = URL atual copiada!
 zen-general-cancel-label = 
     .label = Cancelar
 zen-general-confirm = 
@@ -57,13 +57,13 @@ 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
+zen-generic-next = Próximo
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-protections-enabled = Habilitado
+zen-site-data-protections-disabled = Desabilitado
+zen-site-data-setting-cross-site = Cookie entre Sites
 zen-site-data-security-info-extension = 
     .label = Extensão
 zen-site-data-security-info-secure = 
@@ -77,18 +77,18 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Todas as Configurações do Site
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Compartilhar Esta Página
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Entrar no Modo Leitura
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Tirar Captura de Tela
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Marcar Esta Página
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = Copiar URL
+zen-site-data-setting-site-protection = Proteção contra Rastreamento
 
 # 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 = Um novo lar para extensões, permissões e mais
+zen-site-data-panel-feature-callout-subtitle = Clique no ícone para gerenciar configurações do site, visualizar informações de segurança, acessar extensões e realizar ações comuns.
diff --git a/locales/pt-BR/browser/browser/zen-workspaces.ftl b/locales/pt-BR/browser/browser/zen-workspaces.ftl
index 7b032e85d..b2d5d710b 100644
--- a/locales/pt-BR/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-BR/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Excluir Espaço?
 zen-workspaces-delete-workspace-body = Tem certeza que deseja excluir { $name }? Esta ação não pode ser desfeita.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Abas Fechadas! Use <span>{ $shortcut }</span> para desfazer.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Limpar
+    .tooltiptext = Fechar todas as abas não fixadas
diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
index 5d46462a5..aff4680ae 100644
--- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
@@ -304,4 +304,4 @@ zen-devtools-toggle-performance-shortcut = Alternar Desempenho
 zen-devtools-toggle-storage-shortcut = Alternar Armazenamento
 zen-devtools-toggle-dom-shortcut = Alternar DOM
 zen-devtools-toggle-accessibility-shortcut = Alternar Acessibilidade
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Fechar Todos os Separadores Não Fixados
diff --git a/locales/pt-PT/browser/browser/zen-workspaces.ftl b/locales/pt-PT/browser/browser/zen-workspaces.ftl
index d6af3ae11..91e3f788e 100644
--- a/locales/pt-PT/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-PT/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Eliminar Espaço de Trabalho?
 zen-workspaces-delete-workspace-body = Tem certeza que deseja eliminar { $name }? Esta ação não pode ser desfeita.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Separadores Fechados! Use <span>{ $shortcut }</span> para voltar atrás.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Limpar
+    .tooltiptext = Fechar todos os separadores não fixados
diff --git a/locales/vi/browser/browser/preferences/zen-preferences.ftl b/locales/vi/browser/browser/preferences/zen-preferences.ftl
index 9d83b2f56..b817df522 100644
--- a/locales/vi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/vi/browser/browser/preferences/zen-preferences.ftl
@@ -74,7 +74,7 @@ zen-settings-workspaces-description = Với các không gian làm việc, bạn
 zen-settings-workspaces-enabled = 
     .label = Bật không gian làm việc
 zen-settings-workspaces-hide-default-container-indicator = 
-    .label = Ẩn chỉ báo vùng chứa mặc định trên thanh thẻ
+    .label = Ẩn container mặc định trên thanh công cụ
 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 = Conflicts with { $group } -> { $shortcut }
 pane-zen-theme-title = Cài đặt chủ đề
@@ -145,7 +145,7 @@ zen-urlbar-behavior-label = Hành vi thanh đường dẫn
 zen-urlbar-behavior-normal = 
     .label = Bình thường
 zen-urlbar-behavior-floating-on-type = 
-    .label = Tách ra khi nhập
+    .label = Tách ra khi nhập chữ
 zen-urlbar-behavior-float = 
     .label = Luôn luôn tách
 pane-zen-CKS-title = Phím tắt
@@ -174,7 +174,7 @@ zenCKSOption-group-zen-split-view = Chế độ xem chia đôi
 zenCKSOption-group-devTools = Công cụ nhà phát triển
 zen-key-quick-restart = Khởi động lại nhanh
 zen-window-new-shortcut = Cửa sổ mới
-zen-tab-new-shortcut = Tab mới
+zen-tab-new-shortcut = Thẻ mới
 zen-key-redo = Hoàn tác
 zen-restore-last-closed-tab-shortcut = Khôi phục lại thẻ gần nhất đã đóng
 zen-location-open-shortcut = Mở đường dẫn
diff --git a/locales/vi/browser/browser/zen-folders.ftl b/locales/vi/browser/browser/zen-folders.ftl
index 953611723..4efc605a1 100644
--- a/locales/vi/browser/browser/zen-folders.ftl
+++ b/locales/vi/browser/browser/zen-folders.ftl
@@ -19,7 +19,7 @@ zen-folders-panel-change-folder-space =
 zen-folders-panel-change-icon-folder = 
     .label = Đổi biểu tượng thư mục thẻ
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = Tắt các thẻ trong thư mục
 zen-folders-unload-folder = 
     .label = Tải lại tất cả các thẻ
 zen-folders-search-no-results = Không có thẻ nào trùng với tìm kiếm 🤔
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index e037f71c2..9a3bdafd6 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -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/.
 
-zen-panel-ui-current-profile-text = hồ sơ hiện tại
+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 = 
     .label = Đặt lại thẻ đã ghim
@@ -14,7 +14,7 @@ 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 = 
-    .label = Thay thế đường dường dẫn đã gim với hiện tại
+    .label = Thay thế đường dường dẫn đã ghim 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.
 zen-shortcuts-corrupted = Tệp phím tắt { -brand-short-name } của bạn đã bị hư. Chúng đã được trẻ về phím tắt gốc.
@@ -42,8 +42,8 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods = 
     .label = Mods
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
-    .tooltiptext = Toggle Compact Mode
+    .label = Chế độ tối giản
+    .tooltiptext = Bật chế độ tối giản
 
 # note: Do not translate the "<br/>" tags in the following string
 
@@ -55,42 +55,42 @@ zen-icons-picker-emoji =
     .label = Biểu cảm
 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
-zen-generic-next = Next
+urlbar-search-mode-zen_actions = Hành động
+zen-site-data-settings = Thiết lập
+zen-generic-manage = Quản lý
+zen-generic-more = Thêm
+zen-generic-next = Tiếp
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-allow = Đã cho phép
+zen-site-data-setting-block = Đã chặn
+zen-site-data-protections-enabled = Đã tắt
+zen-site-data-protections-disabled = Đã bật
+zen-site-data-setting-cross-site = Cookie liên trang web
 zen-site-data-security-info-extension = 
-    .label = Extension
+    .label = Tiện ích mở rộng (Extensions)
 zen-site-data-security-info-secure = 
-    .label = Secure
+    .label = Đã bảo mật
 zen-site-data-security-info-not-secure = 
-    .label = Not Secure
+    .label = Chưa bảo mật
 zen-site-data-manage-addons = 
-    .label = Manage Extensions
+    .label = Quản lý tiện ích mở rộng (Extensions)
 zen-site-data-get-addons = 
-    .label = Add Extensions
+    .label = Thêm tiện ích mở rộng (Extensions)
 zen-site-data-site-settings = 
-    .label = All Site Settings
+    .label = Cài đặt tổng quan của trang web
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Chia sẻ trang
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Bật chế độ đọc
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Chụp màn hình
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Lưu (bookmark) trang này
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = Sao chép đường dẫn (URL)
+zen-site-data-setting-site-protection = Phòng chống theo dõi
 
 # 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 = Diện mạo mới cho add-ons, quyền truy cập và nhiều hơn nữa
+zen-site-data-panel-feature-callout-subtitle = Bấm vào biểu tượng để quản lý các thiết lập của trang web, kiểm tra thông tin bảo mật, quyền truy cập của các tiện ích và thực thiện các tác vụ cơ bản.
diff --git a/locales/vi/browser/browser/zen-vertical-tabs.ftl b/locales/vi/browser/browser/zen-vertical-tabs.ftl
index 879a1ad5c..86e9af51a 100644
--- a/locales/vi/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/vi/browser/browser/zen-vertical-tabs.ftl
@@ -18,7 +18,7 @@ zen-toolbar-context-compact-mode-hide-both =
     .label = Ẩn cả hai
     .accesskey = H
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = Thư mục mới
     .accesskey = N
 sidebar-zen-expand = 
     .label = Mở rộng thanh bên
@@ -33,7 +33,7 @@ tabbrowser-unload-tab-button =
 tabbrowser-reset-pin-button = 
     .tooltiptext =
         { $tabCount ->
-            [one] Tải lại và gim thẻ
-           *[other] Tải lại và gim { $tabCount } thẻ
+            [one] Tải lại và ghim thẻ
+           *[other] Tải lại và ghim { $tabCount } thẻ
         }
 tab-reset-pin-label = Quay trở lại đường dẫn đã ghim
diff --git a/locales/vi/browser/browser/zen-welcome.ftl b/locales/vi/browser/browser/zen-welcome.ftl
index 8cb2574c6..70a300267 100644
--- a/locales/vi/browser/browser/zen-welcome.ftl
+++ b/locales/vi/browser/browser/zen-welcome.ftl
@@ -14,13 +14,13 @@ zen-welcome-initial-essentials-title = Những thẻ quan trọng của bạn, l
 zen-welcome-initial-essentials-description-1 = Cho dù bạn có mở bao nhiêu, những thẻ quan trọng nhất của bạn luôn dễ dàng truy cập, luôn luôn trong tầm tay.
 zen-welcome-initial-essentials-description-2 = Thẻ thường trú sẽ luôn luôn ở đó, trên tất cả không gian làm việc của bạn.
 zen-welcome-workspace-colors-title = Không gian làm việc của bạn, màu sắc của bạn
-zen-welcome-workspace-colors-description = Cá nhân của trình duyệt của bạn, cho mỗi không gian làm việc một màu sắc đặc.
+zen-welcome-workspace-colors-description = Cá nhân hóa trình duyệt của bạn, cho mỗi không gian làm việc một màu sắc đặc trưng.
 zen-welcome-start-browsing-title =
     Sẵn sàng chưa?<br/>
     Bắt đầu thôi nào!
 zen-welcome-start-browsing-description-1 = Mọi thứ đã sẵn sàng. Nhấn nút bên dưới để bắt đầu lướt web với { -brand-short-name }.
 zen-welcome-start-browsing = Bắt đầu nào!
-zen-welcome-default-search-title = Your Default Search Engine
+zen-welcome-default-search-title = Công cụ tìm kiếm mặc định của bạn là?
 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-finished = Trình duyệt của bạn đã được thiết lập thành công!
diff --git a/locales/vi/browser/browser/zen-workspaces.ftl b/locales/vi/browser/browser/zen-workspaces.ftl
index 98cf11c50..4b66ddafb 100644
--- a/locales/vi/browser/browser/zen-workspaces.ftl
+++ b/locales/vi/browser/browser/zen-workspaces.ftl
@@ -8,7 +8,7 @@ zen-panel-ui-workspaces-create =
 zen-panel-ui-folder-create = 
     .label = Tạo thư mục thẻ
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Chia không gian
 zen-workspaces-panel-context-delete = 
     .label = Xóa không gian làm việc
     .accesskey = D
@@ -19,7 +19,7 @@ zen-workspaces-panel-change-icon =
 zen-workspaces-panel-context-default-profile = 
     .label = Cài đặt hồ sơ
 zen-workspaces-panel-unload = 
-    .label = Unload Space
+    .label = Tắt tất cả các trang web trong không gian làm việc
 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 = 
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Bạn có chắc là bạn muốn xóa { $name }? Thao tác này sẽ không được hoàn lại.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Thẻ đã đóng! Bấm <span>{ $shortcut }</span> để hoàn .
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Dọn sạch
+    .tooltiptext = Tắt tất cả các thẻ không ghim

From c2f9097983b7dda7698f4209354183b7444aae58 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 10 Nov 2025 17:07:32 +0100
Subject: [PATCH 067/162] chore: Disable sccache for windows builds, b=no-bug,
 c=configs

---
 configs/windows/mozconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 66a65ff7e..df0b0ef71 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -22,6 +22,10 @@ if test "$ZEN_CROSS_COMPILING"; then
   fi
 fi
 
+# We wrongly detect ccache on windows, which leads to build failures.
+# This line should be removed once the detection is fixed.
+ac_add_options --without-ccache
+
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 

From 47395bf3ce73eb564557eb5bb2e1c9f932a52634 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 11 Nov 2025 09:46:52 +0100
Subject: [PATCH 068/162] chore: New upstream fetch script, p=#11253,
 c=workflows, scripts

* chore: New upstream fetch script, b=no-bug, c=workflows, scripts

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 .github/workflows/check-candidate-release.yml |  2 +-
 .github/workflows/pr-test.yml                 |  7 +-
 .github/workflows/sync-upstream.yml           | 87 +++++++++++++++++++
 package.json                                  |  8 +-
 scripts/update_ff.py                          |  6 +-
 5 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/sync-upstream.yml

diff --git a/.github/workflows/check-candidate-release.yml b/.github/workflows/check-candidate-release.yml
index 57e8c0384..b8b9a7dd8 100644
--- a/.github/workflows/check-candidate-release.yml
+++ b/.github/workflows/check-candidate-release.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Check for any updates
         env:
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 8a956acd6..d0724d423 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -21,14 +21,11 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Install Surfer
-        run: npm i -g @zen-browser/surfer
-
       - name: Install dependencies
         run: npm ci
 
       - name: Download Firefox and dependencies
-        run: surfer download
+        run: npm run download
 
       - name: Import patches
-        run: surfer i
+        run: npm run import
diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
new file mode 100644
index 000000000..b548eb105
--- /dev/null
+++ b/.github/workflows/sync-upstream.yml
@@ -0,0 +1,87 @@
+name: Sync Upstream Firefox Releases
+
+on:
+  schedule:
+    - cron: '59 4 * * 2'
+  workflow_dispatch:
+    inputs:
+      release_candidate:
+        description: 'Set to true to sync release candidates'
+        required: false
+        default: 'false'
+
+permissions:
+  contents: write
+
+jobs:
+  check_candidates:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Sync Upstream Releases
+        run: |
+          if [ "${{ github.event.inputs.release_candidate }}" = "true" ]; then
+            npm run sync:rc
+          else
+            npm run sync
+          fi
+
+      - name: Check if any files changed
+        id: git-check
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "files_changed=true" >> $GITHUB_OUTPUT
+          else
+            echo "files_changed=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Get Firefox Version
+        id: build-data
+        if: steps.git-check.outputs.files_changed == 'true'
+        run: |
+          if [ "${{ github.event.inputs.release_candidate }}" = "true" ]; then
+            VERSION=$(node -pe "require('./surfer.json').version.candidate")
+          else
+            VERSION=$(node -pe "require('./surfer.json').version.version")
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Check if patches got applied
+        if: steps.git-check.outputs.files_changed == 'true'
+        id: check-patches
+        continue-on-error: true
+        run: |
+          echo "Checking if patches apply cleanly..."
+          npm run import
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v7
+        if: steps.git-check.outputs.files_changed == 'true'
+        env:
+          GIT_TRACE: 1
+          GIT_CURL_VERBOSE: 1
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
+          commit-message: 'chore: Sync upstream to `Firefox ${{ steps.build-data.outputs.version }}`'
+          branch: 'chore/sync-upstream-${{ steps.build-data.outputs.version }}'
+          title: 'Sync upstream Firefox to version ${{ steps.build-data.outputs.version }}'
+          body: |
+            This PR syncs the upstream Firefox to version ${{ steps.build-data.outputs.version }}.
+
+            * ${{ steps.check-patches.outcome == 'failure' && '⚠️ Some patches did not apply cleanly. Please review them carefully.' || '✅ All patches applied cleanly.' }}
+
+            @${{ github.actor }} please review and merge this PR.
+          base: dev
+          git-token: ${{ secrets.DEPLOY_KEY }}
+          delete-branch: true
diff --git a/package.json b/package.json
index f84997605..26985ff2e 100644
--- a/package.json
+++ b/package.json
@@ -16,10 +16,10 @@
     "download": "surfer download",
     "bootstrap": "surfer bootstrap",
     "package": "surfer package",
-    "update-ff": "python3 scripts/update_ff.py",
-    "update-ff:raw": "surfer update",
-    "update-ff:rc": "python3 scripts/update_ff.py --rc",
-    "update-ff:l10n": "python3 scripts/update_ff.py --just-l10n",
+    "sync": "python3 scripts/update_ff.py",
+    "sync:raw": "surfer update",
+    "sync:rc": "python3 scripts/update_ff.py --rc",
+    "sync:l10n": "python3 scripts/update_ff.py --just-l10n",
     "pretty": "prettier . --write --cache && autopep8 -r --in-place scripts/ src/",
     "lint": "npx eslint src/ && prettier . --check --cache",
     "lint:fix": "npm run pretty && npx eslint src/ --fix",
diff --git a/scripts/update_ff.py b/scripts/update_ff.py
index b97912790..305b1dcc2 100644
--- a/scripts/update_ff.py
+++ b/scripts/update_ff.py
@@ -29,12 +29,12 @@ def update_rc(last_version: str):
 
 
 def update_ff(is_rc: bool = False, last_version: str = ""):
-  """Runs the npm command to update the 'ff' component."""
+  """Runs the npm command to sync Firefox."""
   if is_rc:
     return update_rc(last_version)
-  result = os.system("npm run update-ff:raw")
+  result = os.system("npm run sync:raw")
   if result != 0:
-    raise RuntimeError("Failed to update 'ff' component.")
+    raise RuntimeError("Failed to sync Firefox.")
 
 
 def get_version_from_file(filename, is_rc):

From dbe3b346095d9812c1aae99a5ea8ff8af8e65476 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 11 Nov 2025 09:55:25 +0100
Subject: [PATCH 069/162] chore: Check for upstream updates after running rc
 checks, p=#11254

* chore: New upstream fetch script, b=no-bug, c=workflows, scripts

* chore: Check for upstream updates after running rc checks, b=no-bug, c=workflows

* chore: Lint, b=no-bug, c=workflows

* Fix typo in workflow name for patch check

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 .github/workflows/check-candidate-release.yml | 10 ++++++++++
 .github/workflows/sync-upstream.yml           | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check-candidate-release.yml b/.github/workflows/check-candidate-release.yml
index b8b9a7dd8..25ee939c9 100644
--- a/.github/workflows/check-candidate-release.yml
+++ b/.github/workflows/check-candidate-release.yml
@@ -22,3 +22,13 @@ jobs:
           DISCORD_PING_IDS: ${{ secrets.DISCORD_PING_IDS }}
         run: |
           python3 scripts/check_rc_response.py
+
+  sync-upstream:
+    name: Sync Upstream
+    uses: ./.github/workflows/sync-upstream.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [check_candidates]
+    with:
+      release_candidate: 'true'
diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
index b548eb105..6a08b46e2 100644
--- a/.github/workflows/sync-upstream.yml
+++ b/.github/workflows/sync-upstream.yml
@@ -1,8 +1,6 @@
 name: Sync Upstream Firefox Releases
 
 on:
-  schedule:
-    - cron: '59 4 * * 2'
   workflow_dispatch:
     inputs:
       release_candidate:
@@ -21,15 +19,27 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
 
+      - name: Check if upstream branch already exists
+        id: check-upstream-branch
+        run: |
+          if git ls-remote --heads origin chore/upstream-sync | grep -sw "refs/heads/chore/upstream-sync" > /dev/null; then
+            echo "branch_exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "branch_exists=false" >> $GITHUB_OUTPUT
+          fi
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
+        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         with:
           node-version-file: '.nvmrc'
 
       - name: Install dependencies
+        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: npm ci
 
       - name: Sync Upstream Releases
+        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: |
           if [ "${{ github.event.inputs.release_candidate }}" = "true" ]; then
             npm run sync:rc
@@ -74,7 +84,7 @@ jobs:
         with:
           token: ${{ secrets.DEPLOY_KEY }}
           commit-message: 'chore: Sync upstream to `Firefox ${{ steps.build-data.outputs.version }}`'
-          branch: 'chore/sync-upstream-${{ steps.build-data.outputs.version }}'
+          branch: 'chore/upstream-sync'
           title: 'Sync upstream Firefox to version ${{ steps.build-data.outputs.version }}'
           body: |
             This PR syncs the upstream Firefox to version ${{ steps.build-data.outputs.version }}.

From 2bed07f7c6287f92ef8276c578fb86fa437e0209 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Nov 2025 10:01:23 +0100
Subject: [PATCH 070/162] feat: Make sure to download and setup CI when
 checking upstream, b=no-bug, c=workflows

---
 .github/workflows/check-candidate-release.yml |  2 +-
 .github/workflows/sync-upstream.yml           | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-candidate-release.yml b/.github/workflows/check-candidate-release.yml
index 25ee939c9..5ea3d8f90 100644
--- a/.github/workflows/check-candidate-release.yml
+++ b/.github/workflows/check-candidate-release.yml
@@ -31,4 +31,4 @@ jobs:
     secrets: inherit
     needs: [check_candidates]
     with:
-      release_candidate: 'true'
+      release_candidate: true
diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
index 6a08b46e2..a16fe9dd4 100644
--- a/.github/workflows/sync-upstream.yml
+++ b/.github/workflows/sync-upstream.yml
@@ -6,13 +6,15 @@ on:
       release_candidate:
         description: 'Set to true to sync release candidates'
         required: false
-        default: 'false'
+        type: boolean
+        default: false
 
 permissions:
   contents: write
 
 jobs:
   check_candidates:
+    name: Sync Upstream
     runs-on: ubuntu-latest
 
     steps:
@@ -38,6 +40,17 @@ jobs:
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: npm ci
 
+      - name: Setup surfer CI
+        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
+        run: |
+          if [ "${{ github.event.inputs.release_candidate }}" = "false" ]; then
+            npm run surfer -- ci --brand release 
+          fi
+
+      - name: Download Firefox and dependencies
+        if: steps.check-upstream-branch.outputs.branch_exists == 'false'
+        run: npm run download
+
       - name: Sync Upstream Releases
         if: steps.check-upstream-branch.outputs.branch_exists == 'false'
         run: |

From fc804acdb0df405dee47cd277b2292eada65ff88 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Nov 2025 10:22:05 +0100
Subject: [PATCH 071/162] fix: Allow the sidebar to be hovered even when the
 pref is off, b=no-bug, c=common, compact-mode, glance, tabs, workspaces

---
 src/zen/common/ZenUIMigration.sys.mjs        |    6 +-
 src/zen/common/styles/zen-omnibox.css        |    2 +-
 src/zen/compact-mode/ZenCompactMode.mjs      | 1553 +++++++++---------
 src/zen/glance/actors/ZenGlanceChild.sys.mjs |    5 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css      |    2 +-
 src/zen/workspaces/ZenWorkspaces.mjs         |    2 +-
 6 files changed, 788 insertions(+), 782 deletions(-)

diff --git a/src/zen/common/ZenUIMigration.sys.mjs b/src/zen/common/ZenUIMigration.sys.mjs
index 7b7457012..b4f5f2d15 100644
--- a/src/zen/common/ZenUIMigration.sys.mjs
+++ b/src/zen/common/ZenUIMigration.sys.mjs
@@ -1,6 +1,6 @@
-// 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 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/. */
 
 import { AppConstants } from 'resource://gre/modules/AppConstants.sys.mjs';
 
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 24becb4bc..96c204d19 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -149,7 +149,7 @@
         visibility 0.15s;
     }
 
-    #navigator-toolbox[zen-has-hover='true'] &,
+    #navigator-toolbox[zen-has-implicit-hover='true'] &,
     &[open],
     #urlbar[has-popup-open='true'] &,
     #identity-box[pageproxystate='invalid'] & {
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 14ba11e0c..318a3b738 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -1,193 +1,202 @@
-// 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/.
-const lazyCompactMode = {};
+/* 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/. */
 
-XPCOMUtils.defineLazyPreferenceGetter(
-  lazyCompactMode,
-  'COMPACT_MODE_FLASH_DURATION',
-  'zen.view.compact.toolbar-flash-popup.duration',
-  800
-);
+{
+  const lazy = {};
 
-XPCOMUtils.defineLazyPreferenceGetter(
-  lazyCompactMode,
-  'COMPACT_MODE_FLASH_ENABLED',
-  'zen.view.compact.toolbar-flash-popup',
-  true
-);
+  XPCOMUtils.defineLazyPreferenceGetter(
+    lazy,
+    'COMPACT_MODE_FLASH_DURATION',
+    'zen.view.compact.toolbar-flash-popup.duration',
+    800
+  );
 
-XPCOMUtils.defineLazyPreferenceGetter(
-  lazyCompactMode,
-  'COMPACT_MODE_CAN_ANIMATE_SIDEBAR',
-  'zen.view.compact.animate-sidebar',
-  true
-);
+  XPCOMUtils.defineLazyPreferenceGetter(
+    lazy,
+    'COMPACT_MODE_FLASH_ENABLED',
+    'zen.view.compact.toolbar-flash-popup',
+    true
+  );
 
-ChromeUtils.defineLazyGetter(lazyCompactMode, 'mainAppWrapper', () =>
-  document.getElementById('zen-main-app-wrapper')
-);
+  XPCOMUtils.defineLazyPreferenceGetter(
+    lazy,
+    'COMPACT_MODE_CAN_ANIMATE_SIDEBAR',
+    'zen.view.compact.animate-sidebar',
+    true
+  );
 
-var gZenCompactModeManager = {
-  _flashTimeouts: {},
-  _eventListeners: [],
-  _removeHoverFrames: {},
+  XPCOMUtils.defineLazyPreferenceGetter(
+    lazy,
+    'COMPACT_MODE_SHOW_SIDEBAR_AND_TOOLBAR_ON_HOVER',
+    'zen.view.compact.show-sidebar-and-toolbar-on-hover',
+    true
+  );
 
-  // Delay to avoid flickering when hovering over the sidebar
-  HOVER_HACK_DELAY: Services.prefs.getIntPref('zen.view.compact.hover-hack-delay', 0),
+  ChromeUtils.defineLazyGetter(lazy, 'mainAppWrapper', () =>
+    document.getElementById('zen-main-app-wrapper')
+  );
 
-  preInit() {
-    this._wasInCompactMode = Services.prefs.getBoolPref(
-      'zen.view.compact.enable-at-startup',
-      false
-    );
-    this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);
+  window.gZenCompactModeManager = {
+    _flashTimeouts: {},
+    _eventListeners: [],
+    _removeHoverFrames: {},
 
-    this.addContextMenu();
-  },
+    // Delay to avoid flickering when hovering over the sidebar
+    HOVER_HACK_DELAY: Services.prefs.getIntPref('zen.view.compact.hover-hack-delay', 0),
 
-  init() {
-    this.addMouseActions();
+    preInit() {
+      this._wasInCompactMode = Services.prefs.getBoolPref(
+        'zen.view.compact.enable-at-startup',
+        false
+      );
+      this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);
 
-    const tabIsRightObserver = this._updateSidebarIsOnRight.bind(this);
-    Services.prefs.addObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
+      this.addContextMenu();
+    },
 
-    window.addEventListener(
-      'unload',
-      () => {
-        Services.prefs.removeObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
-      },
-      { once: true }
-    );
+    init() {
+      this.addMouseActions();
 
-    gZenUIManager.addPopupTrackingAttribute(this.sidebar);
-    gZenUIManager.addPopupTrackingAttribute(
-      document.getElementById('zen-appcontent-navbar-wrapper')
-    );
+      const tabIsRightObserver = this._updateSidebarIsOnRight.bind(this);
+      Services.prefs.addObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
 
-    this.addHasPolyfillObserver();
+      window.addEventListener(
+        'unload',
+        () => {
+          Services.prefs.removeObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
+        },
+        { once: true }
+      );
 
-    // Clear hover states when window state changes (minimize, maximize, etc.)
-    window.addEventListener('sizemodechange', () => this._clearAllHoverStates());
+      gZenUIManager.addPopupTrackingAttribute(this.sidebar);
+      gZenUIManager.addPopupTrackingAttribute(
+        document.getElementById('zen-appcontent-navbar-wrapper')
+      );
 
-    this._canShowBackgroundTabToast = Services.prefs.getBoolPref(
-      'zen.view.compact.show-background-tab-toast',
-      true
-    );
+      this.addHasPolyfillObserver();
 
-    if (AppConstants.platform == 'macosx') {
-      window.addEventListener('mouseover', (event) => {
-        const buttons = gZenVerticalTabsManager.actualWindowButtons;
-        if (event.target.closest('.titlebar-buttonbox-container') === buttons) return;
-        this._setElementExpandAttribute(buttons, false);
-      });
-    }
+      // Clear hover states when window state changes (minimize, maximize, etc.)
+      window.addEventListener('sizemodechange', () => this._clearAllHoverStates());
 
-    SessionStore.promiseAllWindowsRestored.then(() => {
-      this.preference = this._wasInCompactMode;
-    });
-  },
+      this._canShowBackgroundTabToast = Services.prefs.getBoolPref(
+        'zen.view.compact.show-background-tab-toast',
+        true
+      );
 
-  log(...args) {
-    if (this._canDebugLog) {
-      console.log('[Zen Compact Mode]', ...args);
-    }
-  },
-
-  get preference() {
-    return document.documentElement.getAttribute('zen-compact-mode') === 'true';
-  },
-
-  get shouldBeCompact() {
-    return !document.documentElement.getAttribute('chromehidden')?.includes('toolbar');
-  },
-
-  set preference(value) {
-    if (!this.shouldBeCompact) {
-      value = false;
-    }
-    this.log('Setting compact mode preference to', value);
-    if (
-      this.preference === value ||
-      document.documentElement.hasAttribute('zen-compact-animating')
-    ) {
-      if (typeof this._wasInCompactMode !== 'undefined') {
-        // We wont do anything with it anyway, so we remove it
-        delete this._wasInCompactMode;
+      if (AppConstants.platform == 'macosx') {
+        window.addEventListener('mouseover', (event) => {
+          const buttons = gZenVerticalTabsManager.actualWindowButtons;
+          if (event.target.closest('.titlebar-buttonbox-container') === buttons) return;
+          this._setElementExpandAttribute(buttons, false);
+        });
       }
-      delete this._ignoreNextHover;
-      // We dont want the user to be able to spam the button
-      return;
-    }
-    this.sidebar.removeAttribute('zen-user-show');
-    // We use this element in order to make it persis across restarts, by using the XULStore.
-    // main-window can't store attributes other than window sizes, so we use this instead
-    lazyCompactMode.mainAppWrapper.setAttribute('zen-compact-mode', value);
-    document.documentElement.setAttribute('zen-compact-mode', value);
-    if (typeof this._wasInCompactMode === 'undefined') {
-      Services.prefs.setBoolPref('zen.view.compact.enable-at-startup', value);
-    }
-    this._updateEvent();
-  },
 
-  get sidebarIsOnRight() {
-    if (typeof this._sidebarIsOnRight !== 'undefined') {
+      SessionStore.promiseAllWindowsRestored.then(() => {
+        this.preference = this._wasInCompactMode;
+      });
+    },
+
+    log(...args) {
+      if (this._canDebugLog) {
+        console.log('[Zen Compact Mode]', ...args);
+      }
+    },
+
+    get preference() {
+      return document.documentElement.getAttribute('zen-compact-mode') === 'true';
+    },
+
+    get shouldBeCompact() {
+      return !document.documentElement.getAttribute('chromehidden')?.includes('toolbar');
+    },
+
+    set preference(value) {
+      if (!this.shouldBeCompact) {
+        value = false;
+      }
+      this.log('Setting compact mode preference to', value);
+      if (
+        this.preference === value ||
+        document.documentElement.hasAttribute('zen-compact-animating')
+      ) {
+        if (typeof this._wasInCompactMode !== 'undefined') {
+          // 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;
+      }
+      this.sidebar.removeAttribute('zen-user-show');
+      // We use this element in order to make it persis across restarts, by using the XULStore.
+      // main-window can't store attributes other than window sizes, so we use this instead
+      lazy.mainAppWrapper.setAttribute('zen-compact-mode', value);
+      document.documentElement.setAttribute('zen-compact-mode', value);
+      if (typeof this._wasInCompactMode === 'undefined') {
+        Services.prefs.setBoolPref('zen.view.compact.enable-at-startup', value);
+      }
+      this._updateEvent();
+    },
+
+    get sidebarIsOnRight() {
+      if (typeof this._sidebarIsOnRight !== 'undefined') {
+        return this._sidebarIsOnRight;
+      }
+      this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
       return this._sidebarIsOnRight;
-    }
-    this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
-    return this._sidebarIsOnRight;
-  },
+    },
 
-  get sidebar() {
-    return gNavToolbox;
-  },
+    get sidebar() {
+      return gNavToolbox;
+    },
 
-  addHasPolyfillObserver() {
-    const attributes = ['panelopen', 'open', 'breakout-extend', 'zen-floating-urlbar'];
-    this.sidebarObserverId = ZenHasPolyfill.observeSelectorExistence(
-      this.sidebar,
-      [
-        {
-          selector:
-            ":is([panelopen='true'], [open='true'], [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)",
-        },
-      ],
-      'zen-compact-mode-active',
-      attributes
-    );
-    this.toolbarObserverId = ZenHasPolyfill.observeSelectorExistence(
-      document.getElementById('zen-appcontent-navbar-wrapper'),
-      [
-        {
-          selector:
-            ":is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(.zen-compact-mode-ignore)",
-        },
-      ],
-      'zen-compact-mode-active',
-      attributes
-    );
-    // Always connect this observer, we need it even if compact mode is disabled
-    ZenHasPolyfill.connectObserver(this.toolbarObserverId);
-  },
+    addHasPolyfillObserver() {
+      const attributes = ['panelopen', 'open', 'breakout-extend', 'zen-floating-urlbar'];
+      this.sidebarObserverId = ZenHasPolyfill.observeSelectorExistence(
+        this.sidebar,
+        [
+          {
+            selector:
+              ":is([panelopen='true'], [open='true'], [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)",
+          },
+        ],
+        'zen-compact-mode-active',
+        attributes
+      );
+      this.toolbarObserverId = ZenHasPolyfill.observeSelectorExistence(
+        document.getElementById('zen-appcontent-navbar-wrapper'),
+        [
+          {
+            selector:
+              ":is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(.zen-compact-mode-ignore)",
+          },
+        ],
+        'zen-compact-mode-active',
+        attributes
+      );
+      // Always connect this observer, we need it even if compact mode is disabled
+      ZenHasPolyfill.connectObserver(this.toolbarObserverId);
+    },
 
-  flashSidebarIfNecessary(aInstant = false) {
-    // This function is called after exiting DOM fullscreen mode,
-    // so we do a bit of a hack to re-calculate the URL height
-    if (aInstant) {
-      gZenVerticalTabsManager.recalculateURLBarHeight();
-    }
-    if (
-      !aInstant &&
-      this.preference &&
-      lazyCompactMode.COMPACT_MODE_FLASH_ENABLED &&
-      !gZenGlanceManager._animating
-    ) {
-      this.flashSidebar();
-    }
-  },
+    flashSidebarIfNecessary(aInstant = false) {
+      // This function is called after exiting DOM fullscreen mode,
+      // so we do a bit of a hack to re-calculate the URL height
+      if (aInstant) {
+        gZenVerticalTabsManager.recalculateURLBarHeight();
+      }
+      if (
+        !aInstant &&
+        this.preference &&
+        lazy.COMPACT_MODE_FLASH_ENABLED &&
+        !gZenGlanceManager._animating
+      ) {
+        this.flashSidebar();
+      }
+    },
 
-  addContextMenu() {
-    const fragment = window.MozXULElement.parseXULToFragment(`
+    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"/>
@@ -199,660 +208,660 @@ var gZenCompactModeManager = {
       </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),
-    };
+      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]);
+      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();
-  },
+      document.getElementById('viewToolbarsMenuSeparator').before(fragment);
+      this.updateContextMenu();
+    },
 
-  updateCompactModeContext(isSingleToolbar) {
-    const isIllegalState = this.checkIfIllegalState();
-    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);
-    }
-    const hideToolbarMenuItem = document.getElementById(
-      'zen-context-menu-compact-mode-hide-toolbar'
-    );
-    if (isIllegalState) {
-      hideToolbarMenuItem.setAttribute('disabled', 'true');
-    } else {
-      hideToolbarMenuItem.removeAttribute('disabled');
-    }
-  },
+    updateCompactModeContext(isSingleToolbar) {
+      const isIllegalState = this.checkIfIllegalState();
+      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);
+      }
+      const hideToolbarMenuItem = document.getElementById(
+        'zen-context-menu-compact-mode-hide-toolbar'
+      );
+      if (isIllegalState) {
+        hideToolbarMenuItem.setAttribute('disabled', 'true');
+      } else {
+        hideToolbarMenuItem.removeAttribute('disabled');
+      }
+    },
 
-  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();
-  },
-
-  /* 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
+    hideSidebar() {
       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());
-  },
-
-  addEventListener(callback) {
-    this._eventListeners.push(callback);
-  },
-
-  removeEventListener(callback) {
-    const index = this._eventListeners.indexOf(callback);
-    if (index !== -1) {
-      this._eventListeners.splice(index, 1);
-    }
-  },
-
-  async _updateEvent() {
-    const isUrlbarFocused = gURLBar.focused;
-    // IF we are animating IN, call the callbacks first so we can calculate the width
-    // once the window buttons are shown
-    this.updateContextMenu();
-    if (!this.preference) {
+    hideToolbar() {
+      Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
+      Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', false);
       this.callAllEventListeners();
-      await this.animateCompactMode();
-    } else {
-      await this.animateCompactMode();
-      this.callAllEventListeners();
-    }
-    gZenUIManager.updateTabsToolbar();
-    if (isUrlbarFocused) {
-      gURLBar.focus();
-    }
-    if (this.preference) {
-      ZenHasPolyfill.connectObserver(this.sidebarObserverId);
-    } else {
-      ZenHasPolyfill.disconnectObserver(this.sidebarObserverId);
-    }
-    window.dispatchEvent(new CustomEvent('ZenCompactMode:Toggled', { detail: this.preference }));
-  },
+    },
 
-  // NOTE: Dont actually use event, it's just so we make sure
-  // the caller is from the ResizeObserver
-  getAndApplySidebarWidth(event = undefined) {
-    if (this._ignoreNextResize) {
-      delete this._ignoreNextResize;
-      return;
-    }
-    let sidebarWidth = this.sidebar.getBoundingClientRect().width;
-    const shouldRecalculate =
-      this.preference || document.documentElement.hasAttribute('zen-creating-workspace');
-    const sidebarExpanded = document.documentElement.hasAttribute('zen-sidebar-expanded');
-    if (sidebarWidth > 1) {
-      if (shouldRecalculate && sidebarExpanded) {
-        sidebarWidth = Math.max(sidebarWidth, 150);
+    hideBoth() {
+      Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
+      Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
+      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;
       }
-      // Second variable to get the genuine width of the sidebar
-      this.sidebar.style.setProperty('--actual-zen-sidebar-width', `${sidebarWidth}px`);
-      window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
-      if (
-        event &&
-        shouldRecalculate &&
-        sidebarExpanded &&
-        !gZenVerticalTabsManager._hadSidebarCollapse
-      ) {
+      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());
+    },
+
+    addEventListener(callback) {
+      this._eventListeners.push(callback);
+    },
+
+    removeEventListener(callback) {
+      const index = this._eventListeners.indexOf(callback);
+      if (index !== -1) {
+        this._eventListeners.splice(index, 1);
+      }
+    },
+
+    async _updateEvent() {
+      const isUrlbarFocused = gURLBar.focused;
+      // IF we are animating IN, call the callbacks first so we can calculate the width
+      // once the window buttons are shown
+      this.updateContextMenu();
+      if (!this.preference) {
+        this.callAllEventListeners();
+        await this.animateCompactMode();
+      } else {
+        await this.animateCompactMode();
+        this.callAllEventListeners();
+      }
+      gZenUIManager.updateTabsToolbar();
+      if (isUrlbarFocused) {
+        gURLBar.focus();
+      }
+      if (this.preference) {
+        ZenHasPolyfill.connectObserver(this.sidebarObserverId);
+      } else {
+        ZenHasPolyfill.disconnectObserver(this.sidebarObserverId);
+      }
+      window.dispatchEvent(new CustomEvent('ZenCompactMode:Toggled', { detail: this.preference }));
+    },
+
+    // NOTE: Dont actually use event, it's just so we make sure
+    // the caller is from the ResizeObserver
+    getAndApplySidebarWidth(event = undefined) {
+      if (this._ignoreNextResize) {
+        delete this._ignoreNextResize;
         return;
       }
-      delete gZenVerticalTabsManager._hadSidebarCollapse;
-      this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
-    }
-    return sidebarWidth;
-  },
-
-  get canHideSidebar() {
-    return (
-      Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
-      gZenVerticalTabsManager._hasSetSingleToolbar
-    );
-  },
-
-  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');
-    return new Promise((resolve) => {
-      // We need to set the splitter width before hiding it
-      let splitterWidth = document
-        .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') {
-        canAnimate = false;
-        delete this._wasInCompactMode;
-      }
-      // Do this so we can get the correct width ONCE compact mode styled have been applied
-      if (canAnimate) {
-        this.sidebar.setAttribute('animate', 'true');
-      }
-      if (this._ignoreNextHover) {
-        this._setElementExpandAttribute(this.sidebar, false);
-      }
-      this.sidebar.style.removeProperty('margin-right');
-      this.sidebar.style.removeProperty('margin-left');
-      this.sidebar.style.removeProperty('transform');
-      window.requestAnimationFrame(() => {
-        delete this._ignoreNextResize;
-        let sidebarWidth = this.getAndApplySidebarWidth();
-        const elementSeparation = ZenThemeModifier.elementSeparation;
-        if (!canAnimate) {
-          this.sidebar.removeAttribute('animate');
-          document.documentElement.removeAttribute('zen-compact-animating');
-
-          this.getAndApplySidebarWidth({});
-          this._ignoreNextResize = true;
-
-          delete this._ignoreNextHover;
-
-          resolve();
+      let sidebarWidth = this.sidebar.getBoundingClientRect().width;
+      const shouldRecalculate =
+        this.preference || document.documentElement.hasAttribute('zen-creating-workspace');
+      const sidebarExpanded = document.documentElement.hasAttribute('zen-sidebar-expanded');
+      if (sidebarWidth > 1) {
+        if (shouldRecalculate && sidebarExpanded) {
+          sidebarWidth = Math.max(sidebarWidth, 150);
+        }
+        // Second variable to get the genuine width of the sidebar
+        this.sidebar.style.setProperty('--actual-zen-sidebar-width', `${sidebarWidth}px`);
+        window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
+        if (
+          event &&
+          shouldRecalculate &&
+          sidebarExpanded &&
+          !gZenVerticalTabsManager._hadSidebarCollapse
+        ) {
           return;
         }
-        if (canHideSidebar && isCompactMode) {
-          if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
-            sidebarWidth -= 0.5 * splitterWidth;
-            if (elementSeparation < splitterWidth) {
-              // Subtract from the splitter width to end up with the correct element separation
-              sidebarWidth += 1.5 * splitterWidth - elementSeparation;
-            }
-          } else {
-            sidebarWidth -= elementSeparation;
-          }
-          this._setElementExpandAttribute(this.sidebar, false);
-          gZenUIManager.motion
-            .animate(
-              this.sidebar,
-              {
-                marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
-                marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
-              },
-              {
-                ease: 'easeIn',
-                type: 'spring',
-                bounce: 0,
-                duration: 0.12,
-              }
-            )
-            .then(() => {
-              this.sidebar.style.transition = 'none';
-              this.sidebar.style.pointEvents = 'none';
-              const titlebar = document.getElementById('titlebar');
-              titlebar.style.visibility = 'hidden';
-              titlebar.style.transition = 'none';
-              this.sidebar.removeAttribute('animate');
-              document.documentElement.removeAttribute('zen-compact-animating');
+        delete gZenVerticalTabsManager._hadSidebarCollapse;
+        this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
+      }
+      return sidebarWidth;
+    },
 
-              setTimeout(() => {
-                this.getAndApplySidebarWidth({});
-                this._ignoreNextResize = true;
+    get canHideSidebar() {
+      return (
+        Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
+        gZenVerticalTabsManager._hasSetSingleToolbar
+      );
+    },
+
+    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');
+      return new Promise((resolve) => {
+        // We need to set the splitter width before hiding it
+        let splitterWidth = document
+          .getElementById('zen-sidebar-splitter')
+          .getBoundingClientRect().width;
+        const isCompactMode = this.preference;
+        const canHideSidebar = this.canHideSidebar;
+        let canAnimate = lazy.COMPACT_MODE_CAN_ANIMATE_SIDEBAR && !this.isSidebarPotentiallyOpen();
+        if (typeof this._wasInCompactMode !== 'undefined') {
+          canAnimate = false;
+          delete this._wasInCompactMode;
+        }
+        // Do this so we can get the correct width ONCE compact mode styled have been applied
+        if (canAnimate) {
+          this.sidebar.setAttribute('animate', 'true');
+        }
+        if (this._ignoreNextHover) {
+          this._setElementExpandAttribute(this.sidebar, false);
+        }
+        this.sidebar.style.removeProperty('margin-right');
+        this.sidebar.style.removeProperty('margin-left');
+        this.sidebar.style.removeProperty('transform');
+        window.requestAnimationFrame(() => {
+          delete this._ignoreNextResize;
+          let sidebarWidth = this.getAndApplySidebarWidth();
+          const elementSeparation = ZenThemeModifier.elementSeparation;
+          if (!canAnimate) {
+            this.sidebar.removeAttribute('animate');
+            document.documentElement.removeAttribute('zen-compact-animating');
+
+            this.getAndApplySidebarWidth({});
+            this._ignoreNextResize = true;
+
+            delete this._ignoreNextHover;
+
+            resolve();
+            return;
+          }
+          if (canHideSidebar && isCompactMode) {
+            if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
+              sidebarWidth -= 0.5 * splitterWidth;
+              if (elementSeparation < splitterWidth) {
+                // Subtract from the splitter width to end up with the correct element separation
+                sidebarWidth += 1.5 * splitterWidth - elementSeparation;
+              }
+            } else {
+              sidebarWidth -= elementSeparation;
+            }
+            this._setElementExpandAttribute(this.sidebar, false);
+            gZenUIManager.motion
+              .animate(
+                this.sidebar,
+                {
+                  marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
+                  marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
+                },
+                {
+                  ease: 'easeIn',
+                  type: 'spring',
+                  bounce: 0,
+                  duration: 0.12,
+                }
+              )
+              .then(() => {
+                this.sidebar.style.transition = 'none';
+                this.sidebar.style.pointEvents = 'none';
+                const titlebar = document.getElementById('titlebar');
+                titlebar.style.visibility = 'hidden';
+                titlebar.style.transition = 'none';
+                this.sidebar.removeAttribute('animate');
+                document.documentElement.removeAttribute('zen-compact-animating');
 
                 setTimeout(() => {
-                  if (this._ignoreNextHover) {
-                    setTimeout(() => {
-                      delete this._ignoreNextHover;
-                    });
-                  }
+                  this.getAndApplySidebarWidth({});
+                  this._ignoreNextResize = true;
 
-                  this.sidebar.style.removeProperty('margin-right');
-                  this.sidebar.style.removeProperty('margin-left');
+                  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');
+                    this.sidebar.style.removeProperty('transform');
+                    this.sidebar.style.removeProperty('point-events');
+
+                    titlebar.style.removeProperty('visibility');
+                    titlebar.style.removeProperty('transition');
+
+                    gURLBar.textbox.style.removeProperty('visibility');
+
+                    resolve();
+                  });
+                });
+              });
+          } 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`;
+            } else {
+              this.sidebar.style.marginLeft = `-${sidebarWidth}px`;
+            }
+            gZenUIManager.motion
+              .animate(
+                this.sidebar,
+                this.sidebarIsOnRight
+                  ? {
+                      marginRight: [`-${sidebarWidth}px`, 0],
+                      transform: ['translateX(100%)', 'translateX(0)'],
+                    }
+                  : { marginLeft: 0 },
+                {
+                  ease: 'easeOut',
+                  type: 'spring',
+                  bounce: 0,
+                  duration: 0.12,
+                }
+              )
+              .then(() => {
+                this.sidebar.removeAttribute('animate');
+                document.getElementById('browser').style.removeProperty('overflow');
+                this.sidebar.style.transition = 'none';
+                this.sidebar.style.removeProperty('margin-right');
+                this.sidebar.style.removeProperty('margin-left');
+                this.sidebar.style.removeProperty('transform');
+                document.documentElement.removeAttribute('zen-compact-animating');
+                setTimeout(() => {
                   this.sidebar.style.removeProperty('transition');
-                  this.sidebar.style.removeProperty('transform');
-                  this.sidebar.style.removeProperty('point-events');
-
-                  titlebar.style.removeProperty('visibility');
-                  titlebar.style.removeProperty('transition');
-
-                  gURLBar.textbox.style.removeProperty('visibility');
-
                   resolve();
                 });
               });
-            });
-        } 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`;
           } else {
-            this.sidebar.style.marginLeft = `-${sidebarWidth}px`;
+            this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
+            document.documentElement.removeAttribute('zen-compact-animating');
+            delete this._ignoreNextHover;
+            resolve();
           }
-          gZenUIManager.motion
-            .animate(
-              this.sidebar,
-              this.sidebarIsOnRight
-                ? {
-                    marginRight: [`-${sidebarWidth}px`, 0],
-                    transform: ['translateX(100%)', 'translateX(0)'],
-                  }
-                : { marginLeft: 0 },
-              {
-                ease: 'easeOut',
-                type: 'spring',
-                bounce: 0,
-                duration: 0.12,
-              }
-            )
-            .then(() => {
-              this.sidebar.removeAttribute('animate');
-              document.getElementById('browser').style.removeProperty('overflow');
-              this.sidebar.style.transition = 'none';
-              this.sidebar.style.removeProperty('margin-right');
-              this.sidebar.style.removeProperty('margin-left');
-              this.sidebar.style.removeProperty('transform');
-              document.documentElement.removeAttribute('zen-compact-animating');
-              setTimeout(() => {
-                this.sidebar.style.removeProperty('transition');
-                resolve();
-              });
-            });
-        } else {
-          this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
-          document.documentElement.removeAttribute('zen-compact-animating');
-          delete this._ignoreNextHover;
-          resolve();
+        });
+      });
+    },
+
+    updateContextMenu() {
+      document
+        .getElementById('zen-context-menu-compact-mode-toggle')
+        .setAttribute('checked', this.preference);
+
+      const hideTabBar = this.canHideSidebar;
+      const hideToolbar = this.canHideToolbar;
+      const hideBoth = hideTabBar && hideToolbar;
+
+      const idName = 'zen-context-menu-compact-mode-hide-';
+      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() {
+      // Fix for bug https://github.com/zen-browser/desktop/issues/1925
+      const buttons = document.querySelectorAll(
+        'toolbarbutton:is(#unified-extensions-button, .webextension-browser-action)'
+      );
+      for (let button of buttons) {
+        button.removeAttribute('open');
+      }
+    },
+
+    toggle(ignoreHover = false) {
+      // Only ignore the next hover when we are enabling compact mode
+      this._ignoreNextHover = ignoreHover && !this.preference;
+      return (this.preference = !this.preference);
+    },
+
+    _updateSidebarIsOnRight() {
+      this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
+    },
+
+    toggleSidebar() {
+      this.sidebar.toggleAttribute('zen-user-show');
+    },
+
+    get hideAfterHoverDuration() {
+      if (this._hideAfterHoverDuration) {
+        return this._hideAfterHoverDuration;
+      }
+      return Services.prefs.getIntPref('zen.view.compact.toolbar-hide-after-hover.duration');
+    },
+
+    get hoverableElements() {
+      return [
+        {
+          element: this.sidebar,
+          screenEdge: this.sidebarIsOnRight ? 'right' : 'left',
+          keepHoverDuration: 100,
+        },
+        {
+          element: document.getElementById('zen-appcontent-navbar-wrapper'),
+          screenEdge: 'top',
+        },
+        {
+          element: gZenVerticalTabsManager.actualWindowButtons,
+        },
+      ];
+    },
+
+    flashSidebar(duration = lazy.COMPACT_MODE_FLASH_DURATION) {
+      let tabPanels = document.getElementById('tabbrowser-tabpanels');
+      if (!tabPanels.matches("[zen-split-view='true']")) {
+        this.flashElement(this.sidebar, duration, this.sidebar.id);
+      }
+    },
+
+    flashElement(element, duration, id, attrName = 'flash-popup') {
+      if (this._flashTimeouts[id]) {
+        clearTimeout(this._flashTimeouts[id]);
+      } else {
+        requestAnimationFrame(() => this._setElementExpandAttribute(element, true, attrName));
+      }
+      this._flashTimeouts[id] = setTimeout(() => {
+        window.requestAnimationFrame(() => {
+          this._setElementExpandAttribute(element, false, attrName);
+          this._flashTimeouts[id] = null;
+        });
+      }, duration);
+    },
+
+    clearFlashTimeout(id) {
+      clearTimeout(this._flashTimeouts[id]);
+      this._flashTimeouts[id] = null;
+    },
+
+    _setElementExpandAttribute(element, value, attr = 'zen-has-hover') {
+      const kVerifiedAttributes = ['zen-has-hover', 'has-popup-menu', 'zen-compact-mode-active'];
+      const isToolbar = element.id === 'zen-appcontent-navbar-wrapper';
+      if (value) {
+        if (attr === 'zen-has-hover' && element !== gZenVerticalTabsManager.actualWindowButtons) {
+          element.setAttribute('zen-has-implicit-hover', 'true');
+          if (!lazy.COMPACT_MODE_SHOW_SIDEBAR_AND_TOOLBAR_ON_HOVER) {
+            return;
+          }
+        }
+        element.setAttribute(attr, 'true');
+        if (
+          isToolbar &&
+          ((gZenVerticalTabsManager._hasSetSingleToolbar &&
+            (element.hasAttribute('should-hide') ||
+              document.documentElement.hasAttribute('zen-has-bookmarks'))) ||
+            (this.preference &&
+              Services.prefs.getBoolPref('zen.view.compact.hide-toolbar') &&
+              !gZenVerticalTabsManager._hasSetSingleToolbar))
+        ) {
+          gBrowser.tabpanels.setAttribute('has-toolbar-hovered', 'true');
+        }
+      } else {
+        if (attr === 'zen-has-hover') {
+          element.removeAttribute('zen-has-implicit-hover');
+        }
+        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._setElementExpandAttribute(gZenVerticalTabsManager.actualWindowButtons, false);
+          });
+          this._hasHoveredUrlbar = true;
+          return;
         }
       });
-    });
-  },
 
-  updateContextMenu() {
-    document
-      .getElementById('zen-context-menu-compact-mode-toggle')
-      .setAttribute('checked', this.preference);
+      for (let i = 0; i < this.hoverableElements.length; i++) {
+        let target = this.hoverableElements[i].element;
 
-    const hideTabBar = this.canHideSidebar;
-    const hideToolbar = this.canHideToolbar;
-    const hideBoth = hideTabBar && hideToolbar;
+        // Add the attribute on startup if the mouse is already over the element
+        if (target.matches(':hover')) {
+          this._setElementExpandAttribute(target, true);
+        }
 
-    const idName = 'zen-context-menu-compact-mode-hide-';
-    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);
-  },
+        const onEnter = (event) => {
+          setTimeout(() => {
+            if (event.type === 'mouseenter' && !event.target.matches(':hover')) return;
+            if (event.target.closest('panel')) return;
+            // Dont register the hover if the urlbar is floating and we are hovering over it
+            this.clearFlashTimeout('has-hover' + target.id);
+            window.requestAnimationFrame(() => {
+              if (
+                document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
+                this._hasHoveredUrlbar ||
+                this._ignoreNextHover ||
+                target.hasAttribute('zen-has-hover')
+              ) {
+                return;
+              }
+              this._setElementExpandAttribute(target, true);
+            });
+          }, this.HOVER_HACK_DELAY);
+        };
 
-  _removeOpenStateOnUnifiedExtensions() {
-    // Fix for bug https://github.com/zen-browser/desktop/issues/1925
-    const buttons = document.querySelectorAll(
-      'toolbarbutton:is(#unified-extensions-button, .webextension-browser-action)'
-    );
-    for (let button of buttons) {
-      button.removeAttribute('open');
-    }
-  },
-
-  toggle(ignoreHover = false) {
-    // Only ignore the next hover when we are enabling compact mode
-    this._ignoreNextHover = ignoreHover && !this.preference;
-    return (this.preference = !this.preference);
-  },
-
-  _updateSidebarIsOnRight() {
-    this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
-  },
-
-  toggleSidebar() {
-    this.sidebar.toggleAttribute('zen-user-show');
-  },
-
-  get hideAfterHoverDuration() {
-    if (this._hideAfterHoverDuration) {
-      return this._hideAfterHoverDuration;
-    }
-    return Services.prefs.getIntPref('zen.view.compact.toolbar-hide-after-hover.duration');
-  },
-
-  get hoverableElements() {
-    if (typeof this._showSidebarAndToolbarOnHover === 'undefined') {
-      this._showSidebarAndToolbarOnHover = Services.prefs.getBoolPref(
-        'zen.view.compact.show-sidebar-and-toolbar-on-hover',
-        true
-      );
-    }
-    return [
-      ...(!this._showSidebarAndToolbarOnHover
-        ? []
-        : [
-            {
-              element: this.sidebar,
-              screenEdge: this.sidebarIsOnRight ? 'right' : 'left',
-              keepHoverDuration: 100,
-            },
-            {
-              element: document.getElementById('zen-appcontent-navbar-wrapper'),
-              screenEdge: 'top',
-            },
-          ]),
-      {
-        element: gZenVerticalTabsManager.actualWindowButtons,
-      },
-    ];
-  },
-
-  flashSidebar(duration = lazyCompactMode.COMPACT_MODE_FLASH_DURATION) {
-    let tabPanels = document.getElementById('tabbrowser-tabpanels');
-    if (!tabPanels.matches("[zen-split-view='true']")) {
-      this.flashElement(this.sidebar, duration, this.sidebar.id);
-    }
-  },
-
-  flashElement(element, duration, id, attrName = 'flash-popup') {
-    if (this._flashTimeouts[id]) {
-      clearTimeout(this._flashTimeouts[id]);
-    } else {
-      requestAnimationFrame(() => this._setElementExpandAttribute(element, true, attrName));
-    }
-    this._flashTimeouts[id] = setTimeout(() => {
-      window.requestAnimationFrame(() => {
-        this._setElementExpandAttribute(element, false, attrName);
-        this._flashTimeouts[id] = null;
-      });
-    }, duration);
-  },
-
-  clearFlashTimeout(id) {
-    clearTimeout(this._flashTimeouts[id]);
-    this._flashTimeouts[id] = null;
-  },
-
-  _setElementExpandAttribute(element, value, attr = 'zen-has-hover') {
-    const kVerifiedAttributes = ['zen-has-hover', 'has-popup-menu', 'zen-compact-mode-active'];
-    const isToolbar = element.id === 'zen-appcontent-navbar-wrapper';
-    if (value) {
-      element.setAttribute(attr, 'true');
-      if (
-        isToolbar &&
-        ((gZenVerticalTabsManager._hasSetSingleToolbar &&
-          (element.hasAttribute('should-hide') ||
-            document.documentElement.hasAttribute('zen-has-bookmarks'))) ||
-          (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._setElementExpandAttribute(gZenVerticalTabsManager.actualWindowButtons, false);
-        });
-        this._hasHoveredUrlbar = true;
-        return;
-      }
-    });
-
-    for (let i = 0; i < this.hoverableElements.length; i++) {
-      let target = this.hoverableElements[i].element;
-
-      // Add the attribute on startup if the mouse is already over the element
-      if (target.matches(':hover')) {
-        this._setElementExpandAttribute(target, true);
-      }
-
-      const onEnter = (event) => {
-        setTimeout(() => {
-          if (event.type === 'mouseenter' && !event.target.matches(':hover')) return;
-          if (event.target.closest('panel')) return;
-          // Dont register the hover if the urlbar is floating and we are hovering over it
-          this.clearFlashTimeout('has-hover' + target.id);
-          window.requestAnimationFrame(() => {
+        const onLeave = (event) => {
+          if (AppConstants.platform == 'macosx') {
+            const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
+            const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
+            const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
             if (
-              document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
-              this._hasHoveredUrlbar ||
-              this._ignoreNextHover ||
-              target.hasAttribute('zen-has-hover')
+              event.clientX < MAC_WINDOW_BUTTONS_X_BORDER &&
+              event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER &&
+              event.clientX > buttonRect.x &&
+              event.clientY > buttonRect.y
             ) {
               return;
             }
-            this._setElementExpandAttribute(target, true);
-          });
-        }, this.HOVER_HACK_DELAY);
-      };
-
-      const onLeave = (event) => {
-        if (AppConstants.platform == 'macosx') {
-          const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
-          const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
-          const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
-          if (
-            event.clientX < MAC_WINDOW_BUTTONS_X_BORDER &&
-            event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER &&
-            event.clientX > buttonRect.x &&
-            event.clientY > buttonRect.y
-          ) {
-            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.
+          // 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.
+          setTimeout(() => {
+            // Let's double check if the mouse is still hovering over the element, see the bug above.
+            if (event.target.matches(':hover')) {
+              return;
+            }
+
+            if (
+              event.explicitOriginalTarget?.closest?.('#urlbar[zen-floating-urlbar]') ||
+              (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' &&
+                gZenVerticalTabsManager._hasSetSingleToolbar) ||
+              this._hasHoveredUrlbar ||
+              this._ignoreNextHover ||
+              (event.type === 'dragleave' &&
+                event.explicitOriginalTarget !== target &&
+                target.contains?.(event.explicitOriginalTarget))
+            ) {
+              return;
+            }
+
+            if (this.hoverableElements[i].keepHoverDuration) {
+              this.flashElement(
+                target,
+                this.hoverableElements[i].keepHoverDuration,
+                'has-hover' + target.id,
+                'zen-has-hover'
+              );
+            } else {
+              this._removeHoverFrames[target.id] = window.requestAnimationFrame(() =>
+                this._setElementExpandAttribute(target, false)
+              );
+            }
+          }, this.HOVER_HACK_DELAY);
+        };
+
+        target.addEventListener('mouseover', onEnter);
+        target.addEventListener('dragover', onEnter);
+
+        target.addEventListener('mouseleave', onLeave);
+        target.addEventListener('dragleave', onLeave);
+      }
+
+      document.documentElement.addEventListener('mouseleave', (event) => {
         setTimeout(() => {
-          // Let's double check if the mouse is still hovering over the element, see the bug above.
-          if (event.target.matches(':hover')) {
-            return;
-          }
+          const screenEdgeCrossed = this._getCrossedEdge(event.pageX, event.pageY);
+          if (!screenEdgeCrossed) return;
+          for (let entry of this.hoverableElements) {
+            if (screenEdgeCrossed !== entry.screenEdge) continue;
+            const target = entry.element;
+            const boundAxis =
+              entry.screenEdge === 'right' || entry.screenEdge === 'left' ? 'y' : 'x';
+            if (!this._positionInBounds(boundAxis, target, event.pageX, event.pageY, 7)) {
+              continue;
+            }
+            window.cancelAnimationFrame(this._removeHoverFrames[target.id]);
 
-          if (
-            event.explicitOriginalTarget?.closest?.('#urlbar[zen-floating-urlbar]') ||
-            (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' &&
-              gZenVerticalTabsManager._hasSetSingleToolbar) ||
-            this._hasHoveredUrlbar ||
-            this._ignoreNextHover ||
-            (event.type === 'dragleave' &&
-              event.explicitOriginalTarget !== target &&
-              target.contains?.(event.explicitOriginalTarget))
-          ) {
-            return;
-          }
-
-          if (this.hoverableElements[i].keepHoverDuration) {
             this.flashElement(
               target,
-              this.hoverableElements[i].keepHoverDuration,
+              this.hideAfterHoverDuration,
               'has-hover' + target.id,
               'zen-has-hover'
             );
-          } else {
-            this._removeHoverFrames[target.id] = window.requestAnimationFrame(() =>
-              this._setElementExpandAttribute(target, false)
+            document.addEventListener(
+              'mousemove',
+              () => {
+                if (target.matches(':hover')) return;
+                this._setElementExpandAttribute(target, false);
+                this.clearFlashTimeout('has-hover' + target.id);
+              },
+              { once: true }
             );
           }
         }, this.HOVER_HACK_DELAY);
-      };
-
-      target.addEventListener('mouseover', onEnter);
-      target.addEventListener('dragover', onEnter);
-
-      target.addEventListener('mouseleave', onLeave);
-      target.addEventListener('dragleave', onLeave);
-    }
-
-    document.documentElement.addEventListener('mouseleave', (event) => {
-      setTimeout(() => {
-        const screenEdgeCrossed = this._getCrossedEdge(event.pageX, event.pageY);
-        if (!screenEdgeCrossed) return;
-        for (let entry of this.hoverableElements) {
-          if (screenEdgeCrossed !== entry.screenEdge) continue;
-          const target = entry.element;
-          const boundAxis = entry.screenEdge === 'right' || entry.screenEdge === 'left' ? 'y' : 'x';
-          if (!this._positionInBounds(boundAxis, target, event.pageX, event.pageY, 7)) {
-            continue;
-          }
-          window.cancelAnimationFrame(this._removeHoverFrames[target.id]);
-
-          this.flashElement(
-            target,
-            this.hideAfterHoverDuration,
-            'has-hover' + target.id,
-            'zen-has-hover'
-          );
-          document.addEventListener(
-            'mousemove',
-            () => {
-              if (target.matches(':hover')) return;
-              this._setElementExpandAttribute(target, false);
-              this.clearFlashTimeout('has-hover' + target.id);
-            },
-            { once: true }
-          );
-        }
-      }, this.HOVER_HACK_DELAY);
-    });
-
-    gURLBar.textbox.addEventListener('mouseleave', () => {
-      setTimeout(() => {
-        setTimeout(() => {
-          requestAnimationFrame(() => {
-            delete this._hasHoveredUrlbar;
-          });
-        }, 10);
-      }, 0);
-    });
-  },
-
-  _getCrossedEdge(posX, posY, element = document.documentElement, maxDistance = 10) {
-    const targetBox = element.getBoundingClientRect();
-    posX = Math.max(targetBox.left, Math.min(posX, targetBox.right));
-    posY = Math.max(targetBox.top, Math.min(posY, targetBox.bottom));
-    return ['top', 'bottom', 'left', 'right'].find((edge, i) => {
-      const distance = Math.abs((i < 2 ? posY : posX) - targetBox[edge]);
-      return distance <= maxDistance;
-    });
-  },
-
-  _positionInBounds(axis = 'x', element, x, y, error = 0) {
-    const bBox = element.getBoundingClientRect();
-    if (axis === 'y') return bBox.top - error < y && y < bBox.bottom + error;
-    else return bBox.left - error < x && x < bBox.right + error;
-  },
-
-  _clearAllHoverStates() {
-    // Clear hover attributes from all hoverable elements
-    for (let entry of this.hoverableElements) {
-      const target = entry.element;
-      if (target && !target.matches(':hover') && target.hasAttribute('zen-has-hover')) {
-        this._setElementExpandAttribute(target, false);
-        this.clearFlashTimeout('has-hover' + target.id);
-      }
-    }
-  },
-
-  isSidebarPotentiallyOpen() {
-    if (this._ignoreNextHover) {
-      this._setElementExpandAttribute(this.sidebar, false);
-    }
-    return (
-      this.sidebar.hasAttribute('zen-user-show') ||
-      this.sidebar.hasAttribute('zen-has-hover') ||
-      this.sidebar.hasAttribute('zen-has-empty-tab')
-    );
-  },
-
-  async _onTabOpen(tab, inBackground) {
-    if (
-      inBackground &&
-      this.preference &&
-      !this.isSidebarPotentiallyOpen() &&
-      this._canShowBackgroundTabToast &&
-      !gZenGlanceManager._animating &&
-      !this._nextTimeWillBeActive
-    ) {
-      gZenUIManager.showToast('zen-background-tab-opened-toast', {
-        button: {
-          id: 'zen-open-background-tab-button',
-          command: () => {
-            const targetWindow = window.ownerGlobal.parent || window;
-            targetWindow.gBrowser.selectedTab = tab;
-          },
-        },
       });
-    }
-    delete this._nextTimeWillBeActive;
-  },
-};
 
-document.addEventListener(
-  'MozBeforeInitialXULLayout',
-  () => {
-    gZenCompactModeManager.preInit();
-  },
-  { once: true }
-);
+      gURLBar.textbox.addEventListener('mouseleave', () => {
+        setTimeout(() => {
+          setTimeout(() => {
+            requestAnimationFrame(() => {
+              delete this._hasHoveredUrlbar;
+            });
+          }, 10);
+        }, 0);
+      });
+    },
+
+    _getCrossedEdge(posX, posY, element = document.documentElement, maxDistance = 10) {
+      const targetBox = element.getBoundingClientRect();
+      posX = Math.max(targetBox.left, Math.min(posX, targetBox.right));
+      posY = Math.max(targetBox.top, Math.min(posY, targetBox.bottom));
+      return ['top', 'bottom', 'left', 'right'].find((edge, i) => {
+        const distance = Math.abs((i < 2 ? posY : posX) - targetBox[edge]);
+        return distance <= maxDistance;
+      });
+    },
+
+    _positionInBounds(axis = 'x', element, x, y, error = 0) {
+      const bBox = element.getBoundingClientRect();
+      if (axis === 'y') return bBox.top - error < y && y < bBox.bottom + error;
+      else return bBox.left - error < x && x < bBox.right + error;
+    },
+
+    _clearAllHoverStates() {
+      // Clear hover attributes from all hoverable elements
+      for (let entry of this.hoverableElements) {
+        const target = entry.element;
+        if (target && !target.matches(':hover') && target.hasAttribute('zen-has-hover')) {
+          this._setElementExpandAttribute(target, false);
+          this.clearFlashTimeout('has-hover' + target.id);
+        }
+      }
+    },
+
+    isSidebarPotentiallyOpen() {
+      if (this._ignoreNextHover) {
+        this._setElementExpandAttribute(this.sidebar, false);
+      }
+      return (
+        this.sidebar.hasAttribute('zen-user-show') ||
+        this.sidebar.hasAttribute('zen-has-hover') ||
+        this.sidebar.hasAttribute('zen-has-empty-tab')
+      );
+    },
+
+    async _onTabOpen(tab, inBackground) {
+      if (
+        inBackground &&
+        this.preference &&
+        !this.isSidebarPotentiallyOpen() &&
+        this._canShowBackgroundTabToast &&
+        !gZenGlanceManager._animating &&
+        !this._nextTimeWillBeActive
+      ) {
+        gZenUIManager.showToast('zen-background-tab-opened-toast', {
+          button: {
+            id: 'zen-open-background-tab-button',
+            command: () => {
+              const targetWindow = window.ownerGlobal.parent || window;
+              targetWindow.gBrowser.selectedTab = tab;
+            },
+          },
+        });
+      }
+      delete this._nextTimeWillBeActive;
+    },
+  };
+
+  document.addEventListener(
+    'MozBeforeInitialXULLayout',
+    () => {
+      gZenCompactModeManager.preInit();
+    },
+    { once: true }
+  );
+}
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index 8ebf72eaa..e3f78f2a0 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -55,9 +55,6 @@ export class ZenGlanceChild extends JSWindowActorChild {
   }
 
   on_click(event) {
-    if (event.button !== 0 || event.defaultPrevented) {
-      return;
-    }
     // get closest A element
     const target = event.target.closest('A');
     const elementToRecord = event.originalTarget || event.target;
@@ -67,7 +64,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     // The problem is that at that stage we don't know the rect or even what
     // element has been clicked, so we send the data here.
     this.#sendClickDataToParent(target, elementToRecord);
-    if (this.#ensureOnlyKeyModifiers(event)) {
+    if (event.button !== 0 || event.defaultPrevented || this.#ensureOnlyKeyModifiers(event)) {
       return;
     }
     const activationMethod = this.#activationMethod;
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 975acad6e..21694d525 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -179,7 +179,7 @@
     font-weight: 500;
     gap: 2px;
 
-    #navigator-toolbox[zen-has-hover='true'] & {
+    #navigator-toolbox[zen-has-implicit-hover='true'] & {
       visibility: visible;
       opacity: 0.5;
     }
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 8bce5d7e7..e2228a209 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -563,7 +563,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   }
 
   get _hoveringSidebar() {
-    return gNavToolbox.hasAttribute('zen-has-hover');
+    return gNavToolbox.hasAttribute('zen-has-implicit-hover');
   }
 
   _handleAppCommand(event) {

From 8b649254077be86727d02aaaff255449d62fadf5 Mon Sep 17 00:00:00 2001
From: devdinc <a-mail-for+profesional-github@proton.me>
Date: Tue, 11 Nov 2025 12:53:25 +0300
Subject: [PATCH 072/162] chore: Add `Open Link in Glance` option to context
 menu, p=#11241

* Update zen-general.ftl

Signed-off-by: devdinc <a-mail-for+profesional-github@proton.me>

* Update nsContextMenu-sys-mjs.patch

Signed-off-by: devdinc <a-mail-for+profesional-github@proton.me>

* Update ZenGlanceManager.mjs

Signed-off-by: devdinc <a-mail-for+profesional-github@proton.me>

* Update zen-general.ftl

Signed-off-by: devdinc <a-mail-for+profesional-github@proton.me>

* Update ZenGlanceManager.mjs

Signed-off-by: devdinc <a-mail-for+profesional-github@proton.me>

* chore: Cleanup and fix patches, b=no-bug, c=glance

---------

Signed-off-by: devdinc <a-mail-for+profesional-github@proton.me>
Co-authored-by: mr. m <mr.m@tuta.com>
---
 locales/en-US/browser/browser/zen-general.ftl        |  4 ++++
 src/browser/base/content/nsContextMenu-sys-mjs.patch | 10 +++++-----
 src/zen/glance/ZenGlanceManager.mjs                  | 12 ++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 49fe38cf0..3cd708737 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -116,3 +116,7 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance =
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/src/browser/base/content/nsContextMenu-sys-mjs.patch b/src/browser/base/content/nsContextMenu-sys-mjs.patch
index d705ed870..b872d46b7 100644
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 259b440375c7e84d373a134fea20cdbc1c1bae4b..a9ce22a2391b4ec0bf82ceedd35f4c9d9626bb28 100644
+index 259b440375c7e84d373a134fea20cdbc1c1bae4b..c4a251f0169d22186c2766992ab40366d53582f1 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1104,6 +1104,8 @@ export class nsContextMenu {
+@@ -1103,6 +1103,8 @@ export class nsContextMenu {
+         !this.onMozExtLink &&
          !this.isSecureAboutPage()
      );
- 
 +    this.showItem("context-zenSplitLink", this.onLink && !this.onMailtoLink && !this.onTelLink);
-+
++    this.showItem("context-zenOpenLinkInGlance", this.onLink && !this.onMailtoLink && !this.onTelLink);
+ 
      let canNotStrip =
        lazy.STRIP_ON_SHARE_CAN_DISABLE && !this.#canStripParams();
- 
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 52e452175..27d82b591 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -40,6 +40,7 @@
       this.#setupEventListeners();
       this.#setupPreferences();
       this.#setupObservers();
+      this.#insertIntoContextMenu();
     }
 
     #setupEventListeners() {
@@ -64,6 +65,17 @@
       Services.obs.addObserver(this, 'quit-application-requested');
     }
 
+    #insertIntoContextMenu() {
+      const menuitem = document.createXULElement('menuitem');
+      menuitem.setAttribute('id', 'context-zenOpenLinkInGlance');
+      menuitem.setAttribute('hidden', 'true');
+      menuitem.setAttribute('data-l10n-id', 'zen-open-link-in-glance');
+
+      menuitem.addEventListener('command', () => this.openGlance({ url: gContextMenu.linkURL }));
+
+      document.getElementById('context-sep-open').insertAdjacentElement('beforebegin', menuitem);
+    }
+
     /**
      * Handle main command set events for glance operations
      * @param {Event} event - The command event

From 249d793b5deab944e85728fe4273b189f3216cf4 Mon Sep 17 00:00:00 2001
From: Jun Jie <71215065+junnjiee@users.noreply.github.com>
Date: Tue, 11 Nov 2025 17:53:39 +0800
Subject: [PATCH 073/162] feat: Ctrl+Tab cycling to keep within
 essentials/regular tabs only, p=#11242

* feat: ctrl+tab cycles within essential/workspace tabs only

* add test for ctrl+tab cycling by attribute

* move settings UI related code to /src/zen, revert patches for main.inc.xhtml and main.js, use simple tab filter when current tab is hidden

* chore: Cleanup and add extra pref, b=no-bug, c=tests, tabs

---------

Co-authored-by: mr. m <mr.m@tuta.com>
---
 .../browser/preferences/zen-preferences.ftl   |  8 +-
 prefs/zen/zen.yaml                            |  6 ++
 .../components/preferences/zen-settings.js    | 41 +++++++++
 .../preferences/zenTabsManagement.inc.xhtml   |  8 ++
 src/toolkit/content/widgets/tabbox-js.patch   | 64 ++++++++++++--
 src/zen/tests/tabs/browser.toml               |  3 +-
 .../tabs/browser_tabs_cycle_by_attribute.js   | 86 +++++++++++++++++++
 7 files changed, 208 insertions(+), 8 deletions(-)
 create mode 100644 src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js

diff --git a/locales/en-US/browser/browser/preferences/zen-preferences.ftl b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
index d053124e2..2941a5157 100644
--- a/locales/en-US/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-US/browser/browser/preferences/zen-preferences.ftl
@@ -59,6 +59,12 @@ zen-tabs-unloader-enabled =
 zen-tabs-close-on-back-with-no-history =
     .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
 
+zen-tabs-cycle-by-attribute =
+  .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs =
+  .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+
 zen-look-and-feel-compact-toolbar-themed =
     .label = Use themed background for compact toolbar
 
@@ -150,7 +156,7 @@ zen-theme-marketplace-input-default-placeholder =
     .placeholder = Type something...
 pane-zen-marketplace-title = Zen Mods
 zen-themes-auto-update =
-   .label = Automatically update installed mods on startup 
+   .label = Automatically update installed mods on startup
 
 zen-settings-workspaces-force-container-tabs-to-workspace =
     .label = Switch to workspace where container is set as default when opening container tabs
diff --git a/prefs/zen/zen.yaml b/prefs/zen/zen.yaml
index c44a0e626..9c6e9d787 100644
--- a/prefs/zen/zen.yaml
+++ b/prefs/zen/zen.yaml
@@ -37,3 +37,9 @@
 
 - name: zen.tabs.close-on-back-with-no-history
   value: true
+
+- name: zen.tabs.ctrl-tab.ignore-essential-tabs
+  value: false
+
+- name: zen.tabs.ctrl-tab.ignore-pending-tabs
+  value: false
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index a126c8a38..35fbccbf7 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -707,13 +707,39 @@ var gZenWorkspacesSettings = {
         }
       },
     };
+
+    let toggleZenCycleByAttrWarning = {
+      observe() {
+        const warning = document.getElementById('zenTabsCycleByAttributeWarning');
+        warning.hidden = !(
+          Services.prefs.getBoolPref('zen.tabs.ctrl-tab.ignore-essential-tabs', false) &&
+          Services.prefs.getBoolPref('browser.ctrlTab.sortByRecentlyUsed', false)
+        );
+      },
+    };
+
+    toggleZenCycleByAttrWarning.observe(); // call it once on initial load
+
     Services.prefs.addObserver('zen.glance.enabled', tabsUnloaderPrefListener); // We can use the same listener for both prefs
     Services.prefs.addObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
     Services.prefs.addObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
+    Services.prefs.addObserver(
+      'zen.tabs.ctrl-tab.ignore-essential-tabs',
+      toggleZenCycleByAttrWarning
+    );
+    Services.prefs.addObserver('browser.ctrlTab.sortByRecentlyUsed', toggleZenCycleByAttrWarning);
     window.addEventListener('unload', () => {
       Services.prefs.removeObserver('zen.glance.enabled', tabsUnloaderPrefListener);
       Services.prefs.removeObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
       Services.prefs.removeObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
+      Services.prefs.removeObserver(
+        'zen.tabs.ctrl-tab.ignore-essential-tabs',
+        toggleZenCycleByAttrWarning
+      );
+      Services.prefs.removeObserver(
+        'browser.ctrlTab.sortByRecentlyUsed',
+        toggleZenCycleByAttrWarning
+      );
     });
   },
 };
@@ -1135,6 +1161,21 @@ Preferences.addAll([
     type: 'bool',
     default: true,
   },
+  {
+    id: 'zen.tabs.ctrl-tab.ignore-essential-tabs',
+    type: 'bool',
+    default: false,
+  },
+  {
+    id: 'zen.tabs.ctrl-tab.ignore-pending-tabs',
+    type: 'bool',
+    default: false,
+  },
+  {
+    id: 'zen.tabs.close-on-back-with-no-history',
+    type: 'bool',
+    default: false,
+  },
 ]);
 
 Preferences.addSetting({
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index 2943b863b..6effbd1bd 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -29,6 +29,14 @@
       <checkbox id="zenTabsCloseOnBackWithNoHistory"
             data-l10n-id="zen-tabs-close-on-back-with-no-history"
             preference="zen.tabs.close-on-back-with-no-history"/>
+      <checkbox data-l10n-id="zen-tabs-cycle-ignore-pending-tabs"
+            preference="zen.tabs.ctrl-tab.ignore-pending-tabs"/>
+      <checkbox data-l10n-id="zen-tabs-cycle-by-attribute"
+            preference="zen.tabs.ctrl-tab.ignore-essential-tabs"/>
+      <description id="zenTabsCycleByAttributeWarning"
+            class="description-deemphasized"
+            data-l10n-id="zen-tabs-cycle-by-attribute-warning"
+            hidden="true"/>
 </groupbox>
 
 <hbox id="zenTabsUnloadCategory"
diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch
index cc7dcea1c..0d4d37b05 100644
--- a/src/toolkit/content/widgets/tabbox-js.patch
+++ b/src/toolkit/content/widgets/tabbox-js.patch
@@ -1,8 +1,32 @@
 diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
-index cfe2da6e199667bd668f117cc8972212c7f57da2..bdd7dcc26139202e6e31afde47dc4d877f3db3c5 100644
+index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a0722627f9ed4b 100644
 --- a/toolkit/content/widgets/tabbox.js
 +++ b/toolkit/content/widgets/tabbox.js
-@@ -213,7 +213,7 @@
+@@ -11,6 +11,23 @@
+     "resource://gre/modules/AppConstants.sys.mjs"
+   );
+ 
++  const { XPCOMUtils } = ChromeUtils.importESModule(
++    "resource://gre/modules/XPCOMUtils.sys.mjs"
++  );
++  const lazyZenPrefs = {};
++  XPCOMUtils.defineLazyPreferenceGetter(
++    lazyZenPrefs,
++    "cycleByAttribute",
++    "zen.tabs.ctrl-tab.ignore-essential-tabs",
++    false
++  );
++  XPCOMUtils.defineLazyPreferenceGetter(
++    lazyZenPrefs,
++    "ignorePendingTabs",
++    "zen.tabs.ctrl-tab.ignore-pending-tabs",
++    false
++  );
++
+   let imports = {};
+   ChromeUtils.defineESModuleGetters(imports, {
+     ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+@@ -213,7 +230,7 @@
      ) {
        this._inAsyncOperation = false;
        if (oldPanel != this._selectedPanel) {
@@ -11,7 +35,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..bdd7dcc26139202e6e31afde47dc4d87
          this._selectedPanel?.classList.add("deck-selected");
        }
        this.setAttribute("selectedIndex", val);
-@@ -697,7 +697,7 @@
+@@ -697,7 +714,7 @@
        if (!tab) {
          return;
        }
@@ -20,7 +44,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..bdd7dcc26139202e6e31afde47dc4d87
          if (otherTab != tab && otherTab.selected) {
            otherTab._selected = false;
          }
-@@ -733,6 +733,7 @@
+@@ -733,6 +750,7 @@
       * @param {MozTab|null} [val]
       */
      set selectedItem(val) {
@@ -28,7 +52,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..bdd7dcc26139202e6e31afde47dc4d87
        if (val && !val.selected) {
          // The selectedIndex setter ignores invalid values
          // such as -1 if |val| isn't one of our child nodes.
-@@ -910,7 +911,7 @@
+@@ -910,7 +928,7 @@
          if (tab == startTab) {
            return null;
          }
@@ -37,7 +61,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..bdd7dcc26139202e6e31afde47dc4d87
            return tab;
          }
        }
-@@ -972,10 +973,11 @@
+@@ -972,13 +990,30 @@
       * @param {boolean} [aWrap]
       */
      advanceSelectedTab(aDir, aWrap) {
@@ -50,3 +74,31 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..bdd7dcc26139202e6e31afde47dc4d87
        }
        let newTab = null;
  
++      const tabFilter = tab => {
++        if (!tab.visible) {
++          return false
++        }
++        if (lazyZenPrefs.ignorePendingTabs && tab.hasAttribute("pending")) {
++          return false
++        }
++        if (!lazyZenPrefs.cycleByAttribute) {
++          return true
++        }
++        if (startTab.hasAttribute("zen-essential")) {
++          return tab.hasAttribute("zen-essential")
++        }
++        return !tab.hasAttribute("zen-essential")
++      }
++
+       // Handle keyboard navigation for a hidden tab that can be selected, like the Firefox View tab,
+       // which has a random placement in this.allTabs.
+       if (startTab.hidden) {
+@@ -991,7 +1026,7 @@
+         newTab = this.findNextTab(startTab, {
+           direction: aDir,
+           wrap: aWrap,
+-          filter: tab => tab.visible,
++          filter: tabFilter,
+         });
+       }
+ 
diff --git a/src/zen/tests/tabs/browser.toml b/src/zen/tests/tabs/browser.toml
index 0d6efd5dd..eee3f05d4 100644
--- a/src/zen/tests/tabs/browser.toml
+++ b/src/zen/tests/tabs/browser.toml
@@ -9,8 +9,9 @@ support-files = [
 
 ["browser_tabs_empty_checks.js"]
 ["browser_tabs_fetch_checks.js"]
+["browser_tabs_cycle_by_attribute.js"]
 ["browser_drag_drop_vertical.js"]
 tags = [
   "drag-drop",
   "vertical-tabs"
-]
\ No newline at end of file
+]
diff --git a/src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js b/src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js
new file mode 100644
index 000000000..3dba19ffa
--- /dev/null
+++ b/src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js
@@ -0,0 +1,86 @@
+'use strict';
+
+const URL1 = 'data:text/plain,tab1';
+const URL2 = 'data:text/plain,tab2';
+const URL3 = 'data:text/plain,tab3';
+const URL4 = 'data:text/plain,tab4';
+const URL5 = 'data:text/plain,tab5';
+const URL6 = 'data:text/plain,tab6';
+
+/**
+ * ensures that tab select action is completed
+ */
+async function selectTab(tab) {
+  const onSelect = BrowserTestUtils.waitForEvent(gBrowser.tabContainer, 'TabSelect');
+  gBrowser.selectedTab = tab;
+  await onSelect;
+}
+
+add_setup(async () => {
+  // remove default new tab
+  const tabToRemove = gBrowser.selectedTab;
+  BrowserTestUtils.removeTab(tabToRemove);
+
+  const tabs = await Promise.all([
+    addTabTo(gBrowser, URL1),
+    addTabTo(gBrowser, URL2),
+    addTabTo(gBrowser, URL3),
+    addTabTo(gBrowser, URL4),
+    addTabTo(gBrowser, URL5),
+    addTabTo(gBrowser, URL6),
+  ]);
+
+  gZenPinnedTabManager.addToEssentials(tabs.slice(0, 3));
+  await BrowserTestUtils.waitForCondition(
+    () => tabs.slice(0, 3).every((tab) => tab.hasAttribute('zen-essential')),
+    'all essentials ready'
+  );
+
+  const essentialTabs = gBrowser.tabs.filter((tab) => tab.hasAttribute('zen-essential'));
+  Assert.equal(essentialTabs.length, 3, '3 essential tabs created');
+
+  const workspaceTabs = gBrowser.tabs.filter(
+    (tab) => !tab.hasAttribute('zen-essential') && !tab.hasAttribute('zen-empty-tab')
+  );
+  Assert.equal(workspaceTabs.length, 3, '3 workspace tabs created, excluding empty tab');
+
+  registerCleanupFunction(async () => {
+    // replace the default new tab in the test window
+    addTabTo(gBrowser, 'about:blank');
+    tabs.forEach((element) => {
+      BrowserTestUtils.removeTab(element);
+    });
+    await SpecialPowers.popPrefEnv();
+  });
+});
+
+add_task(async function cycleTabsByAttribute() {
+  await SpecialPowers.pushPrefEnv({
+    set: [['zen.tabs.ctrl-tab.ignore-essential-tabs', true]],
+  });
+
+  const essentialTabs = gBrowser.tabs.filter((tab) => tab.hasAttribute('zen-essential'));
+  await selectTab(essentialTabs[0]);
+
+  gBrowser.tabContainer.advanceSelectedTab(1, true);
+  gBrowser.tabContainer.advanceSelectedTab(1, true);
+  gBrowser.tabContainer.advanceSelectedTab(1, true);
+  ok(
+    gBrowser.selectedTab === essentialTabs[0],
+    'tab cycling applies within essential tabs only, as the starting tab is a essential tab'
+  );
+
+  const workspaceTabs = gBrowser.tabs.filter(
+    (tab) => !tab.hasAttribute('zen-essential') && !tab.hasAttribute('zen-empty-tab')
+  );
+  await selectTab(workspaceTabs[0]);
+
+  gBrowser.tabContainer.advanceSelectedTab(1, true);
+  gBrowser.tabContainer.advanceSelectedTab(1, true);
+  gBrowser.tabContainer.advanceSelectedTab(1, true);
+
+  ok(
+    gBrowser.selectedTab === workspaceTabs[0],
+    'tab cycling applies within workspace tabs only, as the starting tab is a workspace tab'
+  );
+});

From 081efe68982407d78db38cbdfc2caccde861e301 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Nov 2025 12:05:32 +0100
Subject: [PATCH 074/162] fix: Fixed workflow_call not being set properly for
 upstream checks, b=no-bug, c=workflows

---
 .github/workflows/sync-upstream.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
index a16fe9dd4..be6c53120 100644
--- a/.github/workflows/sync-upstream.yml
+++ b/.github/workflows/sync-upstream.yml
@@ -8,6 +8,13 @@ on:
         required: false
         type: boolean
         default: false
+  workflow_call:
+    inputs:
+      release_candidate:
+        description: 'Set to true to sync release candidates'
+        required: false
+        type: boolean
+        default: false
 
 permissions:
   contents: write

From 5d9b50ca55f54d9d89d3865da4bf9518f213bb02 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 11 Nov 2025 18:20:25 +0100
Subject: [PATCH 075/162] chore: New Crowdin updates, p=#11238

* 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)

* Update source file zen-general.ftl

* Update source file zen-preferences.ftl

* New translations zen-general.ftl (French)

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

* New translations zen-general.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-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/preferences/zen-preferences.ftl | 7 +++++++
 locales/ar/browser/browser/zen-general.ftl                 | 3 +++
 locales/ca/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/ca/browser/browser/zen-general.ftl                 | 3 +++
 locales/cs/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/cs/browser/browser/zen-general.ftl                 | 3 +++
 locales/cy/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/cy/browser/browser/zen-general.ftl                 | 3 +++
 locales/da/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/da/browser/browser/zen-general.ftl                 | 3 +++
 locales/de/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/de/browser/browser/zen-general.ftl                 | 3 +++
 locales/el/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/el/browser/browser/zen-general.ftl                 | 3 +++
 .../en-GB/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/en-GB/browser/browser/zen-general.ftl              | 3 +++
 .../es-ES/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/es-ES/browser/browser/zen-general.ftl              | 3 +++
 locales/et/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/et/browser/browser/zen-general.ftl                 | 3 +++
 locales/fa/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/fa/browser/browser/zen-general.ftl                 | 3 +++
 locales/fi/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/fi/browser/browser/zen-general.ftl                 | 3 +++
 locales/fr/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/fr/browser/browser/zen-general.ftl                 | 3 +++
 .../ga-IE/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/ga-IE/browser/browser/zen-general.ftl              | 3 +++
 locales/he/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/he/browser/browser/zen-general.ftl                 | 3 +++
 locales/hu/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/hu/browser/browser/zen-general.ftl                 | 3 +++
 locales/id/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/id/browser/browser/zen-general.ftl                 | 3 +++
 locales/is/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/is/browser/browser/zen-general.ftl                 | 3 +++
 locales/it/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/it/browser/browser/zen-general.ftl                 | 3 +++
 locales/ja/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/ja/browser/browser/zen-general.ftl                 | 3 +++
 locales/ko/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/ko/browser/browser/zen-general.ftl                 | 3 +++
 locales/lt/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/lt/browser/browser/zen-general.ftl                 | 3 +++
 locales/nl/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/nl/browser/browser/zen-general.ftl                 | 3 +++
 .../nn-NO/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/nn-NO/browser/browser/zen-general.ftl              | 3 +++
 locales/pl/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/pl/browser/browser/zen-general.ftl                 | 3 +++
 .../pt-BR/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/pt-BR/browser/browser/zen-general.ftl              | 3 +++
 .../pt-PT/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/pt-PT/browser/browser/zen-general.ftl              | 3 +++
 locales/ru/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/ru/browser/browser/zen-general.ftl                 | 3 +++
 .../sv-SE/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/sv-SE/browser/browser/zen-general.ftl              | 3 +++
 locales/th/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/th/browser/browser/zen-general.ftl                 | 3 +++
 locales/tr/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/tr/browser/browser/zen-general.ftl                 | 3 +++
 locales/uk/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/uk/browser/browser/zen-general.ftl                 | 3 +++
 locales/vi/browser/browser/preferences/zen-preferences.ftl | 7 +++++++
 locales/vi/browser/browser/zen-general.ftl                 | 3 +++
 .../zh-CN/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/zh-CN/browser/browser/zen-general.ftl              | 3 +++
 .../zh-TW/browser/browser/preferences/zen-preferences.ftl  | 7 +++++++
 locales/zh-TW/browser/browser/zen-general.ftl              | 3 +++
 70 files changed, 350 insertions(+)

diff --git a/locales/ar/browser/browser/preferences/zen-preferences.ftl b/locales/ar/browser/browser/preferences/zen-preferences.ftl
index 14b1a242a..c8edbb744 100644
--- a/locales/ar/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ar/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = مساحات العمل
 zen-tabs-unloader-enabled = 
     .label = تمكين إلغاء تحميل علامة التبويب
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 2fd882720..36e0ffbc2 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl
index 73d535c4c..2b4a51e44 100644
--- a/locales/ca/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Espais de treball
 zen-tabs-unloader-enabled = 
     .label = Habilita la hibernació de pestanyes
+zen-tabs-close-on-back-with-no-history = 
+    .label = Tanca la pestanya i canvia a la pestanya del propietari (o a la pestanya utilitzada més recentment) quan torneu enrere sense historial
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Utilitza un fons temàtic per a la barra d'eines compacta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index fcb31c108..825c351b6 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Protecció contra el seguiment
 
 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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/cs/browser/browser/preferences/zen-preferences.ftl b/locales/cs/browser/browser/preferences/zen-preferences.ftl
index 766d80f23..4c7d09bfd 100644
--- a/locales/cs/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cs/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Pracoviště
 zen-tabs-unloader-enabled = 
     .label = Povolit uspání karet
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Použít tématické pozadí pro kompaktní panel karet
 zen-workspace-continue-where-left-off = 
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index e2a6b9e1e..5fe517daa 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/cy/browser/browser/preferences/zen-preferences.ftl b/locales/cy/browser/browser/preferences/zen-preferences.ftl
index 5bc04fc62..cc0d0bf2c 100644
--- a/locales/cy/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cy/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Workspaces
 zen-tabs-unloader-enabled = 
     .label = Enable Tab Unloader
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index 6895e3b57..3f344c5c4 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/da/browser/browser/preferences/zen-preferences.ftl b/locales/da/browser/browser/preferences/zen-preferences.ftl
index 78172279f..1c511ce32 100644
--- a/locales/da/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/da/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Arbejdsområder
 zen-tabs-unloader-enabled = 
     .label = Aktiver fanedeaktivering
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index 70406a818..edee35a71 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Sporingsbeskyttelse
 
 zen-site-data-panel-feature-callout-title = Et nyt hjem for tilføjelser, tilladelser og mere
 zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site settings, view security info, access extensions, and perform common actions.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index e9160ee84..7091cc44b 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Arbeitsbereiche
 zen-tabs-unloader-enabled = 
     .label = Tab-Entlader aktivieren
+zen-tabs-close-on-back-with-no-history = 
+    .label = Tab schließen und zum Besitzer-Tab (oder den zuletzt benutzten Tab) wechseln, wenn kein Tab-Verlauf vorhanden ist
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Theme Hintergrund für kompakte Symbolleiste verwenden
 zen-workspace-continue-where-left-off = 
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 0fdabed61..6346958c9 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking-Schutz
 
 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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl
index 309bbdfa2..0faae2d4f 100644
--- a/locales/el/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/el/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Χώροι Εργασίας
 zen-tabs-unloader-enabled = 
     .label = Ενεργοποίηση Εκφορτωτή Καρτέλας
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Χρήση παρασκηνίου με θέμα για συμπαγή γραμμή εργαλειών
 zen-workspace-continue-where-left-off = 
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 284dd95f2..ac34f6830 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
index 9d58dfbd3..04aafe675 100644
--- a/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/en-GB/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Workspaces
 zen-tabs-unloader-enabled = 
     .label = Enable Tab Unload
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index d186a8cf4..46742f630 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -92,3 +92,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
index 21eaa8d09..8274329a8 100644
--- a/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/es-ES/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Espacios de trabajo
 zen-tabs-unloader-enabled = 
     .label = Habilitar suspensión de pestañas
+zen-tabs-close-on-back-with-no-history = 
+    .label = Cerrar pestaña y cambiar a su pestaña propietaria (o la pestaña usada más recientemente) al volver sin historial
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab solo alterna dentro de las pestañas esenciales o de espacio de trabajo
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignorar pestañas pendientes cuando alterna con Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab alternará según el orden de uso reciente, cuando está habilitado
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Usar fondo temático para la barra de herramientas compacta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index c0c3da85b..85346c269 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Protección contra el rastreo
 
 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.
+zen-open-link-in-glance = 
+    .label = Abrir enlace en Glance
+    .accesskey = G
diff --git a/locales/et/browser/browser/preferences/zen-preferences.ftl b/locales/et/browser/browser/preferences/zen-preferences.ftl
index 8de131140..747c5c954 100644
--- a/locales/et/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/et/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Tööruumid
 zen-tabs-unloader-enabled = 
     .label = Luba kaartide mälust eemaldamine
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Kasuta kompaktsel tööriistaribal teema poolt küljendatud tausta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index d94ba4549..f93107eaf 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/fa/browser/browser/preferences/zen-preferences.ftl b/locales/fa/browser/browser/preferences/zen-preferences.ftl
index c65dc03e1..26422e617 100644
--- a/locales/fa/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fa/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = فضاهای کاری
 zen-tabs-unloader-enabled = 
     .label = Enable Tab Unloader
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index 1533ebfe3..76eac56f9 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl
index 301292da4..dbba7f1d7 100644
--- a/locales/fi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Työtilat
 zen-tabs-unloader-enabled = 
     .label = Ota Käyttöön välilehden purkaminen
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index c864d7904..14487dae8 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl
index f35b281aa..08a5ac40c 100644
--- a/locales/fr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Espaces de travail
 zen-tabs-unloader-enabled = 
     .label = Activer le déchargement des onglets
+zen-tabs-close-on-back-with-no-history = 
+    .label = Fermer l'onglet et passer à l'onglet parent (ou à l'onglet le plus récemment utilisé) lorsque vous revenez en arrière sans historique
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab permet de passer d'un onglet Essential ou d'un Espace de travail à l'autre uniquement
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignorer les onglets en attente lors du défilement avec Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab permet de passer d'un onglet à l'autre dans l'ordre d'utilisation récente, lorsqu'il est activé
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Utiliser l’arrière-plan du thème pour la barre d’outils en mode compact
 zen-workspace-continue-where-left-off = 
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 48f68f781..2173484ab 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Protection contre le pistage
 
 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.
+zen-open-link-in-glance = 
+    .label = Ouvrir le lien dans Glance
+    .accesskey = G
diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
index a54a4f937..b0a864f7e 100644
--- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Spásanna Oibre Eile
 zen-tabs-unloader-enabled = 
     .label = Cumasaigh Díluchtóir Cluaisíní
+zen-tabs-close-on-back-with-no-history = 
+    .label = Dún an cluaisín agus aistrigh go dtí an cluaisín úinéara (nó an cluaisín is déanaí a úsáideadh) nuair a théann tú ar ais gan aon stair
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Úsáid cúlra téamach don bharra uirlisí dlúth
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 43024dfc6..30cbbf49d 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Cosaint Rianaithe
 
 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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/he/browser/browser/preferences/zen-preferences.ftl b/locales/he/browser/browser/preferences/zen-preferences.ftl
index 2c0483d8b..697805f6b 100644
--- a/locales/he/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/he/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = סביבות עבודה
 zen-tabs-unloader-enabled = 
     .label = הפעלת פינוי כרטיסיות
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = שימוש ברקע עם עיצוב לסרגל מכווץ
 zen-workspace-continue-where-left-off = 
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index 6ac86ed5e..6ff3f2a35 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking Protection
 
 zen-site-data-panel-feature-callout-title = בית חדש לתוספים, הרשאות, ועוד
 zen-site-data-panel-feature-callout-subtitle = ניתן ללחוץ על הסמל כדי לנהל הגדרות אתר, לצפות במידע אבטחה, לגשת לתוספים, ולבצע פעולות נפוצות.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl
index efa7ac046..7dd5bc58e 100644
--- a/locales/hu/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Munkakörnyezetek
 zen-tabs-unloader-enabled = 
     .label = Lap ürítő engedélyezése
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Tematikus háttér használata a kompakt eszköztárhoz
 zen-workspace-continue-where-left-off = 
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 2e861ddbb..dbdab2e7b 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Nyomkövetés vé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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl
index e6dd6f3a7..545fe2901 100644
--- a/locales/id/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/id/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Ruang Kerja
 zen-tabs-unloader-enabled = 
     .label = Aktifkan Pelepas Tab
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Gunakan latar belakang bertema untuk bilah atas dalam mode ringkas
 zen-workspace-continue-where-left-off = 
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 156697f48..74e7a48af 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Perlindungan Pelacakan
 
 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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/is/browser/browser/preferences/zen-preferences.ftl b/locales/is/browser/browser/preferences/zen-preferences.ftl
index ad28de9f0..d2dd76cfb 100644
--- a/locales/is/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/is/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Workspaces
 zen-tabs-unloader-enabled = 
     .label = Enable Tab Unloader
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index c2a063ddd..455a5dd24 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl
index 6939c4cc1..d144a87cb 100644
--- a/locales/it/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/it/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Workspace
 zen-tabs-unloader-enabled = 
     .label = Abilita Scaricamento Scheda
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Utilizza lo sfondo a tema per la barra degli strumenti compatta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 70185a708..f2357da65 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -92,3 +92,6 @@ zen-site-data-setting-site-protection = Protezione Tracciamento
 
 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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/ja/browser/browser/preferences/zen-preferences.ftl b/locales/ja/browser/browser/preferences/zen-preferences.ftl
index 0f1138fe1..2a42fd1f9 100644
--- a/locales/ja/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ja/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = ワークスペース
 zen-tabs-unloader-enabled = 
     .label = タブのアンローダーを有効にする
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index faebd450d..8acae44ca 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/ko/browser/browser/preferences/zen-preferences.ftl b/locales/ko/browser/browser/preferences/zen-preferences.ftl
index 7044951b2..a55f6713d 100644
--- a/locales/ko/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ko/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = 워크스페이스
 zen-tabs-unloader-enabled = 
     .label = 탭 언로더 활성화
+zen-tabs-close-on-back-with-no-history = 
+    .label = 뒤로 가기 시 이전 기록이 없으면 탭을 닫고 원래 탭(또는 가장 최근에 쓰인 탭)으로 전환
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab에 에센셜 또는 워크스페이스 탭만 사용
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ctrl+Tab 시 보류중인 탭 무시
+zen-tabs-cycle-by-attribute-warning = 활성화됨에 따라 Ctrl+Tab이 최근에 사용된 순서로 정렬됩니다
 zen-look-and-feel-compact-toolbar-themed = 
     .label = 축소된 툴바에 테마 배경 사용
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 77c7c86bb..55ea40638 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = 추적 보호
 
 zen-site-data-panel-feature-callout-title = 애드온, 권한, 그리고 더 많은 것을 위한 새로운 곳
 zen-site-data-panel-feature-callout-subtitle = 아이콘을 클릭해 사이트 설정, 보안 정보 조회, 확장 프로그램 접근, 기타 행동을 수행할 수 있습니다.
+zen-open-link-in-glance = 
+    .label = 글랜스로 링크 열기
+    .accesskey = G
diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl
index 8cc320b86..8836fa084 100644
--- a/locales/lt/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Darbo sritys
 zen-tabs-unloader-enabled = 
     .label = Įjungti kortelių iškėlyklę
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Naudoti teminį foną kompaktinei įrankių juostai
 zen-workspace-continue-where-left-off = 
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index 8a2d80b79..c54b9b3d7 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Stebėjimo 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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/nl/browser/browser/preferences/zen-preferences.ftl b/locales/nl/browser/browser/preferences/zen-preferences.ftl
index ce5e2d83b..edea8ce16 100644
--- a/locales/nl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nl/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Werkruimtes
 zen-tabs-unloader-enabled = 
     .label = Tabblad ontlader inschakelen
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Gebruik thema achtergrond voor compacte werkbalk
 zen-workspace-continue-where-left-off = 
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 7b96f0d81..bbb1b6932 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking bescherming
 
 zen-site-data-panel-feature-callout-title = Een nieuw thuis voor add-ons, machtigingen en meer
 zen-site-data-panel-feature-callout-subtitle = Klik op het icoon om de site-instellingen te beheren, beveiligingsinfo te bekijken, extensies te openen en gemeenschappelijke acties uit te voeren.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
index 7f2b86dc4..bbd11d0c5 100644
--- a/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/nn-NO/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Workspaces
 zen-tabs-unloader-enabled = 
     .label = Enable Tab Unloader
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 18df1b71c..647c5304e 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl
index 18d5426b4..c51c95c8f 100644
--- a/locales/pl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Obszary robocze
 zen-tabs-unloader-enabled = 
     .label = Włącz rozładowywanie kart
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Użyj tła motywu dla kompaktowego paska narzędzi
 zen-workspace-continue-where-left-off = 
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 810b6339c..10a9e4e34 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Ochrona przed śledzeniem
 
 zen-site-data-panel-feature-callout-title = Nowy dom dla dodatków, uprawnień i więcej
 zen-site-data-panel-feature-callout-subtitle = Kliknij ikonę, aby zarządzać ustawieniami witryny, wyświetlić informacje o zabezpieczeniach, rozszerzeniach i wykonać akcje.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
index b10064b75..9e1a31e49 100644
--- a/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-BR/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Áreas de Trabalho
 zen-tabs-unloader-enabled = 
     .label = Ativar Descarregador de Guias
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Usar fundo temático na barra de ferramentas compacta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 26630077e..bcbac76e7 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -92,3 +92,6 @@ zen-site-data-setting-site-protection = Proteção contra Rastreamento
 
 zen-site-data-panel-feature-callout-title = Um novo lar para extensões, permissões e mais
 zen-site-data-panel-feature-callout-subtitle = Clique no ícone para gerenciar configurações do site, visualizar informações de segurança, acessar extensões e realizar ações comuns.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
index aff4680ae..66e391279 100644
--- a/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pt-PT/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Espaços de Trabalho
 zen-tabs-unloader-enabled = 
     .label = Habilitar a Hibernação de Separadores
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Usar fundo temático para a barra de ferramentas compacta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index b2e5b8253..4448ae0f6 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Proteção contra rastreio
 
 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.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/ru/browser/browser/preferences/zen-preferences.ftl b/locales/ru/browser/browser/preferences/zen-preferences.ftl
index a4a668209..f98930e04 100644
--- a/locales/ru/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ru/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Рабочие пространства
 zen-tabs-unloader-enabled = 
     .label = Включить выгрузку вкладок
+zen-tabs-close-on-back-with-no-history = 
+    .label = Закрывать вкладку и переключаться на родительскую (или последнюю использованную) вкладку при возврате на предыдущую страницу
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab переключает вкладки только из важного или только из пространства
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Игнорировать загружающиеся вкладки при переключении через Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = При включении Ctrl+Tab будет переключать вкладки в порядке последнего использования
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Использовать цвета темы для фона компактной панели инструментов
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 95ac862dd..4208a8a91 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Защита от отслеживани
 
 zen-site-data-panel-feature-callout-title = Новый дом для расширений, разрешений и всего остального
 zen-site-data-panel-feature-callout-subtitle = Нажмите на значок для доступа к настройкам сайта, параметрам безопасности, расширениям и прочим действиям.
+zen-open-link-in-glance = 
+    .label = Открыть ссылку в предпросмотре
+    .accesskey = П
diff --git a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
index 76dd28409..7f11776c4 100644
--- a/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/sv-SE/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Arbetsytor
 zen-tabs-unloader-enabled = 
     .label = Aktivera flikavlastare
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index cf1cfc04f..2dcc999a3 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/th/browser/browser/preferences/zen-preferences.ftl b/locales/th/browser/browser/preferences/zen-preferences.ftl
index 7f2b86dc4..bbd11d0c5 100644
--- a/locales/th/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/th/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Workspaces
 zen-tabs-unloader-enabled = 
     .label = Enable Tab Unloader
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 18df1b71c..647c5304e 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/tr/browser/browser/preferences/zen-preferences.ftl b/locales/tr/browser/browser/preferences/zen-preferences.ftl
index ac89e0d8d..130203b14 100644
--- a/locales/tr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/tr/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Çalışma Alanları
 zen-tabs-unloader-enabled = 
     .label = Sekmeler İçin Uyku Modunu Akitf Et
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 83c9b7734..31b208081 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl
index bbb5a6832..0febb042c 100644
--- a/locales/uk/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Робочі області
 zen-tabs-unloader-enabled = 
     .label = Увімкнути вивантаження вкладок
+zen-tabs-close-on-back-with-no-history = 
+    .label = Закрити вкладку і перейти до вкладки її власника (або останньої використаної вкладки) при поверненні без історії
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Використовувати тематичний фон для компактної панелі інструментів
 zen-workspace-continue-where-left-off = 
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 2d869b20d..f609c26cf 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Захист від відстеженн
 
 zen-site-data-panel-feature-callout-title = Новий дім для доповнень, дозволів тощо
 zen-site-data-panel-feature-callout-subtitle = Натисніть значок, щоби керувати налаштуваннями сайту, переглядати інформацію про безпеку, отримувати доступ до розширень і виконувати поширені дії.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/vi/browser/browser/preferences/zen-preferences.ftl b/locales/vi/browser/browser/preferences/zen-preferences.ftl
index b817df522..db1d55788 100644
--- a/locales/vi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/vi/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = Không gian làm việc
 zen-tabs-unloader-enabled = 
     .label = Mở giải phóng thẻ
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 9a3bdafd6..6b29204ce 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -94,3 +94,6 @@ zen-site-data-setting-site-protection = Phòng chống theo dõi
 
 zen-site-data-panel-feature-callout-title = Diện mạo mới cho add-ons, quyền truy cập và nhiều hơn nữa
 zen-site-data-panel-feature-callout-subtitle = Bấm vào biểu tượng để quản lý các thiết lập của trang web, kiểm tra thông tin bảo mật, quyền truy cập của các tiện ích và thực thiện các tác vụ cơ bản.
+zen-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
index 916ab321f..dac314ce4 100644
--- a/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-CN/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = 工作区
 zen-tabs-unloader-enabled = 
     .label = 启用标签页卸载器
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index 1ccd4b04b..b5c96a0e8 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -92,3 +92,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G
diff --git a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
index 0d7c5162d..9740f6647 100644
--- a/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/zh-TW/browser/browser/preferences/zen-preferences.ftl
@@ -44,6 +44,13 @@ category-zen-workspaces =
 pane-settings-workspaces-title = 工作區
 zen-tabs-unloader-enabled = 
     .label = 啟用分頁卸載器
+zen-tabs-close-on-back-with-no-history = 
+    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+zen-tabs-cycle-by-attribute = 
+    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+zen-tabs-cycle-ignore-pending-tabs = 
+    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Use themed background for compact toolbar
 zen-workspace-continue-where-left-off = 
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index 4fa3e031c..e97208c2f 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -92,3 +92,6 @@ zen-site-data-setting-site-protection = Tracking 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-open-link-in-glance = 
+    .label = Open Link in Glance
+    .accesskey = G

From b48878a766bed15f9a8f07ad036a7abd6150317b Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Nov 2025 18:27:11 +0100
Subject: [PATCH 076/162] fix: Fixed urlbar results not being able to be
 heuristic, b=no-bug, c=folders, tabs

---
 src/zen/folders/ZenFolders.mjs              |  3 +++
 src/zen/tabs/ZenPinnedTabManager.mjs        | 24 ++++++++++++++-------
 src/zen/urlbar/ZenUBActionsProvider.sys.mjs | 11 +++++-----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 3d181132b..108fe4d90 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1157,6 +1157,9 @@
         Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100;
 
       const dropElementGroup = dropElement.group;
+      if (!dropElementGroup) {
+        return { dropElement, colorCode, dropBefore };
+      }
       const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
       let firstGroupElem =
         dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 779f3566b..3436ba178 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -447,7 +447,7 @@
         case 'TabGroupCollapse':
         case 'TabGroupExpand':
         case 'ZenFolderChangedWorkspace':
-          this.#updateGroupInfo(event.originalTarget);
+          this.#updateGroupInfo(event.originalTarget, action);
           break;
         case 'TabGrouped':
           this.#onTabGrouped(event);
@@ -523,7 +523,7 @@
       ZenPinnedTabsStorage.removeTabFromGroup(tabPinId, /* position */ tab._pPos);
     }
 
-    async #updateGroupInfo(group) {
+    async #updateGroupInfo(group, action) {
       if (!group?.isZenFolder) {
         return;
       }
@@ -537,12 +537,20 @@
         groupPin.parentUuid = group.group?.getAttribute('zen-pin-id') || null;
         groupPin.workspaceUuid = group.getAttribute('zen-workspace-id') || null;
         await this.savePin(groupPin);
-        for (const item of group.allItems) {
-          if (gBrowser.isTabGroup(item)) {
-            await this.#updateGroupInfo(item);
-          } else {
-            await this.#onTabMove(item);
-          }
+        switch (action) {
+          case 'ZenFolderRenamed':
+          case 'ZenFolderIconChanged':
+          case 'TabGroupCollapse':
+          case 'TabGroupExpand':
+            break;
+          default:
+            for (const item of group.allItems) {
+              if (gBrowser.isTabGroup(item)) {
+                await this.#updateGroupInfo(item, action);
+              } else {
+                await this.#onTabMove(item);
+              }
+            }
         }
       }
     }
diff --git a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
index 0ace9dcba..792bb4850 100644
--- a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
+++ b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
@@ -262,17 +262,18 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
         ...action.extraPayload,
       });
 
+      const shouldBePrioritized =
+        zenUrlbarResultsLearner.shouldPrioritize(action.commandId) && !isPrefixed;
       let result = new lazy.UrlbarResult({
         type: UrlbarUtils.RESULT_TYPE.DYNAMIC,
         source: UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS,
         payload,
         payloadHighlights,
+        heuristic: shouldBePrioritized,
+        suggestedIndex: !shouldBePrioritized
+          ? zenUrlbarResultsLearner.getDeprioritizeIndex(action.commandId)
+          : undefined,
       });
-      if (zenUrlbarResultsLearner.shouldPrioritize(action.commandId) && !isPrefixed) {
-        result.heuristic = true;
-      } else {
-        result.suggestedIndex = zenUrlbarResultsLearner.getDeprioritizeIndex(action.commandId);
-      }
       result.commandId = action.commandId;
       if (!(isPrefixed && query.length < 2)) {
         // We dont want to record prefixed results, as the user explicitly asked for them.

From 57934c3e8b813af2cdb27354deb791525de73b32 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 11 Nov 2025 18:28:44 +0100
Subject: [PATCH 077/162] chore: Sync upstream to `Firefox 145.0`, p=#11259

---
 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 670da32b8..4211fac39 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 `144.0.2`! 🚀
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `145.0`! 🚀
 - [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0`!
 
 ### Contributing
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index f451058a7..c1019bcb9 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-7bc0bd3b3f84dddd16bc84ddb01bc55782177f5e
\ No newline at end of file
+1e325bc45d9111518958446ac966fd4e4136d6d5
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index 03e2cabec..9fb03ae6e 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "144.0.2",
+    "version": "145.0",
     "candidate": "145.0"
   },
   "buildOptions": {

From 433adbb0b48bac8048801b31030d4813b426a303 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Nov 2025 18:29:35 +0100
Subject: [PATCH 078/162] chore: Bump release 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 03e2cabec..6591e1eb5 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.6b",
+        "displayVersion": "1.17.7b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 7b5348ad40022ca6a6f400a8ea7bda44957206d9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Nov 2025 01:35:26 +0100
Subject: [PATCH 079/162] feat: Show shift and alt after ctrl or meta,
 b=no-bug, c=kbs

---
 src/zen/kbs/ZenKeyboardShortcuts.mjs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index 777d1fbfe..04259eddb 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -200,14 +200,6 @@ class nsKeyShortcutModifiers {
       str += AppConstants.platform == 'macosx' ? '⌃' : 'Ctrl';
       str += separation;
     }
-    if (this.#alt) {
-      str += AppConstants.platform == 'macosx' ? '⌥' : 'Alt';
-      str += separation;
-    }
-    if (this.#shift) {
-      str += '⇧';
-      str += separation;
-    }
     if (this.#meta) {
       str += AppConstants.platform == 'macosx' ? '⌘' : 'Win';
       str += separation;
@@ -216,6 +208,15 @@ class nsKeyShortcutModifiers {
       str += AppConstants.platform == 'macosx' ? '⌘' : 'Ctrl';
       str += separation;
     }
+
+    if (this.#alt) {
+      str += AppConstants.platform == 'macosx' ? '⌥' : 'Alt';
+      str += separation;
+    }
+    if (this.#shift) {
+      str += '⇧';
+      str += separation;
+    }
     return str;
   }
 

From ef54bd7d52bbb959aec380dd3ee42292a6c45617 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 12 Nov 2025 14:02:24 +0100
Subject: [PATCH 080/162] chore: New Crowdin updates, p=#11266

* New translations zen-preferences.ftl (French)

* New translations zen-preferences.ftl (Catalan)

* New translations zen-preferences.ftl (Irish)

* New translations zen-preferences.ftl (Hungarian)

* New translations zen-preferences.ftl (Italian)

* New translations zen-preferences.ftl (Lithuanian)

* New translations zen-preferences.ftl (Ukrainian)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Italian)

* New translations zen-general.ftl (Lithuanian)

* New translations zen-general.ftl (Ukrainian)
---
 .../ca/browser/browser/preferences/zen-preferences.ftl    | 6 +++---
 locales/ca/browser/browser/zen-general.ftl                | 2 +-
 .../fr/browser/browser/preferences/zen-preferences.ftl    | 4 ++--
 .../ga-IE/browser/browser/preferences/zen-preferences.ftl | 6 +++---
 locales/ga-IE/browser/browser/zen-general.ftl             | 2 +-
 .../hu/browser/browser/preferences/zen-preferences.ftl    | 8 ++++----
 locales/hu/browser/browser/zen-general.ftl                | 2 +-
 .../it/browser/browser/preferences/zen-preferences.ftl    | 6 +++---
 locales/it/browser/browser/zen-general.ftl                | 2 +-
 .../lt/browser/browser/preferences/zen-preferences.ftl    | 8 ++++----
 locales/lt/browser/browser/zen-general.ftl                | 2 +-
 .../uk/browser/browser/preferences/zen-preferences.ftl    | 6 +++---
 locales/uk/browser/browser/zen-general.ftl                | 2 +-
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/locales/ca/browser/browser/preferences/zen-preferences.ftl b/locales/ca/browser/browser/preferences/zen-preferences.ftl
index 2b4a51e44..dbea9bcb0 100644
--- a/locales/ca/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ca/browser/browser/preferences/zen-preferences.ftl
@@ -47,10 +47,10 @@ zen-tabs-unloader-enabled =
 zen-tabs-close-on-back-with-no-history = 
     .label = Tanca la pestanya i canvia a la pestanya del propietari (o a la pestanya utilitzada més recentment) quan torneu enrere sense historial
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Ctrl+Tab permet només canviar entre les pestanyes essencials o de l'espai de treball
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Ignora les pestanyes pendents mentre es canvia amb Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab anirà canviant per ordre d'ús recent, quan estigui habilitat
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Utilitza un fons temàtic per a la barra d'eines compacta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 825c351b6..64ccedee2 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -95,5 +95,5 @@ zen-site-data-setting-site-protection = Protecció contra el seguiment
 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.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Obre l'enllaç en un cop d'ull
     .accesskey = G
diff --git a/locales/fr/browser/browser/preferences/zen-preferences.ftl b/locales/fr/browser/browser/preferences/zen-preferences.ftl
index 08a5ac40c..e5933123f 100644
--- a/locales/fr/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fr/browser/browser/preferences/zen-preferences.ftl
@@ -47,9 +47,9 @@ zen-tabs-unloader-enabled =
 zen-tabs-close-on-back-with-no-history = 
     .label = Fermer l'onglet et passer à l'onglet parent (ou à l'onglet le plus récemment utilisé) lorsque vous revenez en arrière sans historique
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab permet de passer d'un onglet Essential ou d'un Espace de travail à l'autre uniquement
+    .label = Ctrl+Tab permet de passer d'un onglet Essential ou d'un espace de travail à l'autre uniquement
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignorer les onglets en attente lors du défilement avec Ctrl+Tab
+    .label = Ignorer les onglets déchargés lors du défilement avec Ctrl+Tab
 zen-tabs-cycle-by-attribute-warning = Ctrl+Tab permet de passer d'un onglet à l'autre dans l'ordre d'utilisation récente, lorsqu'il est activé
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Utiliser l’arrière-plan du thème pour la barre d’outils en mode compact
diff --git a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
index b0a864f7e..191601539 100644
--- a/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/ga-IE/browser/browser/preferences/zen-preferences.ftl
@@ -47,10 +47,10 @@ zen-tabs-unloader-enabled =
 zen-tabs-close-on-back-with-no-history = 
     .label = Dún an cluaisín agus aistrigh go dtí an cluaisín úinéara (nó an cluaisín is déanaí a úsáideadh) nuair a théann tú ar ais gan aon stair
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Timthriallta Ctrl+Tab laistigh de na cluaisíní Riachtanach nó Spás Oibre amháin
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Déan neamhaird de na cluaisíní atá ar feitheamh agus tú ag rothlú le Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Roghnóidh Ctrl+Tab an t-ord a úsáideadh le déanaí, toisc go bhfuil sé cumasaithe
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Úsáid cúlra téamach don bharra uirlisí dlúth
 zen-workspace-continue-where-left-off = 
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 30cbbf49d..2844c0084 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -95,5 +95,5 @@ zen-site-data-setting-site-protection = Cosaint Rianaithe
 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.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Oscail an Nasc i Glance
     .accesskey = G
diff --git a/locales/hu/browser/browser/preferences/zen-preferences.ftl b/locales/hu/browser/browser/preferences/zen-preferences.ftl
index 7dd5bc58e..1d929c3f3 100644
--- a/locales/hu/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/hu/browser/browser/preferences/zen-preferences.ftl
@@ -45,12 +45,12 @@ pane-settings-workspaces-title = Munkakörnyezetek
 zen-tabs-unloader-enabled = 
     .label = Lap ürítő engedélyezése
 zen-tabs-close-on-back-with-no-history = 
-    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+    .label = A lap bezárása után váltson a tulajdonos lapra (vagy a legutóbb használt lapra), ha nincs előzmény, amihez vissza lehetne lépni
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = A Ctrl+Tab csak az alapvető vagy a munkakörnyezetbeli lapok között lehet váltani
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = A Ctrl+Tab-al történő váltáskor a várakozó lapok figyelmen kívül hagyása
+zen-tabs-cycle-by-attribute-warning = A Ctrl+Tab a legutóbb használt sorrendben vált a lapok között, mivel ez a beállítás engedélyezve van
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Tematikus háttér használata a kompakt eszköztárhoz
 zen-workspace-continue-where-left-off = 
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index dbdab2e7b..0bd0c4c3a 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -95,5 +95,5 @@ zen-site-data-setting-site-protection = Nyomkövetés vé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.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Link megnyitása a bepillantóban
     .accesskey = G
diff --git a/locales/it/browser/browser/preferences/zen-preferences.ftl b/locales/it/browser/browser/preferences/zen-preferences.ftl
index d144a87cb..591187b55 100644
--- a/locales/it/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/it/browser/browser/preferences/zen-preferences.ftl
@@ -47,10 +47,10 @@ zen-tabs-unloader-enabled =
 zen-tabs-close-on-back-with-no-history = 
     .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Ctrl+Tab cicla solo tra le schede Essenziali o Spazi
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Ignora le schede in sospeso quando si cicla con Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Se abilitato, Ctrl+Tab ciclarà in ordine di utilizzo recente
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Utilizza lo sfondo a tema per la barra degli strumenti compatta
 zen-workspace-continue-where-left-off = 
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index f2357da65..13f55fa84 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -93,5 +93,5 @@ zen-site-data-setting-site-protection = Protezione Tracciamento
 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.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Apri collegamento in Sguardo
     .accesskey = G
diff --git a/locales/lt/browser/browser/preferences/zen-preferences.ftl b/locales/lt/browser/browser/preferences/zen-preferences.ftl
index 8836fa084..1dca2eaf2 100644
--- a/locales/lt/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/lt/browser/browser/preferences/zen-preferences.ftl
@@ -45,12 +45,12 @@ pane-settings-workspaces-title = Darbo sritys
 zen-tabs-unloader-enabled = 
     .label = Įjungti kortelių iškėlyklę
 zen-tabs-close-on-back-with-no-history = 
-    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+    .label = Užverti kortelę ir perjungti į jos savininko kortelę (arba paskutinę naudotą kortelę), grįžtant atgal be istorijos
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Vald+Tab perjungia tik tarp būtiniausių arba darbo srities kortelių
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Nepaisyti laukiančių kortelių, kai perjungiama langus su Vald+Tab
+zen-tabs-cycle-by-attribute-warning = Vald+Tab klavišai bus perjungiami pagal neseniai naudotą tvarką, nes ji yra įjungta.
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Naudoti teminį foną kompaktinei įrankių juostai
 zen-workspace-continue-where-left-off = 
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index c54b9b3d7..b4c18ab1f 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -95,5 +95,5 @@ zen-site-data-setting-site-protection = Stebėjimo 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.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Atverti nuorodą spartiuojame pažiūrėjime
     .accesskey = G
diff --git a/locales/uk/browser/browser/preferences/zen-preferences.ftl b/locales/uk/browser/browser/preferences/zen-preferences.ftl
index 0febb042c..142b5e00c 100644
--- a/locales/uk/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/uk/browser/browser/preferences/zen-preferences.ftl
@@ -47,10 +47,10 @@ zen-tabs-unloader-enabled =
 zen-tabs-close-on-back-with-no-history = 
     .label = Закрити вкладку і перейти до вкладки її власника (або останньої використаної вкладки) при поверненні без історії
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Ctrl+Tab перемикається лише в межах вкладок із важливого або робочого простору
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Ігнорувати очікувальні вкладки під час перемикання за допомогою Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Комбінація Ctrl+Tab буде перемикати в порядку останнього використання
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Використовувати тематичний фон для компактної панелі інструментів
 zen-workspace-continue-where-left-off = 
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index f609c26cf..2ed0f7a82 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -95,5 +95,5 @@ zen-site-data-setting-site-protection = Захист від відстеженн
 zen-site-data-panel-feature-callout-title = Новий дім для доповнень, дозволів тощо
 zen-site-data-panel-feature-callout-subtitle = Натисніть значок, щоби керувати налаштуваннями сайту, переглядати інформацію про безпеку, отримувати доступ до розширень і виконувати поширені дії.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Відкрити посилання в передперегляді
     .accesskey = G

From 32aff6623f362d1c6787c507c7dabb255ee22d8f Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 12 Nov 2025 14:33:11 +0100
Subject: [PATCH 081/162] fix: Fixed tab ownership being removed when opening
 new tabs, p=#11267, c=common

---
 .../base/content/browser-commands-js.patch    |   4 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 147 ++++++++++--------
 src/zen/common/ZenUIManager.mjs               |   6 +-
 src/zen/kbs/ZenKeyboardShortcuts.mjs          |   1 -
 4 files changed, 91 insertions(+), 67 deletions(-)

diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch
index 3c0aabfee..1c8e4e1fb 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 939ca497b882b3f4200141ba1b6764fb5c846f45..779cba5ff3df856a246321a36caa3725c054a314 100644
+index 939ca497b882b3f4200141ba1b6764fb5c846f45..09eb945215bb26e18c4414850bc4233ad5bd760c 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
 @@ -14,6 +14,10 @@ var BrowserCommands = {
@@ -7,7 +7,7 @@ index 939ca497b882b3f4200141ba1b6764fb5c846f45..779cba5ff3df856a246321a36caa3725
  
      if (where == "current") {
 +      if (!gBrowser.webNavigation.canGoBack && gZenCommonActions.shouldCloseTabOnBack()) {
-+        gBrowser.removeTab(gBrowser.selectedTab);
++        gBrowser.removeTab(gBrowser.selectedTab, { animate: true });
 +        return;
 +      }
        try {
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 407e111dc..c581a6389 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc349868d0d0 100644
+index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad0c761fb5 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -450,15 +450,64 @@
@@ -132,7 +132,15 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1470,6 +1533,7 @@
+@@ -1379,7 +1442,6 @@
+ 
+       // Preview mode should not reset the owner
+       if (!this._previewMode && !oldTab.selected) {
+-        oldTab.owner = null;
+       }
+ 
+       let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
+@@ -1470,6 +1532,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -140,7 +148,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1622,6 +1686,9 @@
+@@ -1622,6 +1685,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -150,7 +158,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1945,7 +2012,8 @@
+@@ -1945,7 +2011,8 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -160,7 +168,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          return false;
        }
  
-@@ -2053,7 +2121,7 @@
+@@ -2053,7 +2120,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -169,7 +177,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2328,6 +2396,7 @@
+@@ -2328,6 +2395,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -177,7 +185,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2401,8 +2470,7 @@
+@@ -2401,8 +2469,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -187,7 +195,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          b.setAttribute("transparent", "true");
        }
  
-@@ -2567,7 +2635,7 @@
+@@ -2567,7 +2634,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -196,7 +204,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2626,8 +2694,8 @@
+@@ -2626,8 +2693,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) {
@@ -207,7 +215,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2814,7 +2882,6 @@
+@@ -2814,7 +2881,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -215,7 +223,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -2923,6 +2990,8 @@
+@@ -2923,6 +2989,8 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -224,7 +232,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2933,6 +3002,12 @@
+@@ -2933,10 +3001,17 @@
          );
        }
  
@@ -237,7 +245,20 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2996,6 +3071,19 @@
+ 
++      if (!gURLBar.hasAttribute("zen-newtab")) {
+       // If we're opening a foreground tab, set the owner by default.
+       ownerTab ??= inBackground ? null : this.selectedTab;
+ 
+@@ -2944,6 +3019,7 @@
+       if (this.selectedTab.owner) {
+         this.selectedTab.owner = null;
+       }
++      }
+ 
+       // Find the tab that opened this one, if any. This is used for
+       // determining positioning, and inherited attributes such as the
+@@ -2996,6 +3072,19 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -257,7 +278,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -3004,6 +3092,7 @@
+@@ -3004,6 +3093,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -265,7 +286,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -3022,6 +3111,7 @@
+@@ -3022,6 +3112,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -273,7 +294,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          }));
  
          if (focusUrlBar) {
-@@ -3146,6 +3236,12 @@
+@@ -3146,6 +3237,12 @@
          }
        }
  
@@ -286,7 +307,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3330,10 +3426,10 @@
+@@ -3330,10 +3427,10 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -298,7 +319,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        }
  
        if (!color) {
-@@ -3354,9 +3450,14 @@
+@@ -3354,9 +3451,14 @@
          label,
          isAdoptingGroup
        );
@@ -315,7 +336,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        );
        group.addTabs(tabs);
  
-@@ -3477,7 +3578,7 @@
+@@ -3477,7 +3579,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -324,7 +345,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        );
      }
  
-@@ -3679,6 +3780,7 @@
+@@ -3679,6 +3781,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -332,7 +353,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3748,6 +3850,7 @@
+@@ -3748,6 +3851,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -340,7 +361,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          });
        }
  
-@@ -3935,7 +4038,7 @@
+@@ -3935,7 +4039,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -349,7 +370,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -3972,8 +4075,10 @@
+@@ -3972,8 +4076,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -361,7 +382,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
            if (select) {
              tabToSelect = tab;
            }
-@@ -3985,7 +4090,8 @@
+@@ -3985,7 +4091,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -371,7 +392,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3999,7 +4105,10 @@
+@@ -3999,7 +4106,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -383,7 +404,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4044,9 +4153,23 @@
+@@ -4044,9 +4154,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -407,7 +428,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4237,11 +4360,14 @@
+@@ -4237,11 +4361,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -423,7 +444,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4253,7 +4379,7 @@
+@@ -4253,7 +4380,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -432,7 +453,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
              tabGroup = previousTab.group;
            }
            if (
-@@ -4264,7 +4390,7 @@
+@@ -4264,7 +4391,7 @@
            ) {
              elementIndex = Infinity;
            } else if (previousTab.visible) {
@@ -441,7 +462,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4292,14 +4418,14 @@
+@@ -4292,14 +4419,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -460,7 +481,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4310,7 +4436,7 @@
+@@ -4310,7 +4437,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -469,7 +490,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          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);
-@@ -4346,6 +4472,7 @@
+@@ -4346,6 +4473,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -477,7 +498,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
  
        TabBarVisibility.update();
      }
-@@ -4635,6 +4762,9 @@
+@@ -4635,6 +4763,9 @@
          return;
        }
  
@@ -487,7 +508,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
      }
  
-@@ -4896,6 +5026,7 @@
+@@ -4896,6 +5027,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -495,7 +516,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4985,6 +5116,7 @@
+@@ -4985,6 +5117,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -503,7 +524,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        } catch (e) {
          console.error(e);
        }
-@@ -5023,6 +5155,12 @@
+@@ -5023,6 +5156,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -516,7 +537,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -5037,6 +5175,9 @@
+@@ -5037,6 +5176,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -526,7 +547,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5085,7 +5226,13 @@
+@@ -5085,7 +5227,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -541,7 +562,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          return;
        }
  
-@@ -5219,7 +5366,7 @@
+@@ -5219,7 +5367,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -550,7 +571,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5243,6 +5390,7 @@
+@@ -5243,6 +5391,7 @@
  
          newTab = true;
        }
@@ -558,7 +579,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5283,13 +5431,7 @@
+@@ -5283,13 +5432,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -573,7 +594,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        } else {
          TabBarVisibility.update();
        }
-@@ -5422,6 +5564,7 @@
+@@ -5422,6 +5565,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -581,7 +602,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5643,6 +5786,7 @@
+@@ -5643,6 +5787,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -589,7 +610,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5655,13 +5799,13 @@
+@@ -5655,13 +5800,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -605,7 +626,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5677,7 +5821,7 @@
+@@ -5677,7 +5822,7 @@
        }
  
        if (tab) {
@@ -614,7 +635,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5698,7 +5842,7 @@
+@@ -5698,7 +5843,7 @@
          });
        }
  
@@ -623,7 +644,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
      }
  
      _blurTab(aTab) {
-@@ -6104,10 +6248,10 @@
+@@ -6104,10 +6249,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -636,7 +657,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6166,6 +6310,7 @@
+@@ -6166,6 +6311,7 @@
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
      replaceTabWithWindow(aTab, aOptions) {
@@ -644,7 +665,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6299,7 +6444,7 @@
+@@ -6299,7 +6445,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -653,7 +674,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
      }
  
      /**
-@@ -6375,8 +6520,8 @@
+@@ -6375,8 +6521,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -664,7 +685,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6402,10 +6547,16 @@
+@@ -6402,10 +6548,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -683,7 +704,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6463,23 +6614,28 @@
+@@ -6463,23 +6615,28 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -718,7 +739,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        } 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
-@@ -6492,14 +6648,34 @@
+@@ -6492,14 +6649,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.
@@ -754,7 +775,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6508,7 +6684,7 @@
+@@ -6508,7 +6685,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -763,7 +784,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6580,10 +6756,10 @@
+@@ -6580,10 +6757,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -776,7 +797,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6613,6 +6789,7 @@
+@@ -6613,6 +6790,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -784,7 +805,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6639,7 +6816,7 @@
+@@ -6639,7 +6817,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -793,7 +814,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6676,6 +6853,10 @@
+@@ -6676,6 +6854,10 @@
  
        moveActionCallback();
  
@@ -804,7 +825,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7576,7 +7757,7 @@
+@@ -7576,7 +7758,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -813,7 +834,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7593,7 +7774,6 @@
+@@ -7593,7 +7775,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -821,7 +842,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
            });
            break;
          case "TabGroupCreateByUser":
-@@ -8542,6 +8722,7 @@
+@@ -8542,6 +8723,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -829,7 +850,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9543,7 +9724,7 @@ var TabContextMenu = {
+@@ -9543,7 +9725,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -838,7 +859,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..326bf96d9346aba7096d518fbf63cc34
      // Build Ask Chat items
      TabContextMenu.GenAI.buildTabMenu(
        document.getElementById("context_askChat"),
-@@ -9863,6 +10044,7 @@ var TabContextMenu = {
+@@ -9863,6 +10045,7 @@ var TabContextMenu = {
          )
        );
      } else {
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index f8c11d47a..645739228 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -443,7 +443,11 @@ var gZenUIManager = {
     if (gURLBar._zenHandleUrlbarClose) {
       gURLBar._zenHandleUrlbarClose = null;
     }
-    gURLBar.removeAttribute('zen-newtab');
+
+    setTimeout(() => {
+      // We use this attribute on Tabbrowser::addTab
+      gURLBar.removeAttribute('zen-newtab');
+    }, 0);
 
     // Safely restore tab visual state with proper validation
     if (
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index 04259eddb..55421898e 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -208,7 +208,6 @@ class nsKeyShortcutModifiers {
       str += AppConstants.platform == 'macosx' ? '⌘' : 'Ctrl';
       str += separation;
     }
-
     if (this.#alt) {
       str += AppConstants.platform == 'macosx' ? '⌥' : 'Alt';
       str += separation;

From 00b132d8b4a59d4c8f730e77bced4d1d0f13637e Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 12 Nov 2025 20:15:59 +0100
Subject: [PATCH 082/162] fix: Fixed compact mode animation toggle not taking
 the actual separator width, b=no-bug, c=compact-mode

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

diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 318a3b738..a4cf97ac4 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -359,11 +359,47 @@
         ) {
           return;
         }
+<<<<<<< Updated upstream
         delete gZenVerticalTabsManager._hadSidebarCollapse;
         this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
       }
       return sidebarWidth;
     },
+=======
+          if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
+            sidebarWidth -= 0.5 * splitterWidth;
+            if (elementSeparation < splitterWidth) {
+              // Subtract from the splitter width to end up with the correct element separation
+              sidebarWidth += 1.5 * splitterWidth - elementSeparation;
+            }
+          } else {
+            sidebarWidth -= elementSeparation;
+          }
+        if (canHideSidebar && isCompactMode) {
+          this._setElementExpandAttribute(this.sidebar, false);
+          gZenUIManager.motion
+            .animate(
+              this.sidebar,
+              {
+                marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
+                marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
+              },
+              {
+                ease: 'easeIn',
+                type: 'spring',
+                bounce: 0,
+                duration: 0.12,
+              }
+            )
+            .then(() => {
+              this.sidebar.style.transition = 'none';
+              this.sidebar.style.pointEvents = 'none';
+              const titlebar = document.getElementById('titlebar');
+              titlebar.style.visibility = 'hidden';
+              titlebar.style.transition = 'none';
+              this.sidebar.removeAttribute('animate');
+              document.documentElement.removeAttribute('zen-compact-animating');
+>>>>>>> Stashed changes
 
     get canHideSidebar() {
       return (

From 2ac1db0facb3ca5c4caef1194afebf545c98c595 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 12 Nov 2025 20:20:11 +0100
Subject: [PATCH 083/162] chore: Fixed git conflicts for compact mode fix,
 b=no-bug, c=compact-mode

---
 src/zen/compact-mode/ZenCompactMode.mjs | 54 +++++--------------------
 1 file changed, 9 insertions(+), 45 deletions(-)

diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index a4cf97ac4..baecbb6db 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -359,47 +359,11 @@
         ) {
           return;
         }
-<<<<<<< Updated upstream
         delete gZenVerticalTabsManager._hadSidebarCollapse;
         this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
       }
       return sidebarWidth;
     },
-=======
-          if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
-            sidebarWidth -= 0.5 * splitterWidth;
-            if (elementSeparation < splitterWidth) {
-              // Subtract from the splitter width to end up with the correct element separation
-              sidebarWidth += 1.5 * splitterWidth - elementSeparation;
-            }
-          } else {
-            sidebarWidth -= elementSeparation;
-          }
-        if (canHideSidebar && isCompactMode) {
-          this._setElementExpandAttribute(this.sidebar, false);
-          gZenUIManager.motion
-            .animate(
-              this.sidebar,
-              {
-                marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
-                marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
-              },
-              {
-                ease: 'easeIn',
-                type: 'spring',
-                bounce: 0,
-                duration: 0.12,
-              }
-            )
-            .then(() => {
-              this.sidebar.style.transition = 'none';
-              this.sidebar.style.pointEvents = 'none';
-              const titlebar = document.getElementById('titlebar');
-              titlebar.style.visibility = 'hidden';
-              titlebar.style.transition = 'none';
-              this.sidebar.removeAttribute('animate');
-              document.documentElement.removeAttribute('zen-compact-animating');
->>>>>>> Stashed changes
 
     get canHideSidebar() {
       return (
@@ -456,16 +420,16 @@
             resolve();
             return;
           }
-          if (canHideSidebar && isCompactMode) {
-            if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
-              sidebarWidth -= 0.5 * splitterWidth;
-              if (elementSeparation < splitterWidth) {
-                // Subtract from the splitter width to end up with the correct element separation
-                sidebarWidth += 1.5 * splitterWidth - elementSeparation;
-              }
-            } else {
-              sidebarWidth -= elementSeparation;
+          if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
+            sidebarWidth -= 0.5 * splitterWidth;
+            if (elementSeparation < splitterWidth) {
+              // Subtract from the splitter width to end up with the correct element separation
+              sidebarWidth += 1.5 * splitterWidth - elementSeparation;
             }
+          } else {
+            sidebarWidth -= elementSeparation;
+          }
+          if (canHideSidebar && isCompactMode) {
             this._setElementExpandAttribute(this.sidebar, false);
             gZenUIManager.motion
               .animate(

From d04872bac8bb1e94bda883afb02500511e3e2063 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Nov 2025 13:25:48 +0100
Subject: [PATCH 084/162] fix: Don't show toggle vertical tabs context menu
 item, b=no-bug, c=no-component

---
 .../customizableui/ToolbarContextMenu-sys-mjs.patch  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
index 628fc23d9..88bc51a65 100644
--- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
+++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
@@ -1,13 +1,15 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index 95621ae202378fb1ebceca5623a98b790b9eb5ff..fe6901f53f863bca20a514df0490499402d669ae 100644
+index 95621ae202378fb1ebceca5623a98b790b9eb5ff..835b831fb4f005ae4be72ce0953ac9254e6b4891 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-@@ -244,7 +244,7 @@ export var ToolbarContextMenu = {
+@@ -242,9 +242,7 @@ export var ToolbarContextMenu = {
+     // Show/hide sidebar and vertical tabs menu items
+     let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
      let showSidebarActions =
-       ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
-       toolbarItem?.localName == "toolbarspring" ||
+-      ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
+-      toolbarItem?.localName == "toolbarspring" ||
 -      isTitlebarSpacer;
-+      isTitlebarSpacer && false;
++      false;
  
      let toggleVerticalTabsItem = document.getElementById(
        "toolbar-context-toggle-vertical-tabs"

From d73176759f177f25860b9577e109d9644c640bcf Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Thu, 13 Nov 2025 17:04:07 +0100
Subject: [PATCH 085/162] fix: Fixed unified extension pref not working,
 b=no-bug, c=common

---
 prefs/zen/theme.yaml                            | 2 +-
 src/zen/common/styles/zen-single-components.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/prefs/zen/theme.yaml b/prefs/zen/theme.yaml
index afbc4ba01..28250f6f9 100644
--- a/prefs/zen/theme.yaml
+++ b/prefs/zen/theme.yaml
@@ -36,7 +36,7 @@
   value: '@IS_TWILIGHT@'
 
 - name: zen.theme.hide-unified-extensions-button
-  value: false
+  value: true
 
 # ==== Mark: border radius ====
 
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 094841385..87b40eed1 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -492,7 +492,7 @@ body > #confetti {
   }
 }
 
-@media (-moz-pref('zen.theme.hide-unified-extensions-button')) {
+@media -moz-pref('zen.theme.hide-unified-extensions-button') {
   #unified-extensions-button {
     display: none !important;
   }

From 9e899f1d8a09ebca5cf46e9571d3901034be8ffa Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Nov 2025 20:33:35 +0100
Subject: [PATCH 086/162] fix: Fixed drag-and-drop regression when updating
 Firefox 145.0, b=no-bug, c=folders

---
 .../components/tabbrowser/content/drag-and-drop-js.patch    | 6 +++---
 src/zen/folders/ZenFolders.mjs                              | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/drag-and-drop-js.patch b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
index 7e4ed9cf2..a6b01c804 100644
--- a/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
+++ b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js
-index c97c661656868bc7faaf7c66c9702eea056aafe1..aa9f0ed071e4898cac2b98a4d81e95df6a41b8dd 100644
+index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812307b9a04 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
 @@ -32,6 +32,9 @@
@@ -149,8 +149,8 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..aa9f0ed071e4898cac2b98a4d81e95df
          this.#tabbrowserTabs.verticalMode &&
 -        tab.pinned &&
 -        this.#tabbrowserTabs.hasAttribute("expanded") &&
-+        (tab.hasAttribute("zen-essential")) &&
-+        (this.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
++        tab.hasAttribute("zen-essential") &&
++        (this.#tabbrowserTabs.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
          !this.#tabbrowserTabs.expandOnHover
        );
      }
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 108fe4d90..0b9a4a77a 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1156,10 +1156,7 @@
       let dragDownThreshold =
         Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100;
 
-      const dropElementGroup = dropElement.group;
-      if (!dropElementGroup) {
-        return { dropElement, colorCode, dropBefore };
-      }
+      const dropElementGroup = dropElement;
       const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
       let firstGroupElem =
         dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;

From 5f6cc6490c95bb85da9ae9d2dbcebcbb04a43e4d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Nov 2025 20:48:43 +0100
Subject: [PATCH 087/162] feat: Only overflow the Y axis to prevent flashing,
 b=no-bug, c=common

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

diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index a1715df59..b857d9452 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -5,7 +5,7 @@
  */
 :root:not([inDOMFullscreen='true']):not([chromehidden~='location']):not([chromehidden~='toolbar']) {
   & #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
-    overflow: clip;
+    overflow-y: clip;
 
     :root:not([zen-no-padding='true']) &:not(.zen-glance-overlay) {
       border-radius: var(--zen-native-inner-radius);

From a0ce29666817c5000daf7be803c6f277cbf33a8b Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 14 Nov 2025 14:16:27 +0100
Subject: [PATCH 088/162] feat: Make 'Add tab to essentials' use a badge,
 b=no-bug, c=common, tabs

---
 locales/en-US/browser/browser/zen-general.ftl |  3 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 82 +++++++++++--------
 .../common/styles/zen-browser-container.css   |  2 +-
 .../common/styles/zen-single-components.css   |  9 +-
 src/zen/tabs/ZenPinnedTabManager.mjs          | 18 ++--
 5 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 3cd708737..bf4aa62d5 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -9,8 +9,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential =
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential =
     .label = Remove from Essentials
     .accesskey = R
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index c581a6389..740b71372 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad0c761fb5 100644
+index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326cbd973686 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -450,15 +450,64 @@
@@ -420,10 +420,10 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
 +            gZenWorkspaces._initialTab._shouldRemove = true;
 +          }
 +        }
-       }
++      }
 +      else {
 +        gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab;
-+      }
+       }
 +      this._hasAlreadyInitializedZenSessionStore = true;
  
        if (tabs.length > 1 || !tabs[0].selected) {
@@ -490,7 +490,19 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
          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);
-@@ -4346,6 +4473,7 @@
+@@ -4338,7 +4465,11 @@
+         const tabContainer = pinned
+           ? this.tabContainer.pinnedTabsContainer
+           : this.tabContainer;
++        if (itemAfter) {
++          itemAfter.before(tab);
++        } else {
+         tabContainer.insertBefore(tab, itemAfter);
++        }
+       }
+ 
+       this._updateTabsAfterInsert();
+@@ -4346,6 +4477,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -498,7 +510,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
  
        TabBarVisibility.update();
      }
-@@ -4635,6 +4763,9 @@
+@@ -4635,6 +4767,9 @@
          return;
        }
  
@@ -508,7 +520,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
      }
  
-@@ -4896,6 +5027,7 @@
+@@ -4896,6 +5031,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -516,7 +528,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4985,6 +5117,7 @@
+@@ -4985,6 +5121,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -524,7 +536,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        } catch (e) {
          console.error(e);
        }
-@@ -5023,6 +5156,12 @@
+@@ -5023,6 +5160,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -537,7 +549,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -5037,6 +5176,9 @@
+@@ -5037,6 +5180,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -547,7 +559,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5085,7 +5227,13 @@
+@@ -5085,7 +5231,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -562,7 +574,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
          return;
        }
  
-@@ -5219,7 +5367,7 @@
+@@ -5219,7 +5371,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -571,7 +583,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5243,6 +5391,7 @@
+@@ -5243,6 +5395,7 @@
  
          newTab = true;
        }
@@ -579,7 +591,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5283,13 +5432,7 @@
+@@ -5283,13 +5436,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -594,7 +606,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        } else {
          TabBarVisibility.update();
        }
-@@ -5422,6 +5565,7 @@
+@@ -5422,6 +5569,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -602,7 +614,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5643,6 +5787,7 @@
+@@ -5643,6 +5791,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -610,7 +622,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5655,13 +5800,13 @@
+@@ -5655,13 +5804,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -626,7 +638,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5677,7 +5822,7 @@
+@@ -5677,7 +5826,7 @@
        }
  
        if (tab) {
@@ -635,7 +647,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5698,7 +5843,7 @@
+@@ -5698,7 +5847,7 @@
          });
        }
  
@@ -644,7 +656,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
      }
  
      _blurTab(aTab) {
-@@ -6104,10 +6249,10 @@
+@@ -6104,10 +6253,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -657,7 +669,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6166,6 +6311,7 @@
+@@ -6166,6 +6315,7 @@
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
      replaceTabWithWindow(aTab, aOptions) {
@@ -665,7 +677,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6299,7 +6445,7 @@
+@@ -6299,7 +6449,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -674,7 +686,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
      }
  
      /**
-@@ -6375,8 +6521,8 @@
+@@ -6375,8 +6525,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -685,7 +697,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6402,10 +6548,16 @@
+@@ -6402,10 +6552,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -704,7 +716,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6463,23 +6615,28 @@
+@@ -6463,23 +6619,28 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -739,7 +751,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        } 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
-@@ -6492,14 +6649,34 @@
+@@ -6492,14 +6653,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.
@@ -775,7 +787,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6508,7 +6685,7 @@
+@@ -6508,7 +6689,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -784,7 +796,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6580,10 +6757,10 @@
+@@ -6580,10 +6761,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -797,7 +809,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6613,6 +6790,7 @@
+@@ -6613,6 +6794,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -805,7 +817,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6639,7 +6817,7 @@
+@@ -6639,7 +6821,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -814,7 +826,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6676,6 +6854,10 @@
+@@ -6676,6 +6858,10 @@
  
        moveActionCallback();
  
@@ -825,7 +837,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7576,7 +7758,7 @@
+@@ -7576,7 +7762,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -834,7 +846,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7593,7 +7775,6 @@
+@@ -7593,7 +7779,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -842,7 +854,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
            });
            break;
          case "TabGroupCreateByUser":
-@@ -8542,6 +8723,7 @@
+@@ -8542,6 +8727,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -850,7 +862,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9543,7 +9725,7 @@ var TabContextMenu = {
+@@ -9543,7 +9729,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -859,7 +871,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..2ab3908f421d6bc126eb7a0f886646ad
      // Build Ask Chat items
      TabContextMenu.GenAI.buildTabMenu(
        document.getElementById("context_askChat"),
-@@ -9863,6 +10045,7 @@ var TabContextMenu = {
+@@ -9863,6 +10049,7 @@ var TabContextMenu = {
          )
        );
      } else {
diff --git a/src/zen/common/styles/zen-browser-container.css b/src/zen/common/styles/zen-browser-container.css
index b857d9452..a1715df59 100644
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -5,7 +5,7 @@
  */
 :root:not([inDOMFullscreen='true']):not([chromehidden~='location']):not([chromehidden~='toolbar']) {
   & #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
-    overflow-y: clip;
+    overflow: clip;
 
     :root:not([zen-no-padding='true']) &:not(.zen-glance-overlay) {
       border-radius: var(--zen-native-inner-radius);
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 87b40eed1..efb207c32 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -374,8 +374,9 @@ body > #confetti {
 }
 
 .zen-site-data-section {
-  gap: 6px;
-  padding: 8px;
+  gap: 2px;
+  padding: 10px;
+  padding-bottom: 8px;
 }
 
 .zen-site-data-section-header {
@@ -505,7 +506,7 @@ body > #confetti {
 #zen-site-data-header {
   gap: 8px;
   align-items: center;
-  padding: 10px 9px;
+  padding: 10px 8px;
   padding-bottom: 0;
 
   :root[zen-single-toolbar='true']:not([zen-right-side='true']) & {
@@ -550,7 +551,7 @@ body > #confetti {
         );
 
         box-shadow:
-          0px 2px 4px rgba(0, 0, 0, 0.075),
+          0px 2px 4px rgba(0, 0, 0, 0.1),
           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.175), rgba(255, 255, 255, 0.1));
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 3436ba178..68104fd18 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -1106,7 +1106,6 @@
       const element = window.MozXULElement.parseXULToFragment(`
             <menuitem id="context_zen-add-essential"
                       data-l10n-id="tab-context-zen-add-essential"
-                      data-l10n-args='{"num": "0", "max": "${this.maxEssentialTabs}"}'
                       hidden="true"
                       disabled="true"
                       command="cmd_contextZenAddToEssentials"/>
@@ -1119,21 +1118,24 @@
       document.getElementById('context_pinTab')?.before(element);
     }
 
-    updatePinnedTabContextMenu(contextTab) {
+    async updatePinnedTabContextMenu(contextTab) {
       if (!this.enabled) {
         document.getElementById('context_pinTab').hidden = true;
         return;
       }
       const isVisible = contextTab.pinned && !contextTab.multiselected;
+      const zenAddEssential = document.getElementById('context_zen-add-essential');
       document.getElementById('context_zen-reset-pinned-tab').hidden =
         !isVisible || !contextTab.getAttribute('zen-pin-id');
       document.getElementById('context_zen-replace-pinned-url-with-current').hidden = !isVisible;
-      document.getElementById('context_zen-add-essential').hidden =
-        contextTab.getAttribute('zen-essential') || !!contextTab.group;
-      document.l10n.setArgs(document.getElementById('context_zen-add-essential'), {
-        num: gBrowser._numZenEssentials,
-        max: this.maxEssentialTabs,
-      });
+      zenAddEssential.hidden = contextTab.getAttribute('zen-essential') || !!contextTab.group;
+      zenAddEssential.setAttribute(
+        'badge',
+        await document.l10n.formatValue('tab-context-zen-add-essential-badge', {
+          num: gBrowser._numZenEssentials,
+          max: this.maxEssentialTabs,
+        })
+      );
       document
         .getElementById('cmd_contextZenAddToEssentials')
         .setAttribute('disabled', !this.canEssentialBeAdded(contextTab));

From b9aa9e3d3ab77e127b933431fa9d20365a922fe1 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:44:56 +0100
Subject: [PATCH 089/162] chore: New Crowdin updates, p=#11275

* New translations zen-preferences.ftl (German)

* New translations zen-workspaces.ftl (German)

* New translations zen-general.ftl (German)

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

* New translations zen-welcome.ftl (German)

* New translations zen-folders.ftl (German)

* 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 +-
 locales/ca/browser/browser/zen-general.ftl    |   3 +-
 locales/cs/browser/browser/zen-general.ftl    |   3 +-
 locales/cy/browser/browser/zen-general.ftl    |   3 +-
 locales/da/browser/browser/zen-general.ftl    |   3 +-
 .../browser/preferences/zen-preferences.ftl   | 104 +++++++++---------
 locales/de/browser/browser/zen-folders.ftl    |   2 +-
 locales/de/browser/browser/zen-general.ftl    |  23 ++--
 .../de/browser/browser/zen-vertical-tabs.ftl  |   6 +-
 locales/de/browser/browser/zen-welcome.ftl    |  16 +--
 locales/de/browser/browser/zen-workspaces.ftl |  16 +--
 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 |   3 +-
 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    |   3 +-
 locales/ga-IE/browser/browser/zen-general.ftl |   3 +-
 locales/he/browser/browser/zen-general.ftl    |   3 +-
 locales/hu/browser/browser/zen-general.ftl    |   3 +-
 locales/id/browser/browser/zen-general.ftl    |   3 +-
 locales/is/browser/browser/zen-general.ftl    |   3 +-
 locales/it/browser/browser/zen-general.ftl    |   3 +-
 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 |   3 +-
 locales/ru/browser/browser/zen-general.ftl    |   3 +-
 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    |   3 +-
 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 +-
 40 files changed, 152 insertions(+), 117 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 36e0ffbc2..eab8ae252 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = إعادة تعيين علامة التبويب المثبتة
     .accesskey = ر
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 64ccedee2..d063a7366 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Restableix la pestanya fixada
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Afegeix als essentials ({ $num } / { $max } espais ocupats)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Elimina dels essencials
     .accesskey = R
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 5fe517daa..5033d7aa7 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Resetovat připnuté karty
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Přidat do Essentials ({ $num } / { $max } zaplněných slotů)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Odstranit z Essentials
     .accesskey = R
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index 3f344c5c4..f771903df 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Ailosod Tab wedi'i Binio
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Diddymu o Hanfodion
     .accesskey = R
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index edee35a71..343c2072d 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Nulstil fastgjort fane
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Føj til Essentielle ({ $num } / { $max } pladser fyldt)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Fjern fra Essentielle
     .accesskey = R
diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index 7091cc44b..1af3340d9 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -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/.
 
-pane-zen-looks-title = Erscheinungsbild
+pane-zen-looks-title = Aussehen
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
 zen-warning-language = Das Ändern der Standardsprache könnte es Websites einfacher machen, Sie zu verfolgen.
@@ -47,10 +47,10 @@ zen-tabs-unloader-enabled =
 zen-tabs-close-on-back-with-no-history = 
     .label = Tab schließen und zum Besitzer-Tab (oder den zuletzt benutzten Tab) wechseln, wenn kein Tab-Verlauf vorhanden ist
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Strg+Tab wechselt nur zwischen Essential- oder Arbeitsbereich-Tabs
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Ausstehende Tabs beim Wechseln mit Strg+Tab ignorieren
+zen-tabs-cycle-by-attribute-warning = Strg+Tab wechselt in der zuletzt verwendeten Reihenfolge, da diese Option aktiviert ist
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Theme Hintergrund für kompakte Symbolleiste verwenden
 zen-workspace-continue-where-left-off = 
@@ -77,38 +77,38 @@ zen-pinned-tab-manager-close-close-shortcut-option =
     .label = Tab schließen
 pane-zen-workspaces-header = Arbeitsbereiche
 zen-settings-workspaces-header = Allgemeine Einstellungen für Arbeitsbereiche
-zen-settings-workspaces-description = Mit Arbeitsbereichen können Sie mehrere Browser-Sitzungen gleichzeitig haben!
+zen-settings-workspaces-description = Mit Arbeitsbereichen kannst du mehrere Browser-Sitzungen gleichzeitig haben
 zen-settings-workspaces-enabled = 
-    .label = Arbeitsbereiche aktivieren
+    .label = Arbeitsbereiche aktivieren (Experimentell)
 zen-settings-workspaces-hide-default-container-indicator = 
-    .label = Standard-Container-Anzeige in der Tab-Leiste ausblenden
+    .label = Container-Indikator 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 { $group } -> { $shortcut }
 pane-zen-theme-title = Design-Einstellungen
 zen-vertical-tabs-title = Seitenleiste und Tab-Layout
 zen-vertical-tabs-header = Vertikale Tabs
-zen-vertical-tabs-description = Verwalten Sie Ihre Tabs in einem vertikalen Layout
+zen-vertical-tabs-description = Verwalte die Ausrichtung der Tabs und andere Layout-Einstellungen
 zen-vertical-tabs-show-expand-button = 
     .label = Erweitern-Schaltfläche anzeigen
 zen-vertical-tabs-newtab-on-tab-list = 
-    .label = Schaltfläche "Neuer Tab" in der Tab-Liste anzeigen
+    .label = "Neuen Tab"-Button in der Tab-Liste anzeigen
 zen-vertical-tabs-newtab-top-button-up = 
     .label = Schaltfläche "Neuer Tab" nach oben verschieben
 zen-vertical-tabs-expand-tabs-by-default = Tabs standardmäßig erweitern
 zen-vertical-tabs-dont-expand-tabs-by-default = Tabs standardmäßig nicht erweitern
-zen-vertical-tabs-expand-tabs-on-hover = Tabs beim Drüberfahren erweitern (funktioniert nicht im Kompaktmodus)
+zen-vertical-tabs-expand-tabs-on-hover = Tabs bei Hover erweitern (funktioniert nicht im Kompaktmodus)
 zen-vertical-tabs-expand-tabs-header = Wie Tabs erweitert werden sollen
-zen-vertical-tabs-expand-tabs-description = Wählen Sie, wie Tabs in der Seitenleiste erweitert werden sollen
+zen-vertical-tabs-expand-tabs-description = Wähle aus, wie Tabs in der Seitenleiste erweitert werden sollen
 zen-theme-marketplace-header = Zen Mods
 zen-theme-disable-all-enabled = 
     .title = Alle Mods deaktivieren
 zen-theme-disable-all-disabled = 
     .title = Alle Mods aktivieren
-zen-theme-marketplace-description = Finden und installieren Sie Mods aus dem Store.
+zen-theme-marketplace-description = Finde und installiere Designs aus dem Store.
 zen-theme-marketplace-remove-button = 
-    .label = Mod entfernen
+    .label = Design entfernen
 zen-theme-marketplace-check-for-updates-button = 
-    .label = Auf Updates prüfen
+    .label = Nach Updates suchen
 zen-theme-marketplace-import-button = 
     .label = Mods importieren
 zen-theme-marketplace-export-button = 
@@ -117,20 +117,20 @@ zen-theme-marketplace-import-success = Mods erfolgreich importiert
 zen-theme-marketplace-import-failure = Beim Importieren der Mods ist ein Fehler aufgetreten
 zen-theme-marketplace-export-success = Mods erfolgreich exportiert
 zen-theme-marketplace-export-failure = Beim Exportieren der Mods ist ein Fehler aufgetreten
-zen-theme-marketplace-updates-success = Mods wurden erfolgreich aktualisiert
+zen-theme-marketplace-updates-success = Design erfolgreich aktualisiert
 zen-theme-marketplace-updates-failure = Es konnten keine Updates gefunden werden!
 zen-theme-marketplace-toggle-enabled-button = 
-    .title = Mod deaktivieren
+    .title = Design deaktivieren
 zen-theme-marketplace-toggle-disabled-button = 
-    .title = Mod aktivieren
-zen-theme-marketplace-remove-confirmation = Sind Sie sicher, dass Sie diesen Mod entfernen möchten?
+    .title = Design aktivieren
+zen-theme-marketplace-remove-confirmation = Möchtest du dieses Mod wirklich entfernen?
 zen-theme-marketplace-close-modal = Schließen
 zen-theme-marketplace-theme-header-title = 
     .title = CSS-Selektor: { $name }
 zen-theme-marketplace-dropdown-default-label = 
     .label = Keine
 zen-theme-marketplace-input-default-placeholder = 
-    .placeholder = Etwas eingeben...
+    .placeholder = Gib etwas ein...
 pane-zen-marketplace-title = Zen Mods
 zen-themes-auto-update = 
     .label = Installierte Mods beim Start automatisch aktualisieren
@@ -160,24 +160,24 @@ category-zen-CKS =
     .tooltiptext = { pane-zen-CKS-title }
 pane-settings-CKS-title = { -brand-short-name } Tastenkürzel
 zen-settings-CKS-header = Passen Sie Ihre Tastenkürzel an
-zen-settings-CKS-description = Ändern Sie die Standard-Tastenkürzel nach Ihren Wünschen und verbessern Sie Ihr Browser-Erlebnis
+zen-settings-CKS-description = Ändere die Standard-Tastenkürzel nach deinen Wünschen und verbessere dein Browser-Erlebnis
 zen-settings-CKS-disable-firefox = 
     .label = { -brand-short-name } Standard-Tastenkürzel deaktivieren
 zen-settings-CKS-duplicate-shortcut = 
-    .label = Tastenkürzel duplizieren
+    .label = Doppeltes Tastenkürzel
 zen-settings-CKS-reset-shortcuts = 
     .label = Auf Standard zurücksetzen
-zenCKSOption-group-other = Sonstige
-zenCKSOption-group-windowAndTabManagement = Fenster- & Tab-Verwaltung
+zenCKSOption-group-other = Sonstiges
+zenCKSOption-group-windowAndTabManagement = Fenster- und Tab-Verwaltung
 zenCKSOption-group-navigation = Navigation
-zenCKSOption-group-searchAndFind = Suchen & Finden
+zenCKSOption-group-searchAndFind = Suchen und Finden
 zenCKSOption-group-pageOperations = Seitenoperationen
 zenCKSOption-group-historyAndBookmarks = Verlauf & Lesezeichen
 zenCKSOption-group-mediaAndDisplay = Medien & Anzeige
 zenCKSOption-group-zen-compact-mode = Kompaktmodus
-zenCKSOption-group-zen-workspace = Arbeitsbereiche
+zenCKSOption-group-zen-workspace = Zen Arbeitsbereiche
 zenCKSOption-group-zen-other = Andere Zen-Funktionen
-zenCKSOption-group-zen-split-view = Geteilte Ansicht
+zenCKSOption-group-zen-split-view = Zen Geteilte Ansicht
 zenCKSOption-group-devTools = Entwicklertools
 zen-key-quick-restart = Schneller Neustart
 zen-window-new-shortcut = Neues Fenster
@@ -186,7 +186,7 @@ zen-key-redo = Wiederholen
 zen-restore-last-closed-tab-shortcut = Letzten geschlossenen Tab wiederherstellen
 zen-location-open-shortcut = Adresse öffnen
 zen-location-open-shortcut-alt = Adresse öffnen (Alt)
-zen-key-undo-close-window = Fenster schließen rückgängig machen
+zen-key-undo-close-window = Geschlossenes Fenster wiederherstellen
 zen-text-action-undo-shortcut = Rückgängig
 zen-text-action-redo-shortcut = Wiederholen
 zen-text-action-cut-shortcut = Ausschneiden
@@ -196,15 +196,15 @@ zen-text-action-copy-url-markdown-shortcut = Aktuelle URL als Markdown kopieren
 zen-text-action-paste-shortcut = Einfügen
 zen-text-action-select-all-shortcut = Alles auswählen
 zen-text-action-delete-shortcut = Löschen
-zen-history-show-all-shortcut-mac = Gesamten Verlauf anzeigen (Mac)
+zen-history-show-all-shortcut-mac = Verlauf anzeigen (Mac)
 zen-full-screen-shortcut = Vollbild umschalten
 zen-reader-mode-toggle-shortcut-windows = Lesemodus umschalten (Windows)
-zen-picture-in-picture-toggle-shortcut-alt = Bild-in-Bild umschalten (Alt)
-zen-picture-in-picture-toggle-shortcut-mac = Bild-in-Bild umschalten (Mac)
-zen-picture-in-picture-toggle-shortcut-mac-alt = Bild-in-Bild umschalten (Mac Alt)
-zen-page-source-shortcut-safari = Seitenquelltext anzeigen (Safari)
-zen-nav-stop-shortcut = Laden stoppen
-zen-history-sidebar-shortcut = Verlauf-Seitenleiste anzeigen
+zen-picture-in-picture-toggle-shortcut-alt = Bild-im-Bild umschalten (Alt)
+zen-picture-in-picture-toggle-shortcut-mac = Bild-im-Bild umschalten (Mac)
+zen-picture-in-picture-toggle-shortcut-mac-alt = Bild-im-Bild umschalten (Mac Alternative)
+zen-page-source-shortcut-safari = Seitenquelltext (Safari)
+zen-nav-stop-shortcut = Navigation stoppen
+zen-history-sidebar-shortcut = Verlaufs-Seitenleiste
 zen-window-minimize-shortcut = Fenster minimieren
 zen-help-shortcut = Hilfe öffnen
 zen-preferences-shortcut = Einstellungen öffnen
@@ -218,11 +218,11 @@ zen-file-open-shortcut = Datei öffnen
 zen-save-page-shortcut = Seite speichern
 zen-print-shortcut = Seite drucken
 zen-close-shortcut-2 = Tab schließen
-zen-mute-toggle-shortcut = Stummschaltung umschalten
-zen-key-delete = Entfernen-Taste
+zen-mute-toggle-shortcut = Stumm schalten umschalten
+zen-key-delete = Löschen-Taste
 zen-key-go-back = Zurück gehen
 zen-key-go-forward = Vorwärts gehen
-zen-nav-back-shortcut-alt = Rückwärts navigieren (Alt)
+zen-nav-back-shortcut-alt = Zurück navigieren (Alt)
 zen-nav-fwd-shortcut-alt = Vorwärts navigieren (Alt)
 zen-history-show-all-shortcut = Gesamten Verlauf anzeigen
 zen-key-enter-full-screen = Vollbild aktivieren
@@ -232,15 +232,15 @@ zen-key-inspector-mac = Inspektor umschalten (Mac)
 zen-toggle-sidebar-shortcut = Firefox-Seitenleiste umschalten
 zen-toggle-pin-tab-shortcut = Angepinnter Tab umschalten
 zen-reader-mode-toggle-shortcut-other = Lesemodus umschalten
-zen-picture-in-picture-toggle-shortcut = Bild-in-Bild umschalten
+zen-picture-in-picture-toggle-shortcut = Bild-im-Bild umschalten
 zen-nav-reload-shortcut-2 = Seite neu laden
 zen-key-about-processes = Über Prozesse
 zen-page-source-shortcut = Seitenquelltext anzeigen
 zen-page-info-shortcut = Seiteninformationen anzeigen
 zen-find-shortcut = Auf Seite suchen
-zen-search-find-again-shortcut = Erneut suchen
+zen-search-find-again-shortcut = Weitersuchen
 zen-search-find-again-shortcut-prev = Vorheriges suchen
-zen-search-find-again-shortcut-2 = Erneut suchen (Alt)
+zen-search-find-again-shortcut-2 = Weitersuchen (Alt)
 zen-bookmark-this-page-shortcut = Diese Seite zu Lesezeichen hinzufügen
 zen-bookmark-show-library-shortcut = Lesezeichen-Bibliothek anzeigen
 zen-key-stop = Laden stoppen
@@ -250,13 +250,13 @@ zen-full-zoom-reset-shortcut = Zoom zurücksetzen
 zen-full-zoom-reset-shortcut-alt = Zoom zurücksetzen (Alt)
 zen-full-zoom-enlarge-shortcut-alt = Hineinzoomen (Alt)
 zen-full-zoom-enlarge-shortcut-alt2 = Hineinzoomen (Alt 2)
-zen-bidi-switch-direction-shortcut = Textrichtung wechseln
-zen-private-browsing-shortcut = Privates Surfen
-zen-screenshot-shortcut = Screenshot erstellen
-zen-key-sanitize = Browserdaten löschen
+zen-bidi-switch-direction-shortcut = Text-Richtung wechseln
+zen-private-browsing-shortcut = Privaten Modus öffnen
+zen-screenshot-shortcut = Screenshot machen
+zen-key-sanitize = Browser-Daten löschen
 zen-quit-app-shortcut = Anwendung beenden
-zen-key-wr-capture-cmd = WR Aufnahmebefehl
-zen-key-wr-toggle-capture-sequence-cmd = WR Aufnahmesequenz umschalten
+zen-key-wr-capture-cmd = WR-Aufnahme-Befehl
+zen-key-wr-toggle-capture-sequence-cmd = WR-Aufnahmesequenz umschalten
 zen-nav-reload-shortcut = Seite neu laden
 zen-nav-reload-shortcut-skip-cache = Seite neu laden (Cache überspringen)
 zen-close-shortcut = Fenster schließen
@@ -275,13 +275,13 @@ zen-workspace-shortcut-switch-7 = Zu Arbeitsbereich 7 wechseln
 zen-workspace-shortcut-switch-8 = Zu Arbeitsbereich 8 wechseln
 zen-workspace-shortcut-switch-9 = Zu Arbeitsbereich 9 wechseln
 zen-workspace-shortcut-switch-10 = Zu Arbeitsbereich 10 wechseln
-zen-workspace-shortcut-forward = Nächster Arbeitsbereich
-zen-workspace-shortcut-backward = Vorheriger Arbeitsbereich
+zen-workspace-shortcut-forward = Zum nächsten Arbeitsbereich wechseln
+zen-workspace-shortcut-backward = Zum vorherigen Arbeitsbereich wechseln
 zen-sidebar-shortcut-toggle = Seitenleisten-Breite umschalten
-zen-pinned-tab-shortcut-reset = Angepinnten Tab auf angepinnte URL zurücksetzen
-zen-split-view-shortcut-grid = Geteilte Ansicht Raster umschalten
-zen-split-view-shortcut-vertical = Geteilte Ansicht vertikal umschalten
-zen-split-view-shortcut-horizontal = Geteilte Ansicht horizontal umschalten
+zen-pinned-tab-shortcut-reset = Angehefteten Tab zurücksetzen
+zen-split-view-shortcut-grid = Raster-Layout für geteilte Ansicht umschalten
+zen-split-view-shortcut-vertical = Vertikales Layout für geteilte Ansicht umschalten
+zen-split-view-shortcut-horizontal = Horizontales Layout für geteilte Ansicht umschalten
 zen-split-view-shortcut-unsplit = Geteilte Ansicht schließen
 zen-new-empty-split-view-shortcut = Neuer leerer Split View
 zen-key-select-tab-1 = Tab #1 auswählen
diff --git a/locales/de/browser/browser/zen-folders.ftl b/locales/de/browser/browser/zen-folders.ftl
index a295a8ac9..0c56c64cc 100644
--- a/locales/de/browser/browser/zen-folders.ftl
+++ b/locales/de/browser/browser/zen-folders.ftl
@@ -22,4 +22,4 @@ zen-folders-unload-all-tooltip =
     .tooltiptext = Aktive Tabs in diesem Ordner entladen
 zen-folders-unload-folder = 
     .label = Alle Tabs entladen
-zen-folders-search-no-results = Keine passenden Tabs gefunden 🤔
+zen-folders-search-no-results = Keine passenden Tabs gefunden
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 6346958c9..09b6a5b15 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -5,23 +5,24 @@
 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 = 
-    .label = Angepinnten Tab zurücksetzen
+    .label = Angehefteten Tab zurücksetzen
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Zu Essentials hinzufügen ({ $num } / { $max } Plätze belegt)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Aus Essentials entfernen
     .accesskey = R
 tab-context-zen-replace-pinned-url-with-current = 
-    .label = Angepinnte URL durch aktuelle ersetzen
+    .label = Angeheftete 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.
-zen-shortcuts-corrupted = Ihre { -brand-short-name } Tastenkürzel-Datei ist beschädigt. Sie wurde auf die Standard-Tastenkürzel zurückgesetzt.
+zen-themes-corrupted = Deine { -brand-short-name } Mods-Datei ist beschädigt. Sie wurde auf das Standard-Design zurückgesetzt.
+zen-shortcuts-corrupted = Deine { -brand-short-name } Tastenkürzel-Datei ist beschädigt. Sie wurde auf die Standard-Tastenkürzel zurückgesetzt.
 # note: Do not translate the "<br/>" tags in the following string
 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!
+    Öffne einen neuen Tab, um die neue Adressleiste in Aktion zu sehen!
 zen-disable = Deaktivieren
 pictureinpicture-minimize-btn = 
     .aria-label = Minimieren
@@ -33,7 +34,7 @@ zen-general-cancel-label =
     .label = Abbrechen
 zen-general-confirm = 
     .label = Bestätigen
-zen-pinned-tab-replaced = Die URL des angepinnten Tabs wurde durch die aktuelle URL ersetzt!
+zen-pinned-tab-replaced = Die URL des angehefteten 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!
@@ -43,7 +44,7 @@ zen-library-sidebar-mods =
     .label = Mods
 zen-toggle-compact-mode-button = 
     .label = Kompakter Modus
-    .tooltiptext = Compact Mode umschalten
+    .tooltiptext = Kompakten Modus umschalten
 
 # note: Do not translate the "<br/>" tags in the following string
 
@@ -92,8 +93,8 @@ zen-site-data-setting-site-protection = Tracking-Schutz
 
 # Section: Feature callouts
 
-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.
+zen-site-data-panel-feature-callout-title = Ein neuer Ort für Add-ons, Berechtigungen und mehr
+zen-site-data-panel-feature-callout-subtitle = Klicke auf das Symbol, um Website-Einstellungen zu verwalten, Sicherheitsinformationen anzuzeigen, auf Erweiterungen zuzugreifen und häufige Aktionen auszuführen.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Link in Glance öffnen
     .accesskey = G
diff --git a/locales/de/browser/browser/zen-vertical-tabs.ftl b/locales/de/browser/browser/zen-vertical-tabs.ftl
index 2540c82da..b8f7da8a5 100644
--- a/locales/de/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/de/browser/browser/zen-vertical-tabs.ftl
@@ -33,7 +33,7 @@ tabbrowser-unload-tab-button =
 tabbrowser-reset-pin-button = 
     .tooltiptext =
         { $tabCount ->
-            [one] Tab zurücksetzen und anpinnen
-           *[other] { $tabCount } Tabs zurücksetzen und anpinnen
+            [one] Tab zurücksetzen und anheften
+           *[other] { $tabCount } Tabs zurücksetzen und anheften
         }
-tab-reset-pin-label = Zurück zur angepinnten URL
+tab-reset-pin-label = Zurück zur angehefteten URL
diff --git a/locales/de/browser/browser/zen-welcome.ftl b/locales/de/browser/browser/zen-welcome.ftl
index 7a860e4df..ddcd9d751 100644
--- a/locales/de/browser/browser/zen-welcome.ftl
+++ b/locales/de/browser/browser/zen-welcome.ftl
@@ -6,21 +6,21 @@ zen-welcome-title-line1 = Willkommen zu
 zen-welcome-title-line2 = einem ruhigeren Internet
 zen-welcome-import-title = Ein neuer Anfang, dieselben Lesezeichen
 zen-welcome-import-description-1 = Ihre Lesezeichen, Ihr Verlauf und Ihre Passwörter sind wie eine Spur durch das Internet – lassen Sie sie nicht zurück!
-zen-welcome-import-description-2 = Übertragen Sie sie ganz einfach aus einem anderen Browser und machen Sie genau dort weiter, wo Sie aufgehört haben.
+zen-welcome-import-description-2 = Übertrage sie ganz einfach aus einem anderen Browser und mache genau dort weiter, wo du aufgehört hast.
 zen-welcome-import-button = Jetzt importieren
 zen-welcome-set-default-browser = { -brand-short-name } als Standardbrowser festlegen
 zen-welcome-dont-set-default-browser = { -brand-short-name } NICHT als Standardbrowser festlegen
-zen-welcome-initial-essentials-title = Ihre wichtigsten Tabs, immer in Reichweite
-zen-welcome-initial-essentials-description-1 = Halten Sie Ihre wichtigsten Tabs leicht zugänglich und immer griffbereit, egal wie viele Sie öffnen.
-zen-welcome-initial-essentials-description-2 = Essential-Tabs sind immer sichtbar, unabhängig davon, in welchem Arbeitsbereich Sie sich befinden.
-zen-welcome-workspace-colors-title = Ihre Arbeitsbereiche, Ihre Farben
+zen-welcome-initial-essentials-title = Deine wichtigsten Tabs, immer in Reichweite
+zen-welcome-initial-essentials-description-1 = Halte deine wichtigsten Tabs leicht zugänglich und immer griffbereit, egal wie viele du öffnest.
+zen-welcome-initial-essentials-description-2 = Essential-Tabs sind immer sichtbar, unabhängig davon, in welchem Arbeitsbereich du dich befindest.
+zen-welcome-workspace-colors-title = Deine Arbeitsbereiche, deine Farben
 zen-welcome-workspace-colors-description = Personalisieren Sie Ihren Browser, indem Sie jedem Arbeitsbereich eine eigene Farbidentität geben.
 zen-welcome-start-browsing-title =
     Alles bereit?<br/>
     Dann kann es losgehen!
-zen-welcome-start-browsing-description-1 = Sie sind startklar! Klicken Sie auf die Schaltfläche unten, um mit { -brand-short-name } zu beginnen.
+zen-welcome-start-browsing-description-1 = Du bist startklar! Klicke auf die Schaltfläche unten, um mit { -brand-short-name } zu beginnen.
 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-default-search-description = Wähle deine Standard-Suchmaschine. Du kannst sie jederzeit später ändern!
 zen-welcome-skip-button = Überspringen
-zen-welcome-finished = Ihr Zen wurde erfolgreich eingerichtet!
+zen-welcome-finished = Dein Zen wurde erfolgreich eingerichtet!
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index ac3ab82f7..fc0cac6b3 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -8,20 +8,20 @@ zen-panel-ui-workspaces-create =
 zen-panel-ui-folder-create = 
     .label = Ordner erstellen
 zen-panel-ui-new-empty-split = 
-    .label = Split View erstellen
+    .label = Neuen Split erstellen
 zen-workspaces-panel-context-delete = 
     .label = Arbeitsbereich löschen
     .accesskey = D
 zen-workspaces-panel-change-name = 
-    .label = Name ändern
+    .label = Namen ändern
 zen-workspaces-panel-change-icon = 
     .label = Symbol ändern
 zen-workspaces-panel-context-default-profile = 
     .label = Profil festlegen
 zen-workspaces-panel-unload = 
     .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-how-to-reorder-title = So ordnest du Arbeitsbereiche neu an
+zen-workspaces-how-to-reorder-desc = Ziehe die Arbeitsbereich-Symbole am unteren Rand der Seitenleiste, um sie neu anzuordnen
 zen-workspaces-change-theme = 
     .label = Design bearbeiten
 zen-workspaces-panel-context-open = 
@@ -54,12 +54,12 @@ zen-workspaces-panel-context-reorder =
 zen-workspace-creation-profile = Profil
     .tooltiptext = Profile werden verwendet, um Cookies und Website-Daten zwischen Arbeitsbereichen zu trennen.
 zen-workspace-creation-header = Arbeitsbereich erstellen
-zen-workspace-creation-label = Arbeitsbereiche werden verwendet, um Ihre Tabs und Sitzungen zu organisieren.
+zen-workspace-creation-label = Arbeitsbereiche helfen dir, deine Tabs und Sitzungen zu organisieren.
 zen-workspaces-delete-workspace-title = Arbeitsbereich löschen?
-zen-workspaces-delete-workspace-body = Sind Sie sicher, dass Sie { $name } löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.
+zen-workspaces-delete-workspace-body = Möchtest du { $name } wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs geschlossen! Nutze <span>{ $shortcut }</span> , um rückgängig zu machen.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs geschlossen! Nutze <span>{ $shortcut }</span>, um rückgängig zu machen.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Löschen
+    .label = Aufräumen
     .tooltiptext = Alle nicht angehefteten Tabs schließen
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index ac34f6830..30770a89f 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Επαναφορά Καρφιτσωμένης Καρτέλας
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Προσθήκη στα Απαραίτητα ({ $num } / { $max } θέσεις γεμάτες)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Αφαίρεση από Απαραίτητα
     .accesskey = R
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index 46742f630..cbfaa23b2 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index 85346c269..efb854572 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Restablecer pestaña fijada
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Añadir a esenciales ({ $num } / { $max } huecos llenos)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Quitar de esenciales
     .accesskey = R
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index f93107eaf..332aabcf1 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Lähtesta püsikaart
     .accesskey = p
 tab-context-zen-add-essential = 
-    .label = Märgi oluliseks ({ $num } / { $max } täidetud)
+    .label = Add to Essentials
     .accesskey = o
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Eemalda olulistest
     .accesskey = o
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index 76eac56f9..c3d119ffa 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 14487dae8..6b75aa1ab 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Nollaa Kiinnitetty Välilehti
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Poista olennaisista
     .accesskey = R
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 2173484ab..e00bfe1db 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Réinitialiser l’onglet épinglé
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Ajouter aux Essentials ({ $num } / { $max } emplacements occupés)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Retirer des Essentials
     .accesskey = R
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 2844c0084..2a4a7c99a 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ 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 } / { $max } sliotán líonta)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Bain de na Bunriachtanais
     .accesskey = R
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index 6ff3f2a35..c546889ce 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = אפס כרטיסייה מוצמדת
     .accesskey = ר
 tab-context-zen-add-essential = 
-    .label = הוסף לנחוצים ({ $num } / { $max } מקומות מלאים)
+    .label = Add to Essentials
     .accesskey = ק
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = הסר מנחוצים
     .accesskey = ר
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 0bd0c4c3a..2bedf561f 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ 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 } / { $max } hely foglalt)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Eltávolítás az alapvetőkből
     .accesskey = R
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 74e7a48af..4451a416f 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Kembalikan ke URL Awal
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Tambahkan ke Essentials ({ $num } / { $max } slot terisi)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Hapus dari Essentials
     .accesskey = R
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index 455a5dd24..5c89851d1 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Endursetja Festan Flipa
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Fjarlægja frá Höfuðatriði
     .accesskey = R
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 13f55fa84..58de35cf5 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Reimposta scheda fissata
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Aggiungi a Essenziali ({ $num } / { $max } slot riempiti)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Rimuovi dagli Essenziali
     .accesskey = R
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 8acae44ca..213a2d47e 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = ピン留めされたタブをリセット
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Essentialsから削除
     .accesskey = R
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 55ea40638..0ea2f847b 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = 고정된 탭 초기화
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = 에센셜에 추가 ({ $num } / { $max } 개 추가됨)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = 에센셜에서 제거하기
     .accesskey = R
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index b4c18ab1f..654935d28 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Atkurti prisegtą kortelę
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Įtraukti į būtiniausius ({ $num } / { $max } užpildytų vietų)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Šalinti iš būtiniausių
     .accesskey = R
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index bbb1b6932..2e749ec15 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Vastgezette tabblad resetten
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Toevoegen aan Essentials ({ $num } / { $max } plekken gevuld)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Verwijderen uit Essentials
     .accesskey = R
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 647c5304e..7f2d3ec8c 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 10a9e4e34..5e6b01a9e 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Resetuj przypiętą kartę
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Dodaj do Niezbędnych ({ $num } / { $max } miejsc wypełnione)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Usuń z Niezbędnych
     .accesskey = R
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index bcbac76e7..9018a53b1 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Redefinir Guia Fixada
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Remover dos Essenciais
     .accesskey = R
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 4448ae0f6..68239dba0 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Repor o Separador Fixado
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Adicionar aos Essenciais ({ $num } / { $max } espaços preenchidos)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Remover dos Essenciais
     .accesskey = R
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 4208a8a91..add11add8 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Сбросить закреплённую вкладку
     .accesskey = К
 tab-context-zen-add-essential = 
-    .label = Добавить в важное ({ $num } из { $max } слотов занято)
+    .label = Add to Essentials
     .accesskey = У
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Удалить из важного
     .accesskey = К
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 2dcc999a3..55732320a 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ 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 } / { $max } platser fyllda)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Ta bort från Essentials
     .accesskey = R
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 647c5304e..7f2d3ec8c 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Reset Pinned Tab
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Remove from Essentials
     .accesskey = R
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 31b208081..a6acb4375 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Sabitlenen Sekmeyi Sıfırla
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Temel Ögelerden Kaldır
     .accesskey = R
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 2ed0f7a82..1d5ffd091 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Скинути прикріплену вкладку
     .accesskey = Р
 tab-context-zen-add-essential = 
-    .label = Додати до Основного ({ $num } / { $max } комірок заповнено)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Вилучити з основних елементів
     .accesskey = R
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 6b29204ce..8f97f5c6c 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ 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 } / { $max } )
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = Loại ra khỏi thẻ thường trú
     .accesskey = R
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index b5c96a0e8..e04c359ba 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = 重置固定标签页
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = 添加到常驻标签页（已使用 { $num } / { $max }）
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = 从常驻标签页中移除
     .accesskey = R
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index e97208c2f..f972deb48 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -8,8 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = 重置釘選的分頁
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials ({ $num } / { $max } slots filled)
+    .label = Add to Essentials
     .accesskey = E
+tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
 tab-context-zen-remove-essential = 
     .label = 從 Essentials 中移除
     .accesskey = R

From 93157bb5771e4217ab0a52dc0d8f41b3e167588d Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:45:12 +0100
Subject: [PATCH 090/162] feat: Always show control center except on empty
 states, p=#11283, c=common, tabs, workspaces

---
 .../identity-block/identity-block-css.patch      | 11 ++++++++++-
 src/browser/themes/shared/zen-icons/icons.css    | 10 +++++++---
 src/zen/common/styles/zen-omnibox.css            | 16 +++++++---------
 src/zen/tabs/zen-tabs/vertical-tabs.css          |  6 ++----
 src/zen/workspaces/ZenWorkspaces.mjs             |  1 +
 5 files changed, 27 insertions(+), 17 deletions(-)

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 2c5c54f64..6f4941ae0 100644
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,7 +1,16 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index d542e962d42b17140888e299ed43a838047ee48c..5e0b72f147687924c48dfed0318f53b765a4d497 100644
+index d542e962d42b17140888e299ed43a838047ee48c..806bc4f9d7b7557abf316a84858046e04c4f7ff5 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
+@@ -7,7 +7,7 @@
+ #identity-box {
+   margin-inline-end: var(--identity-box-margin-inline);
+ 
+-  &[pageproxystate="invalid"] {
++  :root[zen-has-empty-tab='true'] & {
+     pointer-events: none;
+     -moz-user-focus: ignore;
+   }
 @@ -81,13 +81,6 @@
    }
  }
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 71416c647..258f007f3 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -504,13 +504,17 @@
 }
 
 #identity-permission-box,
-#identity-box:not([pageproxystate='invalid']) #identity-icon-box:not([open]),
-#identity-box[pageproxystate='invalid'] #zen-site-data-icon-button {
+:root:not([zen-has-empty-tab='true'])
+  #urlbar:not([breakout-extend='true'])
+  #identity-icon-box:not([open]),
+:root[zen-has-empty-tab='true'] #zen-site-data-icon-button,
+#urlbar[breakout-extend='true'] #zen-site-data-icon-button {
   display: none !important;
 }
 
 #zen-site-data-icon-button {
-  padding: 0 6px;
+  padding: 0 6px !important;
+  border-radius: var(--urlbar-icon-border-radius) !important;
 
   & image {
     list-style-image: url('permissions.svg');
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 96c204d19..94838947e 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -152,16 +152,16 @@
     #navigator-toolbox[zen-has-implicit-hover='true'] &,
     &[open],
     #urlbar[has-popup-open='true'] &,
-    #identity-box[pageproxystate='invalid'] & {
+    :root[zen-has-empty-tab='true'] & {
       opacity: 1;
       visibility: visible;
     }
   }
 }
 
-:root:not([zen-single-toolbar='true'])
+:root:not([zen-single-toolbar='true']):not([zen-has-empty-tab='true'])
   #urlbar:not([breakout-extend='true'])
-  .urlbar-input-container:not([pageproxystate='invalid']) {
+  .urlbar-input-container {
   padding: 2px 3px;
   gap: 2px;
 
@@ -184,8 +184,7 @@
   background: transparent !important;
 }
 
-:root[zen-single-toolbar='true'],
-#urlbar[pageproxystate='invalid'] {
+:root:is([zen-single-toolbar='true'], [zen-has-empty-tab='true']) {
   #zen-copy-url-button[disabled] {
     display: none !important;
   }
@@ -313,6 +312,7 @@
 
 :root[zen-single-toolbar='true'] {
   --urlbar-icon-border-radius: 8px !important;
+  --urlbar-inner-border-radius: var(--toolbarbutton-border-radius) !important;
 
   #identity-permission-box > *:not(#zen-site-data-icon-button) {
     visibility: collapse;
@@ -322,10 +322,8 @@
     display: none;
   }
 
-  #urlbar:not([breakout-extend='true']) {
-    #identity-box:not([pageproxystate='invalid']) {
-      order: 2;
-    }
+  &:not([zen-has-empty-tab='true']) #urlbar:not([breakout-extend='true']) #identity-box {
+    order: 2;
   }
 
   #notification-popup-box:not([open]) {
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 21694d525..2cedddc4d 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -514,10 +514,8 @@
   & #nav-bar {
     padding-right: 0;
 
-    :root[zen-single-toolbar='true'] & {
-      &
-        #urlbar:not([breakout-extend='true']):not([pageproxystate='invalid'])
-        .urlbar-input-container {
+    :root[zen-single-toolbar='true']:not([zen-has-empty-tab='true']) & {
+      & #urlbar:not([breakout-extend='true']) .urlbar-input-container {
         padding-left: 8px;
         padding-right: 4px;
       }
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index e2228a209..9966f7f57 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2655,6 +2655,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   #changeToEmptyTab() {
     const isEmpty = gBrowser.selectedTab.hasAttribute('zen-empty-tab');
     gZenCompactModeManager.sidebar.toggleAttribute('zen-has-empty-tab', isEmpty);
+    document.documentElement.setAttribute('zen-has-empty-tab', isEmpty);
   }
 
   async onLocationChange(event) {

From 8ee2840b45c69de346aa096db89a4e528cd86145 Mon Sep 17 00:00:00 2001
From: Jun Jie <71215065+junnjiee@users.noreply.github.com>
Date: Sat, 15 Nov 2025 20:46:47 +0800
Subject: [PATCH 091/162] fix: Set workspace id of duplicated essential tab to
 current active workspace, b=bug
 https://github.com/zen-browser/desktop/issues/10457, p=#11293

---
 .../sessionstore/SessionStore-sys-mjs.patch   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index df250c095..5cf576c24 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 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10540eb659 100644
+index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0eeba2381c 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -127,6 +127,8 @@ const TAB_EVENTS = [
@@ -49,7 +49,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
        return;
      }
  
-@@ -4089,6 +4090,11 @@ var SessionStoreInternal = {
+@@ -4089,6 +4090,12 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -58,10 +58,11 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
 +      tabState.zenIsGlance = false;
 +      tabState.zenGlanceId = null;
 +      tabState.zenHasStaticLabel = false;
++      tabState.zenWorkspace = aWindow.gZenWorkspaces.activeWorkspace;
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4525,6 +4531,7 @@ var SessionStoreInternal = {
+@@ -4525,6 +4532,7 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -69,7 +70,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5374,7 +5381,7 @@ var SessionStoreInternal = {
+@@ -5374,7 +5382,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -78,7 +79,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
          removableTabs.push(tab);
        }
      }
-@@ -5434,7 +5441,7 @@ var SessionStoreInternal = {
+@@ -5434,7 +5442,7 @@ var SessionStoreInternal = {
      }
  
      let workspaceID = aWindow.getWorkspaceID();
@@ -87,7 +88,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
        winData.workspaceID = workspaceID;
      }
    },
-@@ -5625,11 +5632,12 @@ var SessionStoreInternal = {
+@@ -5625,11 +5633,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -101,7 +102,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5640,6 +5648,7 @@ var SessionStoreInternal = {
+@@ -5640,6 +5649,7 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -109,7 +110,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5652,7 +5661,7 @@ var SessionStoreInternal = {
+@@ -5652,7 +5662,7 @@ var SessionStoreInternal = {
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
      if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -118,7 +119,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5764,8 +5773,8 @@ var SessionStoreInternal = {
+@@ -5764,8 +5774,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -129,7 +130,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5808,6 +5817,8 @@ var SessionStoreInternal = {
+@@ -5808,6 +5818,8 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -138,7 +139,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6371,6 +6382,25 @@ var SessionStoreInternal = {
+@@ -6371,6 +6383,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -164,7 +165,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..f13ed1412bb7ae6623aa2605d7691d10
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -7289,7 +7319,7 @@ var SessionStoreInternal = {
+@@ -7289,7 +7320,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {

From 4798821192a1d3cd8bb5a1f7322d08995e8f2833 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 15 Nov 2025 18:18:56 +0100
Subject: [PATCH 092/162] fix: Apply patch from
 https://bugzilla.mozilla.org/show_bug.cgi?id=1993474, b=no-bug,
 c=no-component

---
 src/firefox-patches/bug_1993474_fix.patch | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/firefox-patches/bug_1993474_fix.patch

diff --git a/src/firefox-patches/bug_1993474_fix.patch b/src/firefox-patches/bug_1993474_fix.patch
new file mode 100644
index 000000000..b18363128
--- /dev/null
+++ b/src/firefox-patches/bug_1993474_fix.patch
@@ -0,0 +1,30 @@
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index 2a17159215d107f6e4b09cf3a63ab0fff2c2ee70..622bb36a184a87a1d755b19ff6c3c50027ae53f5 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -2848,6 +2848,25 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
+ 
+   mCustomNonClient = aCustomTitlebar;
+ 
++  // Because of bug 1993474, we want to properly set the WS_BORDER style
++  // when the titlebar is turned on or off.
++  //
++  // The documentation for window styles says that most styles can't be
++  // modified after the window is created. Testing shows that WS_BORDER
++  // seems to be OK, but make sure this is the only style we try to change
++  // here.
++  const LONG_PTR actualStyle = ::GetWindowLongPtrW(mWnd, GWL_STYLE);
++  LONG_PTR newStyle = actualStyle;
++  if (mCustomNonClient) {
++    newStyle &= ~WS_BORDER;
++  } else {
++    newStyle |= WS_BORDER;
++  }
++  if (newStyle != actualStyle) {
++    VERIFY_WINDOW_STYLE(newStyle);
++    ::SetWindowLongPtrW(mWnd, GWL_STYLE, newStyle);
++  }
++  
+   // Force a reflow of content based on the new client dimensions.
+   if (mCustomNonClient) {
+     UpdateNonClientMargins();

From 58c2c2cd8fcce185bb0cdf3eb0558e5afe7c0fa8 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sat, 15 Nov 2025 18:20:28 +0100
Subject: [PATCH 093/162] chore: New Crowdin updates, p=#11296

* New translations zen-general.ftl (French)

* New translations zen-preferences.ftl (Czech)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Catalan)

* New translations zen-general.ftl (Czech)

* New translations zen-general.ftl (Irish)

* New translations zen-general.ftl (Hungarian)

* New translations zen-general.ftl (Korean)

* New translations zen-general.ftl (Ukrainian)

* New translations zen-workspaces.ftl (Czech)
---
 locales/ca/browser/browser/zen-general.ftl    |  4 +--
 .../browser/preferences/zen-preferences.ftl   | 12 +++----
 locales/cs/browser/browser/zen-general.ftl    | 34 +++++++++----------
 locales/cs/browser/browser/zen-workspaces.ftl |  6 ++--
 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/ko/browser/browser/zen-general.ftl    |  4 +--
 locales/uk/browser/browser/zen-general.ftl    |  4 +--
 10 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index d063a7366..030c4cc35 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Restableix la pestanya fixada
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Afegeix als essencials
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } espais ocupats
 tab-context-zen-remove-essential = 
     .label = Elimina dels essencials
     .accesskey = R
diff --git a/locales/cs/browser/browser/preferences/zen-preferences.ftl b/locales/cs/browser/browser/preferences/zen-preferences.ftl
index 4c7d09bfd..ff60ad1c1 100644
--- a/locales/cs/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/cs/browser/browser/preferences/zen-preferences.ftl
@@ -45,12 +45,12 @@ pane-settings-workspaces-title = Pracoviště
 zen-tabs-unloader-enabled = 
     .label = Povolit uspání karet
 zen-tabs-close-on-back-with-no-history = 
-    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+    .label = „Zavřít panel a přepnout na jeho nadřazený panel (nebo naposledy použitý panel), když se vracíte zpět bez historie.“
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Ctrl+Tab cykly pouze v Essentials nebo pracovních kartách
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Ignorovat čekající panely při cyklování s Ctrl+Tab
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab bude cyklovat v nedávno použitém pořadí
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Použít tématické pozadí pro kompaktní panel karet
 zen-workspace-continue-where-left-off = 
@@ -83,7 +83,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 = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Je v konfliktu s { $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
@@ -311,4 +311,4 @@ zen-devtools-toggle-performance-shortcut = Přepnout výkon
 zen-devtools-toggle-storage-shortcut = Přepnout úložiště
 zen-devtools-toggle-dom-shortcut = Přepnout DOM
 zen-devtools-toggle-accessibility-shortcut = Přepnout přístupnost
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Zavřít všechny nepřipnuté panely
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 5033d7aa7..90ba335cc 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Resetovat připnuté karty
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Přidat do Essentials
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } zaplněných slotů
 tab-context-zen-remove-essential = 
     .label = Odstranit z Essentials
     .accesskey = R
@@ -29,7 +29,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 = Copied current URL!
+zen-copy-current-url-confirmation = URL adresa byla zkopírována!
 zen-general-cancel-label = 
     .label = Zrušit
 zen-general-confirm = 
@@ -43,7 +43,7 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods = 
     .label = Módy
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
+    .label = Kompaktní režim
     .tooltiptext = Přepnout kompaktní režim
 
 # note: Do not translate the "<br/>" tags in the following string
@@ -60,13 +60,13 @@ urlbar-search-mode-zen_actions = Akce
 zen-site-data-settings = Nastavení
 zen-generic-manage = Spravovat
 zen-generic-more = Více
-zen-generic-next = Next
+zen-generic-next = Další
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-protections-enabled = Zapnuto
+zen-site-data-protections-disabled = Vypnuto
+zen-site-data-setting-cross-site = Mezi stránkové cookies
 zen-site-data-security-info-extension = 
     .label = Rozšíření
 zen-site-data-security-info-secure = 
@@ -80,21 +80,21 @@ zen-site-data-get-addons =
 zen-site-data-site-settings = 
     .label = Nastavení všech stránek
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Sdílet tuto stránku
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Zapnout čtecí režim
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Pořídit snímek obrazovky
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Přidat tuto stránku do záložek
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = Kopírovat URL
+zen-site-data-setting-site-protection = Ochrana proti sledování
 
 # 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 = Nový domov pro doplňky, oprávnění a další
+zen-site-data-panel-feature-callout-subtitle = Klikněte na ikonu pro správu nastavení webu, zobrazení bezpečnostních informací, přístup k rozšíření a provádění běžných akcí.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Otevřít odkaz v Glance
     .accesskey = G
diff --git a/locales/cs/browser/browser/zen-workspaces.ftl b/locales/cs/browser/browser/zen-workspaces.ftl
index 57716f91b..0e8d1f210 100644
--- a/locales/cs/browser/browser/zen-workspaces.ftl
+++ b/locales/cs/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Odstranit prostor?
 zen-workspaces-delete-workspace-body = Opravdu chcete smazat { $name }? Tuto akci nelze vrátit zpět.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Karty byly zavřeny! Použijte <span>{ $shortcut }</span> pro zrušení.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Vyčistit
+    .tooltiptext = Zavřít všechny nepřipnuté panely
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index efb854572..ffbf76ef3 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Restablecer pestaña fijada
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Añadir a esenciales
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } huecos llenos
 tab-context-zen-remove-essential = 
     .label = Quitar de esenciales
     .accesskey = R
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index e00bfe1db..4b8c300ba 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Réinitialiser l’onglet épinglé
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Ajouter aux Essentials
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } emplacements occupés
 tab-context-zen-remove-essential = 
     .label = Retirer des Essentials
     .accesskey = R
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 2a4a7c99a..23d98022d 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Athshocraigh an Cluaisín Prionáilte
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Cuir leis na Bunriachtanais
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } sliotán líonta
 tab-context-zen-remove-essential = 
     .label = Bain de na Bunriachtanais
     .accesskey = R
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 2bedf561f..68c695255 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Kitűzött lap visszaállítása
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Felvétel az alapvetőkbe
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } hely foglalt
 tab-context-zen-remove-essential = 
     .label = Eltávolítás az alapvetőkből
     .accesskey = R
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 0ea2f847b..49e7f7783 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = 고정된 탭 초기화
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = 에센셜에 추가
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max }개 추가됨
 tab-context-zen-remove-essential = 
     .label = 에센셜에서 제거하기
     .accesskey = R
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 1d5ffd091..68f2cdefb 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Скинути прикріплену вкладку
     .accesskey = Р
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Додати до необхідного
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } комірок заповнено
 tab-context-zen-remove-essential = 
     .label = Вилучити з основних елементів
     .accesskey = R

From 684dbfdc0bf7887283a00535bf3e2df099350628 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Nov 2025 02:55:54 +0100
Subject: [PATCH 094/162] feat: Properly align site control icons, b=no-bug,
 c=common

---
 src/zen/common/styles/zen-single-components.css | 4 ++--
 1 file 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 efb207c32..309c6a15f 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -375,7 +375,7 @@ body > #confetti {
 
 .zen-site-data-section {
   gap: 2px;
-  padding: 10px;
+  padding: 9px;
   padding-bottom: 8px;
 }
 
@@ -506,7 +506,7 @@ body > #confetti {
 #zen-site-data-header {
   gap: 8px;
   align-items: center;
-  padding: 10px 8px;
+  padding: 10px 9px;
   padding-bottom: 0;
 
   :root[zen-single-toolbar='true']:not([zen-right-side='true']) & {

From 38ebe91674f37251cdbaaab6194a4d316b8b3076 Mon Sep 17 00:00:00 2001
From: Vedaant Rajoo <vedaant12345@gmail.com>
Date: Sat, 15 Nov 2025 17:56:05 -0800
Subject: [PATCH 095/162] fix: Add null checks for tab permissions and
 conversions in TabManagerBase, ensuring stability with empty tabs, p=#11302

---
 .../extensions/parent/ext-tabs-base-js.patch  | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 src/toolkit/components/extensions/parent/ext-tabs-base-js.patch

diff --git a/src/toolkit/components/extensions/parent/ext-tabs-base-js.patch b/src/toolkit/components/extensions/parent/ext-tabs-base-js.patch
new file mode 100644
index 000000000..b050c0b92
--- /dev/null
+++ b/src/toolkit/components/extensions/parent/ext-tabs-base-js.patch
@@ -0,0 +1,64 @@
+diff --git a/toolkit/components/extensions/parent/ext-tabs-base.js b/toolkit/components/extensions/parent/ext-tabs-base.js
+index d3c2d62406d17a14b0288752c34b6dd4350f032a..2f970d41b8ada9a13fc18b8d2a6607b973983072 100644
+--- a/toolkit/components/extensions/parent/ext-tabs-base.js
++++ b/toolkit/components/extensions/parent/ext-tabs-base.js
+@@ -1942,6 +1942,7 @@ class TabManagerBase {
+    */
+   addActiveTabPermission(nativeTab) {
+     let tab = this.getWrapper(nativeTab);
++    if (!tab) return; // Empty tabs aren't tracked, nothing to add
+     if (
+       this.extension.hasPermission("activeTab") ||
+       (this.extension.originControls &&
+@@ -1963,7 +1964,9 @@ class TabManagerBase {
+    *        The native tab for which to revoke permissions.
+    */
+   revokeActiveTabPermission(nativeTab) {
+-    this.getWrapper(nativeTab).activeTabWindowID = null;
++    let wrapper = this.getWrapper(nativeTab);
++    if (!wrapper) return; // Empty tabs arent tracked, nothing to revoke
++    wrapper.activeTabWindowID = null;
+   }
+ 
+   /**
+@@ -1976,7 +1979,9 @@ class TabManagerBase {
+    *        True if the extension has activeTab permissions for this tab.
+    */
+   hasActiveTabPermission(nativeTab) {
+-    return this.getWrapper(nativeTab).hasActiveTabPermission;
++    let wrapper = this.getWrapper(nativeTab);
++    if (!wrapper) return false; // Empty tabs arent tracked, nothing to check
++    return wrapper.hasActiveTabPermission;
+   }
+ 
+   /**
+@@ -1987,6 +1992,7 @@ class TabManagerBase {
+    */
+   activateScripts(nativeTab) {
+     let tab = this.getWrapper(nativeTab);
++    if (!tab) return; // Empty tabs aren't tracked, nothing to activate
+     if (
+       this.extension.originControls &&
+       !tab.matchesHostPermission &&
+@@ -2019,7 +2025,9 @@ class TabManagerBase {
+    *        True if the extension has permissions for this tab.
+    */
+   hasTabPermission(nativeTab) {
+-    return this.getWrapper(nativeTab).hasTabPermission;
++    let wrapper = this.getWrapper(nativeTab);
++    if (!wrapper) return false; // Empty tabs arent tracked, nothing to check
++    return wrapper.hasTabPermission;
+   }
+ 
+   /**
+@@ -2066,7 +2074,9 @@ class TabManagerBase {
+    * @returns {object}
+    */
+   convert(nativeTab, fallbackTabSize = null) {
+-    return this.getWrapper(nativeTab).convert(fallbackTabSize);
++    let wrapper = this.getWrapper(nativeTab);
++    if (!wrapper) return null; // Empty tabs aren't tracked, can't convert
++    return wrapper.convert(fallbackTabSize);
+   }
+ 
+   /**

From 14352ad21ac56c850b94a11d306aaed18a4b3285 Mon Sep 17 00:00:00 2001
From: Jun Jie <71215065+junnjiee@users.noreply.github.com>
Date: Sun, 16 Nov 2025 18:38:49 +0800
Subject: [PATCH 096/162] fix: remove css override blocking psuedo-classes from
 showing, p=#11308

---
 src/browser/themes/shared/preferences/zen-preferences.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index 14f88a823..c33c0f945 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -91,8 +91,8 @@ groupbox button {
 
 groupbox button,
 groupbox menulist {
-  background-color: light-dark(#f1f1f1, #363636) !important;
-  color: light-dark(black, white) !important;
+  background-color: light-dark(#f1f1f1, #363636);
+  color: light-dark(black, white);
 }
 
 groupbox h2 {

From a3f396ab1931dbf4eaa1faba40f3c382fdce50b3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Nov 2025 12:18:52 +0100
Subject: [PATCH 097/162] chore: Revert applying patches from bug_1993474,
 b=no-bug, c=no-component

---
 src/firefox-patches/bug_1993474_fix.patch | 30 -----------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 src/firefox-patches/bug_1993474_fix.patch

diff --git a/src/firefox-patches/bug_1993474_fix.patch b/src/firefox-patches/bug_1993474_fix.patch
deleted file mode 100644
index b18363128..000000000
--- a/src/firefox-patches/bug_1993474_fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index 2a17159215d107f6e4b09cf3a63ab0fff2c2ee70..622bb36a184a87a1d755b19ff6c3c50027ae53f5 100644
---- a/widget/windows/nsWindow.cpp
-+++ b/widget/windows/nsWindow.cpp
-@@ -2848,6 +2848,25 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
- 
-   mCustomNonClient = aCustomTitlebar;
- 
-+  // Because of bug 1993474, we want to properly set the WS_BORDER style
-+  // when the titlebar is turned on or off.
-+  //
-+  // The documentation for window styles says that most styles can't be
-+  // modified after the window is created. Testing shows that WS_BORDER
-+  // seems to be OK, but make sure this is the only style we try to change
-+  // here.
-+  const LONG_PTR actualStyle = ::GetWindowLongPtrW(mWnd, GWL_STYLE);
-+  LONG_PTR newStyle = actualStyle;
-+  if (mCustomNonClient) {
-+    newStyle &= ~WS_BORDER;
-+  } else {
-+    newStyle |= WS_BORDER;
-+  }
-+  if (newStyle != actualStyle) {
-+    VERIFY_WINDOW_STYLE(newStyle);
-+    ::SetWindowLongPtrW(mWnd, GWL_STYLE, newStyle);
-+  }
-+  
-   // Force a reflow of content based on the new client dimensions.
-   if (mCustomNonClient) {
-     UpdateNonClientMargins();

From 9a9c1c312c8bb3eba9a7a3a0180e9ad9b5cc20c6 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Mon, 17 Nov 2025 11:38:45 +0100
Subject: [PATCH 098/162] fix: Fixed glance not listening for context menu
 activations, b=closes #11148, c=common, glance

---
 src/zen/common/ZenActorsManager.sys.mjs      | 2 +-
 src/zen/glance/actors/ZenGlanceChild.sys.mjs | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/zen/common/ZenActorsManager.sys.mjs b/src/zen/common/ZenActorsManager.sys.mjs
index bfaf184af..2d7b8c10a 100644
--- a/src/zen/common/ZenActorsManager.sys.mjs
+++ b/src/zen/common/ZenActorsManager.sys.mjs
@@ -42,7 +42,7 @@ let JSWINDOWACTORS = {
       esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
       events: {
         DOMContentLoaded: {},
-        click: {
+        mousedown: {
           capture: true,
         },
         keydown: {
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index e3f78f2a0..47337790a 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -35,9 +35,12 @@ export class ZenGlanceChild extends JSWindowActorChild {
   }
 
   #sendClickDataToParent(target, element) {
-    if (!element || !target) {
+    if (!element && !target) {
       return;
     }
+    if (!target) {
+      target = element;
+    }
     // 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.
@@ -54,7 +57,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     });
   }
 
-  on_click(event) {
+  on_mousedown(event) {
     // get closest A element
     const target = event.target.closest('A');
     const elementToRecord = event.originalTarget || event.target;

From 01f10cfc098dac41ebb3cf0761febbbe7fa9b4de Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Mon, 17 Nov 2025 13:50:03 +0100
Subject: [PATCH 099/162] feat: Make close and reset icons only appear when
 hovering the tab, b=no-bug, c=folders, tabs

---
 src/zen/folders/ZenFolders.mjs          | 2 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 0b9a4a77a..4245f4cd6 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1156,7 +1156,7 @@
       let dragDownThreshold =
         Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100;
 
-      const dropElementGroup = dropElement;
+      const dropElementGroup = dropElement?.isZenFolder ? dropElement : dropElement?.group;
       const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
       let firstGroupElem =
         dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 2cedddc4d..ce6669ef8 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -329,6 +329,13 @@
       scale: 0.92;
     }
 
+    &:not(:hover) {
+      .tab-close-button,
+      .tab-reset-button {
+        display: none !important;
+      }
+    }
+
     & .tab-icon-image {
       &:not([src]),
       &:-moz-broken {

From f36b84de3c8098415ca7342cabe4c733d5daf58c Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Mon, 17 Nov 2025 13:53:45 +0100
Subject: [PATCH 100/162] chore: Clean up unused block in macos share method,
 b=no-bug, c=common

---
 src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm b/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm
index eaea43ca7..060b6a426 100644
--- a/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm
+++ b/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm
@@ -24,9 +24,6 @@ nsresult ZenCommonUtils::PlayHapticFeedbackInternal() {
     id<NSHapticFeedbackPerformer> performer = [NSHapticFeedbackManager defaultPerformer];
     [performer performFeedbackPattern:NSHapticFeedbackPatternAlignment
                       performanceTime:NSHapticFeedbackPerformanceTimeDefault];
-  } else {
-    // Fallback on earlier versions
-    // Note: This is a no-op on older versions of iOS/macOS
   }
   return NS_OK;
   NS_OBJC_END_TRY_BLOCK_RETURN(NS_OK);

From a61b077d3fd44f50752721ce7561a6d0290ba190 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 18 Nov 2025 00:31:11 +0100
Subject: [PATCH 101/162] fix: Don't resize the sidebar when entering DOM
 fullscreen, b=no-bug, c=workspaces

---
 src/zen/workspaces/ZenWorkspaces.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 9966f7f57..c409d7274 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2555,6 +2555,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
 
   async onPinnedTabsResize(entries, forAnimation = false, animateContainer = false) {
     if (
+      document.documentElement.hasAttribute('inDOMFullscreen') ||
       !this._hasInitializedTabsStrip ||
       (this._organizingWorkspaceStrip && !forAnimation) ||
       document.documentElement.hasAttribute('zen-creating-workspace') ||

From 08996215b2f55bc15a26b84e2d5585716aa3f863 Mon Sep 17 00:00:00 2001
From: Jun Jie <71215065+junnjiee@users.noreply.github.com>
Date: Tue, 18 Nov 2025 16:03:53 +0800
Subject: [PATCH 102/162] fix: persist expanded glance tab after closing
 browser, p=#11336

* fix: persist expanded glance tab after closing browser

* fix lint error
---
 src/zen/glance/ZenGlanceManager.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 27d82b591..3302a3f4f 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -1415,8 +1415,9 @@
       this.overlay.classList.remove('zen-glance-overlay');
       this.#clearContainerStyles(this.browserWrapper);
       this.animatingFullOpen = false;
+      const glanceID = this.#currentGlanceID;
       this.closeGlance({ noAnimation: true, skipPermitUnload: true });
-      this.#glances.delete(this.#currentGlanceID);
+      this.#glances.delete(glanceID);
     }
 
     /**

From 45b20dffdadf08ffae95898ae310133de0e640ae Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 18 Nov 2025 10:07:36 +0100
Subject: [PATCH 103/162] chore: Sync upstream to `Firefox 145.0.1-RC`,
 p=#11338

---
 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 4211fac39..d00d75e03 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 `145.0`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0.1`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index c1019bcb9..e66a0d045 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-1e325bc45d9111518958446ac966fd4e4136d6d5
\ No newline at end of file
+ef3ddf3a109b09ba86b975355e881b9a23f58bfb
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index 544ec059d..503c71e39 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "145.0",
-    "candidate": "145.0"
+    "candidate": "145.0.1"
   },
   "buildOptions": {
     "generateBranding": true

From 6ba714e4e4aab24ab6e2dd09d66c648cc99da442 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 18 Nov 2025 17:53:08 +0100
Subject: [PATCH 104/162] chore: Sync upstream to `Firefox 145.0.1`, p=#11347

---
 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 d00d75e03..538f3a383 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 `145.0`! 🚀
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `145.0.1`! 🚀
 - [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0.1`!
 
 ### Contributing
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index e66a0d045..9839d1fa1 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-ef3ddf3a109b09ba86b975355e881b9a23f58bfb
\ No newline at end of file
+99a389c2413be0374ee04b10021ed269c0387b45
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index 503c71e39..3da838ef2 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "145.0",
+    "version": "145.0.1",
     "candidate": "145.0.1"
   },
   "buildOptions": {

From 4361efb9568e1c5ce27b112721856e0b695c040a Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 18 Nov 2025 20:16:51 +0100
Subject: [PATCH 105/162] feat: Start using Firefox's split views to prevent
 memory leaks, b=no-bug, c=common, split-view

---
 .../tabbrowser/AsyncTabSwitcher-sys-mjs.patch |   4 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 152 ++++++++--------
 src/zen/common/ZenUIManager.mjs               |  30 ++--
 src/zen/split-view/ZenViewSplitter.mjs        | 162 ++++++++++--------
 src/zen/split-view/zen-decks.css              |   2 +-
 5 files changed, 192 insertions(+), 158 deletions(-)

diff --git a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
index eba2ec3d1..e8d761cb5 100644
--- a/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-index bcd7689e9d68ef8b171c327188174334c4271e21..f69180acb87644f109aa91b871e347f1b1835f53 100644
+index bcd7689e9d68ef8b171c327188174334c4271e21..0a95e1137fdf4b63e0d841776ad934da1a513c6f 100644
 --- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 +++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 @@ -938,6 +938,7 @@ export class AsyncTabSwitcher {
        this.tabbrowser._printPreviewBrowsers.has(browser) ||
        this.tabbrowser.splitViewBrowsers.includes(browser) ||
        lazy.PictureInPicture.isOriginatingBrowser(browser)
-+      || browser?.parentNode?.parentNode?.parentNode?.classList?.contains("zen-glance-background")
++      || browser?.zenModeActive
      );
    }
  
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 740b71372..1bb770059 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,16 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326cbd973686 100644
+index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e6923fe5f 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -450,15 +450,64 @@
+@@ -386,6 +386,7 @@
+      * @type {MozBrowser[]}
+      */
+     get splitViewBrowsers() {
++      return gZenViewSplitter.splitViewBrowsers;
+       const browsers = [];
+       if (this.#activeSplitView) {
+         for (const tab of this.#activeSplitView.tabs) {
+@@ -450,15 +451,64 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -69,7 +77,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -613,6 +662,7 @@
+@@ -613,6 +663,7 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -77,7 +85,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -898,13 +948,17 @@
+@@ -898,13 +949,17 @@
        }
  
        this.showTab(aTab);
@@ -96,7 +104,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -917,11 +971,15 @@
+@@ -917,11 +972,15 @@
        }
  
        this.#handleTabMove(aTab, () => {
@@ -113,7 +121,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1098,6 +1156,8 @@
+@@ -1098,6 +1157,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -122,7 +130,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        if (
          aIconURL &&
          !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1107,6 +1167,9 @@
+@@ -1107,6 +1168,9 @@
          );
          return;
        }
@@ -132,7 +140,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1379,7 +1442,6 @@
+@@ -1379,7 +1443,6 @@
  
        // Preview mode should not reset the owner
        if (!this._previewMode && !oldTab.selected) {
@@ -140,7 +148,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        }
  
        let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1470,6 +1532,7 @@
+@@ -1470,6 +1533,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -148,7 +156,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1622,6 +1685,9 @@
+@@ -1622,6 +1686,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -158,7 +166,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1945,7 +2011,8 @@
+@@ -1945,7 +2012,8 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -168,7 +176,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          return false;
        }
  
-@@ -2053,7 +2120,7 @@
+@@ -2053,7 +2121,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -177,7 +185,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2328,6 +2395,7 @@
+@@ -2328,6 +2396,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -185,7 +193,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2401,8 +2469,7 @@
+@@ -2401,8 +2470,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -195,7 +203,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          b.setAttribute("transparent", "true");
        }
  
-@@ -2567,7 +2634,7 @@
+@@ -2567,7 +2635,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -204,7 +212,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2626,8 +2693,8 @@
+@@ -2626,8 +2694,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) {
@@ -215,7 +223,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2814,7 +2881,6 @@
+@@ -2814,7 +2882,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -223,7 +231,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -2923,6 +2989,8 @@
+@@ -2923,6 +2990,8 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -232,7 +240,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2933,10 +3001,17 @@
+@@ -2933,10 +3002,17 @@
          );
        }
  
@@ -250,7 +258,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        // If we're opening a foreground tab, set the owner by default.
        ownerTab ??= inBackground ? null : this.selectedTab;
  
-@@ -2944,6 +3019,7 @@
+@@ -2944,6 +3020,7 @@
        if (this.selectedTab.owner) {
          this.selectedTab.owner = null;
        }
@@ -258,7 +266,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
        // Find the tab that opened this one, if any. This is used for
        // determining positioning, and inherited attributes such as the
-@@ -2996,6 +3072,19 @@
+@@ -2996,6 +3073,19 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -278,7 +286,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -3004,6 +3093,7 @@
+@@ -3004,6 +3094,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -286,7 +294,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -3022,6 +3112,7 @@
+@@ -3022,6 +3113,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -294,7 +302,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          }));
  
          if (focusUrlBar) {
-@@ -3146,6 +3237,12 @@
+@@ -3146,6 +3238,12 @@
          }
        }
  
@@ -307,7 +315,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3330,10 +3427,10 @@
+@@ -3330,10 +3428,10 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -319,7 +327,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        }
  
        if (!color) {
-@@ -3354,9 +3451,14 @@
+@@ -3354,9 +3452,14 @@
          label,
          isAdoptingGroup
        );
@@ -336,7 +344,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        );
        group.addTabs(tabs);
  
-@@ -3477,7 +3579,7 @@
+@@ -3477,7 +3580,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -345,7 +353,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        );
      }
  
-@@ -3679,6 +3781,7 @@
+@@ -3679,6 +3782,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -353,7 +361,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3748,6 +3851,7 @@
+@@ -3748,6 +3852,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -361,7 +369,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          });
        }
  
-@@ -3935,7 +4039,7 @@
+@@ -3935,7 +4040,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -370,7 +378,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -3972,8 +4076,10 @@
+@@ -3972,8 +4077,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -382,7 +390,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
            if (select) {
              tabToSelect = tab;
            }
-@@ -3985,7 +4091,8 @@
+@@ -3985,7 +4092,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -392,7 +400,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3999,7 +4106,10 @@
+@@ -3999,7 +4107,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -404,7 +412,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4044,9 +4154,23 @@
+@@ -4044,9 +4155,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -428,7 +436,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4237,11 +4361,14 @@
+@@ -4237,11 +4362,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -444,7 +452,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4253,7 +4380,7 @@
+@@ -4253,7 +4381,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -453,7 +461,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
              tabGroup = previousTab.group;
            }
            if (
-@@ -4264,7 +4391,7 @@
+@@ -4264,7 +4392,7 @@
            ) {
              elementIndex = Infinity;
            } else if (previousTab.visible) {
@@ -462,7 +470,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4292,14 +4419,14 @@
+@@ -4292,14 +4420,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -481,7 +489,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4310,7 +4437,7 @@
+@@ -4310,7 +4438,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -490,7 +498,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          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);
-@@ -4338,7 +4465,11 @@
+@@ -4338,7 +4466,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -502,7 +510,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        }
  
        this._updateTabsAfterInsert();
-@@ -4346,6 +4477,7 @@
+@@ -4346,6 +4478,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -510,7 +518,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
        TabBarVisibility.update();
      }
-@@ -4635,6 +4767,9 @@
+@@ -4635,6 +4768,9 @@
          return;
        }
  
@@ -520,7 +528,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
      }
  
-@@ -4896,6 +5031,7 @@
+@@ -4896,6 +5032,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -528,7 +536,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4985,6 +5121,7 @@
+@@ -4985,6 +5122,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -536,7 +544,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        } catch (e) {
          console.error(e);
        }
-@@ -5023,6 +5160,12 @@
+@@ -5023,6 +5161,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -549,7 +557,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -5037,6 +5180,9 @@
+@@ -5037,6 +5181,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -559,7 +567,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5085,7 +5231,13 @@
+@@ -5085,7 +5232,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -574,7 +582,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          return;
        }
  
-@@ -5219,7 +5371,7 @@
+@@ -5219,7 +5372,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -583,7 +591,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5243,6 +5395,7 @@
+@@ -5243,6 +5396,7 @@
  
          newTab = true;
        }
@@ -591,7 +599,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5283,13 +5436,7 @@
+@@ -5283,13 +5437,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -606,7 +614,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        } else {
          TabBarVisibility.update();
        }
-@@ -5422,6 +5569,7 @@
+@@ -5422,6 +5570,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -614,7 +622,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5643,6 +5791,7 @@
+@@ -5643,6 +5792,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -622,7 +630,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5655,13 +5804,13 @@
+@@ -5655,13 +5805,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -638,7 +646,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5677,7 +5826,7 @@
+@@ -5677,7 +5827,7 @@
        }
  
        if (tab) {
@@ -647,7 +655,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5698,7 +5847,7 @@
+@@ -5698,7 +5848,7 @@
          });
        }
  
@@ -656,7 +664,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
      }
  
      _blurTab(aTab) {
-@@ -6104,10 +6253,10 @@
+@@ -6104,10 +6254,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -669,7 +677,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6166,6 +6315,7 @@
+@@ -6166,6 +6316,7 @@
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
      replaceTabWithWindow(aTab, aOptions) {
@@ -677,7 +685,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6299,7 +6449,7 @@
+@@ -6299,7 +6450,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -686,7 +694,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
      }
  
      /**
-@@ -6375,8 +6525,8 @@
+@@ -6375,8 +6526,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -697,7 +705,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6402,10 +6552,16 @@
+@@ -6402,10 +6553,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -716,7 +724,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6463,23 +6619,28 @@
+@@ -6463,23 +6620,28 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -751,7 +759,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        } 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
-@@ -6492,14 +6653,34 @@
+@@ -6492,14 +6654,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.
@@ -787,7 +795,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6508,7 +6689,7 @@
+@@ -6508,7 +6690,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -796,7 +804,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6580,10 +6761,10 @@
+@@ -6580,10 +6762,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -809,7 +817,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6613,6 +6794,7 @@
+@@ -6613,6 +6795,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -817,7 +825,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6639,7 +6821,7 @@
+@@ -6639,7 +6822,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -826,7 +834,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6676,6 +6858,10 @@
+@@ -6676,6 +6859,10 @@
  
        moveActionCallback();
  
@@ -837,7 +845,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7576,7 +7762,7 @@
+@@ -7576,7 +7763,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -846,7 +854,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7593,7 +7779,6 @@
+@@ -7593,7 +7780,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -854,7 +862,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
            });
            break;
          case "TabGroupCreateByUser":
-@@ -8542,6 +8727,7 @@
+@@ -8542,6 +8728,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -862,7 +870,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9543,7 +9729,7 @@ var TabContextMenu = {
+@@ -9543,7 +9730,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -871,7 +879,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..1bf95403333f914f082b38441d31326c
      // Build Ask Chat items
      TabContextMenu.GenAI.buildTabMenu(
        document.getElementById("context_askChat"),
-@@ -9863,6 +10049,7 @@ var TabContextMenu = {
+@@ -9863,6 +10050,7 @@ var TabContextMenu = {
          )
        );
      } else {
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 645739228..74e71bada 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -493,20 +493,26 @@ var gZenUIManager = {
 
     if (gURLBar.focused) {
       setTimeout(() => {
-        window.dispatchEvent(
-          new CustomEvent('ZenURLBarClosed', { detail: { onSwitch, onElementPicked } })
-        );
-        gURLBar.view.close({ elementPicked: onElementPicked });
-        gURLBar.updateTextOverflow();
+        setTimeout(() => {
+          window.dispatchEvent(
+            new CustomEvent('ZenURLBarClosed', { detail: { onSwitch, onElementPicked } })
+          );
+          gURLBar.view.close({ elementPicked: onElementPicked });
+          gURLBar.updateTextOverflow();
 
-        // Ensure tab and browser are valid before updating state
-        const selectedTab = gBrowser.selectedTab;
-        if (selectedTab && selectedTab.linkedBrowser && !selectedTab.closing && onSwitch) {
-          const browserState = gURLBar.getBrowserState(selectedTab.linkedBrowser);
-          if (browserState) {
-            browserState.urlbarFocused = false;
+          if (onElementPicked && onSwitch) {
+            gURLBar.setURI(null, onSwitch);
           }
-        }
+
+          // Ensure tab and browser are valid before updating state
+          const selectedTab = gBrowser.selectedTab;
+          if (selectedTab && selectedTab.linkedBrowser && !selectedTab.closing && onSwitch) {
+            const browserState = gURLBar.getBrowserState(selectedTab.linkedBrowser);
+            if (browserState) {
+              browserState.urlbarFocused = false;
+            }
+          }
+        }, 0);
       }, 0);
     }
   },
diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs
index 5aeeaa67c..ab3912b3a 100644
--- a/src/zen/split-view/ZenViewSplitter.mjs
+++ b/src/zen/split-view/ZenViewSplitter.mjs
@@ -1067,86 +1067,88 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
    * @param {string|undefined} gridType - The type of grid layout.
    */
   splitTabs(tabs, gridType, initialIndex = 0) {
-    // TODO: Add support for splitting essential tabs
-    tabs = tabs.filter((t) => !t.hidden && !t.hasAttribute('zen-empty-tab'));
-    if (tabs.length < 2 || tabs.length > this.MAX_TABS) {
-      return;
-    }
+    this.#withoutSplitViewTransition(() => {
+      // TODO: Add support for splitting essential tabs
+      tabs = tabs.filter((t) => !t.hidden && !t.hasAttribute('zen-empty-tab'));
+      if (tabs.length < 2 || tabs.length > this.MAX_TABS) {
+        return;
+      }
 
-    const existingSplitTab = tabs.find((tab) => tab.splitView);
-    if (existingSplitTab) {
-      this._moveTabsToContainer(tabs, tabs[initialIndex]);
-      const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab));
-      const group = this._data[groupIndex];
-      const gridTypeChange = gridType && group.gridType !== gridType;
-      const newTabsAdded = tabs.find((t) => !group.tabs.includes(t));
-      if (gridTypeChange || !newTabsAdded) {
-        // reset layout
-        group.gridType = gridType;
-        group.layoutTree = this.calculateLayoutTree(
-          [...new Set(group.tabs.concat(tabs))],
-          gridType
-        );
-      } else {
-        // Add any tabs that are not already in the group
+      const existingSplitTab = tabs.find((tab) => tab.splitView);
+      if (existingSplitTab) {
+        this._moveTabsToContainer(tabs, tabs[initialIndex]);
+        const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab));
+        const group = this._data[groupIndex];
+        const gridTypeChange = gridType && group.gridType !== gridType;
+        const newTabsAdded = tabs.find((t) => !group.tabs.includes(t));
+        if (gridTypeChange || !newTabsAdded) {
+          // reset layout
+          group.gridType = gridType;
+          group.layoutTree = this.calculateLayoutTree(
+            [...new Set(group.tabs.concat(tabs))],
+            gridType
+          );
+        } else {
+          // Add any tabs that are not already in the group
+          for (let i = 0; i < tabs.length; i++) {
+            const tab = tabs[i];
+            if (!group.tabs.includes(tab)) {
+              gBrowser.moveTabToGroup(tab, this._getSplitViewGroup(tabs));
+              group.tabs.push(tab);
+              this.addTabToSplit(tab, group.layoutTree);
+            }
+          }
+        }
+        if (this._sessionRestoring) {
+          return;
+        }
+        this.activateSplitView(group, true);
+        return;
+      }
+
+      // We are here if none of the tabs have been previously split
+      // If there's ANY pinned tab on the list, we clone the pinned tab
+      // state to all the tabs
+      const allArePinned = tabs.every((tab) => tab.pinned);
+      const thereIsOnePinned = tabs.some((tab) => tab.pinned);
+      const thereIsOneEssential = tabs.some((tab) => tab.hasAttribute('zen-essential'));
+
+      if (thereIsOneEssential || (thereIsOnePinned && !allArePinned)) {
         for (let i = 0; i < tabs.length; i++) {
           const tab = tabs[i];
-          if (!group.tabs.includes(tab)) {
-            gBrowser.moveTabToGroup(tab, this._getSplitViewGroup(tabs));
-            group.tabs.push(tab);
-            this.addTabToSplit(tab, group.layoutTree);
+          if (tab.pinned) {
+            tabs[i] = gBrowser.duplicateTab(tab, true);
           }
         }
       }
+
+      gridType ??= 'grid';
+
+      const splitData = {
+        tabs,
+        gridType,
+        layoutTree: this.calculateLayoutTree(tabs, gridType),
+      };
+      this._data.push(splitData);
+      if (!this._sessionRestoring) {
+        window.gBrowser.selectedTab = tabs[initialIndex] ?? tabs[0];
+      }
+
+      // Add tabs to the split view group
+      let splitGroup = this._getSplitViewGroup(tabs);
+      if (splitGroup) {
+        for (const tab of tabs) {
+          if (!tab.group || tab.group !== splitGroup) {
+            gBrowser.moveTabToGroup(tab, splitGroup);
+          }
+        }
+      }
+
       if (this._sessionRestoring) {
         return;
       }
-      this.activateSplitView(group, true);
-      return;
-    }
-
-    // We are here if none of the tabs have been previously split
-    // If there's ANY pinned tab on the list, we clone the pinned tab
-    // state to all the tabs
-    const allArePinned = tabs.every((tab) => tab.pinned);
-    const thereIsOnePinned = tabs.some((tab) => tab.pinned);
-    const thereIsOneEssential = tabs.some((tab) => tab.hasAttribute('zen-essential'));
-
-    if (thereIsOneEssential || (thereIsOnePinned && !allArePinned)) {
-      for (let i = 0; i < tabs.length; i++) {
-        const tab = tabs[i];
-        if (tab.pinned) {
-          tabs[i] = gBrowser.duplicateTab(tab, true);
-        }
-      }
-    }
-
-    gridType ??= 'grid';
-
-    const splitData = {
-      tabs,
-      gridType,
-      layoutTree: this.calculateLayoutTree(tabs, gridType),
-    };
-    this._data.push(splitData);
-    if (!this._sessionRestoring) {
-      window.gBrowser.selectedTab = tabs[initialIndex] ?? tabs[0];
-    }
-
-    // Add tabs to the split view group
-    let splitGroup = this._getSplitViewGroup(tabs);
-    if (splitGroup) {
-      for (const tab of tabs) {
-        if (!tab.group || tab.group !== splitGroup) {
-          gBrowser.moveTabToGroup(tab, splitGroup);
-        }
-      }
-    }
-
-    if (this._sessionRestoring) {
-      return;
-    }
-    this.activateSplitView(splitData);
+      this.activateSplitView(splitData);
+    });
   }
 
   addTabToSplit(tab, splitNode, prepend = true) {
@@ -1929,6 +1931,17 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
     return true;
   }
 
+  #withoutSplitViewTransition(callback) {
+    this.tabBrowserPanel.classList.add('zen-split-view-no-transition');
+    try {
+      callback();
+    } finally {
+      requestAnimationFrame(() => {
+        this.tabBrowserPanel.classList.remove('zen-split-view-no-transition');
+      }, 0);
+    }
+  }
+
   createEmptySplit() {
     const selectedTab = gBrowser.selectedTab;
     const emptyTab = gZenWorkspaces._emptyTab;
@@ -1975,6 +1988,13 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
       gZenUIManager.handleNewTab(false, false, 'tab', true);
     }, 0);
   }
+
+  get splitViewBrowsers() {
+    if (this.currentView < 0) {
+      return [];
+    }
+    return this._data[this.currentView].tabs.map((tab) => tab.linkedBrowser);
+  }
 }
 
 window.gZenViewSplitter = new nsZenViewSplitter();
diff --git a/src/zen/split-view/zen-decks.css b/src/zen/split-view/zen-decks.css
index bc88c016f..9c4ff3f3a 100644
--- a/src/zen/split-view/zen-decks.css
+++ b/src/zen/split-view/zen-decks.css
@@ -58,7 +58,7 @@
   margin-top: 0 !important;
 }
 
-#tabbrowser-tabpanels[zen-split-view='true']:not([zen-split-resizing]) > [zen-split='true'] {
+#tabbrowser-tabpanels[zen-split-view='true']:not(.zen-split-view-no-transition):not([zen-split-resizing]) > [zen-split='true'] {
   transition: inset 0.09s ease-out !important;
   & browser {
     transition: opacity 0.2s ease-out !important;

From f948575446e8224cfcf218925190fb9d7ab8ba1d Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 18 Nov 2025 20:23:48 +0100
Subject: [PATCH 106/162] chore: New Crowdin updates, p=#11325

---
 locales/id/browser/browser/preferences/zen-preferences.ftl | 6 +++---
 locales/id/browser/browser/zen-general.ftl                 | 6 +++---
 locales/id/browser/browser/zen-workspaces.ftl              | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/locales/id/browser/browser/preferences/zen-preferences.ftl b/locales/id/browser/browser/preferences/zen-preferences.ftl
index 545fe2901..71e6c6754 100644
--- a/locales/id/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/id/browser/browser/preferences/zen-preferences.ftl
@@ -45,9 +45,9 @@ pane-settings-workspaces-title = Ruang Kerja
 zen-tabs-unloader-enabled = 
     .label = Aktifkan Pelepas Tab
 zen-tabs-close-on-back-with-no-history = 
-    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+    .label = Tutup tab dan beralih ke tab pemiliknya (atau tab yang terakhir digunakan) saat kembali tanpa riwayat
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Ctrl+Tab berputar hanya dalam tab Esensial atau Ruang Kerja
 zen-tabs-cycle-ignore-pending-tabs = 
     .label = Ignore Pending tabs when cycling with Ctrl+Tab
 zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
@@ -311,4 +311,4 @@ zen-devtools-toggle-performance-shortcut = Ubah Performance
 zen-devtools-toggle-storage-shortcut = Ubah Penyimpanan
 zen-devtools-toggle-dom-shortcut = Ubah DOM
 zen-devtools-toggle-accessibility-shortcut = Ubah Aksesibilitas
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-close-all-unpinned-tabs-shortcut = Tutup Semua Tab yang Tidak Disematkan
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 4451a416f..90d834f96 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Kembalikan ke URL Awal
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Tambahkan ke Essentials
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } slot terisi
 tab-context-zen-remove-essential = 
     .label = Hapus dari Essentials
     .accesskey = R
@@ -96,5 +96,5 @@ zen-site-data-setting-site-protection = Perlindungan Pelacakan
 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.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Buka Tautan di Glance
     .accesskey = G
diff --git a/locales/id/browser/browser/zen-workspaces.ftl b/locales/id/browser/browser/zen-workspaces.ftl
index 25a94b3c3..dd99d5d3b 100644
--- a/locales/id/browser/browser/zen-workspaces.ftl
+++ b/locales/id/browser/browser/zen-workspaces.ftl
@@ -59,7 +59,7 @@ zen-workspaces-delete-workspace-title = Delete Workspace?
 zen-workspaces-delete-workspace-body = Apakah Anda yakin ingin menghapus { $name }? Tindakan ini tidak bisa dibatalkan.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Tab Ditutup! Gunakan <span>{ $shortcut }</span> untuk membatalkan.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Bersihkan
+    .tooltiptext = Tutup semua tab yang tidak disematkan

From dfbf4db57f9dab8a9de44dbc477d42935b5e9d64 Mon Sep 17 00:00:00 2001
From: ramiro <GARZA.RAMIROV@GMAIL.COM>
Date: Tue, 18 Nov 2025 20:24:19 +0100
Subject: [PATCH 107/162] fix: improve drag-and-drop behavior for tab folders,
 b=closes #11326, p=#11345

Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 prefs/zen/view.yaml            |  7 ++----
 src/zen/folders/ZenFolders.mjs | 44 +++++++++++++++-------------------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/prefs/zen/view.yaml b/prefs/zen/view.yaml
index 8235e67fe..334de94da 100644
--- a/prefs/zen/view.yaml
+++ b/prefs/zen/view.yaml
@@ -43,11 +43,8 @@
 - name: zen.view.drag-and-drop.move-over-threshold
   value: 70
 
-- name: zen.view.drag-and-drop.drop-inside-upper-threshold
-  value: 80
-
-- name: zen.view.drag-and-drop.drop-inside-lower-threshold
-  value: 30
+- name: zen.view.drag-and-drop.edge-zone-threshold
+  value: 25
 
 - name: zen.view.context-menu.refresh
   value: false
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 4245f4cd6..010a196a7 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -29,9 +29,11 @@
     return `${month} month${month === 1 ? '' : 's'} ago`;
   }
 
-  const ZEN_MAX_SUBFOLDERS = Services.prefs.getIntPref('zen.folders.max-subfolders');
-
   class nsZenFolders extends nsZenDOMOperatedFeature {
+    #ZEN_MAX_SUBFOLDERS = Services.prefs.getIntPref('zen.folders.max-subfolders', 5);
+    #ZEN_EDGE_ZONE_THRESHOLD =
+      Services.prefs.getIntPref('zen.view.drag-and-drop.edge-zone-threshold', 25) / 100;
+
     #popup = null;
     #popupTimer = null;
     #mouseTimer = null;
@@ -89,7 +91,7 @@
         const newSubfolderItem = document.getElementById('context_zenFolderNewSubfolder');
         newSubfolderItem.setAttribute(
           'disabled',
-          folder.level >= ZEN_MAX_SUBFOLDERS - 1 ? 'true' : 'false'
+          folder.level >= this.#ZEN_MAX_SUBFOLDERS - 1 ? 'true' : 'false'
         );
 
         const changeFolderSpace = document
@@ -470,7 +472,7 @@
     canDropElement(element, targetElement) {
       const isZenFolder = element?.isZenFolder;
       const level = targetElement?.group?.level + 1;
-      if (isZenFolder && level >= ZEN_MAX_SUBFOLDERS) {
+      if (isZenFolder && level >= this.#ZEN_MAX_SUBFOLDERS) {
         return false;
       }
       return true;
@@ -899,7 +901,11 @@
       const labelContainer = group.querySelector('.tab-group-label-container');
       // Setup mouseenter/mouseleave events for the folder
       labelContainer.addEventListener('mouseenter', (event) => {
-        if (!group.collapsed || !Services.prefs.getBoolPref('zen.folders.search.enabled')) {
+        if (
+          !group.collapsed ||
+          !Services.prefs.getBoolPref('zen.folders.search.enabled') ||
+          gBrowser.tabContainer.hasAttribute('movingtab')
+        ) {
           return;
         }
         this.#mouseTimer = setTimeout(() => {
@@ -1104,7 +1110,8 @@
         (!folder.hasAttribute('split-view-group') || !folder.hasAttribute('selected')) &&
         folder !== tab?.group &&
         !(
-          folder.level >= ZEN_MAX_SUBFOLDERS && movingTabs?.some((t) => gBrowser.isTabGroupLabel(t))
+          folder.level >= this.#ZEN_MAX_SUBFOLDERS &&
+          movingTabs?.some((t) => gBrowser.isTabGroupLabel(t))
         )
       ) {
         folder.setAttribute('selected', 'true');
@@ -1151,10 +1158,6 @@
       let dropElement = currentDropElement;
       let dropBefore = currentDropBefore;
       let colorCode = currentColorCode;
-      let dragUpThreshold =
-        Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-upper-threshold') / 100;
-      let dragDownThreshold =
-        Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100;
 
       const dropElementGroup = dropElement?.isZenFolder ? dropElement : dropElement?.group;
       const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
@@ -1162,26 +1165,17 @@
         dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;
       if (gBrowser.isTabGroup(firstGroupElem)) firstGroupElem = firstGroupElem.labelElement;
 
-      const isRestrictedGroup = isSplitGroup || dropElementGroup.collapsed;
-
-      const shouldDropInside =
-        !dropBefore &&
-        overlapPercent >= dragDownThreshold &&
-        overlapPercent <= dragUpThreshold &&
-        !isSplitGroup;
-      const shouldDropNear = overlapPercent < dragUpThreshold || overlapPercent > dragDownThreshold;
+      const isInMiddleZone =
+        overlapPercent >= this.#ZEN_EDGE_ZONE_THRESHOLD &&
+        overlapPercent <= 1 - this.#ZEN_EDGE_ZONE_THRESHOLD;
+      const shouldDropInside = isInMiddleZone && !isSplitGroup;
 
       if (shouldDropInside) {
         dropElement = firstGroupElem;
         dropBefore = true;
         this.highlightGroupOnDragOver(dropElementGroup, movingTabs);
-      } else if (shouldDropNear) {
-        if (dropBefore) {
-          colorCode = undefined;
-        } else if (!isRestrictedGroup) {
-          dropElement = firstGroupElem;
-          dropBefore = true;
-        }
+      } else {
+        colorCode = undefined;
         this.highlightGroupOnDragOver(null);
       }
 

From e5509f607dfe2cf8a0e1dbdc14e4e4d4553dfa49 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 18 Nov 2025 20:40:55 +0100
Subject: [PATCH 108/162] fix: Fixed position for control center panel on
 double toolbar, b=no-bug, c=common

---
 src/zen/common/ZenUIManager.mjs       | 5 ++++-
 src/zen/common/styles/zen-omnibox.css | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 74e71bada..115a75c97 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -669,7 +669,10 @@ var gZenUIManager = {
     if (anchor?.closest('#zen-sidebar-top-buttons')) {
       block = 'topleft';
     }
-    if (gZenVerticalTabsManager._hasSetSingleToolbar && gZenVerticalTabsManager._prefsRightSide) {
+    if (
+      (gZenVerticalTabsManager._hasSetSingleToolbar && gZenVerticalTabsManager._prefsRightSide) ||
+      (panel?.id === 'zen-unified-site-data-panel' && !gZenVerticalTabsManager._hasSetSingleToolbar)
+    ) {
       block = 'bottomright';
       inline = 'topright';
     }
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 94838947e..2e5116d06 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -722,6 +722,8 @@
 }
 
 :root:not([zen-single-toolbar='true'])
+  --urlbar-icon-border-radius: 6px !important;
+
   #urlbar[breakout-extend='true']:not([zen-floating-urlbar='true']) {
   & .urlbar-background {
     border-radius: 10px !important;

From 72dbe631ec43c87c5ad634927b73db2f78b4811a Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 18 Nov 2025 20:45:17 +0100
Subject: [PATCH 109/162] chore: Fixed linter errors, b=no-bug, c=common

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

diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 2e5116d06..4a916ef08 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -355,6 +355,8 @@
 }
 
 :root:not([zen-single-toolbar='true']) {
+  --urlbar-icon-border-radius: 6px !important;
+
   #notification-popup-box {
     margin: 0 4px 0 0 !important;
     justify-content: center;
@@ -722,8 +724,6 @@
 }
 
 :root:not([zen-single-toolbar='true'])
-  --urlbar-icon-border-radius: 6px !important;
-
   #urlbar[breakout-extend='true']:not([zen-floating-urlbar='true']) {
   & .urlbar-background {
     border-radius: 10px !important;

From 4aef6bb2857f2f23dc28095a0edb8dd405d927e9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 18 Nov 2025 21:02:28 +0100
Subject: [PATCH 110/162] 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 544ec059d..e4e79e6e3 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.7b",
+        "displayVersion": "1.17.8b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 9f15a61727641e59d645f23d80bef29a14053952 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 18 Nov 2025 21:02:58 +0100
Subject: [PATCH 111/162] chore: Apply patches from
 https://bugzilla.mozilla.org/show_bug.cgi?id=1993474, p=#11351 c=no-component

---
 src/firefox-patches/bug_1993474.patch | 107 ++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 src/firefox-patches/bug_1993474.patch

diff --git a/src/firefox-patches/bug_1993474.patch b/src/firefox-patches/bug_1993474.patch
new file mode 100644
index 000000000..11ebfc044
--- /dev/null
+++ b/src/firefox-patches/bug_1993474.patch
@@ -0,0 +1,107 @@
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index 2a17159215d107f6e4b09cf3a63ab0fff2c2ee70..15dffb83dbac8c6aa9b3dfa388b66874d5b05a7e 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -2848,6 +2848,25 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
+ 
+   mCustomNonClient = aCustomTitlebar;
+ 
++  // Because of bug 1993474, we want to properly set the WS_BORDER style
++  // when the titlebar is turned on or off.
++  //
++  // The documentation for window styles says that most styles can't be
++  // modified after the window is created. Testing shows that WS_BORDER
++  // seems to be OK, but make sure this is the only style we try to change
++  // here.
++  const LONG_PTR actualStyle = ::GetWindowLongPtrW(mWnd, GWL_STYLE);
++  LONG_PTR newStyle = actualStyle;
++  if (mCustomNonClient) {
++    newStyle &= ~WS_BORDER;
++  } else {
++    newStyle |= WS_BORDER;
++  }
++  if (newStyle != actualStyle) {
++    VERIFY_WINDOW_STYLE(newStyle);
++    ::SetWindowLongPtrW(mWnd, GWL_STYLE, newStyle);
++  }
++
+   // Force a reflow of content based on the new client dimensions.
+   if (mCustomNonClient) {
+     UpdateNonClientMargins();
+@@ -8792,9 +8811,10 @@ void nsWindow::FrameState::CheckInvariant() const {
+              mPreFullscreenSizeMode < nsSizeMode_Invalid);
+   MOZ_ASSERT(mWindow);
+ 
+-  // We should never observe fullscreen sizemode unless fullscreen is enabled
+-  MOZ_ASSERT_IF(mSizeMode == nsSizeMode_Fullscreen, mFullscreenMode);
+-  MOZ_ASSERT_IF(!mFullscreenMode, mSizeMode != nsSizeMode_Fullscreen);
++  // Unfortunately this can happen now with the hack fix in
++  // SetSizeModeInternal()
++  // MOZ_ASSERT_IF(mSizeMode == nsSizeMode_Fullscreen, mFullscreenMode);
++  // MOZ_ASSERT_IF(!mFullscreenMode, mSizeMode != nsSizeMode_Fullscreen);
+ 
+   // Something went wrong if we somehow saved fullscreen mode when we are
+   // changing into fullscreen mode
+@@ -8902,6 +8922,62 @@ void nsWindow::FrameState::SetSizeModeInternal(nsSizeMode aMode,
+       mSizeMode == nsSizeMode_Fullscreen || aMode == nsSizeMode_Fullscreen;
+   const bool maximized = aMode == nsSizeMode_Maximized;
+   const bool fullscreen = aMode == nsSizeMode_Fullscreen;
++  const bool wasMaximized = mSizeMode == nsSizeMode_Maximized;
++  const bool wasFullscreen = mSizeMode == nsSizeMode_Fullscreen;
++
++  // Maximizing a window without the WS_BORDER style set will make Windows
++  // display it over the taskbar, even if we tell it not to. So if we're
++  // becoming maximized, make sure WS_BORDER is set, then clear it after a
++  // short time if necessary (to avoid issues like bug 1993474). Conversely,
++  // for becoming fullscreen make sure WS_BORDER is cleared. Yes, this is a
++  // hack.
++  if ((maximized && !wasMaximized) || (fullscreen && !wasFullscreen)) {
++    const LONG_PTR actualStyle = ::GetWindowLongPtrW(mWindow->mWnd, GWL_STYLE);
++    LONG_PTR newStyle = actualStyle;
++    if (maximized) {
++      newStyle |= WS_BORDER;
++    } else {
++      newStyle &= ~WS_BORDER;
++    }
++    if (newStyle != actualStyle) {
++      VERIFY_WINDOW_STYLE(newStyle);
++      MOZ_LOG(
++          gWindowsLog, LogLevel::Info,
++          ("window style is %d, temporarily fixing up WS_BORDER", mSizeMode));
++      ::SetWindowLongPtrW(mWindow->mWnd, GWL_STYLE, newStyle);
++      ::SetWindowPos(mWindow->mWnd, nullptr, 0, 0, 0, 0,
++                     SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
++                         SWP_NOACTIVATE | SWP_NOOWNERZORDER);
++    }
++    NS_DispatchToMainThread(NS_NewRunnableFunction(
++        "nsWindow::FrameState::SetSizeModeInternal",
++        [expectedMode = aMode, window = RefPtr(this->mWindow)]() {
++          // Make sure we're still in the same state (i.e. the user hasn't
++          // un-maximized or un-fullscreened the window in the meantime)
++          if (window->SizeMode() != expectedMode) {
++            return;
++          }
++          const LONG_PTR actualStyle =
++              ::GetWindowLongPtrW(window->mWnd, GWL_STYLE);
++          LONG_PTR newStyle = actualStyle;
++          if (expectedMode == nsSizeMode_Maximized &&
++              window->mCustomNonClient) {
++            newStyle &= ~WS_BORDER;
++          } else {
++            newStyle |= WS_BORDER;
++          }
++          if (newStyle != actualStyle) {
++            VERIFY_WINDOW_STYLE(newStyle);
++            MOZ_LOG(gWindowsLog, LogLevel::Info,
++                    ("window style is %d, after delay restoring WS_BORDER",
++                     expectedMode));
++            ::SetWindowLongPtrW(window->mWnd, GWL_STYLE, newStyle);
++            ::SetWindowPos(window->mWnd, nullptr, 0, 0, 0, 0,
++                           SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
++                               SWP_NOACTIVATE | SWP_NOOWNERZORDER);
++          }
++        }));
++  }
+ 
+   mSizeMode = aMode;
+ 

From b903a25092cae6322625d345726ac4dd05a0d498 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 19 Nov 2025 01:59:46 +0100
Subject: [PATCH 112/162] chore: Revert
 "https://github.com/zen-browser/desktop/commit/9f15a61727641e59d645f23d80bef29a14053952",
 p=#11353

This reverts commit 9f15a61727641e59d645f23d80bef29a14053952.
---
 src/firefox-patches/bug_1993474.patch | 107 --------------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 src/firefox-patches/bug_1993474.patch

diff --git a/src/firefox-patches/bug_1993474.patch b/src/firefox-patches/bug_1993474.patch
deleted file mode 100644
index 11ebfc044..000000000
--- a/src/firefox-patches/bug_1993474.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index 2a17159215d107f6e4b09cf3a63ab0fff2c2ee70..15dffb83dbac8c6aa9b3dfa388b66874d5b05a7e 100644
---- a/widget/windows/nsWindow.cpp
-+++ b/widget/windows/nsWindow.cpp
-@@ -2848,6 +2848,25 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
- 
-   mCustomNonClient = aCustomTitlebar;
- 
-+  // Because of bug 1993474, we want to properly set the WS_BORDER style
-+  // when the titlebar is turned on or off.
-+  //
-+  // The documentation for window styles says that most styles can't be
-+  // modified after the window is created. Testing shows that WS_BORDER
-+  // seems to be OK, but make sure this is the only style we try to change
-+  // here.
-+  const LONG_PTR actualStyle = ::GetWindowLongPtrW(mWnd, GWL_STYLE);
-+  LONG_PTR newStyle = actualStyle;
-+  if (mCustomNonClient) {
-+    newStyle &= ~WS_BORDER;
-+  } else {
-+    newStyle |= WS_BORDER;
-+  }
-+  if (newStyle != actualStyle) {
-+    VERIFY_WINDOW_STYLE(newStyle);
-+    ::SetWindowLongPtrW(mWnd, GWL_STYLE, newStyle);
-+  }
-+
-   // Force a reflow of content based on the new client dimensions.
-   if (mCustomNonClient) {
-     UpdateNonClientMargins();
-@@ -8792,9 +8811,10 @@ void nsWindow::FrameState::CheckInvariant() const {
-              mPreFullscreenSizeMode < nsSizeMode_Invalid);
-   MOZ_ASSERT(mWindow);
- 
--  // We should never observe fullscreen sizemode unless fullscreen is enabled
--  MOZ_ASSERT_IF(mSizeMode == nsSizeMode_Fullscreen, mFullscreenMode);
--  MOZ_ASSERT_IF(!mFullscreenMode, mSizeMode != nsSizeMode_Fullscreen);
-+  // Unfortunately this can happen now with the hack fix in
-+  // SetSizeModeInternal()
-+  // MOZ_ASSERT_IF(mSizeMode == nsSizeMode_Fullscreen, mFullscreenMode);
-+  // MOZ_ASSERT_IF(!mFullscreenMode, mSizeMode != nsSizeMode_Fullscreen);
- 
-   // Something went wrong if we somehow saved fullscreen mode when we are
-   // changing into fullscreen mode
-@@ -8902,6 +8922,62 @@ void nsWindow::FrameState::SetSizeModeInternal(nsSizeMode aMode,
-       mSizeMode == nsSizeMode_Fullscreen || aMode == nsSizeMode_Fullscreen;
-   const bool maximized = aMode == nsSizeMode_Maximized;
-   const bool fullscreen = aMode == nsSizeMode_Fullscreen;
-+  const bool wasMaximized = mSizeMode == nsSizeMode_Maximized;
-+  const bool wasFullscreen = mSizeMode == nsSizeMode_Fullscreen;
-+
-+  // Maximizing a window without the WS_BORDER style set will make Windows
-+  // display it over the taskbar, even if we tell it not to. So if we're
-+  // becoming maximized, make sure WS_BORDER is set, then clear it after a
-+  // short time if necessary (to avoid issues like bug 1993474). Conversely,
-+  // for becoming fullscreen make sure WS_BORDER is cleared. Yes, this is a
-+  // hack.
-+  if ((maximized && !wasMaximized) || (fullscreen && !wasFullscreen)) {
-+    const LONG_PTR actualStyle = ::GetWindowLongPtrW(mWindow->mWnd, GWL_STYLE);
-+    LONG_PTR newStyle = actualStyle;
-+    if (maximized) {
-+      newStyle |= WS_BORDER;
-+    } else {
-+      newStyle &= ~WS_BORDER;
-+    }
-+    if (newStyle != actualStyle) {
-+      VERIFY_WINDOW_STYLE(newStyle);
-+      MOZ_LOG(
-+          gWindowsLog, LogLevel::Info,
-+          ("window style is %d, temporarily fixing up WS_BORDER", mSizeMode));
-+      ::SetWindowLongPtrW(mWindow->mWnd, GWL_STYLE, newStyle);
-+      ::SetWindowPos(mWindow->mWnd, nullptr, 0, 0, 0, 0,
-+                     SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
-+                         SWP_NOACTIVATE | SWP_NOOWNERZORDER);
-+    }
-+    NS_DispatchToMainThread(NS_NewRunnableFunction(
-+        "nsWindow::FrameState::SetSizeModeInternal",
-+        [expectedMode = aMode, window = RefPtr(this->mWindow)]() {
-+          // Make sure we're still in the same state (i.e. the user hasn't
-+          // un-maximized or un-fullscreened the window in the meantime)
-+          if (window->SizeMode() != expectedMode) {
-+            return;
-+          }
-+          const LONG_PTR actualStyle =
-+              ::GetWindowLongPtrW(window->mWnd, GWL_STYLE);
-+          LONG_PTR newStyle = actualStyle;
-+          if (expectedMode == nsSizeMode_Maximized &&
-+              window->mCustomNonClient) {
-+            newStyle &= ~WS_BORDER;
-+          } else {
-+            newStyle |= WS_BORDER;
-+          }
-+          if (newStyle != actualStyle) {
-+            VERIFY_WINDOW_STYLE(newStyle);
-+            MOZ_LOG(gWindowsLog, LogLevel::Info,
-+                    ("window style is %d, after delay restoring WS_BORDER",
-+                     expectedMode));
-+            ::SetWindowLongPtrW(window->mWnd, GWL_STYLE, newStyle);
-+            ::SetWindowPos(window->mWnd, nullptr, 0, 0, 0, 0,
-+                           SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
-+                               SWP_NOACTIVATE | SWP_NOOWNERZORDER);
-+          }
-+        }));
-+  }
- 
-   mSizeMode = aMode;
- 

From 4089dfa18baaa724b7a6bfc63b9164164caff83e Mon Sep 17 00:00:00 2001
From: ramiro <GARZA.RAMIROV@GMAIL.COM>
Date: Wed, 19 Nov 2025 12:30:15 +0100
Subject: [PATCH 113/162] fix: Split view gap when in compact view and sidebar
 is on right, b=closes https://github.com/zen-browser/desktop/issues/11269,
 p=#11357

---
 src/zen/compact-mode/sidebar.inc.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/compact-mode/sidebar.inc.css b/src/zen/compact-mode/sidebar.inc.css
index 40fecdf51..30110fd0d 100644
--- a/src/zen/compact-mode/sidebar.inc.css
+++ b/src/zen/compact-mode/sidebar.inc.css
@@ -106,7 +106,7 @@
       right: calc(-1 * var(--actual-zen-sidebar-width) + var(--zen-element-separation) / 2 + 1px);
     }
 
-    & .browserSidebarContainer {
+    & .browserSidebarContainer:not([is-zen-split='true']) {
       margin-left: 0 !important;
       margin-right: 0 !important;
     }

From 58f97c65e148b3486a1a70fe6741c07a777a5d39 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 19 Nov 2025 14:47:41 +0100
Subject: [PATCH 114/162] feat: Add preference for sidebar dragging, b=no-bug,
 c=common, workspaces

---
 prefs/zen/view.yaml                           |  3 ++
 .../urlbar/UrlbarResult-sys-mjs.patch         | 15 +++++++
 src/zen/common/ZenUIManager.mjs               | 44 +++++++++----------
 src/zen/workspaces/zen-workspaces.css         |  6 ++-
 4 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 src/browser/components/urlbar/UrlbarResult-sys-mjs.patch

diff --git a/prefs/zen/view.yaml b/prefs/zen/view.yaml
index 334de94da..7f5939822 100644
--- a/prefs/zen/view.yaml
+++ b/prefs/zen/view.yaml
@@ -57,3 +57,6 @@
 
 - name: zen.view.show-clear-tabs-button
   value: true
+
+- name: zen.view.draggable-sidebar
+  value: true
diff --git a/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch b/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
new file mode 100644
index 000000000..8aa60156a
--- /dev/null
+++ b/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
@@ -0,0 +1,15 @@
+diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs
+index 0882c0a01d17184cadb56aa1236ca97adf7f866b..4a5842eda6280205b96f9aee9b6f3b49fac7077c 100644
+--- a/browser/components/urlbar/UrlbarResult.sys.mjs
++++ b/browser/components/urlbar/UrlbarResult.sys.mjs
+@@ -172,6 +172,10 @@ export class UrlbarResult {
+     return this.#heuristic;
+   }
+ 
++  set heuristic(value) {
++    this.#heuristic = value;
++  }
++
+   get hideRowLabel() {
+     return this.#hideRowLabel;
+   }
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 115a75c97..238501278 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -444,29 +444,29 @@ var gZenUIManager = {
       gURLBar._zenHandleUrlbarClose = null;
     }
 
+    const isFocusedBefore = gURLBar.focused;
     setTimeout(() => {
       // We use this attribute on Tabbrowser::addTab
       gURLBar.removeAttribute('zen-newtab');
-    }, 0);
 
-    // Safely restore tab visual state with proper validation
-    if (
-      this._lastTab &&
-      !this._lastTab.closing &&
-      this._lastTab.ownerGlobal &&
-      !this._lastTab.ownerGlobal.closed
-    ) {
-      this._lastTab._visuallySelected = true;
-      this._lastTab = null;
-    }
+      // Safely restore tab visual state with proper validation
+      if (
+        this._lastTab &&
+        !this._lastTab.closing &&
+        this._lastTab.ownerGlobal &&
+        !this._lastTab.ownerGlobal.closed &&
+        !onSwitch
+      ) {
+        this._lastTab._visuallySelected = true;
+        this._lastTab = null;
+      }
 
-    // Reset newtab buttons
-    for (const button of this.newtabButtons) {
-      button.removeAttribute('in-urlbar');
-    }
+      // Reset newtab buttons
+      for (const button of this.newtabButtons) {
+        button.removeAttribute('in-urlbar');
+      }
 
-    // Handle search data
-    if (!onElementPicked) {
+      // Handle search data
       if (onSwitch) {
         this.clearUrlbarData();
       } else {
@@ -487,12 +487,8 @@ var gZenUIManager = {
       }
 
       gURLBar.handleRevert();
-    } else if (onElementPicked && onSwitch) {
-      this.clearUrlbarData();
-    }
 
-    if (gURLBar.focused) {
-      setTimeout(() => {
+      if (isFocusedBefore) {
         setTimeout(() => {
           window.dispatchEvent(
             new CustomEvent('ZenURLBarClosed', { detail: { onSwitch, onElementPicked } })
@@ -513,8 +509,8 @@ var gZenUIManager = {
             }
           }
         }, 0);
-      }, 0);
-    }
+      }
+    }, 0);
   },
 
   urlbarTrim(aURL) {
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index bc4c528b6..674a9cd44 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -330,8 +330,10 @@ zen-workspace {
     }
   }
 
-  &[active] .zen-workspace-empty-space {
-    -moz-window-dragging: drag;
+  @media -moz-pref('zen.view.draggable-sidebar') {
+    &[active] .zen-workspace-empty-space {
+      -moz-window-dragging: drag;
+    }
   }
 }
 

From 4c5a3aeabbfa3afcce7a529435bc0598d351c566 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 19 Nov 2025 19:14:45 +0100
Subject: [PATCH 115/162] feat: Always show the separator if there are visible
 tabs, b=closes #11349, c=tabs, workspaces

---
 .../themes/shared/zen-icons/lin/close.svg        |  2 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css          | 16 ++++++++--------
 src/zen/workspaces/ZenWorkspaces.mjs             |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/browser/themes/shared/zen-icons/lin/close.svg b/src/browser/themes/shared/zen-icons/lin/close.svg
index 7c535fa68..c4d0be066 100644
--- a/src/browser/themes/shared/zen-icons/lin/close.svg
+++ b/src/browser/themes/shared/zen-icons/lin/close.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="14" y1="4" x2="4" y2="14" data-color="color-2"></line><line x1="4" y1="4" x2="14" y2="14"></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="2" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="14" y1="4" x2="4" y2="14" data-color="color-2"></line><line x1="4" y1="4" x2="14" y2="14"></line></g></svg>
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index ce6669ef8..b75d8467d 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -329,13 +329,6 @@
       scale: 0.92;
     }
 
-    &:not(:hover) {
-      .tab-close-button,
-      .tab-reset-button {
-        display: none !important;
-      }
-    }
-
     & .tab-icon-image {
       &:not([src]),
       &:-moz-broken {
@@ -656,7 +649,14 @@
         }
       }
 
-      &:is(:hover, [visuallyselected]) .tab-close-button {
+      &:not(:hover) {
+        .tab-close-button,
+        .tab-reset-button {
+          display: none;
+        }
+      }
+
+      &:is(:hover, [multiselected][selected]) .tab-close-button {
         display: block;
         --tab-inline-padding: 0;
         margin-inline-end: 0;
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index c409d7274..9ca190752 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2536,7 +2536,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     // <= 2 because we have the empty tab and the new tab button
     const shouldHideSeparator = fromTabSelection
       ? pinnedContainer.hasAttribute('hide-separator')
-      : pinnedContainer.children.length === 1 || !visibleTabsFound();
+      : !visibleTabsFound();
     if (shouldHideSeparator) {
       pinnedContainer.setAttribute('hide-separator', 'true');
     } else {

From 0e8b8da84561d9f7d7a42b335920dc6581a10090 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 20 Nov 2025 18:14:46 +0100
Subject: [PATCH 116/162] chore: Convert the codebase into modules, p=#11364

* chore: Convert the codebase into modules, b=no-bug, c=common, compact-mode, folders, fonts, glance, images, kbs, media, mods, split-view, tabs, tests, vendor, welcome, workspaces

* feat: Added update popup, b=no-bug, c=media, common
---
 locales/en-US/browser/browser/zen-general.ftl |   11 +
 package-lock.json                             |  158 +-
 package.json                                  |    2 +-
 prefs/zen/updates.yaml                        |    6 +
 src/browser/base/content/zen-assets.inc.xhtml |   31 +-
 .../base/content/zen-assets.jar.inc.mn        |  116 +-
 .../base/content/zen-preloaded.inc.xhtml      |   14 +-
 .../components/preferences/zen-settings.js    |   12 +-
 .../zenKeyboardShortcuts.inc.xhtml            |    2 +-
 .../preferences/zenLooksAndFeel.inc.xhtml     |    2 +-
 .../preferences/zenMarketplace.inc.xhtml      |    1 -
 .../shared/zen-icons/check_unused_icons.py    |   73 +
 .../themes/shared/zen-icons/jar.inc.mn        |   81 +-
 .../shared/zen-icons/lin/accessibility.svg    |    5 -
 .../zen-icons/lin/add-to-dictionary.svg       |    5 -
 .../shared/zen-icons/lin/audio-save.svg       |    5 -
 .../themes/shared/zen-icons/lin/checkmark.svg |    5 -
 .../themes/shared/zen-icons/lin/close-all.svg |    5 -
 .../themes/shared/zen-icons/lin/edit-redo.svg |    5 -
 .../shared/zen-icons/lin/edit-select-all.svg  |    5 -
 .../themes/shared/zen-icons/lin/edit-undo.svg |    5 -
 .../themes/shared/zen-icons/lin/edit.svg      |    5 -
 .../themes/shared/zen-icons/lin/ext-link.svg  |    5 -
 .../themes/shared/zen-icons/lin/firefox.svg   |    5 -
 .../zen-icons/lin/heart-circle-fill.svg       |    5 +
 .../shared/zen-icons/lin/image-copy.svg       |    5 -
 .../shared/zen-icons/lin/image-open.svg       |    5 -
 .../shared/zen-icons/lin/image-save.svg       |    5 -
 .../themes/shared/zen-icons/lin/inspect.svg   |    5 -
 .../shared/zen-icons/lin/media-loop.svg       |    5 -
 .../themes/shared/zen-icons/lin/media-pip.svg |    5 -
 .../shared/zen-icons/lin/media-speed.svg      |    5 -
 .../themes/shared/zen-icons/lin/menu-bar.svg  |    5 -
 .../themes/shared/zen-icons/lin/move-tab.svg  |    5 -
 .../shared/zen-icons/lin/paste-and-go.svg     |    5 -
 .../themes/shared/zen-icons/lin/report.svg    |    5 -
 .../shared/zen-icons/lin/source-code.svg      |    5 -
 .../shared/zen-icons/lin/video-open.svg       |    5 -
 .../shared/zen-icons/lin/video-save.svg       |    5 -
 .../shared/zen-icons/lin/zoom-control.svg     |    5 -
 src/zen/common/ZenHasPolyfill.mjs             |   77 -
 src/zen/common/ZenPreloadedScripts.js         |    2 +-
 src/zen/common/ZenSessionStore.mjs            |   46 -
 src/zen/common/ZenStartup.mjs                 |  227 --
 src/zen/common/emojis/ZenEmojiPicker.mjs      |  389 +-
 src/zen/common/emojis/fetch_emojis.py         |    1 -
 src/zen/common/jar.inc.mn                     |   36 +
 .../common/{ => modules}/ZenCommonUtils.mjs   |   11 +-
 src/zen/common/modules/ZenHasPolyfill.mjs     |   75 +
 src/zen/common/modules/ZenSessionStore.mjs    |   47 +
 .../common/modules/ZenSidebarNotification.mjs |  128 +
 src/zen/common/modules/ZenStartup.mjs         |  188 +
 src/zen/common/{ => modules}/ZenUIManager.mjs |    6 +-
 src/zen/common/modules/ZenUpdates.mjs         |   89 +
 src/zen/common/moz.build                      |    6 +-
 .../styles/zen-sidebar-notification.css       |  122 +
 src/zen/common/styles/zen-theme.css           |    8 +
 .../common/{ => sys}/ZenActorsManager.sys.mjs |    0
 .../{ => sys}/ZenCustomizableUI.sys.mjs       |    2 +-
 .../common/{ => sys}/ZenUIMigration.sys.mjs   |    0
 src/zen/common/zenThemeModifier.js            |    2 +-
 src/zen/compact-mode/ZenCompactMode.mjs       | 1597 ++++----
 src/zen/compact-mode/jar.inc.mn               |    6 +
 src/zen/downloads/ZenDownloadAnimation.mjs    |  865 ++---
 src/zen/downloads/jar.inc.mn                  |    7 +
 src/zen/folders/ZenFolder.mjs                 |  443 ++-
 src/zen/folders/ZenFolders.mjs                | 3085 ++++++++--------
 src/zen/folders/jar.inc.mn                    |    7 +
 src/zen/fonts/jar.inc.mn                      |    6 +
 src/zen/glance/ZenGlanceManager.mjs           | 3276 ++++++++---------
 src/zen/glance/jar.inc.mn                     |    6 +
 src/zen/images/jar.inc.mn                     |   25 +
 src/zen/kbs/ZenKeyboardShortcuts.mjs          |    8 +-
 src/zen/kbs/jar.inc.mn                        |    5 +
 src/zen/media/ZenMediaController.mjs          | 1288 ++++---
 src/zen/media/jar.inc.mn                      |    6 +
 src/zen/media/zen-media-controls.css          |   15 +-
 src/zen/mods/ZenMods.mjs                      | 1225 +++---
 src/zen/mods/jar.inc.mn                       |    5 +
 src/zen/split-view/ZenViewSplitter.mjs        |    2 +
 src/zen/split-view/jar.inc.mn                 |    6 +
 src/zen/tabs/ZenPinnedTabManager.mjs          | 2754 +++++++-------
 src/zen/tabs/ZenPinnedTabsStorage.mjs         |    3 +-
 src/zen/tabs/jar.inc.mn                       |    8 +
 .../tabs/browser_tabs_cycle_by_attribute.js   |    3 +
 src/zen/vendor/jar.inc.mn                     |    6 +
 src/zen/welcome/jar.inc.mn                    |    6 +
 src/zen/workspaces/ZenGradientGenerator.mjs   | 3101 ++++++++--------
 src/zen/workspaces/ZenWorkspace.mjs           |  409 +-
 src/zen/workspaces/ZenWorkspaceCreation.mjs   |  553 ++-
 src/zen/workspaces/ZenWorkspaceIcons.mjs      |  361 +-
 src/zen/workspaces/ZenWorkspaces.mjs          |    9 +-
 src/zen/workspaces/ZenWorkspacesStorage.mjs   |    4 +-
 src/zen/workspaces/jar.inc.mn                 |   13 +
 src/zen/zen.globals.js                        |    7 +-
 95 files changed, 10686 insertions(+), 10540 deletions(-)
 create mode 100644 prefs/zen/updates.yaml
 create mode 100644 src/browser/themes/shared/zen-icons/check_unused_icons.py
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/accessibility.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/add-to-dictionary.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/audio-save.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/checkmark.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/close-all.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/edit-redo.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/edit-select-all.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/edit-undo.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/edit.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/ext-link.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/firefox.svg
 create mode 100644 src/browser/themes/shared/zen-icons/lin/heart-circle-fill.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/image-copy.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/image-open.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/image-save.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/inspect.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/media-loop.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/media-pip.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/media-speed.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/menu-bar.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/move-tab.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/paste-and-go.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/report.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/source-code.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/video-open.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/video-save.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/lin/zoom-control.svg
 delete mode 100644 src/zen/common/ZenHasPolyfill.mjs
 delete mode 100644 src/zen/common/ZenSessionStore.mjs
 delete mode 100644 src/zen/common/ZenStartup.mjs
 create mode 100644 src/zen/common/jar.inc.mn
 rename src/zen/common/{ => modules}/ZenCommonUtils.mjs (93%)
 create mode 100644 src/zen/common/modules/ZenHasPolyfill.mjs
 create mode 100644 src/zen/common/modules/ZenSessionStore.mjs
 create mode 100644 src/zen/common/modules/ZenSidebarNotification.mjs
 create mode 100644 src/zen/common/modules/ZenStartup.mjs
 rename src/zen/common/{ => modules}/ZenUIManager.mjs (99%)
 create mode 100644 src/zen/common/modules/ZenUpdates.mjs
 create mode 100644 src/zen/common/styles/zen-sidebar-notification.css
 rename src/zen/common/{ => sys}/ZenActorsManager.sys.mjs (100%)
 rename src/zen/common/{ => sys}/ZenCustomizableUI.sys.mjs (99%)
 rename src/zen/common/{ => sys}/ZenUIMigration.sys.mjs (100%)
 create mode 100644 src/zen/compact-mode/jar.inc.mn
 create mode 100644 src/zen/downloads/jar.inc.mn
 create mode 100644 src/zen/folders/jar.inc.mn
 create mode 100644 src/zen/fonts/jar.inc.mn
 create mode 100644 src/zen/glance/jar.inc.mn
 create mode 100644 src/zen/images/jar.inc.mn
 create mode 100644 src/zen/kbs/jar.inc.mn
 create mode 100644 src/zen/media/jar.inc.mn
 create mode 100644 src/zen/mods/jar.inc.mn
 create mode 100644 src/zen/split-view/jar.inc.mn
 create mode 100644 src/zen/tabs/jar.inc.mn
 create mode 100644 src/zen/vendor/jar.inc.mn
 create mode 100644 src/zen/welcome/jar.inc.mn
 create mode 100644 src/zen/workspaces/jar.inc.mn

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index bf4aa62d5..3792765fe 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -121,3 +121,14 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
+
+zen-sidebar-notification-updated-heading = Update Complete!
+
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip =
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip =
+    .title = Restart in Safe Mode
diff --git a/package-lock.json b/package-lock.json
index 0a4a39033..709f0fcee 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.22"
+        "@zen-browser/surfer": "^1.11.23"
       },
       "devDependencies": {
         "@babel/preset-typescript": "^7.27.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"
@@ -617,13 +611,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -637,19 +624,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -838,51 +812,51 @@
       }
     },
     "node_modules/@oozcitak/dom": {
-      "version": "1.15.10",
-      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-1.15.10.tgz",
-      "integrity": "sha512-0JT29/LaxVgRcGKvHmSrUTEvZ8BXvZhGl2LASRUgHqDTC1M5g1pLmVv56IYNyt3bG2CUjDkc67wnyZC14pbQrQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-2.0.1.tgz",
+      "integrity": "sha512-Un5k8MKqGak1LQM/behcHylmGdRopBXZax19weVedEAIrOCRZooY+MvX4Ehcz0ftOEPgYZ7vjIm/+MokVBFO3w==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/infra": "1.0.8",
-        "@oozcitak/url": "1.0.4",
-        "@oozcitak/util": "8.3.8"
+        "@oozcitak/infra": "^2.0.1",
+        "@oozcitak/url": "^2.0.1",
+        "@oozcitak/util": "^9.0.2"
       },
       "engines": {
-        "node": ">=8.0"
+        "node": ">=20.0"
       }
     },
     "node_modules/@oozcitak/infra": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-1.0.8.tgz",
-      "integrity": "sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-2.0.1.tgz",
+      "integrity": "sha512-TtjI+kducm0ExL3OTKglPLkAIQ3alq0Otbokml62haZESfQaL3ojLJxl7+UTBhWCkBBuCshzGEEYmX5MXo8WOg==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/util": "8.3.8"
+        "@oozcitak/util": "~9.0.2"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=20.0"
       }
     },
     "node_modules/@oozcitak/url": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-1.0.4.tgz",
-      "integrity": "sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-2.0.1.tgz",
+      "integrity": "sha512-lLHUQUyYy86q+qbALr0TMVh+VQAYwNGbsxBx4LhfjvkNYG0hgAwWtq7ePebGs2nEhZmmIFl24ikuCpH2r5d3+A==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/infra": "1.0.8",
-        "@oozcitak/util": "8.3.8"
+        "@oozcitak/infra": "^2.0.1",
+        "@oozcitak/util": "^9.0.2"
       },
       "engines": {
-        "node": ">=8.0"
+        "node": ">=20.0"
       }
     },
     "node_modules/@oozcitak/util": {
-      "version": "8.3.8",
-      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-8.3.8.tgz",
-      "integrity": "sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-9.0.4.tgz",
+      "integrity": "sha512-kmx1hRJlsvxiTCpK97off59LqSEOtkWOPe4rdfFL8TjZtihYSTVNObIfc86jtLngfnuIuuTRt+TUCgRS220RSQ==",
       "license": "MIT",
       "engines": {
-        "node": ">=8.0"
+        "node": ">=20.0"
       }
     },
     "node_modules/@resvg/resvg-js": {
@@ -1135,9 +1109,9 @@
       "license": "MIT"
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.11.22",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.22.tgz",
-      "integrity": "sha512-fvV+8stPXJDyX/6lv4bvgkxq1hNGyJJyOU1ysjJSrElxo9CerB35XU8LMjAs6SjuV1olLMILg2DwCIP2gVn0+Q==",
+      "version": "1.11.23",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.23.tgz",
+      "integrity": "sha512-nPJ8oH1r4yncPCymuVxFRJMKbj9elpLIuSMW7botJT1UpyTKeGPrpFukpc+fq4U8TXa1tNddpoUvI8ZRfk0sxA==",
       "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
@@ -1161,7 +1135,7 @@
         "semver": "^7.3.7",
         "sharp": "^0.32.6",
         "tiny-glob": "^0.2.9",
-        "xmlbuilder2": "^3.0.2"
+        "xmlbuilder2": "^4.0.0"
       },
       "bin": {
         "surfer": "dist/index.js"
@@ -1173,6 +1147,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1252,13 +1227,10 @@
       }
     },
     "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
     },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.2",
@@ -1846,8 +1818,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 +2005,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 +2325,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 +2561,6 @@
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -2616,6 +2584,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",
@@ -3056,19 +3025,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/esquery": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
@@ -3463,7 +3419,6 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -4409,13 +4364,12 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "license": "MIT",
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
@@ -4461,7 +4415,6 @@
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -4896,7 +4849,6 @@
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -5111,8 +5063,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 +5519,7 @@
       "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -6342,12 +6294,6 @@
       "integrity": "sha512-lgxErLl/7A5+vgIIXsh9MbeukOaCb2axgQ+bKCdIE+ibNT4XNYGNCR1qFEGq6F+YDASXK3Fh/c5FgtZchFolxw==",
       "license": "MIT"
     },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "license": "BSD-3-Clause"
-    },
     "node_modules/stack-base-iterator": {
       "version": "1.1.20",
       "resolved": "https://registry.npmjs.org/stack-base-iterator/-/stack-base-iterator-1.1.20.tgz",
@@ -6982,7 +6928,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "escalade": "^3.2.0",
         "picocolors": "^1.1.1"
@@ -7236,18 +7181,18 @@
       "license": "ISC"
     },
     "node_modules/xmlbuilder2": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-3.1.1.tgz",
-      "integrity": "sha512-WCSfbfZnQDdLQLiMdGUQpMxxckeQ4oZNMNhLVkcekTu7xhD4tuUDyAPoY8CwXvBYE6LwBHd6QW2WZXlOWr1vCw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-4.0.0.tgz",
+      "integrity": "sha512-zIoY033NGmbzHX1cYOGKNfeWpZyiGLzXGHNoxQ6tR/R+WqT7mqz+EDtFdPwqnhIms6vHz9BNtMS47DiGPyGfwg==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/dom": "1.15.10",
-        "@oozcitak/infra": "1.0.8",
-        "@oozcitak/util": "8.3.8",
-        "js-yaml": "3.14.1"
+        "@oozcitak/dom": "^2.0.1",
+        "@oozcitak/infra": "^2.0.1",
+        "@oozcitak/util": "^9.0.4",
+        "js-yaml": "^4.1.0"
       },
       "engines": {
-        "node": ">=12.0"
+        "node": ">=20.0"
       }
     },
     "node_modules/xtend": {
@@ -7264,8 +7209,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 26985ff2e..fc84a6d66 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.22"
+    "@zen-browser/surfer": "^1.11.23"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.27.0",
diff --git a/prefs/zen/updates.yaml b/prefs/zen/updates.yaml
new file mode 100644
index 000000000..52bc68bdd
--- /dev/null
+++ b/prefs/zen/updates.yaml
@@ -0,0 +1,6 @@
+# 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/.
+
+- name: zen.updates.show-update-notification
+  value: true
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 91b136f2e..2ab4e638e 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -43,18 +43,19 @@
 <script type="text/javascript" src="chrome://browser/content/ZenPreloadedScripts.js"></script>
 
 # Scripts used all over the browser
-<script type="text/javascript" src="chrome://browser/content/ZenUIManager.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenFolder.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenFolders.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenMods.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenCompactMode.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenGradientGenerator.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenGlanceManager.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenMediaController.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenEmojiPicker.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaceCreation.mjs"></script>
+<script type="module" src="chrome://browser/content/ZenUIManager.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenFolder.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenCompactMode.mjs"></script>
+
+<script type="module" src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs"></script>
+
+<script type="module" src="chrome://browser/content/zen-components/ZenMediaController.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenWorkspaceCreation.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenGlanceManager.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenFolders.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenEmojiPicker.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenMods.mjs"></script>
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index d8ee81f6e..04f9cfb52 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -2,104 +2,18 @@
 # 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/.
 
-        content/browser/zenThemeModifier.js                                     (../../zen/common/zenThemeModifier.js)
-        content/browser/ZenStartup.mjs                                          (../../zen/common/ZenStartup.mjs)
-        content/browser/ZenPreloadedScripts.js                                  (../../zen/common/ZenPreloadedScripts.js)
-        content/browser/zen-sets.js                                             (../../zen/common/zen-sets.js)
-        content/browser/ZenUIManager.mjs                                        (../../zen/common/ZenUIManager.mjs)
-        content/browser/zen-components/ZenCommonUtils.mjs                       (../../zen/common/ZenCommonUtils.mjs)
-        content/browser/zen-components/ZenSessionStore.mjs                      (../../zen/common/ZenSessionStore.mjs)
-        content/browser/zen-components/ZenEmojisData.min.mjs                    (../../zen/common/emojis/ZenEmojisData.min.mjs)
-        content/browser/zen-components/ZenEmojiPicker.mjs                       (../../zen/common/emojis/ZenEmojiPicker.mjs)
-        content/browser/zen-components/ZenHasPolyfill.mjs                       (../../zen/common/ZenHasPolyfill.mjs)
-
-*       content/browser/zen-styles/zen-theme.css                                (../../zen/common/styles/zen-theme.css)
-        content/browser/zen-styles/zen-buttons.css                              (../../zen/common/styles/zen-buttons.css)
-        content/browser/zen-styles/zen-browser-ui.css                           (../../zen/common/styles/zen-browser-ui.css)
-        content/browser/zen-styles/zen-animations.css                           (../../zen/common/styles/zen-animations.css)
-        content/browser/zen-styles/zen-panel-ui.css                             (../../zen/common/styles/zen-panel-ui.css)
-        content/browser/zen-styles/zen-single-components.css                    (../../zen/common/styles/zen-single-components.css)
-        content/browser/zen-styles/zen-sidebar.css                              (../../zen/common/styles/zen-sidebar.css)
-        content/browser/zen-styles/zen-toolbar.css                              (../../zen/common/styles/zen-toolbar.css)
-        content/browser/zen-styles/zen-browser-container.css                    (../../zen/common/styles/zen-browser-container.css)
-        content/browser/zen-styles/zen-omnibox.css                               (../../zen/common/styles/zen-omnibox.css)
-        content/browser/zen-styles/zen-popup.css                                (../../zen/common/styles/zen-popup.css)
-        content/browser/zen-styles/zen-branding.css                             (../../zen/common/styles/zen-branding.css)
-
-        content/browser/zen-styles/zen-panels/bookmarks.css                     (../../zen/common/styles/zen-panels/bookmarks.css)
-        content/browser/zen-styles/zen-panels/print.css                         (../../zen/common/styles/zen-panels/print.css)
-        content/browser/zen-styles/zen-panels/dialog.css                        (../../zen/common/styles/zen-panels/dialog.css)
-
-        content/browser/zen-components/ZenCompactMode.mjs                       (../../zen/compact-mode/ZenCompactMode.mjs)
-*       content/browser/zen-styles/zen-compact-mode.css                         (../../zen/compact-mode/zen-compact-mode.css)
-
-        content/browser/zen-components/ZenViewSplitter.mjs                      (../../zen/split-view/ZenViewSplitter.mjs)
-*       content/browser/zen-styles/zen-decks.css                                (../../zen/split-view/zen-decks.css)
-
-        content/browser/zen-components/ZenMods.mjs                              (../../zen/mods/ZenMods.mjs)
-
-        content/browser/zen-components/ZenWorkspaceIcons.mjs                    (../../zen/workspaces/ZenWorkspaceIcons.mjs)
-        content/browser/zen-components/ZenWorkspace.mjs                         (../../zen/workspaces/ZenWorkspace.mjs)
-        content/browser/zen-components/ZenWorkspaces.mjs                        (../../zen/workspaces/ZenWorkspaces.mjs)
-        content/browser/zen-components/ZenWorkspaceCreation.mjs                 (../../zen/workspaces/ZenWorkspaceCreation.mjs)
-        content/browser/zen-components/ZenWorkspacesStorage.mjs                 (../../zen/workspaces/ZenWorkspacesStorage.mjs)
-        content/browser/zen-components/ZenWorkspacesSync.mjs                    (../../zen/workspaces/ZenWorkspacesSync.mjs)
-        content/browser/zen-components/ZenGradientGenerator.mjs                 (../../zen/workspaces/ZenGradientGenerator.mjs)
-*       content/browser/zen-styles/zen-workspaces.css                           (../../zen/workspaces/zen-workspaces.css)
-        content/browser/zen-styles/zen-gradient-generator.css                   (../../zen/workspaces/zen-gradient-generator.css)
-
-        content/browser/zen-components/ZenKeyboardShortcuts.mjs                 (../../zen/kbs/ZenKeyboardShortcuts.mjs)
-
-        content/browser/zen-components/ZenPinnedTabsStorage.mjs                 (../../zen/tabs/ZenPinnedTabsStorage.mjs)
-        content/browser/zen-components/ZenPinnedTabManager.mjs                  (../../zen/tabs/ZenPinnedTabManager.mjs)
-*       content/browser/zen-styles/zen-tabs.css                                 (../../zen/tabs/zen-tabs.css)
-        content/browser/zen-styles/zen-tabs/vertical-tabs.css                   (../../zen/tabs/zen-tabs/vertical-tabs.css)
-
-        content/browser/zen-components/ZenGlanceManager.mjs                     (../../zen/glance/ZenGlanceManager.mjs)
-        content/browser/zen-styles/zen-glance.css                               (../../zen/glance/zen-glance.css)
-
-        content/browser/zen-components/ZenFolder.mjs                            (../../zen/folders/ZenFolder.mjs)
-        content/browser/zen-components/ZenFolders.mjs                           (../../zen/folders/ZenFolders.mjs)
-        content/browser/zen-styles/zen-folders.css                              (../../zen/folders/zen-folders.css)
-
-        content/browser/zen-components/ZenWelcome.mjs                           (../../zen/welcome/ZenWelcome.mjs)
-        content/browser/zen-styles/zen-welcome.css                              (../../zen/welcome/zen-welcome.css)
-
-        content/browser/zen-components/ZenMediaController.mjs                   (../../zen/media/ZenMediaController.mjs)
-        content/browser/zen-styles/zen-media-controls.css                       (../../zen/media/zen-media-controls.css)
-
-        content/browser/zen-components/ZenDownloadAnimation.mjs                 (../../zen/downloads/ZenDownloadAnimation.mjs)
-        content/browser/zen-styles/zen-download-arc-animation.css               (../../zen/downloads/zen-download-arc-animation.css)
-        content/browser/zen-styles/zen-download-box-animation.css               (../../zen/downloads/zen-download-box-animation.css)
-
-
-        # Images
-        content/browser/zen-images/brand-header.svg                             (../../zen/images/brand-header.svg)
-        content/browser/zen-images/layouts/collapsed.png                        (../../zen/images/layouts/collapsed.png)
-        content/browser/zen-images/layouts/multiple-toolbar.png                 (../../zen/images/layouts/multiple-toolbar.png)
-        content/browser/zen-images/layouts/single-toolbar.png                   (../../zen/images/layouts/single-toolbar.png)
-        content/browser/zen-images/grain-bg.png                                 (../../zen/images/grain-bg.png)
-        content/browser/zen-images/note-indicator.svg                           (../../zen/images/note-indicator.svg)
-
-        content/browser/zen-images/downloads/download.svg                       (../../zen/images/downloads/download.svg)
-        content/browser/zen-images/downloads/archive.svg                        (../../zen/images/downloads/archive.svg)
-
-        # Fonts
-        content/browser/zen-fonts/JunicodeVF-Italic.woff2                       (../../zen/fonts/JunicodeVF-Italic.woff2)
-        content/browser/zen-fonts/JunicodeVF-Roman.woff2                        (../../zen/fonts/JunicodeVF-Roman.woff2)
-
-        # JS Vendor
-        content/browser/zen-vendor/tsparticles.confetti.bundle.min.js           (../../zen/vendor/tsparticles.confetti.bundle.min.js)
-        content/browser/zen-vendor/motion.min.mjs                               (../../zen/vendor/motion.min.mjs)
-
-        # FavIcons for startup
-        content/browser/zen-images/favicons/calendar.svg                        (../../zen/images/favicons/calendar.svg)
-        content/browser/zen-images/favicons/discord.svg                         (../../zen/images/favicons/discord.svg)
-        content/browser/zen-images/favicons/figma.svg                           (../../zen/images/favicons/figma.svg)
-        content/browser/zen-images/favicons/github.svg                          (../../zen/images/favicons/github.svg)
-        content/browser/zen-images/favicons/notion.svg                          (../../zen/images/favicons/notion.svg)
-        content/browser/zen-images/favicons/obsidian.svg                        (../../zen/images/favicons/obsidian.svg)
-        content/browser/zen-images/favicons/slack.svg                           (../../zen/images/favicons/slack.svg)
-        content/browser/zen-images/favicons/reddit.svg                          (../../zen/images/favicons/reddit.svg)
-        content/browser/zen-images/favicons/x.svg                               (../../zen/images/favicons/x.svg)
-        content/browser/zen-images/favicons/trello.svg                          (../../zen/images/favicons/trello.svg)
+#include ../../../zen/common/jar.inc.mn
+#include ../../../zen/compact-mode/jar.inc.mn
+#include ../../../zen/split-view/jar.inc.mn
+#include ../../../zen/mods/jar.inc.mn
+#include ../../../zen/workspaces/jar.inc.mn
+#include ../../../zen/tabs/jar.inc.mn
+#include ../../../zen/kbs/jar.inc.mn
+#include ../../../zen/glance/jar.inc.mn
+#include ../../../zen/folders/jar.inc.mn
+#include ../../../zen/welcome/jar.inc.mn
+#include ../../../zen/media/jar.inc.mn
+#include ../../../zen/downloads/jar.inc.mn
+#include ../../../zen/images/jar.inc.mn
+#include ../../../zen/vendor/jar.inc.mn
+#include ../../../zen/fonts/jar.inc.mn
diff --git a/src/browser/base/content/zen-preloaded.inc.xhtml b/src/browser/base/content/zen-preloaded.inc.xhtml
index 83e73ef9d..6cd7ba1dc 100644
--- a/src/browser/base/content/zen-preloaded.inc.xhtml
+++ b/src/browser/base/content/zen-preloaded.inc.xhtml
@@ -6,11 +6,11 @@
 # the window is fully loaded.
 # Make sure they are loaded before the global-scripts.inc file.
 <script type="text/javascript" src="chrome://browser/content/zen-sets.js"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenHasPolyfill.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenCommonUtils.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaceIcons.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspace.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaces.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenSessionStore.mjs"></script>
+
+<script type="module" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenHasPolyfill.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenSessionStore.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenWorkspaces.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenWorkspace.mjs"></script>
+<script type="module" src="chrome://browser/content/zen-components/ZenWorkspaceIcons.mjs"></script>
\ No newline at end of file
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 35fbccbf7..6bad8d201 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1,8 +1,13 @@
-/* eslint-disable no-undef */
+/* eslint-disable no-undef, no-unused-vars */
 // 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/.
 
+const { nsZenMultiWindowFeature } = ChromeUtils.importESModule(
+  'chrome://browser/content/zen-components/ZenCommonUtils.mjs',
+  { global: 'current' }
+);
+
 var gZenMarketplaceManager = {
   async init() {
     const checkForUpdates = document.getElementById('zenThemeMarketplaceCheckForUpdates');
@@ -634,7 +639,6 @@ var gZenMarketplaceManager = {
 const kZenExtendedSidebar = 'zen.view.sidebar-expanded';
 const kZenSingleToolbar = 'zen.view.use-single-toolbar';
 
-/* eslint-disable no-unused-vars */
 var gZenLooksAndFeel = {
   init() {
     if (this.__hasInitialized) return;
@@ -696,7 +700,6 @@ var gZenLooksAndFeel = {
   },
 };
 
-/* eslint-disable no-unused-vars */
 var gZenWorkspacesSettings = {
   init() {
     var tabsUnloaderPrefListener = {
@@ -751,7 +754,7 @@ const ZEN_CKS_WRAPPER_ID = `${ZEN_CKS_CLASS_BASE}-wrapper`;
 const ZEN_CKS_GROUP_PREFIX = `${ZEN_CKS_CLASS_BASE}-group`;
 const KEYBIND_ATTRIBUTE_KEY = 'key';
 
-var zenMissingKeyboardShortcutL10n = {
+const zenMissingKeyboardShortcutL10n = {
   key_quickRestart: 'zen-key-quick-restart',
   key_delete: 'zen-key-delete',
   goBackKb: 'zen-key-go-back',
@@ -805,7 +808,6 @@ var zenIgnoreKeyboardShortcutL10n = [
   'zen-full-zoom-reduce-shortcut-alt-a',
 ];
 
-/* eslint-disable no-unused-vars */
 var gZenCKSSettings = {
   async init() {
     await this._initializeCKS();
diff --git a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
index 49cc4ee04..efbb535e7 100644
--- a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
+++ b/src/browser/components/preferences/zenKeyboardShortcuts.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/.
 
-<script src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"/>
+<script type="module" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"/>
 <html:template id="template-paneZenCKS">
 <hbox id="ZenCKSCategory"
       class="subcategory"
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 068db06b6..08b2c2ef7 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.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/.
 
-<script src="chrome://browser/content/preferences/zen-settings.js"/>
+<script type="text/javascript" src="chrome://browser/content/preferences/zen-settings.js"/>
 <html:template id="template-paneZenLooks">
 
 <hbox id="zenVerticalTabsCategory"
diff --git a/src/browser/components/preferences/zenMarketplace.inc.xhtml b/src/browser/components/preferences/zenMarketplace.inc.xhtml
index 8a6b36ff5..0bc932bb6 100644
--- a/src/browser/components/preferences/zenMarketplace.inc.xhtml
+++ b/src/browser/components/preferences/zenMarketplace.inc.xhtml
@@ -2,7 +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/.
 
-<script src="chrome://browser/content/zen-components/ZenCommonUtils.mjs" defer=""/>
 <html:template id="template-paneZenMarketplace">
 <hbox id="ZenMarketplaceCategory"
       class="subcategory"
diff --git a/src/browser/themes/shared/zen-icons/check_unused_icons.py b/src/browser/themes/shared/zen-icons/check_unused_icons.py
new file mode 100644
index 000000000..d4ef60487
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/check_unused_icons.py
@@ -0,0 +1,73 @@
+# 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/.
+
+# Note: You'll need to be on the root directory of the repo to run this script:
+#       python3 src/browser/themes/shared/zen-icons/check_unused_icons.py
+
+import os
+import sys
+import argparse
+
+IGNORE_DIRS = ['node_modules', 'engine']
+
+
+def get_all_icon_files(icon_dir):
+  icon_files = []
+  for root, _, files in os.walk(icon_dir):
+    for file in files:
+      if file.endswith('.svg'):
+        icon_files.append(file)
+  return icon_files
+
+
+def find_icon_usage(icon_files):
+  used_icons = set()
+  for root, _, files in os.walk('src'):
+    if any(ignored in root for ignored in IGNORE_DIRS):
+      continue
+    for file in files:
+      # ignore jar files
+      if file.endswith(('.mn')):
+        continue
+      try:
+        with open(os.path.join(root, file), 'r', encoding='utf-8') as f:
+          content = f.read()
+          for icon in icon_files:
+            if icon in content:
+              used_icons.add(icon)
+      except BaseException:
+        continue
+  return used_icons
+
+
+def main(args):
+  parser = argparse.ArgumentParser(description='Check for unused zen icons.')
+  parser.add_argument('--remove', action='store_true', help='Remove unused icons')
+  parsed_args = parser.parse_args(args)
+
+  icon_dir = 'src/browser/themes/shared/zen-icons/lin'
+  icon_files = get_all_icon_files(icon_dir)
+  used_icons = find_icon_usage(icon_files)
+
+  unused_icons = set(icon_files) - used_icons
+
+  if unused_icons:
+    print("Unused icons:")
+    for icon in sorted(unused_icons):
+      if parsed_args.remove:
+        os.remove(os.path.join(icon_dir, icon))
+        print(f"Removed {icon}")
+      else:
+        print(icon)
+  else:
+    print("No unused icons found.")
+
+  if parsed_args.remove:
+    print("Unused icons removed.")
+    os.chdir('src/browser/themes/shared/zen-icons')
+    os.system("sh ./update-resources.sh")
+
+
+if __name__ == "__main__":
+  main(sys.argv[1:])
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index d52bde3b5..485933c80 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -3,13 +3,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifdef XP_WIN
-*  skin/classic/browser/zen-icons/accessibility.svg                      (../shared/zen-icons/lin/accessibility.svg) 
-*  skin/classic/browser/zen-icons/add-to-dictionary.svg                      (../shared/zen-icons/lin/add-to-dictionary.svg) 
 *  skin/classic/browser/zen-icons/arrow-down.svg                      (../shared/zen-icons/lin/arrow-down.svg) 
 *  skin/classic/browser/zen-icons/arrow-left.svg                      (../shared/zen-icons/lin/arrow-left.svg) 
 *  skin/classic/browser/zen-icons/arrow-right.svg                      (../shared/zen-icons/lin/arrow-right.svg) 
 *  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) 
@@ -22,9 +19,7 @@
 *  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) 
-*  skin/classic/browser/zen-icons/checkmark.svg                      (../shared/zen-icons/lin/checkmark.svg) 
 *  skin/classic/browser/zen-icons/chevron.svg                      (../shared/zen-icons/lin/chevron.svg) 
-*  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) 
@@ -41,20 +36,14 @@
 *  skin/classic/browser/zen-icons/edit-cut.svg                      (../shared/zen-icons/lin/edit-cut.svg) 
 *  skin/classic/browser/zen-icons/edit-delete.svg                      (../shared/zen-icons/lin/edit-delete.svg) 
 *  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-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/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) 
 *  skin/classic/browser/zen-icons/forget.svg                      (../shared/zen-icons/lin/forget.svg) 
 *  skin/classic/browser/zen-icons/forward.svg                      (../shared/zen-icons/lin/forward.svg) 
@@ -63,28 +52,21 @@
 *  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/heart-circle-fill.svg                      (../shared/zen-icons/lin/heart-circle-fill.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) 
 *  skin/classic/browser/zen-icons/home.svg                      (../shared/zen-icons/lin/home.svg) 
-*  skin/classic/browser/zen-icons/image-copy.svg                      (../shared/zen-icons/lin/image-copy.svg) 
-*  skin/classic/browser/zen-icons/image-open.svg                      (../shared/zen-icons/lin/image-open.svg) 
-*  skin/classic/browser/zen-icons/image-save.svg                      (../shared/zen-icons/lin/image-save.svg) 
 *  skin/classic/browser/zen-icons/info.svg                      (../shared/zen-icons/lin/info.svg) 
-*  skin/classic/browser/zen-icons/inspect.svg                      (../shared/zen-icons/lin/inspect.svg) 
 *  skin/classic/browser/zen-icons/library.svg                      (../shared/zen-icons/lin/library.svg) 
 *  skin/classic/browser/zen-icons/link.svg                      (../shared/zen-icons/lin/link.svg) 
 *  skin/classic/browser/zen-icons/mail.svg                      (../shared/zen-icons/lin/mail.svg) 
 *  skin/classic/browser/zen-icons/manage.svg                      (../shared/zen-icons/lin/manage.svg) 
-*  skin/classic/browser/zen-icons/media-loop.svg                      (../shared/zen-icons/lin/media-loop.svg) 
 *  skin/classic/browser/zen-icons/media-mute.svg                      (../shared/zen-icons/lin/media-mute.svg) 
 *  skin/classic/browser/zen-icons/media-next.svg                      (../shared/zen-icons/lin/media-next.svg) 
 *  skin/classic/browser/zen-icons/media-pause.svg                      (../shared/zen-icons/lin/media-pause.svg) 
-*  skin/classic/browser/zen-icons/media-pip.svg                      (../shared/zen-icons/lin/media-pip.svg) 
 *  skin/classic/browser/zen-icons/media-play.svg                      (../shared/zen-icons/lin/media-play.svg) 
 *  skin/classic/browser/zen-icons/media-previous.svg                      (../shared/zen-icons/lin/media-previous.svg) 
-*  skin/classic/browser/zen-icons/media-speed.svg                      (../shared/zen-icons/lin/media-speed.svg) 
 *  skin/classic/browser/zen-icons/media-unmute.svg                      (../shared/zen-icons/lin/media-unmute.svg) 
-*  skin/classic/browser/zen-icons/menu-bar.svg                      (../shared/zen-icons/lin/menu-bar.svg) 
 *  skin/classic/browser/zen-icons/menu.svg                      (../shared/zen-icons/lin/menu.svg) 
 *  skin/classic/browser/zen-icons/microphone-blocked-fill.svg                      (../shared/zen-icons/lin/microphone-blocked-fill.svg) 
 *  skin/classic/browser/zen-icons/microphone-blocked.svg                      (../shared/zen-icons/lin/microphone-blocked.svg) 
@@ -92,13 +74,11 @@
 *  skin/classic/browser/zen-icons/microphone.svg                      (../shared/zen-icons/lin/microphone.svg) 
 *  skin/classic/browser/zen-icons/midi.svg                      (../shared/zen-icons/lin/midi.svg) 
 *  skin/classic/browser/zen-icons/moon-stars.svg                      (../shared/zen-icons/lin/moon-stars.svg) 
-*  skin/classic/browser/zen-icons/move-tab.svg                      (../shared/zen-icons/lin/move-tab.svg) 
 *  skin/classic/browser/zen-icons/new-tab-image.svg                      (../shared/zen-icons/lin/new-tab-image.svg) 
 *  skin/classic/browser/zen-icons/open.svg                      (../shared/zen-icons/lin/open.svg) 
 *  skin/classic/browser/zen-icons/page-portrait.svg                      (../shared/zen-icons/lin/page-portrait.svg) 
 *  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) 
@@ -113,7 +93,6 @@
 *  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/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/screen.svg                      (../shared/zen-icons/lin/screen.svg) 
@@ -130,7 +109,6 @@
 *  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) 
 *  skin/classic/browser/zen-icons/split.svg                      (../shared/zen-icons/lin/split.svg) 
@@ -146,23 +124,17 @@
 *  skin/classic/browser/zen-icons/unpin.svg                      (../shared/zen-icons/lin/unpin.svg) 
 *  skin/classic/browser/zen-icons/video-blocked-fill.svg                      (../shared/zen-icons/lin/video-blocked-fill.svg) 
 *  skin/classic/browser/zen-icons/video-fill.svg                      (../shared/zen-icons/lin/video-fill.svg) 
-*  skin/classic/browser/zen-icons/video-open.svg                      (../shared/zen-icons/lin/video-open.svg) 
-*  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) 
 #endif
 #ifdef XP_MACOSX
-*  skin/classic/browser/zen-icons/accessibility.svg                      (../shared/zen-icons/lin/accessibility.svg) 
-*  skin/classic/browser/zen-icons/add-to-dictionary.svg                      (../shared/zen-icons/lin/add-to-dictionary.svg) 
 *  skin/classic/browser/zen-icons/arrow-down.svg                      (../shared/zen-icons/lin/arrow-down.svg) 
 *  skin/classic/browser/zen-icons/arrow-left.svg                      (../shared/zen-icons/lin/arrow-left.svg) 
 *  skin/classic/browser/zen-icons/arrow-right.svg                      (../shared/zen-icons/lin/arrow-right.svg) 
 *  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) 
@@ -175,9 +147,7 @@
 *  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) 
-*  skin/classic/browser/zen-icons/checkmark.svg                      (../shared/zen-icons/lin/checkmark.svg) 
 *  skin/classic/browser/zen-icons/chevron.svg                      (../shared/zen-icons/lin/chevron.svg) 
-*  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) 
@@ -194,20 +164,14 @@
 *  skin/classic/browser/zen-icons/edit-cut.svg                      (../shared/zen-icons/lin/edit-cut.svg) 
 *  skin/classic/browser/zen-icons/edit-delete.svg                      (../shared/zen-icons/lin/edit-delete.svg) 
 *  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-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/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) 
 *  skin/classic/browser/zen-icons/forget.svg                      (../shared/zen-icons/lin/forget.svg) 
 *  skin/classic/browser/zen-icons/forward.svg                      (../shared/zen-icons/lin/forward.svg) 
@@ -216,28 +180,21 @@
 *  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/heart-circle-fill.svg                      (../shared/zen-icons/lin/heart-circle-fill.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) 
 *  skin/classic/browser/zen-icons/home.svg                      (../shared/zen-icons/lin/home.svg) 
-*  skin/classic/browser/zen-icons/image-copy.svg                      (../shared/zen-icons/lin/image-copy.svg) 
-*  skin/classic/browser/zen-icons/image-open.svg                      (../shared/zen-icons/lin/image-open.svg) 
-*  skin/classic/browser/zen-icons/image-save.svg                      (../shared/zen-icons/lin/image-save.svg) 
 *  skin/classic/browser/zen-icons/info.svg                      (../shared/zen-icons/lin/info.svg) 
-*  skin/classic/browser/zen-icons/inspect.svg                      (../shared/zen-icons/lin/inspect.svg) 
 *  skin/classic/browser/zen-icons/library.svg                      (../shared/zen-icons/lin/library.svg) 
 *  skin/classic/browser/zen-icons/link.svg                      (../shared/zen-icons/lin/link.svg) 
 *  skin/classic/browser/zen-icons/mail.svg                      (../shared/zen-icons/lin/mail.svg) 
 *  skin/classic/browser/zen-icons/manage.svg                      (../shared/zen-icons/lin/manage.svg) 
-*  skin/classic/browser/zen-icons/media-loop.svg                      (../shared/zen-icons/lin/media-loop.svg) 
 *  skin/classic/browser/zen-icons/media-mute.svg                      (../shared/zen-icons/lin/media-mute.svg) 
 *  skin/classic/browser/zen-icons/media-next.svg                      (../shared/zen-icons/lin/media-next.svg) 
 *  skin/classic/browser/zen-icons/media-pause.svg                      (../shared/zen-icons/lin/media-pause.svg) 
-*  skin/classic/browser/zen-icons/media-pip.svg                      (../shared/zen-icons/lin/media-pip.svg) 
 *  skin/classic/browser/zen-icons/media-play.svg                      (../shared/zen-icons/lin/media-play.svg) 
 *  skin/classic/browser/zen-icons/media-previous.svg                      (../shared/zen-icons/lin/media-previous.svg) 
-*  skin/classic/browser/zen-icons/media-speed.svg                      (../shared/zen-icons/lin/media-speed.svg) 
 *  skin/classic/browser/zen-icons/media-unmute.svg                      (../shared/zen-icons/lin/media-unmute.svg) 
-*  skin/classic/browser/zen-icons/menu-bar.svg                      (../shared/zen-icons/lin/menu-bar.svg) 
 *  skin/classic/browser/zen-icons/menu.svg                      (../shared/zen-icons/lin/menu.svg) 
 *  skin/classic/browser/zen-icons/microphone-blocked-fill.svg                      (../shared/zen-icons/lin/microphone-blocked-fill.svg) 
 *  skin/classic/browser/zen-icons/microphone-blocked.svg                      (../shared/zen-icons/lin/microphone-blocked.svg) 
@@ -245,13 +202,11 @@
 *  skin/classic/browser/zen-icons/microphone.svg                      (../shared/zen-icons/lin/microphone.svg) 
 *  skin/classic/browser/zen-icons/midi.svg                      (../shared/zen-icons/lin/midi.svg) 
 *  skin/classic/browser/zen-icons/moon-stars.svg                      (../shared/zen-icons/lin/moon-stars.svg) 
-*  skin/classic/browser/zen-icons/move-tab.svg                      (../shared/zen-icons/lin/move-tab.svg) 
 *  skin/classic/browser/zen-icons/new-tab-image.svg                      (../shared/zen-icons/lin/new-tab-image.svg) 
 *  skin/classic/browser/zen-icons/open.svg                      (../shared/zen-icons/lin/open.svg) 
 *  skin/classic/browser/zen-icons/page-portrait.svg                      (../shared/zen-icons/lin/page-portrait.svg) 
 *  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) 
@@ -266,7 +221,6 @@
 *  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/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/screen.svg                      (../shared/zen-icons/lin/screen.svg) 
@@ -283,7 +237,6 @@
 *  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) 
 *  skin/classic/browser/zen-icons/split.svg                      (../shared/zen-icons/lin/split.svg) 
@@ -299,23 +252,17 @@
 *  skin/classic/browser/zen-icons/unpin.svg                      (../shared/zen-icons/lin/unpin.svg) 
 *  skin/classic/browser/zen-icons/video-blocked-fill.svg                      (../shared/zen-icons/lin/video-blocked-fill.svg) 
 *  skin/classic/browser/zen-icons/video-fill.svg                      (../shared/zen-icons/lin/video-fill.svg) 
-*  skin/classic/browser/zen-icons/video-open.svg                      (../shared/zen-icons/lin/video-open.svg) 
-*  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) 
 #endif
 #ifdef XP_LINUX
-*  skin/classic/browser/zen-icons/accessibility.svg                      (../shared/zen-icons/lin/accessibility.svg) 
-*  skin/classic/browser/zen-icons/add-to-dictionary.svg                      (../shared/zen-icons/lin/add-to-dictionary.svg) 
 *  skin/classic/browser/zen-icons/arrow-down.svg                      (../shared/zen-icons/lin/arrow-down.svg) 
 *  skin/classic/browser/zen-icons/arrow-left.svg                      (../shared/zen-icons/lin/arrow-left.svg) 
 *  skin/classic/browser/zen-icons/arrow-right.svg                      (../shared/zen-icons/lin/arrow-right.svg) 
 *  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) 
@@ -328,9 +275,7 @@
 *  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) 
-*  skin/classic/browser/zen-icons/checkmark.svg                      (../shared/zen-icons/lin/checkmark.svg) 
 *  skin/classic/browser/zen-icons/chevron.svg                      (../shared/zen-icons/lin/chevron.svg) 
-*  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) 
@@ -347,20 +292,14 @@
 *  skin/classic/browser/zen-icons/edit-cut.svg                      (../shared/zen-icons/lin/edit-cut.svg) 
 *  skin/classic/browser/zen-icons/edit-delete.svg                      (../shared/zen-icons/lin/edit-delete.svg) 
 *  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-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/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) 
 *  skin/classic/browser/zen-icons/forget.svg                      (../shared/zen-icons/lin/forget.svg) 
 *  skin/classic/browser/zen-icons/forward.svg                      (../shared/zen-icons/lin/forward.svg) 
@@ -369,28 +308,21 @@
 *  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/heart-circle-fill.svg                      (../shared/zen-icons/lin/heart-circle-fill.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) 
 *  skin/classic/browser/zen-icons/home.svg                      (../shared/zen-icons/lin/home.svg) 
-*  skin/classic/browser/zen-icons/image-copy.svg                      (../shared/zen-icons/lin/image-copy.svg) 
-*  skin/classic/browser/zen-icons/image-open.svg                      (../shared/zen-icons/lin/image-open.svg) 
-*  skin/classic/browser/zen-icons/image-save.svg                      (../shared/zen-icons/lin/image-save.svg) 
 *  skin/classic/browser/zen-icons/info.svg                      (../shared/zen-icons/lin/info.svg) 
-*  skin/classic/browser/zen-icons/inspect.svg                      (../shared/zen-icons/lin/inspect.svg) 
 *  skin/classic/browser/zen-icons/library.svg                      (../shared/zen-icons/lin/library.svg) 
 *  skin/classic/browser/zen-icons/link.svg                      (../shared/zen-icons/lin/link.svg) 
 *  skin/classic/browser/zen-icons/mail.svg                      (../shared/zen-icons/lin/mail.svg) 
 *  skin/classic/browser/zen-icons/manage.svg                      (../shared/zen-icons/lin/manage.svg) 
-*  skin/classic/browser/zen-icons/media-loop.svg                      (../shared/zen-icons/lin/media-loop.svg) 
 *  skin/classic/browser/zen-icons/media-mute.svg                      (../shared/zen-icons/lin/media-mute.svg) 
 *  skin/classic/browser/zen-icons/media-next.svg                      (../shared/zen-icons/lin/media-next.svg) 
 *  skin/classic/browser/zen-icons/media-pause.svg                      (../shared/zen-icons/lin/media-pause.svg) 
-*  skin/classic/browser/zen-icons/media-pip.svg                      (../shared/zen-icons/lin/media-pip.svg) 
 *  skin/classic/browser/zen-icons/media-play.svg                      (../shared/zen-icons/lin/media-play.svg) 
 *  skin/classic/browser/zen-icons/media-previous.svg                      (../shared/zen-icons/lin/media-previous.svg) 
-*  skin/classic/browser/zen-icons/media-speed.svg                      (../shared/zen-icons/lin/media-speed.svg) 
 *  skin/classic/browser/zen-icons/media-unmute.svg                      (../shared/zen-icons/lin/media-unmute.svg) 
-*  skin/classic/browser/zen-icons/menu-bar.svg                      (../shared/zen-icons/lin/menu-bar.svg) 
 *  skin/classic/browser/zen-icons/menu.svg                      (../shared/zen-icons/lin/menu.svg) 
 *  skin/classic/browser/zen-icons/microphone-blocked-fill.svg                      (../shared/zen-icons/lin/microphone-blocked-fill.svg) 
 *  skin/classic/browser/zen-icons/microphone-blocked.svg                      (../shared/zen-icons/lin/microphone-blocked.svg) 
@@ -398,13 +330,11 @@
 *  skin/classic/browser/zen-icons/microphone.svg                      (../shared/zen-icons/lin/microphone.svg) 
 *  skin/classic/browser/zen-icons/midi.svg                      (../shared/zen-icons/lin/midi.svg) 
 *  skin/classic/browser/zen-icons/moon-stars.svg                      (../shared/zen-icons/lin/moon-stars.svg) 
-*  skin/classic/browser/zen-icons/move-tab.svg                      (../shared/zen-icons/lin/move-tab.svg) 
 *  skin/classic/browser/zen-icons/new-tab-image.svg                      (../shared/zen-icons/lin/new-tab-image.svg) 
 *  skin/classic/browser/zen-icons/open.svg                      (../shared/zen-icons/lin/open.svg) 
 *  skin/classic/browser/zen-icons/page-portrait.svg                      (../shared/zen-icons/lin/page-portrait.svg) 
 *  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) 
@@ -419,7 +349,6 @@
 *  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/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/screen.svg                      (../shared/zen-icons/lin/screen.svg) 
@@ -436,7 +365,6 @@
 *  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) 
 *  skin/classic/browser/zen-icons/split.svg                      (../shared/zen-icons/lin/split.svg) 
@@ -452,13 +380,10 @@
 *  skin/classic/browser/zen-icons/unpin.svg                      (../shared/zen-icons/lin/unpin.svg) 
 *  skin/classic/browser/zen-icons/video-blocked-fill.svg                      (../shared/zen-icons/lin/video-blocked-fill.svg) 
 *  skin/classic/browser/zen-icons/video-fill.svg                      (../shared/zen-icons/lin/video-fill.svg) 
-*  skin/classic/browser/zen-icons/video-open.svg                      (../shared/zen-icons/lin/video-open.svg) 
-*  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) 
 #endif
 *  skin/classic/browser/zen-icons/urlbar-arrow.svg                      (../shared/zen-icons/common/urlbar-arrow.svg) 
diff --git a/src/browser/themes/shared/zen-icons/lin/accessibility.svg b/src/browser/themes/shared/zen-icons/lin/accessibility.svg
deleted file mode 100644
index e19752f4d..000000000
--- a/src/browser/themes/shared/zen-icons/lin/accessibility.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="9" cy="2.25" r="1.5" data-color="color-2"></circle><line x1="7.25" y1="16.5" x2="7.25" y2="6.24"></line><line x1="10.75" y1="6.24" x2="10.75" y2="16.5"></line><path d="M2.75,5.75c1.751,.3,3.86,.531,6.25,.531,1.777,0,3.894-.128,6.25-.531"></path><line x1="7.25" y1="11.25" x2="10.75" y2="11.25"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/add-to-dictionary.svg b/src/browser/themes/shared/zen-icons/lin/add-to-dictionary.svg
deleted file mode 100644
index b73c7cffa..000000000
--- a/src/browser/themes/shared/zen-icons/lin/add-to-dictionary.svg
+++ /dev/null
@@ -1,5 +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/.
-<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.181,3.257c-.221-.865-.998-1.507-1.931-1.507H5.75c-1.105,0-2,.896-2,2v12.5l5.25-3.5,5.25,3.5v-3"></path><line x1="14.25" y1="5.75" x2="14.25" y2="10.75" data-color="color-2"></line><line x1="16.75" y1="8.25" x2="11.75" y2="8.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/audio-save.svg b/src/browser/themes/shared/zen-icons/lin/audio-save.svg
deleted file mode 100644
index ca397dd27..000000000
--- a/src/browser/themes/shared/zen-icons/lin/audio-save.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="7.25" x2="5.75" y2="13.75"></line><line x1="14.75" y1="5.75" x2="14.75" y2="12.25"></line><path d="m8.6399,3.0186l4.9461-.8246c.61-.102,1.164.368,1.164.986v2.57l-9,1.5"></path><circle cx="3.75" cy="13.75" r="2"></circle><circle cx="12.75" cy="12.25" r="2"></circle><line x1="3.75" y1="1.25" x2="3.75" y2="6.25" data-color="color-2"></line><line x1="6.25" y1="3.75" x2="1.25" y2="3.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/checkmark.svg b/src/browser/themes/shared/zen-icons/lin/checkmark.svg
deleted file mode 100644
index c24575d4a..000000000
--- a/src/browser/themes/shared/zen-icons/lin/checkmark.svg
+++ /dev/null
@@ -1,5 +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/.
-<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"><polyline points="2.75 9.5 6.5 13.25 15.25 4.5"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/close-all.svg b/src/browser/themes/shared/zen-icons/lin/close-all.svg
deleted file mode 100644
index c80f58b30..000000000
--- a/src/browser/themes/shared/zen-icons/lin/close-all.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M1.75,16.25v-.5c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v.5"></path><path d="M3.75,11.25c0-.828,.672-1.5,1.5-1.5h7.5c.828,0,1.5,.672,1.5,1.5"></path><polyline points="11.5 4.75 9 7.25 6.5 4.75" data-color="color-2"></polyline><line x1="9" y1="7" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/edit-redo.svg b/src/browser/themes/shared/zen-icons/lin/edit-redo.svg
deleted file mode 100644
index 85ca4753b..000000000
--- a/src/browser/themes/shared/zen-icons/lin/edit-redo.svg
+++ /dev/null
@@ -1,5 +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/.
-<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,10c-.528-.461-2.7-2.251-6-2.251s-5.472,1.79-6,2.251" data-color="color-2"></path><polyline points="13.375 5.598 15 10 10.47 11.222"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/edit-select-all.svg b/src/browser/themes/shared/zen-icons/lin/edit-select-all.svg
deleted file mode 100644
index 137a567ae..000000000
--- a/src/browser/themes/shared/zen-icons/lin/edit-select-all.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="14.75" y1=".75" x2="14.75" y2="5.75" data-color="color-2"></line><line x1="17.25" y1="3.25" x2="12.25" y2="3.25" data-color="color-2"></line><path d="M2.25,5.25c0-1.105,.895-2,2-2"></path><path d="M14.75,13.75c0,1.105-.895,2-2,2"></path><path d="M4.25,15.75c-1.105,0-2-.895-2-2"></path><line x1="7.25" y1="3.25" x2="9.25" y2="3.25"></line><line x1="7.25" y1="15.75" x2="9.75" y2="15.75"></line><line x1="14.75" y1="8.75" x2="14.75" y2="10.75"></line><line x1="2.25" y1="8.25" x2="2.25" y2="10.75"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/edit-undo.svg b/src/browser/themes/shared/zen-icons/lin/edit-undo.svg
deleted file mode 100644
index dd708e475..000000000
--- a/src/browser/themes/shared/zen-icons/lin/edit-undo.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M3,10c.528-.461,2.7-2.251,6-2.251s5.472,1.79,6,2.251" data-color="color-2"></path><polyline points="4.625 5.598 3 10 7.53 11.222"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/edit.svg b/src/browser/themes/shared/zen-icons/lin/edit.svg
deleted file mode 100644
index a879756fc..000000000
--- a/src/browser/themes/shared/zen-icons/lin/edit.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M2.75,15.25s3.599-.568,4.546-1.515c.947-.947,7.327-7.327,7.327-7.327,.837-.837,.837-2.194,0-3.03-.837-.837-2.194-.837-3.03,0,0,0-6.38,6.38-7.327,7.327s-1.515,4.546-1.515,4.546h0Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/ext-link.svg b/src/browser/themes/shared/zen-icons/lin/ext-link.svg
deleted file mode 100644
index 861778ca0..000000000
--- a/src/browser/themes/shared/zen-icons/lin/ext-link.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M4.25,9.25V3.75c0-1.105,.895-2,2-2h6c1.105,0,2,.895,2,2V13.25c0,1.105-.895,2-2,2H7.25"></path><polyline points="7.24 6.75 11.25 6.75 11.25 10.76" data-color="color-2"></polyline><line x1="11.25" y1="6.75" x2="1.75" y2="16.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/firefox.svg b/src/browser/themes/shared/zen-icons/lin/firefox.svg
deleted file mode 100644
index 09cd36756..000000000
--- a/src/browser/themes/shared/zen-icons/lin/firefox.svg
+++ /dev/null
@@ -1,5 +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/.
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="currentColor" fill-opacity="context-fill-opacity"><path d="M14.7498,13.0913c-.0154.9253-.7896,1.6587-1.715,1.6587h-6.956c-.2705,0-.4541-.275-.3505-.5248l.0024-.0057c.4574-1.1044,1.1996-2.0362,2.1473-2.7161.1179-.0846.2601-.1284.4052-.1284h4.7793c.9416,0,1.703.7711,1.6873,1.7163Z"/><path d="M9.9212,1.25c.2705,0,.4541.275.3505.5248l-.0024.0057c-.4574,1.1044-1.1996,2.0362-2.1473,2.7161-.1179.0846-.2601.1284-.4052.1284H2.9653c-.9254,0-1.6996-.7334-1.715-1.6587-.0158-.9452.7457-1.7163,1.6873-1.7163h6.9837Z"/><path d="M2.9372,14.75c-.2152,0-.4339-.0414-.6451-.1289-.861-.3566-1.2699-1.3437-.9132-2.2047.5485-1.3241,1.3346-2.5112,2.3367-3.5283,1.0381-1.0537,2.2623-1.877,3.6387-2.4471,1.8919-.7837,3.3654-2.2571,4.149-4.149.3566-.861,1.3437-1.2698,2.2047-.9132.861.3566,1.2699,1.3437.9132,2.2047-.5485,1.3241-1.3346,2.5112-2.3367,3.5283-1.0381,1.0537-2.2623,1.877-3.6387,2.4471-1.8919.7837-3.3654,2.2571-4.149,4.149-.2691.6498-.8975,1.0421-1.5596,1.0421Z"/></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/heart-circle-fill.svg b/src/browser/themes/shared/zen-icons/lin/heart-circle-fill.svg
new file mode 100644
index 000000000..e349c7d4c
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/heart-circle-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 1C13.4183 1 17 4.58172 17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9C1 4.58172 4.58172 1 9 1ZM10.7285 5.55176C10.0566 5.5598 9.42663 5.86058 9 6.36914C8.57267 5.86121 7.94219 5.56042 7.26758 5.55176C6.01248 5.55999 4.99539 6.58541 5 7.83789C5 10.5743 7.79989 12.25 8.6582 12.6982C8.76478 12.7542 8.88246 12.7812 8.99902 12.7812C9.11561 12.7812 9.2339 12.7535 9.33984 12.6982C10.1978 12.2503 12.9989 10.5754 12.999 7.83887C13.0037 6.58553 11.9872 5.55909 10.7285 5.55176Z"/></g></svg>
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/lin/image-copy.svg b/src/browser/themes/shared/zen-icons/lin/image-copy.svg
deleted file mode 100644
index bde7794b0..000000000
--- a/src/browser/themes/shared/zen-icons/lin/image-copy.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M6.587,12.243l5.206-5.2c.391-.391,1.024-.391,1.414,0l3.043,3.043" data-color="color-2"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect><path d="M8,7c-.551,0-1-.449-1-1s.449-1,1-1,1,.449,1,1-.449,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/image-open.svg b/src/browser/themes/shared/zen-icons/lin/image-open.svg
deleted file mode 100644
index 611a6d356..000000000
--- a/src/browser/themes/shared/zen-icons/lin/image-open.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M4,15.25l5.836-5.836c.781-.781,2.047-.781,2.828,0l3.086,3.086" data-color="color-2"></path><rect x="2.25" y="4.75" width="13.5" height="10.5" rx="2" ry="2"></rect><line x1="4.75" y1="1.75" x2="13.25" y2="1.75" data-color="color-2"></line><circle cx="5.75" cy="8.25" r="1.25" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/image-save.svg b/src/browser/themes/shared/zen-icons/lin/image-save.svg
deleted file mode 100644
index e1ebb853b..000000000
--- a/src/browser/themes/shared/zen-icons/lin/image-save.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="m3.762,14.989l6.074-6.075c.781-.781,2.047-.781,2.828,0l2.586,2.586"></path><circle cx="6.25" cy="7.25" r="1.25" stroke-width="0" fill="currentColor"></circle><line x1="14.25" y1="1.25" x2="14.25" y2="6.25" data-color="color-2"></line><path d="m9.461,2.75h-4.711c-1.1046,0-2,.8955-2,2v8.5c0,1.1045.8954,2,2,2h8.5c1.1046,0,2-.8955,2-2v-4.7109"></path><line x1="16.75" y1="3.75" x2="11.75" y2="3.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/inspect.svg b/src/browser/themes/shared/zen-icons/lin/inspect.svg
deleted file mode 100644
index c04dac0a2..000000000
--- a/src/browser/themes/shared/zen-icons/lin/inspect.svg
+++ /dev/null
@@ -1,5 +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/.
-<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"><polyline points="14 6.25 16.25 4 14 1.75" data-color="color-2"></polyline><path d="M6.596,2.75h-1.846c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2H13.25c1.105,0,2-.896,2-2v-4.846"></path><polyline points="11 6.25 8.75 4 11 1.75" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/media-loop.svg b/src/browser/themes/shared/zen-icons/lin/media-loop.svg
deleted file mode 100644
index 4e560fc4a..000000000
--- a/src/browser/themes/shared/zen-icons/lin/media-loop.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M5,13.75h-.75c-1.105,0-2-.895-2-2V6.25c0-1.105,.895-2,2-2H13.75c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2h-5.742" data-color="color-2"></path><polyline points="10.5 11.25 8.008 13.742 10.5 16.235"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/media-pip.svg b/src/browser/themes/shared/zen-icons/lin/media-pip.svg
deleted file mode 100644
index f9e7ca263..000000000
--- a/src/browser/themes/shared/zen-icons/lin/media-pip.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M5.75,12.25h-2c-1.105,0-2-.895-2-2V5.75c0-1.105,.895-2,2-2H12.25c1.105,0,2,.895,2,2v2"></path><rect x="8.75" y="10.75" width="7.5" height="4.5" rx="1.5" ry="1.5"></rect><polyline points="7.25 6.25 7.25 9.25 4.25 9.25" data-color="color-2"></polyline><line x1="7.25" y1="9.25" x2="4.25" y2="6.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/media-speed.svg b/src/browser/themes/shared/zen-icons/lin/media-speed.svg
deleted file mode 100644
index e6544b8a5..000000000
--- a/src/browser/themes/shared/zen-icons/lin/media-speed.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="9" cy="12" r="1" fill="currentColor" data-color="color-2"></circle><path d="M12.75,12.25h3.487c.003-.083,.013-.166,.013-.25,0-4.004-3.246-7.25-7.25-7.25S1.75,7.996,1.75,12c0,.084,.01,.167,.013,.25h3.487"></path><line x1="8.495" y1="11.137" x2="6.557" y2="7.827" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/menu-bar.svg b/src/browser/themes/shared/zen-icons/lin/menu-bar.svg
deleted file mode 100644
index 49152bb9b..000000000
--- a/src/browser/themes/shared/zen-icons/lin/menu-bar.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="9" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="9" cy="3.25" r=".5" fill="currentColor"></circle><circle cx="9" cy="14.75" r=".5" fill="currentColor"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/move-tab.svg b/src/browser/themes/shared/zen-icons/lin/move-tab.svg
deleted file mode 100644
index d4f361352..000000000
--- a/src/browser/themes/shared/zen-icons/lin/move-tab.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="11.25" y="10.75" width="5" height="5" rx="1.5" ry="1.5" data-color="color-2"></rect><rect x="11.25" y="2.25" width="5" height="5" rx="1.5" ry="1.5"></rect><polyline points="6.75 11.5 9 13.75 6.75 16"></polyline><path d="M9,13.75h-2.5c-2.623,0-4.75-2.127-4.75-4.75h0c0-2.623,2.127-4.75,4.75-4.75h1.75"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/paste-and-go.svg b/src/browser/themes/shared/zen-icons/lin/paste-and-go.svg
deleted file mode 100644
index 5680448de..000000000
--- a/src/browser/themes/shared/zen-icons/lin/paste-and-go.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M6.25,2.75h-1c-1.105,0-2,.895-2,2V14.25c0,1.105,.895,2,2,2h7.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1"></path><rect x="6.25" y="1.25" width="5.5" height="3" rx="1" ry="1" data-color="color-2"></rect><polyline points="6.25 10.25 8 12.25 11.75 7.25" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/report.svg b/src/browser/themes/shared/zen-icons/lin/report.svg
deleted file mode 100644
index 06097d2ea..000000000
--- a/src/browser/themes/shared/zen-icons/lin/report.svg
+++ /dev/null
@@ -1,5 +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/.
-<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>
diff --git a/src/browser/themes/shared/zen-icons/lin/source-code.svg b/src/browser/themes/shared/zen-icons/lin/source-code.svg
deleted file mode 100644
index 4259dcfed..000000000
--- a/src/browser/themes/shared/zen-icons/lin/source-code.svg
+++ /dev/null
@@ -1,5 +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/.
-<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"><polyline points="5.25 13.25 1.75 9 5.25 4.75"></polyline><polyline points="12.75 13.25 16.25 9 12.75 4.75"></polyline><line x1="7.75" y1="13.25" x2="10.25" y2="4.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/video-open.svg b/src/browser/themes/shared/zen-icons/lin/video-open.svg
deleted file mode 100644
index d4ffc2e0c..000000000
--- a/src/browser/themes/shared/zen-icons/lin/video-open.svg
+++ /dev/null
@@ -1,5 +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/.
-<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.211,6.984l-2.296-1.385c-.402-.243-.915,.047-.915,.516v2.771c0,.47,.513,.759,.915,.516l2.296-1.385c.389-.235,.389-.798,0-1.033Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/video-save.svg b/src/browser/themes/shared/zen-icons/lin/video-save.svg
deleted file mode 100644
index 636097d3f..000000000
--- a/src/browser/themes/shared/zen-icons/lin/video-save.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.844"></path><path d="M15.75,10.313v-1.563c0-1.104-.895-2-2-2H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h5"></path><path d="M12.539,11.323l4.204,2.477c.343,.202,.343,.697,0,.899l-4.204,2.477c-.349,.206-.789-.045-.789-.449v-4.955c0-.404,.441-.655,.789-.449Z" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/lin/zoom-control.svg b/src/browser/themes/shared/zen-icons/lin/zoom-control.svg
deleted file mode 100644
index b5a4b856e..000000000
--- a/src/browser/themes/shared/zen-icons/lin/zoom-control.svg
+++ /dev/null
@@ -1,5 +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/.
-<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="7.75" cy="7.75" r="5"></circle><line x1="15.25" y1="15.25" x2="11.285" y2="11.285"></line><circle cx="5.5" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="10" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><path d="M6.75,8.5h2c.276,0,.5,.224,.5,.5h0c0,.828-.672,1.5-1.5,1.5h0c-.828,0-1.5-.672-1.5-1.5h0c0-.276,.224-.5,.5-.5Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/zen/common/ZenHasPolyfill.mjs b/src/zen/common/ZenHasPolyfill.mjs
deleted file mode 100644
index 4513033e9..000000000
--- a/src/zen/common/ZenHasPolyfill.mjs
+++ /dev/null
@@ -1,77 +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/.
-
-{
-  class nsHasPolyfill {
-    constructor() {
-      this.observers = [];
-      this.idStore = 0;
-    }
-
-    /**
-     * @param {{selector: string, exists: boolean}} descendantSelectors
-     */
-    observeSelectorExistence(element, descendantSelectors, stateAttribute, attributeFilter = []) {
-      const updateState = () => {
-        const exists = descendantSelectors.some(({ selector }) => {
-          let selected = element.querySelector(selector);
-          if (selected?.tagName?.toLowerCase() === 'menu') {
-            return null;
-          }
-          return selected;
-        });
-        const { exists: shouldExist = true } = descendantSelectors;
-        if (exists === shouldExist) {
-          if (!element.hasAttribute(stateAttribute)) {
-            gZenCompactModeManager._setElementExpandAttribute(element, true, stateAttribute);
-          }
-        } else {
-          if (element.hasAttribute(stateAttribute)) {
-            gZenCompactModeManager._setElementExpandAttribute(element, false, stateAttribute);
-          }
-        }
-      };
-
-      const observer = new MutationObserver(updateState);
-      updateState();
-      const observerId = this.idStore++;
-      this.observers.push({
-        id: observerId,
-        observer,
-        element,
-        attributeFilter,
-      });
-      return observerId;
-    }
-
-    disconnectObserver(observerId) {
-      const index = this.observers.findIndex((o) => o.id === observerId);
-      if (index !== -1) {
-        this.observers[index].observer.disconnect();
-      }
-    }
-
-    connectObserver(observerId) {
-      const observer = this.observers.find((o) => o.id === observerId);
-      if (observer) {
-        observer.observer.observe(observer.element, {
-          childList: true,
-          subtree: true,
-          attributes: true,
-          attributeFilter: observer.attributeFilter.length ? observer.attributeFilter : undefined,
-        });
-      }
-    }
-
-    destroy() {
-      this.observers.forEach((observer) => observer.observer.disconnect());
-      this.observers = [];
-    }
-  }
-
-  const hasPolyfillInstance = new nsHasPolyfill();
-  window.addEventListener('unload', () => hasPolyfillInstance.destroy(), { once: true });
-
-  window.ZenHasPolyfill = hasPolyfillInstance;
-}
diff --git a/src/zen/common/ZenPreloadedScripts.js b/src/zen/common/ZenPreloadedScripts.js
index 90529c6de..6d7dd4a7f 100644
--- a/src/zen/common/ZenPreloadedScripts.js
+++ b/src/zen/common/ZenPreloadedScripts.js
@@ -5,5 +5,5 @@
 // prettier-ignore
 
 {
-  Services.scriptloader.loadSubScript("chrome://browser/content/ZenStartup.mjs", this);
+  ChromeUtils.importESModule("chrome://browser/content/ZenStartup.mjs", { global: "current" });
 }
diff --git a/src/zen/common/ZenSessionStore.mjs b/src/zen/common/ZenSessionStore.mjs
deleted file mode 100644
index 2b86d886e..000000000
--- a/src/zen/common/ZenSessionStore.mjs
+++ /dev/null
@@ -1,46 +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/.
-{
-  class ZenSessionStore extends nsZenPreloadedFeature {
-    init() {
-      this.#waitAndCleanup();
-    }
-
-    promiseInitialized = new Promise((resolve) => {
-      this._resolveInitialized = resolve;
-    });
-
-    restoreInitialTabData(tab, tabData) {
-      if (tabData.zenWorkspace) {
-        tab.setAttribute('zen-workspace-id', tabData.zenWorkspace);
-      }
-      if (tabData.zenPinnedId) {
-        tab.setAttribute('zen-pin-id', tabData.zenPinnedId);
-      }
-      if (tabData.zenHasStaticLabel) {
-        tab.setAttribute('zen-has-static-label', 'true');
-      }
-      if (tabData.zenEssential) {
-        tab.setAttribute('zen-essential', 'true');
-      }
-      if (tabData.zenDefaultUserContextId) {
-        tab.setAttribute('zenDefaultUserContextId', 'true');
-      }
-      if (tabData.zenPinnedEntry) {
-        tab.setAttribute('zen-pinned-entry', tabData.zenPinnedEntry);
-      }
-    }
-
-    async #waitAndCleanup() {
-      await SessionStore.promiseInitialized;
-      this.#cleanup();
-    }
-
-    #cleanup() {
-      this._resolveInitialized();
-    }
-  }
-
-  window.gZenSessionStore = new ZenSessionStore();
-}
diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
deleted file mode 100644
index f1b6c5a0f..000000000
--- a/src/zen/common/ZenStartup.mjs
+++ /dev/null
@@ -1,227 +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/.
-{
-  var gZenStartup = new (class {
-    #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();
-    }
-
-    #initBrowserBackground() {
-      const background = document.createXULElement('box');
-      background.id = 'zen-browser-background';
-      background.classList.add('zen-browser-generic-background');
-      const grain = document.createXULElement('box');
-      grain.classList.add('zen-browser-grain');
-      background.appendChild(grain);
-      document.getElementById('browser').prepend(background);
-      const toolbarBackground = background.cloneNode(true);
-      toolbarBackground.removeAttribute('id');
-      toolbarBackground.classList.add('zen-toolbar-background');
-      document.getElementById('titlebar').prepend(toolbarBackground);
-    }
-
-    #zenInitBrowserLayout() {
-      if (this.#hasInitializedLayout) return;
-      this.#hasInitializedLayout = true;
-      try {
-        const kNavbarItems = ['nav-bar', 'PersonalToolbar'];
-        const kNewContainerId = 'zen-appcontent-navbar-container';
-        let newContainer = document.getElementById(kNewContainerId);
-        for (let id of kNavbarItems) {
-          const node = document.getElementById(id);
-          console.assert(node, 'Could not find node with id: ' + id);
-          if (!node) continue;
-          newContainer.appendChild(node);
-        }
-
-        // Fix notification deck
-        const deckTemplate = document.getElementById('tab-notification-deck-template');
-        if (deckTemplate) {
-          document.getElementById('zen-appcontent-wrapper').prepend(deckTemplate);
-        }
-
-        gZenWorkspaces.init();
-        setTimeout(() => {
-          gZenUIManager.init();
-          this.#checkForWelcomePage();
-        }, 0);
-      } catch (e) {
-        console.error('ZenThemeModifier: Error initializing browser layout', e);
-      }
-      if (gBrowserInit.delayedStartupFinished) {
-        this.delayedStartupFinished();
-      } else {
-        Services.obs.addObserver(this, 'browser-delayed-startup-finished');
-      }
-    }
-
-    observe(aSubject, aTopic) {
-      // This nsIObserver method allows us to defer initialization until after
-      // this window has finished painting and starting up.
-      if (aTopic == 'browser-delayed-startup-finished' && aSubject == window) {
-        Services.obs.removeObserver(this, 'browser-delayed-startup-finished');
-        this.delayedStartupFinished();
-      }
-    }
-
-    delayedStartupFinished() {
-      gZenWorkspaces.promiseInitialized.then(async () => {
-        await delayedStartupPromise;
-        await SessionStore.promiseAllWindowsRestored;
-        delete gZenUIManager.promiseInitialized;
-        this.#initSearchBar();
-        gZenCompactModeManager.init();
-        // Fix for https://github.com/zen-browser/desktop/issues/7605, specially in compact mode
-        if (gURLBar.hasAttribute('breakout-extend')) {
-          gURLBar.focus();
-        }
-        // A bit of a hack to make sure the tabs toolbar is updated.
-        // Just in case we didn't get the right size.
-        gZenUIManager.updateTabsToolbar();
-        this.closeWatermark();
-        this.isReady = true;
-      });
-    }
-
-    openWatermark() {
-      if (!Services.prefs.getBoolPref('zen.watermark.enabled', false)) {
-        document.documentElement.removeAttribute('zen-before-loaded');
-        return;
-      }
-      for (let elem of document.querySelectorAll('#browser > *, #urlbar')) {
-        elem.style.opacity = 0;
-      }
-    }
-
-    closeWatermark() {
-      document.documentElement.removeAttribute('zen-before-loaded');
-      if (Services.prefs.getBoolPref('zen.watermark.enabled', false)) {
-        let elementsToIgnore = this.#watermarkIgnoreElements.map((id) => '#' + id).join(', ');
-        gZenUIManager.motion
-          .animate(
-            '#browser > *:not(' + elementsToIgnore + '), #urlbar, #tabbrowser-tabbox > *',
-            {
-              opacity: [0, 1],
-            },
-            {
-              duration: 0.1,
-            }
-          )
-          .then(() => {
-            for (let elem of document.querySelectorAll(
-              '#browser > *, #urlbar, #tabbrowser-tabbox > *'
-            )) {
-              elem.style.removeProperty('opacity');
-            }
-          });
-      }
-      window.requestAnimationFrame(() => {
-        window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
-      });
-    }
-
-    #changeSidebarLocation() {
-      const kElementsToAppend = ['sidebar-splitter', 'sidebar-box'];
-
-      const browser = document.getElementById('browser');
-      browser.prepend(gNavToolbox);
-
-      const sidebarPanelWrapper = document.getElementById('tabbrowser-tabbox');
-      for (let id of kElementsToAppend) {
-        const elem = document.getElementById(id);
-        if (elem) {
-          sidebarPanelWrapper.prepend(elem);
-        }
-      }
-    }
-
-    #initSearchBar() {
-      // Only focus the url bar
-      gURLBar.focus();
-    }
-
-    #checkForWelcomePage() {
-      if (!Services.prefs.getBoolPref('zen.welcome-screen.seen', false)) {
-        Services.prefs.setBoolPref('zen.welcome-screen.seen', true);
-        Services.prefs.setStringPref('zen.updates.last-build-id', Services.appinfo.appBuildID);
-        Services.scriptloader.loadSubScript(
-          'chrome://browser/content/zen-components/ZenWelcome.mjs',
-          window
-        );
-      } else {
-        this.#createUpdateAnimation();
-      }
-    }
-
-    async #createUpdateAnimation() {
-      const appID = Services.appinfo.appBuildID;
-      if (
-        Services.prefs.getStringPref('zen.updates.last-build-id', '') === appID ||
-        gZenUIManager.testingEnabled
-      ) {
-        return;
-      }
-      Services.prefs.setStringPref('zen.updates.last-build-id', appID);
-      await gZenWorkspaces.promiseInitialized;
-      const appWrapper = document.getElementById('zen-main-app-wrapper');
-      const element = document.createElement('div');
-      element.id = 'zen-update-animation';
-      const elementBorder = document.createElement('div');
-      elementBorder.id = 'zen-update-animation-border';
-      requestIdleCallback(() => {
-        if (gReduceMotion) {
-          return;
-        }
-        appWrapper.appendChild(element);
-        appWrapper.appendChild(elementBorder);
-        Promise.all([
-          gZenUIManager.motion.animate(
-            '#zen-update-animation',
-            {
-              top: ['100%', '-50%'],
-              opacity: [0.5, 1],
-            },
-            {
-              duration: 0.35,
-            }
-          ),
-          gZenUIManager.motion.animate(
-            '#zen-update-animation-border',
-            {
-              '--background-top': ['150%', '-50%'],
-            },
-            {
-              duration: 0.35,
-              delay: 0.08,
-            }
-          ),
-        ]).then(() => {
-          element.remove();
-          elementBorder.remove();
-        });
-      });
-    }
-  })();
-
-  window.addEventListener(
-    'MozBeforeInitialXULLayout',
-    () => {
-      gZenStartup.init();
-    },
-    { once: true }
-  );
-}
diff --git a/src/zen/common/emojis/ZenEmojiPicker.mjs b/src/zen/common/emojis/ZenEmojiPicker.mjs
index 8c31d4e18..0f36a7caf 100644
--- a/src/zen/common/emojis/ZenEmojiPicker.mjs
+++ b/src/zen/common/emojis/ZenEmojiPicker.mjs
@@ -1,9 +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/.
-{
-  // prettier-ignore
-  const SVG_ICONS = [
+
+import { nsZenDOMOperatedFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+
+// prettier-ignore
+const SVG_ICONS = [
     "airplane.svg", "american-football.svg", "baseball.svg", "basket.svg", 
     "bed.svg", "bell.svg", "bookmark.svg", "book.svg", 
     "briefcase.svg", "brush.svg", "bug.svg", "build.svg", 
@@ -28,204 +30,201 @@
     "water.svg", "weight.svg", 
   ];
 
-  class nsZenEmojiPicker extends nsZenDOMOperatedFeature {
-    #panel;
+class nsZenEmojiPicker extends nsZenDOMOperatedFeature {
+  #panel;
 
-    #anchor;
+  #anchor;
 
-    #currentPromise = null;
-    #currentPromiseResolve = null;
-    #currentPromiseReject = null;
+  #currentPromise = null;
+  #currentPromiseResolve = null;
+  #currentPromiseReject = null;
 
-    init() {
-      this.#panel = document.getElementById('PanelUI-zen-emojis-picker');
-      this.#panel.addEventListener('popupshowing', this);
-      this.#panel.addEventListener('popuphidden', this);
-      this.#panel.addEventListener('command', this);
-      this.searchInput.addEventListener('input', this);
-    }
+  init() {
+    this.#panel = document.getElementById('PanelUI-zen-emojis-picker');
+    this.#panel.addEventListener('popupshowing', this);
+    this.#panel.addEventListener('popuphidden', this);
+    this.#panel.addEventListener('command', this);
+    this.searchInput.addEventListener('input', this);
+  }
 
-    handleEvent(event) {
-      switch (event.type) {
-        case 'popupshowing':
-          this.#onPopupShowing(event);
-          break;
-        case 'popuphidden':
-          this.#onPopupHidden(event);
-          break;
-        case 'command':
-          if (event.target.id === 'PanelUI-zen-emojis-picker-none') {
-            this.#selectEmoji(null);
-          } else if (event.target.id === 'PanelUI-zen-emojis-picker-change-emojis') {
-            this.#changePage(false);
-          } else if (event.target.id === 'PanelUI-zen-emojis-picker-change-svg') {
-            this.#changePage(true);
-          }
-          break;
-        case 'input':
-          this.#onSearchInput(event);
-          break;
-      }
-    }
-
-    get #emojis() {
-      if (this._emojis) {
-        return this._emojis;
-      }
-      const lazy = {};
-      Services.scriptloader.loadSubScript(
-        'chrome://browser/content/zen-components/ZenEmojisData.min.mjs',
-        lazy
-      );
-      this._emojis = lazy.ZenEmojisData;
-      return this._emojis;
-    }
-
-    get emojiList() {
-      return document.getElementById('PanelUI-zen-emojis-picker-list');
-    }
-
-    get svgList() {
-      return document.getElementById('PanelUI-zen-emojis-picker-svgs');
-    }
-
-    get searchInput() {
-      return document.getElementById('PanelUI-zen-emojis-picker-search');
-    }
-
-    #changePage(toSvg = false) {
-      const itemToScroll = toSvg
-        ? this.svgList
-        : document
-            .getElementById('PanelUI-zen-emojis-picker-pages')
-            .querySelector('[emojis="true"]');
-      itemToScroll.scrollIntoView({
-        behavior: 'smooth',
-        block: 'nearest',
-        inline: 'start',
-      });
-      const button = document.getElementById(
-        `PanelUI-zen-emojis-picker-change-${toSvg ? 'svg' : 'emojis'}`
-      );
-      const otherButton = document.getElementById(
-        `PanelUI-zen-emojis-picker-change-${toSvg ? 'emojis' : 'svg'}`
-      );
-      button.classList.add('selected');
-      otherButton.classList.remove('selected');
-    }
-
-    #clearEmojis() {
-      delete this._emojis;
-    }
-
-    #onSearchInput(event) {
-      const input = event.target;
-      const value = input.value.trim().toLowerCase();
-      // search for emojis.tags and order by emojis.order
-      const filteredEmojis = this.#emojis
-        .filter((emoji) => {
-          return emoji.tags.some((tag) => tag.toLowerCase().includes(value));
-        })
-        .sort((a, b) => a.order - b.order);
-      for (const button of this.emojiList.children) {
-        const buttonEmoji = button.getAttribute('label');
-        const emojiObject = filteredEmojis.find((emoji) => emoji.emoji === buttonEmoji);
-        if (emojiObject) {
-          button.hidden = !emojiObject.tags.some((tag) => tag.toLowerCase().includes(value));
-          button.style.order = emojiObject.order;
-        } else {
-          button.hidden = true;
+  handleEvent(event) {
+    switch (event.type) {
+      case 'popupshowing':
+        this.#onPopupShowing(event);
+        break;
+      case 'popuphidden':
+        this.#onPopupHidden(event);
+        break;
+      case 'command':
+        if (event.target.id === 'PanelUI-zen-emojis-picker-none') {
+          this.#selectEmoji(null);
+        } else if (event.target.id === 'PanelUI-zen-emojis-picker-change-emojis') {
+          this.#changePage(false);
+        } else if (event.target.id === 'PanelUI-zen-emojis-picker-change-svg') {
+          this.#changePage(true);
         }
-      }
-    }
-
-    // note: It's async on purpose so we can render the popup before processing the emojis
-    async #onPopupShowing(event) {
-      if (event.target !== this.#panel) return;
-      this.searchInput.value = '';
-      const allowEmojis = !this.#panel.hasAttribute('only-svg-icons');
-      if (allowEmojis) {
-        const emojiList = this.emojiList;
-        for (const emoji of this.#emojis) {
-          const item = document.createXULElement('toolbarbutton');
-          item.className = 'toolbarbutton-1 zen-emojis-picker-emoji';
-          item.setAttribute('label', emoji.emoji);
-          item.setAttribute('tooltiptext', '');
-          item.addEventListener('command', () => {
-            this.#selectEmoji(emoji.emoji);
-          });
-          emojiList.appendChild(item);
-        }
-        setTimeout(() => {
-          this.searchInput.focus();
-        }, 500);
-      }
-      const svgList = this.svgList;
-      for (const icon of SVG_ICONS) {
-        const item = document.createXULElement('toolbarbutton');
-        item.className = 'toolbarbutton-1 zen-emojis-picker-svg';
-        item.setAttribute('label', icon);
-        item.setAttribute('tooltiptext', '');
-        item.style.listStyleImage = `url(${this.getSVGURL(icon)})`;
-        item.setAttribute('icon', icon);
-        item.addEventListener('command', () => {
-          this.#selectEmoji(this.getSVGURL(icon));
-        });
-        svgList.appendChild(item);
-      }
-    }
-
-    #onPopupHidden(event) {
-      if (event.target !== this.#panel) return;
-      this.#clearEmojis();
-
-      this.#changePage(false);
-
-      const emojiList = this.emojiList;
-      emojiList.innerHTML = '';
-
-      this.svgList.innerHTML = '';
-
-      if (this.#currentPromiseReject) {
-        this.#currentPromiseReject(new Error('Emoji picker closed without selection'));
-      }
-
-      this.#currentPromise = null;
-      this.#currentPromiseResolve = null;
-      this.#currentPromiseReject = null;
-
-      this.#anchor.removeAttribute('zen-emoji-open');
-      this.#anchor = null;
-    }
-
-    #selectEmoji(emoji) {
-      this.#currentPromiseResolve?.(emoji);
-      this.#panel.hidePopup();
-    }
-
-    open(anchor, { onlySvgIcons = false } = {}) {
-      if (this.#currentPromise) {
-        return null;
-      }
-      this.#currentPromise = new Promise((resolve, reject) => {
-        this.#currentPromiseResolve = resolve;
-        this.#currentPromiseReject = reject;
-      });
-      this.#anchor = anchor;
-      this.#anchor.setAttribute('zen-emoji-open', 'true');
-      if (onlySvgIcons) {
-        this.#panel.setAttribute('only-svg-icons', 'true');
-      } else {
-        this.#panel.removeAttribute('only-svg-icons');
-      }
-      this.#panel.openPopup(anchor, 'after_start', 0, 0, false, false);
-      return this.#currentPromise;
-    }
-
-    getSVGURL(icon) {
-      return `chrome://browser/skin/zen-icons/selectable/${icon}`;
+        break;
+      case 'input':
+        this.#onSearchInput(event);
+        break;
     }
   }
 
-  window.gZenEmojiPicker = new nsZenEmojiPicker();
+  get #emojis() {
+    if (this._emojis) {
+      return this._emojis;
+    }
+    const lazy = {};
+    Services.scriptloader.loadSubScript(
+      'chrome://browser/content/zen-components/ZenEmojisData.min.mjs',
+      lazy
+    );
+    this._emojis = lazy.ZenEmojisData;
+    return this._emojis;
+  }
+
+  get emojiList() {
+    return document.getElementById('PanelUI-zen-emojis-picker-list');
+  }
+
+  get svgList() {
+    return document.getElementById('PanelUI-zen-emojis-picker-svgs');
+  }
+
+  get searchInput() {
+    return document.getElementById('PanelUI-zen-emojis-picker-search');
+  }
+
+  #changePage(toSvg = false) {
+    const itemToScroll = toSvg
+      ? this.svgList
+      : document.getElementById('PanelUI-zen-emojis-picker-pages').querySelector('[emojis="true"]');
+    itemToScroll.scrollIntoView({
+      behavior: 'smooth',
+      block: 'nearest',
+      inline: 'start',
+    });
+    const button = document.getElementById(
+      `PanelUI-zen-emojis-picker-change-${toSvg ? 'svg' : 'emojis'}`
+    );
+    const otherButton = document.getElementById(
+      `PanelUI-zen-emojis-picker-change-${toSvg ? 'emojis' : 'svg'}`
+    );
+    button.classList.add('selected');
+    otherButton.classList.remove('selected');
+  }
+
+  #clearEmojis() {
+    delete this._emojis;
+  }
+
+  #onSearchInput(event) {
+    const input = event.target;
+    const value = input.value.trim().toLowerCase();
+    // search for emojis.tags and order by emojis.order
+    const filteredEmojis = this.#emojis
+      .filter((emoji) => {
+        return emoji.tags.some((tag) => tag.toLowerCase().includes(value));
+      })
+      .sort((a, b) => a.order - b.order);
+    for (const button of this.emojiList.children) {
+      const buttonEmoji = button.getAttribute('label');
+      const emojiObject = filteredEmojis.find((emoji) => emoji.emoji === buttonEmoji);
+      if (emojiObject) {
+        button.hidden = !emojiObject.tags.some((tag) => tag.toLowerCase().includes(value));
+        button.style.order = emojiObject.order;
+      } else {
+        button.hidden = true;
+      }
+    }
+  }
+
+  // note: It's async on purpose so we can render the popup before processing the emojis
+  async #onPopupShowing(event) {
+    if (event.target !== this.#panel) return;
+    this.searchInput.value = '';
+    const allowEmojis = !this.#panel.hasAttribute('only-svg-icons');
+    if (allowEmojis) {
+      const emojiList = this.emojiList;
+      for (const emoji of this.#emojis) {
+        const item = document.createXULElement('toolbarbutton');
+        item.className = 'toolbarbutton-1 zen-emojis-picker-emoji';
+        item.setAttribute('label', emoji.emoji);
+        item.setAttribute('tooltiptext', '');
+        item.addEventListener('command', () => {
+          this.#selectEmoji(emoji.emoji);
+        });
+        emojiList.appendChild(item);
+      }
+      setTimeout(() => {
+        this.searchInput.focus();
+      }, 500);
+    }
+    const svgList = this.svgList;
+    for (const icon of SVG_ICONS) {
+      const item = document.createXULElement('toolbarbutton');
+      item.className = 'toolbarbutton-1 zen-emojis-picker-svg';
+      item.setAttribute('label', icon);
+      item.setAttribute('tooltiptext', '');
+      item.style.listStyleImage = `url(${this.getSVGURL(icon)})`;
+      item.setAttribute('icon', icon);
+      item.addEventListener('command', () => {
+        this.#selectEmoji(this.getSVGURL(icon));
+      });
+      svgList.appendChild(item);
+    }
+  }
+
+  #onPopupHidden(event) {
+    if (event.target !== this.#panel) return;
+    this.#clearEmojis();
+
+    this.#changePage(false);
+
+    const emojiList = this.emojiList;
+    emojiList.innerHTML = '';
+
+    this.svgList.innerHTML = '';
+
+    if (this.#currentPromiseReject) {
+      this.#currentPromiseReject(new Error('Emoji picker closed without selection'));
+    }
+
+    this.#currentPromise = null;
+    this.#currentPromiseResolve = null;
+    this.#currentPromiseReject = null;
+
+    this.#anchor.removeAttribute('zen-emoji-open');
+    this.#anchor = null;
+  }
+
+  #selectEmoji(emoji) {
+    this.#currentPromiseResolve?.(emoji);
+    this.#panel.hidePopup();
+  }
+
+  open(anchor, { onlySvgIcons = false } = {}) {
+    if (this.#currentPromise) {
+      return null;
+    }
+    this.#currentPromise = new Promise((resolve, reject) => {
+      this.#currentPromiseResolve = resolve;
+      this.#currentPromiseReject = reject;
+    });
+    this.#anchor = anchor;
+    this.#anchor.setAttribute('zen-emoji-open', 'true');
+    if (onlySvgIcons) {
+      this.#panel.setAttribute('only-svg-icons', 'true');
+    } else {
+      this.#panel.removeAttribute('only-svg-icons');
+    }
+    this.#panel.openPopup(anchor, 'after_start', 0, 0, false, false);
+    return this.#currentPromise;
+  }
+
+  getSVGURL(icon) {
+    return `chrome://browser/skin/zen-icons/selectable/${icon}`;
+  }
 }
+
+window.gZenEmojiPicker = new nsZenEmojiPicker();
diff --git a/src/zen/common/emojis/fetch_emojis.py b/src/zen/common/emojis/fetch_emojis.py
index 5458de1d4..d057f6531 100644
--- a/src/zen/common/emojis/fetch_emojis.py
+++ b/src/zen/common/emojis/fetch_emojis.py
@@ -1,4 +1,3 @@
-#
 # 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/.
diff --git a/src/zen/common/jar.inc.mn b/src/zen/common/jar.inc.mn
new file mode 100644
index 000000000..2d4172f8b
--- /dev/null
+++ b/src/zen/common/jar.inc.mn
@@ -0,0 +1,36 @@
+# 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/.
+
+        content/browser/zenThemeModifier.js                                     (../../zen/common/zenThemeModifier.js)
+        content/browser/ZenPreloadedScripts.js                                  (../../zen/common/ZenPreloadedScripts.js)
+        content/browser/zen-sets.js                                             (../../zen/common/zen-sets.js)
+
+        content/browser/ZenStartup.mjs                                          (../../zen/common/modules/ZenStartup.mjs)
+        content/browser/ZenUpdates.mjs                                          (../../zen/common/modules/ZenUpdates.mjs)
+        content/browser/ZenUIManager.mjs                                        (../../zen/common/modules/ZenUIManager.mjs)
+        content/browser/zen-components/ZenCommonUtils.mjs                       (../../zen/common/modules/ZenCommonUtils.mjs)
+        content/browser/zen-components/ZenSessionStore.mjs                      (../../zen/common/modules/ZenSessionStore.mjs)
+        content/browser/zen-components/ZenHasPolyfill.mjs                       (../../zen/common/modules/ZenHasPolyfill.mjs)
+        content/browser/zen-components/ZenSidebarNotification.mjs               (../../zen/common/modules/ZenSidebarNotification.mjs)
+
+        content/browser/zen-components/ZenEmojisData.min.mjs                    (../../zen/common/emojis/ZenEmojisData.min.mjs)
+        content/browser/zen-components/ZenEmojiPicker.mjs                       (../../zen/common/emojis/ZenEmojiPicker.mjs)
+
+*       content/browser/zen-styles/zen-theme.css                                (../../zen/common/styles/zen-theme.css)
+        content/browser/zen-styles/zen-buttons.css                              (../../zen/common/styles/zen-buttons.css)
+        content/browser/zen-styles/zen-browser-ui.css                           (../../zen/common/styles/zen-browser-ui.css)
+        content/browser/zen-styles/zen-animations.css                           (../../zen/common/styles/zen-animations.css)
+        content/browser/zen-styles/zen-panel-ui.css                             (../../zen/common/styles/zen-panel-ui.css)
+        content/browser/zen-styles/zen-single-components.css                    (../../zen/common/styles/zen-single-components.css)
+        content/browser/zen-styles/zen-sidebar.css                              (../../zen/common/styles/zen-sidebar.css)
+        content/browser/zen-styles/zen-toolbar.css                              (../../zen/common/styles/zen-toolbar.css)
+        content/browser/zen-styles/zen-browser-container.css                    (../../zen/common/styles/zen-browser-container.css)
+        content/browser/zen-styles/zen-omnibox.css                              (../../zen/common/styles/zen-omnibox.css)
+        content/browser/zen-styles/zen-popup.css                                (../../zen/common/styles/zen-popup.css)
+        content/browser/zen-styles/zen-branding.css                             (../../zen/common/styles/zen-branding.css)
+        content/browser/zen-styles/zen-sidebar-notification.css                 (../../zen/common/styles/zen-sidebar-notification.css)
+
+        content/browser/zen-styles/zen-panels/bookmarks.css                     (../../zen/common/styles/zen-panels/bookmarks.css)
+        content/browser/zen-styles/zen-panels/print.css                         (../../zen/common/styles/zen-panels/print.css)
+        content/browser/zen-styles/zen-panels/dialog.css                        (../../zen/common/styles/zen-panels/dialog.css)
diff --git a/src/zen/common/ZenCommonUtils.mjs b/src/zen/common/modules/ZenCommonUtils.mjs
similarity index 93%
rename from src/zen/common/ZenCommonUtils.mjs
rename to src/zen/common/modules/ZenCommonUtils.mjs
index f6b7cdc03..e1ac284bc 100644
--- a/src/zen/common/ZenCommonUtils.mjs
+++ b/src/zen/common/modules/ZenCommonUtils.mjs
@@ -15,8 +15,7 @@ window.gZenOperatingSystemCommonUtils = {
   },
 };
 
-/* eslint-disable no-unused-vars */
-class nsZenMultiWindowFeature {
+export class nsZenMultiWindowFeature {
   constructor() {}
 
   static get browsers() {
@@ -50,23 +49,21 @@ class nsZenMultiWindowFeature {
   }
 }
 
-/* eslint-disable no-unused-vars */
-class nsZenDOMOperatedFeature {
+export class nsZenDOMOperatedFeature {
   constructor() {
     var initBound = this.init.bind(this);
     document.addEventListener('DOMContentLoaded', initBound, { once: true });
   }
 }
 
-/* eslint-disable no-unused-vars */
-class nsZenPreloadedFeature {
+export class nsZenPreloadedFeature {
   constructor() {
     var initBound = this.init.bind(this);
     document.addEventListener('MozBeforeInitialXULLayout', initBound, { once: true });
   }
 }
 
-var gZenCommonActions = {
+window.gZenCommonActions = {
   copyCurrentURLToClipboard() {
     const [currentUrl, ClipboardHelper] = gURLBar.zenStrippedURI;
     const displaySpec = currentUrl.displaySpec;
diff --git a/src/zen/common/modules/ZenHasPolyfill.mjs b/src/zen/common/modules/ZenHasPolyfill.mjs
new file mode 100644
index 000000000..97035fabc
--- /dev/null
+++ b/src/zen/common/modules/ZenHasPolyfill.mjs
@@ -0,0 +1,75 @@
+// 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/.
+
+class nsHasPolyfill {
+  constructor() {
+    this.observers = [];
+    this.idStore = 0;
+  }
+
+  /**
+   * @param {{selector: string, exists: boolean}} descendantSelectors
+   */
+  observeSelectorExistence(element, descendantSelectors, stateAttribute, attributeFilter = []) {
+    const updateState = () => {
+      const exists = descendantSelectors.some(({ selector }) => {
+        let selected = element.querySelector(selector);
+        if (selected?.tagName?.toLowerCase() === 'menu') {
+          return null;
+        }
+        return selected;
+      });
+      const { exists: shouldExist = true } = descendantSelectors;
+      if (exists === shouldExist) {
+        if (!element.hasAttribute(stateAttribute)) {
+          gZenCompactModeManager._setElementExpandAttribute(element, true, stateAttribute);
+        }
+      } else {
+        if (element.hasAttribute(stateAttribute)) {
+          gZenCompactModeManager._setElementExpandAttribute(element, false, stateAttribute);
+        }
+      }
+    };
+
+    const observer = new MutationObserver(updateState);
+    updateState();
+    const observerId = this.idStore++;
+    this.observers.push({
+      id: observerId,
+      observer,
+      element,
+      attributeFilter,
+    });
+    return observerId;
+  }
+
+  disconnectObserver(observerId) {
+    const index = this.observers.findIndex((o) => o.id === observerId);
+    if (index !== -1) {
+      this.observers[index].observer.disconnect();
+    }
+  }
+
+  connectObserver(observerId) {
+    const observer = this.observers.find((o) => o.id === observerId);
+    if (observer) {
+      observer.observer.observe(observer.element, {
+        childList: true,
+        subtree: true,
+        attributes: true,
+        attributeFilter: observer.attributeFilter.length ? observer.attributeFilter : undefined,
+      });
+    }
+  }
+
+  destroy() {
+    this.observers.forEach((observer) => observer.observer.disconnect());
+    this.observers = [];
+  }
+}
+
+const hasPolyfillInstance = new nsHasPolyfill();
+window.addEventListener('unload', () => hasPolyfillInstance.destroy(), { once: true });
+
+window.ZenHasPolyfill = hasPolyfillInstance;
diff --git a/src/zen/common/modules/ZenSessionStore.mjs b/src/zen/common/modules/ZenSessionStore.mjs
new file mode 100644
index 000000000..daa0d0962
--- /dev/null
+++ b/src/zen/common/modules/ZenSessionStore.mjs
@@ -0,0 +1,47 @@
+// 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/.
+
+import { nsZenPreloadedFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+
+class ZenSessionStore extends nsZenPreloadedFeature {
+  init() {
+    this.#waitAndCleanup();
+  }
+
+  promiseInitialized = new Promise((resolve) => {
+    this._resolveInitialized = resolve;
+  });
+
+  restoreInitialTabData(tab, tabData) {
+    if (tabData.zenWorkspace) {
+      tab.setAttribute('zen-workspace-id', tabData.zenWorkspace);
+    }
+    if (tabData.zenPinnedId) {
+      tab.setAttribute('zen-pin-id', tabData.zenPinnedId);
+    }
+    if (tabData.zenHasStaticLabel) {
+      tab.setAttribute('zen-has-static-label', 'true');
+    }
+    if (tabData.zenEssential) {
+      tab.setAttribute('zen-essential', 'true');
+    }
+    if (tabData.zenDefaultUserContextId) {
+      tab.setAttribute('zenDefaultUserContextId', 'true');
+    }
+    if (tabData.zenPinnedEntry) {
+      tab.setAttribute('zen-pinned-entry', tabData.zenPinnedEntry);
+    }
+  }
+
+  async #waitAndCleanup() {
+    await SessionStore.promiseInitialized;
+    this.#cleanup();
+  }
+
+  #cleanup() {
+    this._resolveInitialized();
+  }
+}
+
+window.gZenSessionStore = new ZenSessionStore();
diff --git a/src/zen/common/modules/ZenSidebarNotification.mjs b/src/zen/common/modules/ZenSidebarNotification.mjs
new file mode 100644
index 000000000..84c52864e
--- /dev/null
+++ b/src/zen/common/modules/ZenSidebarNotification.mjs
@@ -0,0 +1,128 @@
+/* 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/. */
+
+import { html } from 'chrome://global/content/vendor/lit.all.mjs';
+import { MozLitElement } from 'chrome://global/content/lit-utils.mjs';
+
+const lazy = {};
+
+ChromeUtils.defineLazyGetter(lazy, 'siblingElement', () => {
+  // All our notifications should be attached after the media controls toolbar
+  return document.getElementById('zen-media-controls-toolbar');
+});
+
+/**
+ * Zen Sidebar Notification Component
+ *
+ * Displays and takes care of animations for notifications that
+ * appear in the sidebar.
+ *
+ * @properties {headingL10nId} - The L10n ID for the heading text.
+ */
+class ZenSidebarNotification extends MozLitElement {
+  static properties = {
+    headingL10nId: { type: String, fluent: true },
+    links: { type: Array },
+  };
+
+  constructor({ headingL10nId = '', links = [] } = {}) {
+    super();
+    this.headingL10nId = headingL10nId;
+    this.links = links;
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    if (this.parentElement) {
+      this.#animateIn();
+    }
+  }
+
+  remove() {
+    this.#animateOut().then(() => {
+      super.remove();
+    });
+  }
+
+  render() {
+    return html`
+      <link
+        rel="stylesheet"
+        href="chrome://browser/content/zen-styles/zen-sidebar-notification.css" />
+      <div class="zen-sidebar-notification-header">
+        <label
+          class="zen-sidebar-notification-heading"
+          flex="1"
+          data-l10n-id="${this.headingL10nId}"></label>
+        <div class="zen-sidebar-notification-close-button" @click=${() => this.remove()}>
+          <img src="chrome://browser/skin/zen-icons/close.svg" />
+        </div>
+      </div>
+      <div class="zen-sidebar-notification-body">
+        ${this.links.map(
+          (link) => html`
+            <div
+              class="zen-sidebar-notification-link-container"
+              data-l10n-id="${link.l10nId}-tooltip"
+              ?special=${link.special}
+              @click=${() => {
+                if (link.action) {
+                  link.action();
+                  return;
+                }
+                window.openLinkIn(link.url, 'tab', {
+                  triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+                  forceForeground: true,
+                });
+                this.remove();
+              }}>
+              <img class="zen-sidebar-notification-link-icon" src="${link.icon}" />
+              <label
+                class="zen-sidebar-notification-link-text"
+                data-l10n-id="${link.l10nId}-label"></label>
+            </div>
+          `
+        )}
+      </div>
+    `;
+  }
+
+  #animateIn() {
+    this.style.opacity = '0';
+    return gZenUIManager.motion.animate(
+      this,
+      {
+        opacity: [0, 1],
+        y: [50, 0],
+      },
+      {
+        delay: 1,
+      }
+    );
+  }
+
+  #animateOut() {
+    return gZenUIManager.motion.animate(
+      this,
+      {
+        opacity: [1, 0],
+        y: [0, 10],
+      },
+      {}
+    );
+  }
+}
+
+export default function createSidebarNotification(args) {
+  if (!gZenVerticalTabsManager._prefsSidebarExpanded) {
+    return null;
+  }
+
+  const notification = new ZenSidebarNotification(args);
+
+  lazy.siblingElement.insertAdjacentElement('afterend', notification);
+  return notification;
+}
+
+customElements.define('zen-sidebar-notification', ZenSidebarNotification);
diff --git a/src/zen/common/modules/ZenStartup.mjs b/src/zen/common/modules/ZenStartup.mjs
new file mode 100644
index 000000000..c47c1e17d
--- /dev/null
+++ b/src/zen/common/modules/ZenStartup.mjs
@@ -0,0 +1,188 @@
+// 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/.
+
+import checkForZenUpdates, {
+  createWindowUpdateAnimation,
+} from 'chrome://browser/content/ZenUpdates.mjs';
+
+class ZenStartup {
+  #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();
+  }
+
+  #initBrowserBackground() {
+    const background = document.createXULElement('box');
+    background.id = 'zen-browser-background';
+    background.classList.add('zen-browser-generic-background');
+    const grain = document.createXULElement('box');
+    grain.classList.add('zen-browser-grain');
+    background.appendChild(grain);
+    document.getElementById('browser').prepend(background);
+    const toolbarBackground = background.cloneNode(true);
+    toolbarBackground.removeAttribute('id');
+    toolbarBackground.classList.add('zen-toolbar-background');
+    document.getElementById('titlebar').prepend(toolbarBackground);
+  }
+
+  #zenInitBrowserLayout() {
+    if (this.#hasInitializedLayout) return;
+    this.#hasInitializedLayout = true;
+    try {
+      const kNavbarItems = ['nav-bar', 'PersonalToolbar'];
+      const kNewContainerId = 'zen-appcontent-navbar-container';
+      let newContainer = document.getElementById(kNewContainerId);
+      for (let id of kNavbarItems) {
+        const node = document.getElementById(id);
+        console.assert(node, 'Could not find node with id: ' + id);
+        if (!node) continue;
+        newContainer.appendChild(node);
+      }
+
+      // Fix notification deck
+      const deckTemplate = document.getElementById('tab-notification-deck-template');
+      if (deckTemplate) {
+        document.getElementById('zen-appcontent-wrapper').prepend(deckTemplate);
+      }
+
+      gZenWorkspaces.init();
+      setTimeout(() => {
+        gZenUIManager.init();
+        this.#checkForWelcomePage();
+      }, 0);
+    } catch (e) {
+      console.error('ZenThemeModifier: Error initializing browser layout', e);
+    }
+    if (gBrowserInit.delayedStartupFinished) {
+      this.delayedStartupFinished();
+    } else {
+      Services.obs.addObserver(this, 'browser-delayed-startup-finished');
+    }
+  }
+
+  observe(aSubject, aTopic) {
+    // This nsIObserver method allows us to defer initialization until after
+    // this window has finished painting and starting up.
+    if (aTopic == 'browser-delayed-startup-finished' && aSubject == window) {
+      Services.obs.removeObserver(this, 'browser-delayed-startup-finished');
+      this.delayedStartupFinished();
+    }
+  }
+
+  delayedStartupFinished() {
+    gZenWorkspaces.promiseInitialized.then(async () => {
+      await delayedStartupPromise;
+      await SessionStore.promiseAllWindowsRestored;
+      delete gZenUIManager.promiseInitialized;
+      this.#initSearchBar();
+      gZenCompactModeManager.init();
+      // Fix for https://github.com/zen-browser/desktop/issues/7605, specially in compact mode
+      if (gURLBar.hasAttribute('breakout-extend')) {
+        gURLBar.focus();
+      }
+      // A bit of a hack to make sure the tabs toolbar is updated.
+      // Just in case we didn't get the right size.
+      gZenUIManager.updateTabsToolbar();
+      this.closeWatermark();
+      checkForZenUpdates();
+      this.isReady = true;
+    });
+  }
+
+  openWatermark() {
+    if (!Services.prefs.getBoolPref('zen.watermark.enabled', false)) {
+      document.documentElement.removeAttribute('zen-before-loaded');
+      return;
+    }
+    for (let elem of document.querySelectorAll('#browser > *, #urlbar')) {
+      elem.style.opacity = 0;
+    }
+  }
+
+  closeWatermark() {
+    document.documentElement.removeAttribute('zen-before-loaded');
+    if (Services.prefs.getBoolPref('zen.watermark.enabled', false)) {
+      let elementsToIgnore = this.#watermarkIgnoreElements.map((id) => '#' + id).join(', ');
+      gZenUIManager.motion
+        .animate(
+          '#browser > *:not(' + elementsToIgnore + '), #urlbar, #tabbrowser-tabbox > *',
+          {
+            opacity: [0, 1],
+          },
+          {
+            duration: 0.1,
+          }
+        )
+        .then(() => {
+          for (let elem of document.querySelectorAll(
+            '#browser > *, #urlbar, #tabbrowser-tabbox > *'
+          )) {
+            elem.style.removeProperty('opacity');
+          }
+        });
+    }
+    window.requestAnimationFrame(() => {
+      window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
+    });
+  }
+
+  #changeSidebarLocation() {
+    const kElementsToAppend = ['sidebar-splitter', 'sidebar-box'];
+
+    const browser = document.getElementById('browser');
+    browser.prepend(gNavToolbox);
+
+    const sidebarPanelWrapper = document.getElementById('tabbrowser-tabbox');
+    for (let id of kElementsToAppend) {
+      const elem = document.getElementById(id);
+      if (elem) {
+        sidebarPanelWrapper.prepend(elem);
+      }
+    }
+  }
+
+  #initSearchBar() {
+    // Only focus the url bar
+    gURLBar.focus();
+  }
+
+  #checkForWelcomePage() {
+    if (!Services.prefs.getBoolPref('zen.welcome-screen.seen', false)) {
+      Services.prefs.setBoolPref('zen.welcome-screen.seen', true);
+      Services.prefs.setStringPref('zen.updates.last-build-id', Services.appinfo.appBuildID);
+      Services.scriptloader.loadSubScript(
+        'chrome://browser/content/zen-components/ZenWelcome.mjs',
+        window
+      );
+    } else {
+      this.#createUpdateAnimation();
+    }
+  }
+
+  async #createUpdateAnimation() {
+    return await createWindowUpdateAnimation();
+  }
+}
+
+window.gZenStartup = new ZenStartup();
+
+window.addEventListener(
+  'MozBeforeInitialXULLayout',
+  () => {
+    gZenStartup.init();
+  },
+  { once: true }
+);
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/modules/ZenUIManager.mjs
similarity index 99%
rename from src/zen/common/ZenUIManager.mjs
rename to src/zen/common/modules/ZenUIManager.mjs
index 238501278..e16fc982f 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/modules/ZenUIManager.mjs
@@ -2,7 +2,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/.
 
-var gZenUIManager = {
+import { nsZenMultiWindowFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+
+window.gZenUIManager = {
   _popupTrackingElements: [],
   _hoverPausedForExpand: false,
   _hasLoadedDOM: false,
@@ -720,7 +722,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
   true
 );
 
-var gZenVerticalTabsManager = {
+window.gZenVerticalTabsManager = {
   init() {
     this._multiWindowFeature = new nsZenMultiWindowFeature();
     this._initWaitPromise();
diff --git a/src/zen/common/modules/ZenUpdates.mjs b/src/zen/common/modules/ZenUpdates.mjs
new file mode 100644
index 000000000..8501c684b
--- /dev/null
+++ b/src/zen/common/modules/ZenUpdates.mjs
@@ -0,0 +1,89 @@
+// 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/.
+
+import createSidebarNotification from 'chrome://browser/content/zen-components/ZenSidebarNotification.mjs';
+
+const ZEN_UPDATE_PREF = 'zen.updates.last-version';
+const ZEN_BUILD_ID_PREF = 'zen.updates.last-build-id';
+const ZEN_UPDATE_SHOW = 'zen.updates.show-update-notification';
+
+export default function checkForZenUpdates() {
+  const version = Services.appinfo.version;
+  const lastVersion = Services.prefs.getStringPref(ZEN_UPDATE_PREF, version);
+
+  if (
+    version !== lastVersion &&
+    !gZenUIManager.testingEnabled &&
+    Services.prefs.getBoolPref(ZEN_UPDATE_SHOW, true)
+  ) {
+    const updateUrl = Services.prefs.getStringPref('app.releaseNotesURL.prompt', '');
+    createSidebarNotification({
+      headingL10nId: 'zen-sidebar-notification-updated-heading',
+      links: [
+        {
+          url: Services.urlFormatter.formatURL(updateUrl.replace('%VERSION%', version)),
+          l10nId: 'zen-sidebar-notification-updated',
+          special: true,
+          icon: 'chrome://browser/skin/zen-icons/heart-circle-fill.svg',
+        },
+        {
+          action: () => {
+            Services.obs.notifyObservers(window, 'restart-in-safe-mode');
+          },
+          l10nId: 'zen-sidebar-notification-restart-safe-mode',
+          icon: 'chrome://browser/skin/zen-icons/security-broken.svg',
+        },
+      ],
+    });
+  }
+}
+
+export async function createWindowUpdateAnimation() {
+  const appID = Services.appinfo.appBuildID;
+  if (
+    Services.prefs.getStringPref(ZEN_BUILD_ID_PREF, '') === appID ||
+    gZenUIManager.testingEnabled
+  ) {
+    return;
+  }
+  Services.prefs.setStringPref(ZEN_BUILD_ID_PREF, appID);
+  await gZenWorkspaces.promiseInitialized;
+  const appWrapper = document.getElementById('zen-main-app-wrapper');
+  const element = document.createElement('div');
+  element.id = 'zen-update-animation';
+  const elementBorder = document.createElement('div');
+  elementBorder.id = 'zen-update-animation-border';
+  requestIdleCallback(() => {
+    if (gReduceMotion) {
+      return;
+    }
+    appWrapper.appendChild(element);
+    appWrapper.appendChild(elementBorder);
+    Promise.all([
+      gZenUIManager.motion.animate(
+        '#zen-update-animation',
+        {
+          top: ['100%', '-50%'],
+          opacity: [0.5, 1],
+        },
+        {
+          duration: 0.35,
+        }
+      ),
+      gZenUIManager.motion.animate(
+        '#zen-update-animation-border',
+        {
+          '--background-top': ['150%', '-50%'],
+        },
+        {
+          duration: 0.35,
+          delay: 0.08,
+        }
+      ),
+    ]).then(() => {
+      element.remove();
+      elementBorder.remove();
+    });
+  });
+}
diff --git a/src/zen/common/moz.build b/src/zen/common/moz.build
index fa6ec309c..8dc973b44 100644
--- a/src/zen/common/moz.build
+++ b/src/zen/common/moz.build
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
-  "ZenActorsManager.sys.mjs",
-  "ZenCustomizableUI.sys.mjs",
-  "ZenUIMigration.sys.mjs",
+  "sys/ZenActorsManager.sys.mjs",
+  "sys/ZenCustomizableUI.sys.mjs",
+  "sys/ZenUIMigration.sys.mjs",
 ]
diff --git a/src/zen/common/styles/zen-sidebar-notification.css b/src/zen/common/styles/zen-sidebar-notification.css
new file mode 100644
index 000000000..1e8a6782d
--- /dev/null
+++ b/src/zen/common/styles/zen-sidebar-notification.css
@@ -0,0 +1,122 @@
+/*
+ * 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/.
+ */
+
+@keyframes zen-text-gradient {
+  0% {
+    background-position: 0% 50%;
+  }
+  100% {
+    background-position: 100% 50%;
+  }
+}
+
+:host {
+  background: var(--zen-sidebar-notification-bg);
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  border-radius: var(--border-radius-medium);
+  box-shadow: var(--zen-sidebar-notification-shadow);
+  font-size: var(--font-size-medium);
+}
+
+.zen-sidebar-notification-header {
+  display: flex;
+  position: relative;
+  flex: 1;
+  padding: 8px;
+  border-bottom: 1px solid color-mix(in srgb, currentColor 10%, transparent);
+}
+
+.zen-sidebar-notification-heading {
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-weight: 500;
+  flex: 1;
+}
+
+.zen-sidebar-notification-close-button {
+  position: absolute;
+  right: 2px;
+  top: 2px;
+  border-radius: 4px;
+  border-top-right-radius: calc(var(--border-radius-medium) - 2px);
+  z-index: 1;
+  padding: 4px;
+  width: 18px;
+  height: 18px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  opacity: 0.4;
+
+  &:hover {
+    background: color-mix(in srgb, currentColor 15%, transparent);
+  }
+
+  & img {
+    -moz-context-properties: fill, fill-opacity;
+    fill-opacity: 1;
+    fill: currentColor;
+    width: 14px;
+    pointer-events: none;
+  }
+}
+
+.zen-sidebar-notification-body {
+  padding: 6px;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+
+  & .zen-sidebar-notification-link-container {
+    cursor: pointer;
+    padding: 4px;
+    display: flex;
+    gap: 6px;
+    align-items: center;
+    transition: opacity 0.2s ease-in-out;
+    opacity: 0.7;
+
+    & .zen-sidebar-notification-link-text {
+      cursor: inherit;
+    }
+
+    &[special] {
+      opacity: 1;
+      --special-color: color-mix(in srgb, var(--zen-primary-color), currentColor 50%);
+      --specia-color-2: color-mix(in srgb, var(--zen-primary-color), currentColor 90%);
+      background: linear-gradient(
+        135deg,
+        var(--specia-color-2),
+        var(--special-color),
+        var(--specia-color-2),
+        var(--special-color)
+      );
+      background-size: 400%;
+      filter: saturate(3);
+      background-clip: text;
+      /* Still works on firefox */
+      -webkit-text-fill-color: transparent;
+      animation: zen-text-gradient 2s linear infinite;
+    }
+
+    &:hover {
+      opacity: 1;
+    }
+
+    & .zen-sidebar-notification-link-icon {
+      pointer-events: none;
+      width: 16px;
+      height: 16px;
+      -moz-context-properties: fill, fill-opacity;
+      fill: var(--special-color, currentColor);
+    }
+  }
+}
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 8dda42371..93f4f8808 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -242,6 +242,14 @@
   /* Define tab hover background color */
   --tab-hover-background-color: var(--toolbarbutton-hover-background);
 
+  /* Sidebar Notifications */
+  --zen-sidebar-notification-bg: color-mix(
+    in srgb,
+    var(--zen-primary-color) 15%,
+    light-dark(white, black)
+  );
+  --zen-sidebar-notification-shadow: 0 0 6px light-dark(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.3));
+
   /* Nativity */
   --zen-native-content-radius: var(--zen-border-radius);
   @media (-moz-platform: linux) {
diff --git a/src/zen/common/ZenActorsManager.sys.mjs b/src/zen/common/sys/ZenActorsManager.sys.mjs
similarity index 100%
rename from src/zen/common/ZenActorsManager.sys.mjs
rename to src/zen/common/sys/ZenActorsManager.sys.mjs
diff --git a/src/zen/common/ZenCustomizableUI.sys.mjs b/src/zen/common/sys/ZenCustomizableUI.sys.mjs
similarity index 99%
rename from src/zen/common/ZenCustomizableUI.sys.mjs
rename to src/zen/common/sys/ZenCustomizableUI.sys.mjs
index 4e5646ee8..bd7efc760 100644
--- a/src/zen/common/ZenCustomizableUI.sys.mjs
+++ b/src/zen/common/sys/ZenCustomizableUI.sys.mjs
@@ -4,7 +4,7 @@
 
 import { AppConstants } from 'resource://gre/modules/AppConstants.sys.mjs';
 
-export var ZenCustomizableUI = new (class {
+export const ZenCustomizableUI = new (class {
   constructor() {}
 
   TYPE_TOOLBAR = 'toolbar';
diff --git a/src/zen/common/ZenUIMigration.sys.mjs b/src/zen/common/sys/ZenUIMigration.sys.mjs
similarity index 100%
rename from src/zen/common/ZenUIMigration.sys.mjs
rename to src/zen/common/sys/ZenUIMigration.sys.mjs
diff --git a/src/zen/common/zenThemeModifier.js b/src/zen/common/zenThemeModifier.js
index fb736d733..06f4674c4 100644
--- a/src/zen/common/zenThemeModifier.js
+++ b/src/zen/common/zenThemeModifier.js
@@ -95,7 +95,7 @@ var ZenThemeModifier = {
     const kMinElementSeparation = 0.1; // in px
     let separation = this.elementSeparation;
     if (
-      window.fullScreen &&
+      document.documentElement.hasAttribute('inFullscreen') &&
       window.gZenCompactModeManager?.preference &&
       !document.getElementById('tabbrowser-tabbox')?.hasAttribute('zen-split-view') &&
       Services.prefs.getBoolPref('zen.view.borderless-fullscreen', true)
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index baecbb6db..f5f54fe05 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -2,201 +2,200 @@
  * 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 lazy = {};
+const lazy = {};
 
-  XPCOMUtils.defineLazyPreferenceGetter(
-    lazy,
-    'COMPACT_MODE_FLASH_DURATION',
-    'zen.view.compact.toolbar-flash-popup.duration',
-    800
-  );
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  'COMPACT_MODE_FLASH_DURATION',
+  'zen.view.compact.toolbar-flash-popup.duration',
+  800
+);
 
-  XPCOMUtils.defineLazyPreferenceGetter(
-    lazy,
-    'COMPACT_MODE_FLASH_ENABLED',
-    'zen.view.compact.toolbar-flash-popup',
-    true
-  );
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  'COMPACT_MODE_FLASH_ENABLED',
+  'zen.view.compact.toolbar-flash-popup',
+  true
+);
 
-  XPCOMUtils.defineLazyPreferenceGetter(
-    lazy,
-    'COMPACT_MODE_CAN_ANIMATE_SIDEBAR',
-    'zen.view.compact.animate-sidebar',
-    true
-  );
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  'COMPACT_MODE_CAN_ANIMATE_SIDEBAR',
+  'zen.view.compact.animate-sidebar',
+  true
+);
 
-  XPCOMUtils.defineLazyPreferenceGetter(
-    lazy,
-    'COMPACT_MODE_SHOW_SIDEBAR_AND_TOOLBAR_ON_HOVER',
-    'zen.view.compact.show-sidebar-and-toolbar-on-hover',
-    true
-  );
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  'COMPACT_MODE_SHOW_SIDEBAR_AND_TOOLBAR_ON_HOVER',
+  'zen.view.compact.show-sidebar-and-toolbar-on-hover',
+  true
+);
 
-  ChromeUtils.defineLazyGetter(lazy, 'mainAppWrapper', () =>
-    document.getElementById('zen-main-app-wrapper')
-  );
+ChromeUtils.defineLazyGetter(lazy, 'mainAppWrapper', () =>
+  document.getElementById('zen-main-app-wrapper')
+);
 
-  window.gZenCompactModeManager = {
-    _flashTimeouts: {},
-    _eventListeners: [],
-    _removeHoverFrames: {},
+window.gZenCompactModeManager = {
+  _flashTimeouts: {},
+  _eventListeners: [],
+  _removeHoverFrames: {},
 
-    // Delay to avoid flickering when hovering over the sidebar
-    HOVER_HACK_DELAY: Services.prefs.getIntPref('zen.view.compact.hover-hack-delay', 0),
+  // Delay to avoid flickering when hovering over the sidebar
+  HOVER_HACK_DELAY: Services.prefs.getIntPref('zen.view.compact.hover-hack-delay', 0),
 
-    preInit() {
-      this._wasInCompactMode = Services.prefs.getBoolPref(
-        'zen.view.compact.enable-at-startup',
-        false
-      );
-      this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);
+  preInit() {
+    this._wasInCompactMode = Services.prefs.getBoolPref(
+      'zen.view.compact.enable-at-startup',
+      false
+    );
+    this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);
 
-      this.addContextMenu();
-    },
+    this.addContextMenu();
+  },
 
-    init() {
-      this.addMouseActions();
+  init() {
+    this.addMouseActions();
 
-      const tabIsRightObserver = this._updateSidebarIsOnRight.bind(this);
-      Services.prefs.addObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
+    const tabIsRightObserver = this._updateSidebarIsOnRight.bind(this);
+    Services.prefs.addObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
 
-      window.addEventListener(
-        'unload',
-        () => {
-          Services.prefs.removeObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
-        },
-        { once: true }
-      );
+    window.addEventListener(
+      'unload',
+      () => {
+        Services.prefs.removeObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
+      },
+      { once: true }
+    );
 
-      gZenUIManager.addPopupTrackingAttribute(this.sidebar);
-      gZenUIManager.addPopupTrackingAttribute(
-        document.getElementById('zen-appcontent-navbar-wrapper')
-      );
+    gZenUIManager.addPopupTrackingAttribute(this.sidebar);
+    gZenUIManager.addPopupTrackingAttribute(
+      document.getElementById('zen-appcontent-navbar-wrapper')
+    );
 
-      this.addHasPolyfillObserver();
+    this.addHasPolyfillObserver();
 
-      // Clear hover states when window state changes (minimize, maximize, etc.)
-      window.addEventListener('sizemodechange', () => this._clearAllHoverStates());
+    // Clear hover states when window state changes (minimize, maximize, etc.)
+    window.addEventListener('sizemodechange', () => this._clearAllHoverStates());
 
-      this._canShowBackgroundTabToast = Services.prefs.getBoolPref(
-        'zen.view.compact.show-background-tab-toast',
-        true
-      );
+    this._canShowBackgroundTabToast = Services.prefs.getBoolPref(
+      'zen.view.compact.show-background-tab-toast',
+      true
+    );
 
-      if (AppConstants.platform == 'macosx') {
-        window.addEventListener('mouseover', (event) => {
-          const buttons = gZenVerticalTabsManager.actualWindowButtons;
-          if (event.target.closest('.titlebar-buttonbox-container') === buttons) return;
-          this._setElementExpandAttribute(buttons, false);
-        });
-      }
-
-      SessionStore.promiseAllWindowsRestored.then(() => {
-        this.preference = this._wasInCompactMode;
+    if (AppConstants.platform == 'macosx') {
+      window.addEventListener('mouseover', (event) => {
+        const buttons = gZenVerticalTabsManager.actualWindowButtons;
+        if (event.target.closest('.titlebar-buttonbox-container') === buttons) return;
+        this._setElementExpandAttribute(buttons, false);
       });
-    },
+    }
 
-    log(...args) {
-      if (this._canDebugLog) {
-        console.log('[Zen Compact Mode]', ...args);
-      }
-    },
+    SessionStore.promiseAllWindowsRestored.then(() => {
+      this.preference = this._wasInCompactMode;
+    });
+  },
 
-    get preference() {
-      return document.documentElement.getAttribute('zen-compact-mode') === 'true';
-    },
+  log(...args) {
+    if (this._canDebugLog) {
+      console.log('[Zen Compact Mode]', ...args);
+    }
+  },
 
-    get shouldBeCompact() {
-      return !document.documentElement.getAttribute('chromehidden')?.includes('toolbar');
-    },
+  get preference() {
+    return document.documentElement.getAttribute('zen-compact-mode') === 'true';
+  },
 
-    set preference(value) {
-      if (!this.shouldBeCompact) {
-        value = false;
-      }
-      this.log('Setting compact mode preference to', value);
-      if (
-        this.preference === value ||
-        document.documentElement.hasAttribute('zen-compact-animating')
-      ) {
-        if (typeof this._wasInCompactMode !== 'undefined') {
-          // 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;
-      }
-      this.sidebar.removeAttribute('zen-user-show');
-      // We use this element in order to make it persis across restarts, by using the XULStore.
-      // main-window can't store attributes other than window sizes, so we use this instead
-      lazy.mainAppWrapper.setAttribute('zen-compact-mode', value);
-      document.documentElement.setAttribute('zen-compact-mode', value);
-      if (typeof this._wasInCompactMode === 'undefined') {
-        Services.prefs.setBoolPref('zen.view.compact.enable-at-startup', value);
-      }
-      this._updateEvent();
-    },
+  get shouldBeCompact() {
+    return !document.documentElement.getAttribute('chromehidden')?.includes('toolbar');
+  },
 
-    get sidebarIsOnRight() {
-      if (typeof this._sidebarIsOnRight !== 'undefined') {
-        return this._sidebarIsOnRight;
+  set preference(value) {
+    if (!this.shouldBeCompact) {
+      value = false;
+    }
+    this.log('Setting compact mode preference to', value);
+    if (
+      this.preference === value ||
+      document.documentElement.hasAttribute('zen-compact-animating')
+    ) {
+      if (typeof this._wasInCompactMode !== 'undefined') {
+        // We wont do anything with it anyway, so we remove it
+        delete this._wasInCompactMode;
       }
-      this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
+      delete this._ignoreNextHover;
+      // We dont want the user to be able to spam the button
+      return;
+    }
+    this.sidebar.removeAttribute('zen-user-show');
+    // We use this element in order to make it persis across restarts, by using the XULStore.
+    // main-window can't store attributes other than window sizes, so we use this instead
+    lazy.mainAppWrapper.setAttribute('zen-compact-mode', value);
+    document.documentElement.setAttribute('zen-compact-mode', value);
+    if (typeof this._wasInCompactMode === 'undefined') {
+      Services.prefs.setBoolPref('zen.view.compact.enable-at-startup', value);
+    }
+    this._updateEvent();
+  },
+
+  get sidebarIsOnRight() {
+    if (typeof this._sidebarIsOnRight !== 'undefined') {
       return this._sidebarIsOnRight;
-    },
+    }
+    this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
+    return this._sidebarIsOnRight;
+  },
 
-    get sidebar() {
-      return gNavToolbox;
-    },
+  get sidebar() {
+    return gNavToolbox;
+  },
 
-    addHasPolyfillObserver() {
-      const attributes = ['panelopen', 'open', 'breakout-extend', 'zen-floating-urlbar'];
-      this.sidebarObserverId = ZenHasPolyfill.observeSelectorExistence(
-        this.sidebar,
-        [
-          {
-            selector:
-              ":is([panelopen='true'], [open='true'], [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)",
-          },
-        ],
-        'zen-compact-mode-active',
-        attributes
-      );
-      this.toolbarObserverId = ZenHasPolyfill.observeSelectorExistence(
-        document.getElementById('zen-appcontent-navbar-wrapper'),
-        [
-          {
-            selector:
-              ":is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(.zen-compact-mode-ignore)",
-          },
-        ],
-        'zen-compact-mode-active',
-        attributes
-      );
-      // Always connect this observer, we need it even if compact mode is disabled
-      ZenHasPolyfill.connectObserver(this.toolbarObserverId);
-    },
+  addHasPolyfillObserver() {
+    const attributes = ['panelopen', 'open', 'breakout-extend', 'zen-floating-urlbar'];
+    this.sidebarObserverId = ZenHasPolyfill.observeSelectorExistence(
+      this.sidebar,
+      [
+        {
+          selector:
+            ":is([panelopen='true'], [open='true'], [breakout-extend='true']):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)",
+        },
+      ],
+      'zen-compact-mode-active',
+      attributes
+    );
+    this.toolbarObserverId = ZenHasPolyfill.observeSelectorExistence(
+      document.getElementById('zen-appcontent-navbar-wrapper'),
+      [
+        {
+          selector:
+            ":is([panelopen='true'], [open='true'], #urlbar:focus-within, [breakout-extend='true']):not(.zen-compact-mode-ignore)",
+        },
+      ],
+      'zen-compact-mode-active',
+      attributes
+    );
+    // Always connect this observer, we need it even if compact mode is disabled
+    ZenHasPolyfill.connectObserver(this.toolbarObserverId);
+  },
 
-    flashSidebarIfNecessary(aInstant = false) {
-      // This function is called after exiting DOM fullscreen mode,
-      // so we do a bit of a hack to re-calculate the URL height
-      if (aInstant) {
-        gZenVerticalTabsManager.recalculateURLBarHeight();
-      }
-      if (
-        !aInstant &&
-        this.preference &&
-        lazy.COMPACT_MODE_FLASH_ENABLED &&
-        !gZenGlanceManager._animating
-      ) {
-        this.flashSidebar();
-      }
-    },
+  flashSidebarIfNecessary(aInstant = false) {
+    // This function is called after exiting DOM fullscreen mode,
+    // so we do a bit of a hack to re-calculate the URL height
+    if (aInstant) {
+      gZenVerticalTabsManager.recalculateURLBarHeight();
+    }
+    if (
+      !aInstant &&
+      this.preference &&
+      lazy.COMPACT_MODE_FLASH_ENABLED &&
+      !gZenGlanceManager._animating
+    ) {
+      this.flashSidebar();
+    }
+  },
 
-    addContextMenu() {
-      const fragment = window.MozXULElement.parseXULToFragment(`
+  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"/>
@@ -208,660 +207,658 @@
       </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),
-      };
+    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]);
-        }
+    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();
-    },
+    document.getElementById('viewToolbarsMenuSeparator').before(fragment);
+    this.updateContextMenu();
+  },
 
-    updateCompactModeContext(isSingleToolbar) {
-      const isIllegalState = this.checkIfIllegalState();
-      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);
-      }
-      const hideToolbarMenuItem = document.getElementById(
-        'zen-context-menu-compact-mode-hide-toolbar'
-      );
-      if (isIllegalState) {
-        hideToolbarMenuItem.setAttribute('disabled', 'true');
-      } else {
-        hideToolbarMenuItem.removeAttribute('disabled');
-      }
-    },
+  updateCompactModeContext(isSingleToolbar) {
+    const isIllegalState = this.checkIfIllegalState();
+    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);
+    }
+    const hideToolbarMenuItem = document.getElementById(
+      'zen-context-menu-compact-mode-hide-toolbar'
+    );
+    if (isIllegalState) {
+      hideToolbarMenuItem.setAttribute('disabled', 'true');
+    } else {
+      hideToolbarMenuItem.removeAttribute('disabled');
+    }
+  },
 
-    hideSidebar() {
+  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();
+  },
+
+  /* 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;
+  },
 
-    hideToolbar() {
-      Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
-      Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', false);
+  callAllEventListeners() {
+    this._eventListeners.forEach((callback) => callback());
+  },
+
+  addEventListener(callback) {
+    this._eventListeners.push(callback);
+  },
+
+  removeEventListener(callback) {
+    const index = this._eventListeners.indexOf(callback);
+    if (index !== -1) {
+      this._eventListeners.splice(index, 1);
+    }
+  },
+
+  async _updateEvent() {
+    const isUrlbarFocused = gURLBar.focused;
+    // IF we are animating IN, call the callbacks first so we can calculate the width
+    // once the window buttons are shown
+    this.updateContextMenu();
+    if (!this.preference) {
       this.callAllEventListeners();
-    },
-
-    hideBoth() {
-      Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
-      Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
+      await this.animateCompactMode();
+    } else {
+      await this.animateCompactMode();
       this.callAllEventListeners();
-    },
+    }
+    gZenUIManager.updateTabsToolbar();
+    if (isUrlbarFocused) {
+      gURLBar.focus();
+    }
+    if (this.preference) {
+      ZenHasPolyfill.connectObserver(this.sidebarObserverId);
+    } else {
+      ZenHasPolyfill.disconnectObserver(this.sidebarObserverId);
+    }
+    window.dispatchEvent(new CustomEvent('ZenCompactMode:Toggled', { detail: this.preference }));
+  },
 
-    /* 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;
+  // NOTE: Dont actually use event, it's just so we make sure
+  // the caller is from the ResizeObserver
+  getAndApplySidebarWidth(event = undefined) {
+    if (this._ignoreNextResize) {
+      delete this._ignoreNextResize;
+      return;
+    }
+    let sidebarWidth = this.sidebar.getBoundingClientRect().width;
+    const shouldRecalculate =
+      this.preference || document.documentElement.hasAttribute('zen-creating-workspace');
+    const sidebarExpanded = document.documentElement.hasAttribute('zen-sidebar-expanded');
+    if (sidebarWidth > 1) {
+      if (shouldRecalculate && sidebarExpanded) {
+        sidebarWidth = Math.max(sidebarWidth, 150);
       }
-      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());
-    },
-
-    addEventListener(callback) {
-      this._eventListeners.push(callback);
-    },
-
-    removeEventListener(callback) {
-      const index = this._eventListeners.indexOf(callback);
-      if (index !== -1) {
-        this._eventListeners.splice(index, 1);
-      }
-    },
-
-    async _updateEvent() {
-      const isUrlbarFocused = gURLBar.focused;
-      // IF we are animating IN, call the callbacks first so we can calculate the width
-      // once the window buttons are shown
-      this.updateContextMenu();
-      if (!this.preference) {
-        this.callAllEventListeners();
-        await this.animateCompactMode();
-      } else {
-        await this.animateCompactMode();
-        this.callAllEventListeners();
-      }
-      gZenUIManager.updateTabsToolbar();
-      if (isUrlbarFocused) {
-        gURLBar.focus();
-      }
-      if (this.preference) {
-        ZenHasPolyfill.connectObserver(this.sidebarObserverId);
-      } else {
-        ZenHasPolyfill.disconnectObserver(this.sidebarObserverId);
-      }
-      window.dispatchEvent(new CustomEvent('ZenCompactMode:Toggled', { detail: this.preference }));
-    },
-
-    // NOTE: Dont actually use event, it's just so we make sure
-    // the caller is from the ResizeObserver
-    getAndApplySidebarWidth(event = undefined) {
-      if (this._ignoreNextResize) {
-        delete this._ignoreNextResize;
+      // Second variable to get the genuine width of the sidebar
+      this.sidebar.style.setProperty('--actual-zen-sidebar-width', `${sidebarWidth}px`);
+      window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
+      if (
+        event &&
+        shouldRecalculate &&
+        sidebarExpanded &&
+        !gZenVerticalTabsManager._hadSidebarCollapse
+      ) {
         return;
       }
-      let sidebarWidth = this.sidebar.getBoundingClientRect().width;
-      const shouldRecalculate =
-        this.preference || document.documentElement.hasAttribute('zen-creating-workspace');
-      const sidebarExpanded = document.documentElement.hasAttribute('zen-sidebar-expanded');
-      if (sidebarWidth > 1) {
-        if (shouldRecalculate && sidebarExpanded) {
-          sidebarWidth = Math.max(sidebarWidth, 150);
-        }
-        // Second variable to get the genuine width of the sidebar
-        this.sidebar.style.setProperty('--actual-zen-sidebar-width', `${sidebarWidth}px`);
-        window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
-        if (
-          event &&
-          shouldRecalculate &&
-          sidebarExpanded &&
-          !gZenVerticalTabsManager._hadSidebarCollapse
-        ) {
-          return;
-        }
-        delete gZenVerticalTabsManager._hadSidebarCollapse;
-        this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
+      delete gZenVerticalTabsManager._hadSidebarCollapse;
+      this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
+    }
+    return sidebarWidth;
+  },
+
+  get canHideSidebar() {
+    return (
+      Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
+      gZenVerticalTabsManager._hasSetSingleToolbar
+    );
+  },
+
+  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');
+    return new Promise((resolve) => {
+      // We need to set the splitter width before hiding it
+      let splitterWidth = document
+        .getElementById('zen-sidebar-splitter')
+        .getBoundingClientRect().width;
+      const isCompactMode = this.preference;
+      const canHideSidebar = this.canHideSidebar;
+      let canAnimate = lazy.COMPACT_MODE_CAN_ANIMATE_SIDEBAR && !this.isSidebarPotentiallyOpen();
+      if (typeof this._wasInCompactMode !== 'undefined') {
+        canAnimate = false;
+        delete this._wasInCompactMode;
       }
-      return sidebarWidth;
-    },
-
-    get canHideSidebar() {
-      return (
-        Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ||
-        gZenVerticalTabsManager._hasSetSingleToolbar
-      );
-    },
-
-    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');
-      return new Promise((resolve) => {
-        // We need to set the splitter width before hiding it
-        let splitterWidth = document
-          .getElementById('zen-sidebar-splitter')
-          .getBoundingClientRect().width;
-        const isCompactMode = this.preference;
-        const canHideSidebar = this.canHideSidebar;
-        let canAnimate = lazy.COMPACT_MODE_CAN_ANIMATE_SIDEBAR && !this.isSidebarPotentiallyOpen();
-        if (typeof this._wasInCompactMode !== 'undefined') {
-          canAnimate = false;
-          delete this._wasInCompactMode;
-        }
-        // Do this so we can get the correct width ONCE compact mode styled have been applied
-        if (canAnimate) {
-          this.sidebar.setAttribute('animate', 'true');
-        }
-        if (this._ignoreNextHover) {
-          this._setElementExpandAttribute(this.sidebar, false);
-        }
-        this.sidebar.style.removeProperty('margin-right');
-        this.sidebar.style.removeProperty('margin-left');
-        this.sidebar.style.removeProperty('transform');
-        window.requestAnimationFrame(() => {
-          delete this._ignoreNextResize;
-          let sidebarWidth = this.getAndApplySidebarWidth();
-          const elementSeparation = ZenThemeModifier.elementSeparation;
-          if (!canAnimate) {
-            this.sidebar.removeAttribute('animate');
-            document.documentElement.removeAttribute('zen-compact-animating');
-
-            this.getAndApplySidebarWidth({});
-            this._ignoreNextResize = true;
-
-            delete this._ignoreNextHover;
-
-            resolve();
-            return;
-          }
-          if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
-            sidebarWidth -= 0.5 * splitterWidth;
-            if (elementSeparation < splitterWidth) {
-              // Subtract from the splitter width to end up with the correct element separation
-              sidebarWidth += 1.5 * splitterWidth - elementSeparation;
-            }
-          } else {
-            sidebarWidth -= elementSeparation;
-          }
-          if (canHideSidebar && isCompactMode) {
-            this._setElementExpandAttribute(this.sidebar, false);
-            gZenUIManager.motion
-              .animate(
-                this.sidebar,
-                {
-                  marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
-                  marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
-                },
-                {
-                  ease: 'easeIn',
-                  type: 'spring',
-                  bounce: 0,
-                  duration: 0.12,
-                }
-              )
-              .then(() => {
-                this.sidebar.style.transition = 'none';
-                this.sidebar.style.pointEvents = 'none';
-                const titlebar = document.getElementById('titlebar');
-                titlebar.style.visibility = 'hidden';
-                titlebar.style.transition = 'none';
-                this.sidebar.removeAttribute('animate');
-                document.documentElement.removeAttribute('zen-compact-animating');
-
-                setTimeout(() => {
-                  this.getAndApplySidebarWidth({});
-                  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');
-                    this.sidebar.style.removeProperty('transform');
-                    this.sidebar.style.removeProperty('point-events');
-
-                    titlebar.style.removeProperty('visibility');
-                    titlebar.style.removeProperty('transition');
-
-                    gURLBar.textbox.style.removeProperty('visibility');
-
-                    resolve();
-                  });
-                });
-              });
-          } 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`;
-            } else {
-              this.sidebar.style.marginLeft = `-${sidebarWidth}px`;
-            }
-            gZenUIManager.motion
-              .animate(
-                this.sidebar,
-                this.sidebarIsOnRight
-                  ? {
-                      marginRight: [`-${sidebarWidth}px`, 0],
-                      transform: ['translateX(100%)', 'translateX(0)'],
-                    }
-                  : { marginLeft: 0 },
-                {
-                  ease: 'easeOut',
-                  type: 'spring',
-                  bounce: 0,
-                  duration: 0.12,
-                }
-              )
-              .then(() => {
-                this.sidebar.removeAttribute('animate');
-                document.getElementById('browser').style.removeProperty('overflow');
-                this.sidebar.style.transition = 'none';
-                this.sidebar.style.removeProperty('margin-right');
-                this.sidebar.style.removeProperty('margin-left');
-                this.sidebar.style.removeProperty('transform');
-                document.documentElement.removeAttribute('zen-compact-animating');
-                setTimeout(() => {
-                  this.sidebar.style.removeProperty('transition');
-                  resolve();
-                });
-              });
-          } else {
-            this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
-            document.documentElement.removeAttribute('zen-compact-animating');
-            delete this._ignoreNextHover;
-            resolve();
-          }
-        });
-      });
-    },
-
-    updateContextMenu() {
-      document
-        .getElementById('zen-context-menu-compact-mode-toggle')
-        .setAttribute('checked', this.preference);
-
-      const hideTabBar = this.canHideSidebar;
-      const hideToolbar = this.canHideToolbar;
-      const hideBoth = hideTabBar && hideToolbar;
-
-      const idName = 'zen-context-menu-compact-mode-hide-';
-      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() {
-      // Fix for bug https://github.com/zen-browser/desktop/issues/1925
-      const buttons = document.querySelectorAll(
-        'toolbarbutton:is(#unified-extensions-button, .webextension-browser-action)'
-      );
-      for (let button of buttons) {
-        button.removeAttribute('open');
+      // Do this so we can get the correct width ONCE compact mode styled have been applied
+      if (canAnimate) {
+        this.sidebar.setAttribute('animate', 'true');
       }
-    },
-
-    toggle(ignoreHover = false) {
-      // Only ignore the next hover when we are enabling compact mode
-      this._ignoreNextHover = ignoreHover && !this.preference;
-      return (this.preference = !this.preference);
-    },
-
-    _updateSidebarIsOnRight() {
-      this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
-    },
-
-    toggleSidebar() {
-      this.sidebar.toggleAttribute('zen-user-show');
-    },
-
-    get hideAfterHoverDuration() {
-      if (this._hideAfterHoverDuration) {
-        return this._hideAfterHoverDuration;
-      }
-      return Services.prefs.getIntPref('zen.view.compact.toolbar-hide-after-hover.duration');
-    },
-
-    get hoverableElements() {
-      return [
-        {
-          element: this.sidebar,
-          screenEdge: this.sidebarIsOnRight ? 'right' : 'left',
-          keepHoverDuration: 100,
-        },
-        {
-          element: document.getElementById('zen-appcontent-navbar-wrapper'),
-          screenEdge: 'top',
-        },
-        {
-          element: gZenVerticalTabsManager.actualWindowButtons,
-        },
-      ];
-    },
-
-    flashSidebar(duration = lazy.COMPACT_MODE_FLASH_DURATION) {
-      let tabPanels = document.getElementById('tabbrowser-tabpanels');
-      if (!tabPanels.matches("[zen-split-view='true']")) {
-        this.flashElement(this.sidebar, duration, this.sidebar.id);
-      }
-    },
-
-    flashElement(element, duration, id, attrName = 'flash-popup') {
-      if (this._flashTimeouts[id]) {
-        clearTimeout(this._flashTimeouts[id]);
-      } else {
-        requestAnimationFrame(() => this._setElementExpandAttribute(element, true, attrName));
-      }
-      this._flashTimeouts[id] = setTimeout(() => {
-        window.requestAnimationFrame(() => {
-          this._setElementExpandAttribute(element, false, attrName);
-          this._flashTimeouts[id] = null;
-        });
-      }, duration);
-    },
-
-    clearFlashTimeout(id) {
-      clearTimeout(this._flashTimeouts[id]);
-      this._flashTimeouts[id] = null;
-    },
-
-    _setElementExpandAttribute(element, value, attr = 'zen-has-hover') {
-      const kVerifiedAttributes = ['zen-has-hover', 'has-popup-menu', 'zen-compact-mode-active'];
-      const isToolbar = element.id === 'zen-appcontent-navbar-wrapper';
-      if (value) {
-        if (attr === 'zen-has-hover' && element !== gZenVerticalTabsManager.actualWindowButtons) {
-          element.setAttribute('zen-has-implicit-hover', 'true');
-          if (!lazy.COMPACT_MODE_SHOW_SIDEBAR_AND_TOOLBAR_ON_HOVER) {
-            return;
-          }
-        }
-        element.setAttribute(attr, 'true');
-        if (
-          isToolbar &&
-          ((gZenVerticalTabsManager._hasSetSingleToolbar &&
-            (element.hasAttribute('should-hide') ||
-              document.documentElement.hasAttribute('zen-has-bookmarks'))) ||
-            (this.preference &&
-              Services.prefs.getBoolPref('zen.view.compact.hide-toolbar') &&
-              !gZenVerticalTabsManager._hasSetSingleToolbar))
-        ) {
-          gBrowser.tabpanels.setAttribute('has-toolbar-hovered', 'true');
-        }
-      } else {
-        if (attr === 'zen-has-hover') {
-          element.removeAttribute('zen-has-implicit-hover');
-        }
-        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._setElementExpandAttribute(gZenVerticalTabsManager.actualWindowButtons, false);
-          });
-          this._hasHoveredUrlbar = true;
-          return;
-        }
-      });
-
-      for (let i = 0; i < this.hoverableElements.length; i++) {
-        let target = this.hoverableElements[i].element;
-
-        // Add the attribute on startup if the mouse is already over the element
-        if (target.matches(':hover')) {
-          this._setElementExpandAttribute(target, true);
-        }
-
-        const onEnter = (event) => {
-          setTimeout(() => {
-            if (event.type === 'mouseenter' && !event.target.matches(':hover')) return;
-            if (event.target.closest('panel')) return;
-            // Dont register the hover if the urlbar is floating and we are hovering over it
-            this.clearFlashTimeout('has-hover' + target.id);
-            window.requestAnimationFrame(() => {
-              if (
-                document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
-                this._hasHoveredUrlbar ||
-                this._ignoreNextHover ||
-                target.hasAttribute('zen-has-hover')
-              ) {
-                return;
-              }
-              this._setElementExpandAttribute(target, true);
-            });
-          }, this.HOVER_HACK_DELAY);
-        };
-
-        const onLeave = (event) => {
-          if (AppConstants.platform == 'macosx') {
-            const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
-            const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
-            const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
-            if (
-              event.clientX < MAC_WINDOW_BUTTONS_X_BORDER &&
-              event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER &&
-              event.clientX > buttonRect.x &&
-              event.clientY > buttonRect.y
-            ) {
-              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.
-          setTimeout(() => {
-            // Let's double check if the mouse is still hovering over the element, see the bug above.
-            if (event.target.matches(':hover')) {
-              return;
-            }
-
-            if (
-              event.explicitOriginalTarget?.closest?.('#urlbar[zen-floating-urlbar]') ||
-              (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' &&
-                gZenVerticalTabsManager._hasSetSingleToolbar) ||
-              this._hasHoveredUrlbar ||
-              this._ignoreNextHover ||
-              (event.type === 'dragleave' &&
-                event.explicitOriginalTarget !== target &&
-                target.contains?.(event.explicitOriginalTarget))
-            ) {
-              return;
-            }
-
-            if (this.hoverableElements[i].keepHoverDuration) {
-              this.flashElement(
-                target,
-                this.hoverableElements[i].keepHoverDuration,
-                'has-hover' + target.id,
-                'zen-has-hover'
-              );
-            } else {
-              this._removeHoverFrames[target.id] = window.requestAnimationFrame(() =>
-                this._setElementExpandAttribute(target, false)
-              );
-            }
-          }, this.HOVER_HACK_DELAY);
-        };
-
-        target.addEventListener('mouseover', onEnter);
-        target.addEventListener('dragover', onEnter);
-
-        target.addEventListener('mouseleave', onLeave);
-        target.addEventListener('dragleave', onLeave);
-      }
-
-      document.documentElement.addEventListener('mouseleave', (event) => {
-        setTimeout(() => {
-          const screenEdgeCrossed = this._getCrossedEdge(event.pageX, event.pageY);
-          if (!screenEdgeCrossed) return;
-          for (let entry of this.hoverableElements) {
-            if (screenEdgeCrossed !== entry.screenEdge) continue;
-            const target = entry.element;
-            const boundAxis =
-              entry.screenEdge === 'right' || entry.screenEdge === 'left' ? 'y' : 'x';
-            if (!this._positionInBounds(boundAxis, target, event.pageX, event.pageY, 7)) {
-              continue;
-            }
-            window.cancelAnimationFrame(this._removeHoverFrames[target.id]);
-
-            this.flashElement(
-              target,
-              this.hideAfterHoverDuration,
-              'has-hover' + target.id,
-              'zen-has-hover'
-            );
-            document.addEventListener(
-              'mousemove',
-              () => {
-                if (target.matches(':hover')) return;
-                this._setElementExpandAttribute(target, false);
-                this.clearFlashTimeout('has-hover' + target.id);
-              },
-              { once: true }
-            );
-          }
-        }, this.HOVER_HACK_DELAY);
-      });
-
-      gURLBar.textbox.addEventListener('mouseleave', () => {
-        setTimeout(() => {
-          setTimeout(() => {
-            requestAnimationFrame(() => {
-              delete this._hasHoveredUrlbar;
-            });
-          }, 10);
-        }, 0);
-      });
-    },
-
-    _getCrossedEdge(posX, posY, element = document.documentElement, maxDistance = 10) {
-      const targetBox = element.getBoundingClientRect();
-      posX = Math.max(targetBox.left, Math.min(posX, targetBox.right));
-      posY = Math.max(targetBox.top, Math.min(posY, targetBox.bottom));
-      return ['top', 'bottom', 'left', 'right'].find((edge, i) => {
-        const distance = Math.abs((i < 2 ? posY : posX) - targetBox[edge]);
-        return distance <= maxDistance;
-      });
-    },
-
-    _positionInBounds(axis = 'x', element, x, y, error = 0) {
-      const bBox = element.getBoundingClientRect();
-      if (axis === 'y') return bBox.top - error < y && y < bBox.bottom + error;
-      else return bBox.left - error < x && x < bBox.right + error;
-    },
-
-    _clearAllHoverStates() {
-      // Clear hover attributes from all hoverable elements
-      for (let entry of this.hoverableElements) {
-        const target = entry.element;
-        if (target && !target.matches(':hover') && target.hasAttribute('zen-has-hover')) {
-          this._setElementExpandAttribute(target, false);
-          this.clearFlashTimeout('has-hover' + target.id);
-        }
-      }
-    },
-
-    isSidebarPotentiallyOpen() {
       if (this._ignoreNextHover) {
         this._setElementExpandAttribute(this.sidebar, false);
       }
-      return (
-        this.sidebar.hasAttribute('zen-user-show') ||
-        this.sidebar.hasAttribute('zen-has-hover') ||
-        this.sidebar.hasAttribute('zen-has-empty-tab')
-      );
-    },
+      this.sidebar.style.removeProperty('margin-right');
+      this.sidebar.style.removeProperty('margin-left');
+      this.sidebar.style.removeProperty('transform');
+      window.requestAnimationFrame(() => {
+        delete this._ignoreNextResize;
+        let sidebarWidth = this.getAndApplySidebarWidth();
+        const elementSeparation = ZenThemeModifier.elementSeparation;
+        if (!canAnimate) {
+          this.sidebar.removeAttribute('animate');
+          document.documentElement.removeAttribute('zen-compact-animating');
 
-    async _onTabOpen(tab, inBackground) {
-      if (
-        inBackground &&
-        this.preference &&
-        !this.isSidebarPotentiallyOpen() &&
-        this._canShowBackgroundTabToast &&
-        !gZenGlanceManager._animating &&
-        !this._nextTimeWillBeActive
-      ) {
-        gZenUIManager.showToast('zen-background-tab-opened-toast', {
-          button: {
-            id: 'zen-open-background-tab-button',
-            command: () => {
-              const targetWindow = window.ownerGlobal.parent || window;
-              targetWindow.gBrowser.selectedTab = tab;
-            },
-          },
-        });
+          this.getAndApplySidebarWidth({});
+          this._ignoreNextResize = true;
+
+          delete this._ignoreNextHover;
+
+          resolve();
+          return;
+        }
+        if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
+          sidebarWidth -= 0.5 * splitterWidth;
+          if (elementSeparation < splitterWidth) {
+            // Subtract from the splitter width to end up with the correct element separation
+            sidebarWidth += 1.5 * splitterWidth - elementSeparation;
+          }
+        } else {
+          sidebarWidth -= elementSeparation;
+        }
+        if (canHideSidebar && isCompactMode) {
+          this._setElementExpandAttribute(this.sidebar, false);
+          gZenUIManager.motion
+            .animate(
+              this.sidebar,
+              {
+                marginRight: [0, this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0],
+                marginLeft: [0, this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`],
+              },
+              {
+                ease: 'easeIn',
+                type: 'spring',
+                bounce: 0,
+                duration: 0.12,
+              }
+            )
+            .then(() => {
+              this.sidebar.style.transition = 'none';
+              this.sidebar.style.pointEvents = 'none';
+              const titlebar = document.getElementById('titlebar');
+              titlebar.style.visibility = 'hidden';
+              titlebar.style.transition = 'none';
+              this.sidebar.removeAttribute('animate');
+              document.documentElement.removeAttribute('zen-compact-animating');
+
+              setTimeout(() => {
+                this.getAndApplySidebarWidth({});
+                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');
+                  this.sidebar.style.removeProperty('transform');
+                  this.sidebar.style.removeProperty('point-events');
+
+                  titlebar.style.removeProperty('visibility');
+                  titlebar.style.removeProperty('transition');
+
+                  gURLBar.textbox.style.removeProperty('visibility');
+
+                  resolve();
+                });
+              });
+            });
+        } 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`;
+          } else {
+            this.sidebar.style.marginLeft = `-${sidebarWidth}px`;
+          }
+          gZenUIManager.motion
+            .animate(
+              this.sidebar,
+              this.sidebarIsOnRight
+                ? {
+                    marginRight: [`-${sidebarWidth}px`, 0],
+                    transform: ['translateX(100%)', 'translateX(0)'],
+                  }
+                : { marginLeft: 0 },
+              {
+                ease: 'easeOut',
+                type: 'spring',
+                bounce: 0,
+                duration: 0.12,
+              }
+            )
+            .then(() => {
+              this.sidebar.removeAttribute('animate');
+              document.getElementById('browser').style.removeProperty('overflow');
+              this.sidebar.style.transition = 'none';
+              this.sidebar.style.removeProperty('margin-right');
+              this.sidebar.style.removeProperty('margin-left');
+              this.sidebar.style.removeProperty('transform');
+              document.documentElement.removeAttribute('zen-compact-animating');
+              setTimeout(() => {
+                this.sidebar.style.removeProperty('transition');
+                resolve();
+              });
+            });
+        } else {
+          this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
+          document.documentElement.removeAttribute('zen-compact-animating');
+          delete this._ignoreNextHover;
+          resolve();
+        }
+      });
+    });
+  },
+
+  updateContextMenu() {
+    document
+      .getElementById('zen-context-menu-compact-mode-toggle')
+      .setAttribute('checked', this.preference);
+
+    const hideTabBar = this.canHideSidebar;
+    const hideToolbar = this.canHideToolbar;
+    const hideBoth = hideTabBar && hideToolbar;
+
+    const idName = 'zen-context-menu-compact-mode-hide-';
+    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() {
+    // Fix for bug https://github.com/zen-browser/desktop/issues/1925
+    const buttons = document.querySelectorAll(
+      'toolbarbutton:is(#unified-extensions-button, .webextension-browser-action)'
+    );
+    for (let button of buttons) {
+      button.removeAttribute('open');
+    }
+  },
+
+  toggle(ignoreHover = false) {
+    // Only ignore the next hover when we are enabling compact mode
+    this._ignoreNextHover = ignoreHover && !this.preference;
+    return (this.preference = !this.preference);
+  },
+
+  _updateSidebarIsOnRight() {
+    this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
+  },
+
+  toggleSidebar() {
+    this.sidebar.toggleAttribute('zen-user-show');
+  },
+
+  get hideAfterHoverDuration() {
+    if (this._hideAfterHoverDuration) {
+      return this._hideAfterHoverDuration;
+    }
+    return Services.prefs.getIntPref('zen.view.compact.toolbar-hide-after-hover.duration');
+  },
+
+  get hoverableElements() {
+    return [
+      {
+        element: this.sidebar,
+        screenEdge: this.sidebarIsOnRight ? 'right' : 'left',
+        keepHoverDuration: 100,
+      },
+      {
+        element: document.getElementById('zen-appcontent-navbar-wrapper'),
+        screenEdge: 'top',
+      },
+      {
+        element: gZenVerticalTabsManager.actualWindowButtons,
+      },
+    ];
+  },
+
+  flashSidebar(duration = lazy.COMPACT_MODE_FLASH_DURATION) {
+    let tabPanels = document.getElementById('tabbrowser-tabpanels');
+    if (!tabPanels.matches("[zen-split-view='true']")) {
+      this.flashElement(this.sidebar, duration, this.sidebar.id);
+    }
+  },
+
+  flashElement(element, duration, id, attrName = 'flash-popup') {
+    if (this._flashTimeouts[id]) {
+      clearTimeout(this._flashTimeouts[id]);
+    } else {
+      requestAnimationFrame(() => this._setElementExpandAttribute(element, true, attrName));
+    }
+    this._flashTimeouts[id] = setTimeout(() => {
+      window.requestAnimationFrame(() => {
+        this._setElementExpandAttribute(element, false, attrName);
+        this._flashTimeouts[id] = null;
+      });
+    }, duration);
+  },
+
+  clearFlashTimeout(id) {
+    clearTimeout(this._flashTimeouts[id]);
+    this._flashTimeouts[id] = null;
+  },
+
+  _setElementExpandAttribute(element, value, attr = 'zen-has-hover') {
+    const kVerifiedAttributes = ['zen-has-hover', 'has-popup-menu', 'zen-compact-mode-active'];
+    const isToolbar = element.id === 'zen-appcontent-navbar-wrapper';
+    if (value) {
+      if (attr === 'zen-has-hover' && element !== gZenVerticalTabsManager.actualWindowButtons) {
+        element.setAttribute('zen-has-implicit-hover', 'true');
+        if (!lazy.COMPACT_MODE_SHOW_SIDEBAR_AND_TOOLBAR_ON_HOVER) {
+          return;
+        }
       }
-      delete this._nextTimeWillBeActive;
-    },
-  };
+      element.setAttribute(attr, 'true');
+      if (
+        isToolbar &&
+        ((gZenVerticalTabsManager._hasSetSingleToolbar &&
+          (element.hasAttribute('should-hide') ||
+            document.documentElement.hasAttribute('zen-has-bookmarks'))) ||
+          (this.preference &&
+            Services.prefs.getBoolPref('zen.view.compact.hide-toolbar') &&
+            !gZenVerticalTabsManager._hasSetSingleToolbar))
+      ) {
+        gBrowser.tabpanels.setAttribute('has-toolbar-hovered', 'true');
+      }
+    } else {
+      if (attr === 'zen-has-hover') {
+        element.removeAttribute('zen-has-implicit-hover');
+      }
+      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');
+      }
+    }
+  },
 
-  document.addEventListener(
-    'MozBeforeInitialXULLayout',
-    () => {
-      gZenCompactModeManager.preInit();
-    },
-    { once: true }
-  );
-}
+  addMouseActions() {
+    gURLBar.textbox.addEventListener('mouseenter', (event) => {
+      if (event.target.closest('#urlbar[zen-floating-urlbar]')) {
+        window.requestAnimationFrame(() => {
+          this._setElementExpandAttribute(gZenVerticalTabsManager.actualWindowButtons, false);
+        });
+        this._hasHoveredUrlbar = true;
+        return;
+      }
+    });
+
+    for (let i = 0; i < this.hoverableElements.length; i++) {
+      let target = this.hoverableElements[i].element;
+
+      // Add the attribute on startup if the mouse is already over the element
+      if (target.matches(':hover')) {
+        this._setElementExpandAttribute(target, true);
+      }
+
+      const onEnter = (event) => {
+        setTimeout(() => {
+          if (event.type === 'mouseenter' && !event.target.matches(':hover')) return;
+          if (event.target.closest('panel')) return;
+          // Dont register the hover if the urlbar is floating and we are hovering over it
+          this.clearFlashTimeout('has-hover' + target.id);
+          window.requestAnimationFrame(() => {
+            if (
+              document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
+              this._hasHoveredUrlbar ||
+              this._ignoreNextHover ||
+              target.hasAttribute('zen-has-hover')
+            ) {
+              return;
+            }
+            this._setElementExpandAttribute(target, true);
+          });
+        }, this.HOVER_HACK_DELAY);
+      };
+
+      const onLeave = (event) => {
+        if (AppConstants.platform == 'macosx') {
+          const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
+          const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
+          const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
+          if (
+            event.clientX < MAC_WINDOW_BUTTONS_X_BORDER &&
+            event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER &&
+            event.clientX > buttonRect.x &&
+            event.clientY > buttonRect.y
+          ) {
+            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.
+        setTimeout(() => {
+          // Let's double check if the mouse is still hovering over the element, see the bug above.
+          if (event.target.matches(':hover')) {
+            return;
+          }
+
+          if (
+            event.explicitOriginalTarget?.closest?.('#urlbar[zen-floating-urlbar]') ||
+            (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' &&
+              gZenVerticalTabsManager._hasSetSingleToolbar) ||
+            this._hasHoveredUrlbar ||
+            this._ignoreNextHover ||
+            (event.type === 'dragleave' &&
+              event.explicitOriginalTarget !== target &&
+              target.contains?.(event.explicitOriginalTarget))
+          ) {
+            return;
+          }
+
+          if (this.hoverableElements[i].keepHoverDuration) {
+            this.flashElement(
+              target,
+              this.hoverableElements[i].keepHoverDuration,
+              'has-hover' + target.id,
+              'zen-has-hover'
+            );
+          } else {
+            this._removeHoverFrames[target.id] = window.requestAnimationFrame(() =>
+              this._setElementExpandAttribute(target, false)
+            );
+          }
+        }, this.HOVER_HACK_DELAY);
+      };
+
+      target.addEventListener('mouseover', onEnter);
+      target.addEventListener('dragover', onEnter);
+
+      target.addEventListener('mouseleave', onLeave);
+      target.addEventListener('dragleave', onLeave);
+    }
+
+    document.documentElement.addEventListener('mouseleave', (event) => {
+      setTimeout(() => {
+        const screenEdgeCrossed = this._getCrossedEdge(event.pageX, event.pageY);
+        if (!screenEdgeCrossed) return;
+        for (let entry of this.hoverableElements) {
+          if (screenEdgeCrossed !== entry.screenEdge) continue;
+          const target = entry.element;
+          const boundAxis = entry.screenEdge === 'right' || entry.screenEdge === 'left' ? 'y' : 'x';
+          if (!this._positionInBounds(boundAxis, target, event.pageX, event.pageY, 7)) {
+            continue;
+          }
+          window.cancelAnimationFrame(this._removeHoverFrames[target.id]);
+
+          this.flashElement(
+            target,
+            this.hideAfterHoverDuration,
+            'has-hover' + target.id,
+            'zen-has-hover'
+          );
+          document.addEventListener(
+            'mousemove',
+            () => {
+              if (target.matches(':hover')) return;
+              this._setElementExpandAttribute(target, false);
+              this.clearFlashTimeout('has-hover' + target.id);
+            },
+            { once: true }
+          );
+        }
+      }, this.HOVER_HACK_DELAY);
+    });
+
+    gURLBar.textbox.addEventListener('mouseleave', () => {
+      setTimeout(() => {
+        setTimeout(() => {
+          requestAnimationFrame(() => {
+            delete this._hasHoveredUrlbar;
+          });
+        }, 10);
+      }, 0);
+    });
+  },
+
+  _getCrossedEdge(posX, posY, element = document.documentElement, maxDistance = 10) {
+    const targetBox = element.getBoundingClientRect();
+    posX = Math.max(targetBox.left, Math.min(posX, targetBox.right));
+    posY = Math.max(targetBox.top, Math.min(posY, targetBox.bottom));
+    return ['top', 'bottom', 'left', 'right'].find((edge, i) => {
+      const distance = Math.abs((i < 2 ? posY : posX) - targetBox[edge]);
+      return distance <= maxDistance;
+    });
+  },
+
+  _positionInBounds(axis = 'x', element, x, y, error = 0) {
+    const bBox = element.getBoundingClientRect();
+    if (axis === 'y') return bBox.top - error < y && y < bBox.bottom + error;
+    else return bBox.left - error < x && x < bBox.right + error;
+  },
+
+  _clearAllHoverStates() {
+    // Clear hover attributes from all hoverable elements
+    for (let entry of this.hoverableElements) {
+      const target = entry.element;
+      if (target && !target.matches(':hover') && target.hasAttribute('zen-has-hover')) {
+        this._setElementExpandAttribute(target, false);
+        this.clearFlashTimeout('has-hover' + target.id);
+      }
+    }
+  },
+
+  isSidebarPotentiallyOpen() {
+    if (this._ignoreNextHover) {
+      this._setElementExpandAttribute(this.sidebar, false);
+    }
+    return (
+      this.sidebar.hasAttribute('zen-user-show') ||
+      this.sidebar.hasAttribute('zen-has-hover') ||
+      this.sidebar.hasAttribute('zen-has-empty-tab')
+    );
+  },
+
+  async _onTabOpen(tab, inBackground) {
+    if (
+      inBackground &&
+      this.preference &&
+      !this.isSidebarPotentiallyOpen() &&
+      this._canShowBackgroundTabToast &&
+      !gZenGlanceManager._animating &&
+      !this._nextTimeWillBeActive
+    ) {
+      gZenUIManager.showToast('zen-background-tab-opened-toast', {
+        button: {
+          id: 'zen-open-background-tab-button',
+          command: () => {
+            const targetWindow = window.ownerGlobal.parent || window;
+            targetWindow.gBrowser.selectedTab = tab;
+          },
+        },
+      });
+    }
+    delete this._nextTimeWillBeActive;
+  },
+};
+
+document.addEventListener(
+  'MozBeforeInitialXULLayout',
+  () => {
+    gZenCompactModeManager.preInit();
+  },
+  { once: true }
+);
diff --git a/src/zen/compact-mode/jar.inc.mn b/src/zen/compact-mode/jar.inc.mn
new file mode 100644
index 000000000..93d26d3a3
--- /dev/null
+++ b/src/zen/compact-mode/jar.inc.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+*       content/browser/zen-styles/zen-compact-mode.css                         (../../zen/compact-mode/zen-compact-mode.css)
+        content/browser/zen-components/ZenCompactMode.mjs                       (../../zen/compact-mode/ZenCompactMode.mjs)
diff --git a/src/zen/downloads/ZenDownloadAnimation.mjs b/src/zen/downloads/ZenDownloadAnimation.mjs
index 133aea098..4affc0ae8 100644
--- a/src/zen/downloads/ZenDownloadAnimation.mjs
+++ b/src/zen/downloads/ZenDownloadAnimation.mjs
@@ -1,165 +1,169 @@
 // 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/.
-{
-  const { Downloads } = ChromeUtils.importESModule('resource://gre/modules/Downloads.sys.mjs');
 
-  const CONFIG = Object.freeze({
-    ANIMATION: {
-      ARC_STEPS: 60,
-      MAX_ARC_HEIGHT: 1200,
-      ARC_HEIGHT_RATIO: 0.8, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
-      SCALE_END: 0.45, // Final scale at destination
-    },
-  });
+import { Downloads } from 'resource://gre/modules/Downloads.sys.mjs';
+import {
+  nsZenDOMOperatedFeature,
+  nsZenMultiWindowFeature,
+} from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
 
-  class nsZenDownloadAnimation extends nsZenDOMOperatedFeature {
-    async init() {
-      await this.#setupDownloadListeners();
-    }
+const CONFIG = Object.freeze({
+  ANIMATION: {
+    ARC_STEPS: 60,
+    MAX_ARC_HEIGHT: 1200,
+    ARC_HEIGHT_RATIO: 0.8, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
+    SCALE_END: 0.45, // Final scale at destination
+  },
+});
 
-    async #setupDownloadListeners() {
-      try {
-        const list = await Downloads.getList(Downloads.ALL);
-        list.addView({
-          onDownloadAdded: this.#handleNewDownload.bind(this),
-        });
-      } catch (error) {
-        console.error(
-          `[${nsZenDownloadAnimation.name}] Failed to set up download animation listeners: ${error}`
-        );
-      }
-    }
+class nsZenDownloadAnimation extends nsZenDOMOperatedFeature {
+  async init() {
+    await this.#setupDownloadListeners();
+  }
 
-    #handleNewDownload() {
-      if (
-        !Services.prefs.getBoolPref('zen.downloads.download-animation') ||
-        !nsZenMultiWindowFeature.isActiveWindow
-      ) {
-        return;
-      }
-
-      if (!gZenUIManager._lastClickPosition) {
-        console.warn(
-          `[${nsZenDownloadAnimation.name}] No recent click position available for animation`
-        );
-        return;
-      }
-
-      this.#animateDownload(gZenUIManager._lastClickPosition);
-    }
-
-    #animateDownload(startPosition) {
-      let animationElement = document.querySelector('zen-download-animation');
-
-      if (!animationElement) {
-        animationElement = document.createElement('zen-download-animation');
-        document.body.appendChild(animationElement);
-      }
-
-      animationElement.initializeAnimation(startPosition);
+  async #setupDownloadListeners() {
+    try {
+      const list = await Downloads.getList(Downloads.ALL);
+      list.addView({
+        onDownloadAdded: this.#handleNewDownload.bind(this),
+      });
+    } catch (error) {
+      console.error(
+        `[${nsZenDownloadAnimation.name}] Failed to set up download animation listeners: ${error}`
+      );
     }
   }
 
-  class nsZenDownloadAnimationElement extends HTMLElement {
-    #boxAnimationElement = null;
-    #boxAnimationTimeoutId = null;
-    #isBoxAnimationRunning = false;
-
-    constructor() {
-      super();
-      this.attachShadow({ mode: 'open' });
-      this.#loadArcStyles();
+  #handleNewDownload() {
+    if (
+      !Services.prefs.getBoolPref('zen.downloads.download-animation') ||
+      !nsZenMultiWindowFeature.isActiveWindow
+    ) {
+      return;
     }
 
-    #loadArcStyles() {
-      try {
-        const link = document.createElement('link');
-        link.setAttribute('rel', 'stylesheet');
-        link.setAttribute(
-          'href',
-          'chrome://browser/content/zen-styles/zen-download-arc-animation.css'
-        );
-        this.shadowRoot.appendChild(link);
-      } catch (error) {
-        console.error(`[${nsZenDownloadAnimationElement.name}] Error loading arc styles: ${error}`);
-      }
+    if (!gZenUIManager._lastClickPosition) {
+      console.warn(
+        `[${nsZenDownloadAnimation.name}] No recent click position available for animation`
+      );
+      return;
     }
 
-    async initializeAnimation(startPosition) {
-      if (!startPosition) {
-        console.warn(
-          `[${nsZenDownloadAnimationElement.name}] No start position provided, skipping animation`
-        );
-        return;
-      }
+    this.#animateDownload(gZenUIManager._lastClickPosition);
+  }
 
-      // Determine animation target position
-      const { endPosition, isDownloadButtonVisible } = this.#determineEndPosition();
+  #animateDownload(startPosition) {
+    let animationElement = document.querySelector('zen-download-animation');
+
+    if (!animationElement) {
+      animationElement = document.createElement('zen-download-animation');
+      document.body.appendChild(animationElement);
+    }
+
+    animationElement.initializeAnimation(startPosition);
+  }
+}
+
+class nsZenDownloadAnimationElement extends HTMLElement {
+  #boxAnimationElement = null;
+  #boxAnimationTimeoutId = null;
+  #isBoxAnimationRunning = false;
+
+  constructor() {
+    super();
+    this.attachShadow({ mode: 'open' });
+    this.#loadArcStyles();
+  }
+
+  #loadArcStyles() {
+    try {
+      const link = document.createElement('link');
+      link.setAttribute('rel', 'stylesheet');
+      link.setAttribute(
+        'href',
+        'chrome://browser/content/zen-styles/zen-download-arc-animation.css'
+      );
+      this.shadowRoot.appendChild(link);
+    } catch (error) {
+      console.error(`[${nsZenDownloadAnimationElement.name}] Error loading arc styles: ${error}`);
+    }
+  }
+
+  async initializeAnimation(startPosition) {
+    if (!startPosition) {
+      console.warn(
+        `[${nsZenDownloadAnimationElement.name}] No start position provided, skipping animation`
+      );
+      return;
+    }
+
+    // Determine animation target position
+    const { endPosition, isDownloadButtonVisible } = this.#determineEndPosition();
+    const areTabsPositionedRight = this.#areTabsOnRightSide();
+
+    // Create and prepare the arc animation element
+    const arcAnimationElement = this.#createArcAnimationElement(startPosition);
+
+    // Calculate optimal arc parameters based on available space
+    const distance = this.#calculateDistance(startPosition, endPosition);
+    const { arcHeight, shouldArcDownward } = this.#calculateOptimalArc(
+      startPosition,
+      endPosition,
+      distance
+    );
+    const distanceX = endPosition.clientX - startPosition.clientX;
+    const distanceY = endPosition.clientY - startPosition.clientY;
+    const arcSequence = this.#createArcAnimationSequence(
+      distanceX,
+      distanceY,
+      arcHeight,
+      shouldArcDownward
+    );
+
+    // Start the download animation
+    await this.#startDownloadAnimation(
+      areTabsPositionedRight,
+      isDownloadButtonVisible,
+      arcAnimationElement,
+      arcSequence
+    );
+  }
+
+  #areTabsOnRightSide() {
+    return Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
+  }
+
+  #determineEndPosition() {
+    const downloadsButton = document.getElementById('downloads-button');
+    const isDownloadButtonVisible = downloadsButton && this.#isElementVisible(downloadsButton);
+
+    let endPosition = { clientX: 0, clientY: 0 };
+
+    if (isDownloadButtonVisible) {
+      // Use download button as target
+      const buttonRect = downloadsButton.getBoundingClientRect();
+      endPosition = {
+        clientX: buttonRect.left + buttonRect.width / 2,
+        clientY: buttonRect.top + buttonRect.height / 2,
+      };
+    } else {
+      // Use alternative position at bottom of wrapper
       const areTabsPositionedRight = this.#areTabsOnRightSide();
+      const wrapper = document.getElementById('zen-main-app-wrapper');
+      const wrapperRect = wrapper.getBoundingClientRect();
 
-      // Create and prepare the arc animation element
-      const arcAnimationElement = this.#createArcAnimationElement(startPosition);
-
-      // Calculate optimal arc parameters based on available space
-      const distance = this.#calculateDistance(startPosition, endPosition);
-      const { arcHeight, shouldArcDownward } = this.#calculateOptimalArc(
-        startPosition,
-        endPosition,
-        distance
-      );
-      const distanceX = endPosition.clientX - startPosition.clientX;
-      const distanceY = endPosition.clientY - startPosition.clientY;
-      const arcSequence = this.#createArcAnimationSequence(
-        distanceX,
-        distanceY,
-        arcHeight,
-        shouldArcDownward
-      );
-
-      // Start the download animation
-      await this.#startDownloadAnimation(
-        areTabsPositionedRight,
-        isDownloadButtonVisible,
-        arcAnimationElement,
-        arcSequence
-      );
+      endPosition = {
+        clientX: areTabsPositionedRight ? wrapperRect.right - 42 : wrapperRect.left + 42,
+        clientY: wrapperRect.bottom - 40,
+      };
     }
 
-    #areTabsOnRightSide() {
-      return Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
-    }
+    return { endPosition, isDownloadButtonVisible };
+  }
 
-    #determineEndPosition() {
-      const downloadsButton = document.getElementById('downloads-button');
-      const isDownloadButtonVisible = downloadsButton && this.#isElementVisible(downloadsButton);
-
-      let endPosition = { clientX: 0, clientY: 0 };
-
-      if (isDownloadButtonVisible) {
-        // Use download button as target
-        const buttonRect = downloadsButton.getBoundingClientRect();
-        endPosition = {
-          clientX: buttonRect.left + buttonRect.width / 2,
-          clientY: buttonRect.top + buttonRect.height / 2,
-        };
-      } else {
-        // Use alternative position at bottom of wrapper
-        const areTabsPositionedRight = this.#areTabsOnRightSide();
-        const wrapper = document.getElementById('zen-main-app-wrapper');
-        const wrapperRect = wrapper.getBoundingClientRect();
-
-        endPosition = {
-          clientX: areTabsPositionedRight ? wrapperRect.right - 42 : wrapperRect.left + 42,
-          clientY: wrapperRect.bottom - 40,
-        };
-      }
-
-      return { endPosition, isDownloadButtonVisible };
-    }
-
-    #createArcAnimationElement(startPosition) {
-      const arcAnimationHTML = `
+  #createArcAnimationElement(startPosition) {
+    const arcAnimationHTML = `
             <box class="zen-download-arc-animation">
               <box class="zen-download-arc-animation-inner-circle">
                 <html:div class="zen-download-arc-animation-icon"></html:div>
@@ -167,328 +171,327 @@
             </box>
           `;
 
-      const fragment = window.MozXULElement.parseXULToFragment(arcAnimationHTML);
-      const animationElement = fragment.querySelector('.zen-download-arc-animation');
+    const fragment = window.MozXULElement.parseXULToFragment(arcAnimationHTML);
+    const animationElement = fragment.querySelector('.zen-download-arc-animation');
 
-      Object.assign(animationElement.style, {
-        left: `${startPosition.clientX}px`,
-        top: `${startPosition.clientY}px`,
-        transform: 'translate(-50%, -50%)',
+    Object.assign(animationElement.style, {
+      left: `${startPosition.clientX}px`,
+      top: `${startPosition.clientY}px`,
+      transform: 'translate(-50%, -50%)',
+    });
+
+    this.shadowRoot.appendChild(animationElement);
+
+    return animationElement;
+  }
+
+  #calculateOptimalArc(startPosition, endPosition, distance) {
+    // Calculate available space for the arc
+    const availableTopSpace = Math.min(startPosition.clientY, endPosition.clientY);
+    const viewportHeight = window.innerHeight;
+    const availableBottomSpace =
+      viewportHeight - Math.max(startPosition.clientY, endPosition.clientY);
+
+    // 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 * CONFIG.ANIMATION.ARC_HEIGHT_RATIO,
+      CONFIG.ANIMATION.MAX_ARC_HEIGHT,
+      availableSpace * 0.8
+    );
+
+    return { arcHeight, shouldArcDownward };
+  }
+
+  #calculateDistance(start, end) {
+    const distanceX = end.clientX - start.clientX;
+    const distanceY = end.clientY - start.clientY;
+    return Math.sqrt(distanceX * distanceX + distanceY * distanceY);
+  }
+
+  async #startDownloadAnimation(
+    areTabsPositionedRight,
+    isDownloadButtonVisible,
+    arcAnimationElement,
+    sequence
+  ) {
+    try {
+      if (!isDownloadButtonVisible) {
+        this.#startBoxAnimation(areTabsPositionedRight);
+      }
+
+      await gZenUIManager.motion.animate(arcAnimationElement, sequence, {
+        duration: Services.prefs.getIntPref('zen.downloads.download-animation-duration') / 1000,
+        easing: 'cubic-bezier(0.37, 0, 0.63, 1)',
+        fill: 'forwards',
       });
 
-      this.shadowRoot.appendChild(animationElement);
+      this.#cleanArcAnimation(arcAnimationElement);
+    } catch (error) {
+      console.error('[nsZenDownloadAnimationElement] Error in animation sequence:', error);
+      this.#cleanArcAnimation(arcAnimationElement);
+    }
+  }
 
-      return animationElement;
+  #createArcAnimationSequence(distanceX, distanceY, arcHeight, shouldArcDownward) {
+    const sequence = { offset: [], opacity: [], transform: [] };
+
+    const arcDirection = shouldArcDownward ? 1 : -1;
+    const steps = CONFIG.ANIMATION.ARC_STEPS;
+    const endScale = CONFIG.ANIMATION.SCALE_END;
+
+    function easeInOutQuad(t) {
+      return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
     }
 
-    #calculateOptimalArc(startPosition, endPosition, distance) {
-      // Calculate available space for the arc
-      const availableTopSpace = Math.min(startPosition.clientY, endPosition.clientY);
-      const viewportHeight = window.innerHeight;
-      const availableBottomSpace =
-        viewportHeight - Math.max(startPosition.clientY, endPosition.clientY);
+    let previousRotation = 0;
+    for (let i = 0; i <= steps; i++) {
+      const progress = i / steps;
+      const eased = easeInOutQuad(progress);
 
-      // Determine if we should arc downward or upward based on available space
-      const shouldArcDownward = availableBottomSpace > availableTopSpace;
+      // Calculate opacity changes
+      let opacity;
+      if (progress < 0.3) {
+        // Fade in during first 30%
+        opacity = 0.3 + (progress / 0.3) * 0.6;
+      } else if (progress < 0.98) {
+        // Slight increase to full opacity
+        opacity = 0.9 + ((progress - 0.3) / 0.6) * 0.1;
+      } else {
+        // Decrease opacity in the final steps
+        opacity = 1 - ((progress - 0.9) / 0.1) * 1;
+      }
 
-      // Use the space in the direction we're arcing
-      const availableSpace = shouldArcDownward ? availableBottomSpace : availableTopSpace;
+      // Calculate scaling changes
+      let scale;
+      if (progress < 0.5) {
+        scale = 0.5 + (progress / 0.5) * 1.3;
+      } else {
+        scale = 1.8 - ((progress - 0.5) / 0.5) * (1.8 - endScale);
+      }
 
-      // Limit arc height to a percentage of the available space
-      const arcHeight = Math.min(
-        distance * CONFIG.ANIMATION.ARC_HEIGHT_RATIO,
-        CONFIG.ANIMATION.MAX_ARC_HEIGHT,
-        availableSpace * 0.8
+      // Position on arc
+      const x = distanceX * eased;
+      const y = distanceY * eased + arcDirection * arcHeight * (1 - (2 * eased - 1) ** 2);
+
+      // Calculate rotation to point in the direction of movement
+      let rotation = previousRotation;
+      if (i > 0) {
+        const prevEased = easeInOutQuad((i - 1) / steps);
+
+        const prevX = distanceX * prevEased;
+        const prevAdjustedProgress = prevEased * 2 - 1;
+        const prevVerticalOffset = arcDirection * arcHeight * (1 - prevAdjustedProgress * 2);
+        const prevY = distanceY * prevEased + prevVerticalOffset;
+
+        const targetRotation = Math.atan2(y - prevY, x - prevX) * (180 / Math.PI);
+
+        rotation += (targetRotation - previousRotation) * 0.01;
+        previousRotation = rotation;
+      }
+
+      sequence.offset.push(progress);
+      sequence.opacity.push(opacity);
+      sequence.transform.push(
+        `translate(calc(${x}px - 50%), calc(${y}px - 50%)) rotate(${rotation}deg) scale(${scale})`
       );
-
-      return { arcHeight, shouldArcDownward };
     }
 
-    #calculateDistance(start, end) {
-      const distanceX = end.clientX - start.clientX;
-      const distanceY = end.clientY - start.clientY;
-      return Math.sqrt(distanceX * distanceX + distanceY * distanceY);
+    return sequence;
+  }
+
+  #cleanArcAnimation(element) {
+    element.remove();
+  }
+
+  async #startBoxAnimation(areTabsPositionedRight) {
+    // If animation is already in progress, don't start a new one
+    if (this.#isBoxAnimationRunning) {
+      console.warn(
+        `[${nsZenDownloadAnimationElement.name}] Box animation already running, skipping new request.`
+      );
+      return;
     }
 
-    async #startDownloadAnimation(
-      areTabsPositionedRight,
-      isDownloadButtonVisible,
-      arcAnimationElement,
-      sequence
-    ) {
-      try {
-        if (!isDownloadButtonVisible) {
-          this.#startBoxAnimation(areTabsPositionedRight);
-        }
-
-        await gZenUIManager.motion.animate(arcAnimationElement, sequence, {
-          duration: Services.prefs.getIntPref('zen.downloads.download-animation-duration') / 1000,
-          easing: 'cubic-bezier(0.37, 0, 0.63, 1)',
-          fill: 'forwards',
-        });
-
-        this.#cleanArcAnimation(arcAnimationElement);
-      } catch (error) {
-        console.error('[nsZenDownloadAnimationElement] Error in animation sequence:', error);
-        this.#cleanArcAnimation(arcAnimationElement);
-      }
+    if (this.#boxAnimationElement) {
+      clearTimeout(this.#boxAnimationTimeoutId);
+      this.#boxAnimationTimeoutId = setTimeout(
+        () => this.#finishBoxAnimation(areTabsPositionedRight),
+        this.#getBoxAnimationDurationMs()
+      );
+      return;
     }
 
-    #createArcAnimationSequence(distanceX, distanceY, arcHeight, shouldArcDownward) {
-      const sequence = { offset: [], opacity: [], transform: [] };
-
-      const arcDirection = shouldArcDownward ? 1 : -1;
-      const steps = CONFIG.ANIMATION.ARC_STEPS;
-      const endScale = CONFIG.ANIMATION.SCALE_END;
-
-      function easeInOutQuad(t) {
-        return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
-      }
-
-      let previousRotation = 0;
-      for (let i = 0; i <= steps; i++) {
-        const progress = i / steps;
-        const eased = easeInOutQuad(progress);
-
-        // Calculate opacity changes
-        let opacity;
-        if (progress < 0.3) {
-          // Fade in during first 30%
-          opacity = 0.3 + (progress / 0.3) * 0.6;
-        } else if (progress < 0.98) {
-          // Slight increase to full opacity
-          opacity = 0.9 + ((progress - 0.3) / 0.6) * 0.1;
-        } else {
-          // Decrease opacity in the final steps
-          opacity = 1 - ((progress - 0.9) / 0.1) * 1;
-        }
-
-        // Calculate scaling changes
-        let scale;
-        if (progress < 0.5) {
-          scale = 0.5 + (progress / 0.5) * 1.3;
-        } else {
-          scale = 1.8 - ((progress - 0.5) / 0.5) * (1.8 - endScale);
-        }
-
-        // Position on arc
-        const x = distanceX * eased;
-        const y = distanceY * eased + arcDirection * arcHeight * (1 - (2 * eased - 1) ** 2);
-
-        // Calculate rotation to point in the direction of movement
-        let rotation = previousRotation;
-        if (i > 0) {
-          const prevEased = easeInOutQuad((i - 1) / steps);
-
-          const prevX = distanceX * prevEased;
-          const prevAdjustedProgress = prevEased * 2 - 1;
-          const prevVerticalOffset = arcDirection * arcHeight * (1 - prevAdjustedProgress * 2);
-          const prevY = distanceY * prevEased + prevVerticalOffset;
-
-          const targetRotation = Math.atan2(y - prevY, x - prevX) * (180 / Math.PI);
-
-          rotation += (targetRotation - previousRotation) * 0.01;
-          previousRotation = rotation;
-        }
-
-        sequence.offset.push(progress);
-        sequence.opacity.push(opacity);
-        sequence.transform.push(
-          `translate(calc(${x}px - 50%), calc(${y}px - 50%)) rotate(${rotation}deg) scale(${scale})`
-        );
-      }
-
-      return sequence;
+    const wrapper = document.getElementById('zen-main-app-wrapper');
+    if (!wrapper) {
+      console.warn(
+        `[${nsZenDownloadAnimationElement.name}] Cannot start box animation, Wrapper element not found`
+      );
+      return;
     }
 
-    #cleanArcAnimation(element) {
-      element.remove();
-    }
+    this.#isBoxAnimationRunning = true;
 
-    async #startBoxAnimation(areTabsPositionedRight) {
-      // If animation is already in progress, don't start a new one
-      if (this.#isBoxAnimationRunning) {
-        console.warn(
-          `[${nsZenDownloadAnimationElement.name}] Box animation already running, skipping new request.`
-        );
-        return;
-      }
-
-      if (this.#boxAnimationElement) {
-        clearTimeout(this.#boxAnimationTimeoutId);
-        this.#boxAnimationTimeoutId = setTimeout(
-          () => this.#finishBoxAnimation(areTabsPositionedRight),
-          this.#getBoxAnimationDurationMs()
-        );
-        return;
-      }
-
-      const wrapper = document.getElementById('zen-main-app-wrapper');
-      if (!wrapper) {
-        console.warn(
-          `[${nsZenDownloadAnimationElement.name}] Cannot start box animation, Wrapper element not found`
-        );
-        return;
-      }
-
-      this.#isBoxAnimationRunning = true;
-
-      try {
-        const boxAnimationHTML = `
+    try {
+      const boxAnimationHTML = `
             <box class="zen-download-box-animation">
               <html:div class="zen-download-box-animation-icon"></html:div>
             </box>
           `;
 
-        const sideProp = areTabsPositionedRight ? 'right' : 'left';
+      const sideProp = areTabsPositionedRight ? 'right' : 'left';
 
-        const fragment = window.MozXULElement.parseXULToFragment(boxAnimationHTML);
-        this.#boxAnimationElement = fragment.querySelector('.zen-download-box-animation');
+      const fragment = window.MozXULElement.parseXULToFragment(boxAnimationHTML);
+      this.#boxAnimationElement = fragment.querySelector('.zen-download-box-animation');
 
-        Object.assign(this.#boxAnimationElement.style, {
-          bottom: '24px',
-          transform: 'scale(0.8)',
-          [sideProp]: '-50px',
-        });
+      Object.assign(this.#boxAnimationElement.style, {
+        bottom: '24px',
+        transform: 'scale(0.8)',
+        [sideProp]: '-50px',
+      });
 
-        wrapper.appendChild(this.#boxAnimationElement);
+      wrapper.appendChild(this.#boxAnimationElement);
 
-        await gZenUIManager.motion.animate(
-          this.#boxAnimationElement,
-          {
-            [sideProp]: '34px',
-            opacity: 1,
-            transform: 'scale(1.1)',
-          },
-          {
-            duration: 0.35,
-            easing: 'ease-out',
-          }
-        ).finished;
-
-        await gZenUIManager.motion.animate(
-          this.#boxAnimationElement,
-          {
-            [sideProp]: '24px',
-            transform: 'scale(1)',
-          },
-          {
-            duration: 0.2,
-            easing: 'ease-in-out',
-          }
-        ).finished;
-
-        clearTimeout(this.#boxAnimationTimeoutId);
-        this.#boxAnimationTimeoutId = setTimeout(
-          () => this.#finishBoxAnimation(areTabsPositionedRight),
-          this.#getBoxAnimationDurationMs()
-        );
-      } catch (error) {
-        console.error(
-          `[${nsZenDownloadAnimationElement.name}] Error during box entry animation: ${error}`
-        );
-        this.#cleanBoxAnimation();
-      } finally {
-        this.#isBoxAnimationRunning = false;
-      }
-    }
-
-    #getBoxAnimationDurationMs() {
-      return Services.prefs.getIntPref('zen.downloads.download-animation-duration') + 200;
-    }
-
-    async #finishBoxAnimation(areTabsPositionedRight) {
-      clearTimeout(this.#boxAnimationTimeoutId);
-      this.#boxAnimationTimeoutId = null;
-
-      if (!this.#boxAnimationElement || this.#isBoxAnimationRunning) {
-        if (!this.#boxAnimationElement) this.#cleanBoxAnimationState();
-        return;
-      }
-
-      this.#isBoxAnimationRunning = true;
-
-      try {
-        const sideProp = areTabsPositionedRight ? 'right' : 'left';
-
-        await gZenUIManager.motion.animate(
-          this.#boxAnimationElement,
-          {
-            transform: 'scale(0.9)',
-          },
-          {
-            duration: 0.15,
-            easing: 'ease-in',
-          }
-        ).finished;
-
-        await gZenUIManager.motion.animate(
-          this.#boxAnimationElement,
-          {
-            [sideProp]: '-50px',
-            opacity: 0,
-            transform: 'scale(0.8)',
-          },
-          {
-            duration: 0.3,
-            easing: 'cubic-bezier(0.5, 0, 0.75, 0)',
-          }
-        ).finished;
-      } catch (error) {
-        console.warn(
-          `[${nsZenDownloadAnimationElement.name}] Error during box exit animation: ${error}`
-        );
-      } finally {
-        this.#cleanBoxAnimation();
-      }
-    }
-
-    #cleanBoxAnimationState() {
-      this.#boxAnimationElement = null;
-      if (this.#boxAnimationTimeoutId) {
-        clearTimeout(this.#boxAnimationTimeoutId);
-        this.#boxAnimationTimeoutId = null;
-      }
-      this.#isBoxAnimationRunning = false;
-    }
-
-    #cleanBoxAnimation() {
-      if (this.#boxAnimationElement && this.#boxAnimationElement.isConnected) {
-        try {
-          this.#boxAnimationElement.remove();
-        } catch (error) {
-          console.error(
-            `[${nsZenDownloadAnimationElement.name}] Error removing box animation element: ${error}`,
-            error
-          );
+      await gZenUIManager.motion.animate(
+        this.#boxAnimationElement,
+        {
+          [sideProp]: '34px',
+          opacity: 1,
+          transform: 'scale(1.1)',
+        },
+        {
+          duration: 0.35,
+          easing: 'ease-out',
         }
-      }
-      this.#cleanBoxAnimationState();
-    }
+      ).finished;
 
-    #isElementVisible(element) {
-      if (!element) return false;
+      await gZenUIManager.motion.animate(
+        this.#boxAnimationElement,
+        {
+          [sideProp]: '24px',
+          transform: 'scale(1)',
+        },
+        {
+          duration: 0.2,
+          easing: 'ease-in-out',
+        }
+      ).finished;
 
-      const rect = element.getBoundingClientRect();
-
-      // Element must be in the viewport
-      // Is 1 and no 0 because if you pin the download button in the overflow menu
-      // the download button is in the viewport but in the position 0,0 so this
-      // avoid this case
-      if (
-        rect.bottom < 1 ||
-        rect.right < 1 ||
-        rect.top > window.innerHeight ||
-        rect.left > window.innerWidth
-      ) {
-        return false;
-      }
-
-      return true;
+      clearTimeout(this.#boxAnimationTimeoutId);
+      this.#boxAnimationTimeoutId = setTimeout(
+        () => this.#finishBoxAnimation(areTabsPositionedRight),
+        this.#getBoxAnimationDurationMs()
+      );
+    } catch (error) {
+      console.error(
+        `[${nsZenDownloadAnimationElement.name}] Error during box entry animation: ${error}`
+      );
+      this.#cleanBoxAnimation();
+    } finally {
+      this.#isBoxAnimationRunning = false;
     }
   }
 
-  customElements.define('zen-download-animation', nsZenDownloadAnimationElement);
+  #getBoxAnimationDurationMs() {
+    return Services.prefs.getIntPref('zen.downloads.download-animation-duration') + 200;
+  }
 
-  new nsZenDownloadAnimation();
+  async #finishBoxAnimation(areTabsPositionedRight) {
+    clearTimeout(this.#boxAnimationTimeoutId);
+    this.#boxAnimationTimeoutId = null;
+
+    if (!this.#boxAnimationElement || this.#isBoxAnimationRunning) {
+      if (!this.#boxAnimationElement) this.#cleanBoxAnimationState();
+      return;
+    }
+
+    this.#isBoxAnimationRunning = true;
+
+    try {
+      const sideProp = areTabsPositionedRight ? 'right' : 'left';
+
+      await gZenUIManager.motion.animate(
+        this.#boxAnimationElement,
+        {
+          transform: 'scale(0.9)',
+        },
+        {
+          duration: 0.15,
+          easing: 'ease-in',
+        }
+      ).finished;
+
+      await gZenUIManager.motion.animate(
+        this.#boxAnimationElement,
+        {
+          [sideProp]: '-50px',
+          opacity: 0,
+          transform: 'scale(0.8)',
+        },
+        {
+          duration: 0.3,
+          easing: 'cubic-bezier(0.5, 0, 0.75, 0)',
+        }
+      ).finished;
+    } catch (error) {
+      console.warn(
+        `[${nsZenDownloadAnimationElement.name}] Error during box exit animation: ${error}`
+      );
+    } finally {
+      this.#cleanBoxAnimation();
+    }
+  }
+
+  #cleanBoxAnimationState() {
+    this.#boxAnimationElement = null;
+    if (this.#boxAnimationTimeoutId) {
+      clearTimeout(this.#boxAnimationTimeoutId);
+      this.#boxAnimationTimeoutId = null;
+    }
+    this.#isBoxAnimationRunning = false;
+  }
+
+  #cleanBoxAnimation() {
+    if (this.#boxAnimationElement && this.#boxAnimationElement.isConnected) {
+      try {
+        this.#boxAnimationElement.remove();
+      } catch (error) {
+        console.error(
+          `[${nsZenDownloadAnimationElement.name}] Error removing box animation element: ${error}`,
+          error
+        );
+      }
+    }
+    this.#cleanBoxAnimationState();
+  }
+
+  #isElementVisible(element) {
+    if (!element) return false;
+
+    const rect = element.getBoundingClientRect();
+
+    // Element must be in the viewport
+    // Is 1 and no 0 because if you pin the download button in the overflow menu
+    // the download button is in the viewport but in the position 0,0 so this
+    // avoid this case
+    if (
+      rect.bottom < 1 ||
+      rect.right < 1 ||
+      rect.top > window.innerHeight ||
+      rect.left > window.innerWidth
+    ) {
+      return false;
+    }
+
+    return true;
+  }
 }
+
+customElements.define('zen-download-animation', nsZenDownloadAnimationElement);
+
+new nsZenDownloadAnimation();
diff --git a/src/zen/downloads/jar.inc.mn b/src/zen/downloads/jar.inc.mn
new file mode 100644
index 000000000..19463fe27
--- /dev/null
+++ b/src/zen/downloads/jar.inc.mn
@@ -0,0 +1,7 @@
+# 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/.
+
+        content/browser/zen-components/ZenDownloadAnimation.mjs                 (../../zen/downloads/ZenDownloadAnimation.mjs)
+        content/browser/zen-styles/zen-download-arc-animation.css               (../../zen/downloads/zen-download-arc-animation.css)
+        content/browser/zen-styles/zen-download-box-animation.css               (../../zen/downloads/zen-download-box-animation.css)
diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index f6ac00a86..2209e6713 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -1,11 +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/.
-{
-  class ZenFolder extends MozTabbrowserTabGroup {
-    #initialized = false;
 
-    static markup = `
+class ZenFolder extends MozTabbrowserTabGroup {
+  #initialized = false;
+
+  static markup = `
       <hbox class="tab-group-label-container" pack="center">
         <html:div class="tab-group-folder-icon"/>
         <label class="tab-group-label" role="button"/>
@@ -19,8 +19,8 @@
       </vbox>
     `;
 
-    static rawIcon = new DOMParser().parseFromString(
-      `
+  static rawIcon = new DOMParser().parseFromString(
+    `
       <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
         <defs>
           <linearGradient gradientUnits="userSpaceOnUse" x1="14" y1="5.625" x2="14" y2="22.375" id="gradient-0">
@@ -53,230 +53,227 @@
           <ellipse cx="18" cy="16" rx="1.25" ry="1.25"/>
         </g>
       </svg>`,
-      'image/svg+xml'
-    ).documentElement;
+    'image/svg+xml'
+  ).documentElement;
 
-    constructor() {
-      super();
+  constructor() {
+    super();
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this.labelElement.pinned = true;
+    if (this.#initialized) {
+      return;
     }
+    this.#initialized = true;
+    this._activeTabs = [];
+    this.icon.appendChild(ZenFolder.rawIcon.cloneNode(true));
 
-    connectedCallback() {
-      super.connectedCallback();
-      this.labelElement.pinned = true;
-      if (this.#initialized) {
-        return;
-      }
-      this.#initialized = true;
-      this._activeTabs = [];
-      this.icon.appendChild(ZenFolder.rawIcon.cloneNode(true));
+    this.labelElement.parentElement.setAttribute('context', 'zenFolderActions');
 
-      this.labelElement.parentElement.setAttribute('context', 'zenFolderActions');
-
-      this.labelElement.onRenameFinished = (newLabel) => {
-        this.name = newLabel.trim() || 'Folder';
-        const event = new CustomEvent('ZenFolderRenamed', {
-          bubbles: true,
-        });
-        this.dispatchEvent(event);
-      };
-
-      if (this.collapsed) {
-        this.querySelector('.tab-group-container').setAttribute('hidden', true);
-      }
-    }
-
-    get icon() {
-      return this.querySelector('.tab-group-folder-icon');
-    }
-
-    /**
-     * Returns the group this folder belongs to.
-     * @returns {MozTabbrowserTabGroup|null} The group this folder belongs to, or null if it is not part of a group.
-     **/
-    get group() {
-      if (gBrowser.isTabGroup(this.parentElement?.parentElement)) {
-        return this.parentElement.parentElement;
-      }
-      return null;
-    }
-
-    get isZenFolder() {
-      return true;
-    }
-
-    get activeGroups() {
-      let activeGroups = [];
-      let currentGroup = this;
-      if (currentGroup?.hasAttribute('has-active')) activeGroups.push(currentGroup);
-      while (currentGroup?.group) {
-        currentGroup = currentGroup?.group;
-        if (currentGroup?.hasAttribute('has-active')) {
-          activeGroups.push(currentGroup);
-        }
-      }
-      return activeGroups;
-    }
-
-    get childActiveGroups() {
-      return Array.from(this.querySelectorAll('zen-folder[has-active]'));
-    }
-
-    rename() {
-      if (!document.documentElement.hasAttribute('zen-sidebar-expanded')) {
-        return;
-      }
-      gZenVerticalTabsManager.renameTabStart({
-        target: this.labelElement,
-        explicit: true,
+    this.labelElement.onRenameFinished = (newLabel) => {
+      this.name = newLabel.trim() || 'Folder';
+      const event = new CustomEvent('ZenFolderRenamed', {
+        bubbles: true,
       });
-    }
+      this.dispatchEvent(event);
+    };
 
-    createSubfolder() {
-      // We need to expand all parent folders
-      let currentFolder = this;
-      do {
-        currentFolder.collapsed = false;
-        currentFolder = currentFolder.group;
-      } while (currentFolder);
-      gZenFolders.createFolder([], {
-        renameFolder: !gZenUIManager.testingEnabled,
-        label: 'Subfolder',
-        insertAfter: this.querySelector('.tab-group-container').lastElementChild,
-      });
-    }
-
-    async unpackTabs() {
-      this.collapsed = false;
-      for (let tab of this.allItems.reverse()) {
-        tab = tab.group.hasAttribute('split-view-group') ? tab.group : tab;
-        if (tab.hasAttribute('zen-empty-tab')) {
-          await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
-          gBrowser.removeTab(tab);
-        } else {
-          gBrowser.ungroupTab(tab);
-        }
-      }
-    }
-
-    async delete() {
-      for (const tab of this.allItemsRecursive) {
-        await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
-        if (tab.hasAttribute('zen-empty-tab')) {
-          // Manually remove the empty tabs as removeTabs() inside removeTabGroup
-          // does ignore them.
-          gBrowser.removeTab(tab);
-        }
-      }
-      await gBrowser.removeTabGroup(this, { isUserTriggered: true });
-    }
-
-    get allItemsRecursive() {
-      const items = [];
-      for (const item of this.allItems) {
-        if (item.isZenFolder) {
-          items.push(item, ...item.allItemsRecursive);
-        } else {
-          items.push(item);
-        }
-      }
-      return items;
-    }
-
-    get allItems() {
-      return [...this.querySelector('.tab-group-container').children].filter(
-        (child) => !child.classList.contains('zen-tab-group-start')
-      );
-    }
-
-    get pinned() {
-      return this.isZenFolder;
-    }
-
-    /**
-     * Intentionally ignore attempts to change the pinned state.
-     * ZenFolder instances determine their "pinned" status based on their type (isZenFolder)
-     * and do not support being pinned or unpinned via this setter.
-     * This no-op setter ensures compatibility with interfaces expecting a pinned property,
-     * while preserving the invariant that ZenFolders cannot have their pinned state changed externally.
-     */
-    set pinned(value) {}
-
-    get iconURL() {
-      return this.icon.querySelector('image')?.getAttribute('href') || '';
-    }
-
-    set activeTabs(tabs) {
-      if (tabs.length) {
-        this._activeTabs = tabs;
-        for (let tab of tabs) {
-          tab.setAttribute('folder-active', 'true');
-        }
-      } else {
-        const folders = new Map();
-        for (let tab of this._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) {
-            tab.removeAttribute('folder-active');
-            tab.style.removeProperty('--zen-folder-indent');
-          }
-        }
-        this._activeTabs = [];
-        folders.clear();
-      }
-    }
-
-    get activeTabs() {
-      return this._activeTabs;
-    }
-
-    get resetButton() {
-      return this.labelElement.parentElement.querySelector('.tab-reset-button');
-    }
-
-    unloadAllTabs(event) {
-      this.#unloadAllActiveTabs(event, /* noClose */ true);
-    }
-
-    async #unloadAllActiveTabs(event, noClose = false) {
-      await gZenPinnedTabManager.onCloseTabShortcut(event, this.tabs, {
-        noClose,
-        alwaysUnload: true,
-        folderToUnload: this,
-      });
-      this.activeTabs = [];
-    }
-
-    on_click(event) {
-      if (event.target === this.resetButton) {
-        event.stopPropagation();
-        this.unloadAllTabs(event);
-        return;
-      }
-      super.on_click(event);
-    }
-
-    /**
-     * Get the root most collapsed folder in the tree.
-     * @returns {ZenFolder|null} The root most collapsed folder, or null if none are collapsed.
-     */
-    get rootMostCollapsedFolder() {
-      let current = this;
-      let rootMost = null;
-      do {
-        if (current.collapsed) {
-          rootMost = current;
-        }
-        current = current.group;
-      } while (current);
-      return rootMost;
+    if (this.collapsed) {
+      this.querySelector('.tab-group-container').setAttribute('hidden', true);
     }
   }
 
-  customElements.define('zen-folder', ZenFolder);
+  get icon() {
+    return this.querySelector('.tab-group-folder-icon');
+  }
+
+  /**
+   * Returns the group this folder belongs to.
+   * @returns {MozTabbrowserTabGroup|null} The group this folder belongs to, or null if it is not part of a group.
+   **/
+  get group() {
+    if (gBrowser.isTabGroup(this.parentElement?.parentElement)) {
+      return this.parentElement.parentElement;
+    }
+    return null;
+  }
+
+  get isZenFolder() {
+    return true;
+  }
+
+  get activeGroups() {
+    let activeGroups = [];
+    let currentGroup = this;
+    if (currentGroup?.hasAttribute('has-active')) activeGroups.push(currentGroup);
+    while (currentGroup?.group) {
+      currentGroup = currentGroup?.group;
+      if (currentGroup?.hasAttribute('has-active')) {
+        activeGroups.push(currentGroup);
+      }
+    }
+    return activeGroups;
+  }
+
+  get childActiveGroups() {
+    return Array.from(this.querySelectorAll('zen-folder[has-active]'));
+  }
+
+  rename() {
+    if (!document.documentElement.hasAttribute('zen-sidebar-expanded')) {
+      return;
+    }
+    gZenVerticalTabsManager.renameTabStart({
+      target: this.labelElement,
+      explicit: true,
+    });
+  }
+
+  createSubfolder() {
+    // We need to expand all parent folders
+    let currentFolder = this;
+    do {
+      currentFolder.collapsed = false;
+      currentFolder = currentFolder.group;
+    } while (currentFolder);
+    gZenFolders.createFolder([], {
+      renameFolder: !gZenUIManager.testingEnabled,
+      label: 'Subfolder',
+      insertAfter: this.querySelector('.tab-group-container').lastElementChild,
+    });
+  }
+
+  async unpackTabs() {
+    this.collapsed = false;
+    for (let tab of this.allItems.reverse()) {
+      tab = tab.group.hasAttribute('split-view-group') ? tab.group : tab;
+      if (tab.hasAttribute('zen-empty-tab')) {
+        await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
+        gBrowser.removeTab(tab);
+      } else {
+        gBrowser.ungroupTab(tab);
+      }
+    }
+  }
+
+  async delete() {
+    for (const tab of this.allItemsRecursive) {
+      await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
+      if (tab.hasAttribute('zen-empty-tab')) {
+        // Manually remove the empty tabs as removeTabs() inside removeTabGroup
+        // does ignore them.
+        gBrowser.removeTab(tab);
+      }
+    }
+    await gBrowser.removeTabGroup(this, { isUserTriggered: true });
+  }
+
+  get allItemsRecursive() {
+    const items = [];
+    for (const item of this.allItems) {
+      if (item.isZenFolder) {
+        items.push(item, ...item.allItemsRecursive);
+      } else {
+        items.push(item);
+      }
+    }
+    return items;
+  }
+
+  get allItems() {
+    return [...this.querySelector('.tab-group-container').children].filter(
+      (child) => !child.classList.contains('zen-tab-group-start')
+    );
+  }
+
+  get pinned() {
+    return this.isZenFolder;
+  }
+
+  /**
+   * Intentionally ignore attempts to change the pinned state.
+   * ZenFolder instances determine their "pinned" status based on their type (isZenFolder)
+   * and do not support being pinned or unpinned via this setter.
+   * This no-op setter ensures compatibility with interfaces expecting a pinned property,
+   * while preserving the invariant that ZenFolders cannot have their pinned state changed externally.
+   */
+  set pinned(value) {}
+
+  get iconURL() {
+    return this.icon.querySelector('image')?.getAttribute('href') || '';
+  }
+
+  set activeTabs(tabs) {
+    if (tabs.length) {
+      this._activeTabs = tabs;
+      for (let tab of tabs) {
+        tab.setAttribute('folder-active', 'true');
+      }
+    } else {
+      const folders = new Map();
+      for (let tab of this._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) {
+          tab.removeAttribute('folder-active');
+          tab.style.removeProperty('--zen-folder-indent');
+        }
+      }
+      this._activeTabs = [];
+      folders.clear();
+    }
+  }
+
+  get activeTabs() {
+    return this._activeTabs;
+  }
+
+  get resetButton() {
+    return this.labelElement.parentElement.querySelector('.tab-reset-button');
+  }
+
+  unloadAllTabs(event) {
+    this.#unloadAllActiveTabs(event, /* noClose */ true);
+  }
+
+  async #unloadAllActiveTabs(event, noClose = false) {
+    await gZenPinnedTabManager.onCloseTabShortcut(event, this.tabs, {
+      noClose,
+      alwaysUnload: true,
+      folderToUnload: this,
+    });
+    this.activeTabs = [];
+  }
+
+  on_click(event) {
+    if (event.target === this.resetButton) {
+      event.stopPropagation();
+      this.unloadAllTabs(event);
+      return;
+    }
+    super.on_click(event);
+  }
+
+  /**
+   * Get the root most collapsed folder in the tree.
+   * @returns {ZenFolder|null} The root most collapsed folder, or null if none are collapsed.
+   */
+  get rootMostCollapsedFolder() {
+    let current = this;
+    let rootMost = null;
+    do {
+      if (current.collapsed) {
+        rootMost = current;
+      }
+      current = current.group;
+    } while (current);
+    return rootMost;
+  }
 }
+
+customElements.define('zen-folder', ZenFolder);
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 010a196a7..8fdf63fec 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1,1276 +1,1354 @@
 // 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/.
-{
-  function formatRelativeTime(timestamp) {
-    const now = Date.now();
 
-    const sec = Math.floor((now - timestamp) / 1000);
-    if (sec < 60) {
-      return 'Just now';
-    }
+import { nsZenDOMOperatedFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
 
-    const min = Math.floor(sec / 60);
-    if (min < 60) {
-      return `${min} minute${min === 1 ? '' : 's'} ago`;
-    }
+function formatRelativeTime(timestamp) {
+  const now = Date.now();
 
-    const hour = Math.floor(min / 60);
-    if (hour < 24) {
-      return `${hour} hour${hour === 1 ? '' : 's'} ago`;
-    }
-
-    const day = Math.floor(hour / 24);
-    if (day < 30) {
-      return `${day} day${day === 1 ? '' : 's'} ago`;
-    }
-
-    const month = Math.floor(day / 30);
-    return `${month} month${month === 1 ? '' : 's'} ago`;
+  const sec = Math.floor((now - timestamp) / 1000);
+  if (sec < 60) {
+    return 'Just now';
   }
 
-  class nsZenFolders extends nsZenDOMOperatedFeature {
-    #ZEN_MAX_SUBFOLDERS = Services.prefs.getIntPref('zen.folders.max-subfolders', 5);
-    #ZEN_EDGE_ZONE_THRESHOLD =
-      Services.prefs.getIntPref('zen.view.drag-and-drop.edge-zone-threshold', 25) / 100;
+  const min = Math.floor(sec / 60);
+  if (min < 60) {
+    return `${min} minute${min === 1 ? '' : 's'} ago`;
+  }
 
-    #popup = null;
-    #popupTimer = null;
-    #mouseTimer = null;
-    #lastHighlightedGroup = null;
+  const hour = Math.floor(min / 60);
+  if (hour < 24) {
+    return `${hour} hour${hour === 1 ? '' : 's'} ago`;
+  }
 
-    #lastFolderContextMenu = null;
+  const day = Math.floor(hour / 24);
+  if (day < 30) {
+    return `${day} day${day === 1 ? '' : 's'} ago`;
+  }
 
-    #foldersEnabled = false;
+  const month = Math.floor(day / 30);
+  return `${month} month${month === 1 ? '' : 's'} ago`;
+}
 
-    #animationCount = 0;
+class nsZenFolders extends nsZenDOMOperatedFeature {
+  #ZEN_MAX_SUBFOLDERS = Services.prefs.getIntPref('zen.folders.max-subfolders', 5);
+  #ZEN_EDGE_ZONE_THRESHOLD =
+    Services.prefs.getIntPref('zen.view.drag-and-drop.edge-zone-threshold', 25) / 100;
 
-    init() {
-      this.#foldersEnabled = !gZenWorkspaces.privateWindowOrDisabled;
+  #popup = null;
+  #popupTimer = null;
+  #mouseTimer = null;
+  #lastHighlightedGroup = null;
 
-      if (!this.#foldersEnabled) {
-        return;
-      }
+  #lastFolderContextMenu = null;
 
-      this.#initContextMenu();
-      this.#initTabsPopup();
-      this.#initEventListeners();
+  #foldersEnabled = false;
+
+  #animationCount = 0;
+
+  init() {
+    this.#foldersEnabled = !gZenWorkspaces.privateWindowOrDisabled;
+
+    if (!this.#foldersEnabled) {
+      return;
     }
 
-    #initContextMenu() {
-      const contextMenuItems = window.MozXULElement.parseXULToFragment(
-        `<menuitem id="zen-context-menu-new-folder" data-l10n-id="zen-toolbar-context-new-folder"/>`
-      );
-      document.getElementById('context_moveTabToGroup').before(contextMenuItems);
-      const contextMenuItemsToolbar = window.MozXULElement.parseXULToFragment(
-        `<menuitem id="zen-context-menu-new-folder-toolbar" data-l10n-id="zen-toolbar-context-new-folder"/>`
-      );
-      document.getElementById('toolbar-context-openANewTab').after(contextMenuItemsToolbar);
+    this.#initContextMenu();
+    this.#initTabsPopup();
+    this.#initEventListeners();
+  }
 
-      const folderActionsMenu = document.getElementById('zenFolderActions');
-      folderActionsMenu.addEventListener('popupshowing', (event) => {
-        const target = event.explicitOriginalTarget;
-        let folder;
-        if (gBrowser.isTabGroupLabel(target)) {
-          folder = target.group;
-        } else if (gBrowser.isTabGroupLabel(target.parentElement)) {
-          folder = target.parentElement.group;
-        } else if (
-          target.parentElement?.isZenFolder &&
-          target?.classList.contains('tab-group-label-container')
-        ) {
-          folder = target.parentElement;
-        }
+  #initContextMenu() {
+    const contextMenuItems = window.MozXULElement.parseXULToFragment(
+      `<menuitem id="zen-context-menu-new-folder" data-l10n-id="zen-toolbar-context-new-folder"/>`
+    );
+    document.getElementById('context_moveTabToGroup').before(contextMenuItems);
+    const contextMenuItemsToolbar = window.MozXULElement.parseXULToFragment(
+      `<menuitem id="zen-context-menu-new-folder-toolbar" data-l10n-id="zen-toolbar-context-new-folder"/>`
+    );
+    document.getElementById('toolbar-context-openANewTab').after(contextMenuItemsToolbar);
 
-        // We only want to rename zen-folders as firefox groups don't work well with this
-        if (!folder?.isZenFolder) {
-          return;
-        }
-        this.#lastFolderContextMenu = folder;
+    const folderActionsMenu = document.getElementById('zenFolderActions');
+    folderActionsMenu.addEventListener('popupshowing', (event) => {
+      const target = event.explicitOriginalTarget;
+      let folder;
+      if (gBrowser.isTabGroupLabel(target)) {
+        folder = target.group;
+      } else if (gBrowser.isTabGroupLabel(target.parentElement)) {
+        folder = target.parentElement.group;
+      } else if (
+        target.parentElement?.isZenFolder &&
+        target?.classList.contains('tab-group-label-container')
+      ) {
+        folder = target.parentElement;
+      }
 
-        const newSubfolderItem = document.getElementById('context_zenFolderNewSubfolder');
-        newSubfolderItem.setAttribute(
-          'disabled',
-          folder.level >= this.#ZEN_MAX_SUBFOLDERS - 1 ? 'true' : 'false'
-        );
+      // We only want to rename zen-folders as firefox groups don't work well with this
+      if (!folder?.isZenFolder) {
+        return;
+      }
+      this.#lastFolderContextMenu = folder;
 
-        const changeFolderSpace = document
-          .getElementById('context_zenChangeFolderSpace')
-          .querySelector('menupopup');
-        changeFolderSpace.innerHTML = '';
-        for (const workspace of [...gZenWorkspaces._workspaceCache.workspaces].reverse()) {
-          const item = document.createXULElement('menuitem');
-          item.className = 'zen-workspace-context-menu-item';
-          item.setAttribute('zen-workspace-id', workspace.uuid);
-          item.setAttribute('disabled', workspace.uuid === gZenWorkspaces.activeWorkspace);
-          let name = workspace.name;
-          const iconIsSvg = workspace.icon && workspace.icon.endsWith('.svg');
-          if (workspace.icon && workspace.icon !== '' && !iconIsSvg) {
-            name = `${workspace.icon}  ${name}`;
-          }
-          item.setAttribute('label', name);
-          if (iconIsSvg) {
-            item.setAttribute('image', workspace.icon);
-            item.classList.add('zen-workspace-context-icon');
-          }
-          item.addEventListener('command', (event) => {
-            if (!this.#lastFolderContextMenu) return;
-            this.changeFolderToSpace(
-              this.#lastFolderContextMenu,
-              event.target.closest('menuitem').getAttribute('zen-workspace-id')
-            );
-          });
-          changeFolderSpace.appendChild(item);
-        }
-      });
-
-      folderActionsMenu.addEventListener(
-        'popuphidden',
-        (event) => {
-          if (event.target === folderActionsMenu) {
-            this.#lastFolderContextMenu = null;
-          }
-        },
-        { once: true }
+      const newSubfolderItem = document.getElementById('context_zenFolderNewSubfolder');
+      newSubfolderItem.setAttribute(
+        'disabled',
+        folder.level >= this.#ZEN_MAX_SUBFOLDERS - 1 ? 'true' : 'false'
       );
 
-      folderActionsMenu.addEventListener('command', (event) => {
-        if (!this.#lastFolderContextMenu) return;
-        switch (event.target.id) {
-          case 'context_zenFolderRename':
-            this.#lastFolderContextMenu.rename();
-            break;
-          case 'context_zenFolderUnpack':
-            this.#lastFolderContextMenu.unpackTabs();
-            break;
-          case 'context_zenFolderUnloadAll':
-            this.#lastFolderContextMenu.unloadAllTabs(event);
-            break;
-          case 'context_zenFolderNewSubfolder':
-            this.#lastFolderContextMenu.createSubfolder();
-            break;
-          case 'context_zenFolderDelete':
-            this.#lastFolderContextMenu.delete();
-            break;
-          case 'context_zenFolderToSpace':
-            this.#convertFolderToSpace(this.#lastFolderContextMenu);
-            break;
-          case 'context_zenFolderChangeIcon':
-            this.changeFolderUserIcon(this.#lastFolderContextMenu);
-            break;
+      const changeFolderSpace = document
+        .getElementById('context_zenChangeFolderSpace')
+        .querySelector('menupopup');
+      changeFolderSpace.innerHTML = '';
+      for (const workspace of [...gZenWorkspaces._workspaceCache.workspaces].reverse()) {
+        const item = document.createXULElement('menuitem');
+        item.className = 'zen-workspace-context-menu-item';
+        item.setAttribute('zen-workspace-id', workspace.uuid);
+        item.setAttribute('disabled', workspace.uuid === gZenWorkspaces.activeWorkspace);
+        let name = workspace.name;
+        const iconIsSvg = workspace.icon && workspace.icon.endsWith('.svg');
+        if (workspace.icon && workspace.icon !== '' && !iconIsSvg) {
+          name = `${workspace.icon}  ${name}`;
         }
-      });
-    }
-
-    #initTabsPopup() {
-      this.#popup = document.getElementById('zen-folder-tabs-popup');
-
-      const search = this.#popup.querySelector('#zen-folder-tabs-list-search');
-      const tabsList = this.#popup.querySelector('#zen-folder-tabs-list');
-
-      search.addEventListener('input', () => {
-        const query = search.value.toLowerCase();
-        for (const item of tabsList.children) {
-          item.hidden = !item.getAttribute('data-label').includes(query);
+        item.setAttribute('label', name);
+        if (iconIsSvg) {
+          item.setAttribute('image', workspace.icon);
+          item.classList.add('zen-workspace-context-icon');
         }
-      });
-
-      this.#popup.addEventListener('mouseover', () => {
-        clearTimeout(this.#popupTimer);
-      });
-
-      this.#popup.addEventListener('mouseout', () => {
-        this.#popupTimer = setTimeout(() => {
-          if (this.#popup.matches(':hover')) return;
-          this.#popup.hidePopup();
-        }, 200);
-      });
-    }
-
-    #initEventListeners() {
-      window.addEventListener('TabGrouped', this);
-      window.addEventListener('TabUngrouped', this);
-      window.addEventListener('TabGroupCreate', this);
-      window.addEventListener('TabPinned', this);
-      window.addEventListener('TabUnpinned', this);
-      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);
-      document
-        .getElementById('zen-context-menu-new-folder')
-        .addEventListener('command', onNewFolder);
-      document
-        .getElementById('zen-context-menu-new-folder-toolbar')
-        .addEventListener('command', onNewFolder);
-      SessionStore.promiseInitialized.then(() => {
-        gBrowser.tabContainer.addEventListener('dragstart', this.cancelPopupTimer.bind(this));
-      });
-    }
-
-    handleEvent(aEvent) {
-      let methodName = `on_${aEvent.type}`;
-      if (methodName in this) {
-        this[methodName](aEvent);
-      } else {
-        throw new Error(`Unexpected event ${aEvent.type}`);
+        item.addEventListener('command', (event) => {
+          if (!this.#lastFolderContextMenu) return;
+          this.changeFolderToSpace(
+            this.#lastFolderContextMenu,
+            event.target.closest('menuitem').getAttribute('zen-workspace-id')
+          );
+        });
+        changeFolderSpace.appendChild(item);
       }
-    }
+    });
 
-    on_TabGrouped(event) {
-      const tab = event.detail;
-      const group = tab.group;
-      group.pinned = tab.pinned;
-      const isActiveFolder = group?.activeGroups?.length > 0;
-
-      if (isActiveFolder) {
-        group.activeTabs = [...new Set([...group.activeTabs, tab])].sort(
-          (a, b) => a._tPos > b._tPos
-        );
-      }
-
-      if (group.hasAttribute('split-view-group') && group.hasAttribute('zen-pinned-changed')) {
-        // zen-pinned-changed remove it and set it to had-zen-pinned-changed to keep
-        // track of the original pinned state
-        group.removeAttribute('zen-pinned-changed');
-        group.setAttribute('had-zen-pinned-changed', true);
-      }
-
-      if (group.collapsed && !this._sessionRestoring) {
-        group.collapsed = group.hasAttribute('has-active');
-      }
-    }
-
-    on_FolderGrouped(event) {
-      if (this._sessionRestoring) return;
-      const folder = event.detail;
-      const parentFolder = event.target;
-      const isActiveFolder = parentFolder?.activeGroups?.length > 0;
-      const isSplitView = folder.hasAttribute('split-view-group');
-      if (isActiveFolder && isSplitView) {
-        parentFolder.activeTabs = [...new Set([...parentFolder.activeTabs, ...folder.tabs])].sort(
-          (a, b) => a._tPos > b._tPos
-        );
-      }
-      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;
-      if (group?.hasAttribute('split-view-group')) group = group?.group;
-      if (!group?.isZenFolder) {
-        return;
-      }
-
-      const collapsedRoot = group.rootMostCollapsedFolder;
-      if (!collapsedRoot) {
-        return;
-      }
-
-      collapsedRoot.setAttribute('has-active', 'true');
-      await this.animateSelect(collapsedRoot);
-      gBrowser.tabContainer._invalidateCachedTabs();
-    }
-
-    on_TabOpen(event) {
-      const tab = event.target;
-      const group = tab.group;
-      if (!group?.isZenFolder || tab.pinned) return;
-      // Edge case: In occations where we add a tab with an ownerTab
-      // inside a folder, the tab gets added into the folder in an
-      // unpinned state. We need to pin it and re-add it into the folder.
-      if (Services.prefs.getBoolPref('zen.folders.owned-tabs-in-folder')) {
-        gBrowser.pinTab(tab);
-        group.addTabs([tab]);
-      }
-    }
-
-    async on_TabUngrouped(event) {
-      const tab = event.detail;
-      const group = event.target;
-      if (group.hasAttribute('split-view-group') && tab.hasAttribute('had-zen-pinned-changed')) {
-        tab.setAttribute('zen-pinned-changed', true);
-        tab.removeAttribute('had-zen-pinned-changed');
-      }
-
-      await this.animateUnload(group, tab, true);
-    }
-
-    on_TabGroupCreate(event) {
-      const group = event.target;
-      const tabs = group.tabs;
-      if (!group.pinned) {
-        return;
-      }
-      for (const tab of tabs) {
-        if (tab.hasAttribute('zen-pinned-changed')) {
-          tab.removeAttribute('zen-pinned-changed');
-          tab.setAttribute('had-zen-pinned-changed', true);
+    folderActionsMenu.addEventListener(
+      'popuphidden',
+      (event) => {
+        if (event.target === folderActionsMenu) {
+          this.#lastFolderContextMenu = null;
         }
-      }
-    }
+      },
+      { once: true }
+    );
 
-    on_TabPinned(event) {
-      const tab = event.target;
-      const group = tab.group;
-      if (group && group.hasAttribute('split-view-group')) {
-        group.pinned = true;
+    folderActionsMenu.addEventListener('command', (event) => {
+      if (!this.#lastFolderContextMenu) return;
+      switch (event.target.id) {
+        case 'context_zenFolderRename':
+          this.#lastFolderContextMenu.rename();
+          break;
+        case 'context_zenFolderUnpack':
+          this.#lastFolderContextMenu.unpackTabs();
+          break;
+        case 'context_zenFolderUnloadAll':
+          this.#lastFolderContextMenu.unloadAllTabs(event);
+          break;
+        case 'context_zenFolderNewSubfolder':
+          this.#lastFolderContextMenu.createSubfolder();
+          break;
+        case 'context_zenFolderDelete':
+          this.#lastFolderContextMenu.delete();
+          break;
+        case 'context_zenFolderToSpace':
+          this.#convertFolderToSpace(this.#lastFolderContextMenu);
+          break;
+        case 'context_zenFolderChangeIcon':
+          this.changeFolderUserIcon(this.#lastFolderContextMenu);
+          break;
       }
-    }
+    });
+  }
 
-    on_TabUnpinned(event) {
-      const tab = event.target;
-      const group = tab.group;
-      if (group && group.hasAttribute('split-view-group')) {
-        group.pinned = false;
-      }
-    }
+  #initTabsPopup() {
+    this.#popup = document.getElementById('zen-folder-tabs-popup');
 
-    cancelPopupTimer() {
-      if (this.#mouseTimer) {
-        clearTimeout(this.#mouseTimer);
-        this.#mouseTimer = null;
+    const search = this.#popup.querySelector('#zen-folder-tabs-list-search');
+    const tabsList = this.#popup.querySelector('#zen-folder-tabs-list');
+
+    search.addEventListener('input', () => {
+      const query = search.value.toLowerCase();
+      for (const item of tabsList.children) {
+        item.hidden = !item.getAttribute('data-label').includes(query);
       }
-      if (this.#popup) {
+    });
+
+    this.#popup.addEventListener('mouseover', () => {
+      clearTimeout(this.#popupTimer);
+    });
+
+    this.#popup.addEventListener('mouseout', () => {
+      this.#popupTimer = setTimeout(() => {
+        if (this.#popup.matches(':hover')) return;
         this.#popup.hidePopup();
+      }, 200);
+    });
+  }
+
+  #initEventListeners() {
+    window.addEventListener('TabGrouped', this);
+    window.addEventListener('TabUngrouped', this);
+    window.addEventListener('TabGroupCreate', this);
+    window.addEventListener('TabPinned', this);
+    window.addEventListener('TabUnpinned', this);
+    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);
+    document.getElementById('zen-context-menu-new-folder').addEventListener('command', onNewFolder);
+    document
+      .getElementById('zen-context-menu-new-folder-toolbar')
+      .addEventListener('command', onNewFolder);
+    SessionStore.promiseInitialized.then(() => {
+      gBrowser.tabContainer.addEventListener('dragstart', this.cancelPopupTimer.bind(this));
+    });
+  }
+
+  handleEvent(aEvent) {
+    let methodName = `on_${aEvent.type}`;
+    if (methodName in this) {
+      this[methodName](aEvent);
+    } else {
+      throw new Error(`Unexpected event ${aEvent.type}`);
+    }
+  }
+
+  on_TabGrouped(event) {
+    const tab = event.detail;
+    const group = tab.group;
+    group.pinned = tab.pinned;
+    const isActiveFolder = group?.activeGroups?.length > 0;
+
+    if (isActiveFolder) {
+      group.activeTabs = [...new Set([...group.activeTabs, tab])].sort((a, b) => a._tPos > b._tPos);
+    }
+
+    if (group.hasAttribute('split-view-group') && group.hasAttribute('zen-pinned-changed')) {
+      // zen-pinned-changed remove it and set it to had-zen-pinned-changed to keep
+      // track of the original pinned state
+      group.removeAttribute('zen-pinned-changed');
+      group.setAttribute('had-zen-pinned-changed', true);
+    }
+
+    if (group.collapsed && !this._sessionRestoring) {
+      group.collapsed = group.hasAttribute('has-active');
+    }
+  }
+
+  on_FolderGrouped(event) {
+    if (this._sessionRestoring) return;
+    const folder = event.detail;
+    const parentFolder = event.target;
+    const isActiveFolder = parentFolder?.activeGroups?.length > 0;
+    const isSplitView = folder.hasAttribute('split-view-group');
+    if (isActiveFolder && isSplitView) {
+      parentFolder.activeTabs = [...new Set([...parentFolder.activeTabs, ...folder.tabs])].sort(
+        (a, b) => a._tPos > b._tPos
+      );
+    }
+    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;
+    if (group?.hasAttribute('split-view-group')) group = group?.group;
+    if (!group?.isZenFolder) {
+      return;
+    }
+
+    const collapsedRoot = group.rootMostCollapsedFolder;
+    if (!collapsedRoot) {
+      return;
+    }
+
+    collapsedRoot.setAttribute('has-active', 'true');
+    await this.animateSelect(collapsedRoot);
+    gBrowser.tabContainer._invalidateCachedTabs();
+  }
+
+  on_TabOpen(event) {
+    const tab = event.target;
+    const group = tab.group;
+    if (!group?.isZenFolder || tab.pinned) return;
+    // Edge case: In occations where we add a tab with an ownerTab
+    // inside a folder, the tab gets added into the folder in an
+    // unpinned state. We need to pin it and re-add it into the folder.
+    if (Services.prefs.getBoolPref('zen.folders.owned-tabs-in-folder')) {
+      gBrowser.pinTab(tab);
+      group.addTabs([tab]);
+    }
+  }
+
+  async on_TabUngrouped(event) {
+    const tab = event.detail;
+    const group = event.target;
+    if (group.hasAttribute('split-view-group') && tab.hasAttribute('had-zen-pinned-changed')) {
+      tab.setAttribute('zen-pinned-changed', true);
+      tab.removeAttribute('had-zen-pinned-changed');
+    }
+
+    await this.animateUnload(group, tab, true);
+  }
+
+  on_TabGroupCreate(event) {
+    const group = event.target;
+    const tabs = group.tabs;
+    if (!group.pinned) {
+      return;
+    }
+    for (const tab of tabs) {
+      if (tab.hasAttribute('zen-pinned-changed')) {
+        tab.removeAttribute('zen-pinned-changed');
+        tab.setAttribute('had-zen-pinned-changed', true);
       }
     }
+  }
 
-    async on_TabGroupCollapse(event) {
-      const group = event.target;
-      if (!group.isZenFolder) return;
+  on_TabPinned(event) {
+    const tab = event.target;
+    const group = tab.group;
+    if (group && group.hasAttribute('split-view-group')) {
+      group.pinned = true;
+    }
+  }
 
-      await this.animateCollapse(group);
+  on_TabUnpinned(event) {
+    const tab = event.target;
+    const group = tab.group;
+    if (group && group.hasAttribute('split-view-group')) {
+      group.pinned = false;
+    }
+  }
+
+  cancelPopupTimer() {
+    if (this.#mouseTimer) {
+      clearTimeout(this.#mouseTimer);
+      this.#mouseTimer = null;
+    }
+    if (this.#popup) {
+      this.#popup.hidePopup();
+    }
+  }
+
+  async on_TabGroupCollapse(event) {
+    const group = event.target;
+    if (!group.isZenFolder) return;
+
+    await this.animateCollapse(group);
+  }
+
+  async on_TabGroupExpand(event) {
+    const group = event.target;
+    if (!group.isZenFolder) return;
+
+    await this.animateExpand(group);
+  }
+
+  #onNewFolder(event) {
+    const isFromToolbar = event.target.id === 'zen-context-menu-new-folder-toolbar';
+    const contextMenu = event.target.parentElement;
+    let tabs = TabContextMenu.contextTab?.multiselected
+      ? gBrowser.selectedTabs
+      : [TabContextMenu.contextTab];
+    let triggerTab =
+      contextMenu.triggerNode &&
+      (contextMenu.triggerNode.tab || contextMenu.triggerNode.closest('tab'));
+
+    const selectedTabs = gBrowser.selectedTabs;
+    if (selectedTabs.length > 1) {
+      tabs.push(triggerTab, ...gBrowser.selectedTabs);
+    } else {
+      tabs.push(triggerTab);
+    }
+    if (isFromToolbar) {
+      tabs = [];
     }
 
-    async on_TabGroupExpand(event) {
-      const group = event.target;
-      if (!group.isZenFolder) return;
+    const canInsertBefore =
+      !isFromToolbar &&
+      !triggerTab.hasAttribute('zen-essential') &&
+      !triggerTab?.group?.hasAttribute('split-view-group') &&
+      this.canDropElement({ isZenFolder: true }, triggerTab);
 
-      await this.animateExpand(group);
-    }
+    this.createFolder(tabs, {
+      insertAfter: !canInsertBefore ? triggerTab?.group : null,
+      insertBefore: canInsertBefore ? triggerTab : null,
+      renameFolder: true,
+    });
+  }
 
-    #onNewFolder(event) {
-      const isFromToolbar = event.target.id === 'zen-context-menu-new-folder-toolbar';
-      const contextMenu = event.target.parentElement;
-      let tabs = TabContextMenu.contextTab?.multiselected
-        ? gBrowser.selectedTabs
-        : [TabContextMenu.contextTab];
-      let triggerTab =
-        contextMenu.triggerNode &&
-        (contextMenu.triggerNode.tab || contextMenu.triggerNode.closest('tab'));
+  async #convertFolderToSpace(folder) {
+    const currentWorkspace = gZenWorkspaces.getActiveWorkspaceFromCache();
+    let selectedTab = folder.tabs.find((tab) => tab.selected);
+    const icon = folder.icon?.querySelector('svg .icon image');
 
-      const selectedTabs = gBrowser.selectedTabs;
-      if (selectedTabs.length > 1) {
-        tabs.push(triggerTab, ...gBrowser.selectedTabs);
-      } else {
-        tabs.push(triggerTab);
-      }
-      if (isFromToolbar) {
-        tabs = [];
-      }
-
-      const canInsertBefore =
-        !isFromToolbar &&
-        !triggerTab.hasAttribute('zen-essential') &&
-        !triggerTab?.group?.hasAttribute('split-view-group') &&
-        this.canDropElement({ isZenFolder: true }, triggerTab);
-
-      this.createFolder(tabs, {
-        insertAfter: !canInsertBefore ? triggerTab?.group : null,
-        insertBefore: canInsertBefore ? triggerTab : null,
-        renameFolder: true,
-      });
-    }
-
-    async #convertFolderToSpace(folder) {
-      const currentWorkspace = gZenWorkspaces.getActiveWorkspaceFromCache();
-      let selectedTab = folder.tabs.find((tab) => tab.selected);
-      const icon = folder.icon?.querySelector('svg .icon image');
-
-      const newSpace = await gZenWorkspaces.createAndSaveWorkspace(
-        folder.label,
-        /* icon= */ icon?.getAttribute('href'),
-        /* dontChange= */ false,
-        currentWorkspace.containerTabId,
-        {
-          beforeChangeCallback: async (newWorkspace) => {
-            await new Promise((resolve) => {
-              requestAnimationFrame(async () => {
-                const workspacePinnedContainer = gZenWorkspaces.workspaceElement(
-                  newWorkspace.uuid
-                ).pinnedTabsContainer;
-                const tabs = folder.allItems.filter((tab) => !tab.hasAttribute('zen-empty-tab'));
-                workspacePinnedContainer.append(...tabs);
-                await folder.delete();
-                gBrowser.tabContainer._invalidateCachedTabs();
-                if (selectedTab) {
-                  selectedTab.setAttribute('zen-workspace-id', newWorkspace.uuid);
-                  selectedTab.removeAttribute('folder-active');
-                  gZenWorkspaces._lastSelectedWorkspaceTabs[newWorkspace.uuid] = selectedTab;
-                }
-                resolve();
-              });
+    const newSpace = await gZenWorkspaces.createAndSaveWorkspace(
+      folder.label,
+      /* icon= */ icon?.getAttribute('href'),
+      /* dontChange= */ false,
+      currentWorkspace.containerTabId,
+      {
+        beforeChangeCallback: async (newWorkspace) => {
+          await new Promise((resolve) => {
+            requestAnimationFrame(async () => {
+              const workspacePinnedContainer = gZenWorkspaces.workspaceElement(
+                newWorkspace.uuid
+              ).pinnedTabsContainer;
+              const tabs = folder.allItems.filter((tab) => !tab.hasAttribute('zen-empty-tab'));
+              workspacePinnedContainer.append(...tabs);
+              await folder.delete();
+              gBrowser.tabContainer._invalidateCachedTabs();
+              if (selectedTab) {
+                selectedTab.setAttribute('zen-workspace-id', newWorkspace.uuid);
+                selectedTab.removeAttribute('folder-active');
+                gZenWorkspaces._lastSelectedWorkspaceTabs[newWorkspace.uuid] = selectedTab;
+              }
+              resolve();
             });
-          },
-        }
-      );
-      // Change the ID for all tabs
-      for (const tab of gBrowser.tabs) {
-        if (!tab.hasAttribute('zen-essential')) {
-          tab.setAttribute('zen-workspace-id', newSpace.uuid);
-          tab.style.opacity = '';
-          tab.style.height = '';
-        }
-        gBrowser.TabStateFlusher.flush(tab.linkedBrowser);
-        if (gZenWorkspaces._lastSelectedWorkspaceTabs[currentWorkspace.uuid] === tab) {
-          // This tab is no longer the last selected tab in the previous workspace because it's being moved to
-          // the current workspace
-          delete gZenWorkspaces._lastSelectedWorkspaceTabs[currentWorkspace.uuid];
-        }
-      }
-    }
-
-    changeFolderToSpace(folder, workspaceId) {
-      const currentWorkspace = gZenWorkspaces.getActiveWorkspaceFromCache();
-      if (currentWorkspace.uuid === workspaceId) {
-        return;
-      }
-      const workspaceElement = gZenWorkspaces.workspaceElement(workspaceId);
-      const pinnedTabsContainer = workspaceElement.pinnedTabsContainer;
-      pinnedTabsContainer.insertBefore(folder, pinnedTabsContainer.lastChild);
-      for (const tab of folder.tabs) {
-        tab.setAttribute('zen-workspace-id', workspaceId);
-        // This sets the ID for the current folder and any sub-folder
-        // we may encounter
-        tab.group.setAttribute('zen-workspace-id', workspaceId);
-        gBrowser.TabStateFlusher.flush(tab.linkedBrowser);
-        if (gZenWorkspaces._lastSelectedWorkspaceTabs[workspaceId] === tab) {
-          // This tab is no longer the last selected tab in the previous workspace because it's being moved to a new workspace
-          delete gZenWorkspaces._lastSelectedWorkspaceTabs[workspaceId];
-        }
-      }
-      folder.dispatchEvent(new CustomEvent('ZenFolderChangedWorkspace', { bubbles: true }));
-      gZenWorkspaces.changeWorkspaceWithID(workspaceId).then(() => {
-        gBrowser.moveTabTo(folder, { elementIndex: 0, forceUngrouped: true });
-      });
-    }
-
-    canDropElement(element, targetElement) {
-      const isZenFolder = element?.isZenFolder;
-      const level = targetElement?.group?.level + 1;
-      if (isZenFolder && level >= this.#ZEN_MAX_SUBFOLDERS) {
-        return false;
-      }
-      return true;
-    }
-
-    createFolder(tabs = [], options = {}) {
-      const filteredTabs = tabs
-        .filter((tab) => !tab.hasAttribute('zen-essential'))
-        .map((tab) => {
-          gBrowser.pinTab(tab);
-          if (tab?.group?.hasAttribute('split-view-group')) {
-            tab = tab.group;
-          }
-          return tab;
-        });
-
-      const workspacePinned = gZenWorkspaces.workspaceElement(
-        options.workspaceId
-      )?.pinnedTabsContainer;
-      const pinnedContainer =
-        options.workspaceId && workspacePinned
-          ? workspacePinned
-          : gZenWorkspaces.pinnedTabsContainer;
-      const insertBefore =
-        options.insertBefore || pinnedContainer.querySelector('.pinned-tabs-container-separator');
-      const emptyTab = gBrowser.addTab('about:blank', {
-        skipAnimation: true,
-        pinned: true,
-        triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
-        _forZenEmptyTab: true,
-        createLazyBrowser: true,
-      });
-
-      gBrowser.pinTab(emptyTab);
-      tabs = [emptyTab, ...filteredTabs];
-
-      const folder = this._createFolderNode(options);
-      if (options.initialPinId) {
-        folder.setAttribute('zen-pin-id', options.initialPinId);
-      }
-
-      if (options.insertAfter) {
-        options.insertAfter.after(folder);
-      } else {
-        insertBefore.before(folder);
-      }
-      gZenVerticalTabsManager.animateItemOpen(folder);
-
-      folder.addTabs(tabs);
-
-      // Fixes bug1953801 and bug1954689
-      // Ensure that the tab state cache is updated immediately after creating
-      // a group. This is necessary because we consider group creation a
-      // deliberate user action indicating the tab has importance for the user.
-      // Without this, it is not possible to save and close a tab group with
-      // a short lifetime.
-      folder.tabs.forEach((tab) => {
-        gBrowser.TabStateFlusher.flush(tab.linkedBrowser);
-      });
-
-      this.updateFolderIcon(folder, 'auto');
-
-      if (options.renameFolder) {
-        folder.rename();
-      }
-
-      this.#groupInit(folder);
-      return folder;
-    }
-
-    _createFolderNode(options = {}) {
-      const folder = document.createXULElement('zen-folder', { is: 'zen-folder' });
-      let id = options.id;
-      if (!id) {
-        // Note: If this changes, make sure to also update the
-        // getExtTabGroupIdForInternalTabGroupId implementation in
-        // browser/components/extensions/parent/ext-browser.js.
-        // See: Bug 1960104 - Improve tab group ID generation in addTabGroup
-        id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
-      }
-      folder.id = id;
-      folder.label = options.label || 'New Folder';
-      folder.saveOnWindowClose = !!options.saveOnWindowClose;
-      folder.color = 'zen-workspace-color';
-
-      folder.setAttribute(
-        'zen-workspace-id',
-        options.workspaceId || gZenWorkspaces.activeWorkspace
-      );
-
-      // note: We set if the folder is collapsed some time after creation.
-      //   we do this to ensure marginBottom is set correctly in the case
-      //   that we want it to initially be collapsed.
-      setTimeout(
-        (folder) => {
-          gZenPinnedTabManager.promiseInitializedPinned.then(() => {
-            folder.collapsed = !!options.collapsed;
           });
         },
-        0,
-        folder
-      );
-      return folder;
-    }
-
-    handleTabPin(tab) {
-      const group = tab.group;
-      if (!group) {
-        return false;
       }
-      if (group.hasAttribute('split-view-group') && !this._piningFolder) {
-        this._piningFolder = true;
-        for (const otherTab of group.tabs) {
-          gZenPinnedTabManager.resetPinChangedUrl(otherTab);
-          if (tab === otherTab) {
-            continue;
-          }
-          gBrowser.pinTab(otherTab);
+    );
+    // Change the ID for all tabs
+    for (const tab of gBrowser.tabs) {
+      if (!tab.hasAttribute('zen-essential')) {
+        tab.setAttribute('zen-workspace-id', newSpace.uuid);
+        tab.style.opacity = '';
+        tab.style.height = '';
+      }
+      gBrowser.TabStateFlusher.flush(tab.linkedBrowser);
+      if (gZenWorkspaces._lastSelectedWorkspaceTabs[currentWorkspace.uuid] === tab) {
+        // This tab is no longer the last selected tab in the previous workspace because it's being moved to
+        // the current workspace
+        delete gZenWorkspaces._lastSelectedWorkspaceTabs[currentWorkspace.uuid];
+      }
+    }
+  }
+
+  changeFolderToSpace(folder, workspaceId) {
+    const currentWorkspace = gZenWorkspaces.getActiveWorkspaceFromCache();
+    if (currentWorkspace.uuid === workspaceId) {
+      return;
+    }
+    const workspaceElement = gZenWorkspaces.workspaceElement(workspaceId);
+    const pinnedTabsContainer = workspaceElement.pinnedTabsContainer;
+    pinnedTabsContainer.insertBefore(folder, pinnedTabsContainer.lastChild);
+    for (const tab of folder.tabs) {
+      tab.setAttribute('zen-workspace-id', workspaceId);
+      // This sets the ID for the current folder and any sub-folder
+      // we may encounter
+      tab.group.setAttribute('zen-workspace-id', workspaceId);
+      gBrowser.TabStateFlusher.flush(tab.linkedBrowser);
+      if (gZenWorkspaces._lastSelectedWorkspaceTabs[workspaceId] === tab) {
+        // This tab is no longer the last selected tab in the previous workspace because it's being moved to a new workspace
+        delete gZenWorkspaces._lastSelectedWorkspaceTabs[workspaceId];
+      }
+    }
+    folder.dispatchEvent(new CustomEvent('ZenFolderChangedWorkspace', { bubbles: true }));
+    gZenWorkspaces.changeWorkspaceWithID(workspaceId).then(() => {
+      gBrowser.moveTabTo(folder, { elementIndex: 0, forceUngrouped: true });
+    });
+  }
+
+  canDropElement(element, targetElement) {
+    const isZenFolder = element?.isZenFolder;
+    const level = targetElement?.group?.level + 1;
+    if (isZenFolder && level >= this.#ZEN_MAX_SUBFOLDERS) {
+      return false;
+    }
+    return true;
+  }
+
+  createFolder(tabs = [], options = {}) {
+    const filteredTabs = tabs
+      .filter((tab) => !tab.hasAttribute('zen-essential'))
+      .map((tab) => {
+        gBrowser.pinTab(tab);
+        if (tab?.group?.hasAttribute('split-view-group')) {
+          tab = tab.group;
         }
-        this._piningFolder = false;
-        gBrowser.pinnedTabsContainer.insertBefore(group, gBrowser.pinnedTabsContainer.lastChild);
-        gBrowser.tabContainer._invalidateCachedTabs();
-        return true;
-      }
-      return this._piningFolder;
-    }
-
-    handleTabUnpin(tab) {
-      tab.style.removeProperty('--zen-folder-indent');
-      const group = tab.group;
-      if (!group) {
-        return false;
-      }
-      if (group.hasAttribute('split-view-group') && !this._piningFolder) {
-        this._piningFolder = true;
-        for (const otherTab of group.tabs) {
-          if (tab === otherTab) {
-            continue;
-          }
-          gBrowser.unpinTab(otherTab);
-        }
-        this._piningFolder = false;
-        gZenWorkspaces.activeWorkspaceStrip.prepend(group);
-        gBrowser.tabContainer._invalidateCachedTabs();
-        return true;
-      }
-      return this._piningFolder;
-    }
-
-    openTabsPopup(event) {
-      event.stopPropagation();
-      if (document.documentElement.getAttribute('zen-renaming-tab') || gURLBar.focused) {
-        return;
-      }
-
-      const activeGroup = event.target.parentElement;
-      if (
-        activeGroup.tabs.filter((tab) => this.#shouldAppearOnTabSearch(tab, activeGroup)).length ===
-        0
-      ) {
-        // If the group has no tabs, we don't show the popup
-        return;
-      }
-      document.getElementById('zen-folder-tabs-search-no-results').hidden = true;
-      this.#populateTabsList(activeGroup);
-
-      const search = this.#popup.querySelector('#zen-folder-tabs-list-search');
-      document.l10n.setArgs(search, {
-        'folder-name': activeGroup.name,
+        return tab;
       });
-      const tabsList = this.#popup.querySelector('#zen-folder-tabs-list');
 
-      const onSearchInput = () => {
-        const query = search.value.toLowerCase();
-        let foundTabs = 0;
-        for (const item of tabsList.children) {
-          const found = item.getAttribute('data-label').includes(query);
-          item.hidden = !found;
-          if (found) {
-            foundTabs++;
-          }
-        }
-        document.getElementById('zen-folder-tabs-search-no-results').hidden = foundTabs > 0;
-      };
-      search.addEventListener('input', onSearchInput);
+    const workspacePinned = gZenWorkspaces.workspaceElement(
+      options.workspaceId
+    )?.pinnedTabsContainer;
+    const pinnedContainer =
+      options.workspaceId && workspacePinned ? workspacePinned : gZenWorkspaces.pinnedTabsContainer;
+    const insertBefore =
+      options.insertBefore || pinnedContainer.querySelector('.pinned-tabs-container-separator');
+    const emptyTab = gBrowser.addTab('about:blank', {
+      skipAnimation: true,
+      pinned: true,
+      triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+      _forZenEmptyTab: true,
+      createLazyBrowser: true,
+    });
 
-      const onKeyDown = (event) => {
-        // Arrow down and up to navigate through the list
-        if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
-          event.preventDefault();
-          const items = Array.from(tabsList.children).filter((item) => !item.hidden);
-          if (items.length === 0) return;
-          let index = items.indexOf(tabsList.querySelector('.folders-tabs-list-item[selected]'));
-          if (event.key === 'ArrowDown') {
-            index = (index + 1) % items.length;
-          } else if (event.key === 'ArrowUp') {
-            index = (index - 1 + items.length) % items.length;
-          }
-          items.forEach((item) => item.removeAttribute('selected'));
-          const targetItem = items[index];
-          targetItem.setAttribute('selected', 'true');
-          targetItem.scrollIntoView({ block: 'start', behavior: 'smooth' });
-        } else if (event.key === 'Enter') {
-          // Enter to select the currently highlighted item
-          const highlightedItem = tabsList.querySelector('.folders-tabs-list-item[selected]');
-          if (highlightedItem) {
-            highlightedItem.click();
-          }
-        }
-      };
-      document.addEventListener('keydown', onKeyDown);
+    gBrowser.pinTab(emptyTab);
+    tabs = [emptyTab, ...filteredTabs];
 
-      const target = event.target;
-      target.setAttribute('open', true);
-
-      const handlePopupHidden = (event) => {
-        if (event.target !== this.#popup) return;
-        search.value = '';
-        target.removeAttribute('open');
-        search.removeEventListener('input', onSearchInput);
-        document.removeEventListener('keydown', onKeyDown);
-      };
-
-      this.#popup.addEventListener(
-        'popupshown',
-        () => {
-          search.focus();
-          search.select();
-        },
-        { once: true }
-      );
-
-      this.#popup.addEventListener('popuphidden', handlePopupHidden, { once: true });
-      this.#popup.openPopup(target, this.#searchPopupOptions);
+    const folder = this._createFolderNode(options);
+    if (options.initialPinId) {
+      folder.setAttribute('zen-pin-id', options.initialPinId);
     }
 
-    get #searchPopupOptions() {
-      const isRightSide = gZenVerticalTabsManager._prefsRightSide;
-      const position = isRightSide ? 'topleft topright' : 'topright topleft';
-      return {
-        position: position,
-        x: 5,
-        y: -25,
-      };
+    if (options.insertAfter) {
+      options.insertAfter.after(folder);
+    } else {
+      insertBefore.before(folder);
+    }
+    gZenVerticalTabsManager.animateItemOpen(folder);
+
+    folder.addTabs(tabs);
+
+    // Fixes bug1953801 and bug1954689
+    // Ensure that the tab state cache is updated immediately after creating
+    // a group. This is necessary because we consider group creation a
+    // deliberate user action indicating the tab has importance for the user.
+    // Without this, it is not possible to save and close a tab group with
+    // a short lifetime.
+    folder.tabs.forEach((tab) => {
+      gBrowser.TabStateFlusher.flush(tab.linkedBrowser);
+    });
+
+    this.updateFolderIcon(folder, 'auto');
+
+    if (options.renameFolder) {
+      folder.rename();
     }
 
-    #shouldAppearOnTabSearch(tab, group) {
-      // Note that tab.visible and tab.hidden act in different ways.
-      // We don't want to show already visible tabs in the search results.
-      // That's why we need to do the active tab search, tab.hidden doesn't
-      // account for the visibility of the tab itself, it's just a literal
-      // representation of the `hidden` attribute.
-      const tabIsInActiveGroup = group.activeTabs.includes(tab);
-      return !tabIsInActiveGroup && !(tab.hidden || tab.hasAttribute('zen-empty-tab'));
+    this.#groupInit(folder);
+    return folder;
+  }
+
+  _createFolderNode(options = {}) {
+    const folder = document.createXULElement('zen-folder', { is: 'zen-folder' });
+    let id = options.id;
+    if (!id) {
+      // Note: If this changes, make sure to also update the
+      // getExtTabGroupIdForInternalTabGroupId implementation in
+      // browser/components/extensions/parent/ext-browser.js.
+      // See: Bug 1960104 - Improve tab group ID generation in addTabGroup
+      id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
     }
+    folder.id = id;
+    folder.label = options.label || 'New Folder';
+    folder.saveOnWindowClose = !!options.saveOnWindowClose;
+    folder.color = 'zen-workspace-color';
 
-    #populateTabsList(group) {
-      const tabsList = this.#popup.querySelector('#zen-folder-tabs-list');
-      tabsList.replaceChildren();
+    folder.setAttribute('zen-workspace-id', options.workspaceId || gZenWorkspaces.activeWorkspace);
 
-      for (const tab of group.tabs) {
-        if (!this.#shouldAppearOnTabSearch(tab, group)) continue;
-
-        const item = document.createElement('div');
-        item.className = 'folders-tabs-list-item';
-
-        const content = document.createElement('div');
-        content.className = 'folders-tabs-list-item-content';
-
-        const icon = document.createElement('img');
-        icon.className = 'folders-tabs-list-item-icon';
-
-        let tabURL = tab.linkedBrowser?.currentURI?.spec || '';
-        try {
-          // Get the hostname from the URL
-          const url = new URL(tabURL);
-          tabURL = url.hostname || tabURL;
-        } catch {
-          // We don't need to do anything if the URL is invalid. e.g. about:blank
-        }
-        let tabLabel = tab.label || '';
-        let iconURL = gBrowser.getIcon(tab) || PlacesUtils.favicons.defaultFavicon.spec;
-
-        icon.src = iconURL;
-
-        const labelsContainer = document.createElement('div');
-        labelsContainer.className = 'folders-tabs-list-item-labels';
-
-        const mainLabel = document.createElement('div');
-        mainLabel.className = 'folders-tabs-list-item-label';
-        mainLabel.textContent = tabLabel;
-
-        const secondaryLabel = document.createElement('div');
-        secondaryLabel.className = 'tab-list-item-secondary-label';
-        secondaryLabel.textContent = `${formatRelativeTime(tab.lastAccessed)} • ${tab.group.label}`;
-
-        labelsContainer.append(mainLabel, secondaryLabel);
-        content.append(icon, labelsContainer);
-        item.append(content);
-
-        if (tab.selected) {
-          item.setAttribute('selected', 'true');
-        }
-
-        item.setAttribute('data-label', `${tabLabel.toLowerCase()} ${tabURL.toLowerCase()}`);
-
-        item.addEventListener('click', () => {
-          gBrowser.selectedTab = tab;
+    // note: We set if the folder is collapsed some time after creation.
+    //   we do this to ensure marginBottom is set correctly in the case
+    //   that we want it to initially be collapsed.
+    setTimeout(
+      (folder) => {
+        gZenPinnedTabManager.promiseInitializedPinned.then(() => {
+          folder.collapsed = !!options.collapsed;
         });
+      },
+      0,
+      folder
+    );
+    return folder;
+  }
 
-        item.addEventListener('mouseenter', () => {
-          for (const sibling of tabsList.children) {
-            sibling.removeAttribute('selected');
-          }
-          item.setAttribute('selected', 'true');
-        });
-
-        tabsList.appendChild(item);
-      }
+  handleTabPin(tab) {
+    const group = tab.group;
+    if (!group) {
+      return false;
     }
-
-    updateFolderIcon(group, state = 'auto') {
-      const svg = group.querySelector('svg');
-      if (!svg) return [];
-
-      const isCollapsed = group.collapsed;
-      svg.setAttribute('state', state === 'auto' ? (isCollapsed ? 'close' : 'open') : state);
-      const hasActive = group.hasAttribute('has-active');
-      svg.setAttribute('active', hasActive && isCollapsed ? 'true' : 'false');
-
-      return [];
-    }
-
-    setFolderIndentation(tabs, groupElem = undefined, forCollapse = true, animate = true) {
-      if (!gZenPinnedTabManager.expandedSidebarMode) {
-        return;
-      }
-      let tab = tabs[0];
-      let isTab = false;
-      if (tab.group?.hasAttribute('split-view-group')) {
-        tab = tab.group;
-        isTab = true;
-      }
-      if (!groupElem && tab?.group) {
-        groupElem = tab; // So we can set isTab later
-      }
-      if (
-        gBrowser.isTab(groupElem) &&
-        (!(groupElem.hasAttribute('zen-empty-tab') && groupElem.group === tab.group) ||
-          groupElem?.hasAttribute('zen-empty-tab'))
-      ) {
-        groupElem = groupElem.group;
-        isTab = true;
-      }
-      if (!isTab && !groupElem?.hasAttribute('selected') && !forCollapse) {
-        groupElem = null; // Don't indent if the group is not selected
-      }
-      let level = groupElem?.level + 1 || 0;
-      if (gBrowser.isTabGroupLabel(groupElem)) {
-        // If it is a group label, we should not increase its level by one.
-        level = groupElem.group.level;
-      }
-      const baseSpacing = 14; // Base spacing for each level
-      let tabToAnimate = tab;
-      if (gBrowser.isTabGroupLabel(tab)) {
-        tabToAnimate = tab.group;
-      }
-      const tabLevel = tabToAnimate?.group?.level || 0;
-      const spacing = (level - tabLevel) * baseSpacing;
-      if (!animate) {
-        for (const tab of tabs) {
-          tab.style.setProperty('transition', 'none', 'important');
-        }
-      }
-      for (const tab of tabs) {
-        if (gBrowser.isTabGroupLabel(tab) || tab.group?.hasAttribute('split-view-group')) {
-          tab.group.style.setProperty('--zen-folder-indent', `${spacing}px`);
+    if (group.hasAttribute('split-view-group') && !this._piningFolder) {
+      this._piningFolder = true;
+      for (const otherTab of group.tabs) {
+        gZenPinnedTabManager.resetPinChangedUrl(otherTab);
+        if (tab === otherTab) {
           continue;
         }
-        tab.style.setProperty('--zen-folder-indent', `${spacing}px`);
+        gBrowser.pinTab(otherTab);
       }
-      if (!animate) {
-        for (const tab of tabs) {
-          tab.style.removeProperty('transition');
+      this._piningFolder = false;
+      gBrowser.pinnedTabsContainer.insertBefore(group, gBrowser.pinnedTabsContainer.lastChild);
+      gBrowser.tabContainer._invalidateCachedTabs();
+      return true;
+    }
+    return this._piningFolder;
+  }
+
+  handleTabUnpin(tab) {
+    tab.style.removeProperty('--zen-folder-indent');
+    const group = tab.group;
+    if (!group) {
+      return false;
+    }
+    if (group.hasAttribute('split-view-group') && !this._piningFolder) {
+      this._piningFolder = true;
+      for (const otherTab of group.tabs) {
+        if (tab === otherTab) {
+          continue;
+        }
+        gBrowser.unpinTab(otherTab);
+      }
+      this._piningFolder = false;
+      gZenWorkspaces.activeWorkspaceStrip.prepend(group);
+      gBrowser.tabContainer._invalidateCachedTabs();
+      return true;
+    }
+    return this._piningFolder;
+  }
+
+  openTabsPopup(event) {
+    event.stopPropagation();
+    if (document.documentElement.getAttribute('zen-renaming-tab') || gURLBar.focused) {
+      return;
+    }
+
+    const activeGroup = event.target.parentElement;
+    if (
+      activeGroup.tabs.filter((tab) => this.#shouldAppearOnTabSearch(tab, activeGroup)).length === 0
+    ) {
+      // If the group has no tabs, we don't show the popup
+      return;
+    }
+    document.getElementById('zen-folder-tabs-search-no-results').hidden = true;
+    this.#populateTabsList(activeGroup);
+
+    const search = this.#popup.querySelector('#zen-folder-tabs-list-search');
+    document.l10n.setArgs(search, {
+      'folder-name': activeGroup.name,
+    });
+    const tabsList = this.#popup.querySelector('#zen-folder-tabs-list');
+
+    const onSearchInput = () => {
+      const query = search.value.toLowerCase();
+      let foundTabs = 0;
+      for (const item of tabsList.children) {
+        const found = item.getAttribute('data-label').includes(query);
+        item.hidden = !found;
+        if (found) {
+          foundTabs++;
         }
       }
-    }
+      document.getElementById('zen-folder-tabs-search-no-results').hidden = foundTabs > 0;
+    };
+    search.addEventListener('input', onSearchInput);
 
-    changeFolderUserIcon(group) {
-      if (!group) return;
-
-      gZenEmojiPicker
-        .open(group.icon, { onlySvgIcons: true })
-        .then((icon) => {
-          this.setFolderUserIcon(group, icon);
-          group.dispatchEvent(new CustomEvent('ZenFolderIconChanged', { bubbles: true }));
-        })
-        .catch((err) => {
-          console.error(err);
-          return;
-        });
-    }
-
-    setFolderUserIcon(group, icon) {
-      const svgIcon = group.icon.querySelector('svg .icon image');
-      if (!svgIcon) return;
-      svgIcon.setAttribute('href', icon ?? '');
-      if (svgIcon.getAttribute('href') !== icon) {
-        svgIcon.style.opacity = '0';
-      } else {
-        svgIcon.style.opacity = '1';
-      }
-    }
-
-    #groupInit(group, stateData) {
-      // Setup zen-folder icon to the correct position
-      this.updateFolderIcon(group, 'auto');
-      if (stateData?.userIcon) {
-        this.setFolderUserIcon(group, stateData.userIcon);
-      }
-
-      if (group.collapsed) {
-        this.on_TabGroupCollapse({ target: group });
-      }
-
-      const labelContainer = group.querySelector('.tab-group-label-container');
-      // Setup mouseenter/mouseleave events for the folder
-      labelContainer.addEventListener('mouseenter', (event) => {
-        if (
-          !group.collapsed ||
-          !Services.prefs.getBoolPref('zen.folders.search.enabled') ||
-          gBrowser.tabContainer.hasAttribute('movingtab')
-        ) {
-          return;
+    const onKeyDown = (event) => {
+      // Arrow down and up to navigate through the list
+      if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
+        event.preventDefault();
+        const items = Array.from(tabsList.children).filter((item) => !item.hidden);
+        if (items.length === 0) return;
+        let index = items.indexOf(tabsList.querySelector('.folders-tabs-list-item[selected]'));
+        if (event.key === 'ArrowDown') {
+          index = (index + 1) % items.length;
+        } else if (event.key === 'ArrowUp') {
+          index = (index - 1 + items.length) % items.length;
         }
-        this.#mouseTimer = setTimeout(() => {
-          this.openTabsPopup(event);
-        }, Services.prefs.getIntPref('zen.folders.search.hover-delay'));
-      });
-      labelContainer.addEventListener('mouseleave', () => {
-        clearTimeout(this.#mouseTimer);
-        if (!group.collapsed) return;
-        this.#mouseTimer = setTimeout(() => {
-          // If popup is focused don't hide it
-          if (this.#popup.matches(':hover')) return;
-          this.#popup.hidePopup();
-        }, 200);
-      });
-    }
-
-    storeDataForSessionStore() {
-      const folders = Array.from(gBrowser.tabContainer.querySelectorAll('zen-folder'));
-      const splitGroups = Array.from(
-        gBrowser.tabContainer.querySelectorAll('tab-group[split-view-group]')
-      );
-      const allData = [...folders, ...splitGroups];
-
-      // Sort elements in the order in which they appear in the DOM
-      allData.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;
-      });
-
-      const storedData = [];
-
-      for (const folder of allData) {
-        const parentFolder = folder.parentElement.closest('zen-folder');
-        // Skip split-view-group if it's not a zen-folder child
-        if (!parentFolder && folder.hasAttribute('split-view-group')) continue;
-        const emptyFolderTabs = folder.tabs
-          .filter((tab) => tab.hasAttribute('zen-empty-tab'))
-          .map((tab) => tab.getAttribute('zen-pin-id'));
-
-        let prevSiblingInfo = null;
-        const prevSibling = folder.previousElementSibling;
-        const userIcon = folder?.icon?.querySelector('svg .icon image');
-
-        if (prevSibling) {
-          if (gBrowser.isTabGroup(prevSibling)) {
-            prevSiblingInfo = { type: 'group', id: prevSibling.id };
-          } else if (gBrowser.isTab(prevSibling) && prevSibling.hasAttribute('zen-pin-id')) {
-            const zenPinId = prevSibling.getAttribute('zen-pin-id');
-            prevSiblingInfo = { type: 'tab', id: zenPinId };
-          } else {
-            prevSiblingInfo = { type: 'start', id: null };
-          }
+        items.forEach((item) => item.removeAttribute('selected'));
+        const targetItem = items[index];
+        targetItem.setAttribute('selected', 'true');
+        targetItem.scrollIntoView({ block: 'start', behavior: 'smooth' });
+      } else if (event.key === 'Enter') {
+        // Enter to select the currently highlighted item
+        const highlightedItem = tabsList.querySelector('.folders-tabs-list-item[selected]');
+        if (highlightedItem) {
+          highlightedItem.click();
         }
-
-        storedData.push({
-          pinned: folder.pinned,
-          essential: folder.essential,
-          splitViewGroup: folder.hasAttribute('split-view-group'),
-          id: folder.id,
-          name: folder.label,
-          collapsed: folder.collapsed,
-          saveOnWindowClose: folder.saveOnWindowClose,
-          parentId: parentFolder ? parentFolder.id : null,
-          prevSiblingInfo: prevSiblingInfo,
-          emptyTabIds: emptyFolderTabs,
-          userIcon: userIcon?.getAttribute('href'),
-          pinId: folder.getAttribute('zen-pin-id'),
-          // note: We shouldn't be using the workspace-id anywhere, we are just
-          //  remembering it for the pinned tabs manager to use it later.
-          workspaceId: folder.getAttribute('zen-workspace-id'),
-        });
       }
-      return storedData;
+    };
+    document.addEventListener('keydown', onKeyDown);
+
+    const target = event.target;
+    target.setAttribute('open', true);
+
+    const handlePopupHidden = (event) => {
+      if (event.target !== this.#popup) return;
+      search.value = '';
+      target.removeAttribute('open');
+      search.removeEventListener('input', onSearchInput);
+      document.removeEventListener('keydown', onKeyDown);
+    };
+
+    this.#popup.addEventListener(
+      'popupshown',
+      () => {
+        search.focus();
+        search.select();
+      },
+      { once: true }
+    );
+
+    this.#popup.addEventListener('popuphidden', handlePopupHidden, { once: true });
+    this.#popup.openPopup(target, this.#searchPopupOptions);
+  }
+
+  get #searchPopupOptions() {
+    const isRightSide = gZenVerticalTabsManager._prefsRightSide;
+    const position = isRightSide ? 'topleft topright' : 'topright topleft';
+    return {
+      position: position,
+      x: 5,
+      y: -25,
+    };
+  }
+
+  #shouldAppearOnTabSearch(tab, group) {
+    // Note that tab.visible and tab.hidden act in different ways.
+    // We don't want to show already visible tabs in the search results.
+    // That's why we need to do the active tab search, tab.hidden doesn't
+    // account for the visibility of the tab itself, it's just a literal
+    // representation of the `hidden` attribute.
+    const tabIsInActiveGroup = group.activeTabs.includes(tab);
+    return !tabIsInActiveGroup && !(tab.hidden || tab.hasAttribute('zen-empty-tab'));
+  }
+
+  #populateTabsList(group) {
+    const tabsList = this.#popup.querySelector('#zen-folder-tabs-list');
+    tabsList.replaceChildren();
+
+    for (const tab of group.tabs) {
+      if (!this.#shouldAppearOnTabSearch(tab, group)) continue;
+
+      const item = document.createElement('div');
+      item.className = 'folders-tabs-list-item';
+
+      const content = document.createElement('div');
+      content.className = 'folders-tabs-list-item-content';
+
+      const icon = document.createElement('img');
+      icon.className = 'folders-tabs-list-item-icon';
+
+      let tabURL = tab.linkedBrowser?.currentURI?.spec || '';
+      try {
+        // Get the hostname from the URL
+        const url = new URL(tabURL);
+        tabURL = url.hostname || tabURL;
+      } catch {
+        // We don't need to do anything if the URL is invalid. e.g. about:blank
+      }
+      let tabLabel = tab.label || '';
+      let iconURL = gBrowser.getIcon(tab) || PlacesUtils.favicons.defaultFavicon.spec;
+
+      icon.src = iconURL;
+
+      const labelsContainer = document.createElement('div');
+      labelsContainer.className = 'folders-tabs-list-item-labels';
+
+      const mainLabel = document.createElement('div');
+      mainLabel.className = 'folders-tabs-list-item-label';
+      mainLabel.textContent = tabLabel;
+
+      const secondaryLabel = document.createElement('div');
+      secondaryLabel.className = 'tab-list-item-secondary-label';
+      secondaryLabel.textContent = `${formatRelativeTime(tab.lastAccessed)} • ${tab.group.label}`;
+
+      labelsContainer.append(mainLabel, secondaryLabel);
+      content.append(icon, labelsContainer);
+      item.append(content);
+
+      if (tab.selected) {
+        item.setAttribute('selected', 'true');
+      }
+
+      item.setAttribute('data-label', `${tabLabel.toLowerCase()} ${tabURL.toLowerCase()}`);
+
+      item.addEventListener('click', () => {
+        gBrowser.selectedTab = tab;
+      });
+
+      item.addEventListener('mouseenter', () => {
+        for (const sibling of tabsList.children) {
+          sibling.removeAttribute('selected');
+        }
+        item.setAttribute('selected', 'true');
+      });
+
+      tabsList.appendChild(item);
+    }
+  }
+
+  updateFolderIcon(group, state = 'auto') {
+    const svg = group.querySelector('svg');
+    if (!svg) return [];
+
+    const isCollapsed = group.collapsed;
+    svg.setAttribute('state', state === 'auto' ? (isCollapsed ? 'close' : 'open') : state);
+    const hasActive = group.hasAttribute('has-active');
+    svg.setAttribute('active', hasActive && isCollapsed ? 'true' : 'false');
+
+    return [];
+  }
+
+  setFolderIndentation(tabs, groupElem = undefined, forCollapse = true, animate = true) {
+    if (!gZenPinnedTabManager.expandedSidebarMode) {
+      return;
+    }
+    let tab = tabs[0];
+    let isTab = false;
+    if (tab.group?.hasAttribute('split-view-group')) {
+      tab = tab.group;
+      isTab = true;
+    }
+    if (!groupElem && tab?.group) {
+      groupElem = tab; // So we can set isTab later
+    }
+    if (
+      gBrowser.isTab(groupElem) &&
+      (!(groupElem.hasAttribute('zen-empty-tab') && groupElem.group === tab.group) ||
+        groupElem?.hasAttribute('zen-empty-tab'))
+    ) {
+      groupElem = groupElem.group;
+      isTab = true;
+    }
+    if (!isTab && !groupElem?.hasAttribute('selected') && !forCollapse) {
+      groupElem = null; // Don't indent if the group is not selected
+    }
+    let level = groupElem?.level + 1 || 0;
+    if (gBrowser.isTabGroupLabel(groupElem)) {
+      // If it is a group label, we should not increase its level by one.
+      level = groupElem.group.level;
+    }
+    const baseSpacing = 14; // Base spacing for each level
+    let tabToAnimate = tab;
+    if (gBrowser.isTabGroupLabel(tab)) {
+      tabToAnimate = tab.group;
+    }
+    const tabLevel = tabToAnimate?.group?.level || 0;
+    const spacing = (level - tabLevel) * baseSpacing;
+    if (!animate) {
+      for (const tab of tabs) {
+        tab.style.setProperty('transition', 'none', 'important');
+      }
+    }
+    for (const tab of tabs) {
+      if (gBrowser.isTabGroupLabel(tab) || tab.group?.hasAttribute('split-view-group')) {
+        tab.group.style.setProperty('--zen-folder-indent', `${spacing}px`);
+        continue;
+      }
+      tab.style.setProperty('--zen-folder-indent', `${spacing}px`);
+    }
+    if (!animate) {
+      for (const tab of tabs) {
+        tab.style.removeProperty('transition');
+      }
+    }
+  }
+
+  changeFolderUserIcon(group) {
+    if (!group) return;
+
+    gZenEmojiPicker
+      .open(group.icon, { onlySvgIcons: true })
+      .then((icon) => {
+        this.setFolderUserIcon(group, icon);
+        group.dispatchEvent(new CustomEvent('ZenFolderIconChanged', { bubbles: true }));
+      })
+      .catch((err) => {
+        console.error(err);
+        return;
+      });
+  }
+
+  setFolderUserIcon(group, icon) {
+    const svgIcon = group.icon.querySelector('svg .icon image');
+    if (!svgIcon) return;
+    svgIcon.setAttribute('href', icon ?? '');
+    if (svgIcon.getAttribute('href') !== icon) {
+      svgIcon.style.opacity = '0';
+    } else {
+      svgIcon.style.opacity = '1';
+    }
+  }
+
+  #groupInit(group, stateData) {
+    // Setup zen-folder icon to the correct position
+    this.updateFolderIcon(group, 'auto');
+    if (stateData?.userIcon) {
+      this.setFolderUserIcon(group, stateData.userIcon);
     }
 
-    restoreDataFromSessionStore(data) {
-      if (!data || this._sessionRestoring) {
+    if (group.collapsed) {
+      this.on_TabGroupCollapse({ target: group });
+    }
+
+    const labelContainer = group.querySelector('.tab-group-label-container');
+    // Setup mouseenter/mouseleave events for the folder
+    labelContainer.addEventListener('mouseenter', (event) => {
+      if (
+        !group.collapsed ||
+        !Services.prefs.getBoolPref('zen.folders.search.enabled') ||
+        gBrowser.tabContainer.hasAttribute('movingtab')
+      ) {
         return;
       }
+      this.#mouseTimer = setTimeout(() => {
+        this.openTabsPopup(event);
+      }, Services.prefs.getIntPref('zen.folders.search.hover-delay'));
+    });
+    labelContainer.addEventListener('mouseleave', () => {
+      clearTimeout(this.#mouseTimer);
+      if (!group.collapsed) return;
+      this.#mouseTimer = setTimeout(() => {
+        // If popup is focused don't hide it
+        if (this.#popup.matches(':hover')) return;
+        this.#popup.hidePopup();
+      }, 200);
+    });
+  }
 
-      this._sessionRestoring = true;
+  storeDataForSessionStore() {
+    const folders = Array.from(gBrowser.tabContainer.querySelectorAll('zen-folder'));
+    const splitGroups = Array.from(
+      gBrowser.tabContainer.querySelectorAll('tab-group[split-view-group]')
+    );
+    const allData = [...folders, ...splitGroups];
 
-      const tabFolderWorkingData = new Map();
+    // Sort elements in the order in which they appear in the DOM
+    allData.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;
+    });
 
-      for (const folderData of data) {
-        const workingData = {
-          stateData: folderData,
-          node: null,
-          containingTabsFragment: document.createDocumentFragment(),
-        };
-        tabFolderWorkingData.set(folderData.id, workingData);
+    const storedData = [];
 
-        const oldGroup = document.getElementById(folderData.id);
-        folderData.emptyTabIds.forEach((zenPinId) => {
-          oldGroup
-            ?.querySelector(`tab[zen-pin-id="${zenPinId}"]`)
-            ?.setAttribute('zen-empty-tab', true);
-        });
-        if (oldGroup) {
-          if (!folderData.splitViewGroup) {
-            const folder = this._createFolderNode({
-              id: folderData.id,
-              label: folderData.name,
-              collapsed: folderData.collapsed,
-              pinned: folderData.pinned,
-              saveOnWindowClose: folderData.saveOnWindowClose,
-              workspaceId: folderData.workspaceId,
-            });
-            folder.setAttribute('zen-pin-id', folderData.pinId);
-            workingData.node = folder;
-            oldGroup.before(folder);
-          } else {
-            workingData.node = oldGroup;
+    for (const folder of allData) {
+      const parentFolder = folder.parentElement.closest('zen-folder');
+      // Skip split-view-group if it's not a zen-folder child
+      if (!parentFolder && folder.hasAttribute('split-view-group')) continue;
+      const emptyFolderTabs = folder.tabs
+        .filter((tab) => tab.hasAttribute('zen-empty-tab'))
+        .map((tab) => tab.getAttribute('zen-pin-id'));
+
+      let prevSiblingInfo = null;
+      const prevSibling = folder.previousElementSibling;
+      const userIcon = folder?.icon?.querySelector('svg .icon image');
+
+      if (prevSibling) {
+        if (gBrowser.isTabGroup(prevSibling)) {
+          prevSiblingInfo = { type: 'group', id: prevSibling.id };
+        } else if (gBrowser.isTab(prevSibling) && prevSibling.hasAttribute('zen-pin-id')) {
+          const zenPinId = prevSibling.getAttribute('zen-pin-id');
+          prevSiblingInfo = { type: 'tab', id: zenPinId };
+        } else {
+          prevSiblingInfo = { type: 'start', id: null };
+        }
+      }
+
+      storedData.push({
+        pinned: folder.pinned,
+        essential: folder.essential,
+        splitViewGroup: folder.hasAttribute('split-view-group'),
+        id: folder.id,
+        name: folder.label,
+        collapsed: folder.collapsed,
+        saveOnWindowClose: folder.saveOnWindowClose,
+        parentId: parentFolder ? parentFolder.id : null,
+        prevSiblingInfo: prevSiblingInfo,
+        emptyTabIds: emptyFolderTabs,
+        userIcon: userIcon?.getAttribute('href'),
+        pinId: folder.getAttribute('zen-pin-id'),
+        // note: We shouldn't be using the workspace-id anywhere, we are just
+        //  remembering it for the pinned tabs manager to use it later.
+        workspaceId: folder.getAttribute('zen-workspace-id'),
+      });
+    }
+    return storedData;
+  }
+
+  restoreDataFromSessionStore(data) {
+    if (!data || this._sessionRestoring) {
+      return;
+    }
+
+    this._sessionRestoring = true;
+
+    const tabFolderWorkingData = new Map();
+
+    for (const folderData of data) {
+      const workingData = {
+        stateData: folderData,
+        node: null,
+        containingTabsFragment: document.createDocumentFragment(),
+      };
+      tabFolderWorkingData.set(folderData.id, workingData);
+
+      const oldGroup = document.getElementById(folderData.id);
+      folderData.emptyTabIds.forEach((zenPinId) => {
+        oldGroup
+          ?.querySelector(`tab[zen-pin-id="${zenPinId}"]`)
+          ?.setAttribute('zen-empty-tab', true);
+      });
+      if (oldGroup) {
+        if (!folderData.splitViewGroup) {
+          const folder = this._createFolderNode({
+            id: folderData.id,
+            label: folderData.name,
+            collapsed: folderData.collapsed,
+            pinned: folderData.pinned,
+            saveOnWindowClose: folderData.saveOnWindowClose,
+            workspaceId: folderData.workspaceId,
+          });
+          folder.setAttribute('zen-pin-id', folderData.pinId);
+          workingData.node = folder;
+          oldGroup.before(folder);
+        } else {
+          workingData.node = oldGroup;
+        }
+        while (oldGroup.tabs.length > 0) {
+          const tab = oldGroup.tabs[0];
+          if (folderData.workspaceId) {
+            tab.setAttribute('zen-workspace-id', folderData.workspaceId);
           }
-          while (oldGroup.tabs.length > 0) {
-            const tab = oldGroup.tabs[0];
-            if (folderData.workspaceId) {
-              tab.setAttribute('zen-workspace-id', folderData.workspaceId);
+          workingData.containingTabsFragment.appendChild(tab);
+        }
+        if (!folderData.splitViewGroup) {
+          oldGroup.remove();
+        }
+      }
+    }
+
+    for (const { node, containingTabsFragment } of tabFolderWorkingData.values()) {
+      if (node) {
+        node.appendChild(containingTabsFragment);
+      }
+    }
+
+    // Nesting folders into each other according to parentId.
+    for (const { stateData, node } of tabFolderWorkingData.values()) {
+      if (node && stateData.parentId) {
+        const parentWorkingData = tabFolderWorkingData.get(stateData.parentId);
+        if (parentWorkingData && parentWorkingData.node) {
+          switch (stateData?.prevSiblingInfo?.type) {
+            case 'tab': {
+              const tab = parentWorkingData.node.querySelector(
+                `[zen-pin-id="${stateData.prevSiblingInfo.id}"]`
+              );
+              tab.after(node);
+              break;
             }
-            workingData.containingTabsFragment.appendChild(tab);
-          }
-          if (!folderData.splitViewGroup) {
-            oldGroup.remove();
-          }
-        }
-      }
-
-      for (const { node, containingTabsFragment } of tabFolderWorkingData.values()) {
-        if (node) {
-          node.appendChild(containingTabsFragment);
-        }
-      }
-
-      // Nesting folders into each other according to parentId.
-      for (const { stateData, node } of tabFolderWorkingData.values()) {
-        if (node && stateData.parentId) {
-          const parentWorkingData = tabFolderWorkingData.get(stateData.parentId);
-          if (parentWorkingData && parentWorkingData.node) {
-            switch (stateData?.prevSiblingInfo?.type) {
-              case 'tab': {
-                const tab = parentWorkingData.node.querySelector(
-                  `[zen-pin-id="${stateData.prevSiblingInfo.id}"]`
-                );
-                tab.after(node);
+            case 'group': {
+              const folder = document.getElementById(stateData.prevSiblingInfo.id);
+              if (folder) {
+                folder.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 =
-                  parentWorkingData.node.querySelector('.zen-tab-group-start').nextElementSibling;
-                start.after(node);
-              }
+              // 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 =
+                parentWorkingData.node.querySelector('.zen-tab-group-start').nextElementSibling;
+              start.after(node);
             }
           }
         }
       }
-
-      // Initialize UI state for all folders.
-      for (const { stateData, node } of tabFolderWorkingData.values()) {
-        if (node && !stateData.splitViewGroup) {
-          this.#groupInit(node, stateData);
-        }
-      }
-
-      gBrowser.tabContainer._invalidateCachedTabs();
-      this._sessionRestoring = false;
     }
 
-    /**
-     * Highlights the given tab group and removes highlight from any previously highlighted group.
-     * @param {MozTabbrowserTabGroup|undefined|null} folder The folder to highlight, or null to clear highlight.
-     * @param {Array<MozTabbrowserTab>|null} movingTabs The tabs being moved.
-     */
-    highlightGroupOnDragOver(folder, movingTabs) {
-      if (folder === this.#lastHighlightedGroup) return;
-      const tab = movingTabs ? movingTabs[0] : null;
-      if (this.#lastHighlightedGroup && this.#lastHighlightedGroup !== folder) {
-        this.#lastHighlightedGroup.removeAttribute('selected');
-        if (this.#lastHighlightedGroup.collapsed) {
-          this.updateFolderIcon(this.#lastHighlightedGroup, 'close');
-        }
-        this.#lastHighlightedGroup = null;
-      }
-
-      if (
-        folder &&
-        (!folder.hasAttribute('split-view-group') || !folder.hasAttribute('selected')) &&
-        folder !== tab?.group &&
-        !(
-          folder.level >= this.#ZEN_MAX_SUBFOLDERS &&
-          movingTabs?.some((t) => gBrowser.isTabGroupLabel(t))
-        )
-      ) {
-        folder.setAttribute('selected', 'true');
-        folder.style.transform = '';
-        if (folder.collapsed) {
-          this.updateFolderIcon(folder, 'open');
-        }
-        this.#lastHighlightedGroup = folder;
+    // Initialize UI state for all folders.
+    for (const { stateData, node } of tabFolderWorkingData.values()) {
+      if (node && !stateData.splitViewGroup) {
+        this.#groupInit(node, stateData);
       }
     }
 
-    /**
-     * Ungroup a tab from all the active groups it belongs to.
-     * @param {MozTabbrowserTab[]} tabs The tab to ungroup.
-     */
-    ungroupTabsFromActiveGroups(tabs) {
-      for (const tab of tabs) {
-        gBrowser.ungroupTabsUntilNoActive(tab);
+    gBrowser.tabContainer._invalidateCachedTabs();
+    this._sessionRestoring = false;
+  }
+
+  /**
+   * Highlights the given tab group and removes highlight from any previously highlighted group.
+   * @param {MozTabbrowserTabGroup|undefined|null} folder The folder to highlight, or null to clear highlight.
+   * @param {Array<MozTabbrowserTab>|null} movingTabs The tabs being moved.
+   */
+  highlightGroupOnDragOver(folder, movingTabs) {
+    if (folder === this.#lastHighlightedGroup) return;
+    const tab = movingTabs ? movingTabs[0] : null;
+    if (this.#lastHighlightedGroup && this.#lastHighlightedGroup !== folder) {
+      this.#lastHighlightedGroup.removeAttribute('selected');
+      if (this.#lastHighlightedGroup.collapsed) {
+        this.updateFolderIcon(this.#lastHighlightedGroup, 'close');
       }
+      this.#lastHighlightedGroup = null;
     }
 
-    /**
-     * Handles the dragover logic when dragging a tab or tab group label over another tab group label.
-     * This function determines where the dragged item should be visually dropped (before/after the group, or inside it)
-     * and updates related styling and highlighting.
-     *
-     * @param {MozTabbrowserTabGroupLabel} currentDropElement The tab group label currently being dragged over.
-     * @param {MozTabbrowserTab|MozTabbrowserTabGroupLabel} draggedTab The tab or tab group label being dragged.
-     * @param {number} overlapPercent The percentage of overlap between the dragged item and the drop target.
-     * @param {Array<MozTabbrowserTab>} movingTabs An array of tabs that are currently being dragged together.
-     * @param {boolean} currentDropBefore Indicates if the current drop position is before the middle of the drop element.
-     * @param {string|undefined} currentColorCode The current color code for dragover highlighting.
-     * @returns {{dropElement: MozTabbrowserTabGroup|MozTabbrowserTab|MozTabbrowserTabGroupLabel, colorCode: string|undefined, dropBefore: boolean}}
-     *   An object containing the updated drop element, color code for highlighting, and drop position.
-     */
-    handleDragOverTabGroupLabel(
-      currentDropElement,
-      draggedTab,
-      overlapPercent,
-      movingTabs,
-      currentDropBefore,
-      currentColorCode
+    if (
+      folder &&
+      (!folder.hasAttribute('split-view-group') || !folder.hasAttribute('selected')) &&
+      folder !== tab?.group &&
+      !(
+        folder.level >= this.#ZEN_MAX_SUBFOLDERS &&
+        movingTabs?.some((t) => gBrowser.isTabGroupLabel(t))
+      )
     ) {
-      let dropElement = currentDropElement;
-      let dropBefore = currentDropBefore;
-      let colorCode = currentColorCode;
-
-      const dropElementGroup = dropElement?.isZenFolder ? dropElement : dropElement?.group;
-      const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
-      let firstGroupElem =
-        dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;
-      if (gBrowser.isTabGroup(firstGroupElem)) firstGroupElem = firstGroupElem.labelElement;
-
-      const isInMiddleZone =
-        overlapPercent >= this.#ZEN_EDGE_ZONE_THRESHOLD &&
-        overlapPercent <= 1 - this.#ZEN_EDGE_ZONE_THRESHOLD;
-      const shouldDropInside = isInMiddleZone && !isSplitGroup;
-
-      if (shouldDropInside) {
-        dropElement = firstGroupElem;
-        dropBefore = true;
-        this.highlightGroupOnDragOver(dropElementGroup, movingTabs);
-      } else {
-        colorCode = undefined;
-        this.highlightGroupOnDragOver(null);
+      folder.setAttribute('selected', 'true');
+      folder.style.transform = '';
+      if (folder.collapsed) {
+        this.updateFolderIcon(folder, 'open');
       }
+      this.#lastHighlightedGroup = folder;
+    }
+  }
 
-      return { dropElement, colorCode, dropBefore };
+  /**
+   * Ungroup a tab from all the active groups it belongs to.
+   * @param {MozTabbrowserTab[]} tabs The tab to ungroup.
+   */
+  ungroupTabsFromActiveGroups(tabs) {
+    for (const tab of tabs) {
+      gBrowser.ungroupTabsUntilNoActive(tab);
+    }
+  }
+
+  /**
+   * Handles the dragover logic when dragging a tab or tab group label over another tab group label.
+   * This function determines where the dragged item should be visually dropped (before/after the group, or inside it)
+   * and updates related styling and highlighting.
+   *
+   * @param {MozTabbrowserTabGroupLabel} currentDropElement The tab group label currently being dragged over.
+   * @param {MozTabbrowserTab|MozTabbrowserTabGroupLabel} draggedTab The tab or tab group label being dragged.
+   * @param {number} overlapPercent The percentage of overlap between the dragged item and the drop target.
+   * @param {Array<MozTabbrowserTab>} movingTabs An array of tabs that are currently being dragged together.
+   * @param {boolean} currentDropBefore Indicates if the current drop position is before the middle of the drop element.
+   * @param {string|undefined} currentColorCode The current color code for dragover highlighting.
+   * @returns {{dropElement: MozTabbrowserTabGroup|MozTabbrowserTab|MozTabbrowserTabGroupLabel, colorCode: string|undefined, dropBefore: boolean}}
+   *   An object containing the updated drop element, color code for highlighting, and drop position.
+   */
+  handleDragOverTabGroupLabel(
+    currentDropElement,
+    draggedTab,
+    overlapPercent,
+    movingTabs,
+    currentDropBefore,
+    currentColorCode
+  ) {
+    let dropElement = currentDropElement;
+    let dropBefore = currentDropBefore;
+    let colorCode = currentColorCode;
+
+    const dropElementGroup = dropElement?.isZenFolder ? dropElement : dropElement?.group;
+    const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
+    let firstGroupElem = dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;
+    if (gBrowser.isTabGroup(firstGroupElem)) firstGroupElem = firstGroupElem.labelElement;
+
+    const isInMiddleZone =
+      overlapPercent >= this.#ZEN_EDGE_ZONE_THRESHOLD &&
+      overlapPercent <= 1 - this.#ZEN_EDGE_ZONE_THRESHOLD;
+    const shouldDropInside = isInMiddleZone && !isSplitGroup;
+
+    if (shouldDropInside) {
+      dropElement = firstGroupElem;
+      dropBefore = true;
+      this.highlightGroupOnDragOver(dropElementGroup, movingTabs);
+    } else {
+      colorCode = undefined;
+      this.highlightGroupOnDragOver(null);
     }
 
-    #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 { 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;
-        });
-    }
+        }
+        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]);
+  #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;
           }
-          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);
-          }
+        return { item, splitViewId, activeFolderId };
+      });
+  }
 
-          if (gBrowser.isTabGroupLabel(item)) {
-            if (isSplitView) {
-              item = item.group;
-            } else {
-              item = item.parentElement;
-            }
-          }
+  #createAnimation(items, targetState, opts, callback = () => {}) {
+    items = Array.isArray(items) ? items : [items];
+    return items.map((item) =>
+      gZenUIManager.motion.animate(item, targetState, opts).then(callback)
+    );
+  }
 
-          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;
-      }
+  #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 collapsedHeight = 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);
+      });
     }
 
-    async animateCollapse(group) {
-      this.cancelPopupTimer();
+    animations.push(
+      ...this.#createAnimation(
+        itemsToHide,
+        { opacity: [1, 0], height: ['auto', 0] },
+        { duration: 0.12, ease: 'easeInOut' }
+      ),
+      ...this.updateFolderIcon(group),
+      ...this.#createAnimation(
+        groupStart,
+        {
+          marginTop: -(collapsedHeight + 4 * (selectedTabs.length === 0 ? 1 : 0)),
+        },
+        { duration: 0.12, ease: 'easeInOut' }
+      )
+    );
 
-      const animations = [];
-      const selectedTabs = [];
+    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 itemsToHide = [];
-
-      const tabsContainer = group.querySelector('.tab-group-container');
-      const groupStart = group.querySelector('.zen-tab-group-start');
-
-      const groupItems = this.#collectGroupItems(group, {
-        selectedTabs,
+      const activeFolderItems = this.#collectGroupItems(folder, {
         splitViewIds,
         activeFoldersIds,
       });
-      const collapsedHeight = this.#calculateHeightShift(tabsContainer, selectedTabs);
 
       if (selectedTabs.length) {
-        for (let i = 0; i < groupItems.length; i++) {
-          const { item, splitViewId, activeFolderId } = groupItems[i];
+        for (let i = 0; i < activeFolderItems.length; i++) {
+          const { item, splitViewId, activeFolderId } = activeFolderItems[i];
 
           // Skip selected items
           if (selectedTabs.includes(item)) continue;
@@ -1278,11 +1356,13 @@
           // 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')) {
+            const folder = item.parentElement;
+            if (
+              gBrowser.isTabGroup(folder) &&
+              folder.id !== activeFolderId &&
+              item.hasAttribute('folder-active')
+            ) {
               continue;
             }
           }
@@ -1291,443 +1371,352 @@
             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: [1, 0], height: ['auto', 0] },
-          { duration: 0.12, ease: 'easeInOut' }
-        ),
-        ...this.updateFolderIcon(group),
-        ...this.#createAnimation(
-          groupStart,
-          {
-            marginTop: -(collapsedHeight + 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));
           }
-        }
-      }
-
-      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);
+          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 {
-              // 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');
-              }
+              tab.style.removeProperty('--zen-folder-indent');
             }
           }
-          folders.clear();
         }
-        // Folder has been expanded and has no active tabs
-        group.activeTabs = [];
+        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');
+
+      // 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');
+      const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
+
+      // Collect animations for this specific folder becoming inactive
       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.updateFolderIcon(folder, 'close', false),
         ...this.#createAnimation(
           groupStart,
           {
-            marginTop: 0,
+            marginTop: -(collapsedHeight + 4),
           },
           { duration: 0.12, ease: 'easeInOut' },
-          afterMarginTop
+          afterAnimate
         )
       );
-
-      this.#animationCount += 1;
-      await Promise.all(animations);
-      this.#animationCount -= 1;
-
-      // Cleanup
-      this.styleCleanup(itemsToShow);
-      this.styleCleanup(itemsToHide);
     }
 
-    async animateUnloadAll(group) {
-      const animations = [];
+    this.#animationCount += 1;
+    await Promise.all(animations);
+    this.#animationCount -= 1;
+    gBrowser.tabContainer._invalidateCachedTabs();
+  }
 
-      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');
+  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 = [];
+    let lastTab = false;
 
-        // 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 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');
+
+          // 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');
           const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
-          groupStart.style.marginTop = `${-(collapsedHeight + 4)}px`;
-        };
 
-        const groupStart = folder.querySelector('.zen-tab-group-start');
-        const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
-
-        // Collect animations for this specific folder becoming inactive
-        animations.push(
-          ...this.updateFolderIcon(folder, 'close', false),
-          ...this.#createAnimation(
-            groupStart,
-            {
-              marginTop: -(collapsedHeight + 4),
-            },
-            { duration: 0.12, ease: 'easeInOut' },
-            afterAnimate
-          )
-        );
+          // Collect animations for this specific folder becoming inactive
+          const folderAnimation = [
+            ...this.updateFolderIcon(folder, 'close', false),
+            ...this.#createAnimation(
+              groupStart,
+              {
+                marginTop: -(collapsedHeight + 4),
+              },
+              { duration: 0.12, ease: 'easeInOut' },
+              afterAnimate
+            ),
+          ];
+          await Promise.all(folderAnimation);
+        });
       }
-
-      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 = [];
-      let lastTab = false;
+    tabToUnload.removeAttribute('folder-active');
+    if (isSplitView) {
+      tabToUnload = tabToUnload.group;
+    }
 
-      const activeGroups = group.activeGroups;
-      for (const folder of activeGroups) {
-        folder.activeTabs = folder.activeTabs.filter((tab) => tab !== tabToUnload);
+    tabToUnload.style.removeProperty('--zen-folder-indent');
 
-        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');
+    let tabUnloadAnimations = [];
+    if (!ungroup && !lastTab) {
+      tabUnloadAnimations = this.#createAnimation(
+        tabToUnload,
+        {
+          opacity: 0,
+          height: 0,
+        },
+        {
+          duration: 0.12,
+          ease: 'easeInOut',
+        }
+      );
+    }
 
-            // 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`;
+    // 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 = '';
             };
 
-            const groupStart = folder.querySelector('.zen-tab-group-start');
-            const collapsedHeight = this.#calculateHeightShift(tabsContainer, []);
-
-            // Collect animations for this specific folder becoming inactive
-            const folderAnimation = [
-              ...this.updateFolderIcon(folder, 'close', false),
+            animations.push(
+              ...this.updateFolderIcon(currentGroup, 'close', false),
               ...this.#createAnimation(
                 groupStart,
                 {
-                  marginTop: -(collapsedHeight + 4),
+                  marginTop: 0,
                 },
                 { duration: 0.12, ease: 'easeInOut' },
-                afterAnimate
-              ),
-            ];
-            await Promise.all(folderAnimation);
-          });
-        }
-      }
-
-      tabToUnload.removeAttribute('folder-active');
-      if (isSplitView) {
-        tabToUnload = tabToUnload.group;
-      }
-
-      tabToUnload.style.removeProperty('--zen-folder-indent');
-
-      let tabUnloadAnimations = [];
-      if (!ungroup && !lastTab) {
-        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
-                )
+                afterMarginTop
+              )
+            );
+            for (const tab of activeTabs) {
+              this.setFolderIndentation(
+                [tab],
+                currentGroup,
+                /* for collapse = */ true,
+                /* animate = */ false
               );
-              for (const tab of activeTabs) {
-                this.setFolderIndentation(
-                  [tab],
-                  currentGroup,
-                  /* for collapse = */ true,
-                  /* animate = */ false
-                );
-              }
             }
           }
-          currentGroup = currentGroup.group;
         }
+        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 = 'clip';
+    const itemsToShow = [];
+    if (selectedTabs.length) {
+      for (let i = 0; i < groupItems.length; i++) {
+        const { item, splitViewId } = groupItems[i];
 
-      this.#createAnimation(
-        groupStart,
+        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,
         {
-          marginTop: expand ? 0 : -(heightContainer + 4),
+          opacity: '',
+          height: '',
         },
-        { duration: 0.12, ease: 'easeInOut' }
-      );
+        {
+          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;
     }
 
-    styleCleanup(items) {
-      items.forEach((item) => {
-        item.style.removeProperty('opacity');
-        item.style.removeProperty('height');
-      });
-    }
+    // Cleanup
+    this.styleCleanup(itemsToHide);
+    this.styleCleanup(selectedTabs);
   }
 
-  window.gZenFolders = new nsZenFolders();
+  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 = '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/jar.inc.mn b/src/zen/folders/jar.inc.mn
new file mode 100644
index 000000000..971b59dfc
--- /dev/null
+++ b/src/zen/folders/jar.inc.mn
@@ -0,0 +1,7 @@
+# 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/.
+
+        content/browser/zen-components/ZenFolder.mjs                            (../../zen/folders/ZenFolder.mjs)
+        content/browser/zen-components/ZenFolders.mjs                           (../../zen/folders/ZenFolders.mjs)
+        content/browser/zen-styles/zen-folders.css                              (../../zen/folders/zen-folders.css)
\ No newline at end of file
diff --git a/src/zen/fonts/jar.inc.mn b/src/zen/fonts/jar.inc.mn
new file mode 100644
index 000000000..d6650ad61
--- /dev/null
+++ b/src/zen/fonts/jar.inc.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+        content/browser/zen-fonts/JunicodeVF-Italic.woff2                       (../../zen/fonts/JunicodeVF-Italic.woff2)
+        content/browser/zen-fonts/JunicodeVF-Roman.woff2                        (../../zen/fonts/JunicodeVF-Roman.woff2)
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
index 3302a3f4f..1f38cb56a 100644
--- a/src/zen/glance/ZenGlanceManager.mjs
+++ b/src/zen/glance/ZenGlanceManager.mjs
@@ -2,1735 +2,1723 @@
 // 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 { nsZenDOMOperatedFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+
+/**
+ * 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;
+
+  // Click handling
+  #lastLinkClickData = { clientX: 0, clientY: 0, height: 0, width: 0 };
+
+  // Arc animation configuration
+  #ARC_CONFIG = Object.freeze({
+    ARC_STEPS: 70, // Increased for smoother bounce
+    MAX_ARC_HEIGHT: 25,
+    ARC_HEIGHT_RATIO: 0.2, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
+  });
+
+  #GLANCE_ANIMATION_DURATION = Services.prefs.getIntPref('zen.glance.animation-duration') / 1000;
+
+  init() {
+    this.#setupEventListeners();
+    this.#setupPreferences();
+    this.#setupObservers();
+    this.#insertIntoContextMenu();
+  }
+
+  #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
+    );
+  }
+
+  #setupObservers() {
+    Services.obs.addObserver(this, 'quit-application-requested');
+  }
+
+  #insertIntoContextMenu() {
+    const menuitem = document.createXULElement('menuitem');
+    menuitem.setAttribute('id', 'context-zenOpenLinkInGlance');
+    menuitem.setAttribute('hidden', 'true');
+    menuitem.setAttribute('data-l10n-id', 'zen-open-link-in-glance');
+
+    menuitem.addEventListener('command', () => this.openGlance({ url: gContextMenu.linkURL }));
+
+    document.getElementById('context-sep-open').insertAdjacentElement('beforebegin', menuitem);
+  }
+
   /**
-   * Manages the Zen Glance feature - a preview overlay system for tabs
-   * Allows users to preview content without fully opening new tabs
+   * Handle main command set events for glance operations
+   * @param {Event} event - The command event
    */
-  class nsZenGlanceManager extends nsZenDOMOperatedFeature {
-    // Animation state
-    _animating = false;
-    _lazyPref = {};
+  handleMainCommandSet(event) {
+    const command = event.target;
+    const commandHandlers = {
+      cmd_zenGlanceClose: () => this.closeGlance({ onTabClose: true }),
+      cmd_zenGlanceExpand: () => this.fullyOpenGlance(),
+      cmd_zenGlanceSplit: () => this.splitGlance(),
+    };
 
-    // Glance management
-    #glances = new Map();
-    #currentGlanceID = null;
-    #confirmationTimeout = null;
+    const handler = commandHandlers[command.id];
+    if (handler) {
+      handler();
+    }
+  }
 
-    // Animation flags
-    animatingOpen = false;
-    animatingFullOpen = false;
-    closingGlance = false;
-    #duringOpening = false;
-    #ignoreClose = false;
+  /**
+   * Get the current glance browser element
+   * @returns {Browser} The current browser or null
+   */
+  get #currentBrowser() {
+    return this.#glances.get(this.#currentGlanceID)?.browser;
+  }
 
-    // Click handling
-    #lastLinkClickData = { clientX: 0, clientY: 0, height: 0, width: 0 };
+  /**
+   * Get the current glance tab element
+   * @returns {Tab} The current tab or null
+   */
+  get #currentTab() {
+    return this.#glances.get(this.#currentGlanceID)?.tab;
+  }
 
-    // Arc animation configuration
-    #ARC_CONFIG = Object.freeze({
-      ARC_STEPS: 70, // Increased for smoother bounce
-      MAX_ARC_HEIGHT: 25,
-      ARC_HEIGHT_RATIO: 0.2, // Arc height = distance * ratio (capped at MAX_ARC_HEIGHT)
+  /**
+   * 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) {
+    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) {
+    if (topic === 'quit-application-requested') {
+      this.onUnload();
+    }
+  }
+
+  /**
+   * Clean up all glances when the application is unloading
+   */
+  onUnload() {
+    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 = 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,
+    };
+  }
+
+  /**
+   * 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', 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 = glanceId;
+  }
 
-    #GLANCE_ANIMATION_DURATION = Services.prefs.getIntPref('zen.glance.animation-duration') / 1000;
+  /**
+   * 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');
+  }
 
-    init() {
-      this.#setupEventListeners();
-      this.#setupPreferences();
-      this.#setupObservers();
-      this.#insertIntoContextMenu();
-    }
+  /**
+   * Create new overlay buttons with animation
+   * @returns {DocumentFragment} The cloned button template
+   */
+  #createNewOverlayButtons() {
+    const template = document.getElementById('zen-glance-sidebar-template');
+    const newButtons = template.content.cloneNode(true);
+    const container = newButtons.querySelector('.zen-glance-sidebar-container');
 
-    #setupEventListeners() {
-      window.addEventListener('TabClose', this.onTabClose.bind(this));
-      window.addEventListener('TabSelect', this.onLocationChange.bind(this));
+    this.#animateOverlayButtons(container);
+    return newButtons;
+  }
 
-      document
-        .getElementById('tabbrowser-tabpanels')
-        .addEventListener('click', this.onOverlayClick.bind(this));
-    }
+  /**
+   * Animate the overlay buttons entrance
+   * @param {Element} container - The button container
+   */
+  #animateOverlayButtons(container) {
+    container.style.opacity = 0;
 
-    #setupPreferences() {
-      XPCOMUtils.defineLazyPreferenceGetter(
-        this._lazyPref,
-        'SHOULD_OPEN_EXTERNAL_TABS_IN_GLANCE',
-        'zen.glance.open-essential-external-links',
-        false
-      );
-    }
+    const xOffset = gZenVerticalTabsManager._prefsRightSide ? 20 : -20;
 
-    #setupObservers() {
-      Services.obs.addObserver(this, 'quit-application-requested');
-    }
-
-    #insertIntoContextMenu() {
-      const menuitem = document.createXULElement('menuitem');
-      menuitem.setAttribute('id', 'context-zenOpenLinkInGlance');
-      menuitem.setAttribute('hidden', 'true');
-      menuitem.setAttribute('data-l10n-id', 'zen-open-link-in-glance');
-
-      menuitem.addEventListener('command', () => this.openGlance({ url: gContextMenu.linkURL }));
-
-      document.getElementById('context-sep-open').insertAdjacentElement('beforebegin', menuitem);
-    }
-
-    /**
-     * Handle main command set events for glance operations
-     * @param {Event} event - The command event
-     */
-    handleMainCommandSet(event) {
-      const command = event.target;
-      const commandHandlers = {
-        cmd_zenGlanceClose: () => this.closeGlance({ onTabClose: true }),
-        cmd_zenGlanceExpand: () => this.fullyOpenGlance(),
-        cmd_zenGlanceSplit: () => this.splitGlance(),
-      };
-
-      const handler = commandHandlers[command.id];
-      if (handler) {
-        handler();
+    gZenUIManager.motion.animate(
+      container,
+      {
+        opacity: [0, 1],
+        x: [xOffset, 0],
+      },
+      {
+        duration: 0.2,
+        type: 'spring',
+        delay: this.#GLANCE_ANIMATION_DURATION - 0.2,
+        bounce: 0,
       }
+    );
+  }
+
+  /**
+   * 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',
+        undefined
+      )
+    );
+  }
+
+  /**
+   * Set the last link click data
+   * @param {Object} data - The link click data
+   */
+  set lastLinkClickData(data) {
+    this.#lastLinkClickData = data;
+  }
+
+  /**
+   * Get the last link click data
+   * @returns {Object} The last link click data
+   */
+  get lastLinkClickData() {
+    return this.#lastLinkClickData;
+  }
+
+  /**
+   * 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;
     }
 
-    /**
-     * Get the current glance browser element
-     * @returns {Browser} The current browser or null
-     */
-    get #currentBrowser() {
-      return this.#glances.get(this.#currentGlanceID)?.browser;
+    if (gBrowser.selectedTab === this.#currentParentTab) {
+      gBrowser.selectedTab = this.#currentTab;
+      return;
     }
 
-    /**
-     * 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) {
-      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) {
-      if (topic === 'quit-application-requested') {
-        this.onUnload();
-      }
-    }
-
-    /**
-     * Clean up all glances when the application is unloading
-     */
-    onUnload() {
-      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 = 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,
+    if (!data.height || !data.width) {
+      data = {
+        ...data,
+        ...this.lastLinkClickData,
       };
     }
 
-    /**
-     * 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);
+    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) {
+    this.#prepareGlanceAnimation(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) => {
+      // Recalculate location. When opening from pinned tabs,
+      // view splitter doesn't catch if the tab is a glance tab or not.
+      gZenViewSplitter.onLocationChange(browserElement);
+      if (data.width && data.height) {
+        // It is guaranteed that we will animate this opacity later on
+        // when we start animating the glance.
+        this.contentWrapper.style.opacity = 0;
+        data.elementData = await this.#getElementPreviewData(data);
       }
+      this.#glances.get(this.#currentGlanceID).elementData = data.elementData;
+      this.#executeGlanceAnimation(data, browserElement, resolve);
+    });
+  }
 
-      currentTab.querySelector('.tab-content').appendChild(newTab);
-      newTab.setAttribute('zen-glance-tab', true);
-      newTab.setAttribute('glance-id', glanceId);
-      currentTab.setAttribute('glance-id', glanceId);
-    }
+  /**
+   * 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);
 
-    /**
-     * 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 = glanceId;
-    }
+    this.#setupGlancePositioning(data);
+    this.#configureBrowserElement(browserElement);
+  }
 
-    /**
-     * 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');
-    }
+  /**
+   * Animate the parent background
+   */
+  #animateParentBackground() {
+    const parentSidebarContainer = this.#currentParentTab.linkedBrowser.closest(
+      '.browserSidebarContainer'
+    );
 
-    /**
-     * Create new overlay buttons with animation
-     * @returns {DocumentFragment} The cloned button template
-     */
-    #createNewOverlayButtons() {
-      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,
-          type: 'spring',
-          delay: this.#GLANCE_ANIMATION_DURATION - 0.2,
-          bounce: 0,
-        }
-      );
-    }
-
-    /**
-     * 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',
-          undefined
-        )
-      );
-    }
-
-    /**
-     * Set the last link click data
-     * @param {Object} data - The link click data
-     */
-    set lastLinkClickData(data) {
-      this.#lastLinkClickData = data;
-    }
-
-    /**
-     * Get the last link click data
-     * @returns {Object} The last link click data
-     */
-    get lastLinkClickData() {
-      return this.#lastLinkClickData;
-    }
-
-    /**
-     * 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;
+    gZenUIManager.motion.animate(
+      parentSidebarContainer,
+      {
+        scale: [1, 0.98],
+        opacity: [1, 0.4],
+      },
+      {
+        duration: this.#GLANCE_ANIMATION_DURATION,
+        type: 'spring',
+        bounce: 0.2,
       }
+    );
+  }
 
-      if (gBrowser.selectedTab === this.#currentParentTab) {
-        gBrowser.selectedTab = this.#currentTab;
-        return;
+  /**
+   * 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,
+    };
+  }
+
+  #createGlancePreviewElement(src) {
+    const imageDataElement = document.createXULElement('image');
+    imageDataElement.setAttribute('src', src);
+
+    const parent = document.createElement('div');
+    parent.classList.add('zen-glance-element-preview');
+    parent.appendChild(imageDataElement);
+    return parent;
+  }
+
+  /**
+   * 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 = this.#createGlancePreviewElement(data.elementData);
+    this.browserWrapper.prepend(imageDataElement);
+    this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
+
+    gZenUIManager.motion.animate(
+      imageDataElement,
+      {
+        opacity: [1, 0],
+      },
+      {
+        duration: this.#GLANCE_ANIMATION_DURATION / 2,
+        easing: 'easeInOut',
       }
-
-      if (!data.height || !data.width) {
-        data = {
-          ...data,
-          ...this.lastLinkClickData,
-        };
-      }
-
-      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) {
-      this.#prepareGlanceAnimation(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) => {
-        // Recalculate location. When opening from pinned tabs,
-        // view splitter doesn't catch if the tab is a glance tab or not.
-        gZenViewSplitter.onLocationChange(browserElement);
-        if (data.width && data.height) {
-          // It is guaranteed that we will animate this opacity later on
-          // when we start animating the glance.
-          this.contentWrapper.style.opacity = 0;
-          data.elementData = await this.#getElementPreviewData(data);
-        }
-        this.#glances.get(this.#currentGlanceID).elementData = data.elementData;
-        this.#executeGlanceAnimation(data, browserElement, resolve);
-      });
-    }
-
-    /**
-     * 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.#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.4],
-        },
-        {
-          duration: this.#GLANCE_ANIMATION_DURATION,
-          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,
-      };
-    }
-
-    #createGlancePreviewElement(src) {
-      const imageDataElement = document.createXULElement('image');
-      imageDataElement.setAttribute('src', src);
-
-      const parent = document.createElement('div');
-      parent.classList.add('zen-glance-element-preview');
-      parent.appendChild(imageDataElement);
-      return parent;
-    }
-
-    /**
-     * 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 = this.#createGlancePreviewElement(data.elementData);
-      this.browserWrapper.prepend(imageDataElement);
-      this.#glances.get(this.#currentGlanceID).elementImageData = data.elementData;
-
-      gZenUIManager.motion.animate(
-        imageDataElement,
-        {
-          opacity: [1, 0],
-        },
-        {
-          duration: this.#GLANCE_ANIMATION_DURATION / 2,
-          easing: 'easeInOut',
-        }
-      );
-
-      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 } = data;
-      return `${clientX}px ${clientY}px`;
-    }
-
-    /**
-     * 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;
-
-      // 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: this.#GLANCE_ANIMATION_DURATION / 2,
-              easing: 'easeInOut',
-            }
-          )
-          .then(() => {
-            this.contentWrapper.style.opacity = '';
-          });
-      }
-
-      this.#animateParentBackground();
-      gZenUIManager.motion
-        .animate(this.browserWrapper, arcSequence, {
-          duration: gZenUIManager.testingEnabled ? 0 : this.#GLANCE_ANIMATION_DURATION,
-          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: Math.floor(clientX + width / 2),
-          y: Math.floor(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 = 60;
-      if (direction === 'opening') {
-        for (let i = 0; i < bounceSteps; i++) {
-          const progress = i / bounceSteps;
-          // Scale up slightly then back to normal
-          scale = 1 + 0.003 * 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 = '';
-
-      this.browserWrapper.style.height = '100%';
-      this.browserWrapper.style.width = '85%';
-
-      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,
-      hasFocused = false,
-      skipPermitUnload = false,
-    } = {}) {
-      if (!this.#canCloseGlance(onTabClose)) {
-        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');
-        cancelButton.setAttribute('waitconfirmation', true);
-        this.#confirmationTimeout = setTimeout(() => {
-          cancelButton.removeAttribute('waitconfirmation');
-          this.#confirmationTimeout = null;
-        }, 3000);
-        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) {
-      if (this.closingGlance) {
-        return;
-      }
-
-      this.closingGlance = true;
-      this._animating = true;
-
-      gBrowser.moveTabAfter(this.#currentTab, this.#currentParentTab);
-
-      if (onTabClose && gBrowser.tabs.length === 1) {
-        BrowserCommands.openTab();
-        return;
-      }
-
-      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 });
-    }
-
-    /**
-     * Animate sidebar buttons out
-     * @param {Element} sidebarButtons - The sidebar buttons element
-     */
-    #animateSidebarButtons(sidebarButtons) {
-      if (sidebarButtons) {
-        gZenUIManager.motion
-          .animate(
-            sidebarButtons,
-            { opacity: [1, 0] },
-            {
-              duration: 0.2,
-              type: 'spring',
-              bounce: this.#GLANCE_ANIMATION_DURATION - 0.1,
-            }
-          )
-          .then(() => {
-            sidebarButtons.remove();
-          });
-      }
-    }
-
-    #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
-     */
-    #animateParentBackgroundClose(browserSidebarContainer) {
+    );
+
+    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 } = data;
+    return `${clientX}px ${clientY}px`;
+  }
+
+  /**
+   * 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;
+
+    // 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(
-          browserSidebarContainer,
+          this.contentWrapper,
+          { opacity: [0, 1] },
           {
-            scale: [0.98, 1],
-            opacity: [0.4, 1],
-          },
-          {
-            duration: this.#GLANCE_ANIMATION_DURATION / 1.5,
-            type: 'spring',
-            bounce: 0,
+            duration: this.#GLANCE_ANIMATION_DURATION / 2,
+            easing: 'easeInOut',
           }
         )
         .then(() => {
-          this.#clearContainerStyles(browserSidebarContainer);
+          this.contentWrapper.style.opacity = '';
         });
-
-      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, arcSequence, {
-            duration: this.#GLANCE_ANIMATION_DURATION,
-            ease: 'easeOut',
-          })
-          .then(() => {
-            // Remove element preview after closing animation
-            const elementPreview = this.browserWrapper.querySelector('.zen-glance-element-preview');
-            if (elementPreview) {
-              elementPreview.remove();
-            }
-            this.#finalizeGlanceClosing(setNewID, resolve, onTabClose);
-          });
+    this.#animateParentBackground();
+    gZenUIManager.motion
+      .animate(this.browserWrapper, arcSequence, {
+        duration: gZenUIManager.testingEnabled ? 0 : this.#GLANCE_ANIMATION_DURATION,
+        ease: 'easeInOut',
+      })
+      .then(() => {
+        this.#finalizeGlanceOpening(imageDataElement, browserElement, resolve);
       });
-    }
+  }
 
-    /**
-     * 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;
+  /**
+   * 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;
 
-      return {
-        clientX: left - width / 2,
-        clientY: top - height / 2,
+    // 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: Math.floor(clientX + width / 2),
+        y: Math.floor(clientY + height / 2),
         width: width,
         height: height,
       };
     }
 
-    /**
-     * Add element preview if available, used for the closing animation
-     * @param {string} elementImageData - The element image data
-     */
-    #addElementPreview(elementImageData) {
-      if (elementImageData) {
-        const imageDataElement = this.#createGlancePreviewElement(elementImageData);
-        this.browserWrapper.prepend(imageDataElement);
-      }
+    // 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;
     }
 
-    /**
-     * 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) {
-        this.closingGlance = false;
-        return;
-      }
-
-      if (!onTabClose) {
-        this.quickCloseGlance({ clearID: false });
-      }
-      this.overlay.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();
+    function easeOutCubic(t) {
+      return 1 - Math.pow(1 - t, 6);
     }
 
-    /**
-     * 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);
+    // 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);
 
-      if (!this.#currentParentTab.selected) {
-        this.#currentParentTab._visuallySelected = false;
-      }
+      // Calculate size interpolation
+      const currentWidth = startPosition.width + (endPosition.width - startPosition.width) * eased;
+      const currentHeight =
+        startPosition.height + (endPosition.height - startPosition.height) * eased;
 
-      if (gBrowser.selectedTab === lastCurrentTab) {
-        gBrowser.selectedTab = this.#currentParentTab;
-      }
+      // Calculate position on arc
+      const distanceX = endPosition.x - startPosition.x;
+      const distanceY = endPosition.y - startPosition.y;
 
-      if (
-        this.#currentParentTab.linkedBrowser &&
-        !this.#currentParentTab.hasAttribute('split-view')
-      ) {
-        this.#currentParentTab.linkedBrowser.zenModeActive = false;
-      }
+      const x = startPosition.x + distanceX * eased;
+      const y =
+        startPosition.y + distanceY * eased + arcDirection * arcHeight * (1 - (2 * eased - 1) ** 2);
 
-      // Reset overlay references
-      this.browserWrapper = null;
-      this.overlay = null;
-      this.contentWrapper = null;
-
-      lastCurrentTab.removeAttribute('zen-glance-tab');
-
-      this.#ignoreClose = true;
-      lastCurrentTab.dispatchEvent(new Event('GlanceClose', { bubbles: true }));
-      gBrowser.removeTab(lastCurrentTab, { animate: true, skipPermitUnload: true });
-      gBrowser.tabContainer._invalidateCachedTabs();
+      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`);
     }
 
-    /**
-     * 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;
-      // IMPORTANT: #setGlanceStates() must be called before #configureGlanceElements()
-      // to ensure that the glance state is fully set up before configuring the DOM elements.
-      // This order is required to avoid timing/state issues. Do not reorder without understanding the dependencies.
-      this.#setGlanceStates();
-      this.#configureGlanceElements();
-      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;
-      this.#currentBrowser.docShellIsActive = true;
-      this.#currentBrowser.setAttribute('zen-glance-selected', true);
-      this.fillOverlay(this.#currentBrowser);
-      this.#currentParentTab._visuallySelected = true;
-    }
-
-    /**
-     * 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,
-      justAnimateParent = false,
-      clearID = true,
-    } = {}) {
-      const parentHasBrowser = !!this.#currentParentTab.linkedBrowser;
-      const browserContainer = this.#currentParentTab.linkedBrowser.closest(
-        '.browserSidebarContainer'
-      );
-
-      this.#removeParentBackground(parentHasBrowser, browserContainer);
-
-      if (!justAnimateParent && this.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
-     * @param {Tab} prevTab - The previous tab
-     */
-    #onLocationChangeOpenGlance(prevTab) {
-      if (!this.animatingOpen) {
-        this.quickOpenGlance();
-        if (prevTab && prevTab.linkedBrowser) {
-          prevTab.linkedBrowser.docShellIsActive = false;
-          prevTab.linkedBrowser
-            .closest('.browserSidebarContainer')
-            .classList.remove('deck-selected');
+    let scale = 1;
+    const bounceSteps = 60;
+    if (direction === 'opening') {
+      for (let i = 0; i < bounceSteps; i++) {
+        const progress = i / bounceSteps;
+        // Scale up slightly then back to normal
+        scale = 1 + 0.003 * 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]);
       }
     }
 
-    /**
-     * 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;
-      const prevTab = event.detail.previousTab;
+    return sequence;
+  }
 
-      if (this.animatingFullOpen || this.closingGlance) {
-        return;
-      }
+  /**
+   * 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);
+  }
 
-      if (this.#duringOpening || !tab.hasAttribute('glance-id')) {
-        if (this.#currentGlanceID && !this.#duringOpening) {
-          this.quickCloseGlance();
-        }
-        return;
-      }
+  /**
+   * 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);
 
-      if (this.#currentGlanceID && this.#currentGlanceID !== tab.getAttribute('glance-id')) {
-        this.quickCloseGlance();
-      }
+    // Determine if we should arc downward or upward based on available space
+    const shouldArcDownward = availableBottomSpace > availableTopSpace;
 
-      this.#currentGlanceID = tab.getAttribute('glance-id');
-      if (gBrowser.selectedTab === this.#currentTab) {
-        this.#onLocationChangeOpenGlance(prevTab);
-        return;
-      }
-      this.#currentGlanceID = null;
+    // 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();
     }
 
-    /**
-     * Handle tab close events
-     * @param {Event} event - The tab close event
-     */
-    onTabClose(event) {
-      if (event.target === this.#currentParentTab) {
-        this.closeGlance({ onTabClose: true });
-      }
+    this.browserWrapper.style.transformOrigin = '';
+
+    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');
+    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,
+    hasFocused = false,
+    skipPermitUnload = false,
+  } = {}) {
+    if (!this.#canCloseGlance(onTabClose)) {
+      return;
     }
 
-    /**
-     * 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')) {
-        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;
+    if (!skipPermitUnload && !this.#checkPermitUnload()) {
+      return;
     }
 
-    /**
-     * 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;
-        }
+    const browserSidebarContainer = this.#currentParentTab?.linkedBrowser?.closest(
+      '.browserSidebarContainer'
+    );
+    const sidebarButtons = this.browserWrapper.querySelector('.zen-glance-sidebar-container');
 
-        const url1 = tab1.linkedBrowser.currentURI.spec;
-        if (url1.startsWith('about:')) {
-          return true;
-        }
-
-        // Only glance up links that are http(s) or file
-        // https://github.com/zen-browser/desktop/issues/7173
-        const url2Spec = url2.spec;
-        if (!this.#isValidGlanceUrl(url2Spec)) {
-          return false;
-        }
-
-        return Services.io.newURI(url1).host !== url2.host;
-      } catch {
-        return true;
-      }
+    if (this.#handleConfirmationTimeout(onTabClose, hasFocused, sidebarButtons)) {
+      return;
     }
 
-    /**
-     * 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')
-      );
+    this.browserWrapper.removeAttribute('has-finished-animation');
+
+    if (noAnimation) {
+      this.#clearContainerStyles(browserSidebarContainer);
+      this.quickCloseGlance({ closeCurrentTab: false });
+      return;
     }
 
-    /**
-     * 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) {
-      const owner = tab.owner;
+    return this.#animateGlanceClosing(
+      onTabClose,
+      browserSidebarContainer,
+      sidebarButtons,
+      setNewID
+    );
+  }
 
-      return (
-        owner &&
-        owner.pinned &&
-        this._lazyPref.SHOULD_OPEN_EXTERNAL_TABS_IN_GLANCE &&
-        owner.linkedBrowser?.browsingContext?.isAppTab &&
-        this.tabDomainsDiffer(owner, uri) &&
-        Services.prefs.getBoolPref('zen.glance.enabled', true)
-      );
+  /**
+   * 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');
+      cancelButton.setAttribute('waitconfirmation', true);
+      this.#confirmationTimeout = setTimeout(() => {
+        cancelButton.removeAttribute('waitconfirmation');
+        this.#confirmationTimeout = null;
+      }, 3000);
+      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) {
+    if (this.closingGlance) {
+      return;
     }
 
-    /**
-     * Handle tab open events
-     * @param {Browser} browser - The browser element
-     * @param {nsIURI} uri - The URI being opened
-     */
-    onTabOpen(browser, uri) {
-      const tab = gBrowser.getTabForBrowser(browser);
-      if (!tab) {
-        return;
-      }
+    this.closingGlance = true;
+    this._animating = true;
 
-      try {
-        if (this.shouldOpenTabInGlance(tab, uri)) {
-          this.#openGlanceForTab(tab);
-        }
-      } catch (e) {
-        console.error('Error opening glance for tab:', e);
-      }
+    gBrowser.moveTabAfter(this.#currentTab, this.#currentParentTab);
+
+    if (onTabClose && gBrowser.tabs.length === 1) {
+      BrowserCommands.openTab();
+      return;
     }
 
-    /**
-     * Open glance for a specific tab
-     * @param {Tab} tab - The tab to open glance for
-     */
-    #openGlanceForTab(tab) {
-      this.openGlance(
-        {
-          url: undefined,
-        },
-        tab,
-        tab.owner
-      );
-    }
+    this.#prepareGlanceForClosing();
+    this.#animateSidebarButtons(sidebarButtons);
+    this.#animateParentBackgroundClose(browserSidebarContainer);
 
-    /**
-     * Finish opening glance and clean up
-     */
-    finishOpeningGlance() {
-      gBrowser.tabContainer._invalidateCachedTabs();
-      gZenWorkspaces.updateTabsContainers();
-      this.overlay.classList.remove('zen-glance-overlay');
-      this.#clearContainerStyles(this.browserWrapper);
-      this.animatingFullOpen = false;
-      const glanceID = this.#currentGlanceID;
-      this.closeGlance({ noAnimation: true, skipPermitUnload: true });
-      this.#glances.delete(glanceID);
-    }
+    return this.#executeClosingAnimation(setNewID, onTabClose);
+  }
 
-    /**
-     * 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 (!this.#currentGlanceID || !this.#currentTab) {
-        return;
-      }
+  /**
+   * 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 });
+  }
 
-      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);
-      }
-    }
-
-    /**
-     * Prepare tab for full opening
-     */
-    #prepareTabForFullOpen() {
-      this.#currentTab.removeAttribute('zen-glance-tab');
-      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);
-    }
-
-    /**
-     * 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,
-        {
-          width: ['85%', '100%'],
-          height: ['100%', '100%'],
-        },
-        {
-          duration: this.#GLANCE_ANIMATION_DURATION,
-          type: 'spring',
-          bounce: 0,
-        }
-      );
-
-      this.browserWrapper.style.width = '';
-      this.browserWrapper.style.height = '';
-      this.browserWrapper.style.opacity = '';
-      gZenViewSplitter.deactivateCurrentSplitView({ removeDeckSelected: true });
-    }
-
-    /**
-     * 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 (!this.#isActivationKeyPressed(event, activationMethod)) {
-        return;
-      }
-
-      event.preventDefault();
-      event.stopPropagation();
-
-      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);
-      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: left,
-        clientY: top,
-        width: rect.width,
-        height: rect.height,
-      };
-    }
-
-    /**
-     * 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) {
-        return;
-      }
-
-      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;
-        if (parentTab) {
-          return parentTab;
-        }
-      }
-      return tab;
-    }
-
-    /**
-     * Get the tab or its glance child
-     * @param {Tab} tab - The tab to check
-     * @returns {Tab} The tab or its child
-     */
-    getTabOrGlanceChild(tab) {
-      return tab?.glanceTab || 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) {
-      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) {
-        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) {
-      if (!this.#isGlanceEnabledForSearch()) {
-        return;
-      }
-
-      if (where !== 'tab') {
-        return;
-      }
-
-      const currentTab = gBrowser.selectedTab;
-      const parentTab = currentTab.owner;
-
-      if (!parentTab || parentTab.hasAttribute('glance-id')) {
-        return;
-      }
-
-      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,
-          ...clickPosition,
-          width: 0,
-          height: 0,
-        },
-        currentTab,
-        parentTab
-      );
+  /**
+   * Animate sidebar buttons out
+   * @param {Element} sidebarButtons - The sidebar buttons element
+   */
+  #animateSidebarButtons(sidebarButtons) {
+    if (sidebarButtons) {
+      gZenUIManager.motion
+        .animate(
+          sidebarButtons,
+          { opacity: [1, 0] },
+          {
+            duration: 0.2,
+            type: 'spring',
+            bounce: this.#GLANCE_ANIMATION_DURATION - 0.1,
+          }
+        )
+        .then(() => {
+          sidebarButtons.remove();
+        });
     }
   }
 
-  window.gZenGlanceManager = new nsZenGlanceManager();
+  #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
+   */
+  #animateParentBackgroundClose(browserSidebarContainer) {
+    gZenUIManager.motion
+      .animate(
+        browserSidebarContainer,
+        {
+          scale: [0.98, 1],
+          opacity: [0.4, 1],
+        },
+        {
+          duration: this.#GLANCE_ANIMATION_DURATION / 1.5,
+          type: 'spring',
+          bounce: 0,
+        }
+      )
+      .then(() => {
+        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, arcSequence, {
+          duration: this.#GLANCE_ANIMATION_DURATION,
+          ease: 'easeOut',
+        })
+        .then(() => {
+          // Remove element preview after closing animation
+          const elementPreview = this.browserWrapper.querySelector('.zen-glance-element-preview');
+          if (elementPreview) {
+            elementPreview.remove();
+          }
+          this.#finalizeGlanceClosing(setNewID, resolve, onTabClose);
+        });
+    });
+  }
+
+  /**
+   * 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, used for the closing animation
+   * @param {string} elementImageData - The element image data
+   */
+  #addElementPreview(elementImageData) {
+    if (elementImageData) {
+      const imageDataElement = this.#createGlancePreviewElement(elementImageData);
+      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) {
+      this.closingGlance = false;
+      return;
+    }
+
+    if (!onTabClose) {
+      this.quickCloseGlance({ clearID: false });
+    }
+    this.overlay.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');
+
+    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;
+    // IMPORTANT: #setGlanceStates() must be called before #configureGlanceElements()
+    // to ensure that the glance state is fully set up before configuring the DOM elements.
+    // This order is required to avoid timing/state issues. Do not reorder without understanding the dependencies.
+    this.#setGlanceStates();
+    this.#configureGlanceElements();
+    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;
+    this.#currentBrowser.docShellIsActive = true;
+    this.#currentBrowser.setAttribute('zen-glance-selected', true);
+    this.fillOverlay(this.#currentBrowser);
+    this.#currentParentTab._visuallySelected = true;
+  }
+
+  /**
+   * 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,
+    justAnimateParent = false,
+    clearID = true,
+  } = {}) {
+    const parentHasBrowser = !!this.#currentParentTab.linkedBrowser;
+    const browserContainer = this.#currentParentTab.linkedBrowser.closest(
+      '.browserSidebarContainer'
+    );
+
+    this.#removeParentBackground(parentHasBrowser, browserContainer);
+
+    if (!justAnimateParent && this.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
+   * @param {Tab} prevTab - The previous tab
+   */
+  #onLocationChangeOpenGlance(prevTab) {
+    if (!this.animatingOpen) {
+      this.quickOpenGlance();
+      if (prevTab && prevTab.linkedBrowser) {
+        prevTab.linkedBrowser.docShellIsActive = false;
+        prevTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('deck-selected');
+      }
+    }
+  }
+
+  /**
+   * 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;
+    const prevTab = event.detail.previousTab;
+
+    if (this.animatingFullOpen || this.closingGlance) {
+      return;
+    }
+
+    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.#currentTab) {
+      this.#onLocationChangeOpenGlance(prevTab);
+      return;
+    }
+    this.#currentGlanceID = null;
+  }
+
+  /**
+   * 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')) {
+      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;
+      }
+
+      const url1 = tab1.linkedBrowser.currentURI.spec;
+      if (url1.startsWith('about:')) {
+        return true;
+      }
+
+      // Only glance up links that are http(s) or file
+      // https://github.com/zen-browser/desktop/issues/7173
+      const url2Spec = url2.spec;
+      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) {
+    const owner = tab.owner;
+
+    return (
+      owner &&
+      owner.pinned &&
+      this._lazyPref.SHOULD_OPEN_EXTERNAL_TABS_IN_GLANCE &&
+      owner.linkedBrowser?.browsingContext?.isAppTab &&
+      this.tabDomainsDiffer(owner, uri) &&
+      Services.prefs.getBoolPref('zen.glance.enabled', true)
+    );
+  }
+
+  /**
+   * Handle tab open events
+   * @param {Browser} browser - The browser element
+   * @param {nsIURI} uri - The URI being opened
+   */
+  onTabOpen(browser, uri) {
+    const tab = gBrowser.getTabForBrowser(browser);
+    if (!tab) {
+      return;
+    }
+
+    try {
+      if (this.shouldOpenTabInGlance(tab, uri)) {
+        this.#openGlanceForTab(tab);
+      }
+    } catch (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) {
+    this.openGlance(
+      {
+        url: undefined,
+      },
+      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.animatingFullOpen = false;
+    const glanceID = this.#currentGlanceID;
+    this.closeGlance({ noAnimation: true, skipPermitUnload: true });
+    this.#glances.delete(glanceID);
+  }
+
+  /**
+   * 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 (!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);
+    }
+  }
+
+  /**
+   * Prepare tab for full opening
+   */
+  #prepareTabForFullOpen() {
+    this.#currentTab.removeAttribute('zen-glance-tab');
+    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);
+  }
+
+  /**
+   * 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,
+      {
+        width: ['85%', '100%'],
+        height: ['100%', '100%'],
+      },
+      {
+        duration: this.#GLANCE_ANIMATION_DURATION,
+        type: 'spring',
+        bounce: 0,
+      }
+    );
+
+    this.browserWrapper.style.width = '';
+    this.browserWrapper.style.height = '';
+    this.browserWrapper.style.opacity = '';
+    gZenViewSplitter.deactivateCurrentSplitView({ removeDeckSelected: true });
+  }
+
+  /**
+   * 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 (!this.#isActivationKeyPressed(event, activationMethod)) {
+      return;
+    }
+
+    event.preventDefault();
+    event.stopPropagation();
+
+    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);
+    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: left,
+      clientY: top,
+      width: rect.width,
+      height: rect.height,
+    };
+  }
+
+  /**
+   * 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) {
+      return;
+    }
+
+    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;
+      if (parentTab) {
+        return parentTab;
+      }
+    }
+    return tab;
+  }
+
+  /**
+   * Get the tab or its glance child
+   * @param {Tab} tab - The tab to check
+   * @returns {Tab} The tab or its child
+   */
+  getTabOrGlanceChild(tab) {
+    return tab?.glanceTab || 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) {
+    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) {
+      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) {
+    if (!this.#isGlanceEnabledForSearch()) {
+      return;
+    }
+
+    if (where !== 'tab') {
+      return;
+    }
+
+    const currentTab = gBrowser.selectedTab;
+    const parentTab = currentTab.owner;
+
+    if (!parentTab || parentTab.hasAttribute('glance-id')) {
+      return;
+    }
+
+    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,
+        ...clickPosition,
+        width: 0,
+        height: 0,
+      },
+      currentTab,
+      parentTab
+    );
+  }
 }
+
+window.gZenGlanceManager = new nsZenGlanceManager();
diff --git a/src/zen/glance/jar.inc.mn b/src/zen/glance/jar.inc.mn
new file mode 100644
index 000000000..caeadcbe2
--- /dev/null
+++ b/src/zen/glance/jar.inc.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+        content/browser/zen-components/ZenGlanceManager.mjs                     (../../zen/glance/ZenGlanceManager.mjs)
+        content/browser/zen-styles/zen-glance.css                               (../../zen/glance/zen-glance.css)
\ No newline at end of file
diff --git a/src/zen/images/jar.inc.mn b/src/zen/images/jar.inc.mn
new file mode 100644
index 000000000..087e54654
--- /dev/null
+++ b/src/zen/images/jar.inc.mn
@@ -0,0 +1,25 @@
+# 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/.
+
+        content/browser/zen-images/brand-header.svg                             (../../zen/images/brand-header.svg)
+        content/browser/zen-images/layouts/collapsed.png                        (../../zen/images/layouts/collapsed.png)
+        content/browser/zen-images/layouts/multiple-toolbar.png                 (../../zen/images/layouts/multiple-toolbar.png)
+        content/browser/zen-images/layouts/single-toolbar.png                   (../../zen/images/layouts/single-toolbar.png)
+        content/browser/zen-images/grain-bg.png                                 (../../zen/images/grain-bg.png)
+        content/browser/zen-images/note-indicator.svg                           (../../zen/images/note-indicator.svg)
+
+        content/browser/zen-images/downloads/download.svg                       (../../zen/images/downloads/download.svg)
+        content/browser/zen-images/downloads/archive.svg                        (../../zen/images/downloads/archive.svg)
+
+        # FavIcons for startup
+        content/browser/zen-images/favicons/calendar.svg                        (../../zen/images/favicons/calendar.svg)
+        content/browser/zen-images/favicons/discord.svg                         (../../zen/images/favicons/discord.svg)
+        content/browser/zen-images/favicons/figma.svg                           (../../zen/images/favicons/figma.svg)
+        content/browser/zen-images/favicons/github.svg                          (../../zen/images/favicons/github.svg)
+        content/browser/zen-images/favicons/notion.svg                          (../../zen/images/favicons/notion.svg)
+        content/browser/zen-images/favicons/obsidian.svg                        (../../zen/images/favicons/obsidian.svg)
+        content/browser/zen-images/favicons/slack.svg                           (../../zen/images/favicons/slack.svg)
+        content/browser/zen-images/favicons/reddit.svg                          (../../zen/images/favicons/reddit.svg)
+        content/browser/zen-images/favicons/x.svg                               (../../zen/images/favicons/x.svg)
+        content/browser/zen-images/favicons/trello.svg                          (../../zen/images/favicons/trello.svg)
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index 55421898e..d2c6f3d78 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.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 { nsZenMultiWindowFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+
 const KEYCODE_MAP = {
   F1: 'VK_F1',
   F2: 'VK_F2',
@@ -123,7 +125,7 @@ const fixedL10nIds = {
 
 const ZEN_MAIN_KEYSET_ID = 'mainKeyset';
 const ZEN_DEVTOOLS_KEYSET_ID = 'devtoolsKeyset';
-const ZEN_KEYSET_ID = 'zenKeyset';
+window.ZEN_KEYSET_ID = 'zenKeyset';
 
 const ZEN_COMPACT_MODE_SHORTCUTS_GROUP = 'zen-compact-mode';
 const ZEN_WORKSPACE_SHORTCUTS_GROUP = 'zen-workspace';
@@ -1100,7 +1102,7 @@ class nsZenKeyboardShortcutsVersioner {
   }
 }
 
-var gZenKeyboardShortcutsManager = {
+window.gZenKeyboardShortcutsManager = {
   loader: new nsZenKeyboardShortcutsLoader(),
   _hasToLoadDevtools: false,
   _inlineCommands: [],
@@ -1400,7 +1402,7 @@ document.addEventListener(
   'MozBeforeInitialXULLayout',
   () => {
     if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.enabled', false)) {
-      gZenKeyboardShortcutsManager.beforeInit();
+      window.gZenKeyboardShortcutsManager.beforeInit();
     }
   },
   { once: true }
diff --git a/src/zen/kbs/jar.inc.mn b/src/zen/kbs/jar.inc.mn
new file mode 100644
index 000000000..d8b3563d5
--- /dev/null
+++ b/src/zen/kbs/jar.inc.mn
@@ -0,0 +1,5 @@
+# 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/.
+
+        content/browser/zen-components/ZenKeyboardShortcuts.mjs                 (../../zen/kbs/ZenKeyboardShortcuts.mjs)
diff --git a/src/zen/media/ZenMediaController.mjs b/src/zen/media/ZenMediaController.mjs
index 9b3c18ee8..f3566c028 100644
--- a/src/zen/media/ZenMediaController.mjs
+++ b/src/zen/media/ZenMediaController.mjs
@@ -1,688 +1,686 @@
 // 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/.
-{
-  const lazy = {};
-  XPCOMUtils.defineLazyPreferenceGetter(
-    lazy,
-    'RESPECT_PIP_DISABLED',
-    'media.videocontrols.picture-in-picture.respect-disablePictureInPicture',
-    true
-  );
 
-  class nsZenMediaController {
-    _currentMediaController = null;
-    _currentBrowser = null;
-    _mediaUpdateInterval = null;
+const lazy = {};
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  'RESPECT_PIP_DISABLED',
+  'media.videocontrols.picture-in-picture.respect-disablePictureInPicture',
+  true
+);
 
-    mediaTitle = null;
-    mediaArtist = null;
-    mediaControlBar = null;
-    mediaProgressBar = null;
-    mediaCurrentTime = null;
-    mediaDuration = null;
-    mediaFocusButton = null;
-    mediaProgressBarContainer = null;
+class nsZenMediaController {
+  _currentMediaController = null;
+  _currentBrowser = null;
+  _mediaUpdateInterval = null;
 
-    supportedKeys = ['playpause', 'previoustrack', 'nexttrack'];
-    mediaControllersMap = new Map();
+  mediaTitle = null;
+  mediaArtist = null;
+  mediaControlBar = null;
+  mediaProgressBar = null;
+  mediaCurrentTime = null;
+  mediaDuration = null;
+  mediaFocusButton = null;
+  mediaProgressBarContainer = null;
 
-    _tabTimeout = null;
-    _controllerSwitchTimeout = null;
+  supportedKeys = ['playpause', 'previoustrack', 'nexttrack'];
+  mediaControllersMap = new Map();
 
-    #isSeeking = false;
+  _tabTimeout = null;
+  _controllerSwitchTimeout = null;
 
-    init() {
-      if (!Services.prefs.getBoolPref('zen.mediacontrols.enabled', true)) return;
+  #isSeeking = false;
 
-      this.mediaTitle = document.querySelector('#zen-media-title');
-      this.mediaArtist = document.querySelector('#zen-media-artist');
-      this.mediaControlBar = document.querySelector('#zen-media-controls-toolbar');
-      this.mediaProgressBar = document.querySelector('#zen-media-progress-bar');
-      this.mediaCurrentTime = document.querySelector('#zen-media-current-time');
-      this.mediaDuration = document.querySelector('#zen-media-duration');
-      this.mediaFocusButton = document.querySelector('#zen-media-focus-button');
-      this.mediaProgressBarContainer = document.querySelector('#zen-media-progress-hbox');
+  init() {
+    if (!Services.prefs.getBoolPref('zen.mediacontrols.enabled', true)) return;
 
-      this.onPositionstateChange = this._onPositionstateChange.bind(this);
-      this.onPlaybackstateChange = this._onPlaybackstateChange.bind(this);
-      this.onSupportedKeysChange = this._onSupportedKeysChange.bind(this);
-      this.onMetadataChange = this._onMetadataChange.bind(this);
-      this.onDeactivated = this._onDeactivated.bind(this);
-      this.onPipModeChange = this._onPictureInPictureModeChange.bind(this);
+    this.mediaTitle = document.querySelector('#zen-media-title');
+    this.mediaArtist = document.querySelector('#zen-media-artist');
+    this.mediaControlBar = document.querySelector('#zen-media-controls-toolbar');
+    this.mediaProgressBar = document.querySelector('#zen-media-progress-bar');
+    this.mediaCurrentTime = document.querySelector('#zen-media-current-time');
+    this.mediaDuration = document.querySelector('#zen-media-duration');
+    this.mediaFocusButton = document.querySelector('#zen-media-focus-button');
+    this.mediaProgressBarContainer = document.querySelector('#zen-media-progress-hbox');
 
-      this.#initEventListeners();
-    }
+    this.onPositionstateChange = this._onPositionstateChange.bind(this);
+    this.onPlaybackstateChange = this._onPlaybackstateChange.bind(this);
+    this.onSupportedKeysChange = this._onSupportedKeysChange.bind(this);
+    this.onMetadataChange = this._onMetadataChange.bind(this);
+    this.onDeactivated = this._onDeactivated.bind(this);
+    this.onPipModeChange = this._onPictureInPictureModeChange.bind(this);
 
-    #initEventListeners() {
-      this.mediaControlBar.addEventListener('mousedown', (event) => {
-        if (event.target.closest(':is(toolbarbutton,#zen-media-progress-hbox)')) return;
-        else this.onMediaFocus();
-      });
+    this.#initEventListeners();
+  }
 
-      this.mediaControlBar.addEventListener('command', (event) => {
-        const button = event.target.closest('toolbarbutton');
-        if (!button) return;
-        switch (button.id) {
-          case 'zen-media-pip-button':
-            this.onMediaPip();
-            break;
-          case 'zen-media-close-button':
-            this.onControllerClose();
-            break;
-          case 'zen-media-focus-button':
-            this.onMediaFocus();
-            break;
-          case 'zen-media-mute-button':
-            this.onMediaMute();
-            break;
-          case 'zen-media-previoustrack-button':
-            this.onMediaPlayPrev();
-            break;
-          case 'zen-media-nexttrack-button':
-            this.onMediaPlayNext();
-            break;
-          case 'zen-media-playpause-button':
-            this.onMediaToggle();
-            break;
-          case 'zen-media-mute-mic-button':
-            this.onMicrophoneMuteToggle();
-            break;
-          case 'zen-media-mute-camera-button':
-            this.onCameraMuteToggle();
-            break;
-        }
-      });
+  #initEventListeners() {
+    this.mediaControlBar.addEventListener('mousedown', (event) => {
+      if (event.target.closest(':is(toolbarbutton,#zen-media-progress-hbox)')) return;
+      else this.onMediaFocus();
+    });
 
-      this.mediaProgressBar.addEventListener('input', this.onMediaSeekDrag.bind(this));
-      this.mediaProgressBar.addEventListener('change', this.onMediaSeekComplete.bind(this));
-
-      window.addEventListener('TabSelect', (event) => {
-        if (this.isSharing) return;
-
-        const linkedBrowser = event.target.linkedBrowser;
-        this.switchController();
-
-        if (this._currentBrowser) {
-          if (linkedBrowser.browserId === this._currentBrowser.browserId) {
-            if (this._tabTimeout) {
-              clearTimeout(this._tabTimeout);
-              this._tabTimeout = null;
-            }
-
-            this.hideMediaControls();
-          } else {
-            this._tabTimeout = setTimeout(() => {
-              if (!this.mediaControlBar.hasAttribute('pip')) this.showMediaControls();
-              else this._tabTimeout = null;
-            }, 500);
-          }
-        }
-      });
-
-      const onTabDiscardedOrClosed = this.onTabDiscardedOrClosed.bind(this);
-
-      window.addEventListener('TabClose', onTabDiscardedOrClosed);
-      window.addEventListener('TabBrowserDiscarded', onTabDiscardedOrClosed);
-
-      window.addEventListener('DOMAudioPlaybackStarted', (event) => {
-        setTimeout(() => {
-          if (
-            this._currentMediaController?.isPlaying &&
-            this.mediaControlBar.hasAttribute('hidden') &&
-            !this.mediaControlBar.hasAttribute('pip')
-          ) {
-            const { selectedBrowser } = gBrowser;
-            if (selectedBrowser.browserId !== this._currentBrowser.browserId) {
-              this.showMediaControls();
-            }
-          }
-        }, 1000);
-
-        this.activateMediaControls(event.target.browsingContext.mediaController, event.target);
-      });
-
-      window.addEventListener('DOMAudioPlaybackStopped', () => this.updateMuteState());
-    }
-
-    onTabDiscardedOrClosed(event) {
-      const { linkedBrowser } = event.target;
-      const isCurrentBrowser = linkedBrowser?.browserId === this._currentBrowser?.browserId;
-
-      if (isCurrentBrowser) {
-        this.isSharing = false;
-        this.hideMediaControls();
+    this.mediaControlBar.addEventListener('command', (event) => {
+      const button = event.target.closest('toolbarbutton');
+      if (!button) return;
+      switch (button.id) {
+        case 'zen-media-pip-button':
+          this.onMediaPip();
+          break;
+        case 'zen-media-close-button':
+          this.onControllerClose();
+          break;
+        case 'zen-media-focus-button':
+          this.onMediaFocus();
+          break;
+        case 'zen-media-mute-button':
+          this.onMediaMute();
+          break;
+        case 'zen-media-previoustrack-button':
+          this.onMediaPlayPrev();
+          break;
+        case 'zen-media-nexttrack-button':
+          this.onMediaPlayNext();
+          break;
+        case 'zen-media-playpause-button':
+          this.onMediaToggle();
+          break;
+        case 'zen-media-mute-mic-button':
+          this.onMicrophoneMuteToggle();
+          break;
+        case 'zen-media-mute-camera-button':
+          this.onCameraMuteToggle();
+          break;
       }
+    });
 
-      if (linkedBrowser?.browsingContext?.mediaController) {
-        this.deinitMediaController(
-          linkedBrowser.browsingContext.mediaController,
-          true,
-          isCurrentBrowser,
-          true
-        );
-      }
-    }
+    this.mediaProgressBar.addEventListener('input', this.onMediaSeekDrag.bind(this));
+    this.mediaProgressBar.addEventListener('change', this.onMediaSeekComplete.bind(this));
 
-    async deinitMediaController(
-      mediaController,
-      shouldForget = true,
-      shouldOverride = true,
-      shouldHide = true
-    ) {
-      if (shouldForget && mediaController) {
-        mediaController.removeEventListener('pictureinpicturemodechange', this.onPipModeChange);
-        mediaController.removeEventListener('positionstatechange', this.onPositionstateChange);
-        mediaController.removeEventListener('playbackstatechange', this.onPlaybackstateChange);
-        mediaController.removeEventListener('supportedkeyschange', this.onSupportedKeysChange);
-        mediaController.removeEventListener('metadatachange', this.onMetadataChange);
-        mediaController.removeEventListener('deactivated', this.onDeactivated);
+    window.addEventListener('TabSelect', (event) => {
+      if (this.isSharing) return;
 
-        this.mediaControllersMap.delete(mediaController.id);
-      }
-
-      if (shouldOverride) {
-        this._currentMediaController = null;
-        this._currentBrowser = null;
-
-        if (this._mediaUpdateInterval) {
-          clearInterval(this._mediaUpdateInterval);
-          this._mediaUpdateInterval = null;
-        }
-
-        if (shouldHide) await this.hideMediaControls();
-        this.mediaControlBar.removeAttribute('muted');
-        this.mediaControlBar.classList.remove('playing');
-      }
-    }
-
-    get isSharing() {
-      return this.mediaControlBar.hasAttribute('media-sharing');
-    }
-
-    set isSharing(value) {
-      if (this._currentBrowser?.browsingContext && !value) {
-        const webRTC = this._currentBrowser.browsingContext.currentWindowGlobal.getActor('WebRTC');
-        webRTC.sendAsyncMessage('webrtc:UnmuteMicrophone');
-        webRTC.sendAsyncMessage('webrtc:UnmuteCamera');
-      }
-
-      if (!value) {
-        this.mediaControlBar.removeAttribute('mic-muted');
-        this.mediaControlBar.removeAttribute('camera-muted');
-      } else {
-        this.mediaControlBar.setAttribute('media-position-hidden', '');
-        this.mediaControlBar.setAttribute('media-sharing', '');
-      }
-    }
-
-    hideMediaControls() {
-      if (this.mediaControlBar.hasAttribute('hidden')) return;
-
-      return gZenUIManager.motion
-        .animate(
-          this.mediaControlBar,
-          {
-            opacity: [1, 0],
-            y: [0, 10],
-          },
-          {
-            duration: 0.1,
-          }
-        )
-        .then(() => {
-          this.mediaControlBar.setAttribute('hidden', 'true');
-          this.mediaControlBar.removeAttribute('media-sharing');
-          gZenUIManager.updateTabsToolbar();
-        });
-    }
-
-    showMediaControls() {
-      if (!this.mediaControlBar.hasAttribute('hidden')) return;
-
-      if (!this.isSharing) {
-        if (!this._currentMediaController) return;
-        if (this._currentMediaController.isBeingUsedInPIPModeOrFullscreen)
-          return this.hideMediaControls();
-
-        this.updatePipButton();
-      }
-
-      const mediaInfoElements = [this.mediaTitle, this.mediaArtist];
-      for (const element of mediaInfoElements) {
-        element.removeAttribute('overflow'); // So we can properly recalculate the overflow
-      }
-
-      this.mediaControlBar.removeAttribute('hidden');
-      window.requestAnimationFrame(() => {
-        this.mediaControlBar.style.height =
-          this.mediaControlBar.querySelector('toolbaritem').getBoundingClientRect().height + 'px';
-        this.mediaControlBar.style.opacity = 0;
-        gZenUIManager.updateTabsToolbar();
-        gZenUIManager.motion.animate(
-          this.mediaControlBar,
-          {
-            opacity: [0, 1],
-            y: [10, 0],
-          },
-          {}
-        );
-        this.addLabelOverflows(mediaInfoElements);
-      });
-    }
-
-    addLabelOverflows(elements) {
-      for (const element of elements) {
-        const parent = element.parentElement;
-        if (element.scrollWidth > parent.clientWidth) {
-          element.setAttribute('overflow', '');
-        } else {
-          element.removeAttribute('overflow');
-        }
-      }
-    }
-
-    setupMediaController(mediaController, browser) {
-      this._currentMediaController = mediaController;
-      this._currentBrowser = browser;
-
-      this.updatePipButton();
-    }
-
-    setupMediaControlUI(metadata, positionState) {
-      this.updatePipButton();
-
-      if (
-        !this.mediaControlBar.classList.contains('playing') &&
-        this._currentMediaController.isPlaying
-      ) {
-        this.mediaControlBar.classList.add('playing');
-      }
-
-      const iconURL =
-        this._currentBrowser.mIconURL || `page-icon:${this._currentBrowser.currentURI.spec}`;
-      this.mediaFocusButton.style.listStyleImage = `url(${iconURL})`;
-
-      this.mediaTitle.textContent = metadata.title || '';
-      this.mediaArtist.textContent = metadata.artist || '';
-
-      gZenUIManager.updateTabsToolbar();
-
-      this._currentPosition = positionState.position;
-      this._currentDuration = positionState.duration;
-      this._currentPlaybackRate = positionState.playbackRate;
-
-      this.updateMediaPosition();
-
-      for (const key of this.supportedKeys) {
-        const button = this.mediaControlBar.querySelector(`#zen-media-${key}-button`);
-        button.disabled = !this._currentMediaController.supportedKeys.includes(key);
-      }
-    }
-
-    activateMediaControls(mediaController, browser) {
-      this.updateMuteState();
+      const linkedBrowser = event.target.linkedBrowser;
       this.switchController();
 
-      if (!mediaController.isActive || this._currentBrowser?.browserId === browser.browserId)
-        return;
+      if (this._currentBrowser) {
+        if (linkedBrowser.browserId === this._currentBrowser.browserId) {
+          if (this._tabTimeout) {
+            clearTimeout(this._tabTimeout);
+            this._tabTimeout = null;
+          }
 
-      const metadata = mediaController.getMetadata();
-      const positionState = mediaController.getPositionState();
-      this.mediaControllersMap.set(mediaController.id, {
-        controller: mediaController,
-        browser,
-        position: positionState.position,
-        duration: positionState.duration,
-        playbackRate: positionState.playbackRate,
-        lastUpdated: Date.now(),
-      });
-
-      if (!this._currentBrowser && !this.isSharing) {
-        this.setupMediaController(mediaController, browser);
-        this.setupMediaControlUI(metadata, positionState);
-      }
-
-      mediaController.addEventListener('pictureinpicturemodechange', this.onPipModeChange);
-      mediaController.addEventListener('positionstatechange', this.onPositionstateChange);
-      mediaController.addEventListener('playbackstatechange', this.onPlaybackstateChange);
-      mediaController.addEventListener('supportedkeyschange', this.onSupportedKeysChange);
-      mediaController.addEventListener('metadatachange', this.onMetadataChange);
-      mediaController.addEventListener('deactivated', this.onDeactivated);
-    }
-
-    activateMediaDeviceControls(browser) {
-      if (browser?.browsingContext.currentWindowGlobal.hasActivePeerConnections()) {
-        this.mediaControlBar.removeAttribute('can-pip');
-        this._currentBrowser = browser;
-
-        const tab = window.gBrowser.getTabForBrowser(browser);
-        const iconURL = browser.mIconURL || `page-icon:${browser.currentURI.spec}`;
-
-        this.isSharing = true;
-
-        this.mediaFocusButton.style.listStyleImage = `url(${iconURL})`;
-        this.mediaTitle.textContent = tab.label;
-        this.mediaArtist.textContent = '';
-
-        this.showMediaControls();
-      }
-    }
-
-    updateMediaSharing(data) {
-      const { windowId, showCameraIndicator, showMicrophoneIndicator } = data;
-
-      for (const browser of window.gBrowser.browsers) {
-        const isMatch = browser.innerWindowID === windowId;
-        const isCurrentBrowser = this._currentBrowser?.browserId === browser.browserId;
-        const shouldShow = showCameraIndicator || showMicrophoneIndicator;
-
-        if (!isMatch) continue;
-        if (shouldShow && !(isCurrentBrowser && this.isSharing)) {
-          const webRTC = browser.browsingContext.currentWindowGlobal.getActor('WebRTC');
-          webRTC.sendAsyncMessage('webrtc:UnmuteMicrophone');
-          webRTC.sendAsyncMessage('webrtc:UnmuteCamera');
-
-          if (this._currentBrowser) this.isSharing = false;
-          if (this._currentMediaController) {
-            this._currentMediaController.pause();
-            this.deinitMediaController(this._currentMediaController, true, true).then(() =>
-              this.activateMediaDeviceControls(browser)
-            );
-          } else this.activateMediaDeviceControls(browser);
-        } else if (!shouldShow && isCurrentBrowser && this.isSharing) {
-          this.isSharing = false;
-          this._currentBrowser = null;
           this.hideMediaControls();
+        } else {
+          this._tabTimeout = setTimeout(() => {
+            if (!this.mediaControlBar.hasAttribute('pip')) this.showMediaControls();
+            else this._tabTimeout = null;
+          }, 500);
         }
-
-        break;
       }
+    });
+
+    const onTabDiscardedOrClosed = this.onTabDiscardedOrClosed.bind(this);
+
+    window.addEventListener('TabClose', onTabDiscardedOrClosed);
+    window.addEventListener('TabBrowserDiscarded', onTabDiscardedOrClosed);
+
+    window.addEventListener('DOMAudioPlaybackStarted', (event) => {
+      setTimeout(() => {
+        if (
+          this._currentMediaController?.isPlaying &&
+          this.mediaControlBar.hasAttribute('hidden') &&
+          !this.mediaControlBar.hasAttribute('pip')
+        ) {
+          const { selectedBrowser } = gBrowser;
+          if (selectedBrowser.browserId !== this._currentBrowser.browserId) {
+            this.showMediaControls();
+          }
+        }
+      }, 1000);
+
+      this.activateMediaControls(event.target.browsingContext.mediaController, event.target);
+    });
+
+    window.addEventListener('DOMAudioPlaybackStopped', () => this.updateMuteState());
+  }
+
+  onTabDiscardedOrClosed(event) {
+    const { linkedBrowser } = event.target;
+    const isCurrentBrowser = linkedBrowser?.browserId === this._currentBrowser?.browserId;
+
+    if (isCurrentBrowser) {
+      this.isSharing = false;
+      this.hideMediaControls();
     }
 
-    _onDeactivated(event) {
+    if (linkedBrowser?.browsingContext?.mediaController) {
       this.deinitMediaController(
-        event.target,
+        linkedBrowser.browsingContext.mediaController,
         true,
-        event.target.id === this._currentMediaController.id,
+        isCurrentBrowser,
         true
       );
-      this.switchController();
+    }
+  }
+
+  async deinitMediaController(
+    mediaController,
+    shouldForget = true,
+    shouldOverride = true,
+    shouldHide = true
+  ) {
+    if (shouldForget && mediaController) {
+      mediaController.removeEventListener('pictureinpicturemodechange', this.onPipModeChange);
+      mediaController.removeEventListener('positionstatechange', this.onPositionstateChange);
+      mediaController.removeEventListener('playbackstatechange', this.onPlaybackstateChange);
+      mediaController.removeEventListener('supportedkeyschange', this.onSupportedKeysChange);
+      mediaController.removeEventListener('metadatachange', this.onMetadataChange);
+      mediaController.removeEventListener('deactivated', this.onDeactivated);
+
+      this.mediaControllersMap.delete(mediaController.id);
     }
 
-    _onPlaybackstateChange() {
-      if (this._currentMediaController?.isPlaying) {
-        this.mediaControlBar.classList.add('playing');
-      } else {
-        this.switchController();
-        this.mediaControlBar.classList.remove('playing');
-      }
-    }
+    if (shouldOverride) {
+      this._currentMediaController = null;
+      this._currentBrowser = null;
 
-    _onSupportedKeysChange(event) {
-      if (event.target.id !== this._currentMediaController?.id) return;
-      for (const key of this.supportedKeys) {
-        const button = this.mediaControlBar.querySelector(`#zen-media-${key}-button`);
-        button.disabled = !event.target.supportedKeys.includes(key);
-      }
-    }
-
-    _onPositionstateChange(event) {
-      const mediaController = this.mediaControllersMap.get(event.target.id);
-      this.mediaControllersMap.set(event.target.id, {
-        ...mediaController,
-        position: event.position,
-        duration: event.duration,
-        playbackRate: event.playbackRate,
-        lastUpdated: Date.now(),
-      });
-
-      if (event.target.id !== this._currentMediaController?.id) return;
-
-      this._currentPosition = event.position;
-      this._currentDuration = event.duration;
-      this._currentPlaybackRate = event.playbackRate;
-
-      this.updateMediaPosition();
-    }
-
-    switchController(force = false) {
-      let timeout = 3000;
-
-      if (this.isSharing) return;
-      if (this.#isSeeking) return;
-
-      if (this._controllerSwitchTimeout) {
-        clearTimeout(this._controllerSwitchTimeout);
-        this._controllerSwitchTimeout = null;
-      }
-
-      if (this.mediaControllersMap.size === 1) timeout = 0;
-      this._controllerSwitchTimeout = setTimeout(() => {
-        if (!this._currentMediaController?.isPlaying || force) {
-          const nextController = Array.from(this.mediaControllersMap.values())
-            .filter(
-              (ctrl) =>
-                ctrl.controller.isPlaying &&
-                gBrowser.selectedBrowser.browserId !== ctrl.browser.browserId &&
-                ctrl.controller.id !== this._currentMediaController?.id
-            )
-            .sort((a, b) => b.lastUpdated - a.lastUpdated)
-            .shift();
-
-          if (nextController) {
-            this.deinitMediaController(this._currentMediaController, false, true).then(() => {
-              this.setupMediaController(nextController.controller, nextController.browser);
-              const elapsedTime = Math.floor((Date.now() - nextController.lastUpdated) / 1000);
-
-              this.setupMediaControlUI(nextController.controller.getMetadata(), {
-                position:
-                  nextController.position + (nextController.controller.isPlaying ? elapsedTime : 0),
-                duration: nextController.duration,
-                playbackRate: nextController.playbackRate,
-              });
-
-              this.showMediaControls();
-            });
-          }
-        }
-
-        this._controllerSwitchTimeout = null;
-      }, timeout);
-    }
-
-    updateMediaPosition() {
       if (this._mediaUpdateInterval) {
         clearInterval(this._mediaUpdateInterval);
         this._mediaUpdateInterval = null;
       }
 
-      if (this._currentDuration >= 900_000)
-        return this.mediaControlBar.setAttribute('media-position-hidden', 'true');
-      else this.mediaControlBar.removeAttribute('media-position-hidden');
-
-      if (!this._currentDuration) return;
-
-      this.mediaCurrentTime.textContent = this.formatSecondsToTime(this._currentPosition);
-      this.mediaDuration.textContent = this.formatSecondsToTime(this._currentDuration);
-      this.mediaProgressBar.value = (this._currentPosition / this._currentDuration) * 100;
-
-      this._mediaUpdateInterval = setInterval(() => {
-        if (this._currentMediaController?.isPlaying) {
-          this._currentPosition += 1 * this._currentPlaybackRate;
-          if (this._currentPosition > this._currentDuration) {
-            this._currentPosition = this._currentDuration;
-          }
-          this.mediaCurrentTime.textContent = this.formatSecondsToTime(this._currentPosition);
-          this.mediaProgressBar.value = (this._currentPosition / this._currentDuration) * 100;
-        } else {
-          clearInterval(this._mediaUpdateInterval);
-          this._mediaUpdateInterval = null;
-        }
-      }, 1000);
-    }
-
-    formatSecondsToTime(seconds) {
-      if (!seconds || isNaN(seconds)) return '0:00';
-
-      const totalSeconds = Math.max(0, Math.ceil(seconds));
-      const hours = Math.floor(totalSeconds / 3600);
-      const minutes = Math.floor((totalSeconds % 3600) / 60).toString();
-      const secs = (totalSeconds % 60).toString();
-
-      if (hours > 0) {
-        return `${hours}:${minutes.padStart(2, '0')}:${secs.padStart(2, '0')}`;
-      }
-
-      return `${minutes}:${secs.padStart(2, '0')}`;
-    }
-
-    _onMetadataChange(event) {
-      if (event.target.id !== this._currentMediaController?.id) return;
-      this.updatePipButton();
-
-      const metadata = event.target.getMetadata();
-      this.mediaTitle.textContent = metadata.title || '';
-      this.mediaArtist.textContent = metadata.artist || '';
-
-      const mediaInfoElements = [this.mediaTitle, this.mediaArtist];
-      for (const element of mediaInfoElements) {
-        element.removeAttribute('overflow');
-      }
-
-      this.addLabelOverflows(mediaInfoElements);
-    }
-
-    _onPictureInPictureModeChange(event) {
-      if (event.target.id !== this._currentMediaController?.id) return;
-      if (event.target.isBeingUsedInPIPModeOrFullscreen) {
-        this.hideMediaControls();
-        this.mediaControlBar.setAttribute('pip', '');
-      } else {
-        const { selectedBrowser } = gBrowser;
-        if (selectedBrowser.browserId !== this._currentBrowser.browserId) {
-          this.showMediaControls();
-        }
-
-        this.mediaControlBar.removeAttribute('pip');
-      }
-    }
-
-    onMediaPlayPrev() {
-      if (this._currentMediaController?.supportedKeys.includes('previoustrack')) {
-        this._currentMediaController.prevTrack();
-      }
-    }
-
-    onMediaPlayNext() {
-      if (this._currentMediaController?.supportedKeys.includes('nexttrack')) {
-        this._currentMediaController.nextTrack();
-      }
-    }
-
-    onMediaSeekDrag(event) {
-      this.#isSeeking = true;
-
-      this._currentMediaController?.pause();
-      const newTime = (event.target.value / 100) * this._currentDuration;
-      this.mediaCurrentTime.textContent = this.formatSecondsToTime(newTime);
-    }
-
-    onMediaSeekComplete(event) {
-      const newPosition = (event.target.value / 100) * this._currentDuration;
-      if (this._currentMediaController?.supportedKeys.includes('seekto')) {
-        this._currentMediaController.seekTo(newPosition);
-        this._currentMediaController.play();
-      }
-
-      this.#isSeeking = false;
-    }
-
-    onMediaFocus() {
-      if (!this._currentBrowser) return;
-
-      if (this._currentMediaController) this._currentMediaController.focus();
-      else if (this._currentBrowser) {
-        const tab = window.gBrowser.getTabForBrowser(this._currentBrowser);
-        if (tab) window.gZenWorkspaces.switchTabIfNeeded(tab);
-      }
-    }
-
-    onMediaMute() {
-      const tab = window.gBrowser.getTabForBrowser(this._currentBrowser);
-      if (tab) {
-        tab.toggleMuteAudio();
-        this.updateMuteState();
-      }
-    }
-
-    onMediaToggle() {
-      if (this.mediaControlBar.classList.contains('playing')) {
-        this._currentMediaController?.pause();
-      } else {
-        this._currentMediaController?.play();
-      }
-    }
-
-    onControllerClose() {
-      if (this._currentMediaController) {
-        this._currentMediaController.pause();
-        this.deinitMediaController(this._currentMediaController);
-      } else if (this.isSharing) this.isSharing = false;
-
-      this.hideMediaControls();
-      this.switchController(true);
-    }
-
-    onMediaPip() {
-      this._currentBrowser.browsingContext.currentWindowGlobal
-        .getActor('PictureInPictureLauncher')
-        .sendAsyncMessage('PictureInPicture:KeyToggle');
-    }
-
-    onMicrophoneMuteToggle() {
-      if (this._currentBrowser) {
-        const shouldMute = this.mediaControlBar.hasAttribute('mic-muted')
-          ? 'webrtc:UnmuteMicrophone'
-          : 'webrtc:MuteMicrophone';
-
-        this._currentBrowser.browsingContext.currentWindowGlobal
-          .getActor('WebRTC')
-          .sendAsyncMessage(shouldMute);
-        this.mediaControlBar.toggleAttribute('mic-muted');
-      }
-    }
-
-    onCameraMuteToggle() {
-      if (this._currentBrowser) {
-        const shouldMute = this.mediaControlBar.hasAttribute('camera-muted')
-          ? 'webrtc:UnmuteCamera'
-          : 'webrtc:MuteCamera';
-
-        this._currentBrowser.browsingContext.currentWindowGlobal
-          .getActor('WebRTC')
-          .sendAsyncMessage(shouldMute);
-        this.mediaControlBar.toggleAttribute('camera-muted');
-      }
-    }
-
-    updateMuteState() {
-      if (!this._currentBrowser) return;
-      this.mediaControlBar.toggleAttribute('muted', this._currentBrowser.audioMuted);
-    }
-
-    updatePipButton() {
-      if (!this._currentBrowser) return;
-      if (this.isSharing) return;
-
-      const { totalPipCount, totalPipDisabled } = PictureInPicture.getEligiblePipVideoCount(
-        this._currentBrowser
-      );
-      const canPip = totalPipCount === 1 || (totalPipDisabled > 0 && lazy.RESPECT_PIP_DISABLED);
-
-      this.mediaControlBar.toggleAttribute('can-pip', canPip);
+      if (shouldHide) await this.hideMediaControls();
+      this.mediaControlBar.removeAttribute('muted');
+      this.mediaControlBar.classList.remove('playing');
     }
   }
 
-  window.gZenMediaController = new nsZenMediaController();
+  get isSharing() {
+    return this.mediaControlBar.hasAttribute('media-sharing');
+  }
+
+  set isSharing(value) {
+    if (this._currentBrowser?.browsingContext && !value) {
+      const webRTC = this._currentBrowser.browsingContext.currentWindowGlobal.getActor('WebRTC');
+      webRTC.sendAsyncMessage('webrtc:UnmuteMicrophone');
+      webRTC.sendAsyncMessage('webrtc:UnmuteCamera');
+    }
+
+    if (!value) {
+      this.mediaControlBar.removeAttribute('mic-muted');
+      this.mediaControlBar.removeAttribute('camera-muted');
+    } else {
+      this.mediaControlBar.setAttribute('media-position-hidden', '');
+      this.mediaControlBar.setAttribute('media-sharing', '');
+    }
+  }
+
+  hideMediaControls() {
+    if (this.mediaControlBar.hasAttribute('hidden')) return;
+
+    return gZenUIManager.motion
+      .animate(
+        this.mediaControlBar,
+        {
+          opacity: [1, 0],
+          y: [0, 10],
+        },
+        {
+          duration: 0.1,
+        }
+      )
+      .then(() => {
+        this.mediaControlBar.setAttribute('hidden', 'true');
+        this.mediaControlBar.removeAttribute('media-sharing');
+        gZenUIManager.updateTabsToolbar();
+      });
+  }
+
+  showMediaControls() {
+    if (!this.mediaControlBar.hasAttribute('hidden')) return;
+
+    if (!this.isSharing) {
+      if (!this._currentMediaController) return;
+      if (this._currentMediaController.isBeingUsedInPIPModeOrFullscreen)
+        return this.hideMediaControls();
+
+      this.updatePipButton();
+    }
+
+    const mediaInfoElements = [this.mediaTitle, this.mediaArtist];
+    for (const element of mediaInfoElements) {
+      element.removeAttribute('overflow'); // So we can properly recalculate the overflow
+    }
+
+    this.mediaControlBar.removeAttribute('hidden');
+    window.requestAnimationFrame(() => {
+      this.mediaControlBar.style.height =
+        this.mediaControlBar.querySelector('toolbaritem').getBoundingClientRect().height + 'px';
+      this.mediaControlBar.style.opacity = 0;
+      gZenUIManager.updateTabsToolbar();
+      gZenUIManager.motion.animate(
+        this.mediaControlBar,
+        {
+          opacity: [0, 1],
+          y: [10, 0],
+        },
+        {}
+      );
+      this.addLabelOverflows(mediaInfoElements);
+    });
+  }
+
+  addLabelOverflows(elements) {
+    for (const element of elements) {
+      const parent = element.parentElement;
+      if (element.scrollWidth > parent.clientWidth) {
+        element.setAttribute('overflow', '');
+      } else {
+        element.removeAttribute('overflow');
+      }
+    }
+  }
+
+  setupMediaController(mediaController, browser) {
+    this._currentMediaController = mediaController;
+    this._currentBrowser = browser;
+
+    this.updatePipButton();
+  }
+
+  setupMediaControlUI(metadata, positionState) {
+    this.updatePipButton();
+
+    if (
+      !this.mediaControlBar.classList.contains('playing') &&
+      this._currentMediaController.isPlaying
+    ) {
+      this.mediaControlBar.classList.add('playing');
+    }
+
+    const iconURL =
+      this._currentBrowser.mIconURL || `page-icon:${this._currentBrowser.currentURI.spec}`;
+    this.mediaFocusButton.style.listStyleImage = `url(${iconURL})`;
+
+    this.mediaTitle.textContent = metadata.title || '';
+    this.mediaArtist.textContent = metadata.artist || '';
+
+    gZenUIManager.updateTabsToolbar();
+
+    this._currentPosition = positionState.position;
+    this._currentDuration = positionState.duration;
+    this._currentPlaybackRate = positionState.playbackRate;
+
+    this.updateMediaPosition();
+
+    for (const key of this.supportedKeys) {
+      const button = this.mediaControlBar.querySelector(`#zen-media-${key}-button`);
+      button.disabled = !this._currentMediaController.supportedKeys.includes(key);
+    }
+  }
+
+  activateMediaControls(mediaController, browser) {
+    this.updateMuteState();
+    this.switchController();
+
+    if (!mediaController.isActive || this._currentBrowser?.browserId === browser.browserId) return;
+
+    const metadata = mediaController.getMetadata();
+    const positionState = mediaController.getPositionState();
+    this.mediaControllersMap.set(mediaController.id, {
+      controller: mediaController,
+      browser,
+      position: positionState.position,
+      duration: positionState.duration,
+      playbackRate: positionState.playbackRate,
+      lastUpdated: Date.now(),
+    });
+
+    if (!this._currentBrowser && !this.isSharing) {
+      this.setupMediaController(mediaController, browser);
+      this.setupMediaControlUI(metadata, positionState);
+    }
+
+    mediaController.addEventListener('pictureinpicturemodechange', this.onPipModeChange);
+    mediaController.addEventListener('positionstatechange', this.onPositionstateChange);
+    mediaController.addEventListener('playbackstatechange', this.onPlaybackstateChange);
+    mediaController.addEventListener('supportedkeyschange', this.onSupportedKeysChange);
+    mediaController.addEventListener('metadatachange', this.onMetadataChange);
+    mediaController.addEventListener('deactivated', this.onDeactivated);
+  }
+
+  activateMediaDeviceControls(browser) {
+    if (browser?.browsingContext.currentWindowGlobal.hasActivePeerConnections()) {
+      this.mediaControlBar.removeAttribute('can-pip');
+      this._currentBrowser = browser;
+
+      const tab = window.gBrowser.getTabForBrowser(browser);
+      const iconURL = browser.mIconURL || `page-icon:${browser.currentURI.spec}`;
+
+      this.isSharing = true;
+
+      this.mediaFocusButton.style.listStyleImage = `url(${iconURL})`;
+      this.mediaTitle.textContent = tab.label;
+      this.mediaArtist.textContent = '';
+
+      this.showMediaControls();
+    }
+  }
+
+  updateMediaSharing(data) {
+    const { windowId, showCameraIndicator, showMicrophoneIndicator } = data;
+
+    for (const browser of window.gBrowser.browsers) {
+      const isMatch = browser.innerWindowID === windowId;
+      const isCurrentBrowser = this._currentBrowser?.browserId === browser.browserId;
+      const shouldShow = showCameraIndicator || showMicrophoneIndicator;
+
+      if (!isMatch) continue;
+      if (shouldShow && !(isCurrentBrowser && this.isSharing)) {
+        const webRTC = browser.browsingContext.currentWindowGlobal.getActor('WebRTC');
+        webRTC.sendAsyncMessage('webrtc:UnmuteMicrophone');
+        webRTC.sendAsyncMessage('webrtc:UnmuteCamera');
+
+        if (this._currentBrowser) this.isSharing = false;
+        if (this._currentMediaController) {
+          this._currentMediaController.pause();
+          this.deinitMediaController(this._currentMediaController, true, true).then(() =>
+            this.activateMediaDeviceControls(browser)
+          );
+        } else this.activateMediaDeviceControls(browser);
+      } else if (!shouldShow && isCurrentBrowser && this.isSharing) {
+        this.isSharing = false;
+        this._currentBrowser = null;
+        this.hideMediaControls();
+      }
+
+      break;
+    }
+  }
+
+  _onDeactivated(event) {
+    this.deinitMediaController(
+      event.target,
+      true,
+      event.target.id === this._currentMediaController.id,
+      true
+    );
+    this.switchController();
+  }
+
+  _onPlaybackstateChange() {
+    if (this._currentMediaController?.isPlaying) {
+      this.mediaControlBar.classList.add('playing');
+    } else {
+      this.switchController();
+      this.mediaControlBar.classList.remove('playing');
+    }
+  }
+
+  _onSupportedKeysChange(event) {
+    if (event.target.id !== this._currentMediaController?.id) return;
+    for (const key of this.supportedKeys) {
+      const button = this.mediaControlBar.querySelector(`#zen-media-${key}-button`);
+      button.disabled = !event.target.supportedKeys.includes(key);
+    }
+  }
+
+  _onPositionstateChange(event) {
+    const mediaController = this.mediaControllersMap.get(event.target.id);
+    this.mediaControllersMap.set(event.target.id, {
+      ...mediaController,
+      position: event.position,
+      duration: event.duration,
+      playbackRate: event.playbackRate,
+      lastUpdated: Date.now(),
+    });
+
+    if (event.target.id !== this._currentMediaController?.id) return;
+
+    this._currentPosition = event.position;
+    this._currentDuration = event.duration;
+    this._currentPlaybackRate = event.playbackRate;
+
+    this.updateMediaPosition();
+  }
+
+  switchController(force = false) {
+    let timeout = 3000;
+
+    if (this.isSharing) return;
+    if (this.#isSeeking) return;
+
+    if (this._controllerSwitchTimeout) {
+      clearTimeout(this._controllerSwitchTimeout);
+      this._controllerSwitchTimeout = null;
+    }
+
+    if (this.mediaControllersMap.size === 1) timeout = 0;
+    this._controllerSwitchTimeout = setTimeout(() => {
+      if (!this._currentMediaController?.isPlaying || force) {
+        const nextController = Array.from(this.mediaControllersMap.values())
+          .filter(
+            (ctrl) =>
+              ctrl.controller.isPlaying &&
+              gBrowser.selectedBrowser.browserId !== ctrl.browser.browserId &&
+              ctrl.controller.id !== this._currentMediaController?.id
+          )
+          .sort((a, b) => b.lastUpdated - a.lastUpdated)
+          .shift();
+
+        if (nextController) {
+          this.deinitMediaController(this._currentMediaController, false, true).then(() => {
+            this.setupMediaController(nextController.controller, nextController.browser);
+            const elapsedTime = Math.floor((Date.now() - nextController.lastUpdated) / 1000);
+
+            this.setupMediaControlUI(nextController.controller.getMetadata(), {
+              position:
+                nextController.position + (nextController.controller.isPlaying ? elapsedTime : 0),
+              duration: nextController.duration,
+              playbackRate: nextController.playbackRate,
+            });
+
+            this.showMediaControls();
+          });
+        }
+      }
+
+      this._controllerSwitchTimeout = null;
+    }, timeout);
+  }
+
+  updateMediaPosition() {
+    if (this._mediaUpdateInterval) {
+      clearInterval(this._mediaUpdateInterval);
+      this._mediaUpdateInterval = null;
+    }
+
+    if (this._currentDuration >= 900_000)
+      return this.mediaControlBar.setAttribute('media-position-hidden', 'true');
+    else this.mediaControlBar.removeAttribute('media-position-hidden');
+
+    if (!this._currentDuration) return;
+
+    this.mediaCurrentTime.textContent = this.formatSecondsToTime(this._currentPosition);
+    this.mediaDuration.textContent = this.formatSecondsToTime(this._currentDuration);
+    this.mediaProgressBar.value = (this._currentPosition / this._currentDuration) * 100;
+
+    this._mediaUpdateInterval = setInterval(() => {
+      if (this._currentMediaController?.isPlaying) {
+        this._currentPosition += 1 * this._currentPlaybackRate;
+        if (this._currentPosition > this._currentDuration) {
+          this._currentPosition = this._currentDuration;
+        }
+        this.mediaCurrentTime.textContent = this.formatSecondsToTime(this._currentPosition);
+        this.mediaProgressBar.value = (this._currentPosition / this._currentDuration) * 100;
+      } else {
+        clearInterval(this._mediaUpdateInterval);
+        this._mediaUpdateInterval = null;
+      }
+    }, 1000);
+  }
+
+  formatSecondsToTime(seconds) {
+    if (!seconds || isNaN(seconds)) return '0:00';
+
+    const totalSeconds = Math.max(0, Math.ceil(seconds));
+    const hours = Math.floor(totalSeconds / 3600);
+    const minutes = Math.floor((totalSeconds % 3600) / 60).toString();
+    const secs = (totalSeconds % 60).toString();
+
+    if (hours > 0) {
+      return `${hours}:${minutes.padStart(2, '0')}:${secs.padStart(2, '0')}`;
+    }
+
+    return `${minutes}:${secs.padStart(2, '0')}`;
+  }
+
+  _onMetadataChange(event) {
+    if (event.target.id !== this._currentMediaController?.id) return;
+    this.updatePipButton();
+
+    const metadata = event.target.getMetadata();
+    this.mediaTitle.textContent = metadata.title || '';
+    this.mediaArtist.textContent = metadata.artist || '';
+
+    const mediaInfoElements = [this.mediaTitle, this.mediaArtist];
+    for (const element of mediaInfoElements) {
+      element.removeAttribute('overflow');
+    }
+
+    this.addLabelOverflows(mediaInfoElements);
+  }
+
+  _onPictureInPictureModeChange(event) {
+    if (event.target.id !== this._currentMediaController?.id) return;
+    if (event.target.isBeingUsedInPIPModeOrFullscreen) {
+      this.hideMediaControls();
+      this.mediaControlBar.setAttribute('pip', '');
+    } else {
+      const { selectedBrowser } = gBrowser;
+      if (selectedBrowser.browserId !== this._currentBrowser.browserId) {
+        this.showMediaControls();
+      }
+
+      this.mediaControlBar.removeAttribute('pip');
+    }
+  }
+
+  onMediaPlayPrev() {
+    if (this._currentMediaController?.supportedKeys.includes('previoustrack')) {
+      this._currentMediaController.prevTrack();
+    }
+  }
+
+  onMediaPlayNext() {
+    if (this._currentMediaController?.supportedKeys.includes('nexttrack')) {
+      this._currentMediaController.nextTrack();
+    }
+  }
+
+  onMediaSeekDrag(event) {
+    this.#isSeeking = true;
+
+    this._currentMediaController?.pause();
+    const newTime = (event.target.value / 100) * this._currentDuration;
+    this.mediaCurrentTime.textContent = this.formatSecondsToTime(newTime);
+  }
+
+  onMediaSeekComplete(event) {
+    const newPosition = (event.target.value / 100) * this._currentDuration;
+    if (this._currentMediaController?.supportedKeys.includes('seekto')) {
+      this._currentMediaController.seekTo(newPosition);
+      this._currentMediaController.play();
+    }
+
+    this.#isSeeking = false;
+  }
+
+  onMediaFocus() {
+    if (!this._currentBrowser) return;
+
+    if (this._currentMediaController) this._currentMediaController.focus();
+    else if (this._currentBrowser) {
+      const tab = window.gBrowser.getTabForBrowser(this._currentBrowser);
+      if (tab) window.gZenWorkspaces.switchTabIfNeeded(tab);
+    }
+  }
+
+  onMediaMute() {
+    const tab = window.gBrowser.getTabForBrowser(this._currentBrowser);
+    if (tab) {
+      tab.toggleMuteAudio();
+      this.updateMuteState();
+    }
+  }
+
+  onMediaToggle() {
+    if (this.mediaControlBar.classList.contains('playing')) {
+      this._currentMediaController?.pause();
+    } else {
+      this._currentMediaController?.play();
+    }
+  }
+
+  onControllerClose() {
+    if (this._currentMediaController) {
+      this._currentMediaController.pause();
+      this.deinitMediaController(this._currentMediaController);
+    } else if (this.isSharing) this.isSharing = false;
+
+    this.hideMediaControls();
+    this.switchController(true);
+  }
+
+  onMediaPip() {
+    this._currentBrowser.browsingContext.currentWindowGlobal
+      .getActor('PictureInPictureLauncher')
+      .sendAsyncMessage('PictureInPicture:KeyToggle');
+  }
+
+  onMicrophoneMuteToggle() {
+    if (this._currentBrowser) {
+      const shouldMute = this.mediaControlBar.hasAttribute('mic-muted')
+        ? 'webrtc:UnmuteMicrophone'
+        : 'webrtc:MuteMicrophone';
+
+      this._currentBrowser.browsingContext.currentWindowGlobal
+        .getActor('WebRTC')
+        .sendAsyncMessage(shouldMute);
+      this.mediaControlBar.toggleAttribute('mic-muted');
+    }
+  }
+
+  onCameraMuteToggle() {
+    if (this._currentBrowser) {
+      const shouldMute = this.mediaControlBar.hasAttribute('camera-muted')
+        ? 'webrtc:UnmuteCamera'
+        : 'webrtc:MuteCamera';
+
+      this._currentBrowser.browsingContext.currentWindowGlobal
+        .getActor('WebRTC')
+        .sendAsyncMessage(shouldMute);
+      this.mediaControlBar.toggleAttribute('camera-muted');
+    }
+  }
+
+  updateMuteState() {
+    if (!this._currentBrowser) return;
+    this.mediaControlBar.toggleAttribute('muted', this._currentBrowser.audioMuted);
+  }
+
+  updatePipButton() {
+    if (!this._currentBrowser) return;
+    if (this.isSharing) return;
+
+    const { totalPipCount, totalPipDisabled } = PictureInPicture.getEligiblePipVideoCount(
+      this._currentBrowser
+    );
+    const canPip = totalPipCount === 1 || (totalPipDisabled > 0 && lazy.RESPECT_PIP_DISABLED);
+
+    this.mediaControlBar.toggleAttribute('can-pip', canPip);
+  }
 }
+
+window.gZenMediaController = new nsZenMediaController();
diff --git a/src/zen/media/jar.inc.mn b/src/zen/media/jar.inc.mn
new file mode 100644
index 000000000..41aa8b311
--- /dev/null
+++ b/src/zen/media/jar.inc.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+        content/browser/zen-components/ZenMediaController.mjs                   (../../zen/media/ZenMediaController.mjs)
+        content/browser/zen-styles/zen-media-controls.css                       (../../zen/media/zen-media-controls.css)
diff --git a/src/zen/media/zen-media-controls.css b/src/zen/media/zen-media-controls.css
index e3e1e451f..4358a1609 100644
--- a/src/zen/media/zen-media-controls.css
+++ b/src/zen/media/zen-media-controls.css
@@ -9,8 +9,8 @@
   --button-spacing: 2px;
 
   display: flex;
-  justify-content: space-between;
   min-width: 0;
+  justify-content: space-between;
   background: transparent;
   container-type: inline-size;
 
@@ -151,11 +151,6 @@
   }
 
   & > toolbaritem {
-    --zen-media-control-bg: color-mix(
-      in srgb,
-      var(--zen-primary-color) 15%,
-      light-dark(white, black)
-    );
     flex-grow: 1;
     padding: 0;
     transition: padding 0.3s ease-out;
@@ -164,8 +159,8 @@
     bottom: 0;
     padding: 4px 6px;
     border-radius: var(--border-radius-medium);
-    box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
-    background-color: var(--zen-media-control-bg);
+    box-shadow: var(--zen-sidebar-notification-shadow);
+    background-color: var(--zen-sidebar-notification-bg);
     width: 100%;
   }
 
@@ -239,14 +234,14 @@
   overflow-x: visible;
   white-space: nowrap;
   /* Overflow inner box shadow from the left to simulate overflow */
-  mask-image: linear-gradient(to left, transparent, var(--zen-media-control-bg) 0.6em);
+  mask-image: linear-gradient(to left, transparent, var(--zen-sidebar-notification-bg) 0.6em);
   min-width: 1px;
 
   &::before {
     content: '';
     position: absolute;
     width: 0.6em;
-    background: linear-gradient(to right, var(--zen-media-control-bg) 0%, transparent 100%);
+    background: linear-gradient(to right, var(--zen-sidebar-notification-bg) 0%, transparent 100%);
     pointer-events: none;
     top: 6px;
     left: 0;
diff --git a/src/zen/mods/ZenMods.mjs b/src/zen/mods/ZenMods.mjs
index 762a2c826..49eab0b31 100644
--- a/src/zen/mods/ZenMods.mjs
+++ b/src/zen/mods/ZenMods.mjs
@@ -2,72 +2,438 @@
 // 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 nsZenMods extends nsZenPreloadedFeature {
-    // private properties start
-    #kZenStylesheetModHeader = '/* Zen Mods - Generated by ZenMods.';
-    #kZenStylesheetModHeaderBody = `* DO NOT EDIT THIS FILE DIRECTLY!
+import {
+  nsZenPreloadedFeature,
+  nsZenMultiWindowFeature,
+} from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+
+class nsZenMods extends nsZenPreloadedFeature {
+  // private properties start
+  #kZenStylesheetModHeader = '/* Zen Mods - Generated by ZenMods.';
+  #kZenStylesheetModHeaderBody = `* DO NOT EDIT THIS FILE DIRECTLY!
 * Your changes will be overwritten.
 * Instead, go to the preferences and edit the mods there.
 */
 `;
-    #kZenStylesheetModFooter = `
+  #kZenStylesheetModFooter = `
 /* End of Zen Mods */
 `;
-    #getCurrentDateTime = () =>
-      new Intl.DateTimeFormat('en-US', {
-        dateStyle: 'full',
-        timeStyle: 'full',
-      }).format(new Date().getTime());
+  #getCurrentDateTime = () =>
+    new Intl.DateTimeFormat('en-US', {
+      dateStyle: 'full',
+      timeStyle: 'full',
+    }).format(new Date().getTime());
 
-    constructor() {
-      super();
+  constructor() {
+    super();
+  }
+
+  // Stylesheet service
+  #_modsBackend = null;
+
+  get #modsBackend() {
+    if (!this.#_modsBackend) {
+      this.#_modsBackend = Cc['@mozilla.org/zen/mods-backend;1'].getService(Ci.nsIZenModsBackend);
     }
+    return this.#_modsBackend;
+  }
 
-    // Stylesheet service
-    #_modsBackend = null;
+  get #styleSheetPath() {
+    return PathUtils.join(PathUtils.profileDir, 'chrome', 'zen-themes.css');
+  }
 
-    get #modsBackend() {
-      if (!this.#_modsBackend) {
-        this.#_modsBackend = Cc['@mozilla.org/zen/mods-backend;1'].getService(Ci.nsIZenModsBackend);
+  async #handleDisableMods() {
+    await this.#rebuildModsStylesheet();
+  }
+
+  #getStylesheetPathForMod(mod) {
+    return PathUtils.join(this.getModFolder(mod.id), 'chrome.css');
+  }
+
+  async #readStylesheet() {
+    const path = this.modsRootPath;
+    if (!(await IOUtils.exists(path))) {
+      return '';
+    }
+    return await IOUtils.readUTF8(this.#styleSheetPath);
+  }
+
+  async #insertStylesheet() {
+    try {
+      const content = await this.#readStylesheet();
+      this.#modsBackend.rebuildModsStyles(content);
+    } catch (e) {
+      console.warn('[ZenMods]: Error rebuilding mods styles:', e);
+    }
+  }
+
+  async #rebuildModsStylesheet() {
+    const mods = await this.#getEnabledMods();
+
+    await this.#writeStylesheet(mods);
+
+    const modsWithPreferences = await Promise.all(
+      mods.map(async (mod) => {
+        const preferences = await this.getModPreferences(mod);
+
+        return {
+          name: mod.name,
+          enabled: mod.enabled,
+          preferences,
+        };
+      })
+    );
+
+    this.#setDefaults(modsWithPreferences);
+    this.#writeToDom(modsWithPreferences);
+
+    await this.#insertStylesheet();
+  }
+
+  async #getEnabledMods() {
+    if (Services.prefs.getBoolPref('zen.themes.disable-all', false)) {
+      console.log('[ZenMods]: Mods are disabled by user preference.');
+      return [];
+    }
+    const modsObject = await this.getMods();
+    const mods = Object.values(modsObject).filter(
+      (mod) => mod.enabled === undefined || mod.enabled
+    );
+
+    const modList = mods.map(({ name }) => name).join(', ');
+
+    const message =
+      modList !== ''
+        ? `[ZenMods]: Loading enabled Zen mods: ${modList}.`
+        : '[ZenMods]: No enabled Zen mods.';
+
+    console.log(message);
+
+    return mods;
+  }
+
+  #setDefaults(modsWithPreferences) {
+    for (const { preferences, enabled } of modsWithPreferences) {
+      if (enabled !== undefined && !enabled) {
+        continue;
       }
-      return this.#_modsBackend;
-    }
 
-    get #styleSheetPath() {
-      return PathUtils.join(PathUtils.profileDir, 'chrome', 'zen-themes.css');
-    }
+      for (const { type, property, defaultValue } of preferences) {
+        if (defaultValue === undefined) {
+          continue;
+        }
 
-    async #handleDisableMods() {
-      await this.#rebuildModsStylesheet();
-    }
+        const getProperty =
+          type === 'checkbox' ? Services.prefs.getBoolPref : Services.prefs.getStringPref;
+        const setProperty =
+          type === 'checkbox' ? Services.prefs.setBoolPref : Services.prefs.setStringPref;
 
-    #getStylesheetPathForMod(mod) {
-      return PathUtils.join(this.getModFolder(mod.id), 'chrome.css');
-    }
+        try {
+          getProperty(property);
+        } catch {
+          console.debug(
+            `[ZenMods]: Setting default value for ${property} to ${defaultValue} (${typeof defaultValue})`
+          );
 
-    async #readStylesheet() {
-      const path = this.modsRootPath;
-      if (!(await IOUtils.exists(path))) {
-        return '';
+          if (
+            typeof defaultValue !== 'boolean' &&
+            typeof defaultValue !== 'string' &&
+            typeof defaultValue !== 'number'
+          ) {
+            console.warn(
+              `[ZenMods]: Warning, invalid data type received (${typeof defaultValue}), skipping.`
+            );
+            continue;
+          }
+
+          setProperty(
+            property,
+            typeof defaultValue === 'boolean' ? defaultValue : defaultValue.toString()
+          );
+        }
       }
-      return await IOUtils.readUTF8(this.#styleSheetPath);
+    }
+  }
+
+  #writeToDom(modsWithPreferences) {
+    for (const browser of nsZenMultiWindowFeature.browsers) {
+      for (const { enabled, preferences, name } of modsWithPreferences) {
+        const sanitizedName = this.sanitizeModName(name);
+
+        if (enabled !== undefined && !enabled) {
+          const element = browser.document.getElementById(sanitizedName);
+
+          if (element) {
+            element.remove();
+          }
+
+          for (const { property } of preferences.filter(({ type }) => type !== 'checkbox')) {
+            const sanitizedProperty = property?.replaceAll(/\./g, '-');
+
+            browser.document.querySelector(':root').style.removeProperty(`--${sanitizedProperty}`);
+          }
+
+          continue;
+        }
+
+        for (const { property, type } of preferences) {
+          const value = Services.prefs.getStringPref(property, '');
+          const sanitizedProperty = property?.replaceAll(/\./g, '-');
+
+          switch (type) {
+            case 'dropdown': {
+              if (value !== '') {
+                let element = browser.document.getElementById(sanitizedName);
+
+                if (!element) {
+                  element = browser.document.createElement('div');
+
+                  element.style.display = 'none';
+                  element.setAttribute('id', sanitizedName);
+
+                  browser.document.body.appendChild(element);
+                }
+
+                element.setAttribute(sanitizedProperty, value);
+              }
+              break;
+            }
+
+            case 'string': {
+              if (value === '') {
+                browser.document
+                  .querySelector(':root')
+                  .style.removeProperty(`--${sanitizedProperty}`);
+              } else {
+                browser.document
+                  .querySelector(':root')
+                  .style.setProperty(`--${sanitizedProperty}`, value);
+              }
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  async #writeStylesheet(modList = []) {
+    const mods = [];
+
+    for (let mod of modList) {
+      mod._filePath = this.#getStylesheetPathForMod(mod);
+      mods.push(mod);
     }
 
-    async #insertStylesheet() {
+    let content = this.#kZenStylesheetModHeader;
+    content += `\n* FILE GENERATED AT: ${this.#getCurrentDateTime()}\n`;
+    content += this.#kZenStylesheetModHeaderBody;
+
+    for (let mod of mods) {
+      if (mod.enabled !== undefined && !mod.enabled) {
+        continue;
+      }
+
+      content += `\n/* Name: ${mod.name} */\n`;
+      content += `/* Description: ${mod.description} */\n`;
+      content += `/* Author: @${mod.author} */\n`;
+
+      if (mod._readmeURL) {
+        content += `/* Readme: ${mod.readme} */\n`;
+      }
+
+      const chromeContent = await IOUtils.readUTF8(mod._filePath);
+      content += chromeContent;
+    }
+
+    content += this.#kZenStylesheetModFooter;
+
+    const buffer = new TextEncoder().encode(content);
+
+    await IOUtils.write(this.#styleSheetPath, buffer);
+  }
+
+  #compareVersions(version1, version2) {
+    let result = false;
+
+    if (typeof version1 !== 'object') {
+      version1 = version1.toString().split('.');
+    }
+
+    if (typeof version2 !== 'object') {
+      version2 = version2.toString().split('.');
+    }
+
+    for (let i = 0; i < Math.max(version1.length, version2.length); i++) {
+      if (version1[i] == undefined) {
+        version1[i] = 0;
+      }
+      if (version2[i] == undefined) {
+        version2[i] = 0;
+      }
+      if (Number(version1[i]) < Number(version2[i])) {
+        result = true;
+        break;
+      }
+      if (version1[i] != version2[i]) {
+        break;
+      }
+    }
+    return result;
+  }
+
+  #composeModApiUrl(modId) {
+    // keeping theme here as it would require changes to CI to change the name
+    return `https://zen-browser.github.io/theme-store/themes/${modId}/theme.json`;
+  }
+
+  /* eslint-disable no-unused-vars */
+  async #downloadUrlToFile(url, path, isStyleSheet = false, maxRetries = 3, retryDelayMs = 500) {
+    let attempt = 0;
+
+    while (attempt < maxRetries) {
       try {
-        const content = await this.#readStylesheet();
-        this.#modsBackend.rebuildModsStyles(content);
+        const response = await fetch(url);
+
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status} for url: ${url}`);
+        }
+
+        const data = await response.text();
+
+        // convert the data into a Uint8Array
+        const buffer = new TextEncoder().encode(data);
+        await IOUtils.write(path, buffer);
+
+        return; // to exit the loop
       } catch (e) {
-        console.warn('[ZenMods]: Error rebuilding mods styles:', e);
+        attempt++;
+        if (attempt >= maxRetries) {
+          console.error('[ZenMods]: Error downloading file after retries', url, e);
+        } else {
+          console.warn(
+            `[ZenMods]: Download failed (attempt ${attempt} of ${maxRetries}), retrying in ${retryDelayMs}ms...`,
+            url,
+            e
+          );
+          await new Promise((res) => setTimeout(res, retryDelayMs));
+        }
       }
     }
+  }
 
-    async #rebuildModsStylesheet() {
+  // private properties end
+
+  // public properties start
+
+  throttle(mainFunction, delay) {
+    let timerFlag = null;
+
+    return (...args) => {
+      if (timerFlag === null) {
+        mainFunction(...args);
+        timerFlag = setTimeout(() => {
+          timerFlag = null;
+        }, delay);
+      }
+    };
+  }
+
+  debounce(mainFunction, wait) {
+    let timerFlag;
+
+    return (...args) => {
+      clearTimeout(timerFlag);
+      timerFlag = setTimeout(() => {
+        mainFunction(...args);
+      }, wait);
+    };
+  }
+
+  sanitizeModName(name) {
+    // Do not change to "mod-" for backwards compatibility
+    return `theme-${name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-Za-z_-]+/g, '')}`;
+  }
+
+  get updatePref() {
+    return 'zen.mods.updated-value-observer';
+  }
+
+  get modsRootPath() {
+    return PathUtils.join(PathUtils.profileDir, 'chrome', 'zen-themes');
+  }
+
+  get modsDataFile() {
+    return PathUtils.join(PathUtils.profileDir, 'zen-themes.json');
+  }
+
+  getModFolder(modId) {
+    return PathUtils.join(this.modsRootPath, modId);
+  }
+
+  async getMods() {
+    if (!(await IOUtils.exists(this.modsDataFile))) {
+      await IOUtils.writeJSON(this.modsDataFile, {});
+
+      return {};
+    }
+
+    let mods = {};
+
+    try {
+      mods = await IOUtils.readJSON(this.modsDataFile);
+
+      if (mods === null || typeof mods !== 'object') {
+        throw new Error('Mods data file is invalid');
+      }
+    } catch {
+      // If we have a corrupted file, reset it
+      await IOUtils.writeJSON(this.modsDataFile, {});
+
+      Services.wm
+        .getMostRecentWindow('navigator:browser')
+        .gZenUIManager.showToast('zen-themes-corrupted', {
+          timeout: 8000,
+        });
+    }
+
+    return mods;
+  }
+
+  async getModPreferences(mod) {
+    const modPath = PathUtils.join(this.modsRootPath, mod.id, 'preferences.json');
+
+    if (!(await IOUtils.exists(modPath)) || !mod.preferences) {
+      return [];
+    }
+
+    try {
+      const preferences = await IOUtils.readJSON(modPath);
+
+      return preferences.filter(({ disabledOn = [] }) => {
+        return !disabledOn.includes(gZenOperatingSystemCommonUtils.currentOperatingSystem);
+      });
+    } catch (e) {
+      console.error(`[ZenMods]: Error reading mod preferences for ${mod.name}:`, e);
+      return [];
+    }
+  }
+
+  async init() {
+    try {
+      await SessionStore.promiseInitialized;
+
+      if (
+        Services.prefs.getBoolPref('zen.themes.disable-all', false) ||
+        Services.appinfo.inSafeMode
+      ) {
+        console.log('[ZenMods]: Mods disabled by user or in safe mode.');
+        return;
+      }
+
+      await this.getMods(); // Check for any errors in the themes data file
       const mods = await this.#getEnabledMods();
 
-      await this.#writeStylesheet(mods);
-
       const modsWithPreferences = await Promise.all(
         mods.map(async (mod) => {
           const preferences = await this.getModPreferences(mod);
@@ -80,591 +446,216 @@
         })
       );
 
-      this.#setDefaults(modsWithPreferences);
       this.#writeToDom(modsWithPreferences);
 
       await this.#insertStylesheet();
-    }
 
-    async #getEnabledMods() {
-      if (Services.prefs.getBoolPref('zen.themes.disable-all', false)) {
-        console.log('[ZenMods]: Mods are disabled by user preference.');
-        return [];
-      }
-      const modsObject = await this.getMods();
-      const mods = Object.values(modsObject).filter(
-        (mod) => mod.enabled === undefined || mod.enabled
-      );
-
-      const modList = mods.map(({ name }) => name).join(', ');
-
-      const message =
-        modList !== ''
-          ? `[ZenMods]: Loading enabled Zen mods: ${modList}.`
-          : '[ZenMods]: No enabled Zen mods.';
-
-      console.log(message);
-
-      return mods;
-    }
-
-    #setDefaults(modsWithPreferences) {
-      for (const { preferences, enabled } of modsWithPreferences) {
-        if (enabled !== undefined && !enabled) {
-          continue;
-        }
-
-        for (const { type, property, defaultValue } of preferences) {
-          if (defaultValue === undefined) {
-            continue;
-          }
-
-          const getProperty =
-            type === 'checkbox' ? Services.prefs.getBoolPref : Services.prefs.getStringPref;
-          const setProperty =
-            type === 'checkbox' ? Services.prefs.setBoolPref : Services.prefs.setStringPref;
-
-          try {
-            getProperty(property);
-          } catch {
-            console.debug(
-              `[ZenMods]: Setting default value for ${property} to ${defaultValue} (${typeof defaultValue})`
-            );
-
-            if (
-              typeof defaultValue !== 'boolean' &&
-              typeof defaultValue !== 'string' &&
-              typeof defaultValue !== 'number'
-            ) {
-              console.warn(
-                `[ZenMods]: Warning, invalid data type received (${typeof defaultValue}), skipping.`
-              );
-              continue;
+      this.#setNewMilestoneIfNeeded();
+      if (this.#shouldAutoUpdate()) {
+        requestIdleCallback(
+          () => {
+            if (!window.closed) {
+              requestAnimationFrame(() => {
+                this.checkForModsUpdates();
+              });
             }
-
-            setProperty(
-              property,
-              typeof defaultValue === 'boolean' ? defaultValue : defaultValue.toString()
-            );
-          }
-        }
-      }
-    }
-
-    #writeToDom(modsWithPreferences) {
-      for (const browser of nsZenMultiWindowFeature.browsers) {
-        for (const { enabled, preferences, name } of modsWithPreferences) {
-          const sanitizedName = this.sanitizeModName(name);
-
-          if (enabled !== undefined && !enabled) {
-            const element = browser.document.getElementById(sanitizedName);
-
-            if (element) {
-              element.remove();
-            }
-
-            for (const { property } of preferences.filter(({ type }) => type !== 'checkbox')) {
-              const sanitizedProperty = property?.replaceAll(/\./g, '-');
-
-              browser.document
-                .querySelector(':root')
-                .style.removeProperty(`--${sanitizedProperty}`);
-            }
-
-            continue;
-          }
-
-          for (const { property, type } of preferences) {
-            const value = Services.prefs.getStringPref(property, '');
-            const sanitizedProperty = property?.replaceAll(/\./g, '-');
-
-            switch (type) {
-              case 'dropdown': {
-                if (value !== '') {
-                  let element = browser.document.getElementById(sanitizedName);
-
-                  if (!element) {
-                    element = browser.document.createElement('div');
-
-                    element.style.display = 'none';
-                    element.setAttribute('id', sanitizedName);
-
-                    browser.document.body.appendChild(element);
-                  }
-
-                  element.setAttribute(sanitizedProperty, value);
-                }
-                break;
-              }
-
-              case 'string': {
-                if (value === '') {
-                  browser.document
-                    .querySelector(':root')
-                    .style.removeProperty(`--${sanitizedProperty}`);
-                } else {
-                  browser.document
-                    .querySelector(':root')
-                    .style.setProperty(`--${sanitizedProperty}`, value);
-                }
-                break;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    async #writeStylesheet(modList = []) {
-      const mods = [];
-
-      for (let mod of modList) {
-        mod._filePath = this.#getStylesheetPathForMod(mod);
-        mods.push(mod);
-      }
-
-      let content = this.#kZenStylesheetModHeader;
-      content += `\n* FILE GENERATED AT: ${this.#getCurrentDateTime()}\n`;
-      content += this.#kZenStylesheetModHeaderBody;
-
-      for (let mod of mods) {
-        if (mod.enabled !== undefined && !mod.enabled) {
-          continue;
-        }
-
-        content += `\n/* Name: ${mod.name} */\n`;
-        content += `/* Description: ${mod.description} */\n`;
-        content += `/* Author: @${mod.author} */\n`;
-
-        if (mod._readmeURL) {
-          content += `/* Readme: ${mod.readme} */\n`;
-        }
-
-        const chromeContent = await IOUtils.readUTF8(mod._filePath);
-        content += chromeContent;
-      }
-
-      content += this.#kZenStylesheetModFooter;
-
-      const buffer = new TextEncoder().encode(content);
-
-      await IOUtils.write(this.#styleSheetPath, buffer);
-    }
-
-    #compareVersions(version1, version2) {
-      let result = false;
-
-      if (typeof version1 !== 'object') {
-        version1 = version1.toString().split('.');
-      }
-
-      if (typeof version2 !== 'object') {
-        version2 = version2.toString().split('.');
-      }
-
-      for (let i = 0; i < Math.max(version1.length, version2.length); i++) {
-        if (version1[i] == undefined) {
-          version1[i] = 0;
-        }
-        if (version2[i] == undefined) {
-          version2[i] = 0;
-        }
-        if (Number(version1[i]) < Number(version2[i])) {
-          result = true;
-          break;
-        }
-        if (version1[i] != version2[i]) {
-          break;
-        }
-      }
-      return result;
-    }
-
-    #composeModApiUrl(modId) {
-      // keeping theme here as it would require changes to CI to change the name
-      return `https://zen-browser.github.io/theme-store/themes/${modId}/theme.json`;
-    }
-
-    /* eslint-disable no-unused-vars */
-    async #downloadUrlToFile(url, path, isStyleSheet = false, maxRetries = 3, retryDelayMs = 500) {
-      let attempt = 0;
-
-      while (attempt < maxRetries) {
-        try {
-          const response = await fetch(url);
-
-          if (!response.ok) {
-            throw new Error(`HTTP error! status: ${response.status} for url: ${url}`);
-          }
-
-          const data = await response.text();
-
-          // convert the data into a Uint8Array
-          const buffer = new TextEncoder().encode(data);
-          await IOUtils.write(path, buffer);
-
-          return; // to exit the loop
-        } catch (e) {
-          attempt++;
-          if (attempt >= maxRetries) {
-            console.error('[ZenMods]: Error downloading file after retries', url, e);
-          } else {
-            console.warn(
-              `[ZenMods]: Download failed (attempt ${attempt} of ${maxRetries}), retrying in ${retryDelayMs}ms...`,
-              url,
-              e
-            );
-            await new Promise((res) => setTimeout(res, retryDelayMs));
-          }
-        }
-      }
-    }
-
-    // private properties end
-
-    // public properties start
-
-    throttle(mainFunction, delay) {
-      let timerFlag = null;
-
-      return (...args) => {
-        if (timerFlag === null) {
-          mainFunction(...args);
-          timerFlag = setTimeout(() => {
-            timerFlag = null;
-          }, delay);
-        }
-      };
-    }
-
-    debounce(mainFunction, wait) {
-      let timerFlag;
-
-      return (...args) => {
-        clearTimeout(timerFlag);
-        timerFlag = setTimeout(() => {
-          mainFunction(...args);
-        }, wait);
-      };
-    }
-
-    sanitizeModName(name) {
-      // Do not change to "mod-" for backwards compatibility
-      return `theme-${name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-Za-z_-]+/g, '')}`;
-    }
-
-    get updatePref() {
-      return 'zen.mods.updated-value-observer';
-    }
-
-    get modsRootPath() {
-      return PathUtils.join(PathUtils.profileDir, 'chrome', 'zen-themes');
-    }
-
-    get modsDataFile() {
-      return PathUtils.join(PathUtils.profileDir, 'zen-themes.json');
-    }
-
-    getModFolder(modId) {
-      return PathUtils.join(this.modsRootPath, modId);
-    }
-
-    async getMods() {
-      if (!(await IOUtils.exists(this.modsDataFile))) {
-        await IOUtils.writeJSON(this.modsDataFile, {});
-
-        return {};
-      }
-
-      let mods = {};
-
-      try {
-        mods = await IOUtils.readJSON(this.modsDataFile);
-
-        if (mods === null || typeof mods !== 'object') {
-          throw new Error('Mods data file is invalid');
-        }
-      } catch {
-        // If we have a corrupted file, reset it
-        await IOUtils.writeJSON(this.modsDataFile, {});
-
-        Services.wm
-          .getMostRecentWindow('navigator:browser')
-          .gZenUIManager.showToast('zen-themes-corrupted', {
-            timeout: 8000,
-          });
-      }
-
-      return mods;
-    }
-
-    async getModPreferences(mod) {
-      const modPath = PathUtils.join(this.modsRootPath, mod.id, 'preferences.json');
-
-      if (!(await IOUtils.exists(modPath)) || !mod.preferences) {
-        return [];
-      }
-
-      try {
-        const preferences = await IOUtils.readJSON(modPath);
-
-        return preferences.filter(({ disabledOn = [] }) => {
-          return !disabledOn.includes(gZenOperatingSystemCommonUtils.currentOperatingSystem);
-        });
-      } catch (e) {
-        console.error(`[ZenMods]: Error reading mod preferences for ${mod.name}:`, e);
-        return [];
-      }
-    }
-
-    async init() {
-      try {
-        await SessionStore.promiseInitialized;
-
-        if (
-          Services.prefs.getBoolPref('zen.themes.disable-all', false) ||
-          Services.appinfo.inSafeMode
-        ) {
-          console.log('[ZenMods]: Mods disabled by user or in safe mode.');
-          return;
-        }
-
-        await this.getMods(); // Check for any errors in the themes data file
-        const mods = await this.#getEnabledMods();
-
-        const modsWithPreferences = await Promise.all(
-          mods.map(async (mod) => {
-            const preferences = await this.getModPreferences(mod);
-
-            return {
-              name: mod.name,
-              enabled: mod.enabled,
-              preferences,
-            };
-          })
+          },
+          { timeout: 1000 }
         );
-
-        this.#writeToDom(modsWithPreferences);
-
-        await this.#insertStylesheet();
-
-        this.#setNewMilestoneIfNeeded();
-        if (this.#shouldAutoUpdate()) {
-          requestIdleCallback(
-            () => {
-              if (!window.closed) {
-                requestAnimationFrame(() => {
-                  this.checkForModsUpdates();
-                });
-              }
-            },
-            { timeout: 1000 }
-          );
-        }
-      } catch (e) {
-        console.error('[ZenMods]: Error loading Zen Mods:', e);
       }
-
-      Services.prefs.addObserver(this.updatePref, this.#rebuildModsStylesheet.bind(this), false);
-      Services.prefs.addObserver(
-        'zen.themes.disable-all',
-        this.#handleDisableMods.bind(this),
-        false
-      );
+    } catch (e) {
+      console.error('[ZenMods]: Error loading Zen Mods:', e);
     }
 
-    #setNewMilestoneIfNeeded() {
-      const previousMilestone = Services.prefs.getStringPref('zen.mods.milestone', '');
-      if (previousMilestone != Services.appinfo.version) {
-        Services.prefs.setStringPref('zen.mods.milestone', Services.appinfo.version);
-        Services.prefs.clearUserPref('zen.mods.last-update');
-      }
-    }
-
-    #shouldAutoUpdate() {
-      const daysBeforeUpdate = Services.prefs.getIntPref('zen.mods.auto-update-days');
-      const lastUpdatedSec = Services.prefs.getIntPref('zen.mods.last-update', -1);
-      const nowSec = Math.floor(Date.now() / 1000);
-      const daysSinceUpdate = (nowSec - lastUpdatedSec) / (60 * 60 * 24);
-
-      return (
-        (Services.prefs.getBoolPref('zen.mods.auto-update', true) &&
-          daysSinceUpdate >= daysBeforeUpdate) ||
-        lastUpdatedSec < 0
-      );
-    }
-
-    async checkForModsUpdates() {
-      const mods = await this.getMods();
-
-      const updates = await Promise.all(
-        Object.values(mods).map(async (currentMod) => {
-          try {
-            const possibleNewModVersion = await this.requestMod(currentMod.id);
-
-            if (!possibleNewModVersion) {
-              return null;
-            }
-
-            if (
-              !this.#compareVersions(
-                possibleNewModVersion.version,
-                currentMod.version ?? '0.0.0'
-              ) &&
-              possibleNewModVersion.version != currentMod.version
-            ) {
-              console.log(
-                `[ZenMods]: Mod update found for mod ${currentMod.name} (${currentMod.id}), current: ${currentMod.version}, new: ${possibleNewModVersion.version}`
-              );
-
-              possibleNewModVersion.enabled = currentMod.enabled;
-
-              await this.removeMod(currentMod.id, false);
-
-              mods[currentMod.id] = possibleNewModVersion;
-
-              return possibleNewModVersion;
-            }
-
-            return null;
-          } catch (e) {
-            console.error('[ZenMods]: Error checking for mod updates', e);
-
-            return null;
-          }
-        })
-      );
-
-      await this.updateMods(mods);
-      Services.prefs.setIntPref('zen.mods.last-update', Math.floor(Date.now() / 1000));
-      return updates.filter((update) => {
-        return update !== null;
-      });
-    }
-
-    async removeMod(modId, triggerUpdate = true) {
-      const modPath = this.getModFolder(modId);
-
-      console.log(`[ZenMods]: Removing mod ${modPath}`);
-
-      await IOUtils.remove(modPath, { recursive: true, ignoreAbsent: true });
-
-      const mods = await this.getMods();
-
-      delete mods[modId];
-
-      await IOUtils.writeJSON(this.modsDataFile, mods);
-
-      if (triggerUpdate) {
-        this.triggerModsUpdate();
-      }
-    }
-
-    async enableMod(modId) {
-      const mods = await this.getMods();
-      const mod = mods[modId];
-
-      console.log(`[ZenMods]: Enabling mod ${mod.name}`);
-
-      mod.enabled = true;
-
-      await IOUtils.writeJSON(this.modsDataFile, mods);
-    }
-
-    async disableMod(modId) {
-      const mods = await this.getMods();
-      const mod = mods[modId];
-
-      console.log(`[ZenMods]: Disabling mod ${mod.name}`);
-
-      mod.enabled = false;
-
-      await IOUtils.writeJSON(this.modsDataFile, mods);
-    }
-
-    async updateMods(mods = undefined) {
-      if (!mods) {
-        mods = await this.getMods();
-      }
-
-      await IOUtils.writeJSON(this.modsDataFile, mods);
-      await this.checkForModChanges();
-    }
-
-    triggerModsUpdate() {
-      Services.prefs.setBoolPref(this.updatePref, !Services.prefs.getBoolPref(this.updatePref));
-    }
-
-    async installMod(mod) {
-      try {
-        const modPath = PathUtils.join(this.modsRootPath, mod.id);
-        await IOUtils.makeDirectory(modPath, { ignoreExisting: true });
-
-        await this.#downloadUrlToFile(mod.style, PathUtils.join(modPath, 'chrome.css'), true);
-        await this.#downloadUrlToFile(mod.readme, PathUtils.join(modPath, 'readme.md'));
-
-        if (mod.preferences) {
-          await this.#downloadUrlToFile(
-            mod.preferences,
-            PathUtils.join(modPath, 'preferences.json')
-          );
-        }
-      } catch (e) {
-        console.error('[ZenMods]: Error installing mod', mod.id, e);
-      }
-    }
-
-    async checkForModChanges() {
-      const mods = await this.getMods();
-
-      for (const [modId, mod] of Object.entries(mods)) {
-        try {
-          if (!mod) {
-            continue;
-          }
-
-          if (!(await IOUtils.exists(this.getModFolder(modId)))) {
-            await this.installMod(mod);
-          }
-        } catch (e) {
-          console.error('[ZenMods]: Error checking for mod changes', e);
-        }
-      }
-
-      this.triggerModsUpdate();
-    }
-
-    async requestMod(modId) {
-      const url = this.#composeModApiUrl(modId);
-
-      console.debug(`[ZenMods]: Fetching mod ${modId} info from ${url}`);
-
-      const data = await fetch(url, {
-        mode: 'no-cors',
-      });
-
-      if (data.ok) {
-        try {
-          const obj = await data.json();
-
-          return obj;
-        } catch (e) {
-          console.error(`[ZenMods]: Error parsing mod ${modId} info:`, e);
-        }
-      } else {
-        console.error(`[ZenMods]: Error fetching mod ${modId} info:`, data.status);
-      }
-
-      return null;
-    }
-
-    async isModInstalled(modId) {
-      const mods = await this.getMods();
-      return Boolean(mods?.[modId]);
-    }
-
-    // public properties end
+    Services.prefs.addObserver(this.updatePref, this.#rebuildModsStylesheet.bind(this), false);
+    Services.prefs.addObserver('zen.themes.disable-all', this.#handleDisableMods.bind(this), false);
   }
 
-  window.gZenMods = new nsZenMods();
+  #setNewMilestoneIfNeeded() {
+    const previousMilestone = Services.prefs.getStringPref('zen.mods.milestone', '');
+    if (previousMilestone != Services.appinfo.version) {
+      Services.prefs.setStringPref('zen.mods.milestone', Services.appinfo.version);
+      Services.prefs.clearUserPref('zen.mods.last-update');
+    }
+  }
+
+  #shouldAutoUpdate() {
+    const daysBeforeUpdate = Services.prefs.getIntPref('zen.mods.auto-update-days');
+    const lastUpdatedSec = Services.prefs.getIntPref('zen.mods.last-update', -1);
+    const nowSec = Math.floor(Date.now() / 1000);
+    const daysSinceUpdate = (nowSec - lastUpdatedSec) / (60 * 60 * 24);
+
+    return (
+      (Services.prefs.getBoolPref('zen.mods.auto-update', true) &&
+        daysSinceUpdate >= daysBeforeUpdate) ||
+      lastUpdatedSec < 0
+    );
+  }
+
+  async checkForModsUpdates() {
+    const mods = await this.getMods();
+
+    const updates = await Promise.all(
+      Object.values(mods).map(async (currentMod) => {
+        try {
+          const possibleNewModVersion = await this.requestMod(currentMod.id);
+
+          if (!possibleNewModVersion) {
+            return null;
+          }
+
+          if (
+            !this.#compareVersions(possibleNewModVersion.version, currentMod.version ?? '0.0.0') &&
+            possibleNewModVersion.version != currentMod.version
+          ) {
+            console.log(
+              `[ZenMods]: Mod update found for mod ${currentMod.name} (${currentMod.id}), current: ${currentMod.version}, new: ${possibleNewModVersion.version}`
+            );
+
+            possibleNewModVersion.enabled = currentMod.enabled;
+
+            await this.removeMod(currentMod.id, false);
+
+            mods[currentMod.id] = possibleNewModVersion;
+
+            return possibleNewModVersion;
+          }
+
+          return null;
+        } catch (e) {
+          console.error('[ZenMods]: Error checking for mod updates', e);
+
+          return null;
+        }
+      })
+    );
+
+    await this.updateMods(mods);
+    Services.prefs.setIntPref('zen.mods.last-update', Math.floor(Date.now() / 1000));
+    return updates.filter((update) => {
+      return update !== null;
+    });
+  }
+
+  async removeMod(modId, triggerUpdate = true) {
+    const modPath = this.getModFolder(modId);
+
+    console.log(`[ZenMods]: Removing mod ${modPath}`);
+
+    await IOUtils.remove(modPath, { recursive: true, ignoreAbsent: true });
+
+    const mods = await this.getMods();
+
+    delete mods[modId];
+
+    await IOUtils.writeJSON(this.modsDataFile, mods);
+
+    if (triggerUpdate) {
+      this.triggerModsUpdate();
+    }
+  }
+
+  async enableMod(modId) {
+    const mods = await this.getMods();
+    const mod = mods[modId];
+
+    console.log(`[ZenMods]: Enabling mod ${mod.name}`);
+
+    mod.enabled = true;
+
+    await IOUtils.writeJSON(this.modsDataFile, mods);
+  }
+
+  async disableMod(modId) {
+    const mods = await this.getMods();
+    const mod = mods[modId];
+
+    console.log(`[ZenMods]: Disabling mod ${mod.name}`);
+
+    mod.enabled = false;
+
+    await IOUtils.writeJSON(this.modsDataFile, mods);
+  }
+
+  async updateMods(mods = undefined) {
+    if (!mods) {
+      mods = await this.getMods();
+    }
+
+    await IOUtils.writeJSON(this.modsDataFile, mods);
+    await this.checkForModChanges();
+  }
+
+  triggerModsUpdate() {
+    Services.prefs.setBoolPref(this.updatePref, !Services.prefs.getBoolPref(this.updatePref));
+  }
+
+  async installMod(mod) {
+    try {
+      const modPath = PathUtils.join(this.modsRootPath, mod.id);
+      await IOUtils.makeDirectory(modPath, { ignoreExisting: true });
+
+      await this.#downloadUrlToFile(mod.style, PathUtils.join(modPath, 'chrome.css'), true);
+      await this.#downloadUrlToFile(mod.readme, PathUtils.join(modPath, 'readme.md'));
+
+      if (mod.preferences) {
+        await this.#downloadUrlToFile(mod.preferences, PathUtils.join(modPath, 'preferences.json'));
+      }
+    } catch (e) {
+      console.error('[ZenMods]: Error installing mod', mod.id, e);
+    }
+  }
+
+  async checkForModChanges() {
+    const mods = await this.getMods();
+
+    for (const [modId, mod] of Object.entries(mods)) {
+      try {
+        if (!mod) {
+          continue;
+        }
+
+        if (!(await IOUtils.exists(this.getModFolder(modId)))) {
+          await this.installMod(mod);
+        }
+      } catch (e) {
+        console.error('[ZenMods]: Error checking for mod changes', e);
+      }
+    }
+
+    this.triggerModsUpdate();
+  }
+
+  async requestMod(modId) {
+    const url = this.#composeModApiUrl(modId);
+
+    console.debug(`[ZenMods]: Fetching mod ${modId} info from ${url}`);
+
+    const data = await fetch(url, {
+      mode: 'no-cors',
+    });
+
+    if (data.ok) {
+      try {
+        const obj = await data.json();
+
+        return obj;
+      } catch (e) {
+        console.error(`[ZenMods]: Error parsing mod ${modId} info:`, e);
+      }
+    } else {
+      console.error(`[ZenMods]: Error fetching mod ${modId} info:`, data.status);
+    }
+
+    return null;
+  }
+
+  async isModInstalled(modId) {
+    const mods = await this.getMods();
+    return Boolean(mods?.[modId]);
+  }
+
+  // public properties end
 }
+
+window.gZenMods = new nsZenMods();
diff --git a/src/zen/mods/jar.inc.mn b/src/zen/mods/jar.inc.mn
new file mode 100644
index 000000000..e15776368
--- /dev/null
+++ b/src/zen/mods/jar.inc.mn
@@ -0,0 +1,5 @@
+# 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/.
+
+        content/browser/zen-components/ZenMods.mjs                              (../../zen/mods/ZenMods.mjs)
diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs
index ab3912b3a..89488cd43 100644
--- a/src/zen/split-view/ZenViewSplitter.mjs
+++ b/src/zen/split-view/ZenViewSplitter.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 { nsZenDOMOperatedFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+
 class nsSplitLeafNode {
   /**
    * The percentage of the size of the parent the node takes up, dependent on parent direction this is either
diff --git a/src/zen/split-view/jar.inc.mn b/src/zen/split-view/jar.inc.mn
new file mode 100644
index 000000000..cc855a1cc
--- /dev/null
+++ b/src/zen/split-view/jar.inc.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+*       content/browser/zen-styles/zen-decks.css                                (../../zen/split-view/zen-decks.css)
+        content/browser/zen-components/ZenViewSplitter.mjs                      (../../zen/split-view/ZenViewSplitter.mjs)
\ No newline at end of file
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 68104fd18..8598858a4 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -1,1096 +1,1095 @@
 // 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/.
-{
-  const lazy = {};
 
-  class ZenPinnedTabsObserver {
-    static ALL_EVENTS = [
-      'TabPinned',
-      'TabUnpinned',
-      'TabMove',
-      'TabGroupCreate',
-      'TabGroupRemoved',
-      'TabGroupMoved',
-      'ZenFolderRenamed',
-      'ZenFolderIconChanged',
-      'TabGroupCollapse',
-      'TabGroupExpand',
-      'TabGrouped',
-      'TabUngrouped',
-      'ZenFolderChangedWorkspace',
-      'TabAddedToEssentials',
-      'TabRemovedFromEssentials',
-    ];
+import { nsZenDOMOperatedFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
 
-    #listeners = [];
+const lazy = {};
 
-    constructor() {
-      XPCOMUtils.defineLazyPreferenceGetter(
-        lazy,
-        'zenPinnedTabRestorePinnedTabsToPinnedUrl',
-        'zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url',
-        false
-      );
-      XPCOMUtils.defineLazyPreferenceGetter(
-        lazy,
-        'zenPinnedTabCloseShortcutBehavior',
-        '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',
-      });
-      this.#listenPinnedTabEvents();
+class ZenPinnedTabsObserver {
+  static ALL_EVENTS = [
+    'TabPinned',
+    'TabUnpinned',
+    'TabMove',
+    'TabGroupCreate',
+    'TabGroupRemoved',
+    'TabGroupMoved',
+    'ZenFolderRenamed',
+    'ZenFolderIconChanged',
+    'TabGroupCollapse',
+    'TabGroupExpand',
+    'TabGrouped',
+    'TabUngrouped',
+    'ZenFolderChangedWorkspace',
+    'TabAddedToEssentials',
+    'TabRemovedFromEssentials',
+  ];
+
+  #listeners = [];
+
+  constructor() {
+    XPCOMUtils.defineLazyPreferenceGetter(
+      lazy,
+      'zenPinnedTabRestorePinnedTabsToPinnedUrl',
+      'zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url',
+      false
+    );
+    XPCOMUtils.defineLazyPreferenceGetter(
+      lazy,
+      'zenPinnedTabCloseShortcutBehavior',
+      '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',
+    });
+    this.#listenPinnedTabEvents();
+  }
+
+  #listenPinnedTabEvents() {
+    const eventListener = this.#eventListener.bind(this);
+    for (const event of ZenPinnedTabsObserver.ALL_EVENTS) {
+      window.addEventListener(event, eventListener);
     }
-
-    #listenPinnedTabEvents() {
-      const eventListener = this.#eventListener.bind(this);
+    window.addEventListener('unload', () => {
       for (const event of ZenPinnedTabsObserver.ALL_EVENTS) {
-        window.addEventListener(event, eventListener);
+        window.removeEventListener(event, eventListener);
       }
-      window.addEventListener('unload', () => {
-        for (const event of ZenPinnedTabsObserver.ALL_EVENTS) {
-          window.removeEventListener(event, eventListener);
-        }
-      });
-    }
+    });
+  }
 
-    #eventListener(event) {
-      for (const listener of this.#listeners) {
-        listener(event.type, event);
-      }
-    }
-
-    addPinnedTabListener(listener) {
-      this.#listeners.push(listener);
+  #eventListener(event) {
+    for (const listener of this.#listeners) {
+      listener(event.type, event);
     }
   }
 
-  class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
-    hasInitializedPins = false;
-    promiseInitializedPinned = new Promise((resolve) => {
-      this._resolvePinnedInitializedInternal = resolve;
+  addPinnedTabListener(listener) {
+    this.#listeners.push(listener);
+  }
+}
+
+class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
+  hasInitializedPins = false;
+  promiseInitializedPinned = new Promise((resolve) => {
+    this._resolvePinnedInitializedInternal = resolve;
+  });
+
+  async init() {
+    if (!this.enabled) {
+      return;
+    }
+    this._canLog = Services.prefs.getBoolPref('zen.pinned-tab-manager.debug', false);
+    this.observer = new ZenPinnedTabsObserver();
+    this._initClosePinnedTabShortcut();
+    this._insertItemsIntoTabContextMenu();
+    this.observer.addPinnedTabListener(this._onPinnedTabEvent.bind(this));
+
+    this._zenClickEventListener = this._onTabClick.bind(this);
+
+    gZenWorkspaces._resolvePinnedInitialized();
+  }
+
+  log(message) {
+    if (this._canLog) {
+      console.log(`[ZenPinnedTabManager] ${message}`);
+    }
+  }
+
+  onTabIconChanged(tab, url = null) {
+    const iconUrl = url ?? tab.iconImage.src;
+    if (!iconUrl && tab.hasAttribute('zen-pin-id')) {
+      try {
+        setTimeout(async () => {
+          const favicon = await this.getFaviconAsBase64(tab.linkedBrowser.currentURI);
+          if (favicon) {
+            gBrowser.setIcon(tab, favicon);
+          }
+        });
+      } catch {
+        // Handle error
+      }
+    } else {
+      if (tab.hasAttribute('zen-essential')) {
+        tab.style.setProperty('--zen-essential-tab-icon', `url(${iconUrl})`);
+      }
+    }
+  }
+
+  _onTabResetPinButton(event, tab) {
+    event.stopPropagation();
+    const pin = this._pinsCache?.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
+    if (!pin) {
+      return;
+    }
+    let userContextId;
+    if (tab.hasAttribute('usercontextid')) {
+      userContextId = tab.getAttribute('usercontextid');
+    }
+    const pinnedUrl = Services.io.newURI(pin.url);
+    const browser = tab.linkedBrowser;
+    browser.loadURI(pinnedUrl, {
+      triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({
+        userContextId,
+      }),
     });
+    this.resetPinChangedUrl(tab);
+  }
 
-    async init() {
-      if (!this.enabled) {
-        return;
-      }
-      this._canLog = Services.prefs.getBoolPref('zen.pinned-tab-manager.debug', false);
-      this.observer = new ZenPinnedTabsObserver();
-      this._initClosePinnedTabShortcut();
-      this._insertItemsIntoTabContextMenu();
-      this.observer.addPinnedTabListener(this._onPinnedTabEvent.bind(this));
+  get enabled() {
+    return !gZenWorkspaces.privateWindowOrDisabled;
+  }
 
-      this._zenClickEventListener = this._onTabClick.bind(this);
+  get maxEssentialTabs() {
+    return lazy.zenTabsEssentialsMax;
+  }
 
-      gZenWorkspaces._resolvePinnedInitialized();
+  async refreshPinnedTabs({ init = false } = {}) {
+    if (!this.enabled) {
+      return;
     }
-
-    log(message) {
-      if (this._canLog) {
-        console.log(`[ZenPinnedTabManager] ${message}`);
+    await ZenPinnedTabsStorage.promiseInitialized;
+    await this.#initializePinsCache();
+    setTimeout(async () => {
+      // Execute in a separate task to avoid blocking the main thread
+      await SessionStore.promiseAllWindowsRestored;
+      await gZenWorkspaces.promiseInitialized;
+      await this.#initializePinnedTabs(init);
+      if (init) {
+        this._hasFinishedLoading = true;
       }
-    }
+    }, 10);
+  }
 
-    onTabIconChanged(tab, url = null) {
-      const iconUrl = url ?? tab.iconImage.src;
-      if (!iconUrl && tab.hasAttribute('zen-pin-id')) {
-        try {
-          setTimeout(async () => {
-            const favicon = await this.getFaviconAsBase64(tab.linkedBrowser.currentURI);
-            if (favicon) {
-              gBrowser.setIcon(tab, favicon);
+  async #initializePinsCache() {
+    try {
+      // Get pin data
+      const pins = await ZenPinnedTabsStorage.getPins();
+
+      // Enhance pins with favicons
+      this._pinsCache = await Promise.all(
+        pins.map(async (pin) => {
+          try {
+            if (pin.isGroup) {
+              return pin; // Skip groups for now
             }
-          });
-        } catch {
-          // Handle error
+            const image = await this.getFaviconAsBase64(Services.io.newURI(pin.url));
+            return {
+              ...pin,
+              iconUrl: image || null,
+            };
+          } catch {
+            // If favicon fetch fails, continue without icon
+            return {
+              ...pin,
+              iconUrl: null,
+            };
+          }
+        })
+      );
+    } catch (ex) {
+      console.error('Failed to initialize pins cache:', ex);
+      this._pinsCache = [];
+    }
+
+    this.log(`Initialized pins cache with ${this._pinsCache.length} pins`);
+    return this._pinsCache;
+  }
+
+  #finishedInitializingPins() {
+    if (this.hasInitializedPins) {
+      return;
+    }
+    this._resolvePinnedInitializedInternal();
+    delete this._resolvePinnedInitializedInternal;
+    this.hasInitializedPins = true;
+  }
+
+  async #initializePinnedTabs(init = false) {
+    const pins = this._pinsCache;
+    if (!pins?.length || !init) {
+      this.#finishedInitializingPins();
+      return;
+    }
+
+    const pinnedTabsByUUID = new Map();
+    const pinsToCreate = new Set(pins.map((p) => p.uuid));
+
+    // First pass: identify existing tabs and remove those without pins
+    for (let tab of gZenWorkspaces.allStoredTabs) {
+      const pinId = tab.getAttribute('zen-pin-id');
+      if (!pinId) {
+        continue;
+      }
+
+      if (pinsToCreate.has(pinId)) {
+        // This is a valid pinned tab that matches a pin
+        pinnedTabsByUUID.set(pinId, tab);
+        pinsToCreate.delete(pinId);
+
+        if (lazy.zenPinnedTabRestorePinnedTabsToPinnedUrl && init) {
+          this._resetTabToStoredState(tab);
         }
       } else {
-        if (tab.hasAttribute('zen-essential')) {
-          tab.style.setProperty('--zen-essential-tab-icon', `url(${iconUrl})`);
-        }
+        // This is a pinned tab that no longer has a corresponding pin
+        gBrowser.removeTab(tab);
       }
     }
 
-    _onTabResetPinButton(event, tab) {
-      event.stopPropagation();
-      const pin = this._pinsCache?.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
-      if (!pin) {
-        return;
+    for (const group of gZenWorkspaces.allTabGroups) {
+      const pinId = group.getAttribute('zen-pin-id');
+      if (!pinId) {
+        continue;
       }
-      let userContextId;
-      if (tab.hasAttribute('usercontextid')) {
-        userContextId = tab.getAttribute('usercontextid');
+      if (pinsToCreate.has(pinId)) {
+        // This is a valid pinned group that matches a pin
+        pinsToCreate.delete(pinId);
       }
-      const pinnedUrl = Services.io.newURI(pin.url);
-      const browser = tab.linkedBrowser;
-      browser.loadURI(pinnedUrl, {
-        triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({
-          userContextId,
-        }),
-      });
-      this.resetPinChangedUrl(tab);
     }
 
-    get enabled() {
-      return !gZenWorkspaces.privateWindowOrDisabled;
-    }
-
-    get maxEssentialTabs() {
-      return lazy.zenTabsEssentialsMax;
-    }
-
-    async refreshPinnedTabs({ init = false } = {}) {
-      if (!this.enabled) {
-        return;
+    // Second pass: For every existing tab, update its label
+    // and set 'zen-has-static-label' attribute if it's been edited
+    for (let pin of pins) {
+      const tab = pinnedTabsByUUID.get(pin.uuid);
+      if (!tab) {
+        continue;
+      }
+
+      tab.removeAttribute('zen-has-static-label'); // So we can set it again
+      if (pin.title && pin.editedTitle) {
+        gBrowser._setTabLabel(tab, pin.title, { beforeTabOpen: true });
+        tab.setAttribute('zen-has-static-label', 'true');
       }
-      await ZenPinnedTabsStorage.promiseInitialized;
-      await this.#initializePinsCache();
-      setTimeout(async () => {
-        // Execute in a separate task to avoid blocking the main thread
-        await SessionStore.promiseAllWindowsRestored;
-        await gZenWorkspaces.promiseInitialized;
-        await this.#initializePinnedTabs(init);
-        if (init) {
-          this._hasFinishedLoading = true;
-        }
-      }, 10);
     }
 
-    async #initializePinsCache() {
+    const groups = new Map();
+    const pendingTabsInsideGroups = {};
+
+    // Third pass: create new tabs for pins that don't have tabs
+    for (let pin of pins) {
       try {
-        // Get pin data
-        const pins = await ZenPinnedTabsStorage.getPins();
+        if (!pinsToCreate.has(pin.uuid)) {
+          continue; // Skip pins that already have tabs
+        }
 
-        // Enhance pins with favicons
-        this._pinsCache = await Promise.all(
-          pins.map(async (pin) => {
-            try {
-              if (pin.isGroup) {
-                return pin; // Skip groups for now
-              }
-              const image = await this.getFaviconAsBase64(Services.io.newURI(pin.url));
-              return {
-                ...pin,
-                iconUrl: image || null,
-              };
-            } catch {
-              // If favicon fetch fails, continue without icon
-              return {
-                ...pin,
-                iconUrl: null,
-              };
+        if (pin.isGroup) {
+          const tabs = [];
+          // If there's already existing tabs, let's use them
+          for (const [uuid, existingTab] of pinnedTabsByUUID) {
+            const pinObject = this._pinsCache.find((p) => p.uuid === uuid);
+            if (pinObject && pinObject.parentUuid === pin.uuid) {
+              tabs.push(existingTab);
             }
-          })
-        );
-      } catch (ex) {
-        console.error('Failed to initialize pins cache:', ex);
-        this._pinsCache = [];
-      }
-
-      this.log(`Initialized pins cache with ${this._pinsCache.length} pins`);
-      return this._pinsCache;
-    }
-
-    #finishedInitializingPins() {
-      if (this.hasInitializedPins) {
-        return;
-      }
-      this._resolvePinnedInitializedInternal();
-      delete this._resolvePinnedInitializedInternal;
-      this.hasInitializedPins = true;
-    }
-
-    async #initializePinnedTabs(init = false) {
-      const pins = this._pinsCache;
-      if (!pins?.length || !init) {
-        this.#finishedInitializingPins();
-        return;
-      }
-
-      const pinnedTabsByUUID = new Map();
-      const pinsToCreate = new Set(pins.map((p) => p.uuid));
-
-      // First pass: identify existing tabs and remove those without pins
-      for (let tab of gZenWorkspaces.allStoredTabs) {
-        const pinId = tab.getAttribute('zen-pin-id');
-        if (!pinId) {
+          }
+          // We still need to iterate through pending tabs since the database
+          // query doesn't guarantee the order of insertion
+          for (const [parentUuid, folderTabs] of Object.entries(pendingTabsInsideGroups)) {
+            if (parentUuid === pin.uuid) {
+              tabs.push(...folderTabs);
+            }
+          }
+          const group = gZenFolders.createFolder(tabs, {
+            label: pin.title,
+            collapsed: pin.isFolderCollapsed,
+            initialPinId: pin.uuid,
+            workspaceId: pin.workspaceUuid,
+            insertAfter:
+              groups.get(pin.parentUuid)?.querySelector('.tab-group-container')?.lastChild || null,
+          });
+          gZenFolders.setFolderUserIcon(group, pin.folderIcon);
+          groups.set(pin.uuid, group);
           continue;
         }
 
-        if (pinsToCreate.has(pinId)) {
-          // This is a valid pinned tab that matches a pin
-          pinnedTabsByUUID.set(pinId, tab);
-          pinsToCreate.delete(pinId);
+        let params = {
+          skipAnimation: true,
+          allowInheritPrincipal: false,
+          skipBackgroundNotify: true,
+          userContextId: pin.containerTabId || 0,
+          createLazyBrowser: true,
+          skipLoad: true,
+          noInitialLabel: false,
+        };
 
-          if (lazy.zenPinnedTabRestorePinnedTabsToPinnedUrl && init) {
-            this._resetTabToStoredState(tab);
-          }
-        } else {
-          // This is a pinned tab that no longer has a corresponding pin
-          gBrowser.removeTab(tab);
-        }
-      }
+        // Create and initialize the tab
+        let newTab = gBrowser.addTrustedTab(pin.url, params);
+        newTab.setAttribute('zenDefaultUserContextId', true);
 
-      for (const group of gZenWorkspaces.allTabGroups) {
-        const pinId = group.getAttribute('zen-pin-id');
-        if (!pinId) {
-          continue;
-        }
-        if (pinsToCreate.has(pinId)) {
-          // This is a valid pinned group that matches a pin
-          pinsToCreate.delete(pinId);
-        }
-      }
-
-      // Second pass: For every existing tab, update its label
-      // and set 'zen-has-static-label' attribute if it's been edited
-      for (let pin of pins) {
-        const tab = pinnedTabsByUUID.get(pin.uuid);
-        if (!tab) {
-          continue;
+        // Set initial label/title
+        if (pin.title) {
+          gBrowser.setInitialTabTitle(newTab, pin.title);
         }
 
-        tab.removeAttribute('zen-has-static-label'); // So we can set it again
-        if (pin.title && pin.editedTitle) {
-          gBrowser._setTabLabel(tab, pin.title, { beforeTabOpen: true });
-          tab.setAttribute('zen-has-static-label', 'true');
+        // Set the icon if we have it cached
+        if (pin.iconUrl) {
+          gBrowser.setIcon(newTab, pin.iconUrl);
         }
-      }
 
-      const groups = new Map();
-      const pendingTabsInsideGroups = {};
+        newTab.setAttribute('zen-pin-id', pin.uuid);
 
-      // Third pass: create new tabs for pins that don't have tabs
-      for (let pin of pins) {
-        try {
-          if (!pinsToCreate.has(pin.uuid)) {
-            continue; // Skip pins that already have tabs
-          }
+        if (pin.workspaceUuid) {
+          newTab.setAttribute('zen-workspace-id', pin.workspaceUuid);
+        }
 
-          if (pin.isGroup) {
-            const tabs = [];
-            // If there's already existing tabs, let's use them
-            for (const [uuid, existingTab] of pinnedTabsByUUID) {
-              const pinObject = this._pinsCache.find((p) => p.uuid === uuid);
-              if (pinObject && pinObject.parentUuid === pin.uuid) {
-                tabs.push(existingTab);
-              }
-            }
-            // We still need to iterate through pending tabs since the database
-            // query doesn't guarantee the order of insertion
-            for (const [parentUuid, folderTabs] of Object.entries(pendingTabsInsideGroups)) {
-              if (parentUuid === pin.uuid) {
-                tabs.push(...folderTabs);
-              }
-            }
-            const group = gZenFolders.createFolder(tabs, {
-              label: pin.title,
-              collapsed: pin.isFolderCollapsed,
-              initialPinId: pin.uuid,
-              workspaceId: pin.workspaceUuid,
-              insertAfter:
-                groups.get(pin.parentUuid)?.querySelector('.tab-group-container')?.lastChild ||
-                null,
-            });
-            gZenFolders.setFolderUserIcon(group, pin.folderIcon);
-            groups.set(pin.uuid, group);
-            continue;
-          }
+        if (pin.isEssential) {
+          newTab.setAttribute('zen-essential', 'true');
+        }
 
-          let params = {
-            skipAnimation: true,
-            allowInheritPrincipal: false,
-            skipBackgroundNotify: true,
+        if (pin.editedTitle) {
+          newTab.setAttribute('zen-has-static-label', 'true');
+        }
+
+        // Initialize browser state if needed
+        if (!newTab.linkedBrowser._remoteAutoRemoved) {
+          let state = {
+            entries: [
+              {
+                url: pin.url,
+                title: pin.title,
+                triggeringPrincipal_base64: E10SUtils.SERIALIZED_SYSTEMPRINCIPAL,
+              },
+            ],
             userContextId: pin.containerTabId || 0,
-            createLazyBrowser: true,
-            skipLoad: true,
-            noInitialLabel: false,
+            image: pin.iconUrl,
           };
 
-          // Create and initialize the tab
-          let newTab = gBrowser.addTrustedTab(pin.url, params);
-          newTab.setAttribute('zenDefaultUserContextId', true);
+          SessionStore.setTabState(newTab, state);
+        }
 
-          // Set initial label/title
-          if (pin.title) {
-            gBrowser.setInitialTabTitle(newTab, pin.title);
-          }
+        this.log(`Created new pinned tab for pin ${pin.uuid} (isEssential: ${pin.isEssential})`);
+        gBrowser.pinTab(newTab);
 
-          // Set the icon if we have it cached
-          if (pin.iconUrl) {
-            gBrowser.setIcon(newTab, pin.iconUrl);
-          }
-
-          newTab.setAttribute('zen-pin-id', pin.uuid);
-
-          if (pin.workspaceUuid) {
-            newTab.setAttribute('zen-workspace-id', pin.workspaceUuid);
-          }
-
-          if (pin.isEssential) {
-            newTab.setAttribute('zen-essential', 'true');
-          }
-
-          if (pin.editedTitle) {
-            newTab.setAttribute('zen-has-static-label', 'true');
-          }
-
-          // Initialize browser state if needed
-          if (!newTab.linkedBrowser._remoteAutoRemoved) {
-            let state = {
-              entries: [
-                {
-                  url: pin.url,
-                  title: pin.title,
-                  triggeringPrincipal_base64: E10SUtils.SERIALIZED_SYSTEMPRINCIPAL,
-                },
-              ],
-              userContextId: pin.containerTabId || 0,
-              image: pin.iconUrl,
-            };
-
-            SessionStore.setTabState(newTab, state);
-          }
-
-          this.log(`Created new pinned tab for pin ${pin.uuid} (isEssential: ${pin.isEssential})`);
-          gBrowser.pinTab(newTab);
-
-          if (pin.parentUuid) {
-            const parentGroup = groups.get(pin.parentUuid);
-            if (parentGroup) {
-              parentGroup.querySelector('.tab-group-container').appendChild(newTab);
+        if (pin.parentUuid) {
+          const parentGroup = groups.get(pin.parentUuid);
+          if (parentGroup) {
+            parentGroup.querySelector('.tab-group-container').appendChild(newTab);
+          } else {
+            if (pendingTabsInsideGroups[pin.parentUuid]) {
+              pendingTabsInsideGroups[pin.parentUuid].push(newTab);
             } else {
-              if (pendingTabsInsideGroups[pin.parentUuid]) {
-                pendingTabsInsideGroups[pin.parentUuid].push(newTab);
-              } else {
-                pendingTabsInsideGroups[pin.parentUuid] = [newTab];
-              }
+              pendingTabsInsideGroups[pin.parentUuid] = [newTab];
+            }
+          }
+        } else {
+          if (!pin.isEssential) {
+            const container = gZenWorkspaces.workspaceElement(
+              pin.workspaceUuid
+            )?.pinnedTabsContainer;
+            if (container) {
+              container.insertBefore(newTab, container.lastChild);
             }
           } else {
-            if (!pin.isEssential) {
-              const container = gZenWorkspaces.workspaceElement(
-                pin.workspaceUuid
-              )?.pinnedTabsContainer;
-              if (container) {
-                container.insertBefore(newTab, container.lastChild);
-              }
-            } else {
-              gZenWorkspaces.getEssentialsSection(pin.containerTabId).appendChild(newTab);
-            }
+            gZenWorkspaces.getEssentialsSection(pin.containerTabId).appendChild(newTab);
           }
-
-          gBrowser.tabContainer._invalidateCachedTabs();
-          newTab.initialize();
-        } catch (ex) {
-          console.error('Failed to initialize pinned tabs:', ex);
         }
+
+        gBrowser.tabContainer._invalidateCachedTabs();
+        newTab.initialize();
+      } catch (ex) {
+        console.error('Failed to initialize pinned tabs:', ex);
       }
-
-      setTimeout(() => {
-        this.#finishedInitializingPins();
-      }, 0);
-
-      gBrowser._updateTabBarForPinnedTabs();
-      gZenUIManager.updateTabsToolbar();
     }
 
-    _onPinnedTabEvent(action, event) {
-      if (!this.enabled) return;
-      const tab = event.target;
-      if (this._ignoreNextTabPinnedEvent) {
-        delete this._ignoreNextTabPinnedEvent;
-        return;
-      }
-      switch (action) {
-        case 'TabPinned':
-        case 'TabAddedToEssentials':
-          tab._zenClickEventListener = this._zenClickEventListener;
-          tab.addEventListener('click', tab._zenClickEventListener);
-          this._setPinnedAttributes(tab);
-          break;
-        case 'TabRemovedFromEssentials':
-          if (tab.pinned) {
-            this.#onTabMove(tab);
-            break;
-          }
-        // [Fall through]
-        case 'TabUnpinned':
-          this._removePinnedAttributes(tab);
-          if (tab._zenClickEventListener) {
-            tab.removeEventListener('click', tab._zenClickEventListener);
-            delete tab._zenClickEventListener;
-          }
-          break;
-        case 'TabMove':
+    setTimeout(() => {
+      this.#finishedInitializingPins();
+    }, 0);
+
+    gBrowser._updateTabBarForPinnedTabs();
+    gZenUIManager.updateTabsToolbar();
+  }
+
+  _onPinnedTabEvent(action, event) {
+    if (!this.enabled) return;
+    const tab = event.target;
+    if (this._ignoreNextTabPinnedEvent) {
+      delete this._ignoreNextTabPinnedEvent;
+      return;
+    }
+    switch (action) {
+      case 'TabPinned':
+      case 'TabAddedToEssentials':
+        tab._zenClickEventListener = this._zenClickEventListener;
+        tab.addEventListener('click', tab._zenClickEventListener);
+        this._setPinnedAttributes(tab);
+        break;
+      case 'TabRemovedFromEssentials':
+        if (tab.pinned) {
           this.#onTabMove(tab);
           break;
-        case 'TabGroupCreate':
-          this.#onTabGroupCreate(event);
-          break;
-        case 'TabGroupRemoved':
-          this.#onTabGroupRemoved(event);
-          break;
-        case 'TabGroupMoved':
-          this.#onTabGroupMoved(event);
-          break;
+        }
+      // [Fall through]
+      case 'TabUnpinned':
+        this._removePinnedAttributes(tab);
+        if (tab._zenClickEventListener) {
+          tab.removeEventListener('click', tab._zenClickEventListener);
+          delete tab._zenClickEventListener;
+        }
+        break;
+      case 'TabMove':
+        this.#onTabMove(tab);
+        break;
+      case 'TabGroupCreate':
+        this.#onTabGroupCreate(event);
+        break;
+      case 'TabGroupRemoved':
+        this.#onTabGroupRemoved(event);
+        break;
+      case 'TabGroupMoved':
+        this.#onTabGroupMoved(event);
+        break;
+      case 'ZenFolderRenamed':
+      case 'ZenFolderIconChanged':
+      case 'TabGroupCollapse':
+      case 'TabGroupExpand':
+      case 'ZenFolderChangedWorkspace':
+        this.#updateGroupInfo(event.originalTarget, action);
+        break;
+      case 'TabGrouped':
+        this.#onTabGrouped(event);
+        break;
+      case 'TabUngrouped':
+        this.#onTabUngrouped(event);
+        break;
+      default:
+        console.warn('ZenPinnedTabManager: Unhandled tab event', action);
+        break;
+    }
+  }
+
+  async #onTabGroupCreate(event) {
+    const group = event.originalTarget;
+    if (!group.isZenFolder) {
+      return;
+    }
+    if (group.hasAttribute('zen-pin-id')) {
+      return; // Group already exists in storage
+    }
+    const workspaceId = group.getAttribute('zen-workspace-id');
+    let id = await ZenPinnedTabsStorage.createGroup(
+      group.name,
+      group.iconURL,
+      group.collapsed,
+      workspaceId,
+      group.getAttribute('zen-pin-id'),
+      group._pPos
+    );
+    group.setAttribute('zen-pin-id', id);
+    for (const tab of group.tabs) {
+      // Only add it if the tab is directly under the group
+      if (
+        tab.pinned &&
+        tab.hasAttribute('zen-pin-id') &&
+        tab.group === group &&
+        this.hasInitializedPins
+      ) {
+        const tabPinId = tab.getAttribute('zen-pin-id');
+        await ZenPinnedTabsStorage.addTabToGroup(tabPinId, id, /* position */ tab._pPos);
+      }
+    }
+    await this.refreshPinnedTabs();
+  }
+
+  async #onTabGrouped(event) {
+    const tab = event.detail;
+    const group = tab.group;
+    if (!group.isZenFolder) {
+      return;
+    }
+    const pinId = group.getAttribute('zen-pin-id');
+    const tabPinId = tab.getAttribute('zen-pin-id');
+    const tabPin = this._pinsCache?.find((p) => p.uuid === tabPinId);
+    if (!tabPin || !tabPin.group) {
+      return;
+    }
+    ZenPinnedTabsStorage.addTabToGroup(tabPinId, pinId, /* position */ tab._pPos);
+  }
+
+  async #onTabUngrouped(event) {
+    const tab = event.detail;
+    const group = tab.group;
+    if (!group?.isZenFolder) {
+      return;
+    }
+    const tabPinId = tab.getAttribute('zen-pin-id');
+    const tabPin = this._pinsCache?.find((p) => p.uuid === tabPinId);
+    if (!tabPin) {
+      return;
+    }
+    ZenPinnedTabsStorage.removeTabFromGroup(tabPinId, /* position */ tab._pPos);
+  }
+
+  async #updateGroupInfo(group, action) {
+    if (!group?.isZenFolder) {
+      return;
+    }
+    const pinId = group.getAttribute('zen-pin-id');
+    const groupPin = this._pinsCache?.find((p) => p.uuid === pinId);
+    if (groupPin) {
+      groupPin.title = group.name;
+      groupPin.folderIcon = group.iconURL;
+      groupPin.isFolderCollapsed = group.collapsed;
+      groupPin.position = group._pPos;
+      groupPin.parentUuid = group.group?.getAttribute('zen-pin-id') || null;
+      groupPin.workspaceUuid = group.getAttribute('zen-workspace-id') || null;
+      await this.savePin(groupPin);
+      switch (action) {
         case 'ZenFolderRenamed':
         case 'ZenFolderIconChanged':
         case 'TabGroupCollapse':
         case 'TabGroupExpand':
-        case 'ZenFolderChangedWorkspace':
-          this.#updateGroupInfo(event.originalTarget, action);
-          break;
-        case 'TabGrouped':
-          this.#onTabGrouped(event);
-          break;
-        case 'TabUngrouped':
-          this.#onTabUngrouped(event);
           break;
         default:
-          console.warn('ZenPinnedTabManager: Unhandled tab event', action);
-          break;
-      }
-    }
-
-    async #onTabGroupCreate(event) {
-      const group = event.originalTarget;
-      if (!group.isZenFolder) {
-        return;
-      }
-      if (group.hasAttribute('zen-pin-id')) {
-        return; // Group already exists in storage
-      }
-      const workspaceId = group.getAttribute('zen-workspace-id');
-      let id = await ZenPinnedTabsStorage.createGroup(
-        group.name,
-        group.iconURL,
-        group.collapsed,
-        workspaceId,
-        group.getAttribute('zen-pin-id'),
-        group._pPos
-      );
-      group.setAttribute('zen-pin-id', id);
-      for (const tab of group.tabs) {
-        // Only add it if the tab is directly under the group
-        if (
-          tab.pinned &&
-          tab.hasAttribute('zen-pin-id') &&
-          tab.group === group &&
-          this.hasInitializedPins
-        ) {
-          const tabPinId = tab.getAttribute('zen-pin-id');
-          await ZenPinnedTabsStorage.addTabToGroup(tabPinId, id, /* position */ tab._pPos);
-        }
-      }
-      await this.refreshPinnedTabs();
-    }
-
-    async #onTabGrouped(event) {
-      const tab = event.detail;
-      const group = tab.group;
-      if (!group.isZenFolder) {
-        return;
-      }
-      const pinId = group.getAttribute('zen-pin-id');
-      const tabPinId = tab.getAttribute('zen-pin-id');
-      const tabPin = this._pinsCache?.find((p) => p.uuid === tabPinId);
-      if (!tabPin || !tabPin.group) {
-        return;
-      }
-      ZenPinnedTabsStorage.addTabToGroup(tabPinId, pinId, /* position */ tab._pPos);
-    }
-
-    async #onTabUngrouped(event) {
-      const tab = event.detail;
-      const group = tab.group;
-      if (!group?.isZenFolder) {
-        return;
-      }
-      const tabPinId = tab.getAttribute('zen-pin-id');
-      const tabPin = this._pinsCache?.find((p) => p.uuid === tabPinId);
-      if (!tabPin) {
-        return;
-      }
-      ZenPinnedTabsStorage.removeTabFromGroup(tabPinId, /* position */ tab._pPos);
-    }
-
-    async #updateGroupInfo(group, action) {
-      if (!group?.isZenFolder) {
-        return;
-      }
-      const pinId = group.getAttribute('zen-pin-id');
-      const groupPin = this._pinsCache?.find((p) => p.uuid === pinId);
-      if (groupPin) {
-        groupPin.title = group.name;
-        groupPin.folderIcon = group.iconURL;
-        groupPin.isFolderCollapsed = group.collapsed;
-        groupPin.position = group._pPos;
-        groupPin.parentUuid = group.group?.getAttribute('zen-pin-id') || null;
-        groupPin.workspaceUuid = group.getAttribute('zen-workspace-id') || null;
-        await this.savePin(groupPin);
-        switch (action) {
-          case 'ZenFolderRenamed':
-          case 'ZenFolderIconChanged':
-          case 'TabGroupCollapse':
-          case 'TabGroupExpand':
-            break;
-          default:
-            for (const item of group.allItems) {
-              if (gBrowser.isTabGroup(item)) {
-                await this.#updateGroupInfo(item, action);
-              } else {
-                await this.#onTabMove(item);
-              }
+          for (const item of group.allItems) {
+            if (gBrowser.isTabGroup(item)) {
+              await this.#updateGroupInfo(item, action);
+            } else {
+              await this.#onTabMove(item);
             }
-        }
-      }
-    }
-
-    async #onTabGroupRemoved(event) {
-      const group = event.originalTarget;
-      if (!group.isZenFolder) {
-        return;
-      }
-      await ZenPinnedTabsStorage.removePin(group.getAttribute('zen-pin-id'));
-      group.removeAttribute('zen-pin-id');
-    }
-
-    async #onTabGroupMoved(event) {
-      const group = event.originalTarget;
-      if (!group.isZenFolder) {
-        return;
-      }
-      const newIndex = group._pPos;
-      const pinId = group.getAttribute('zen-pin-id');
-      if (!pinId) {
-        return;
-      }
-      for (const tab of group.allItemsRecursive) {
-        if (tab.pinned && tab.getAttribute('zen-pin-id') === pinId) {
-          const pin = this._pinsCache.find((p) => p.uuid === pinId);
-          if (pin) {
-            pin.position = tab._pPos;
-            pin.parentUuid = tab.group?.getAttribute('zen-pin-id') || null;
-            pin.workspaceUuid = group.getAttribute('zen-workspace-id');
-            await this.savePin(pin, false);
           }
-          break;
+      }
+    }
+  }
+
+  async #onTabGroupRemoved(event) {
+    const group = event.originalTarget;
+    if (!group.isZenFolder) {
+      return;
+    }
+    await ZenPinnedTabsStorage.removePin(group.getAttribute('zen-pin-id'));
+    group.removeAttribute('zen-pin-id');
+  }
+
+  async #onTabGroupMoved(event) {
+    const group = event.originalTarget;
+    if (!group.isZenFolder) {
+      return;
+    }
+    const newIndex = group._pPos;
+    const pinId = group.getAttribute('zen-pin-id');
+    if (!pinId) {
+      return;
+    }
+    for (const tab of group.allItemsRecursive) {
+      if (tab.pinned && tab.getAttribute('zen-pin-id') === pinId) {
+        const pin = this._pinsCache.find((p) => p.uuid === pinId);
+        if (pin) {
+          pin.position = tab._pPos;
+          pin.parentUuid = tab.group?.getAttribute('zen-pin-id') || null;
+          pin.workspaceUuid = group.getAttribute('zen-workspace-id');
+          await this.savePin(pin, false);
         }
-      }
-      const groupPin = this._pinsCache?.find((p) => p.uuid === pinId);
-      if (groupPin) {
-        groupPin.position = newIndex;
-        groupPin.parentUuid = group.group?.getAttribute('zen-pin-id');
-        groupPin.workspaceUuid = group.getAttribute('zen-workspace-id');
-        await this.savePin(groupPin);
+        break;
       }
     }
+    const groupPin = this._pinsCache?.find((p) => p.uuid === pinId);
+    if (groupPin) {
+      groupPin.position = newIndex;
+      groupPin.parentUuid = group.group?.getAttribute('zen-pin-id');
+      groupPin.workspaceUuid = group.getAttribute('zen-workspace-id');
+      await this.savePin(groupPin);
+    }
+  }
 
-    async #onTabMove(tab) {
-      if (!tab.pinned || !this._pinsCache) {
-        return;
-      }
-
-      const allTabs = [...gBrowser.tabs, ...gBrowser.tabGroups];
-      for (let i = 0; i < allTabs.length; i++) {
-        const otherTab = allTabs[i];
-        if (
-          otherTab.pinned &&
-          otherTab.getAttribute('zen-pin-id') !== tab.getAttribute('zen-pin-id')
-        ) {
-          const actualPin = this._pinsCache.find(
-            (pin) => pin.uuid === otherTab.getAttribute('zen-pin-id')
-          );
-          if (!actualPin) {
-            continue;
-          }
-          actualPin.position = otherTab._pPos;
-          actualPin.workspaceUuid = otherTab.getAttribute('zen-workspace-id');
-          actualPin.parentUuid = otherTab.group?.getAttribute('zen-pin-id') || null;
-          await this.savePin(actualPin, false);
-        }
-      }
-
-      const actualPin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
-
-      if (!actualPin) {
-        return;
-      }
-      actualPin.position = tab._pPos;
-      actualPin.isEssential = tab.hasAttribute('zen-essential');
-      actualPin.parentUuid = tab.group?.getAttribute('zen-pin-id') || null;
-      actualPin.workspaceUuid = tab.getAttribute('zen-workspace-id') || null;
-
-      // There was a bug where the title and hasStaticLabel attribute were not being set
-      // This is a workaround to fix that
-      if (tab.hasAttribute('zen-has-static-label')) {
-        actualPin.editedTitle = true;
-        actualPin.title = tab.label;
-      }
-      await this.savePin(actualPin);
-      tab.dispatchEvent(
-        new CustomEvent('ZenPinnedTabMoved', {
-          detail: { tab },
-        })
-      );
+  async #onTabMove(tab) {
+    if (!tab.pinned || !this._pinsCache) {
+      return;
     }
 
-    async _onTabClick(e) {
-      const tab = e.target?.closest('tab');
-      if (e.button === 1 && tab) {
-        await this.onCloseTabShortcut(e, tab, {
-          closeIfPending: Services.prefs.getBoolPref(
-            'zen.pinned-tab-manager.wheel-close-if-pending'
-          ),
-        });
-      }
-    }
-
-    async resetPinnedTab(tab) {
-      if (!tab) {
-        tab = TabContextMenu.contextTab;
-      }
-
-      if (!tab || !tab.pinned) {
-        return;
-      }
-
-      await this._resetTabToStoredState(tab);
-    }
-
-    async replacePinnedUrlWithCurrent(tab = undefined) {
-      tab ??= TabContextMenu.contextTab;
-      if (!tab || !tab.pinned || !tab.getAttribute('zen-pin-id')) {
-        return;
-      }
-
-      const browser = tab.linkedBrowser;
-
-      const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
-
-      if (!pin) {
-        return;
-      }
-
-      const userContextId = tab.getAttribute('usercontextid');
-
-      pin.title = tab.label || browser.contentTitle;
-      pin.url = browser.currentURI.spec;
-      pin.workspaceUuid = tab.getAttribute('zen-workspace-id');
-      pin.userContextId = userContextId ? parseInt(userContextId, 10) : 0;
-
-      await this.savePin(pin);
-      this.resetPinChangedUrl(tab);
-      await this.refreshPinnedTabs();
-      gZenUIManager.showToast('zen-pinned-tab-replaced');
-    }
-
-    async _setPinnedAttributes(tab) {
+    const allTabs = [...gBrowser.tabs, ...gBrowser.tabGroups];
+    for (let i = 0; i < allTabs.length; i++) {
+      const otherTab = allTabs[i];
       if (
-        tab.hasAttribute('zen-pin-id') ||
-        !this._hasFinishedLoading ||
-        tab.hasAttribute('zen-empty-tab')
+        otherTab.pinned &&
+        otherTab.getAttribute('zen-pin-id') !== tab.getAttribute('zen-pin-id')
       ) {
-        return;
+        const actualPin = this._pinsCache.find(
+          (pin) => pin.uuid === otherTab.getAttribute('zen-pin-id')
+        );
+        if (!actualPin) {
+          continue;
+        }
+        actualPin.position = otherTab._pPos;
+        actualPin.workspaceUuid = otherTab.getAttribute('zen-workspace-id');
+        actualPin.parentUuid = otherTab.group?.getAttribute('zen-pin-id') || null;
+        await this.savePin(actualPin, false);
       }
+    }
 
-      this.log(`Setting pinned attributes for tab ${tab.linkedBrowser.currentURI.spec}`);
-      const browser = tab.linkedBrowser;
+    const actualPin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
 
-      const uuid = gZenUIManager.generateUuidv4();
-      const userContextId = tab.getAttribute('usercontextid');
+    if (!actualPin) {
+      return;
+    }
+    actualPin.position = tab._pPos;
+    actualPin.isEssential = tab.hasAttribute('zen-essential');
+    actualPin.parentUuid = tab.group?.getAttribute('zen-pin-id') || null;
+    actualPin.workspaceUuid = tab.getAttribute('zen-workspace-id') || null;
 
-      let entry = null;
+    // There was a bug where the title and hasStaticLabel attribute were not being set
+    // This is a workaround to fix that
+    if (tab.hasAttribute('zen-has-static-label')) {
+      actualPin.editedTitle = true;
+      actualPin.title = tab.label;
+    }
+    await this.savePin(actualPin);
+    tab.dispatchEvent(
+      new CustomEvent('ZenPinnedTabMoved', {
+        detail: { tab },
+      })
+    );
+  }
 
-      if (tab.getAttribute('zen-pinned-entry')) {
-        entry = JSON.parse(tab.getAttribute('zen-pinned-entry'));
-      }
-
-      await this.savePin({
-        uuid,
-        title: entry?.title || tab.label || browser.contentTitle,
-        url: entry?.url || browser.currentURI.spec,
-        containerTabId: userContextId ? parseInt(userContextId, 10) : 0,
-        workspaceUuid: tab.getAttribute('zen-workspace-id'),
-        isEssential: tab.getAttribute('zen-essential') === 'true',
-        parentUuid: tab.group?.getAttribute('zen-pin-id') || null,
-        position: tab._pPos,
+  async _onTabClick(e) {
+    const tab = e.target?.closest('tab');
+    if (e.button === 1 && tab) {
+      await this.onCloseTabShortcut(e, tab, {
+        closeIfPending: Services.prefs.getBoolPref('zen.pinned-tab-manager.wheel-close-if-pending'),
       });
+    }
+  }
 
-      tab.setAttribute('zen-pin-id', uuid);
-      tab.dispatchEvent(
-        new CustomEvent('ZenPinnedTabCreated', {
-          detail: { tab },
-        })
-      );
-
-      // This is used while migrating old pins to new system - we don't want to refresh when migrating
-      if (tab.getAttribute('zen-pinned-entry')) {
-        tab.removeAttribute('zen-pinned-entry');
-        return;
-      }
-      this.onLocationChange(browser);
-      await this.refreshPinnedTabs();
+  async resetPinnedTab(tab) {
+    if (!tab) {
+      tab = TabContextMenu.contextTab;
     }
 
-    async _removePinnedAttributes(tab, isClosing = false) {
-      tab.removeAttribute('zen-has-static-label');
-      if (!tab.getAttribute('zen-pin-id') || this._temporarilyUnpiningEssential) {
-        return;
-      }
-
-      if (Services.startup.shuttingDown || window.skipNextCanClose) {
-        return;
-      }
-
-      this.log(`Removing pinned attributes for tab ${tab.getAttribute('zen-pin-id')}`);
-      await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
-      this.resetPinChangedUrl(tab);
-
-      if (!isClosing) {
-        tab.removeAttribute('zen-pin-id');
-        tab.removeAttribute('zen-essential'); // Just in case
-
-        if (!tab.hasAttribute('zen-workspace-id') && gZenWorkspaces.workspaceEnabled) {
-          const workspace = await gZenWorkspaces.getActiveWorkspace();
-          tab.setAttribute('zen-workspace-id', workspace.uuid);
-        }
-      }
-      await this.refreshPinnedTabs();
-      tab.dispatchEvent(
-        new CustomEvent('ZenPinnedTabRemoved', {
-          detail: { tab },
-        })
-      );
+    if (!tab || !tab.pinned) {
+      return;
     }
 
-    _initClosePinnedTabShortcut() {
-      let cmdClose = document.getElementById('cmd_close');
+    await this._resetTabToStoredState(tab);
+  }
 
-      if (cmdClose) {
-        cmdClose.addEventListener('command', this.onCloseTabShortcut.bind(this));
-      }
+  async replacePinnedUrlWithCurrent(tab = undefined) {
+    tab ??= TabContextMenu.contextTab;
+    if (!tab || !tab.pinned || !tab.getAttribute('zen-pin-id')) {
+      return;
     }
 
-    async savePin(pin, notifyObservers = true) {
-      if (!this.hasInitializedPins && !gZenUIManager.testingEnabled) {
-        return;
-      }
-      const existingPin = this._pinsCache.find((p) => p.uuid === pin.uuid);
-      if (existingPin) {
-        Object.assign(existingPin, pin);
-      } else {
-        // We shouldn't need it, but just in case there's
-        // a race condition while making new pinned tabs.
-        this._pinsCache.push(pin);
-      }
-      await ZenPinnedTabsStorage.savePin(pin, notifyObservers);
+    const browser = tab.linkedBrowser;
+
+    const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
+
+    if (!pin) {
+      return;
     }
 
-    async onCloseTabShortcut(
-      event,
-      selectedTab = gBrowser.selectedTab,
-      {
-        behavior = lazy.zenPinnedTabCloseShortcutBehavior,
-        noClose = false,
-        closeIfPending = false,
-        alwaysUnload = false,
-        folderToUnload = null,
-      } = {}
+    const userContextId = tab.getAttribute('usercontextid');
+
+    pin.title = tab.label || browser.contentTitle;
+    pin.url = browser.currentURI.spec;
+    pin.workspaceUuid = tab.getAttribute('zen-workspace-id');
+    pin.userContextId = userContextId ? parseInt(userContextId, 10) : 0;
+
+    await this.savePin(pin);
+    this.resetPinChangedUrl(tab);
+    await this.refreshPinnedTabs();
+    gZenUIManager.showToast('zen-pinned-tab-replaced');
+  }
+
+  async _setPinnedAttributes(tab) {
+    if (
+      tab.hasAttribute('zen-pin-id') ||
+      !this._hasFinishedLoading ||
+      tab.hasAttribute('zen-empty-tab')
     ) {
-      try {
-        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)
-          ),
-        ];
+      return;
+    }
 
-        if (!pinnedTabs.length) {
-          return;
-        }
+    this.log(`Setting pinned attributes for tab ${tab.linkedBrowser.currentURI.spec}`);
+    const browser = tab.linkedBrowser;
 
-        const selectedTabs = pinnedTabs.filter((tab) => tab.selected);
+    const uuid = gZenUIManager.generateUuidv4();
+    const userContextId = tab.getAttribute('usercontextid');
 
-        event.stopPropagation();
-        event.preventDefault();
+    let entry = null;
 
-        if (noClose && behavior === 'close') {
-          behavior = 'unload-switch';
-        }
+    if (tab.getAttribute('zen-pinned-entry')) {
+      entry = JSON.parse(tab.getAttribute('zen-pinned-entry'));
+    }
 
-        if (alwaysUnload && ['close', 'reset', 'switch', 'reset-switch'].includes(behavior)) {
-          behavior = behavior.contains('reset') ? 'reset-unload-switch' : 'unload-switch';
-        }
+    await this.savePin({
+      uuid,
+      title: entry?.title || tab.label || browser.contentTitle,
+      url: entry?.url || browser.currentURI.spec,
+      containerTabId: userContextId ? parseInt(userContextId, 10) : 0,
+      workspaceUuid: tab.getAttribute('zen-workspace-id'),
+      isEssential: tab.getAttribute('zen-essential') === 'true',
+      parentUuid: tab.group?.getAttribute('zen-pin-id') || null,
+      position: tab._pPos,
+    });
 
-        switch (behavior) {
-          case 'close': {
-            for (const tab of pinnedTabs) {
-              this._removePinnedAttributes(tab, true);
-              gBrowser.removeTab(tab, { animate: true });
-            }
-            break;
+    tab.setAttribute('zen-pin-id', uuid);
+    tab.dispatchEvent(
+      new CustomEvent('ZenPinnedTabCreated', {
+        detail: { tab },
+      })
+    );
+
+    // This is used while migrating old pins to new system - we don't want to refresh when migrating
+    if (tab.getAttribute('zen-pinned-entry')) {
+      tab.removeAttribute('zen-pinned-entry');
+      return;
+    }
+    this.onLocationChange(browser);
+    await this.refreshPinnedTabs();
+  }
+
+  async _removePinnedAttributes(tab, isClosing = false) {
+    tab.removeAttribute('zen-has-static-label');
+    if (!tab.getAttribute('zen-pin-id') || this._temporarilyUnpiningEssential) {
+      return;
+    }
+
+    if (Services.startup.shuttingDown || window.skipNextCanClose) {
+      return;
+    }
+
+    this.log(`Removing pinned attributes for tab ${tab.getAttribute('zen-pin-id')}`);
+    await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
+    this.resetPinChangedUrl(tab);
+
+    if (!isClosing) {
+      tab.removeAttribute('zen-pin-id');
+      tab.removeAttribute('zen-essential'); // Just in case
+
+      if (!tab.hasAttribute('zen-workspace-id') && gZenWorkspaces.workspaceEnabled) {
+        const workspace = await gZenWorkspaces.getActiveWorkspace();
+        tab.setAttribute('zen-workspace-id', workspace.uuid);
+      }
+    }
+    await this.refreshPinnedTabs();
+    tab.dispatchEvent(
+      new CustomEvent('ZenPinnedTabRemoved', {
+        detail: { tab },
+      })
+    );
+  }
+
+  _initClosePinnedTabShortcut() {
+    let cmdClose = document.getElementById('cmd_close');
+
+    if (cmdClose) {
+      cmdClose.addEventListener('command', this.onCloseTabShortcut.bind(this));
+    }
+  }
+
+  async savePin(pin, notifyObservers = true) {
+    if (!this.hasInitializedPins && !gZenUIManager.testingEnabled) {
+      return;
+    }
+    const existingPin = this._pinsCache.find((p) => p.uuid === pin.uuid);
+    if (existingPin) {
+      Object.assign(existingPin, pin);
+    } else {
+      // We shouldn't need it, but just in case there's
+      // a race condition while making new pinned tabs.
+      this._pinsCache.push(pin);
+    }
+    await ZenPinnedTabsStorage.savePin(pin, notifyObservers);
+  }
+
+  async onCloseTabShortcut(
+    event,
+    selectedTab = gBrowser.selectedTab,
+    {
+      behavior = lazy.zenPinnedTabCloseShortcutBehavior,
+      noClose = false,
+      closeIfPending = false,
+      alwaysUnload = false,
+      folderToUnload = null,
+    } = {}
+  ) {
+    try {
+      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();
+
+      if (noClose && behavior === 'close') {
+        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': {
+          for (const tab of pinnedTabs) {
+            this._removePinnedAttributes(tab, true);
+            gBrowser.removeTab(tab, { animate: true });
           }
-          case 'reset-unload-switch':
-          case 'unload-switch':
-          case 'reset-switch':
-          case 'switch':
-            if (behavior.includes('unload')) {
-              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;
+          break;
+        }
+        case 'reset-unload-switch':
+        case 'unload-switch':
+        case 'reset-switch':
+        case 'switch':
+          if (behavior.includes('unload')) {
+            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();
+                  };
+                  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();
-                    };
-                    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);
-                  });
-                  return;
-                }
-                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);
-                }
+                    }
+                  }, 3000);
+                });
+                return;
               }
-              if (folderToUnload) {
-                await gZenFolders.animateUnloadAll(folderToUnload);
-              }
-              const allAreUnloaded = pinnedTabs.every(
-                (tab) => tab.hasAttribute('pending') && !tab.hasAttribute('zen-essential')
-              );
-              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');
+              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);
               }
             }
-            if (selectedTabs.length) {
-              this._handleTabSwitch(selectedTabs[0]);
+            if (folderToUnload) {
+              await gZenFolders.animateUnloadAll(folderToUnload);
             }
-            if (behavior.includes('reset')) {
-              for (const tab of pinnedTabs) {
-                this._resetTabToStoredState(tab);
+            const allAreUnloaded = pinnedTabs.every(
+              (tab) => tab.hasAttribute('pending') && !tab.hasAttribute('zen-essential')
+            );
+            for (const tab of pinnedTabs) {
+              if (allAreUnloaded && closeIfPending) {
+                return await this.onCloseTabShortcut(event, tab, { behavior: 'close' });
               }
             }
-            break;
-          case 'reset':
+            await gBrowser.explicitUnloadTabs(pinnedTabs);
+            for (const tab of pinnedTabs) {
+              tab.removeAttribute('discarded');
+            }
+          }
+          if (selectedTabs.length) {
+            this._handleTabSwitch(selectedTabs[0]);
+          }
+          if (behavior.includes('reset')) {
             for (const tab of pinnedTabs) {
               this._resetTabToStoredState(tab);
             }
-            break;
-          default:
-            return;
-        }
-      } catch (ex) {
-        console.error('Error handling close tab shortcut for pinned tab:', ex);
+          }
+          break;
+        case 'reset':
+          for (const tab of pinnedTabs) {
+            this._resetTabToStoredState(tab);
+          }
+          break;
+        default:
+          return;
       }
+    } catch (ex) {
+      console.error('Error handling close tab shortcut for pinned tab:', ex);
+    }
+  }
+
+  _handleTabSwitch(selectedTab) {
+    if (selectedTab !== gBrowser.selectedTab) {
+      return;
+    }
+    const findNextTab = (direction) =>
+      gBrowser.tabContainer.findNextTab(selectedTab, {
+        direction,
+        filter: (tab) => !tab.hidden && !tab.pinned,
+      });
+
+    let nextTab = findNextTab(1) || findNextTab(-1);
+
+    if (!nextTab) {
+      gZenWorkspaces.selectEmptyTab();
+      return;
     }
 
-    _handleTabSwitch(selectedTab) {
-      if (selectedTab !== gBrowser.selectedTab) {
-        return;
-      }
-      const findNextTab = (direction) =>
-        gBrowser.tabContainer.findNextTab(selectedTab, {
-          direction,
-          filter: (tab) => !tab.hidden && !tab.pinned,
-        });
+    if (nextTab) {
+      gBrowser.selectedTab = nextTab;
+    }
+  }
 
-      let nextTab = findNextTab(1) || findNextTab(-1);
-
-      if (!nextTab) {
-        gZenWorkspaces.selectEmptyTab();
-        return;
-      }
-
-      if (nextTab) {
-        gBrowser.selectedTab = nextTab;
-      }
+  _resetTabToStoredState(tab) {
+    const id = tab.getAttribute('zen-pin-id');
+    if (!id) {
+      return;
     }
 
-    _resetTabToStoredState(tab) {
-      const id = tab.getAttribute('zen-pin-id');
-      if (!id) {
-        return;
-      }
-
-      const pin = this._pinsCache.find((pin) => pin.uuid === id);
-      if (!pin) {
-        return;
-      }
-
-      const tabState = SessionStore.getTabState(tab);
-      const state = JSON.parse(tabState);
-
-      const foundEntryIndex = state.entries?.findIndex((entry) => entry.url === pin.url);
-      if (foundEntryIndex === -1) {
-        state.entries = [
-          {
-            url: pin.url,
-            title: pin.title,
-            triggeringPrincipal_base64: lazy.E10SUtils.SERIALIZED_SYSTEMPRINCIPAL,
-          },
-        ];
-      } else {
-        // Remove everything except the entry we want to keep
-        const existingEntry = state.entries[foundEntryIndex];
-        existingEntry.title = pin.title;
-        state.entries = [existingEntry];
-      }
-      state.image = pin.iconUrl || state.image;
-      state.index = 0;
-
-      SessionStore.setTabState(tab, state);
-      this.resetPinChangedUrl(tab);
+    const pin = this._pinsCache.find((pin) => pin.uuid === id);
+    if (!pin) {
+      return;
     }
 
-    async getFaviconAsBase64(pageUrl) {
-      try {
-        const faviconData = await PlacesUtils.favicons.getFaviconForPage(pageUrl);
-        if (!faviconData) {
-          // empty favicon
-          return null;
-        }
-        return faviconData.dataURI;
-      } catch (ex) {
-        console.error('Failed to get favicon:', ex);
+    const tabState = SessionStore.getTabState(tab);
+    const state = JSON.parse(tabState);
+
+    const foundEntryIndex = state.entries?.findIndex((entry) => entry.url === pin.url);
+    if (foundEntryIndex === -1) {
+      state.entries = [
+        {
+          url: pin.url,
+          title: pin.title,
+          triggeringPrincipal_base64: lazy.E10SUtils.SERIALIZED_SYSTEMPRINCIPAL,
+        },
+      ];
+    } else {
+      // Remove everything except the entry we want to keep
+      const existingEntry = state.entries[foundEntryIndex];
+      existingEntry.title = pin.title;
+      state.entries = [existingEntry];
+    }
+    state.image = pin.iconUrl || state.image;
+    state.index = 0;
+
+    SessionStore.setTabState(tab, state);
+    this.resetPinChangedUrl(tab);
+  }
+
+  async getFaviconAsBase64(pageUrl) {
+    try {
+      const faviconData = await PlacesUtils.favicons.getFaviconForPage(pageUrl);
+      if (!faviconData) {
+        // empty favicon
         return null;
       }
+      return faviconData.dataURI;
+    } catch (ex) {
+      console.error('Failed to get favicon:', ex);
+      return null;
     }
+  }
 
-    addToEssentials(tab) {
-      const tabs = tab
-        ? // if it's already an array, dont make it [tab]
-          tab?.length
-          ? tab
-          : [tab]
-        : TabContextMenu.contextTab.multiselected
-          ? gBrowser.selectedTabs
-          : [TabContextMenu.contextTab];
-      let movedAll = true;
-      for (let i = 0; i < tabs.length; i++) {
-        let tab = tabs[i];
-        const section = gZenWorkspaces.getEssentialsSection(tab);
-        if (!this.canEssentialBeAdded(tab)) {
-          movedAll = false;
-          continue;
+  addToEssentials(tab) {
+    const tabs = tab
+      ? // if it's already an array, dont make it [tab]
+        tab?.length
+        ? tab
+        : [tab]
+      : TabContextMenu.contextTab.multiselected
+        ? gBrowser.selectedTabs
+        : [TabContextMenu.contextTab];
+    let movedAll = true;
+    for (let i = 0; i < tabs.length; i++) {
+      let tab = tabs[i];
+      const section = gZenWorkspaces.getEssentialsSection(tab);
+      if (!this.canEssentialBeAdded(tab)) {
+        movedAll = false;
+        continue;
+      }
+      if (tab.hasAttribute('zen-essential')) {
+        continue;
+      }
+      tab.setAttribute('zen-essential', 'true');
+      if (tab.hasAttribute('zen-workspace-id')) {
+        tab.removeAttribute('zen-workspace-id');
+      }
+      if (tab.pinned && tab.hasAttribute('zen-pin-id')) {
+        const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
+        if (pin) {
+          pin.isEssential = true;
+          pin.workspaceUuid = null;
+          this.savePin(pin);
         }
-        if (tab.hasAttribute('zen-essential')) {
-          continue;
-        }
-        tab.setAttribute('zen-essential', 'true');
-        if (tab.hasAttribute('zen-workspace-id')) {
-          tab.removeAttribute('zen-workspace-id');
-        }
-        if (tab.pinned && tab.hasAttribute('zen-pin-id')) {
-          const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
-          if (pin) {
-            pin.isEssential = true;
-            pin.workspaceUuid = null;
-            this.savePin(pin);
+        gBrowser.zenHandleTabMove(tab, () => {
+          if (tab.ownerGlobal !== window) {
+            tab = gBrowser.adoptTab(tab, {
+              selectTab: tab.selected,
+            });
+            tab.setAttribute('zen-essential', 'true');
+          } else {
+            section.appendChild(tab);
           }
-          gBrowser.zenHandleTabMove(tab, () => {
-            if (tab.ownerGlobal !== window) {
-              tab = gBrowser.adoptTab(tab, {
-                selectTab: tab.selected,
-              });
-              tab.setAttribute('zen-essential', 'true');
-            } else {
-              section.appendChild(tab);
-            }
-          });
-        } else {
-          gBrowser.pinTab(tab);
-          this._ignoreNextTabPinnedEvent = true;
-        }
-        tab.setAttribute('zenDefaultUserContextId', true);
-        if (tab.selected) {
-          gZenWorkspaces.switchTabIfNeeded(tab);
-        }
-        this.onTabIconChanged(tab);
-        // Dispatch the event to update the UI
-        const event = new CustomEvent('TabAddedToEssentials', {
-          detail: { tab },
-          bubbles: true,
-          cancelable: false,
         });
-        tab.dispatchEvent(event);
+      } else {
+        gBrowser.pinTab(tab);
+        this._ignoreNextTabPinnedEvent = true;
       }
-      gZenUIManager.updateTabsToolbar();
-      return movedAll;
+      tab.setAttribute('zenDefaultUserContextId', true);
+      if (tab.selected) {
+        gZenWorkspaces.switchTabIfNeeded(tab);
+      }
+      this.onTabIconChanged(tab);
+      // Dispatch the event to update the UI
+      const event = new CustomEvent('TabAddedToEssentials', {
+        detail: { tab },
+        bubbles: true,
+        cancelable: false,
+      });
+      tab.dispatchEvent(event);
     }
+    gZenUIManager.updateTabsToolbar();
+    return movedAll;
+  }
 
-    removeEssentials(tab, unpin = true) {
-      const tabs = tab
-        ? [tab]
-        : TabContextMenu.contextTab.multiselected
-          ? gBrowser.selectedTabs
-          : [TabContextMenu.contextTab];
-      for (let i = 0; i < tabs.length; i++) {
-        const tab = tabs[i];
-        tab.removeAttribute('zen-essential');
-        if (gZenWorkspaces.workspaceEnabled && gZenWorkspaces.getActiveWorkspaceFromCache().uuid) {
-          tab.setAttribute('zen-workspace-id', gZenWorkspaces.getActiveWorkspaceFromCache().uuid);
-        }
-        if (unpin) {
-          gBrowser.unpinTab(tab);
-        } else {
-          gBrowser.zenHandleTabMove(tab, () => {
-            const pinContainer = gZenWorkspaces.pinnedTabsContainer;
-            pinContainer.prepend(tab);
-          });
-        }
-        // Dispatch the event to update the UI
-        const event = new CustomEvent('TabRemovedFromEssentials', {
-          detail: { tab },
-          bubbles: true,
-          cancelable: false,
+  removeEssentials(tab, unpin = true) {
+    const tabs = tab
+      ? [tab]
+      : TabContextMenu.contextTab.multiselected
+        ? gBrowser.selectedTabs
+        : [TabContextMenu.contextTab];
+    for (let i = 0; i < tabs.length; i++) {
+      const tab = tabs[i];
+      tab.removeAttribute('zen-essential');
+      if (gZenWorkspaces.workspaceEnabled && gZenWorkspaces.getActiveWorkspaceFromCache().uuid) {
+        tab.setAttribute('zen-workspace-id', gZenWorkspaces.getActiveWorkspaceFromCache().uuid);
+      }
+      if (unpin) {
+        gBrowser.unpinTab(tab);
+      } else {
+        gBrowser.zenHandleTabMove(tab, () => {
+          const pinContainer = gZenWorkspaces.pinnedTabsContainer;
+          pinContainer.prepend(tab);
         });
-        tab.dispatchEvent(event);
       }
-      gZenUIManager.updateTabsToolbar();
+      // Dispatch the event to update the UI
+      const event = new CustomEvent('TabRemovedFromEssentials', {
+        detail: { tab },
+        bubbles: true,
+        cancelable: false,
+      });
+      tab.dispatchEvent(event);
     }
+    gZenUIManager.updateTabsToolbar();
+  }
 
-    _insertItemsIntoTabContextMenu() {
-      if (!this.enabled) {
-        return;
-      }
-      const elements = window.MozXULElement.parseXULToFragment(`
+  _insertItemsIntoTabContextMenu() {
+    if (!this.enabled) {
+      return;
+    }
+    const elements = window.MozXULElement.parseXULToFragment(`
             <menuseparator id="context_zen-pinned-tab-separator" hidden="true"/>
             <menuitem id="context_zen-replace-pinned-url-with-current"
                       data-lazy-l10n-id="tab-context-zen-replace-pinned-url-with-current"
@@ -1101,9 +1100,9 @@
                       hidden="true"
                       command="cmd_zenPinnedTabResetNoTab"/>
         `);
-      document.getElementById('tabContextMenu').appendChild(elements);
+    document.getElementById('tabContextMenu').appendChild(elements);
 
-      const element = window.MozXULElement.parseXULToFragment(`
+    const element = window.MozXULElement.parseXULToFragment(`
             <menuitem id="context_zen-add-essential"
                       data-l10n-id="tab-context-zen-add-essential"
                       hidden="true"
@@ -1115,470 +1114,469 @@
                       command="cmd_contextZenRemoveFromEssentials"/>
         `);
 
-      document.getElementById('context_pinTab')?.before(element);
+    document.getElementById('context_pinTab')?.before(element);
+  }
+
+  async updatePinnedTabContextMenu(contextTab) {
+    if (!this.enabled) {
+      document.getElementById('context_pinTab').hidden = true;
+      return;
     }
+    const isVisible = contextTab.pinned && !contextTab.multiselected;
+    const zenAddEssential = document.getElementById('context_zen-add-essential');
+    document.getElementById('context_zen-reset-pinned-tab').hidden =
+      !isVisible || !contextTab.getAttribute('zen-pin-id');
+    document.getElementById('context_zen-replace-pinned-url-with-current').hidden = !isVisible;
+    zenAddEssential.hidden = contextTab.getAttribute('zen-essential') || !!contextTab.group;
+    zenAddEssential.setAttribute(
+      'badge',
+      await document.l10n.formatValue('tab-context-zen-add-essential-badge', {
+        num: gBrowser._numZenEssentials,
+        max: this.maxEssentialTabs,
+      })
+    );
+    document
+      .getElementById('cmd_contextZenAddToEssentials')
+      .setAttribute('disabled', !this.canEssentialBeAdded(contextTab));
+    document.getElementById('context_closeTab').hidden = contextTab.hasAttribute('zen-essential');
+    document.getElementById('context_zen-remove-essential').hidden =
+      !contextTab.getAttribute('zen-essential');
+    document.getElementById('zen-context-menu-new-folder').hidden =
+      contextTab.getAttribute('zen-essential');
+    document.getElementById('context_unpinTab').hidden =
+      document.getElementById('context_unpinTab').hidden ||
+      contextTab.getAttribute('zen-essential');
+    document.getElementById('context_unpinSelectedTabs').hidden =
+      document.getElementById('context_unpinSelectedTabs').hidden ||
+      contextTab.getAttribute('zen-essential');
+    document.getElementById('context_zen-pinned-tab-separator').hidden = !isVisible;
+  }
 
-    async updatePinnedTabContextMenu(contextTab) {
-      if (!this.enabled) {
-        document.getElementById('context_pinTab').hidden = true;
-        return;
-      }
-      const isVisible = contextTab.pinned && !contextTab.multiselected;
-      const zenAddEssential = document.getElementById('context_zen-add-essential');
-      document.getElementById('context_zen-reset-pinned-tab').hidden =
-        !isVisible || !contextTab.getAttribute('zen-pin-id');
-      document.getElementById('context_zen-replace-pinned-url-with-current').hidden = !isVisible;
-      zenAddEssential.hidden = contextTab.getAttribute('zen-essential') || !!contextTab.group;
-      zenAddEssential.setAttribute(
-        'badge',
-        await document.l10n.formatValue('tab-context-zen-add-essential-badge', {
-          num: gBrowser._numZenEssentials,
-          max: this.maxEssentialTabs,
-        })
-      );
-      document
-        .getElementById('cmd_contextZenAddToEssentials')
-        .setAttribute('disabled', !this.canEssentialBeAdded(contextTab));
-      document.getElementById('context_closeTab').hidden = contextTab.hasAttribute('zen-essential');
-      document.getElementById('context_zen-remove-essential').hidden =
-        !contextTab.getAttribute('zen-essential');
-      document.getElementById('zen-context-menu-new-folder').hidden =
-        contextTab.getAttribute('zen-essential');
-      document.getElementById('context_unpinTab').hidden =
-        document.getElementById('context_unpinTab').hidden ||
-        contextTab.getAttribute('zen-essential');
-      document.getElementById('context_unpinSelectedTabs').hidden =
-        document.getElementById('context_unpinSelectedTabs').hidden ||
-        contextTab.getAttribute('zen-essential');
-      document.getElementById('context_zen-pinned-tab-separator').hidden = !isVisible;
+  moveToAnotherTabContainerIfNecessary(event, movingTabs) {
+    if (!this.enabled) {
+      return false;
     }
+    movingTabs = [...movingTabs];
+    try {
+      const pinnedTabsTarget =
+        event.target.closest('.zen-current-workspace-indicator') || this._isGoingToPinnedTabs;
+      const essentialTabsTarget = event.target.closest('.zen-essentials-container');
+      const tabsTarget = !this._isGoingToPinnedTabs;
 
-    moveToAnotherTabContainerIfNecessary(event, movingTabs) {
-      if (!this.enabled) {
-        return false;
+      // TODO: Solve the issue of adding a tab between two groups
+      // Remove group labels from the moving tabs and replace it
+      // with the sub tabs
+      for (let i = 0; i < movingTabs.length; i++) {
+        const draggedTab = movingTabs[i];
+        if (gBrowser.isTabGroupLabel(draggedTab)) {
+          const group = draggedTab.group;
+          // remove label and add sub tabs to moving tabs
+          if (group) {
+            movingTabs.splice(i, 1, ...group.tabs);
+          }
+        }
       }
-      movingTabs = [...movingTabs];
-      try {
-        const pinnedTabsTarget =
-          event.target.closest('.zen-current-workspace-indicator') || this._isGoingToPinnedTabs;
-        const essentialTabsTarget = event.target.closest('.zen-essentials-container');
-        const tabsTarget = !this._isGoingToPinnedTabs;
 
-        // TODO: Solve the issue of adding a tab between two groups
-        // Remove group labels from the moving tabs and replace it
-        // with the sub tabs
-        for (let i = 0; i < movingTabs.length; i++) {
-          const draggedTab = movingTabs[i];
-          if (gBrowser.isTabGroupLabel(draggedTab)) {
-            const group = draggedTab.group;
-            // remove label and add sub tabs to moving tabs
-            if (group) {
-              movingTabs.splice(i, 1, ...group.tabs);
-            }
+      let isVertical = this.expandedSidebarMode;
+      let moved = false;
+      let hasActuallyMoved;
+      for (const draggedTab of movingTabs) {
+        let isRegularTabs = false;
+        // Check for essentials container
+        if (essentialTabsTarget) {
+          if (!draggedTab.hasAttribute('zen-essential') && !draggedTab?.group) {
+            moved = true;
+            isVertical = false;
+            hasActuallyMoved = this.addToEssentials(draggedTab);
+          }
+        }
+        // Check for pinned tabs container
+        else if (pinnedTabsTarget) {
+          if (!draggedTab.pinned) {
+            gBrowser.pinTab(draggedTab);
+          } else if (draggedTab.hasAttribute('zen-essential')) {
+            this.removeEssentials(draggedTab, false);
+            moved = true;
+          }
+        }
+        // Check for normal tabs container
+        else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
+          if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
+            gBrowser.unpinTab(draggedTab);
+            isRegularTabs = true;
+          } else if (draggedTab.hasAttribute('zen-essential')) {
+            this.removeEssentials(draggedTab);
+            moved = true;
+            isRegularTabs = true;
           }
         }
 
-        let isVertical = this.expandedSidebarMode;
-        let moved = false;
-        let hasActuallyMoved;
-        for (const draggedTab of movingTabs) {
-          let isRegularTabs = false;
-          // Check for essentials container
-          if (essentialTabsTarget) {
-            if (!draggedTab.hasAttribute('zen-essential') && !draggedTab?.group) {
-              moved = true;
-              isVertical = false;
-              hasActuallyMoved = this.addToEssentials(draggedTab);
-            }
-          }
-          // Check for pinned tabs container
-          else if (pinnedTabsTarget) {
-            if (!draggedTab.pinned) {
-              gBrowser.pinTab(draggedTab);
-            } else if (draggedTab.hasAttribute('zen-essential')) {
-              this.removeEssentials(draggedTab, false);
-              moved = true;
-            }
-          }
-          // Check for normal tabs container
-          else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
-            if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
-              gBrowser.unpinTab(draggedTab);
-              isRegularTabs = true;
-            } else if (draggedTab.hasAttribute('zen-essential')) {
-              this.removeEssentials(draggedTab);
-              moved = true;
-              isRegularTabs = true;
-            }
-          }
+        if (typeof hasActuallyMoved === 'undefined') {
+          hasActuallyMoved = moved;
+        }
 
-          if (typeof hasActuallyMoved === 'undefined') {
-            hasActuallyMoved = moved;
+        // If the tab was moved, adjust its position relative to the target tab
+        if (hasActuallyMoved) {
+          const targetTab = event.target.closest('.tabbrowser-tab');
+          const targetFolder = event.target.closest('zen-folder');
+          let targetElem = targetTab || targetFolder?.labelElement;
+          if (targetElem?.group?.activeGroups?.length > 0) {
+            const activeGroup = targetElem.group.activeGroups.at(-1);
+            targetElem = activeGroup.labelElement;
           }
+          if (targetElem) {
+            const rect = targetElem.getBoundingClientRect();
+            let elementIndex = targetElem.elementIndex;
 
-          // If the tab was moved, adjust its position relative to the target tab
-          if (hasActuallyMoved) {
-            const targetTab = event.target.closest('.tabbrowser-tab');
-            const targetFolder = event.target.closest('zen-folder');
-            let targetElem = targetTab || targetFolder?.labelElement;
-            if (targetElem?.group?.activeGroups?.length > 0) {
-              const activeGroup = targetElem.group.activeGroups.at(-1);
-              targetElem = activeGroup.labelElement;
-            }
-            if (targetElem) {
-              const rect = targetElem.getBoundingClientRect();
-              let elementIndex = targetElem.elementIndex;
-
-              if (isVertical || !this.expandedSidebarMode) {
-                const middleY = targetElem.screenY + rect.height / 2;
-                if (!isRegularTabs && event.screenY > middleY) {
-                  elementIndex++;
-                } else if (isRegularTabs && event.screenY < middleY) {
-                  elementIndex--;
-                }
-              } else {
-                const middleX = targetElem.screenX + rect.width / 2;
-                if (event.screenX > middleX) {
-                  elementIndex++;
-                }
+            if (isVertical || !this.expandedSidebarMode) {
+              const middleY = targetElem.screenY + rect.height / 2;
+              if (!isRegularTabs && event.screenY > middleY) {
+                elementIndex++;
+              } else if (isRegularTabs && event.screenY < middleY) {
+                elementIndex--;
               }
-              // If it's the last tab, move it to the end
-              if (tabsTarget === gBrowser.tabs.at(-1)) {
+            } else {
+              const middleX = targetElem.screenX + rect.width / 2;
+              if (event.screenX > middleX) {
                 elementIndex++;
               }
-
-              gBrowser.moveTabTo(draggedTab, {
-                elementIndex,
-                forceUngrouped: targetElem?.group?.collapsed !== false,
-              });
             }
+            // If it's the last tab, move it to the end
+            if (tabsTarget === gBrowser.tabs.at(-1)) {
+              elementIndex++;
+            }
+
+            gBrowser.moveTabTo(draggedTab, {
+              elementIndex,
+              forceUngrouped: targetElem?.group?.collapsed !== false,
+            });
           }
         }
-
-        return moved;
-      } catch (ex) {
-        console.error('Error moving tabs:', ex);
-        return false;
       }
+
+      return moved;
+    } catch (ex) {
+      console.error('Error moving tabs:', ex);
+      return false;
     }
+  }
 
-    async onLocationChange(browser) {
-      const tab = gBrowser.getTabForBrowser(browser);
-      if (!tab || !tab.pinned || tab.hasAttribute('zen-essential') || !this._pinsCache) {
-        return;
-      }
-      const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
-      if (!pin) {
-        return;
-      }
-      // Remove # and ? from the URL
-      const pinUrl = pin.url.split('#')[0];
-      const currentUrl = browser.currentURI.spec.split('#')[0];
-      // Add an indicator that the pin has been changed
-      if (pinUrl === currentUrl) {
-        this.resetPinChangedUrl(tab);
-        return;
-      }
-      this.pinHasChangedUrl(tab, pin);
+  async onLocationChange(browser) {
+    const tab = gBrowser.getTabForBrowser(browser);
+    if (!tab || !tab.pinned || tab.hasAttribute('zen-essential') || !this._pinsCache) {
+      return;
     }
-
-    resetPinChangedUrl(tab) {
-      if (!tab.hasAttribute('zen-pinned-changed')) {
-        return;
-      }
-      tab.removeAttribute('zen-pinned-changed');
-      tab.removeAttribute('had-zen-pinned-changed');
-      tab.style.removeProperty('--zen-original-tab-icon');
+    const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
+    if (!pin) {
+      return;
     }
-
-    pinHasChangedUrl(tab, pin) {
-      if (tab.hasAttribute('zen-pinned-changed')) {
-        return;
-      }
-      if (tab.group?.hasAttribute('split-view-group')) {
-        tab.setAttribute('had-zen-pinned-changed', 'true');
-      } else {
-        tab.setAttribute('zen-pinned-changed', 'true');
-      }
-      tab.style.setProperty('--zen-original-tab-icon', `url(${pin.iconUrl?.spec})`);
+    // Remove # and ? from the URL
+    const pinUrl = pin.url.split('#')[0];
+    const currentUrl = browser.currentURI.spec.split('#')[0];
+    // Add an indicator that the pin has been changed
+    if (pinUrl === currentUrl) {
+      this.resetPinChangedUrl(tab);
+      return;
     }
+    this.pinHasChangedUrl(tab, pin);
+  }
 
-    removeTabContainersDragoverClass(hideIndicator = true) {
-      if (this._dragIndicator) {
-        Services.zen.playHapticFeedback();
-      }
-      this.dragIndicator.remove();
-      this._dragIndicator = null;
-      if (hideIndicator) {
-        gZenWorkspaces.activeWorkspaceIndicator?.removeAttribute('open');
-      }
+  resetPinChangedUrl(tab) {
+    if (!tab.hasAttribute('zen-pinned-changed')) {
+      return;
     }
+    tab.removeAttribute('zen-pinned-changed');
+    tab.removeAttribute('had-zen-pinned-changed');
+    tab.style.removeProperty('--zen-original-tab-icon');
+  }
 
-    onDragFinish() {
-      for (const item of this.dragShiftableItems) {
-        item.style.transform = '';
-      }
-      delete this._topToNormalTabs;
-      for (const item of gBrowser.tabContainer.ariaFocusableItems) {
-        if (gBrowser.isTab(item)) {
-          let isVisible = true;
-          let parent = item.group;
-          while (parent) {
-            if (!parent.visible) {
-              isVisible = false;
-              break;
-            }
-            parent = parent.group;
-          }
-          if (!isVisible) {
-            continue;
-          }
-        }
-        const itemToAnimate =
-          item.group?.hasAttribute('split-view-group') || gBrowser.isTabGroupLabel(item)
-            ? item.group
-            : item;
-        itemToAnimate.style.removeProperty('--zen-folder-indent');
-      }
-      this.removeTabContainersDragoverClass();
+  pinHasChangedUrl(tab, pin) {
+    if (tab.hasAttribute('zen-pinned-changed')) {
+      return;
     }
-
-    get dragShiftableItems() {
-      const separator = gZenWorkspaces.pinnedTabsContainer.querySelector(
-        '.pinned-tabs-container-separator'
-      );
-      // Make sure to always return the separator at the start of the array
-      return Services.prefs.getBoolPref('zen.view.show-newtab-button-top')
-        ? [separator, gZenWorkspaces.activeWorkspaceElement.newTabButton]
-        : [separator];
+    if (tab.group?.hasAttribute('split-view-group')) {
+      tab.setAttribute('had-zen-pinned-changed', 'true');
+    } else {
+      tab.setAttribute('zen-pinned-changed', 'true');
     }
+    tab.style.setProperty('--zen-original-tab-icon', `url(${pin.iconUrl?.spec})`);
+  }
 
-    animateSeparatorMove(movingTabs, dropElement, isPinned) {
-      let draggedTab = movingTabs[0];
-      if (gBrowser.isTabGroupLabel(draggedTab) && draggedTab.group.isZenFolder) {
-        this._isGoingToPinnedTabs = true;
-        return;
-      }
-      if (draggedTab?.group?.hasAttribute('split-view-group')) {
-        draggedTab = draggedTab.group;
-      }
-      const itemsToCheck = this.dragShiftableItems;
-      let translate = movingTabs[isPinned ? movingTabs.length - 1 : 0].getBoundingClientRect().top;
-      if (isPinned) {
-        const rect = draggedTab.getBoundingClientRect();
-        translate += rect.height;
-      }
-      const draggingTabHeight = movingTabs.reduce((acc, item) => {
-        return acc + window.windowUtils.getBoundsWithoutFlushing(item).height;
-      }, 0);
-      if (typeof this._topToNormalTabs === 'undefined') {
-        const rects = itemsToCheck.map((item) => window.windowUtils.getBoundsWithoutFlushing(item));
-        this._topToNormalTabs = rects[0].top + rects.at(-1).height / (isPinned ? 2 : 4);
-      }
-      let topToNormalTabs = this._topToNormalTabs;
-      const isGoingToPinnedTabs =
-        translate < topToNormalTabs && gBrowser.pinnedTabCount - gBrowser._numZenEssentials > 0;
-      const multiplier = isGoingToPinnedTabs !== isPinned ? (isGoingToPinnedTabs ? 1 : -1) : 0;
-      this._isGoingToPinnedTabs = isGoingToPinnedTabs;
-      if (!dropElement) {
-        itemsToCheck.forEach((item) => {
-          item.style.transform = `translateY(${draggingTabHeight * multiplier}px)`;
-        });
-      }
+  removeTabContainersDragoverClass(hideIndicator = true) {
+    if (this._dragIndicator) {
+      Services.zen.playHapticFeedback();
     }
-
-    getLastTabBound(lastBound, lastTab, isDraggingFolder = false) {
-      if (!lastTab.pinned || isDraggingFolder) {
-        return lastBound;
-      }
-      const shiftedItems = this.dragShiftableItems;
-      let totalHeight = shiftedItems.reduce((acc, item) => {
-        return acc + window.windowUtils.getBoundsWithoutFlushing(item).height;
-      }, 0);
-      if (shiftedItems.length === 1) {
-        // Means the new tab button is not at the top or not visible
-        const lastTabRect = window.windowUtils.getBoundsWithoutFlushing(lastTab);
-        totalHeight += lastTabRect.height;
-      }
-      return lastBound + totalHeight + 6;
+    this.dragIndicator.remove();
+    this._dragIndicator = null;
+    if (hideIndicator) {
+      gZenWorkspaces.activeWorkspaceIndicator?.removeAttribute('open');
     }
+  }
 
-    get dragIndicator() {
-      if (!this._dragIndicator) {
-        this._dragIndicator = document.createElement('div');
-        this._dragIndicator.id = 'zen-drag-indicator';
-        gNavToolbox.appendChild(this._dragIndicator);
-      }
-      return this._dragIndicator;
+  onDragFinish() {
+    for (const item of this.dragShiftableItems) {
+      item.style.transform = '';
     }
-
-    get expandedSidebarMode() {
-      return document.documentElement.getAttribute('zen-sidebar-expanded') === 'true';
-    }
-
-    async updatePinTitle(tab, newTitle, isEdited = true, notifyObservers = true) {
-      const uuid = tab.getAttribute('zen-pin-id');
-      await ZenPinnedTabsStorage.updatePinTitle(uuid, newTitle, isEdited, notifyObservers);
-
-      await this.refreshPinnedTabs();
-
-      const browsers = Services.wm.getEnumerator('navigator:browser');
-
-      // update the label for the same pin across all windows
-      for (const browser of browsers) {
-        const tabs = browser.gBrowser.tabs;
-        // Fix pinned cache for the browser
-        const browserCache = browser.gZenPinnedTabManager?._pinsCache;
-        if (browserCache) {
-          const pin = browserCache.find((pin) => pin.uuid === uuid);
-          if (pin) {
-            pin.title = newTitle;
-            pin.editedTitle = isEdited;
-          }
-        }
-        for (let i = 0; i < tabs.length; i++) {
-          const tabToEdit = tabs[i];
-          if (tabToEdit.getAttribute('zen-pin-id') === uuid && tabToEdit !== tab) {
-            tabToEdit.removeAttribute('zen-has-static-label');
-            if (isEdited) {
-              gBrowser._setTabLabel(tabToEdit, newTitle);
-              tabToEdit.setAttribute('zen-has-static-label', 'true');
-            } else {
-              gBrowser.setTabTitle(tabToEdit);
-            }
+    delete this._topToNormalTabs;
+    for (const item of gBrowser.tabContainer.ariaFocusableItems) {
+      if (gBrowser.isTab(item)) {
+        let isVisible = true;
+        let parent = item.group;
+        while (parent) {
+          if (!parent.visible) {
+            isVisible = false;
             break;
           }
+          parent = parent.group;
+        }
+        if (!isVisible) {
+          continue;
         }
       }
+      const itemToAnimate =
+        item.group?.hasAttribute('split-view-group') || gBrowser.isTabGroupLabel(item)
+          ? item.group
+          : item;
+      itemToAnimate.style.removeProperty('--zen-folder-indent');
     }
+    this.removeTabContainersDragoverClass();
+  }
 
-    canEssentialBeAdded(tab) {
-      return (
-        !(
-          (tab.getAttribute('usercontextid') || 0) !=
-            gZenWorkspaces.getActiveWorkspaceFromCache().containerTabId &&
-          gZenWorkspaces.containerSpecificEssentials
-        ) && gBrowser._numZenEssentials < this.maxEssentialTabs
-      );
+  get dragShiftableItems() {
+    const separator = gZenWorkspaces.pinnedTabsContainer.querySelector(
+      '.pinned-tabs-container-separator'
+    );
+    // Make sure to always return the separator at the start of the array
+    return Services.prefs.getBoolPref('zen.view.show-newtab-button-top')
+      ? [separator, gZenWorkspaces.activeWorkspaceElement.newTabButton]
+      : [separator];
+  }
+
+  animateSeparatorMove(movingTabs, dropElement, isPinned) {
+    let draggedTab = movingTabs[0];
+    if (gBrowser.isTabGroupLabel(draggedTab) && draggedTab.group.isZenFolder) {
+      this._isGoingToPinnedTabs = true;
+      return;
     }
-
-    applyDragoverClass(event, draggedTab) {
-      if (!this.enabled) {
-        return;
-      }
-      let isVertical = this.expandedSidebarMode;
-      if (
-        gBrowser.isTabGroupLabel(draggedTab) &&
-        !draggedTab?.group?.hasAttribute('split-view-group')
-      ) {
-        // If the target is a tab group label, we don't want to apply the dragover class
-        this.removeTabContainersDragoverClass();
-        return;
-      }
-      const pinnedTabsTarget = event.target.closest('.zen-workspace-pinned-tabs-section');
-      const essentialTabsTarget = event.target.closest('.zen-essentials-container');
-      const tabsTarget = event.target.closest('.zen-workspace-normal-tabs-section');
-      const folderTarget = event.target.closest('zen-folder');
-      let targetTab = event.target.closest('.tabbrowser-tab');
-      targetTab = targetTab?.group || targetTab;
-      draggedTab = draggedTab?.group?.hasAttribute('split-view-group')
-        ? draggedTab.group
-        : draggedTab;
-      const isHoveringIndicator = !!event.target.closest('.zen-current-workspace-indicator');
-      if (isHoveringIndicator) {
-        this.removeTabContainersDragoverClass(false);
-        gZenWorkspaces.activeWorkspaceIndicator?.setAttribute('open', true);
-      } else {
-        gZenWorkspaces.activeWorkspaceIndicator?.removeAttribute('open');
-      }
-
-      if (draggedTab?._dragData?.movingTabs) {
-        gZenFolders.ungroupTabsFromActiveGroups(draggedTab._dragData.movingTabs);
-      }
-
-      let shouldAddDragOverElement = false;
-
-      // Decide whether we should show a dragover class for the given target
-      if (essentialTabsTarget) {
-        if (!draggedTab.hasAttribute('zen-essential') && this.canEssentialBeAdded(draggedTab)) {
-          shouldAddDragOverElement = true;
-          isVertical = false;
-        }
-      } else if (pinnedTabsTarget) {
-        if (draggedTab.hasAttribute('zen-essential')) {
-          shouldAddDragOverElement = true;
-        }
-      } else if (tabsTarget) {
-        if (draggedTab.hasAttribute('zen-essential')) {
-          shouldAddDragOverElement = true;
-        }
-      }
-
-      if (!shouldAddDragOverElement || (!targetTab && !folderTarget) || !targetTab) {
-        this.removeTabContainersDragoverClass(!isHoveringIndicator);
-        return;
-      }
-
-      // Calculate middle to decide 'before' or 'after'
-      const rect = targetTab.getBoundingClientRect();
-      let shouldPlayHapticFeedback = false;
-      if (isVertical || !this.expandedSidebarMode) {
-        const separation = 8;
-        const middleY = targetTab.screenY + rect.height / 2;
-        const indicator = this.dragIndicator;
-        let top = 0;
-        if (event.screenY > middleY) {
-          top = Math.round(rect.top + rect.height) + 'px';
-        } else {
-          top = Math.round(rect.top) + 'px';
-        }
-        if (indicator.style.top !== top) {
-          shouldPlayHapticFeedback = true;
-        }
-        indicator.setAttribute('orientation', 'horizontal');
-        indicator.style.setProperty('--indicator-left', rect.left + separation / 2 + 'px');
-        indicator.style.setProperty('--indicator-width', rect.width - separation + 'px');
-        indicator.style.top = top;
-        indicator.style.removeProperty('left');
-      } else {
-        const separation = 8;
-        const middleX = targetTab.screenX + rect.width / 2;
-        const indicator = this.dragIndicator;
-        let left = 0;
-        if (event.screenX > middleX) {
-          left = Math.round(rect.left + rect.width + 1) + 'px';
-        } else {
-          left = Math.round(rect.left - 2) + 'px';
-        }
-        if (indicator.style.left !== left) {
-          shouldPlayHapticFeedback = true;
-        }
-        indicator.setAttribute('orientation', 'vertical');
-        indicator.style.setProperty('--indicator-top', rect.top + separation / 2 + 'px');
-        indicator.style.setProperty('--indicator-height', rect.height - separation + 'px');
-        indicator.style.left = left;
-        indicator.style.removeProperty('top');
-      }
-      if (shouldPlayHapticFeedback) {
-        Services.zen.playHapticFeedback();
-      }
+    if (draggedTab?.group?.hasAttribute('split-view-group')) {
+      draggedTab = draggedTab.group;
     }
+    const itemsToCheck = this.dragShiftableItems;
+    let translate = movingTabs[isPinned ? movingTabs.length - 1 : 0].getBoundingClientRect().top;
+    if (isPinned) {
+      const rect = draggedTab.getBoundingClientRect();
+      translate += rect.height;
+    }
+    const draggingTabHeight = movingTabs.reduce((acc, item) => {
+      return acc + window.windowUtils.getBoundsWithoutFlushing(item).height;
+    }, 0);
+    if (typeof this._topToNormalTabs === 'undefined') {
+      const rects = itemsToCheck.map((item) => window.windowUtils.getBoundsWithoutFlushing(item));
+      this._topToNormalTabs = rects[0].top + rects.at(-1).height / (isPinned ? 2 : 4);
+    }
+    let topToNormalTabs = this._topToNormalTabs;
+    const isGoingToPinnedTabs =
+      translate < topToNormalTabs && gBrowser.pinnedTabCount - gBrowser._numZenEssentials > 0;
+    const multiplier = isGoingToPinnedTabs !== isPinned ? (isGoingToPinnedTabs ? 1 : -1) : 0;
+    this._isGoingToPinnedTabs = isGoingToPinnedTabs;
+    if (!dropElement) {
+      itemsToCheck.forEach((item) => {
+        item.style.transform = `translateY(${draggingTabHeight * multiplier}px)`;
+      });
+    }
+  }
 
-    async onTabLabelChanged(tab) {
-      if (!this._pinsCache) {
-        return;
-      }
-      // If our current pin in the cache point to about:blank, we need to update the entry
-      const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
-      if (!pin) {
-        return;
-      }
+  getLastTabBound(lastBound, lastTab, isDraggingFolder = false) {
+    if (!lastTab.pinned || isDraggingFolder) {
+      return lastBound;
+    }
+    const shiftedItems = this.dragShiftableItems;
+    let totalHeight = shiftedItems.reduce((acc, item) => {
+      return acc + window.windowUtils.getBoundsWithoutFlushing(item).height;
+    }, 0);
+    if (shiftedItems.length === 1) {
+      // Means the new tab button is not at the top or not visible
+      const lastTabRect = window.windowUtils.getBoundsWithoutFlushing(lastTab);
+      totalHeight += lastTabRect.height;
+    }
+    return lastBound + totalHeight + 6;
+  }
 
-      if (pin.url === 'about:blank' && tab.linkedBrowser.currentURI.spec !== 'about:blank') {
-        await this.replacePinnedUrlWithCurrent(tab);
+  get dragIndicator() {
+    if (!this._dragIndicator) {
+      this._dragIndicator = document.createElement('div');
+      this._dragIndicator.id = 'zen-drag-indicator';
+      gNavToolbox.appendChild(this._dragIndicator);
+    }
+    return this._dragIndicator;
+  }
+
+  get expandedSidebarMode() {
+    return document.documentElement.getAttribute('zen-sidebar-expanded') === 'true';
+  }
+
+  async updatePinTitle(tab, newTitle, isEdited = true, notifyObservers = true) {
+    const uuid = tab.getAttribute('zen-pin-id');
+    await ZenPinnedTabsStorage.updatePinTitle(uuid, newTitle, isEdited, notifyObservers);
+
+    await this.refreshPinnedTabs();
+
+    const browsers = Services.wm.getEnumerator('navigator:browser');
+
+    // update the label for the same pin across all windows
+    for (const browser of browsers) {
+      const tabs = browser.gBrowser.tabs;
+      // Fix pinned cache for the browser
+      const browserCache = browser.gZenPinnedTabManager?._pinsCache;
+      if (browserCache) {
+        const pin = browserCache.find((pin) => pin.uuid === uuid);
+        if (pin) {
+          pin.title = newTitle;
+          pin.editedTitle = isEdited;
+        }
+      }
+      for (let i = 0; i < tabs.length; i++) {
+        const tabToEdit = tabs[i];
+        if (tabToEdit.getAttribute('zen-pin-id') === uuid && tabToEdit !== tab) {
+          tabToEdit.removeAttribute('zen-has-static-label');
+          if (isEdited) {
+            gBrowser._setTabLabel(tabToEdit, newTitle);
+            tabToEdit.setAttribute('zen-has-static-label', 'true');
+          } else {
+            gBrowser.setTabTitle(tabToEdit);
+          }
+          break;
+        }
       }
     }
   }
 
-  window.gZenPinnedTabManager = new nsZenPinnedTabManager();
+  canEssentialBeAdded(tab) {
+    return (
+      !(
+        (tab.getAttribute('usercontextid') || 0) !=
+          gZenWorkspaces.getActiveWorkspaceFromCache().containerTabId &&
+        gZenWorkspaces.containerSpecificEssentials
+      ) && gBrowser._numZenEssentials < this.maxEssentialTabs
+    );
+  }
+
+  applyDragoverClass(event, draggedTab) {
+    if (!this.enabled) {
+      return;
+    }
+    let isVertical = this.expandedSidebarMode;
+    if (
+      gBrowser.isTabGroupLabel(draggedTab) &&
+      !draggedTab?.group?.hasAttribute('split-view-group')
+    ) {
+      // If the target is a tab group label, we don't want to apply the dragover class
+      this.removeTabContainersDragoverClass();
+      return;
+    }
+    const pinnedTabsTarget = event.target.closest('.zen-workspace-pinned-tabs-section');
+    const essentialTabsTarget = event.target.closest('.zen-essentials-container');
+    const tabsTarget = event.target.closest('.zen-workspace-normal-tabs-section');
+    const folderTarget = event.target.closest('zen-folder');
+    let targetTab = event.target.closest('.tabbrowser-tab');
+    targetTab = targetTab?.group || targetTab;
+    draggedTab = draggedTab?.group?.hasAttribute('split-view-group')
+      ? draggedTab.group
+      : draggedTab;
+    const isHoveringIndicator = !!event.target.closest('.zen-current-workspace-indicator');
+    if (isHoveringIndicator) {
+      this.removeTabContainersDragoverClass(false);
+      gZenWorkspaces.activeWorkspaceIndicator?.setAttribute('open', true);
+    } else {
+      gZenWorkspaces.activeWorkspaceIndicator?.removeAttribute('open');
+    }
+
+    if (draggedTab?._dragData?.movingTabs) {
+      gZenFolders.ungroupTabsFromActiveGroups(draggedTab._dragData.movingTabs);
+    }
+
+    let shouldAddDragOverElement = false;
+
+    // Decide whether we should show a dragover class for the given target
+    if (essentialTabsTarget) {
+      if (!draggedTab.hasAttribute('zen-essential') && this.canEssentialBeAdded(draggedTab)) {
+        shouldAddDragOverElement = true;
+        isVertical = false;
+      }
+    } else if (pinnedTabsTarget) {
+      if (draggedTab.hasAttribute('zen-essential')) {
+        shouldAddDragOverElement = true;
+      }
+    } else if (tabsTarget) {
+      if (draggedTab.hasAttribute('zen-essential')) {
+        shouldAddDragOverElement = true;
+      }
+    }
+
+    if (!shouldAddDragOverElement || (!targetTab && !folderTarget) || !targetTab) {
+      this.removeTabContainersDragoverClass(!isHoveringIndicator);
+      return;
+    }
+
+    // Calculate middle to decide 'before' or 'after'
+    const rect = targetTab.getBoundingClientRect();
+    let shouldPlayHapticFeedback = false;
+    if (isVertical || !this.expandedSidebarMode) {
+      const separation = 8;
+      const middleY = targetTab.screenY + rect.height / 2;
+      const indicator = this.dragIndicator;
+      let top = 0;
+      if (event.screenY > middleY) {
+        top = Math.round(rect.top + rect.height) + 'px';
+      } else {
+        top = Math.round(rect.top) + 'px';
+      }
+      if (indicator.style.top !== top) {
+        shouldPlayHapticFeedback = true;
+      }
+      indicator.setAttribute('orientation', 'horizontal');
+      indicator.style.setProperty('--indicator-left', rect.left + separation / 2 + 'px');
+      indicator.style.setProperty('--indicator-width', rect.width - separation + 'px');
+      indicator.style.top = top;
+      indicator.style.removeProperty('left');
+    } else {
+      const separation = 8;
+      const middleX = targetTab.screenX + rect.width / 2;
+      const indicator = this.dragIndicator;
+      let left = 0;
+      if (event.screenX > middleX) {
+        left = Math.round(rect.left + rect.width + 1) + 'px';
+      } else {
+        left = Math.round(rect.left - 2) + 'px';
+      }
+      if (indicator.style.left !== left) {
+        shouldPlayHapticFeedback = true;
+      }
+      indicator.setAttribute('orientation', 'vertical');
+      indicator.style.setProperty('--indicator-top', rect.top + separation / 2 + 'px');
+      indicator.style.setProperty('--indicator-height', rect.height - separation + 'px');
+      indicator.style.left = left;
+      indicator.style.removeProperty('top');
+    }
+    if (shouldPlayHapticFeedback) {
+      Services.zen.playHapticFeedback();
+    }
+  }
+
+  async onTabLabelChanged(tab) {
+    if (!this._pinsCache) {
+      return;
+    }
+    // If our current pin in the cache point to about:blank, we need to update the entry
+    const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
+    if (!pin) {
+      return;
+    }
+
+    if (pin.url === 'about:blank' && tab.linkedBrowser.currentURI.spec !== 'about:blank') {
+      await this.replacePinnedUrlWithCurrent(tab);
+    }
+  }
 }
+
+window.gZenPinnedTabManager = new nsZenPinnedTabManager();
diff --git a/src/zen/tabs/ZenPinnedTabsStorage.mjs b/src/zen/tabs/ZenPinnedTabsStorage.mjs
index bc11213f7..4847687cf 100644
--- a/src/zen/tabs/ZenPinnedTabsStorage.mjs
+++ b/src/zen/tabs/ZenPinnedTabsStorage.mjs
@@ -1,7 +1,8 @@
 // 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/.
-var ZenPinnedTabsStorage = {
+
+window.ZenPinnedTabsStorage = {
   _saveCache: [],
 
   async init() {
diff --git a/src/zen/tabs/jar.inc.mn b/src/zen/tabs/jar.inc.mn
new file mode 100644
index 000000000..2acab4816
--- /dev/null
+++ b/src/zen/tabs/jar.inc.mn
@@ -0,0 +1,8 @@
+# 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/.
+
+        content/browser/zen-components/ZenPinnedTabsStorage.mjs                 (../../zen/tabs/ZenPinnedTabsStorage.mjs)
+        content/browser/zen-components/ZenPinnedTabManager.mjs                  (../../zen/tabs/ZenPinnedTabManager.mjs)
+*       content/browser/zen-styles/zen-tabs.css                                 (../../zen/tabs/zen-tabs.css)
+        content/browser/zen-styles/zen-tabs/vertical-tabs.css                   (../../zen/tabs/zen-tabs/vertical-tabs.css)
\ No newline at end of file
diff --git a/src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js b/src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js
index 3dba19ffa..f6dce0faf 100644
--- a/src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js
+++ b/src/zen/tests/tabs/browser_tabs_cycle_by_attribute.js
@@ -1,3 +1,6 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
 'use strict';
 
 const URL1 = 'data:text/plain,tab1';
diff --git a/src/zen/vendor/jar.inc.mn b/src/zen/vendor/jar.inc.mn
new file mode 100644
index 000000000..1f1f91fe3
--- /dev/null
+++ b/src/zen/vendor/jar.inc.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+        content/browser/zen-vendor/tsparticles.confetti.bundle.min.js           (../../zen/vendor/tsparticles.confetti.bundle.min.js)
+        content/browser/zen-vendor/motion.min.mjs                               (../../zen/vendor/motion.min.mjs)
diff --git a/src/zen/welcome/jar.inc.mn b/src/zen/welcome/jar.inc.mn
new file mode 100644
index 000000000..9e7fc185b
--- /dev/null
+++ b/src/zen/welcome/jar.inc.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+        content/browser/zen-components/ZenWelcome.mjs                           (../../zen/welcome/ZenWelcome.mjs)
+        content/browser/zen-styles/zen-welcome.css                              (../../zen/welcome/zen-welcome.css)
\ No newline at end of file
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index 28f79ce52..52c328bec 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -2,891 +2,1000 @@
 // 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/.
 
-{
-  function parseSinePath(pathStr) {
-    const points = [];
-    const commands = pathStr.match(/[MCL]\s*[\d\s.\-,]+/g);
-    if (!commands) return points;
+import { nsZenMultiWindowFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
 
-    commands.forEach((command) => {
-      const type = command.charAt(0);
-      const coordsStr = command.slice(1).trim();
-      const coords = coordsStr.split(/[\s,]+/).map(Number);
+function parseSinePath(pathStr) {
+  const points = [];
+  const commands = pathStr.match(/[MCL]\s*[\d\s.\-,]+/g);
+  if (!commands) return points;
 
-      switch (type) {
-        case 'M':
-          points.push({ x: coords[0], y: coords[1], type: 'M' });
-          break;
-        case 'C':
-          if (coords.length >= 6 && coords.length % 6 === 0) {
-            for (let i = 0; i < coords.length; i += 6) {
-              points.push({
-                x1: coords[i],
-                y1: coords[i + 1],
-                x2: coords[i + 2],
-                y2: coords[i + 3],
-                x: coords[i + 4],
-                y: coords[i + 5],
-                type: 'C',
-              });
-            }
+  commands.forEach((command) => {
+    const type = command.charAt(0);
+    const coordsStr = command.slice(1).trim();
+    const coords = coordsStr.split(/[\s,]+/).map(Number);
+
+    switch (type) {
+      case 'M':
+        points.push({ x: coords[0], y: coords[1], type: 'M' });
+        break;
+      case 'C':
+        if (coords.length >= 6 && coords.length % 6 === 0) {
+          for (let i = 0; i < coords.length; i += 6) {
+            points.push({
+              x1: coords[i],
+              y1: coords[i + 1],
+              x2: coords[i + 2],
+              y2: coords[i + 3],
+              x: coords[i + 4],
+              y: coords[i + 5],
+              type: 'C',
+            });
           }
-          break;
-        case 'L':
-          points.push({ x: coords[0], y: coords[1], type: 'L' });
-          break;
-      }
+        }
+        break;
+      case 'L':
+        points.push({ x: coords[0], y: coords[1], type: 'L' });
+        break;
+    }
+  });
+  return points;
+}
+
+const MAX_OPACITY = 0.9;
+const MIN_OPACITY = AppConstants.platform === 'macosx' ? 0.25 : 0.35;
+
+const EXPLICIT_LIGHTNESS_TYPE = 'explicit-lightness';
+
+export class nsZenThemePicker extends nsZenMultiWindowFeature {
+  static MAX_DOTS = 3;
+
+  currentOpacity = 0.5;
+  dots = [];
+  useAlgo = '';
+  #currentLightness = 50;
+
+  #allowTransparencyOnSidebar = Services.prefs.getBoolPref('zen.theme.acrylic-elements', false);
+
+  #linePath = `M 51.373 27.395 L 367.037 27.395`;
+  #sinePath = `M 51.373 27.395 C 60.14 -8.503 68.906 -8.503 77.671 27.395 C 86.438 63.293 95.205 63.293 103.971 27.395 C 112.738 -8.503 121.504 -8.503 130.271 27.395 C 139.037 63.293 147.803 63.293 156.57 27.395 C 165.335 -8.503 174.101 -8.503 182.868 27.395 C 191.634 63.293 200.4 63.293 209.167 27.395 C 217.933 -8.503 226.7 -8.503 235.467 27.395 C 244.233 63.293 252.999 63.293 261.765 27.395 C 270.531 -8.503 279.297 -8.503 288.064 27.395 C 296.83 63.293 305.596 63.293 314.363 27.395 C 323.13 -8.503 331.896 -8.503 340.662 27.395 M 314.438 27.395 C 323.204 -8.503 331.97 -8.503 340.737 27.395 C 349.503 63.293 358.27 63.293 367.037 27.395`;
+
+  #sinePoints = parseSinePath(this.#sinePath);
+
+  #colorPage = 0;
+  #gradientsCache = new Map();
+
+  constructor() {
+    super();
+    if (
+      !Services.prefs.getBoolPref('zen.theme.gradient', true) ||
+      !gZenWorkspaces.shouldHaveWorkspaces ||
+      gZenWorkspaces.privateWindowOrDisabled
+    ) {
+      return;
+    }
+    this.promiseInitialized = new Promise((resolve) => {
+      this._resolveInitialized = resolve;
     });
-    return points;
+    this.dragStartPosition = null;
+
+    this.isLegacyVersion = Services.prefs.getIntPref('zen.theme.gradient-legacy-version', 1) === 0;
+
+    ChromeUtils.defineLazyGetter(this, 'panel', () =>
+      document.getElementById('PanelUI-zen-gradient-generator')
+    );
+    ChromeUtils.defineLazyGetter(this, 'toolbox', () => document.getElementById('TabsToolbar'));
+    ChromeUtils.defineLazyGetter(this, 'customColorInput', () =>
+      document.getElementById('PanelUI-zen-gradient-generator-custom-input')
+    );
+    ChromeUtils.defineLazyGetter(this, 'customColorList', () =>
+      document.getElementById('PanelUI-zen-gradient-generator-custom-list')
+    );
+
+    ChromeUtils.defineLazyGetter(this, 'sliderWavePath', () =>
+      document.getElementById('PanelUI-zen-gradient-slider-wave').querySelector('path')
+    );
+
+    this.panel.addEventListener('popupshowing', this.handlePanelOpen.bind(this));
+    this.panel.addEventListener('popuphidden', this.handlePanelClose.bind(this));
+    this.panel.addEventListener('command', this.handlePanelCommand.bind(this));
+
+    document
+      .getElementById('PanelUI-zen-gradient-generator-opacity')
+      .addEventListener('input', this.onOpacityChange.bind(this));
+
+    // Call the rest of the initialization
+    this.initContextMenu();
+    this.initPredefinedColors();
+
+    this._resolveInitialized();
+    delete this._resolveInitialized;
+
+    this.initCustomColorInput();
+    this.initTextureInput();
+    this.initSchemeButtons();
+    this.initColorPages();
+
+    const darkModeChange = this.handleDarkModeChange.bind(this);
+    window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', darkModeChange);
+
+    XPCOMUtils.defineLazyPreferenceGetter(
+      this,
+      'windowSchemeType',
+      'zen.view.window.scheme',
+      2,
+      darkModeChange
+    );
+
+    XPCOMUtils.defineLazyPreferenceGetter(this, 'darkModeBias', 'zen.theme.dark-mode-bias', '0.5');
   }
 
-  const MAX_OPACITY = 0.9;
-  const MIN_OPACITY = AppConstants.platform === 'macosx' ? 0.25 : 0.35;
+  handleDarkModeChange() {
+    this.updateCurrentWorkspace();
+  }
 
-  const EXPLICIT_LIGHTNESS_TYPE = 'explicit-lightness';
-
-  class nsZenThemePicker extends nsZenMultiWindowFeature {
-    static MAX_DOTS = 3;
-
-    currentOpacity = 0.5;
-    dots = [];
-    useAlgo = '';
-    #currentLightness = 50;
-
-    #allowTransparencyOnSidebar = Services.prefs.getBoolPref('zen.theme.acrylic-elements', false);
-
-    #linePath = `M 51.373 27.395 L 367.037 27.395`;
-    #sinePath = `M 51.373 27.395 C 60.14 -8.503 68.906 -8.503 77.671 27.395 C 86.438 63.293 95.205 63.293 103.971 27.395 C 112.738 -8.503 121.504 -8.503 130.271 27.395 C 139.037 63.293 147.803 63.293 156.57 27.395 C 165.335 -8.503 174.101 -8.503 182.868 27.395 C 191.634 63.293 200.4 63.293 209.167 27.395 C 217.933 -8.503 226.7 -8.503 235.467 27.395 C 244.233 63.293 252.999 63.293 261.765 27.395 C 270.531 -8.503 279.297 -8.503 288.064 27.395 C 296.83 63.293 305.596 63.293 314.363 27.395 C 323.13 -8.503 331.896 -8.503 340.662 27.395 M 314.438 27.395 C 323.204 -8.503 331.97 -8.503 340.737 27.395 C 349.503 63.293 358.27 63.293 367.037 27.395`;
-
-    #sinePoints = parseSinePath(this.#sinePath);
-
-    #colorPage = 0;
-    #gradientsCache = new Map();
-
-    constructor() {
-      super();
-      if (
-        !Services.prefs.getBoolPref('zen.theme.gradient', true) ||
-        !gZenWorkspaces.shouldHaveWorkspaces ||
-        gZenWorkspaces.privateWindowOrDisabled
-      ) {
-        return;
-      }
-      this.promiseInitialized = new Promise((resolve) => {
-        this._resolveInitialized = resolve;
-      });
-      this.dragStartPosition = null;
-
-      this.isLegacyVersion =
-        Services.prefs.getIntPref('zen.theme.gradient-legacy-version', 1) === 0;
-
-      ChromeUtils.defineLazyGetter(this, 'panel', () =>
-        document.getElementById('PanelUI-zen-gradient-generator')
-      );
-      ChromeUtils.defineLazyGetter(this, 'toolbox', () => document.getElementById('TabsToolbar'));
-      ChromeUtils.defineLazyGetter(this, 'customColorInput', () =>
-        document.getElementById('PanelUI-zen-gradient-generator-custom-input')
-      );
-      ChromeUtils.defineLazyGetter(this, 'customColorList', () =>
-        document.getElementById('PanelUI-zen-gradient-generator-custom-list')
-      );
-
-      ChromeUtils.defineLazyGetter(this, 'sliderWavePath', () =>
-        document.getElementById('PanelUI-zen-gradient-slider-wave').querySelector('path')
-      );
-
-      this.panel.addEventListener('popupshowing', this.handlePanelOpen.bind(this));
-      this.panel.addEventListener('popuphidden', this.handlePanelClose.bind(this));
-      this.panel.addEventListener('command', this.handlePanelCommand.bind(this));
-
-      document
-        .getElementById('PanelUI-zen-gradient-generator-opacity')
-        .addEventListener('input', this.onOpacityChange.bind(this));
-
-      // Call the rest of the initialization
-      this.initContextMenu();
-      this.initPredefinedColors();
-
-      this._resolveInitialized();
-      delete this._resolveInitialized;
-
-      this.initCustomColorInput();
-      this.initTextureInput();
-      this.initSchemeButtons();
-      this.initColorPages();
-
-      const darkModeChange = this.handleDarkModeChange.bind(this);
-      window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', darkModeChange);
-
-      XPCOMUtils.defineLazyPreferenceGetter(
-        this,
-        'windowSchemeType',
-        'zen.view.window.scheme',
-        2,
-        darkModeChange
-      );
-
-      XPCOMUtils.defineLazyPreferenceGetter(
-        this,
-        'darkModeBias',
-        'zen.theme.dark-mode-bias',
-        '0.5'
-      );
+  get isDarkMode() {
+    if (PrivateBrowsingUtils.isWindowPrivate(window)) {
+      return true;
     }
-
-    handleDarkModeChange() {
-      this.updateCurrentWorkspace();
-    }
-
-    get isDarkMode() {
-      if (PrivateBrowsingUtils.isWindowPrivate(window)) {
+    switch (this.windowSchemeType) {
+      case 0:
         return true;
-      }
-      switch (this.windowSchemeType) {
-        case 0:
-          return true;
-        case 1:
-          return false;
-        default:
-      }
-      return window.matchMedia('(prefers-color-scheme: dark)').matches;
+      case 1:
+        return false;
+      default:
     }
+    return window.matchMedia('(prefers-color-scheme: dark)').matches;
+  }
 
-    get colorHarmonies() {
-      return [
-        { type: 'complementary', angles: [180] },
-        { type: 'splitComplementary', angles: [150, 210] },
-        { type: 'analogous', angles: [50, 310] },
-        { type: 'triadic', angles: [120, 240] },
-        { type: 'floating', angles: [] },
-      ];
-    }
+  get colorHarmonies() {
+    return [
+      { type: 'complementary', angles: [180] },
+      { type: 'splitComplementary', angles: [150, 210] },
+      { type: 'analogous', angles: [50, 310] },
+      { type: 'triadic', angles: [120, 240] },
+      { type: 'floating', angles: [] },
+    ];
+  }
 
-    initContextMenu() {
-      const menu = window.MozXULElement.parseXULToFragment(`
+  initContextMenu() {
+    const menu = window.MozXULElement.parseXULToFragment(`
         <menuitem id="zenToolbarThemePicker"
                   data-lazy-l10n-id="zen-workspaces-change-theme"
                   command="cmd_zenOpenZenThemePicker"/>
       `);
-      document.getElementById('toolbar-context-customize').before(menu);
-    }
+    document.getElementById('toolbar-context-customize').before(menu);
+  }
 
-    openThemePicker(event) {
-      const fromForm = event.explicitOriginalTarget?.classList?.contains(
-        'zen-workspace-creation-edit-theme-button'
-      );
-      PanelMultiView.openPopup(this.panel, this.toolbox, {
-        position: 'topright topleft',
-        triggerEvent: event,
-        y: fromForm ? -160 : 0,
-      });
-    }
+  openThemePicker(event) {
+    const fromForm = event.explicitOriginalTarget?.classList?.contains(
+      'zen-workspace-creation-edit-theme-button'
+    );
+    PanelMultiView.openPopup(this.panel, this.toolbox, {
+      position: 'topright topleft',
+      triggerEvent: event,
+      y: fromForm ? -160 : 0,
+    });
+  }
 
-    initCustomColorInput() {
-      this.customColorInput.addEventListener('change', (event) => {
-        // Prevent the popup from closing when the input is focused
-        this.openThemePicker(event);
-      });
-    }
+  initCustomColorInput() {
+    this.customColorInput.addEventListener('change', (event) => {
+      // Prevent the popup from closing when the input is focused
+      this.openThemePicker(event);
+    });
+  }
 
-    initPredefinedColors() {
-      document
-        .getElementById('PanelUI-zen-gradient-generator-color-pages')
-        .addEventListener('click', async (event) => {
-          const target = event.target;
-          const rawPosition = target.getAttribute('data-position');
-          if (!rawPosition) {
-            return;
-          }
-          const algo = target.getAttribute('data-algo');
-          const lightness = target.getAttribute('data-lightness');
-          const numDots = parseInt(target.getAttribute('data-num-dots'));
-          if (numDots < this.dots.length) {
-            for (let i = numDots; i < this.dots.length; i++) {
-              this.dots[i].element.remove();
-            }
-            this.dots = this.dots.slice(0, numDots);
-          }
-          // Generate new gradient from the single color given
-          const [x, y] = rawPosition.split(',').map((pos) => parseInt(pos));
-          let dots = [
-            {
-              ID: 0,
-              position: { x, y },
-              isPrimary: true,
-              type: EXPLICIT_LIGHTNESS_TYPE,
-            },
-          ];
-          for (let i = 1; i < numDots; i++) {
-            dots.push({
-              ID: i,
-              position: { x: 0, y: 0 },
-              type: EXPLICIT_LIGHTNESS_TYPE,
-            });
-          }
-          this.useAlgo = algo;
-          this.#currentLightness = lightness;
-          dots = this.calculateCompliments(dots, 'update', this.useAlgo);
-          this.handleColorPositions(dots, true);
-          this.updateCurrentWorkspace();
-        });
-    }
-
-    initColorPages() {
-      const leftButton = document.getElementById('PanelUI-zen-gradient-generator-color-page-left');
-      const rightButton = document.getElementById(
-        'PanelUI-zen-gradient-generator-color-page-right'
-      );
-      const pagesWrapper = document.getElementById('PanelUI-zen-gradient-generator-color-pages');
-      const pages = pagesWrapper.children;
-      pagesWrapper.addEventListener('wheel', (event) => {
-        event.preventDefault();
-        event.stopPropagation();
-      });
-      leftButton.addEventListener('command', () => {
-        this.#colorPage = (this.#colorPage - 1 + pages.length) % pages.length;
-        // Scroll to the next page, by using scrollLeft
-        pagesWrapper.scrollLeft = (this.#colorPage * pagesWrapper.scrollWidth) / pages.length;
-        rightButton.disabled = false;
-        leftButton.disabled = this.#colorPage === 0;
-      });
-      rightButton.addEventListener('command', () => {
-        this.#colorPage = (this.#colorPage + 1) % pages.length;
-        // Scroll to the next page, by using scrollLeft
-        pagesWrapper.scrollLeft = (this.#colorPage * pagesWrapper.scrollWidth) / pages.length;
-        leftButton.disabled = false;
-        rightButton.disabled = this.#colorPage === pages.length - 1;
-      });
-    }
-
-    initSchemeButtons() {
-      const buttons = document.getElementById('PanelUI-zen-gradient-generator-scheme');
-      buttons.addEventListener('click', (event) => {
-        const target = event.target.closest('.subviewbutton');
-        if (!target) {
+  initPredefinedColors() {
+    document
+      .getElementById('PanelUI-zen-gradient-generator-color-pages')
+      .addEventListener('click', async (event) => {
+        const target = event.target;
+        const rawPosition = target.getAttribute('data-position');
+        if (!rawPosition) {
           return;
         }
-        event.preventDefault();
-        event.stopPropagation();
-        const scheme = target.id.replace('PanelUI-zen-gradient-generator-scheme-', '');
-        if (!scheme) {
-          return;
+        const algo = target.getAttribute('data-algo');
+        const lightness = target.getAttribute('data-lightness');
+        const numDots = parseInt(target.getAttribute('data-num-dots'));
+        if (numDots < this.dots.length) {
+          for (let i = numDots; i < this.dots.length; i++) {
+            this.dots[i].element.remove();
+          }
+          this.dots = this.dots.slice(0, numDots);
         }
-        const themeInt = {
-          auto: 2,
-          light: 1,
-          dark: 0,
-        }[scheme];
-        if (themeInt === undefined) {
-          return;
+        // Generate new gradient from the single color given
+        const [x, y] = rawPosition.split(',').map((pos) => parseInt(pos));
+        let dots = [
+          {
+            ID: 0,
+            position: { x, y },
+            isPrimary: true,
+            type: EXPLICIT_LIGHTNESS_TYPE,
+          },
+        ];
+        for (let i = 1; i < numDots; i++) {
+          dots.push({
+            ID: i,
+            position: { x: 0, y: 0 },
+            type: EXPLICIT_LIGHTNESS_TYPE,
+          });
         }
-        Services.prefs.setIntPref('zen.view.window.scheme', themeInt);
-      });
-    }
-
-    initTextureInput() {
-      const wrapper = document.getElementById('PanelUI-zen-gradient-generator-texture-wrapper');
-      const wrapperWidth = wrapper.getBoundingClientRect().width;
-      // Add elements in a circular pattern, where the center is the center of the wrapper
-      for (let i = 0; i < 16; i++) {
-        const dot = document.createElement('div');
-        dot.classList.add('zen-theme-picker-texture-dot');
-        const position = (i / 16) * Math.PI * 2 + wrapperWidth;
-        dot.style.left = `${Math.cos(position) * 50 + 50}%`;
-        dot.style.top = `${Math.sin(position) * 50 + 50}%`;
-        wrapper.appendChild(dot);
-      }
-      this._textureHandler = document.createElement('div');
-      this._textureHandler.id = 'PanelUI-zen-gradient-generator-texture-handler';
-      this._textureHandler.addEventListener('mousedown', this.onTextureHandlerMouseDown.bind(this));
-      wrapper.appendChild(this._textureHandler);
-    }
-
-    onTextureHandlerMouseDown(event) {
-      event.preventDefault();
-      this._onTextureMouseMove = this.onTextureMouseMove.bind(this);
-      this._onTextureMouseUp = this.onTextureMouseUp.bind(this);
-      document.addEventListener('mousemove', this._onTextureMouseMove);
-      document.addEventListener('mouseup', this._onTextureMouseUp);
-    }
-
-    onTextureMouseMove(event) {
-      event.preventDefault();
-      const wrapper = document.getElementById('PanelUI-zen-gradient-generator-texture-wrapper');
-      const wrapperRect = wrapper.getBoundingClientRect();
-      // Determine how much rotation there is based on the mouse position and the center of the wrapper
-      const rotation = Math.atan2(
-        event.clientY - wrapperRect.top - wrapperRect.height / 2,
-        event.clientX - wrapperRect.left - wrapperRect.width / 2
-      );
-      const previousTexture = this.currentTexture;
-      this.currentTexture = (rotation * 180) / Math.PI + 90;
-      // if it's negative, add 360 to make it positive
-      if (this.currentTexture < 0) {
-        this.currentTexture += 360;
-      }
-      // make it go from 1 to 0 instead of being in degrees
-      this.currentTexture /= 360;
-      // We clip it to the closest button out of 16 possible buttons
-      this.currentTexture = Math.round(this.currentTexture * 16) / 16;
-      if (this.currentTexture === 1) {
-        this.currentTexture = 0;
-      }
-      if (previousTexture !== this.currentTexture) {
+        this.useAlgo = algo;
+        this.#currentLightness = lightness;
+        dots = this.calculateCompliments(dots, 'update', this.useAlgo);
+        this.handleColorPositions(dots, true);
         this.updateCurrentWorkspace();
-        Services.zen.playHapticFeedback();
-      }
-    }
+      });
+  }
 
-    onTextureMouseUp(event) {
+  initColorPages() {
+    const leftButton = document.getElementById('PanelUI-zen-gradient-generator-color-page-left');
+    const rightButton = document.getElementById('PanelUI-zen-gradient-generator-color-page-right');
+    const pagesWrapper = document.getElementById('PanelUI-zen-gradient-generator-color-pages');
+    const pages = pagesWrapper.children;
+    pagesWrapper.addEventListener('wheel', (event) => {
       event.preventDefault();
-      document.removeEventListener('mousemove', this._onTextureMouseMove);
-      document.removeEventListener('mouseup', this._onTextureMouseUp);
-      this._onTextureMouseMove = null;
-      this._onTextureMouseUp = null;
-    }
+      event.stopPropagation();
+    });
+    leftButton.addEventListener('command', () => {
+      this.#colorPage = (this.#colorPage - 1 + pages.length) % pages.length;
+      // Scroll to the next page, by using scrollLeft
+      pagesWrapper.scrollLeft = (this.#colorPage * pagesWrapper.scrollWidth) / pages.length;
+      rightButton.disabled = false;
+      leftButton.disabled = this.#colorPage === 0;
+    });
+    rightButton.addEventListener('command', () => {
+      this.#colorPage = (this.#colorPage + 1) % pages.length;
+      // Scroll to the next page, by using scrollLeft
+      pagesWrapper.scrollLeft = (this.#colorPage * pagesWrapper.scrollWidth) / pages.length;
+      leftButton.disabled = false;
+      rightButton.disabled = this.#colorPage === pages.length - 1;
+    });
+  }
 
-    initThemePicker() {
-      const themePicker = this.panel.querySelector('.zen-theme-picker-gradient');
-      this._onDotMouseMove = this.onDotMouseMove.bind(this);
-      this._onDotMouseUp = this.onDotMouseUp.bind(this);
-      this._onDotMouseDown = this.onDotMouseDown.bind(this);
-      this._onThemePickerClick = this.onThemePickerClick.bind(this);
-      document.addEventListener('mousemove', this._onDotMouseMove);
-      document.addEventListener('mouseup', this._onDotMouseUp);
-      themePicker.addEventListener('mousedown', this._onDotMouseDown);
-      themePicker.addEventListener('click', this._onThemePickerClick);
-    }
-
-    uninitThemePicker() {
-      const themePicker = this.panel.querySelector('.zen-theme-picker-gradient');
-      document.removeEventListener('mousemove', this._onDotMouseMove);
-      document.removeEventListener('mouseup', this._onDotMouseUp);
-      themePicker.removeEventListener('mousedown', this._onDotMouseDown);
-      themePicker.removeEventListener('click', this._onThemePickerClick);
-      this._onDotMouseMove = null;
-      this._onDotMouseUp = null;
-      this._onDotMouseDown = null;
-      this._onThemePickerClick = null;
-    }
-
-    /**
-     * Converts an HSL color value to RGB. Conversion formula
-     * adapted from https://en.wikipedia.org/wiki/HSL_color_space.
-     * Assumes h, s, and l are contained in the set [0, 1] and
-     * returns r, g, and b in the set [0, 255].
-     *
-     * @param   {number}  h       The hue
-     * @param   {number}  s       The saturation
-     * @param   {number}  l       The lightness
-     * @return  {Array}           The RGB representation
-     */
-    hslToRgb(h, s, l) {
-      const { round } = Math;
-      let r, g, b;
-
-      if (s === 0) {
-        r = g = b = l; // achromatic
-      } else {
-        const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-        const p = 2 * l - q;
-        r = this.hueToRgb(p, q, h + 1 / 3);
-        g = this.hueToRgb(p, q, h);
-        b = this.hueToRgb(p, q, h - 1 / 3);
+  initSchemeButtons() {
+    const buttons = document.getElementById('PanelUI-zen-gradient-generator-scheme');
+    buttons.addEventListener('click', (event) => {
+      const target = event.target.closest('.subviewbutton');
+      if (!target) {
+        return;
       }
-
-      return [round(r * 255), round(g * 255), round(b * 255)];
-    }
-
-    rgbToHsl(r, g, b) {
-      r /= 255;
-      g /= 255;
-      b /= 255;
-      let max = Math.max(r, g, b);
-      let min = Math.min(r, g, b);
-      let d = max - min;
-      let h;
-      if (d === 0) h = 0;
-      else if (max === r) h = ((g - b) / d) % 6;
-      else if (max === g) h = (b - r) / d + 2;
-      else if (max === b) h = (r - g) / d + 4;
-      let l = (min + max) / 2;
-      let s = d === 0 ? 0 : d / (1 - Math.abs(2 * l - 1));
-      return [h * 60, s, l];
-    }
-
-    hueToRgb(p, q, t) {
-      if (t < 0) t += 1;
-      if (t > 1) t -= 1;
-      if (t < 1 / 6) return p + (q - p) * 6 * t;
-      if (t < 1 / 2) return q;
-      if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
-      return p;
-    }
-
-    calculateInitialPosition([r, g, b]) {
-      // This function is called before the picker is even rendered, so we hard code the dimensions
-      // important: If any sort of sizing is changed, make sure changes are reflected here
-      const padding = 30;
-      const rect = {
-        width: 338,
-        height: 338,
-      };
-      const centerX = rect.width / 2;
-      const centerY = rect.height / 2;
-      const radius = (rect.width - padding) / 2;
-      const [hue, saturation] = this.rgbToHsl(r, g, b);
-      const angle = (hue / 360) * 2 * Math.PI; // Convert to radians
-      const normalizedSaturation = saturation / 100; // Convert to [0, 1]
-      const x = centerX + radius * normalizedSaturation * Math.cos(angle) - padding;
-      const y = centerY + radius * normalizedSaturation * Math.sin(angle) - padding;
-      return { x, y };
-    }
-
-    getColorFromPosition(x, y, type = undefined) {
-      // Return a color as hsl based on the position in the gradient
-      const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
-      const rect = gradient.getBoundingClientRect();
-      const padding = 30; // each side
-      const dotHalfSize = 36 / 2; // half the size of the dot
-      x += dotHalfSize;
-      y += dotHalfSize;
-      rect.width += padding * 2; // Adjust width and height for padding
-      rect.height += padding * 2; // Adjust width and height for padding
-      const centerX = rect.width / 2;
-      const centerY = rect.height / 2;
-      const radius = (rect.width - padding) / 2;
-      const distance = Math.sqrt((x - centerX) ** 2 + (y - centerY) ** 2);
-      let angle = Math.atan2(y - centerY, x - centerX);
-      angle = (angle * 180) / Math.PI; // Convert to degrees
-      if (angle < 0) {
-        angle += 360; // Normalize to [0, 360)
+      event.preventDefault();
+      event.stopPropagation();
+      const scheme = target.id.replace('PanelUI-zen-gradient-generator-scheme-', '');
+      if (!scheme) {
+        return;
       }
-      const normalizedDistance = 1 - Math.min(distance / radius, 1); // Normalize distance to [0, 1]
-      const hue = (angle / 360) * 360; // Normalize angle to [0, 360)
-      let saturation = normalizedDistance * 100; // stays high even in center
-      if (type !== EXPLICIT_LIGHTNESS_TYPE) {
-        saturation = 80 + (1 - normalizedDistance) * 20;
-        // Set the current lightness to how far we are from the center of the circle
-        // For example, moving the dot outside will have higher lightness, while moving it inside will have lower lightness
-        this.#currentLightness = Math.round((1 - normalizedDistance) * 100);
+      const themeInt = {
+        auto: 2,
+        light: 1,
+        dark: 0,
+      }[scheme];
+      if (themeInt === undefined) {
+        return;
       }
-      const lightness = this.#currentLightness; // Fixed lightness for simplicity
-      const [r, g, b] = this.hslToRgb(hue / 360, saturation / 100, lightness / 100);
-      return [
-        Math.min(255, Math.max(0, r)),
-        Math.min(255, Math.max(0, g)),
-        Math.min(255, Math.max(0, b)),
-      ];
-    }
+      Services.prefs.setIntPref('zen.view.window.scheme', themeInt);
+    });
+  }
 
-    getJSONPos(x, y) {
-      // Return a JSON string with the position
-      return JSON.stringify({ x: Math.round(x), y: Math.round(y) });
-    }
-
-    createDot(color, fromWorkspace = false) {
-      const [r, g, b] = color.c;
+  initTextureInput() {
+    const wrapper = document.getElementById('PanelUI-zen-gradient-generator-texture-wrapper');
+    const wrapperWidth = wrapper.getBoundingClientRect().width;
+    // Add elements in a circular pattern, where the center is the center of the wrapper
+    for (let i = 0; i < 16; i++) {
       const dot = document.createElement('div');
-      if (color.isPrimary) {
+      dot.classList.add('zen-theme-picker-texture-dot');
+      const position = (i / 16) * Math.PI * 2 + wrapperWidth;
+      dot.style.left = `${Math.cos(position) * 50 + 50}%`;
+      dot.style.top = `${Math.sin(position) * 50 + 50}%`;
+      wrapper.appendChild(dot);
+    }
+    this._textureHandler = document.createElement('div');
+    this._textureHandler.id = 'PanelUI-zen-gradient-generator-texture-handler';
+    this._textureHandler.addEventListener('mousedown', this.onTextureHandlerMouseDown.bind(this));
+    wrapper.appendChild(this._textureHandler);
+  }
+
+  onTextureHandlerMouseDown(event) {
+    event.preventDefault();
+    this._onTextureMouseMove = this.onTextureMouseMove.bind(this);
+    this._onTextureMouseUp = this.onTextureMouseUp.bind(this);
+    document.addEventListener('mousemove', this._onTextureMouseMove);
+    document.addEventListener('mouseup', this._onTextureMouseUp);
+  }
+
+  onTextureMouseMove(event) {
+    event.preventDefault();
+    const wrapper = document.getElementById('PanelUI-zen-gradient-generator-texture-wrapper');
+    const wrapperRect = wrapper.getBoundingClientRect();
+    // Determine how much rotation there is based on the mouse position and the center of the wrapper
+    const rotation = Math.atan2(
+      event.clientY - wrapperRect.top - wrapperRect.height / 2,
+      event.clientX - wrapperRect.left - wrapperRect.width / 2
+    );
+    const previousTexture = this.currentTexture;
+    this.currentTexture = (rotation * 180) / Math.PI + 90;
+    // if it's negative, add 360 to make it positive
+    if (this.currentTexture < 0) {
+      this.currentTexture += 360;
+    }
+    // make it go from 1 to 0 instead of being in degrees
+    this.currentTexture /= 360;
+    // We clip it to the closest button out of 16 possible buttons
+    this.currentTexture = Math.round(this.currentTexture * 16) / 16;
+    if (this.currentTexture === 1) {
+      this.currentTexture = 0;
+    }
+    if (previousTexture !== this.currentTexture) {
+      this.updateCurrentWorkspace();
+      Services.zen.playHapticFeedback();
+    }
+  }
+
+  onTextureMouseUp(event) {
+    event.preventDefault();
+    document.removeEventListener('mousemove', this._onTextureMouseMove);
+    document.removeEventListener('mouseup', this._onTextureMouseUp);
+    this._onTextureMouseMove = null;
+    this._onTextureMouseUp = null;
+  }
+
+  initThemePicker() {
+    const themePicker = this.panel.querySelector('.zen-theme-picker-gradient');
+    this._onDotMouseMove = this.onDotMouseMove.bind(this);
+    this._onDotMouseUp = this.onDotMouseUp.bind(this);
+    this._onDotMouseDown = this.onDotMouseDown.bind(this);
+    this._onThemePickerClick = this.onThemePickerClick.bind(this);
+    document.addEventListener('mousemove', this._onDotMouseMove);
+    document.addEventListener('mouseup', this._onDotMouseUp);
+    themePicker.addEventListener('mousedown', this._onDotMouseDown);
+    themePicker.addEventListener('click', this._onThemePickerClick);
+  }
+
+  uninitThemePicker() {
+    const themePicker = this.panel.querySelector('.zen-theme-picker-gradient');
+    document.removeEventListener('mousemove', this._onDotMouseMove);
+    document.removeEventListener('mouseup', this._onDotMouseUp);
+    themePicker.removeEventListener('mousedown', this._onDotMouseDown);
+    themePicker.removeEventListener('click', this._onThemePickerClick);
+    this._onDotMouseMove = null;
+    this._onDotMouseUp = null;
+    this._onDotMouseDown = null;
+    this._onThemePickerClick = null;
+  }
+
+  /**
+   * Converts an HSL color value to RGB. Conversion formula
+   * adapted from https://en.wikipedia.org/wiki/HSL_color_space.
+   * Assumes h, s, and l are contained in the set [0, 1] and
+   * returns r, g, and b in the set [0, 255].
+   *
+   * @param   {number}  h       The hue
+   * @param   {number}  s       The saturation
+   * @param   {number}  l       The lightness
+   * @return  {Array}           The RGB representation
+   */
+  hslToRgb(h, s, l) {
+    const { round } = Math;
+    let r, g, b;
+
+    if (s === 0) {
+      r = g = b = l; // achromatic
+    } else {
+      const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+      const p = 2 * l - q;
+      r = this.hueToRgb(p, q, h + 1 / 3);
+      g = this.hueToRgb(p, q, h);
+      b = this.hueToRgb(p, q, h - 1 / 3);
+    }
+
+    return [round(r * 255), round(g * 255), round(b * 255)];
+  }
+
+  rgbToHsl(r, g, b) {
+    r /= 255;
+    g /= 255;
+    b /= 255;
+    let max = Math.max(r, g, b);
+    let min = Math.min(r, g, b);
+    let d = max - min;
+    let h;
+    if (d === 0) h = 0;
+    else if (max === r) h = ((g - b) / d) % 6;
+    else if (max === g) h = (b - r) / d + 2;
+    else if (max === b) h = (r - g) / d + 4;
+    let l = (min + max) / 2;
+    let s = d === 0 ? 0 : d / (1 - Math.abs(2 * l - 1));
+    return [h * 60, s, l];
+  }
+
+  hueToRgb(p, q, t) {
+    if (t < 0) t += 1;
+    if (t > 1) t -= 1;
+    if (t < 1 / 6) return p + (q - p) * 6 * t;
+    if (t < 1 / 2) return q;
+    if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+    return p;
+  }
+
+  calculateInitialPosition([r, g, b]) {
+    // This function is called before the picker is even rendered, so we hard code the dimensions
+    // important: If any sort of sizing is changed, make sure changes are reflected here
+    const padding = 30;
+    const rect = {
+      width: 338,
+      height: 338,
+    };
+    const centerX = rect.width / 2;
+    const centerY = rect.height / 2;
+    const radius = (rect.width - padding) / 2;
+    const [hue, saturation] = this.rgbToHsl(r, g, b);
+    const angle = (hue / 360) * 2 * Math.PI; // Convert to radians
+    const normalizedSaturation = saturation / 100; // Convert to [0, 1]
+    const x = centerX + radius * normalizedSaturation * Math.cos(angle) - padding;
+    const y = centerY + radius * normalizedSaturation * Math.sin(angle) - padding;
+    return { x, y };
+  }
+
+  getColorFromPosition(x, y, type = undefined) {
+    // Return a color as hsl based on the position in the gradient
+    const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
+    const rect = gradient.getBoundingClientRect();
+    const padding = 30; // each side
+    const dotHalfSize = 36 / 2; // half the size of the dot
+    x += dotHalfSize;
+    y += dotHalfSize;
+    rect.width += padding * 2; // Adjust width and height for padding
+    rect.height += padding * 2; // Adjust width and height for padding
+    const centerX = rect.width / 2;
+    const centerY = rect.height / 2;
+    const radius = (rect.width - padding) / 2;
+    const distance = Math.sqrt((x - centerX) ** 2 + (y - centerY) ** 2);
+    let angle = Math.atan2(y - centerY, x - centerX);
+    angle = (angle * 180) / Math.PI; // Convert to degrees
+    if (angle < 0) {
+      angle += 360; // Normalize to [0, 360)
+    }
+    const normalizedDistance = 1 - Math.min(distance / radius, 1); // Normalize distance to [0, 1]
+    const hue = (angle / 360) * 360; // Normalize angle to [0, 360)
+    let saturation = normalizedDistance * 100; // stays high even in center
+    if (type !== EXPLICIT_LIGHTNESS_TYPE) {
+      saturation = 80 + (1 - normalizedDistance) * 20;
+      // Set the current lightness to how far we are from the center of the circle
+      // For example, moving the dot outside will have higher lightness, while moving it inside will have lower lightness
+      this.#currentLightness = Math.round((1 - normalizedDistance) * 100);
+    }
+    const lightness = this.#currentLightness; // Fixed lightness for simplicity
+    const [r, g, b] = this.hslToRgb(hue / 360, saturation / 100, lightness / 100);
+    return [
+      Math.min(255, Math.max(0, r)),
+      Math.min(255, Math.max(0, g)),
+      Math.min(255, Math.max(0, b)),
+    ];
+  }
+
+  getJSONPos(x, y) {
+    // Return a JSON string with the position
+    return JSON.stringify({ x: Math.round(x), y: Math.round(y) });
+  }
+
+  createDot(color, fromWorkspace = false) {
+    const [r, g, b] = color.c;
+    const dot = document.createElement('div');
+    if (color.isPrimary) {
+      dot.classList.add('primary');
+    }
+    if (color.isCustom) {
+      if (!color.c) {
+        return;
+      }
+      dot.classList.add('custom');
+      dot.style.opacity = 0;
+      dot.style.setProperty('--zen-theme-picker-dot-color', color.c);
+    } else {
+      const { x, y } = color.position || this.calculateInitialPosition([r, g, b]);
+      const dotPad = this.panel.querySelector('.zen-theme-picker-gradient');
+
+      dot.classList.add('zen-theme-picker-dot');
+
+      dot.style.left = `${x}px`;
+      dot.style.top = `${y}px`;
+
+      if (this.dots.length < 1) {
         dot.classList.add('primary');
       }
-      if (color.isCustom) {
-        if (!color.c) {
-          return;
-        }
-        dot.classList.add('custom');
-        dot.style.opacity = 0;
-        dot.style.setProperty('--zen-theme-picker-dot-color', color.c);
-      } else {
-        const { x, y } = color.position || this.calculateInitialPosition([r, g, b]);
-        const dotPad = this.panel.querySelector('.zen-theme-picker-gradient');
 
-        dot.classList.add('zen-theme-picker-dot');
+      dotPad.appendChild(dot);
+      let id = this.dots.length;
 
-        dot.style.left = `${x}px`;
-        dot.style.top = `${y}px`;
+      dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${r}, ${g}, ${b})`);
+      dot.setAttribute('data-position', this.getJSONPos(x, y));
+      dot.setAttribute('data-type', color.type);
 
-        if (this.dots.length < 1) {
-          dot.classList.add('primary');
-        }
-
-        dotPad.appendChild(dot);
-        let id = this.dots.length;
-
-        dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${r}, ${g}, ${b})`);
-        dot.setAttribute('data-position', this.getJSONPos(x, y));
-        dot.setAttribute('data-type', color.type);
-
-        this.dots.push({
-          ID: id,
-          element: dot,
-          position: { x, y },
-          type: color.type,
-          lightness: color.lightness,
-        });
-      }
-      if (!fromWorkspace) {
-        this.updateCurrentWorkspace(true);
-      }
+      this.dots.push({
+        ID: id,
+        element: dot,
+        position: { x, y },
+        type: color.type,
+        lightness: color.lightness,
+      });
     }
+    if (!fromWorkspace) {
+      this.updateCurrentWorkspace(true);
+    }
+  }
 
-    addColorToCustomList(color) {
-      const listItems = window.MozXULElement.parseXULToFragment(`
+  addColorToCustomList(color) {
+    const listItems = window.MozXULElement.parseXULToFragment(`
         <hbox class="zen-theme-picker-custom-list-item">
           <html:div class="zen-theme-picker-dot custom"></html:div>
           <label class="zen-theme-picker-custom-list-item-label"></label>
           <toolbarbutton class="zen-theme-picker-custom-list-item-remove toolbarbutton-1"></toolbarbutton>
         </hbox>
       `);
-      listItems
-        .querySelector('.zen-theme-picker-custom-list-item')
-        .setAttribute('data-color', color);
-      listItems
-        .querySelector('.zen-theme-picker-dot')
-        .style.setProperty('--zen-theme-picker-dot-color', color);
-      listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color;
-      listItems
-        .querySelector('.zen-theme-picker-custom-list-item-remove')
-        .addEventListener('command', this.removeCustomColor.bind(this));
+    listItems.querySelector('.zen-theme-picker-custom-list-item').setAttribute('data-color', color);
+    listItems
+      .querySelector('.zen-theme-picker-dot')
+      .style.setProperty('--zen-theme-picker-dot-color', color);
+    listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color;
+    listItems
+      .querySelector('.zen-theme-picker-custom-list-item-remove')
+      .addEventListener('command', this.removeCustomColor.bind(this));
 
-      this.customColorList.appendChild(listItems);
+    this.customColorList.appendChild(listItems);
+  }
+
+  async addCustomColor() {
+    let color = this.customColorInput.value;
+
+    if (!color) {
+      return;
     }
 
-    async addCustomColor() {
-      let color = this.customColorInput.value;
-
-      if (!color) {
-        return;
+    let colorOpacity =
+      document.getElementById('PanelUI-zen-gradient-generator-custom-opacity')?.value ?? 1;
+    // Convert the opacity into a hex value if it's not already
+    if (colorOpacity < 1) {
+      // e.g. if opacity is 1, we add to the color FF, if it's 0.5 we add 80, etc.
+      const hexOpacity = Math.round(colorOpacity * 255)
+        .toString(16)
+        .padStart(2, '0')
+        .toUpperCase();
+      // If the color is in hex format
+      if (color.startsWith('#')) {
+        // If the color is already in hex format, we just append the opacity
+        if (color.length === 7) {
+          color += hexOpacity;
+        }
       }
+    }
 
-      let colorOpacity =
-        document.getElementById('PanelUI-zen-gradient-generator-custom-opacity')?.value ?? 1;
-      // Convert the opacity into a hex value if it's not already
-      if (colorOpacity < 1) {
-        // e.g. if opacity is 1, we add to the color FF, if it's 0.5 we add 80, etc.
-        const hexOpacity = Math.round(colorOpacity * 255)
-          .toString(16)
-          .padStart(2, '0')
-          .toUpperCase();
-        // If the color is in hex format
-        if (color.startsWith('#')) {
-          // If the color is already in hex format, we just append the opacity
-          if (color.length === 7) {
-            color += hexOpacity;
+    // Add '#' prefix if it's missing and the input appears to be a hex color
+    if (!color.startsWith('#') && /^[0-9A-Fa-f]{3,6}$/.test(color)) {
+      color = '#' + color;
+    }
+
+    // can be any color format, we just add it to the list as a dot, but hidden
+    const dot = document.createElement('div');
+    dot.classList.add('zen-theme-picker-dot', 'hidden', 'custom');
+    dot.style.opacity = 0;
+    dot.style.setProperty('--zen-theme-picker-dot-color', color);
+    this.panel.querySelector('#PanelUI-zen-gradient-generator-custom-list').prepend(dot);
+    this.customColorInput.value = '';
+    document.getElementById('PanelUI-zen-gradient-generator-custom-opacity').value = 1;
+    await this.updateCurrentWorkspace();
+  }
+
+  handlePanelCommand(event) {
+    const target = event.target.closest('toolbarbutton');
+    if (!target) {
+      return;
+    }
+    switch (target.id) {
+      case 'PanelUI-zen-gradient-generator-color-custom-add':
+        this.addCustomColor();
+        break;
+    }
+  }
+
+  spawnDot(dotData, primary = false) {
+    const dotPad = this.panel.querySelector('.zen-theme-picker-gradient');
+    const relativePosition = {
+      x: dotData.x,
+      y: dotData.y,
+    };
+
+    const dot = document.createElement('div');
+    dot.classList.add('zen-theme-picker-dot');
+
+    dot.style.left = `${dotData.x}px`;
+    dot.style.top = `${dotData.y}px`;
+
+    dotPad.appendChild(dot);
+
+    let id = this.dots.length;
+
+    if (primary) {
+      id = 0;
+      dot.classList.add('primary');
+
+      const existingPrimaryDot = this.dots.find((d) => d.ID === 0);
+      if (existingPrimaryDot) {
+        existingPrimaryDot.ID = this.dots.length;
+        existingPrimaryDot.element.classList.remove('primary');
+      }
+    }
+
+    const colorFromPos = this.getColorFromPosition(
+      relativePosition.x,
+      relativePosition.y,
+      dotData.type
+    );
+    dot.style.setProperty(
+      '--zen-theme-picker-dot-color',
+      `rgb(${colorFromPos[0]}, ${colorFromPos[1]}, ${colorFromPos[2]})`
+    );
+    dot.setAttribute('data-position', this.getJSONPos(relativePosition.x, relativePosition.y));
+    dot.setAttribute('data-type', dotData.type);
+
+    this.dots.push({
+      ID: id,
+      element: dot,
+      position: { x: relativePosition.x, y: relativePosition.y },
+      lightness: this.#currentLightness,
+      type: dotData.type,
+    });
+  }
+
+  calculateCompliments(dots, action = 'update', useHarmony = '') {
+    const colorHarmonies = this.colorHarmonies;
+
+    if (dots.length === 0) {
+      return [];
+    }
+
+    function getColorHarmonyType(numDots, dots) {
+      if (useHarmony !== '') {
+        const selectedHarmony = colorHarmonies.find((harmony) => harmony.type === useHarmony);
+
+        if (selectedHarmony) {
+          if (action === 'remove') {
+            if (dots.length !== 0) {
+              return colorHarmonies.find(
+                (harmony) => harmony.angles.length === selectedHarmony.angles.length - 1
+              );
+            } else {
+              return { type: 'floating', angles: [] };
+            }
+          }
+          if (action === 'add') {
+            return colorHarmonies.find(
+              (harmony) => harmony.angles.length === selectedHarmony.angles.length + 1
+            );
+          }
+          if (action === 'update') {
+            return selectedHarmony;
           }
         }
       }
 
-      // Add '#' prefix if it's missing and the input appears to be a hex color
-      if (!color.startsWith('#') && /^[0-9A-Fa-f]{3,6}$/.test(color)) {
-        color = '#' + color;
+      if (action === 'remove') {
+        return colorHarmonies.find((harmony) => harmony.angles.length === numDots);
       }
-
-      // can be any color format, we just add it to the list as a dot, but hidden
-      const dot = document.createElement('div');
-      dot.classList.add('zen-theme-picker-dot', 'hidden', 'custom');
-      dot.style.opacity = 0;
-      dot.style.setProperty('--zen-theme-picker-dot-color', color);
-      this.panel.querySelector('#PanelUI-zen-gradient-generator-custom-list').prepend(dot);
-      this.customColorInput.value = '';
-      document.getElementById('PanelUI-zen-gradient-generator-custom-opacity').value = 1;
-      await this.updateCurrentWorkspace();
-    }
-
-    handlePanelCommand(event) {
-      const target = event.target.closest('toolbarbutton');
-      if (!target) {
-        return;
+      if (action === 'add') {
+        return colorHarmonies.find((harmony) => harmony.angles.length + 1 === numDots);
       }
-      switch (target.id) {
-        case 'PanelUI-zen-gradient-generator-color-custom-add':
-          this.addCustomColor();
-          break;
+      if (action === 'update') {
+        return colorHarmonies.find((harmony) => harmony.angles.length + 1 === numDots);
       }
     }
 
-    spawnDot(dotData, primary = false) {
-      const dotPad = this.panel.querySelector('.zen-theme-picker-gradient');
-      const relativePosition = {
-        x: dotData.x,
-        y: dotData.y,
+    function getAngleFromPosition(position, centerPosition) {
+      let deltaX = position.x - centerPosition.x;
+      let deltaY = position.y - centerPosition.y;
+      let angle = Math.atan2(deltaY, deltaX) * (180 / Math.PI);
+      return (angle + 360) % 360;
+    }
+
+    function getDistanceFromCenter(position, centerPosition) {
+      const deltaX = position.x - centerPosition.x;
+      const deltaY = position.y - centerPosition.y;
+      return Math.sqrt(deltaX * deltaX + deltaY * deltaY);
+    }
+
+    const dotPad = this.panel.querySelector('.zen-theme-picker-gradient');
+    const rect = dotPad.getBoundingClientRect();
+    const padding = 30;
+
+    let updatedDots = [...dots];
+    const centerPosition = { x: rect.width / 2, y: rect.height / 2 };
+
+    const harmonyAngles = getColorHarmonyType(
+      dots.length + (action === 'add' ? 1 : action === 'remove' ? -1 : 0),
+      this.dots
+    );
+    this.useAlgo = harmonyAngles.type;
+    if (!harmonyAngles || harmonyAngles.angles.length === 0) return dots;
+
+    let primaryDot = dots.find((dot) => dot.ID === 0);
+    if (!primaryDot) return [];
+
+    if (action === 'add' && this.dots.length) {
+      updatedDots.push({ ID: this.dots.length, position: centerPosition });
+    }
+    const baseAngle = getAngleFromPosition(primaryDot.position, centerPosition);
+    let distance = getDistanceFromCenter(primaryDot.position, centerPosition);
+    const radius = (rect.width - padding) / 2;
+    if (distance > radius) distance = radius;
+    if (this.dots.length > 0) {
+      updatedDots = [
+        {
+          ID: 0,
+          position: primaryDot.position,
+          type: primaryDot.type,
+        },
+      ];
+    }
+
+    harmonyAngles.angles.forEach((angleOffset, index) => {
+      let newAngle = (baseAngle + angleOffset) % 360;
+      let radian = (newAngle * Math.PI) / 180;
+
+      let newPosition = {
+        x: centerPosition.x + distance * Math.cos(radian),
+        y: centerPosition.y + distance * Math.sin(radian),
       };
 
-      const dot = document.createElement('div');
-      dot.classList.add('zen-theme-picker-dot');
-
-      dot.style.left = `${dotData.x}px`;
-      dot.style.top = `${dotData.y}px`;
-
-      dotPad.appendChild(dot);
-
-      let id = this.dots.length;
-
-      if (primary) {
-        id = 0;
-        dot.classList.add('primary');
-
-        const existingPrimaryDot = this.dots.find((d) => d.ID === 0);
-        if (existingPrimaryDot) {
-          existingPrimaryDot.ID = this.dots.length;
-          existingPrimaryDot.element.classList.remove('primary');
-        }
-      }
-
-      const colorFromPos = this.getColorFromPosition(
-        relativePosition.x,
-        relativePosition.y,
-        dotData.type
-      );
-      dot.style.setProperty(
-        '--zen-theme-picker-dot-color',
-        `rgb(${colorFromPos[0]}, ${colorFromPos[1]}, ${colorFromPos[2]})`
-      );
-      dot.setAttribute('data-position', this.getJSONPos(relativePosition.x, relativePosition.y));
-      dot.setAttribute('data-type', dotData.type);
-
-      this.dots.push({
-        ID: id,
-        element: dot,
-        position: { x: relativePosition.x, y: relativePosition.y },
-        lightness: this.#currentLightness,
-        type: dotData.type,
+      updatedDots.push({
+        ID: index + 1,
+        position: newPosition,
+        type: primaryDot.type,
       });
+    });
+
+    return updatedDots;
+  }
+
+  handleColorPositions(colorPositions, ignoreLegacy = false) {
+    colorPositions.sort((a, b) => a.ID - b.ID);
+
+    if (this.isLegacyVersion && !ignoreLegacy) {
+      this.isLegacyVersion = false;
+      Services.prefs.setIntPref('zen.theme.gradient-legacy-version', 1);
     }
 
-    calculateCompliments(dots, action = 'update', useHarmony = '') {
-      const colorHarmonies = this.colorHarmonies;
+    colorPositions.forEach((dotPosition) => {
+      const existingDot = this.dots.find((dot) => dot.ID === dotPosition.ID);
 
-      if (dots.length === 0) {
-        return [];
-      }
+      if (existingDot) {
+        existingDot.type = dotPosition.type;
+        existingDot.position = dotPosition.position;
+        const colorFromPos = this.getColorFromPosition(
+          dotPosition.position.x,
+          dotPosition.position.y,
+          dotPosition.type
+        );
+        existingDot.lightness = this.#currentLightness;
+        existingDot.element.style.setProperty(
+          '--zen-theme-picker-dot-color',
+          `rgb(${colorFromPos[0]}, ${colorFromPos[1]}, ${colorFromPos[2]})`
+        );
+        existingDot.element.setAttribute(
+          'data-position',
+          this.getJSONPos(dotPosition.position.x, dotPosition.position.y)
+        );
+        existingDot.element.setAttribute('data-type', dotPosition.type);
 
-      function getColorHarmonyType(numDots, dots) {
-        if (useHarmony !== '') {
-          const selectedHarmony = colorHarmonies.find((harmony) => harmony.type === useHarmony);
-
-          if (selectedHarmony) {
-            if (action === 'remove') {
-              if (dots.length !== 0) {
-                return colorHarmonies.find(
-                  (harmony) => harmony.angles.length === selectedHarmony.angles.length - 1
-                );
-              } else {
-                return { type: 'floating', angles: [] };
-              }
+        if (!this.dragging) {
+          gZenUIManager.motion.animate(
+            existingDot.element,
+            {
+              left: `${dotPosition.position.x}px`,
+              top: `${dotPosition.position.y}px`,
+            },
+            {
+              duration: 0.4,
+              type: 'spring',
+              bounce: 0.3,
             }
-            if (action === 'add') {
-              return colorHarmonies.find(
-                (harmony) => harmony.angles.length === selectedHarmony.angles.length + 1
-              );
-            }
-            if (action === 'update') {
-              return selectedHarmony;
-            }
-          }
-        }
-
-        if (action === 'remove') {
-          return colorHarmonies.find((harmony) => harmony.angles.length === numDots);
-        }
-        if (action === 'add') {
-          return colorHarmonies.find((harmony) => harmony.angles.length + 1 === numDots);
-        }
-        if (action === 'update') {
-          return colorHarmonies.find((harmony) => harmony.angles.length + 1 === numDots);
-        }
-      }
-
-      function getAngleFromPosition(position, centerPosition) {
-        let deltaX = position.x - centerPosition.x;
-        let deltaY = position.y - centerPosition.y;
-        let angle = Math.atan2(deltaY, deltaX) * (180 / Math.PI);
-        return (angle + 360) % 360;
-      }
-
-      function getDistanceFromCenter(position, centerPosition) {
-        const deltaX = position.x - centerPosition.x;
-        const deltaY = position.y - centerPosition.y;
-        return Math.sqrt(deltaX * deltaX + deltaY * deltaY);
-      }
-
-      const dotPad = this.panel.querySelector('.zen-theme-picker-gradient');
-      const rect = dotPad.getBoundingClientRect();
-      const padding = 30;
-
-      let updatedDots = [...dots];
-      const centerPosition = { x: rect.width / 2, y: rect.height / 2 };
-
-      const harmonyAngles = getColorHarmonyType(
-        dots.length + (action === 'add' ? 1 : action === 'remove' ? -1 : 0),
-        this.dots
-      );
-      this.useAlgo = harmonyAngles.type;
-      if (!harmonyAngles || harmonyAngles.angles.length === 0) return dots;
-
-      let primaryDot = dots.find((dot) => dot.ID === 0);
-      if (!primaryDot) return [];
-
-      if (action === 'add' && this.dots.length) {
-        updatedDots.push({ ID: this.dots.length, position: centerPosition });
-      }
-      const baseAngle = getAngleFromPosition(primaryDot.position, centerPosition);
-      let distance = getDistanceFromCenter(primaryDot.position, centerPosition);
-      const radius = (rect.width - padding) / 2;
-      if (distance > radius) distance = radius;
-      if (this.dots.length > 0) {
-        updatedDots = [
-          {
-            ID: 0,
-            position: primaryDot.position,
-            type: primaryDot.type,
-          },
-        ];
-      }
-
-      harmonyAngles.angles.forEach((angleOffset, index) => {
-        let newAngle = (baseAngle + angleOffset) % 360;
-        let radian = (newAngle * Math.PI) / 180;
-
-        let newPosition = {
-          x: centerPosition.x + distance * Math.cos(radian),
-          y: centerPosition.y + distance * Math.sin(radian),
-        };
-
-        updatedDots.push({
-          ID: index + 1,
-          position: newPosition,
-          type: primaryDot.type,
-        });
-      });
-
-      return updatedDots;
-    }
-
-    handleColorPositions(colorPositions, ignoreLegacy = false) {
-      colorPositions.sort((a, b) => a.ID - b.ID);
-
-      if (this.isLegacyVersion && !ignoreLegacy) {
-        this.isLegacyVersion = false;
-        Services.prefs.setIntPref('zen.theme.gradient-legacy-version', 1);
-      }
-
-      colorPositions.forEach((dotPosition) => {
-        const existingDot = this.dots.find((dot) => dot.ID === dotPosition.ID);
-
-        if (existingDot) {
-          existingDot.type = dotPosition.type;
-          existingDot.position = dotPosition.position;
-          const colorFromPos = this.getColorFromPosition(
-            dotPosition.position.x,
-            dotPosition.position.y,
-            dotPosition.type
           );
-          existingDot.lightness = this.#currentLightness;
-          existingDot.element.style.setProperty(
-            '--zen-theme-picker-dot-color',
-            `rgb(${colorFromPos[0]}, ${colorFromPos[1]}, ${colorFromPos[2]})`
-          );
-          existingDot.element.setAttribute(
-            'data-position',
-            this.getJSONPos(dotPosition.position.x, dotPosition.position.y)
-          );
-          existingDot.element.setAttribute('data-type', dotPosition.type);
-
-          if (!this.dragging) {
-            gZenUIManager.motion.animate(
-              existingDot.element,
-              {
-                left: `${dotPosition.position.x}px`,
-                top: `${dotPosition.position.y}px`,
-              },
-              {
-                duration: 0.4,
-                type: 'spring',
-                bounce: 0.3,
-              }
-            );
-          } else {
-            existingDot.element.style.left = `${dotPosition.position.x}px`;
-            existingDot.element.style.top = `${dotPosition.position.y}px`;
-          }
         } else {
-          this.spawnDot({
-            type: dotPosition.type,
-            ...dotPosition.position,
-          });
+          existingDot.element.style.left = `${dotPosition.position.x}px`;
+          existingDot.element.style.top = `${dotPosition.position.y}px`;
+        }
+      } else {
+        this.spawnDot({
+          type: dotPosition.type,
+          ...dotPosition.position,
+        });
+      }
+    });
+  }
+
+  onThemePickerClick(event) {
+    if (this._rotating) {
+      return;
+    }
+    if (event.target.closest('#PanelUI-zen-gradient-generator-scheme')) {
+      return;
+    }
+    event.preventDefault();
+    const target = event.target;
+    if (target.id === 'PanelUI-zen-gradient-generator-color-add') {
+      if (this.dots.length >= nsZenThemePicker.MAX_DOTS) return;
+      let colorPositions = this.calculateCompliments(this.dots, 'add', this.useAlgo);
+
+      this.handleColorPositions(colorPositions);
+      this.updateCurrentWorkspace();
+      return;
+    } else if (target.id === 'PanelUI-zen-gradient-generator-color-remove') {
+      this.dots.sort((a, b) => a.ID - b.ID);
+      if (this.dots.length === 0) return;
+
+      const lastDot = this.dots.pop();
+      lastDot.element.remove();
+
+      this.dots.forEach((dot, index) => {
+        dot.ID = index;
+        if (index === 0) {
+          dot.element.classList.add('primary');
+        } else {
+          dot.element.classList.remove('primary');
         }
       });
+
+      let colorPositions = this.calculateCompliments(this.dots, 'remove');
+      this.handleColorPositions(colorPositions);
+      this.updateCurrentWorkspace();
+      return;
     }
 
-    onThemePickerClick(event) {
-      if (this._rotating) {
-        return;
-      }
-      if (event.target.closest('#PanelUI-zen-gradient-generator-scheme')) {
-        return;
-      }
+    if (event.button !== 0 || this.dragging || this.recentlyDragged) return;
+
+    const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
+    const rect = gradient.getBoundingClientRect();
+    const padding = 30;
+
+    const centerX = rect.left + rect.width / 2;
+    const centerY = rect.top + rect.height / 2;
+    const radius = (rect.width - padding) / 2;
+    let pixelX = event.clientX;
+    let pixelY = event.clientY;
+
+    const clickedElement = event.target;
+    let clickedDot = null;
+    const existingPrimaryDot = this.dots.find((d) => d.ID === 0);
+
+    clickedDot = this.dots.find((dot) => dot.element === clickedElement);
+
+    if (clickedDot) {
+      // TODO: this doesnt work and needs to be fixed
+      existingPrimaryDot.ID = clickedDot.ID;
+      clickedDot.ID = 0;
+      clickedDot.element.style.zIndex = 999;
+
+      let colorPositions = this.calculateCompliments(this.dots, 'update', this.useAlgo);
+      this.handleColorPositions(colorPositions);
+      return;
+    }
+
+    const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
+    if (distance > radius) {
+      const angle = Math.atan2(pixelY - centerY, pixelX - centerX);
+      pixelX = centerX + Math.cos(angle) * radius;
+      pixelY = centerY + Math.sin(angle) * radius;
+    }
+
+    const relativeX = pixelX - rect.left;
+    const relativeY = pixelY - rect.top;
+
+    if (!clickedDot && this.dots.length < 1) {
+      this.spawnDot({ x: relativeX, y: relativeY }, this.dots.length === 0);
+
+      this.updateCurrentWorkspace(true);
+    } else if (!clickedDot && existingPrimaryDot) {
+      existingPrimaryDot.position = {
+        x: relativeX,
+        y: relativeY,
+      };
+
+      let colorPositions = this.calculateCompliments(this.dots, 'update', this.useAlgo);
+      this.handleColorPositions(colorPositions);
+      this.updateCurrentWorkspace(true);
+
+      gZenUIManager.motion.animate(
+        existingPrimaryDot.element,
+        {
+          left: `${existingPrimaryDot.position.x}px`,
+          top: `${existingPrimaryDot.position.y}px`,
+        },
+        {
+          duration: 0.4,
+          type: 'spring',
+          bounce: 0.3,
+        }
+      );
+    }
+  }
+
+  onDotMouseDown(event) {
+    if (event.button === 2) {
+      return;
+    }
+    const draggedDot = this.dots.find((dot) => dot.element === event.target);
+    if (draggedDot) {
       event.preventDefault();
-      const target = event.target;
-      if (target.id === 'PanelUI-zen-gradient-generator-color-add') {
-        if (this.dots.length >= nsZenThemePicker.MAX_DOTS) return;
-        let colorPositions = this.calculateCompliments(this.dots, 'add', this.useAlgo);
+      this.dragging = true;
+      this.draggedDot = event.target;
+      this.draggedDot.classList.add('dragging');
+    }
 
-        this.handleColorPositions(colorPositions);
-        this.updateCurrentWorkspace();
-        return;
-      } else if (target.id === 'PanelUI-zen-gradient-generator-color-remove') {
-        this.dots.sort((a, b) => a.ID - b.ID);
-        if (this.dots.length === 0) return;
+    // Store the starting position of the drag
+    this.dragStartPosition = {
+      x: event.clientX,
+      y: event.clientY,
+    };
+  }
 
-        const lastDot = this.dots.pop();
-        lastDot.element.remove();
-
-        this.dots.forEach((dot, index) => {
-          dot.ID = index;
-          if (index === 0) {
-            dot.element.classList.add('primary');
-          } else {
-            dot.element.classList.remove('primary');
-          }
-        });
-
-        let colorPositions = this.calculateCompliments(this.dots, 'remove');
-        this.handleColorPositions(colorPositions);
-        this.updateCurrentWorkspace();
+  onDotMouseUp(event) {
+    if (this._rotating) {
+      return;
+    }
+    if (event.button === 2) {
+      if (!event.target.classList.contains('zen-theme-picker-dot')) {
         return;
       }
+      this.dots = this.dots.filter((dot) => dot.element !== event.target);
+      event.target.remove();
 
-      if (event.button !== 0 || this.dragging || this.recentlyDragged) return;
+      this.dots.sort((a, b) => a.ID - b.ID);
 
-      const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
-      const rect = gradient.getBoundingClientRect();
-      const padding = 30;
+      // Reassign the IDs after sorting
+      this.dots.forEach((dot, index) => {
+        dot.ID = index;
+        if (index === 0) {
+          dot.element.classList.add('primary');
+        } else {
+          dot.element.classList.remove('primary');
+        }
+      });
+
+      let colorPositions = this.calculateCompliments(this.dots, 'remove');
+      this.handleColorPositions(colorPositions);
+
+      this.updateCurrentWorkspace();
+      return;
+    }
+
+    if (this.dragging) {
+      event.preventDefault();
+      event.stopPropagation();
+      this.dragging = false;
+      this.draggedDot.classList.remove('dragging');
+      this.draggedDot = null;
+      this.dragStartPosition = null; // Reset the drag start position
+
+      this.recentlyDragged = true;
+      setTimeout(() => {
+        this.recentlyDragged = false;
+      }, 100);
+      return;
+    }
+  }
+
+  onDotMouseMove(event) {
+    if (this.dragging) {
+      event.preventDefault();
+      const rect = this.panel.querySelector('.zen-theme-picker-gradient').getBoundingClientRect();
+      const padding = 30; // each side
+      // do NOT let the ball be draged outside of an imaginary circle. You can drag it anywhere inside the circle
+      // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball
+      // should be placed on the edge of the circle. If it's inside the circle, then the ball just follows the mouse
 
       const centerX = rect.left + rect.width / 2;
       const centerY = rect.top + rect.height / 2;
       const radius = (rect.width - padding) / 2;
       let pixelX = event.clientX;
       let pixelY = event.clientY;
-
-      const clickedElement = event.target;
-      let clickedDot = null;
-      const existingPrimaryDot = this.dots.find((d) => d.ID === 0);
-
-      clickedDot = this.dots.find((dot) => dot.element === clickedElement);
-
-      if (clickedDot) {
-        // TODO: this doesnt work and needs to be fixed
-        existingPrimaryDot.ID = clickedDot.ID;
-        clickedDot.ID = 0;
-        clickedDot.element.style.zIndex = 999;
-
-        let colorPositions = this.calculateCompliments(this.dots, 'update', this.useAlgo);
-        this.handleColorPositions(colorPositions);
-        return;
-      }
-
       const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
       if (distance > radius) {
         const angle = Math.atan2(pixelY - centerY, pixelX - centerX);
@@ -894,818 +1003,692 @@
         pixelY = centerY + Math.sin(angle) * radius;
       }
 
+      // set the location of the dot in pixels
       const relativeX = pixelX - rect.left;
       const relativeY = pixelY - rect.top;
 
-      if (!clickedDot && this.dots.length < 1) {
-        this.spawnDot({ x: relativeX, y: relativeY }, this.dots.length === 0);
-
-        this.updateCurrentWorkspace(true);
-      } else if (!clickedDot && existingPrimaryDot) {
-        existingPrimaryDot.position = {
-          x: relativeX,
-          y: relativeY,
-        };
-
-        let colorPositions = this.calculateCompliments(this.dots, 'update', this.useAlgo);
-        this.handleColorPositions(colorPositions);
-        this.updateCurrentWorkspace(true);
-
-        gZenUIManager.motion.animate(
-          existingPrimaryDot.element,
-          {
-            left: `${existingPrimaryDot.position.x}px`,
-            top: `${existingPrimaryDot.position.y}px`,
-          },
-          {
-            duration: 0.4,
-            type: 'spring',
-            bounce: 0.3,
-          }
-        );
-      }
-    }
-
-    onDotMouseDown(event) {
-      if (event.button === 2) {
-        return;
-      }
-      const draggedDot = this.dots.find((dot) => dot.element === event.target);
-      if (draggedDot) {
-        event.preventDefault();
-        this.dragging = true;
-        this.draggedDot = event.target;
-        this.draggedDot.classList.add('dragging');
-      }
-
-      // Store the starting position of the drag
-      this.dragStartPosition = {
-        x: event.clientX,
-        y: event.clientY,
+      const draggedDot = this.dots.find((dot) => dot.element === this.draggedDot);
+      draggedDot.element.style.left = `${relativeX}px`;
+      draggedDot.element.style.top = `${relativeY}px`;
+      draggedDot.position = {
+        x: relativeX,
+        y: relativeY,
       };
-    }
+      let colorPositions = this.calculateCompliments(this.dots, 'update', this.useAlgo);
+      this.handleColorPositions(colorPositions);
 
-    onDotMouseUp(event) {
-      if (this._rotating) {
-        return;
-      }
-      if (event.button === 2) {
-        if (!event.target.classList.contains('zen-theme-picker-dot')) {
-          return;
-        }
-        this.dots = this.dots.filter((dot) => dot.element !== event.target);
-        event.target.remove();
-
-        this.dots.sort((a, b) => a.ID - b.ID);
-
-        // Reassign the IDs after sorting
-        this.dots.forEach((dot, index) => {
-          dot.ID = index;
-          if (index === 0) {
-            dot.element.classList.add('primary');
-          } else {
-            dot.element.classList.remove('primary');
-          }
-        });
-
-        let colorPositions = this.calculateCompliments(this.dots, 'remove');
-        this.handleColorPositions(colorPositions);
-
-        this.updateCurrentWorkspace();
-        return;
-      }
-
-      if (this.dragging) {
-        event.preventDefault();
-        event.stopPropagation();
-        this.dragging = false;
-        this.draggedDot.classList.remove('dragging');
-        this.draggedDot = null;
-        this.dragStartPosition = null; // Reset the drag start position
-
-        this.recentlyDragged = true;
-        setTimeout(() => {
-          this.recentlyDragged = false;
-        }, 100);
-        return;
-      }
-    }
-
-    onDotMouseMove(event) {
-      if (this.dragging) {
-        event.preventDefault();
-        const rect = this.panel.querySelector('.zen-theme-picker-gradient').getBoundingClientRect();
-        const padding = 30; // each side
-        // do NOT let the ball be draged outside of an imaginary circle. You can drag it anywhere inside the circle
-        // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball
-        // should be placed on the edge of the circle. If it's inside the circle, then the ball just follows the mouse
-
-        const centerX = rect.left + rect.width / 2;
-        const centerY = rect.top + rect.height / 2;
-        const radius = (rect.width - padding) / 2;
-        let pixelX = event.clientX;
-        let pixelY = event.clientY;
-        const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
-        if (distance > radius) {
-          const angle = Math.atan2(pixelY - centerY, pixelX - centerX);
-          pixelX = centerX + Math.cos(angle) * radius;
-          pixelY = centerY + Math.sin(angle) * radius;
-        }
-
-        // set the location of the dot in pixels
-        const relativeX = pixelX - rect.left;
-        const relativeY = pixelY - rect.top;
-
-        const draggedDot = this.dots.find((dot) => dot.element === this.draggedDot);
-        draggedDot.element.style.left = `${relativeX}px`;
-        draggedDot.element.style.top = `${relativeY}px`;
-        draggedDot.position = {
-          x: relativeX,
-          y: relativeY,
-        };
-        let colorPositions = this.calculateCompliments(this.dots, 'update', this.useAlgo);
-        this.handleColorPositions(colorPositions);
-
-        this.updateCurrentWorkspace();
-      }
-    }
-
-    themedColors(colors) {
-      // For non-Mica themes, we return the colors as they are
-      return [...colors];
-    }
-
-    onOpacityChange(event) {
-      this.currentOpacity = parseFloat(event.target.value);
-      // If we reached a whole number (e.g., 0.1, 0.2, etc.), send a haptic feedback.
-      if (Math.round(this.currentOpacity * 10) !== this._lastHapticFeedback) {
-        Services.zen.playHapticFeedback();
-        this._lastHapticFeedback = Math.round(this.currentOpacity * 10);
-      }
       this.updateCurrentWorkspace();
     }
+  }
 
-    getToolbarModifiedBaseRaw() {
-      const opacity = this.#allowTransparencyOnSidebar ? 0.6 : 1;
-      return this.isDarkMode ? [23, 23, 26, opacity] : [240, 240, 244, opacity];
+  themedColors(colors) {
+    // For non-Mica themes, we return the colors as they are
+    return [...colors];
+  }
+
+  onOpacityChange(event) {
+    this.currentOpacity = parseFloat(event.target.value);
+    // If we reached a whole number (e.g., 0.1, 0.2, etc.), send a haptic feedback.
+    if (Math.round(this.currentOpacity * 10) !== this._lastHapticFeedback) {
+      Services.zen.playHapticFeedback();
+      this._lastHapticFeedback = Math.round(this.currentOpacity * 10);
     }
+    this.updateCurrentWorkspace();
+  }
 
-    getToolbarModifiedBase() {
-      const baseColor = this.getToolbarModifiedBaseRaw();
-      return `rgba(${baseColor[0]}, ${baseColor[1]}, ${baseColor[2]}, ${baseColor[3]})`;
+  getToolbarModifiedBaseRaw() {
+    const opacity = this.#allowTransparencyOnSidebar ? 0.6 : 1;
+    return this.isDarkMode ? [23, 23, 26, opacity] : [240, 240, 244, opacity];
+  }
+
+  getToolbarModifiedBase() {
+    const baseColor = this.getToolbarModifiedBaseRaw();
+    return `rgba(${baseColor[0]}, ${baseColor[1]}, ${baseColor[2]}, ${baseColor[3]})`;
+  }
+
+  get isMica() {
+    return window.matchMedia('(-moz-windows-mica)').matches;
+  }
+
+  get canBeTransparent() {
+    return (
+      this.isMica ||
+      window.matchMedia(
+        '(-moz-platform: macos) or ((-moz-platform: linux) and -moz-pref("zen.widget.linux.transparency"))'
+      ).matches
+    );
+  }
+
+  blendWithWhiteOverlay(baseColor, opacity) {
+    let colorToBlend;
+    let colorToBlendOpacity;
+    if (this.isMica) {
+      colorToBlend = !this.isDarkMode ? [0, 0, 0] : [255, 255, 255];
+      colorToBlendOpacity = 0.35;
+    } else if (AppConstants.platform === 'macosx') {
+      colorToBlend = [255, 255, 255];
+      colorToBlendOpacity = 0.3;
     }
-
-    get isMica() {
-      return window.matchMedia('(-moz-windows-mica)').matches;
-    }
-
-    get canBeTransparent() {
-      return (
-        this.isMica ||
-        window.matchMedia(
-          '(-moz-platform: macos) or ((-moz-platform: linux) and -moz-pref("zen.widget.linux.transparency"))'
-        ).matches
+    if (colorToBlend) {
+      const blendedAlpha = Math.min(
+        1,
+        opacity + MIN_OPACITY + colorToBlendOpacity * (1 - (opacity + MIN_OPACITY))
       );
+      baseColor = this.blendColors(baseColor, colorToBlend, blendedAlpha * 100);
+      opacity += colorToBlendOpacity * (1 - opacity);
     }
+    return `rgba(${baseColor[0]}, ${baseColor[1]}, ${baseColor[2]}, ${opacity})`;
+  }
 
-    blendWithWhiteOverlay(baseColor, opacity) {
-      let colorToBlend;
-      let colorToBlendOpacity;
-      if (this.isMica) {
-        colorToBlend = !this.isDarkMode ? [0, 0, 0] : [255, 255, 255];
-        colorToBlendOpacity = 0.35;
-      } else if (AppConstants.platform === 'macosx') {
-        colorToBlend = [255, 255, 255];
-        colorToBlendOpacity = 0.3;
-      }
-      if (colorToBlend) {
-        const blendedAlpha = Math.min(
-          1,
-          opacity + MIN_OPACITY + colorToBlendOpacity * (1 - (opacity + MIN_OPACITY))
-        );
-        baseColor = this.blendColors(baseColor, colorToBlend, blendedAlpha * 100);
-        opacity += colorToBlendOpacity * (1 - opacity);
-      }
-      return `rgba(${baseColor[0]}, ${baseColor[1]}, ${baseColor[2]}, ${opacity})`;
+  getSingleRGBColor(color, forToolbar = false) {
+    if (color.isCustom) {
+      return color.c;
     }
-
-    getSingleRGBColor(color, forToolbar = false) {
-      if (color.isCustom) {
-        return color.c;
-      }
-      let opacity = this.currentOpacity;
-      if (
-        (forToolbar && !this.#allowTransparencyOnSidebar) ||
-        (!forToolbar && !this.canBeTransparent)
-      ) {
-        color = this.blendColors(
-          color.c,
-          this.getToolbarModifiedBaseRaw().slice(0, 3),
-          this.canBeTransparent ? 90 : opacity * 100
-        );
-        opacity = 1; // Toolbar colors should always be fully opaque
-      } else {
-        color = color.c;
-      }
-      if (this.isLegacyVersion && this.isDarkMode) {
-        // In legacy version, we blend with white overlay or black overlay based on if we are in dark mode
-        color = this.blendColors(color, [0, 0, 0], 30);
-      }
-      return this.blendWithWhiteOverlay(color, opacity);
+    let opacity = this.currentOpacity;
+    if (
+      (forToolbar && !this.#allowTransparencyOnSidebar) ||
+      (!forToolbar && !this.canBeTransparent)
+    ) {
+      color = this.blendColors(
+        color.c,
+        this.getToolbarModifiedBaseRaw().slice(0, 3),
+        this.canBeTransparent ? 90 : opacity * 100
+      );
+      opacity = 1; // Toolbar colors should always be fully opaque
+    } else {
+      color = color.c;
     }
-
-    luminance([r, g, b]) {
-      // These magic numbers are extracted from the wikipedia article on relative luminance
-      // https://en.wikipedia.org/wiki/Relative_luminance
-      var a = [r, g, b].map((v) => {
-        v /= 255;
-        return v <= 0.03928 ? v / 12.92 : Math.pow((v + 0.055) / 1.055, 2.4);
-      });
-      return a[0] * 0.2126 + a[1] * 0.7152 + a[2] * 0.0722;
+    if (this.isLegacyVersion && this.isDarkMode) {
+      // In legacy version, we blend with white overlay or black overlay based on if we are in dark mode
+      color = this.blendColors(color, [0, 0, 0], 30);
     }
+    return this.blendWithWhiteOverlay(color, opacity);
+  }
 
-    contrastRatio(rgb1, rgb2) {
-      const lum1 = this.luminance(rgb1);
-      const lum2 = this.luminance(rgb2);
-      const brightest = Math.max(lum1, lum2);
-      const darkest = Math.min(lum1, lum2);
-      return (brightest + 0.05) / (darkest + 0.05);
-    }
+  luminance([r, g, b]) {
+    // These magic numbers are extracted from the wikipedia article on relative luminance
+    // https://en.wikipedia.org/wiki/Relative_luminance
+    var a = [r, g, b].map((v) => {
+      v /= 255;
+      return v <= 0.03928 ? v / 12.92 : Math.pow((v + 0.055) / 1.055, 2.4);
+    });
+    return a[0] * 0.2126 + a[1] * 0.7152 + a[2] * 0.0722;
+  }
 
-    blendColors(rgb1, rgb2, percentage) {
-      const p = percentage / 100;
-      return [
-        Math.round(rgb1[0] * p + rgb2[0] * (1 - p)),
-        Math.round(rgb1[1] * p + rgb2[1] * (1 - p)),
-        Math.round(rgb1[2] * p + rgb2[2] * (1 - p)),
-      ];
-    }
+  contrastRatio(rgb1, rgb2) {
+    const lum1 = this.luminance(rgb1);
+    const lum2 = this.luminance(rgb2);
+    const brightest = Math.max(lum1, lum2);
+    const darkest = Math.min(lum1, lum2);
+    return (brightest + 0.05) / (darkest + 0.05);
+  }
 
-    getGradient(colors, forToolbar = false) {
-      const themedColors = this.themedColors(colors);
-      this.useAlgo = themedColors[0]?.algorithm ?? '';
-      this.#currentLightness = themedColors[0]?.lightness ?? 50;
+  blendColors(rgb1, rgb2, percentage) {
+    const p = percentage / 100;
+    return [
+      Math.round(rgb1[0] * p + rgb2[0] * (1 - p)),
+      Math.round(rgb1[1] * p + rgb2[1] * (1 - p)),
+      Math.round(rgb1[2] * p + rgb2[2] * (1 - p)),
+    ];
+  }
 
-      const rotation = -45; // TODO: Detect rotation based on the accent color
-      if (themedColors.length === 0) {
-        const getBrowserBg = () => {
-          if (this.canBeTransparent) {
-            return this.isDarkMode ? 'rgba(0, 0, 0, 0.4)' : 'transparent';
-          }
-          return this.isDarkMode ? '#131313' : '#e9e9e9';
-        };
-        return forToolbar ? this.getToolbarModifiedBase() : getBrowserBg();
-      } else if (themedColors.length === 1) {
-        return this.getSingleRGBColor(themedColors[0], forToolbar);
-      } else {
-        // If there are custom colors, we just return a linear gradient with all colors
-        if (themedColors.find((color) => color.isCustom)) {
-          // Just return a linear gradient with all colors
-          const gradientColors = themedColors.map((color) =>
-            this.getSingleRGBColor(color, forToolbar)
-          );
-          // Divide all colors evenly in the gradient
-          const colorStops = gradientColors
-            .map((color, index) => {
-              const position = (index / (gradientColors.length - 1)) * 100;
-              return `${color} ${position}%`;
-            })
-            .join(', ');
-          return `linear-gradient(${rotation}deg, ${colorStops})`;
+  getGradient(colors, forToolbar = false) {
+    const themedColors = this.themedColors(colors);
+    this.useAlgo = themedColors[0]?.algorithm ?? '';
+    this.#currentLightness = themedColors[0]?.lightness ?? 50;
+
+    const rotation = -45; // TODO: Detect rotation based on the accent color
+    if (themedColors.length === 0) {
+      const getBrowserBg = () => {
+        if (this.canBeTransparent) {
+          return this.isDarkMode ? 'rgba(0, 0, 0, 0.4)' : 'transparent';
         }
-        if (themedColors.length === 2) {
-          if (!forToolbar) {
-            return [
-              `linear-gradient(${rotation}deg, ${this.getSingleRGBColor(themedColors[1], forToolbar)} 0%, transparent 100%)`,
-              `linear-gradient(${rotation + 180}deg, ${this.getSingleRGBColor(themedColors[0], forToolbar)} 0%, transparent 80%)`,
-            ]
-              .reverse()
-              .join(', ');
-          }
-          return `linear-gradient(${rotation}deg, ${this.getSingleRGBColor(themedColors[1], forToolbar)} 0%, ${this.getSingleRGBColor(themedColors[0], forToolbar)} 100%)`;
-        } else if (themedColors.length === 3) {
-          let color1 = this.getSingleRGBColor(themedColors[2], forToolbar);
-          let color2 = this.getSingleRGBColor(themedColors[0], forToolbar);
-          let color3 = this.getSingleRGBColor(themedColors[1], forToolbar);
+        return this.isDarkMode ? '#131313' : '#e9e9e9';
+      };
+      return forToolbar ? this.getToolbarModifiedBase() : getBrowserBg();
+    } else if (themedColors.length === 1) {
+      return this.getSingleRGBColor(themedColors[0], forToolbar);
+    } else {
+      // If there are custom colors, we just return a linear gradient with all colors
+      if (themedColors.find((color) => color.isCustom)) {
+        // Just return a linear gradient with all colors
+        const gradientColors = themedColors.map((color) =>
+          this.getSingleRGBColor(color, forToolbar)
+        );
+        // Divide all colors evenly in the gradient
+        const colorStops = gradientColors
+          .map((color, index) => {
+            const position = (index / (gradientColors.length - 1)) * 100;
+            return `${color} ${position}%`;
+          })
+          .join(', ');
+        return `linear-gradient(${rotation}deg, ${colorStops})`;
+      }
+      if (themedColors.length === 2) {
+        if (!forToolbar) {
           return [
-            `linear-gradient(to top, ${color1} -50%, transparent 125%)`,
-            `radial-gradient(circle at 0% 0%, ${color2} 10%, transparent 80%)`,
-            `radial-gradient(circle at 100% -100%, ${color3} -100%, transparent 400%)`,
-          ].join(', ');
+            `linear-gradient(${rotation}deg, ${this.getSingleRGBColor(themedColors[1], forToolbar)} 0%, transparent 100%)`,
+            `linear-gradient(${rotation + 180}deg, ${this.getSingleRGBColor(themedColors[0], forToolbar)} 0%, transparent 80%)`,
+          ]
+            .reverse()
+            .join(', ');
         }
+        return `linear-gradient(${rotation}deg, ${this.getSingleRGBColor(themedColors[1], forToolbar)} 0%, ${this.getSingleRGBColor(themedColors[0], forToolbar)} 100%)`;
+      } else if (themedColors.length === 3) {
+        let color1 = this.getSingleRGBColor(themedColors[2], forToolbar);
+        let color2 = this.getSingleRGBColor(themedColors[0], forToolbar);
+        let color3 = this.getSingleRGBColor(themedColors[1], forToolbar);
+        return [
+          `linear-gradient(to top, ${color1} -50%, transparent 125%)`,
+          `radial-gradient(circle at 0% 0%, ${color2} 10%, transparent 80%)`,
+          `radial-gradient(circle at 100% -100%, ${color3} -100%, transparent 400%)`,
+        ].join(', ');
       }
     }
+  }
 
-    shouldBeDarkMode(accentColor) {
-      if (Services.prefs.getBoolPref('zen.theme.use-system-colors')) {
-        return this.isDarkMode;
-      }
-
-      if (!this.canBeTransparent) {
-        const toolbarBg = this.getToolbarModifiedBaseRaw();
-        accentColor = this.blendColors(
-          toolbarBg.slice(0, 3),
-          accentColor,
-          (1 - this.currentOpacity) * 100
-        );
-      }
-
-      const bg = accentColor;
-
-      // Get text colors (with alpha)
-      let darkText = this.getToolbarColor(true); // e.g. [r, g, b, a]
-      let lightText = this.getToolbarColor(false); // e.g. [r, g, b, a]
-
-      if (this.canBeTransparent) {
-        lightText[3] -= parseFloat(this.darkModeBias); // Reduce alpha for light text
-      }
-
-      // Composite text color over background
-      darkText = this.blendColors(bg, darkText.slice(0, 3), (1 - darkText[3]) * 100);
-      lightText = this.blendColors(bg, lightText.slice(0, 3), (1 - lightText[3]) * 100);
-
-      const darkContrast = this.contrastRatio(bg, darkText);
-      const lightContrast = this.contrastRatio(bg, lightText);
-
-      return darkContrast > lightContrast;
+  shouldBeDarkMode(accentColor) {
+    if (Services.prefs.getBoolPref('zen.theme.use-system-colors')) {
+      return this.isDarkMode;
     }
 
-    static getTheme(colors = [], opacity = 0.5, texture = 0) {
-      return {
-        type: 'gradient',
-        gradientColors: colors ? colors.filter((color) => color) : [], // remove undefined
-        opacity,
-        texture,
-      };
-    }
-
-    updateNoise(texture) {
-      document.documentElement.style.setProperty('--zen-grainy-background-opacity', texture);
-      document.documentElement.setAttribute(
-        'zen-show-grainy-background',
-        texture > 0 ? 'true' : 'false'
+    if (!this.canBeTransparent) {
+      const toolbarBg = this.getToolbarModifiedBaseRaw();
+      accentColor = this.blendColors(
+        toolbarBg.slice(0, 3),
+        accentColor,
+        (1 - this.currentOpacity) * 100
       );
     }
 
-    hexToRgb(hex) {
-      if (hex.startsWith('#')) {
-        hex = hex.substring(1);
+    const bg = accentColor;
+
+    // Get text colors (with alpha)
+    let darkText = this.getToolbarColor(true); // e.g. [r, g, b, a]
+    let lightText = this.getToolbarColor(false); // e.g. [r, g, b, a]
+
+    if (this.canBeTransparent) {
+      lightText[3] -= parseFloat(this.darkModeBias); // Reduce alpha for light text
+    }
+
+    // Composite text color over background
+    darkText = this.blendColors(bg, darkText.slice(0, 3), (1 - darkText[3]) * 100);
+    lightText = this.blendColors(bg, lightText.slice(0, 3), (1 - lightText[3]) * 100);
+
+    const darkContrast = this.contrastRatio(bg, darkText);
+    const lightContrast = this.contrastRatio(bg, lightText);
+
+    return darkContrast > lightContrast;
+  }
+
+  static getTheme(colors = [], opacity = 0.5, texture = 0) {
+    return {
+      type: 'gradient',
+      gradientColors: colors ? colors.filter((color) => color) : [], // remove undefined
+      opacity,
+      texture,
+    };
+  }
+
+  updateNoise(texture) {
+    document.documentElement.style.setProperty('--zen-grainy-background-opacity', texture);
+    document.documentElement.setAttribute(
+      'zen-show-grainy-background',
+      texture > 0 ? 'true' : 'false'
+    );
+  }
+
+  hexToRgb(hex) {
+    if (hex.startsWith('#')) {
+      hex = hex.substring(1);
+    }
+    if (hex.length === 3) {
+      hex = hex
+        .split('')
+        .map((char) => char + char)
+        .join('');
+    }
+    return [
+      parseInt(hex.substring(0, 2), 16),
+      parseInt(hex.substring(2, 4), 16),
+      parseInt(hex.substring(4, 6), 16),
+    ];
+  }
+
+  /**
+   * Get the primary color from a list of colors.
+   * @returns {string} The primary color in hex format.
+   */
+  getAccentColorForUI(accentColor) {
+    return `rgb(${accentColor[0]}, ${accentColor[1]}, ${accentColor[2]})`;
+  }
+
+  getMostDominantColor(allColors) {
+    const color = this.getPrimaryColor(allColors);
+    if (typeof color === 'string') {
+      // We found a custom color, we should rather return the native accent color
+      return this.getNativeAccentColor();
+    }
+    return color;
+  }
+
+  getToolbarColor(isDarkMode = false) {
+    return isDarkMode ? [255, 255, 255, 0.8] : [0, 0, 0, 0.8]; // Default toolbar
+  }
+
+  async onWorkspaceChange(workspace, skipUpdate = false, theme = null) {
+    const uuid = workspace.uuid;
+    // Use theme from workspace object or passed theme
+    let workspaceTheme = theme || workspace.theme;
+
+    await this.foreachWindowAsActive(async (browser) => {
+      if (!browser.gZenThemePicker?.promiseInitialized) {
+        return;
       }
-      if (hex.length === 3) {
-        hex = hex
-          .split('')
-          .map((char) => char + char)
-          .join('');
+
+      if (browser.closing || (await browser.gZenThemePicker?.promiseInitialized)) {
+        return;
       }
-      return [
-        parseInt(hex.substring(0, 2), 16),
-        parseInt(hex.substring(2, 4), 16),
-        parseInt(hex.substring(4, 6), 16),
-      ];
-    }
 
-    /**
-     * Get the primary color from a list of colors.
-     * @returns {string} The primary color in hex format.
-     */
-    getAccentColorForUI(accentColor) {
-      return `rgb(${accentColor[0]}, ${accentColor[1]}, ${accentColor[2]})`;
-    }
-
-    getMostDominantColor(allColors) {
-      const color = this.getPrimaryColor(allColors);
-      if (typeof color === 'string') {
-        // We found a custom color, we should rather return the native accent color
-        return this.getNativeAccentColor();
+      if (theme === null) {
+        browser.gZenThemePicker.invalidateGradientCache();
       }
-      return color;
-    }
 
-    getToolbarColor(isDarkMode = false) {
-      return isDarkMode ? [255, 255, 255, 0.8] : [0, 0, 0, 0.8]; // Default toolbar
-    }
-
-    async onWorkspaceChange(workspace, skipUpdate = false, theme = null) {
-      const uuid = workspace.uuid;
-      // Use theme from workspace object or passed theme
-      let workspaceTheme = theme || workspace.theme;
-
-      await this.foreachWindowAsActive(async (browser) => {
-        if (!browser.gZenThemePicker?.promiseInitialized) {
-          return;
-        }
-
-        if (browser.closing || (await browser.gZenThemePicker?.promiseInitialized)) {
-          return;
-        }
-
-        if (theme === null) {
-          browser.gZenThemePicker.invalidateGradientCache();
-        }
-
-        // Do not rebuild if the workspace is not the same as the current one
-        const windowWorkspace = await browser.gZenWorkspaces.getActiveWorkspace();
-        if (windowWorkspace.uuid !== uuid) {
-          return;
-        }
-
-        // get the theme from the window
-        workspaceTheme = this.fixTheme(theme || windowWorkspace.theme);
-        const docElement = browser.document.documentElement;
-
-        if (!skipUpdate) {
-          for (const dot of browser.gZenThemePicker.panel.querySelectorAll(
-            '.zen-theme-picker-dot'
-          )) {
-            dot.remove();
-          }
-        }
-
-        if (theme) {
-          const workspaceElement = browser.gZenWorkspaces.workspaceElement(windowWorkspace.uuid);
-          if (workspaceElement) {
-            workspaceElement.clearThemeStyles();
-          }
-        }
-
-        if (!skipUpdate) {
-          docElement.style.setProperty(
-            '--zen-main-browser-background-old',
-            docElement.style.getPropertyValue('--zen-main-browser-background')
-          );
-          docElement.style.setProperty(
-            '--zen-main-browser-background-toolbar-old',
-            docElement.style.getPropertyValue('--zen-main-browser-background-toolbar')
-          );
-          docElement.style.setProperty(
-            '--zen-background-opacity',
-            browser.gZenThemePicker.previousBackgroundOpacity ?? 1
-          );
-          if (browser.gZenThemePicker.previousBackgroundResolve) {
-            browser.gZenThemePicker.previousBackgroundResolve();
-          }
-          delete browser.gZenThemePicker.previousBackgroundOpacity;
-        }
-
-        browser.gZenThemePicker.resetCustomColorList();
-
-        browser.gZenThemePicker.currentOpacity = workspaceTheme.opacity ?? 0.5;
-        browser.gZenThemePicker.currentTexture = workspaceTheme.texture ?? 0;
-
-        let dominantColor = this.getMostDominantColor(workspaceTheme.gradientColors);
-        const isDefaultTheme = !dominantColor;
-        if (isDefaultTheme) {
-          dominantColor = this.getNativeAccentColor();
-        }
-
-        const opacitySlider = browser.document.getElementById(
-          'PanelUI-zen-gradient-generator-opacity'
-        );
-
-        {
-          let opacity = browser.gZenThemePicker.currentOpacity;
-          const svg = browser.gZenThemePicker.sliderWavePath;
-          /* eslint-disable no-unused-vars */
-          const [_, secondStop, thirdStop] = document.querySelectorAll(
-            '#PanelUI-zen-gradient-generator-slider-wave-gradient stop'
-          );
-          // Opacity can only be between MIN_OPACITY to MAX_OPACITY. Make opacity relative to that range
-          if (opacity < MIN_OPACITY) {
-            opacity = 0;
-          } else if (opacity > MAX_OPACITY) {
-            opacity = 1;
-          } else {
-            opacity = (opacity - MIN_OPACITY) / (MAX_OPACITY - MIN_OPACITY);
-          }
-          if (isDefaultTheme) {
-            opacity = 1; // If it's the default theme, we want the wave to be
-          }
-          // Since it's sine waves, we can't just set the offset to the opacity, we need to calculate it
-          // The offset is the percentage of the wave that is visible, so we need to multiply
-          // the opacity by 100 to get the percentage.
-          // Set the offset of the stops
-          secondStop.setAttribute('offset', `${opacity * 100}%`);
-          thirdStop.setAttribute('offset', `${opacity * 100}%`);
-          const interpolatedPath = this.#interpolateWavePath(opacity);
-          svg.setAttribute('d', interpolatedPath);
-          opacitySlider.style.setProperty('--zen-thumb-height', `${40 + opacity * 15}px`);
-          opacitySlider.style.setProperty('--zen-thumb-width', `${10 + opacity * 15}px`);
-          svg.style.stroke =
-            interpolatedPath === this.#linePath
-              ? thirdStop.getAttribute('stop-color')
-              : 'url(#PanelUI-zen-gradient-generator-slider-wave-gradient)';
-        }
-
-        for (const button of browser.document.querySelectorAll(
-          '#PanelUI-zen-gradient-generator-color-actions button'
-        )) {
-          // disable if there are no buttons
-          button.disabled =
-            workspaceTheme.gradientColors.length === 0 ||
-            (button.id === 'PanelUI-zen-gradient-generator-color-add'
-              ? workspaceTheme.gradientColors.length >= nsZenThemePicker.MAX_DOTS
-              : false);
-        }
-        const clickToAdd = browser.document.getElementById(
-          'PanelUI-zen-gradient-generator-color-click-to-add'
-        );
-        if (workspaceTheme.gradientColors.length > 0) {
-          clickToAdd.setAttribute('hidden', 'true');
-        } else {
-          clickToAdd.removeAttribute('hidden');
-        }
-
-        opacitySlider.value = browser.gZenThemePicker.currentOpacity;
-        const textureSelectWrapper = browser.document.getElementById(
-          'PanelUI-zen-gradient-generator-texture-wrapper'
-        );
-        const textureWrapperWidth = textureSelectWrapper.getBoundingClientRect().width;
-        // Dont show when hidden
-        if (textureWrapperWidth) {
-          // rotate and trasnform relative to the wrapper width depending on the texture value
-          const textureValue = this.currentTexture;
-          const textureHandler = browser.gZenThemePicker._textureHandler;
-          const rotation = textureValue * 360 - 90;
-          textureHandler.style.transform = `rotate(${rotation + 90}deg)`;
-          // add top and left to center the texture handler in relation with textureWrapperWidth
-          // based on the rotation
-          const top = Math.sin((rotation * Math.PI) / 180) * (textureWrapperWidth / 2) - 6;
-          const left = Math.cos((rotation * Math.PI) / 180) * (textureWrapperWidth / 2) - 3;
-          textureHandler.style.top = `${textureWrapperWidth / 2 + top}px`;
-          textureHandler.style.left = `${textureWrapperWidth / 2 + left}px`;
-          // Highlight the 16 buttons based on the texture value
-          const buttons = browser.document.querySelectorAll('.zen-theme-picker-texture-dot');
-          let i = 4;
-          for (const button of buttons) {
-            button.classList.toggle('active', i / 16 <= textureValue);
-            i++;
-            // We start at point 4 because that's the first point that is not in the middle of the texture
-            if (i === 16) {
-              i = 0;
-            }
-          }
-        }
-
-        const gradient = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors);
-        const gradientToolbar = browser.gZenThemePicker.getGradient(
-          workspaceTheme.gradientColors,
-          true
-        );
-        browser.gZenThemePicker.updateNoise(workspaceTheme.texture);
-
-        browser.gZenThemePicker.customColorList.innerHTML = '';
-        for (const dot of workspaceTheme.gradientColors) {
-          if (dot.isCustom) {
-            browser.gZenThemePicker.addColorToCustomList(dot.c);
-          }
-        }
-
-        docElement.style.setProperty('--zen-main-browser-background-toolbar', gradientToolbar);
-        docElement.style.setProperty('--zen-main-browser-background', gradient);
-        const isDarkModeWindow = browser.gZenThemePicker.isDarkMode;
-        if (isDefaultTheme) {
-          docElement.setAttribute('zen-default-theme', 'true');
-        } else {
-          docElement.removeAttribute('zen-default-theme');
-        }
-        if (dominantColor) {
-          const primaryColor = this.getAccentColorForUI(dominantColor);
-          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.
-          browser.gZenThemePicker.isLegacyVersion =
-            Services.prefs.getIntPref('zen.theme.gradient-legacy-version', 1) === 0;
-
-          let isDarkMode = isDarkModeWindow;
-          if (!isDefaultTheme && !this.isLegacyVersion) {
-            // Check for the primary color
-            isDarkMode = browser.gZenThemePicker.shouldBeDarkMode(dominantColor);
-            docElement.setAttribute('zen-should-be-dark-mode', isDarkMode);
-            browser.gZenThemePicker.panel.removeAttribute('invalidate-controls');
-          } else {
-            docElement.removeAttribute('zen-should-be-dark-mode');
-            if (!this.isLegacyVersion) {
-              browser.gZenThemePicker.panel.setAttribute('invalidate-controls', 'true');
-            }
-          }
-          // Set `--toolbox-textcolor` to have a contrast with the primary color
-          const textColor = this.getToolbarColor(isDarkMode);
-          docElement.style.setProperty(
-            '--toolbox-textcolor',
-            `rgba(${textColor[0]}, ${textColor[1]}, ${textColor[2]}, ${textColor[3]})`
-          );
-        }
-
-        if (!skipUpdate) {
-          browser.gZenThemePicker.dots = [];
-          browser.gZenThemePicker.recalculateDots(workspaceTheme.gradientColors);
-        }
-      });
-    }
-
-    fixTheme(theme) {
-      // add a primary color if there isn't one
-      if (
-        !theme.gradientColors.find((color) => color.isPrimary) &&
-        theme.gradientColors.length > 0
-      ) {
-        theme.gradientColors[0].isPrimary = true;
+      // Do not rebuild if the workspace is not the same as the current one
+      const windowWorkspace = await browser.gZenWorkspaces.getActiveWorkspace();
+      if (windowWorkspace.uuid !== uuid) {
+        return;
       }
-      return theme;
-    }
 
-    getNativeAccentColor() {
-      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);
-        // 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);
-      }
-      if (this.isDarkMode) {
-        // If the theme is dark, we want to use a lighter color
-        return this.blendColors(rgb, [0, 0, 0], 40);
-      }
-      return rgb;
-    }
+      // get the theme from the window
+      workspaceTheme = this.fixTheme(theme || windowWorkspace.theme);
+      const docElement = browser.document.documentElement;
 
-    resetCustomColorList() {
-      this.customColorList.innerHTML = '';
-    }
-
-    removeCustomColor(event) {
-      const target = event.target.closest('.zen-theme-picker-custom-list-item');
-      const color = target.getAttribute('data-color');
-      const dots = this.panel.querySelectorAll('.zen-theme-picker-dot');
-      for (const dot of dots) {
-        if (dot.style.getPropertyValue('--zen-theme-picker-dot-color') === color) {
+      if (!skipUpdate) {
+        for (const dot of browser.gZenThemePicker.panel.querySelectorAll('.zen-theme-picker-dot')) {
           dot.remove();
-          break;
         }
       }
-      target.remove();
-      this.updateCurrentWorkspace();
-    }
 
-    getPrimaryColor(colors) {
-      const primaryColor = colors.find((color) => color.isPrimary);
-      if (primaryColor) {
-        return primaryColor.c;
-      }
-      if (colors.length === 0) {
-        return undefined;
-      }
-      // Get the middle color
-      return colors[Math.floor(colors.length / 2)].c;
-    }
-
-    recalculateDots(colors) {
-      for (const color of colors) {
-        this.createDot(color, true);
-      }
-    }
-
-    async updateCurrentWorkspace(skipSave = true) {
-      this.updated = skipSave;
-      const dots = this.panel.querySelectorAll('.zen-theme-picker-dot');
-      const colors = Array.from(dots)
-        .sort((a, b) => a.getAttribute('data-index') - b.getAttribute('data-index'))
-        .map((dot) => {
-          const color = dot.style.getPropertyValue('--zen-theme-picker-dot-color');
-          const isPrimary = dot.classList.contains('primary');
-
-          if (color === 'undefined') {
-            return;
-          }
-          const isCustom = dot.classList.contains('custom');
-          const algorithm = this.useAlgo;
-          const position =
-            dot.getAttribute('data-position') && JSON.parse(dot.getAttribute('data-position'));
-          const type = dot.getAttribute('data-type');
-          return {
-            c: isCustom ? color : color.match(/\d+/g).map(Number),
-            isCustom,
-            algorithm,
-            isPrimary,
-            lightness: this.#currentLightness,
-            position,
-            type,
-          };
-        });
-      const gradient = nsZenThemePicker.getTheme(colors, this.currentOpacity, this.currentTexture);
-      let currentWorkspace = await gZenWorkspaces.getActiveWorkspace();
-
-      if (!skipSave) {
-        await ZenWorkspacesStorage.saveWorkspaceTheme(currentWorkspace.uuid, gradient);
-        await gZenWorkspaces._propagateWorkspaceData();
-        gZenUIManager.showToast('zen-panel-ui-gradient-generator-saved-message');
-        currentWorkspace = await gZenWorkspaces.getActiveWorkspace();
-      }
-
-      await this.onWorkspaceChange(currentWorkspace, skipSave, skipSave ? gradient : null);
-    }
-
-    async handlePanelClose() {
-      if (this.updated) {
-        await this.updateCurrentWorkspace(false);
-      }
-      this.uninitThemePicker();
-    }
-
-    handlePanelOpen() {
-      this.initThemePicker();
-      setTimeout(() => {
-        this.updateCurrentWorkspace();
-      }, 200);
-    }
-
-    #interpolateWavePath(progress) {
-      const linePath = this.#linePath;
-      const sinePath = this.#sinePath;
-      const referenceY = 27.3;
-      if (this.#sinePoints.length === 0) {
-        return progress < 0.5 ? linePath : sinePath;
-      }
-      if (progress <= 0.001) return linePath;
-      if (progress >= 0.999) return sinePath;
-      const t = progress;
-      let newPathData = '';
-      this.#sinePoints.forEach((p) => {
-        switch (p.type) {
-          case 'M': {
-            const interpolatedY = referenceY + (p.y - referenceY) * t;
-            newPathData += `M ${p.x} ${interpolatedY} `;
-            break;
-          }
-          case 'C': {
-            const y1 = referenceY + (p.y1 - referenceY) * t;
-            const y2 = referenceY + (p.y2 - referenceY) * t;
-            const y = referenceY + (p.y - referenceY) * t;
-            newPathData += `C ${p.x1} ${y1} ${p.x2} ${y2} ${p.x} ${y} `;
-            break;
-          }
-          case 'L':
-            newPathData += `L ${p.x} ${p.y} `;
-            break;
+      if (theme) {
+        const workspaceElement = browser.gZenWorkspaces.workspaceElement(windowWorkspace.uuid);
+        if (workspaceElement) {
+          workspaceElement.clearThemeStyles();
         }
-      });
-      return newPathData.trim();
-    }
-
-    invalidateGradientCache() {
-      this.#gradientsCache = {};
-      window.dispatchEvent(new Event('ZenGradientCacheChanged'));
-    }
-
-    getGradientForWorkspace(workspace) {
-      const uuid = workspace.uuid;
-      if (this.#gradientsCache[uuid]) {
-        return this.#gradientsCache[uuid];
       }
-      const previousOpacity = this.currentOpacity;
-      const previousLightness = this.#currentLightness;
-      const theme = workspace.theme;
-      this.currentOpacity = theme.opacity ?? 0.5;
-      this.#currentLightness = theme.lightness ?? 50;
-      const gradient = this.getGradient(theme.gradientColors);
-      const toolbarGradient = this.getGradient(theme.gradientColors, true);
-      let dominantColor = this.getMostDominantColor(theme.gradientColors);
+
+      if (!skipUpdate) {
+        docElement.style.setProperty(
+          '--zen-main-browser-background-old',
+          docElement.style.getPropertyValue('--zen-main-browser-background')
+        );
+        docElement.style.setProperty(
+          '--zen-main-browser-background-toolbar-old',
+          docElement.style.getPropertyValue('--zen-main-browser-background-toolbar')
+        );
+        docElement.style.setProperty(
+          '--zen-background-opacity',
+          browser.gZenThemePicker.previousBackgroundOpacity ?? 1
+        );
+        if (browser.gZenThemePicker.previousBackgroundResolve) {
+          browser.gZenThemePicker.previousBackgroundResolve();
+        }
+        delete browser.gZenThemePicker.previousBackgroundOpacity;
+      }
+
+      browser.gZenThemePicker.resetCustomColorList();
+
+      browser.gZenThemePicker.currentOpacity = workspaceTheme.opacity ?? 0.5;
+      browser.gZenThemePicker.currentTexture = workspaceTheme.texture ?? 0;
+
+      let dominantColor = this.getMostDominantColor(workspaceTheme.gradientColors);
       const isDefaultTheme = !dominantColor;
       if (isDefaultTheme) {
         dominantColor = this.getNativeAccentColor();
       }
-      let isDarkMode = this.isDarkMode;
-      let isExplicitMode = false;
-      if (!isDefaultTheme && !this.isLegacyVersion) {
-        // Check for the primary color
-        isDarkMode = this.shouldBeDarkMode(dominantColor);
-        isExplicitMode = true;
+
+      const opacitySlider = browser.document.getElementById(
+        'PanelUI-zen-gradient-generator-opacity'
+      );
+
+      {
+        let opacity = browser.gZenThemePicker.currentOpacity;
+        const svg = browser.gZenThemePicker.sliderWavePath;
+        /* eslint-disable no-unused-vars */
+        const [_, secondStop, thirdStop] = document.querySelectorAll(
+          '#PanelUI-zen-gradient-generator-slider-wave-gradient stop'
+        );
+        // Opacity can only be between MIN_OPACITY to MAX_OPACITY. Make opacity relative to that range
+        if (opacity < MIN_OPACITY) {
+          opacity = 0;
+        } else if (opacity > MAX_OPACITY) {
+          opacity = 1;
+        } else {
+          opacity = (opacity - MIN_OPACITY) / (MAX_OPACITY - MIN_OPACITY);
+        }
+        if (isDefaultTheme) {
+          opacity = 1; // If it's the default theme, we want the wave to be
+        }
+        // Since it's sine waves, we can't just set the offset to the opacity, we need to calculate it
+        // The offset is the percentage of the wave that is visible, so we need to multiply
+        // the opacity by 100 to get the percentage.
+        // Set the offset of the stops
+        secondStop.setAttribute('offset', `${opacity * 100}%`);
+        thirdStop.setAttribute('offset', `${opacity * 100}%`);
+        const interpolatedPath = this.#interpolateWavePath(opacity);
+        svg.setAttribute('d', interpolatedPath);
+        opacitySlider.style.setProperty('--zen-thumb-height', `${40 + opacity * 15}px`);
+        opacitySlider.style.setProperty('--zen-thumb-width', `${10 + opacity * 15}px`);
+        svg.style.stroke =
+          interpolatedPath === this.#linePath
+            ? thirdStop.getAttribute('stop-color')
+            : 'url(#PanelUI-zen-gradient-generator-slider-wave-gradient)';
       }
-      this.#gradientsCache[uuid] = {
-        gradient,
-        toolbarGradient,
-        grain: theme.texture ?? 0,
-        isDarkMode,
-        isExplicitMode,
-        toolbarColor: this.getToolbarColor(isDarkMode),
-        primaryColor: this.getAccentColorForUI(dominantColor),
-      };
-      this.currentOpacity = previousOpacity;
-      this.#currentLightness = previousLightness;
-      return this.#gradientsCache[uuid];
+
+      for (const button of browser.document.querySelectorAll(
+        '#PanelUI-zen-gradient-generator-color-actions button'
+      )) {
+        // disable if there are no buttons
+        button.disabled =
+          workspaceTheme.gradientColors.length === 0 ||
+          (button.id === 'PanelUI-zen-gradient-generator-color-add'
+            ? workspaceTheme.gradientColors.length >= nsZenThemePicker.MAX_DOTS
+            : false);
+      }
+      const clickToAdd = browser.document.getElementById(
+        'PanelUI-zen-gradient-generator-color-click-to-add'
+      );
+      if (workspaceTheme.gradientColors.length > 0) {
+        clickToAdd.setAttribute('hidden', 'true');
+      } else {
+        clickToAdd.removeAttribute('hidden');
+      }
+
+      opacitySlider.value = browser.gZenThemePicker.currentOpacity;
+      const textureSelectWrapper = browser.document.getElementById(
+        'PanelUI-zen-gradient-generator-texture-wrapper'
+      );
+      const textureWrapperWidth = textureSelectWrapper.getBoundingClientRect().width;
+      // Dont show when hidden
+      if (textureWrapperWidth) {
+        // rotate and trasnform relative to the wrapper width depending on the texture value
+        const textureValue = this.currentTexture;
+        const textureHandler = browser.gZenThemePicker._textureHandler;
+        const rotation = textureValue * 360 - 90;
+        textureHandler.style.transform = `rotate(${rotation + 90}deg)`;
+        // add top and left to center the texture handler in relation with textureWrapperWidth
+        // based on the rotation
+        const top = Math.sin((rotation * Math.PI) / 180) * (textureWrapperWidth / 2) - 6;
+        const left = Math.cos((rotation * Math.PI) / 180) * (textureWrapperWidth / 2) - 3;
+        textureHandler.style.top = `${textureWrapperWidth / 2 + top}px`;
+        textureHandler.style.left = `${textureWrapperWidth / 2 + left}px`;
+        // Highlight the 16 buttons based on the texture value
+        const buttons = browser.document.querySelectorAll('.zen-theme-picker-texture-dot');
+        let i = 4;
+        for (const button of buttons) {
+          button.classList.toggle('active', i / 16 <= textureValue);
+          i++;
+          // We start at point 4 because that's the first point that is not in the middle of the texture
+          if (i === 16) {
+            i = 0;
+          }
+        }
+      }
+
+      const gradient = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors);
+      const gradientToolbar = browser.gZenThemePicker.getGradient(
+        workspaceTheme.gradientColors,
+        true
+      );
+      browser.gZenThemePicker.updateNoise(workspaceTheme.texture);
+
+      browser.gZenThemePicker.customColorList.innerHTML = '';
+      for (const dot of workspaceTheme.gradientColors) {
+        if (dot.isCustom) {
+          browser.gZenThemePicker.addColorToCustomList(dot.c);
+        }
+      }
+
+      docElement.style.setProperty('--zen-main-browser-background-toolbar', gradientToolbar);
+      docElement.style.setProperty('--zen-main-browser-background', gradient);
+      const isDarkModeWindow = browser.gZenThemePicker.isDarkMode;
+      if (isDefaultTheme) {
+        docElement.setAttribute('zen-default-theme', 'true');
+      } else {
+        docElement.removeAttribute('zen-default-theme');
+      }
+      if (dominantColor) {
+        const primaryColor = this.getAccentColorForUI(dominantColor);
+        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.
+        browser.gZenThemePicker.isLegacyVersion =
+          Services.prefs.getIntPref('zen.theme.gradient-legacy-version', 1) === 0;
+
+        let isDarkMode = isDarkModeWindow;
+        if (!isDefaultTheme && !this.isLegacyVersion) {
+          // Check for the primary color
+          isDarkMode = browser.gZenThemePicker.shouldBeDarkMode(dominantColor);
+          docElement.setAttribute('zen-should-be-dark-mode', isDarkMode);
+          browser.gZenThemePicker.panel.removeAttribute('invalidate-controls');
+        } else {
+          docElement.removeAttribute('zen-should-be-dark-mode');
+          if (!this.isLegacyVersion) {
+            browser.gZenThemePicker.panel.setAttribute('invalidate-controls', 'true');
+          }
+        }
+        // Set `--toolbox-textcolor` to have a contrast with the primary color
+        const textColor = this.getToolbarColor(isDarkMode);
+        docElement.style.setProperty(
+          '--toolbox-textcolor',
+          `rgba(${textColor[0]}, ${textColor[1]}, ${textColor[2]}, ${textColor[3]})`
+        );
+      }
+
+      if (!skipUpdate) {
+        browser.gZenThemePicker.dots = [];
+        browser.gZenThemePicker.recalculateDots(workspaceTheme.gradientColors);
+      }
+    });
+  }
+
+  fixTheme(theme) {
+    // add a primary color if there isn't one
+    if (!theme.gradientColors.find((color) => color.isPrimary) && theme.gradientColors.length > 0) {
+      theme.gradientColors[0].isPrimary = true;
+    }
+    return theme;
+  }
+
+  getNativeAccentColor() {
+    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);
+      // 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);
+    }
+    if (this.isDarkMode) {
+      // If the theme is dark, we want to use a lighter color
+      return this.blendColors(rgb, [0, 0, 0], 40);
+    }
+    return rgb;
+  }
+
+  resetCustomColorList() {
+    this.customColorList.innerHTML = '';
+  }
+
+  removeCustomColor(event) {
+    const target = event.target.closest('.zen-theme-picker-custom-list-item');
+    const color = target.getAttribute('data-color');
+    const dots = this.panel.querySelectorAll('.zen-theme-picker-dot');
+    for (const dot of dots) {
+      if (dot.style.getPropertyValue('--zen-theme-picker-dot-color') === color) {
+        dot.remove();
+        break;
+      }
+    }
+    target.remove();
+    this.updateCurrentWorkspace();
+  }
+
+  getPrimaryColor(colors) {
+    const primaryColor = colors.find((color) => color.isPrimary);
+    if (primaryColor) {
+      return primaryColor.c;
+    }
+    if (colors.length === 0) {
+      return undefined;
+    }
+    // Get the middle color
+    return colors[Math.floor(colors.length / 2)].c;
+  }
+
+  recalculateDots(colors) {
+    for (const color of colors) {
+      this.createDot(color, true);
     }
   }
 
-  window.nsZenThemePicker = nsZenThemePicker;
+  async updateCurrentWorkspace(skipSave = true) {
+    this.updated = skipSave;
+    const dots = this.panel.querySelectorAll('.zen-theme-picker-dot');
+    const colors = Array.from(dots)
+      .sort((a, b) => a.getAttribute('data-index') - b.getAttribute('data-index'))
+      .map((dot) => {
+        const color = dot.style.getPropertyValue('--zen-theme-picker-dot-color');
+        const isPrimary = dot.classList.contains('primary');
+
+        if (color === 'undefined') {
+          return;
+        }
+        const isCustom = dot.classList.contains('custom');
+        const algorithm = this.useAlgo;
+        const position =
+          dot.getAttribute('data-position') && JSON.parse(dot.getAttribute('data-position'));
+        const type = dot.getAttribute('data-type');
+        return {
+          c: isCustom ? color : color.match(/\d+/g).map(Number),
+          isCustom,
+          algorithm,
+          isPrimary,
+          lightness: this.#currentLightness,
+          position,
+          type,
+        };
+      });
+    const gradient = nsZenThemePicker.getTheme(colors, this.currentOpacity, this.currentTexture);
+    let currentWorkspace = await gZenWorkspaces.getActiveWorkspace();
+
+    if (!skipSave) {
+      await ZenWorkspacesStorage.saveWorkspaceTheme(currentWorkspace.uuid, gradient);
+      await gZenWorkspaces._propagateWorkspaceData();
+      gZenUIManager.showToast('zen-panel-ui-gradient-generator-saved-message');
+      currentWorkspace = await gZenWorkspaces.getActiveWorkspace();
+    }
+
+    await this.onWorkspaceChange(currentWorkspace, skipSave, skipSave ? gradient : null);
+  }
+
+  async handlePanelClose() {
+    if (this.updated) {
+      await this.updateCurrentWorkspace(false);
+    }
+    this.uninitThemePicker();
+  }
+
+  handlePanelOpen() {
+    this.initThemePicker();
+    setTimeout(() => {
+      this.updateCurrentWorkspace();
+    }, 200);
+  }
+
+  #interpolateWavePath(progress) {
+    const linePath = this.#linePath;
+    const sinePath = this.#sinePath;
+    const referenceY = 27.3;
+    if (this.#sinePoints.length === 0) {
+      return progress < 0.5 ? linePath : sinePath;
+    }
+    if (progress <= 0.001) return linePath;
+    if (progress >= 0.999) return sinePath;
+    const t = progress;
+    let newPathData = '';
+    this.#sinePoints.forEach((p) => {
+      switch (p.type) {
+        case 'M': {
+          const interpolatedY = referenceY + (p.y - referenceY) * t;
+          newPathData += `M ${p.x} ${interpolatedY} `;
+          break;
+        }
+        case 'C': {
+          const y1 = referenceY + (p.y1 - referenceY) * t;
+          const y2 = referenceY + (p.y2 - referenceY) * t;
+          const y = referenceY + (p.y - referenceY) * t;
+          newPathData += `C ${p.x1} ${y1} ${p.x2} ${y2} ${p.x} ${y} `;
+          break;
+        }
+        case 'L':
+          newPathData += `L ${p.x} ${p.y} `;
+          break;
+      }
+    });
+    return newPathData.trim();
+  }
+
+  invalidateGradientCache() {
+    this.#gradientsCache = {};
+    window.dispatchEvent(new Event('ZenGradientCacheChanged'));
+  }
+
+  getGradientForWorkspace(workspace) {
+    const uuid = workspace.uuid;
+    if (this.#gradientsCache[uuid]) {
+      return this.#gradientsCache[uuid];
+    }
+    const previousOpacity = this.currentOpacity;
+    const previousLightness = this.#currentLightness;
+    const theme = workspace.theme;
+    this.currentOpacity = theme.opacity ?? 0.5;
+    this.#currentLightness = theme.lightness ?? 50;
+    const gradient = this.getGradient(theme.gradientColors);
+    const toolbarGradient = this.getGradient(theme.gradientColors, true);
+    let dominantColor = this.getMostDominantColor(theme.gradientColors);
+    const isDefaultTheme = !dominantColor;
+    if (isDefaultTheme) {
+      dominantColor = this.getNativeAccentColor();
+    }
+    let isDarkMode = this.isDarkMode;
+    let isExplicitMode = false;
+    if (!isDefaultTheme && !this.isLegacyVersion) {
+      // Check for the primary color
+      isDarkMode = this.shouldBeDarkMode(dominantColor);
+      isExplicitMode = true;
+    }
+    this.#gradientsCache[uuid] = {
+      gradient,
+      toolbarGradient,
+      grain: theme.texture ?? 0,
+      isDarkMode,
+      isExplicitMode,
+      toolbarColor: this.getToolbarColor(isDarkMode),
+      primaryColor: this.getAccentColorForUI(dominantColor),
+    };
+    this.currentOpacity = previousOpacity;
+    this.#currentLightness = previousLightness;
+    return this.#gradientsCache[uuid];
+  }
 }
diff --git a/src/zen/workspaces/ZenWorkspace.mjs b/src/zen/workspaces/ZenWorkspace.mjs
index aa92b13f7..ce6baa122 100644
--- a/src/zen/workspaces/ZenWorkspace.mjs
+++ b/src/zen/workspaces/ZenWorkspace.mjs
@@ -1,10 +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/.
-{
-  class nsZenWorkspace extends MozXULElement {
-    static get markup() {
-      return `
+
+class nsZenWorkspace extends MozXULElement {
+  static get markup() {
+    return `
         <vbox class="zen-workspace-tabs-section zen-current-workspace-indicator" flex="1" context="zenWorkspaceMoreActions">
           <hbox class="zen-current-workspace-indicator-icon" />
           <label class="zen-current-workspace-indicator-name" flex="1" />
@@ -35,230 +35,227 @@
         </arrowscrollbox>
         <vbox class="zen-workspace-empty-space" flex="1" />
       `;
+  }
+
+  static get inheritedAttributes() {
+    return {
+      '.zen-workspace-tabs-section': 'zen-workspace-id=id',
+    };
+  }
+
+  constructor() {
+    super();
+  }
+
+  connectedCallback() {
+    if (this.delayConnectedCallback() || this._hasConnected) {
+      // If we are not ready yet, or if we have already connected, we
+      // don't need to do anything.
+      return;
     }
 
-    static get inheritedAttributes() {
-      return {
-        '.zen-workspace-tabs-section': 'zen-workspace-id=id',
-      };
-    }
+    this._hasConnected = true;
+    this.appendChild(this.constructor.fragment);
 
-    constructor() {
-      super();
-    }
+    this.tabsContainer = this.querySelector('.zen-workspace-normal-tabs-section');
+    this.indicator = this.querySelector('.zen-current-workspace-indicator');
+    this.pinnedTabsContainer = this.querySelector('.zen-workspace-pinned-tabs-section');
+    this.initializeAttributeInheritance();
 
-    connectedCallback() {
-      if (this.delayConnectedCallback() || this._hasConnected) {
-        // If we are not ready yet, or if we have already connected, we
-        // don't need to do anything.
-        return;
-      }
+    this.scrollbox = this.querySelector('arrowscrollbox');
+    this.scrollbox.smoothScroll = Services.prefs.getBoolPref(
+      'zen.startup.smooth-scroll-in-tabs',
+      false
+    );
 
-      this._hasConnected = true;
-      this.appendChild(this.constructor.fragment);
+    this.scrollbox.addEventListener('wheel', this, true);
+    this.scrollbox.addEventListener('underflow', this);
+    this.scrollbox.addEventListener('overflow', this);
 
-      this.tabsContainer = this.querySelector('.zen-workspace-normal-tabs-section');
-      this.indicator = this.querySelector('.zen-current-workspace-indicator');
-      this.pinnedTabsContainer = this.querySelector('.zen-workspace-pinned-tabs-section');
-      this.initializeAttributeInheritance();
+    this.indicator.querySelector('.zen-current-workspace-indicator-name').onRenameFinished =
+      this.onIndicatorRenameFinished.bind(this);
 
-      this.scrollbox = this.querySelector('arrowscrollbox');
-      this.scrollbox.smoothScroll = Services.prefs.getBoolPref(
-        'zen.startup.smooth-scroll-in-tabs',
-        false
-      );
+    this.pinnedTabsContainer.scrollbox = this.scrollbox;
 
-      this.scrollbox.addEventListener('wheel', this, true);
-      this.scrollbox.addEventListener('underflow', this);
-      this.scrollbox.addEventListener('overflow', this);
+    this.indicator
+      .querySelector('.zen-workspaces-actions')
+      .addEventListener('click', this.onActionsCommand.bind(this));
 
-      this.indicator.querySelector('.zen-current-workspace-indicator-name').onRenameFinished =
-        this.onIndicatorRenameFinished.bind(this);
+    this.indicator
+      .querySelector('.zen-current-workspace-indicator-icon')
+      .addEventListener('dblclick', (event) => {
+        event.stopPropagation();
+        gZenWorkspaces.changeWorkspaceIcon();
+      });
 
-      this.pinnedTabsContainer.scrollbox = this.scrollbox;
-
-      this.indicator
-        .querySelector('.zen-workspaces-actions')
-        .addEventListener('click', this.onActionsCommand.bind(this));
-
-      this.indicator
-        .querySelector('.zen-current-workspace-indicator-icon')
-        .addEventListener('dblclick', (event) => {
-          event.stopPropagation();
-          gZenWorkspaces.changeWorkspaceIcon();
-        });
-
-      this.scrollbox._getScrollableElements = () => {
-        const children = [...this.pinnedTabsContainer.children, ...this.tabsContainer.children];
-        if (Services.prefs.getBoolPref('zen.view.show-newtab-button-top', false)) {
-          // Move the perifery to the first non-pinned tab
-          const periphery = this.tabsContainer.querySelector(
-            '#tabbrowser-arrowscrollbox-periphery'
+    this.scrollbox._getScrollableElements = () => {
+      const children = [...this.pinnedTabsContainer.children, ...this.tabsContainer.children];
+      if (Services.prefs.getBoolPref('zen.view.show-newtab-button-top', false)) {
+        // Move the perifery to the first non-pinned tab
+        const periphery = this.tabsContainer.querySelector('#tabbrowser-arrowscrollbox-periphery');
+        if (periphery) {
+          const firstNonPinnedTabIndex = children.findIndex(
+            (child) => gBrowser.isTab(child) && !child.pinned
           );
-          if (periphery) {
-            const firstNonPinnedTabIndex = children.findIndex(
-              (child) => gBrowser.isTab(child) && !child.pinned
-            );
-            if (firstNonPinnedTabIndex > -1) {
-              // Change to new location and remove from the old one on the list
-              const peripheryIndex = children.indexOf(periphery);
-              if (peripheryIndex > -1) {
-                children.splice(peripheryIndex, 1);
-              }
-              children.splice(firstNonPinnedTabIndex, 0, periphery);
+          if (firstNonPinnedTabIndex > -1) {
+            // Change to new location and remove from the old one on the list
+            const peripheryIndex = children.indexOf(periphery);
+            if (peripheryIndex > -1) {
+              children.splice(peripheryIndex, 1);
             }
+            children.splice(firstNonPinnedTabIndex, 0, periphery);
           }
         }
-        return Array.prototype.filter.call(
-          children,
-          this.scrollbox._canScrollToElement,
-          this.scrollbox
-        );
-      };
-
-      this.scrollbox._canScrollToElement = (element) => {
-        if (gBrowser.isTab(element)) {
-          return (
-            !element.hasAttribute('zen-essential') &&
-            !this.hasAttribute('positionpinnedtabs') &&
-            !element.hasAttribute('zen-empty-tab')
-          );
-        }
-        return true;
-      };
-
-      // Override for performance reasons. This is the size of a single element
-      // that can be scrolled when using mouse wheel scrolling. If we don't do
-      // this then arrowscrollbox computes this value by calling
-      // _getScrollableElements and dividing the box size by that number.
-      // However in the tabstrip case we already know the answer to this as,
-      // when we're overflowing, it is always the same as the tab min width or
-      // height. For tab group labels, the number won't exactly match, but
-      // that shouldn't be a problem in practice since the arrowscrollbox
-      // stops at element bounds when finishing scrolling.
-      try {
-        Object.defineProperty(this.scrollbox, 'lineScrollAmount', {
-          get: () => 36,
-        });
-      } catch (e) {
-        console.warn('Failed to set lineScrollAmount', e);
       }
-
-      // Add them manually since attribute inheritance doesn't work
-      // for multiple layers of shadow DOM.
-      this.tabsContainer.setAttribute('zen-workspace-id', this.id);
-      this.pinnedTabsContainer.setAttribute('zen-workspace-id', this.id);
-
-      this.#updateOverflow();
-
-      this.onGradientCacheChanged = this.#onGradientCacheChanged.bind(this);
-      window.addEventListener('ZenGradientCacheChanged', this.onGradientCacheChanged);
-
-      this.dispatchEvent(
-        new CustomEvent('ZenWorkspaceAttached', {
-          bubbles: true,
-          composed: true,
-          detail: { workspace: this },
-        })
+      return Array.prototype.filter.call(
+        children,
+        this.scrollbox._canScrollToElement,
+        this.scrollbox
       );
-    }
+    };
 
-    disconnectedCallback() {
-      window.removeEventListener('ZenGradientCacheChanged', this.onGradientCacheChanged);
-    }
-
-    get active() {
-      return this.hasAttribute('active');
-    }
-
-    set active(value) {
-      if (value) {
-        this.setAttribute('active', 'true');
-      } else {
-        this.removeAttribute('active');
-      }
-      this.#updateOverflow();
-    }
-
-    #updateOverflow() {
-      if (!this.scrollbox) return;
-      if (this.overflows) {
-        this.#dispatchEventFromScrollbox('overflow');
-      } else {
-        this.#dispatchEventFromScrollbox('underflow');
-      }
-    }
-
-    #dispatchEventFromScrollbox(type) {
-      this.scrollbox.dispatchEvent(new CustomEvent(type, {}));
-    }
-
-    get overflows() {
-      return this.scrollbox.overflowing;
-    }
-
-    handleEvent(event) {
-      if (this.active) {
-        gBrowser.tabContainer.handleEvent(event);
-      }
-    }
-
-    get workspaceUuid() {
-      return this.id;
-    }
-
-    async onIndicatorRenameFinished(newName) {
-      if (newName === '') {
-        return;
-      }
-      let workspaces = (await gZenWorkspaces._workspaces()).workspaces;
-      let workspaceData = workspaces.find((workspace) => workspace.uuid === this.workspaceUuid);
-      workspaceData.name = newName;
-      await gZenWorkspaces.saveWorkspace(workspaceData);
-      this.indicator.querySelector('.zen-current-workspace-indicator-name').textContent = newName;
-      gZenUIManager.showToast('zen-workspace-renamed-toast');
-    }
-
-    onActionsCommand(event) {
-      event.stopPropagation();
-      const popup = document.getElementById('zenWorkspaceMoreActions');
-      const target = event.target;
-      target.setAttribute('open', 'true');
-      this.indicator.setAttribute('open', 'true');
-      const handlePopupHidden = (event) => {
-        if (event.target !== popup) return;
-        target.removeAttribute('open');
-        this.indicator.removeAttribute('open');
-        popup.removeEventListener('popuphidden', handlePopupHidden);
-      };
-      popup.addEventListener('popuphidden', handlePopupHidden);
-      popup.openPopup(event.target, 'after_start');
-    }
-
-    get newTabButton() {
-      return this.querySelector('#tabs-newtab-button');
-    }
-
-    #onGradientCacheChanged() {
-      const { isDarkMode, isExplicitMode, toolbarColor, primaryColor } =
-        gZenThemePicker.getGradientForWorkspace(
-          gZenWorkspaces.getWorkspaceFromId(this.workspaceUuid)
+    this.scrollbox._canScrollToElement = (element) => {
+      if (gBrowser.isTab(element)) {
+        return (
+          !element.hasAttribute('zen-essential') &&
+          !this.hasAttribute('positionpinnedtabs') &&
+          !element.hasAttribute('zen-empty-tab')
         );
-      if (isExplicitMode) {
-        this.style.colorScheme = isDarkMode ? 'dark' : 'light';
-      } else {
-        this.style.colorScheme = '';
       }
-      this.style.setProperty('--toolbox-textcolor', `rgba(${toolbarColor.join(',')})`);
-      this.style.setProperty('--zen-primary-color', primaryColor);
+      return true;
+    };
+
+    // Override for performance reasons. This is the size of a single element
+    // that can be scrolled when using mouse wheel scrolling. If we don't do
+    // this then arrowscrollbox computes this value by calling
+    // _getScrollableElements and dividing the box size by that number.
+    // However in the tabstrip case we already know the answer to this as,
+    // when we're overflowing, it is always the same as the tab min width or
+    // height. For tab group labels, the number won't exactly match, but
+    // that shouldn't be a problem in practice since the arrowscrollbox
+    // stops at element bounds when finishing scrolling.
+    try {
+      Object.defineProperty(this.scrollbox, 'lineScrollAmount', {
+        get: () => 36,
+      });
+    } catch (e) {
+      console.warn('Failed to set lineScrollAmount', e);
     }
 
-    clearThemeStyles() {
-      this.style.colorScheme = '';
-      this.style.removeProperty('--toolbox-textcolor');
-      this.style.removeProperty('--zen-primary-color');
+    // Add them manually since attribute inheritance doesn't work
+    // for multiple layers of shadow DOM.
+    this.tabsContainer.setAttribute('zen-workspace-id', this.id);
+    this.pinnedTabsContainer.setAttribute('zen-workspace-id', this.id);
+
+    this.#updateOverflow();
+
+    this.onGradientCacheChanged = this.#onGradientCacheChanged.bind(this);
+    window.addEventListener('ZenGradientCacheChanged', this.onGradientCacheChanged);
+
+    this.dispatchEvent(
+      new CustomEvent('ZenWorkspaceAttached', {
+        bubbles: true,
+        composed: true,
+        detail: { workspace: this },
+      })
+    );
+  }
+
+  disconnectedCallback() {
+    window.removeEventListener('ZenGradientCacheChanged', this.onGradientCacheChanged);
+  }
+
+  get active() {
+    return this.hasAttribute('active');
+  }
+
+  set active(value) {
+    if (value) {
+      this.setAttribute('active', 'true');
+    } else {
+      this.removeAttribute('active');
+    }
+    this.#updateOverflow();
+  }
+
+  #updateOverflow() {
+    if (!this.scrollbox) return;
+    if (this.overflows) {
+      this.#dispatchEventFromScrollbox('overflow');
+    } else {
+      this.#dispatchEventFromScrollbox('underflow');
     }
   }
 
-  customElements.define('zen-workspace', nsZenWorkspace);
+  #dispatchEventFromScrollbox(type) {
+    this.scrollbox.dispatchEvent(new CustomEvent(type, {}));
+  }
+
+  get overflows() {
+    return this.scrollbox.overflowing;
+  }
+
+  handleEvent(event) {
+    if (this.active) {
+      gBrowser.tabContainer.handleEvent(event);
+    }
+  }
+
+  get workspaceUuid() {
+    return this.id;
+  }
+
+  async onIndicatorRenameFinished(newName) {
+    if (newName === '') {
+      return;
+    }
+    let workspaces = (await gZenWorkspaces._workspaces()).workspaces;
+    let workspaceData = workspaces.find((workspace) => workspace.uuid === this.workspaceUuid);
+    workspaceData.name = newName;
+    await gZenWorkspaces.saveWorkspace(workspaceData);
+    this.indicator.querySelector('.zen-current-workspace-indicator-name').textContent = newName;
+    gZenUIManager.showToast('zen-workspace-renamed-toast');
+  }
+
+  onActionsCommand(event) {
+    event.stopPropagation();
+    const popup = document.getElementById('zenWorkspaceMoreActions');
+    const target = event.target;
+    target.setAttribute('open', 'true');
+    this.indicator.setAttribute('open', 'true');
+    const handlePopupHidden = (event) => {
+      if (event.target !== popup) return;
+      target.removeAttribute('open');
+      this.indicator.removeAttribute('open');
+      popup.removeEventListener('popuphidden', handlePopupHidden);
+    };
+    popup.addEventListener('popuphidden', handlePopupHidden);
+    popup.openPopup(event.target, 'after_start');
+  }
+
+  get newTabButton() {
+    return this.querySelector('#tabs-newtab-button');
+  }
+
+  #onGradientCacheChanged() {
+    const { isDarkMode, isExplicitMode, toolbarColor, primaryColor } =
+      gZenThemePicker.getGradientForWorkspace(
+        gZenWorkspaces.getWorkspaceFromId(this.workspaceUuid)
+      );
+    if (isExplicitMode) {
+      this.style.colorScheme = isDarkMode ? 'dark' : 'light';
+    } else {
+      this.style.colorScheme = '';
+    }
+    this.style.setProperty('--toolbox-textcolor', `rgba(${toolbarColor.join(',')})`);
+    this.style.setProperty('--zen-primary-color', primaryColor);
+  }
+
+  clearThemeStyles() {
+    this.style.colorScheme = '';
+    this.style.removeProperty('--toolbox-textcolor');
+    this.style.removeProperty('--zen-primary-color');
+  }
 }
+
+customElements.define('zen-workspace', nsZenWorkspace);
diff --git a/src/zen/workspaces/ZenWorkspaceCreation.mjs b/src/zen/workspaces/ZenWorkspaceCreation.mjs
index b377ce249..cbaeed4c2 100644
--- a/src/zen/workspaces/ZenWorkspaceCreation.mjs
+++ b/src/zen/workspaces/ZenWorkspaceCreation.mjs
@@ -1,29 +1,29 @@
 // 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/.
-{
-  class nsZenWorkspaceCreation extends MozXULElement {
-    #wasInCollapsedMode = false;
 
-    promiseInitialized = new Promise((resolve) => {
-      this.resolveInitialized = resolve;
-    });
+class nsZenWorkspaceCreation extends MozXULElement {
+  #wasInCollapsedMode = false;
 
-    #hiddenElements = [];
+  promiseInitialized = new Promise((resolve) => {
+    this.resolveInitialized = resolve;
+  });
 
-    static get elementsToDisable() {
-      return [
-        'cmd_zenOpenWorkspacePanel',
-        'cmd_zenOpenWorkspaceCreation',
-        'cmd_zenOpenFolderCreation',
-        'cmd_zenToggleSidebar',
-        'cmd_newNavigatorTab',
-        'cmd_newNavigatorTabNoEvent',
-      ];
-    }
+  #hiddenElements = [];
 
-    static get markup() {
-      return `
+  static get elementsToDisable() {
+    return [
+      'cmd_zenOpenWorkspacePanel',
+      'cmd_zenOpenWorkspaceCreation',
+      'cmd_zenOpenFolderCreation',
+      'cmd_zenToggleSidebar',
+      'cmd_newNavigatorTab',
+      'cmd_newNavigatorTabNoEvent',
+    ];
+  }
+
+  static get markup() {
+    return `
         <vbox class="zen-workspace-creation" flex="1">
           <form>
             <vbox>
@@ -61,293 +61,292 @@
           </form>
         </vbox>
       `;
+  }
+
+  get workspaceId() {
+    return this.getAttribute('workspace-id');
+  }
+
+  get previousWorkspaceId() {
+    return this.getAttribute('previous-workspace-id');
+  }
+
+  get elementsToAnimate() {
+    return [
+      this.querySelector('.zen-workspace-creation-title'),
+      this.querySelector('.zen-workspace-creation-label').parentElement,
+      this.querySelector('.zen-workspace-creation-name-wrapper'),
+      this.querySelector('.zen-workspace-creation-profile-wrapper'),
+      this.querySelector('.zen-workspace-creation-edit-theme-button'),
+      this.createButton.parentNode,
+      this.cancelButton,
+    ];
+  }
+
+  connectedCallback() {
+    if (this.delayConnectedCallback()) {
+      // If we are not ready yet, or if we have already connected, we
+      // don't need to do anything.
+      return;
     }
 
-    get workspaceId() {
-      return this.getAttribute('workspace-id');
+    this.appendChild(this.constructor.fragment);
+    this.initializeAttributeInheritance();
+
+    this.inputName = this.querySelector('.zen-workspace-creation-name');
+    this.inputIcon = this.querySelector('.zen-workspace-creation-icon-label');
+    this.inputProfile = this.querySelector('.zen-workspace-creation-profile');
+    this.createButton = this.querySelector('.zen-workspace-creation-create-button');
+    this.cancelButton = this.querySelector('.zen-workspace-creation-cancel-button');
+
+    for (const element of this.elementsToAnimate) {
+      element.style.opacity = 0;
     }
 
-    get previousWorkspaceId() {
-      return this.getAttribute('previous-workspace-id');
-    }
+    this.#wasInCollapsedMode =
+      document.documentElement.getAttribute('zen-sidebar-expanded') !== 'true';
 
-    get elementsToAnimate() {
-      return [
-        this.querySelector('.zen-workspace-creation-title'),
-        this.querySelector('.zen-workspace-creation-label').parentElement,
-        this.querySelector('.zen-workspace-creation-name-wrapper'),
-        this.querySelector('.zen-workspace-creation-profile-wrapper'),
-        this.querySelector('.zen-workspace-creation-edit-theme-button'),
-        this.createButton.parentNode,
-        this.cancelButton,
-      ];
-    }
+    gNavToolbox.setAttribute('zen-sidebar-expanded', 'true');
+    document.documentElement.setAttribute('zen-sidebar-expanded', 'true');
 
-    connectedCallback() {
-      if (this.delayConnectedCallback()) {
-        // If we are not ready yet, or if we have already connected, we
-        // don't need to do anything.
-        return;
+    window.docShell.treeOwner
+      .QueryInterface(Ci.nsIInterfaceRequestor)
+      .getInterface(Ci.nsIAppWindow)
+      .rollupAllPopups();
+
+    this.handleZenWorkspacesChangeBind = this.handleZenWorkspacesChange.bind(this);
+
+    for (const element of this.parentElement.children) {
+      if (element !== this) {
+        element.hidden = true;
+        this.#hiddenElements.push(element);
       }
+    }
 
-      this.appendChild(this.constructor.fragment);
-      this.initializeAttributeInheritance();
-
-      this.inputName = this.querySelector('.zen-workspace-creation-name');
-      this.inputIcon = this.querySelector('.zen-workspace-creation-icon-label');
-      this.inputProfile = this.querySelector('.zen-workspace-creation-profile');
-      this.createButton = this.querySelector('.zen-workspace-creation-create-button');
-      this.cancelButton = this.querySelector('.zen-workspace-creation-cancel-button');
-
-      for (const element of this.elementsToAnimate) {
-        element.style.opacity = 0;
+    for (const element of nsZenWorkspaceCreation.elementsToDisable) {
+      const el = document.getElementById(element);
+      if (el) {
+        el.setAttribute('disabled', 'true');
       }
-
-      this.#wasInCollapsedMode =
-        document.documentElement.getAttribute('zen-sidebar-expanded') !== 'true';
-
-      gNavToolbox.setAttribute('zen-sidebar-expanded', 'true');
-      document.documentElement.setAttribute('zen-sidebar-expanded', 'true');
-
-      window.docShell.treeOwner
-        .QueryInterface(Ci.nsIInterfaceRequestor)
-        .getInterface(Ci.nsIAppWindow)
-        .rollupAllPopups();
-
-      this.handleZenWorkspacesChangeBind = this.handleZenWorkspacesChange.bind(this);
-
-      for (const element of this.parentElement.children) {
-        if (element !== this) {
-          element.hidden = true;
-          this.#hiddenElements.push(element);
-        }
-      }
-
-      for (const element of nsZenWorkspaceCreation.elementsToDisable) {
-        const el = document.getElementById(element);
-        if (el) {
-          el.setAttribute('disabled', 'true');
-        }
-      }
-
-      this.createButton.addEventListener('command', this.onCreateButtonCommand.bind(this));
-      this.cancelButton.addEventListener('command', this.onCancelButtonCommand.bind(this));
-
-      this.inputName.addEventListener('input', () => {
-        this.createButton.disabled = !this.inputName.value.trim();
-      });
-
-      this.inputIcon.addEventListener('command', this.onIconCommand.bind(this));
-
-      this.profilesPopup = this.querySelector('.zen-workspace-creation-profiles-popup');
-
-      if (gZenWorkspaces.shouldShowContainers) {
-        this.inputProfile.addEventListener('command', this.onProfileCommand.bind(this));
-        this.profilesPopup.addEventListener('popupshown', this.onProfilePopupShown.bind(this));
-        this.profilesPopup.addEventListener('command', this.onProfilePopupCommand.bind(this));
-
-        this.currentProfile = {
-          id: 0,
-          name: 'Default',
-        };
-      } else {
-        this.inputProfile.parentNode.hidden = true;
-      }
-
-      document.getElementById('zen-sidebar-splitter').style.pointerEvents = 'none';
-
-      gZenUIManager.motion
-        .animate(
-          [gBrowser.tabContainer, gURLBar.textbox],
-          {
-            opacity: [1, 0],
-          },
-          {
-            duration: 0.3,
-            type: 'spring',
-            bounce: 0,
-          }
-        )
-        .then(() => {
-          gBrowser.tabContainer.style.visibility = 'collapse';
-          if (gZenVerticalTabsManager._hasSetSingleToolbar) {
-            document.getElementById('nav-bar').style.visibility = 'collapse';
-          }
-          this.style.visibility = 'visible';
-          gZenCompactModeManager.getAndApplySidebarWidth();
-          this.resolveInitialized();
-          gZenUIManager.motion
-            .animate(
-              this.elementsToAnimate,
-              {
-                y: [20, 0],
-                opacity: [0, 1],
-                filter: ['blur(2px)', 'blur(0)'],
-              },
-              {
-                duration: 0.6,
-                type: 'spring',
-                bounce: 0,
-                delay: gZenUIManager.motion.stagger(0.05, { startDelay: 0.2 }),
-              }
-            )
-            .then(() => {
-              this.inputName.focus();
-              gZenWorkspaces.workspaceElement(this.workspaceId).hidden = false;
-            });
-        });
     }
 
-    async onCreateButtonCommand() {
-      const workspace = await gZenWorkspaces.getActiveWorkspace();
-      workspace.name = this.inputName.value.trim();
-      workspace.icon = this.inputIcon.image || this.inputIcon.label || undefined;
-      workspace.containerTabId = this.currentProfile;
-      await gZenWorkspaces.saveWorkspace(workspace);
+    this.createButton.addEventListener('command', this.onCreateButtonCommand.bind(this));
+    this.cancelButton.addEventListener('command', this.onCancelButtonCommand.bind(this));
 
-      await this.#cleanup();
+    this.inputName.addEventListener('input', () => {
+      this.createButton.disabled = !this.inputName.value.trim();
+    });
 
-      await gZenWorkspaces._organizeWorkspaceStripLocations(workspace, true);
-      await gZenWorkspaces.updateTabsContainers();
+    this.inputIcon.addEventListener('command', this.onIconCommand.bind(this));
 
-      gBrowser.tabContainer._invalidateCachedTabs();
-    }
+    this.profilesPopup = this.querySelector('.zen-workspace-creation-profiles-popup');
 
-    async onCancelButtonCommand() {
-      await gZenWorkspaces.changeWorkspaceWithID(this.previousWorkspaceId);
-    }
+    if (gZenWorkspaces.shouldShowContainers) {
+      this.inputProfile.addEventListener('command', this.onProfileCommand.bind(this));
+      this.profilesPopup.addEventListener('popupshown', this.onProfilePopupShown.bind(this));
+      this.profilesPopup.addEventListener('command', this.onProfilePopupCommand.bind(this));
 
-    onIconCommand(event) {
-      gZenEmojiPicker
-        .open(event.target)
-        .then(async (emoji) => {
-          const isSvg = emoji && emoji.endsWith('.svg');
-          if (isSvg) {
-            this.inputIcon.label = '';
-            this.inputIcon.image = emoji;
-            this.inputIcon.setAttribute('has-svg-icon', 'true');
-          } else {
-            this.inputIcon.image = '';
-            this.inputIcon.label = emoji || '';
-            this.inputIcon.removeAttribute('has-svg-icon');
-          }
-        })
-        .catch((error) => {
-          console.warn('Error changing workspace icon:', error);
-        });
-    }
-
-    set currentProfile(profile) {
-      this.inputProfile.label = profile.name;
-      this._profileId = profile.id;
-    }
-
-    get currentProfile() {
-      return this._profileId;
-    }
-
-    onProfileCommand(event) {
-      this.profilesPopup.openPopup(event.target, 'after_start');
-    }
-
-    onProfilePopupShown(event) {
-      return window.createUserContextMenu(event, {
-        isContextMenu: true,
-        showDefaultTab: true,
-      });
-    }
-
-    onProfilePopupCommand(event) {
-      let userContextId = parseInt(event.target.getAttribute('data-usercontextid'));
-      if (isNaN(userContextId)) {
-        return;
-      }
       this.currentProfile = {
-        id: userContextId,
-        name: event.target.label,
+        id: 0,
+        name: 'Default',
       };
+    } else {
+      this.inputProfile.parentNode.hidden = true;
     }
 
-    finishSetup() {
-      gZenWorkspaces.addChangeListeners(this.handleZenWorkspacesChangeBind, { once: true });
-    }
+    document.getElementById('zen-sidebar-splitter').style.pointerEvents = 'none';
 
-    async handleZenWorkspacesChange() {
-      await gZenWorkspaces.removeWorkspace(this.workspaceId);
-      await this.#cleanup();
-    }
-
-    async #cleanup() {
-      await gZenUIManager.motion.animate(
-        this.elementsToAnimate.reverse(),
-        {
-          y: [0, 20],
-          opacity: [1, 0],
-          filter: ['blur(0)', 'blur(2px)'],
-        },
-        {
-          duration: 0.4,
-          type: 'spring',
-          bounce: 0,
-          delay: gZenUIManager.motion.stagger(0.05),
-        }
-      );
-
-      document.getElementById('zen-sidebar-splitter').style.pointerEvents = '';
-
-      gZenWorkspaces.removeChangeListeners(this.handleZenWorkspacesChangeBind);
-      for (const element of this.constructor.elementsToDisable) {
-        const el = document.getElementById(element);
-        if (el) {
-          el.removeAttribute('disabled');
-        }
-      }
-
-      if (this.#wasInCollapsedMode) {
-        gNavToolbox.removeAttribute('zen-sidebar-expanded');
-        document.documentElement.removeAttribute('zen-sidebar-expanded');
-      }
-
-      document.documentElement.removeAttribute('zen-creating-workspace');
-
-      gBrowser.tabContainer.style.visibility = '';
-      gBrowser.tabContainer.style.opacity = 0;
-      if (gZenVerticalTabsManager._hasSetSingleToolbar) {
-        document.getElementById('nav-bar').style.visibility = '';
-        gURLBar.textbox.style.opacity = 0;
-      }
-
-      this.remove();
-      gZenUIManager.updateTabsToolbar();
-
-      const workspace = await gZenWorkspaces.getActiveWorkspace();
-      await gZenWorkspaces._organizeWorkspaceStripLocations(workspace, true);
-      await gZenWorkspaces.updateTabsContainers();
-
-      await gZenUIManager.motion.animate(
+    gZenUIManager.motion
+      .animate(
         [gBrowser.tabContainer, gURLBar.textbox],
         {
-          opacity: [0, 1],
+          opacity: [1, 0],
         },
         {
           duration: 0.3,
           type: 'spring',
           bounce: 0,
         }
-      );
-
-      gBrowser.tabContainer.style.opacity = '';
-      if (gZenVerticalTabsManager._hasSetSingleToolbar) {
-        gURLBar.textbox.style.opacity = '';
-      }
-
-      for (const element of this.#hiddenElements) {
-        element.hidden = false;
-      }
-
-      this.#hiddenElements = [];
-    }
+      )
+      .then(() => {
+        gBrowser.tabContainer.style.visibility = 'collapse';
+        if (gZenVerticalTabsManager._hasSetSingleToolbar) {
+          document.getElementById('nav-bar').style.visibility = 'collapse';
+        }
+        this.style.visibility = 'visible';
+        gZenCompactModeManager.getAndApplySidebarWidth();
+        this.resolveInitialized();
+        gZenUIManager.motion
+          .animate(
+            this.elementsToAnimate,
+            {
+              y: [20, 0],
+              opacity: [0, 1],
+              filter: ['blur(2px)', 'blur(0)'],
+            },
+            {
+              duration: 0.6,
+              type: 'spring',
+              bounce: 0,
+              delay: gZenUIManager.motion.stagger(0.05, { startDelay: 0.2 }),
+            }
+          )
+          .then(() => {
+            this.inputName.focus();
+            gZenWorkspaces.workspaceElement(this.workspaceId).hidden = false;
+          });
+      });
   }
 
-  customElements.define('zen-workspace-creation', nsZenWorkspaceCreation);
+  async onCreateButtonCommand() {
+    const workspace = await gZenWorkspaces.getActiveWorkspace();
+    workspace.name = this.inputName.value.trim();
+    workspace.icon = this.inputIcon.image || this.inputIcon.label || undefined;
+    workspace.containerTabId = this.currentProfile;
+    await gZenWorkspaces.saveWorkspace(workspace);
+
+    await this.#cleanup();
+
+    await gZenWorkspaces._organizeWorkspaceStripLocations(workspace, true);
+    await gZenWorkspaces.updateTabsContainers();
+
+    gBrowser.tabContainer._invalidateCachedTabs();
+  }
+
+  async onCancelButtonCommand() {
+    await gZenWorkspaces.changeWorkspaceWithID(this.previousWorkspaceId);
+  }
+
+  onIconCommand(event) {
+    gZenEmojiPicker
+      .open(event.target)
+      .then(async (emoji) => {
+        const isSvg = emoji && emoji.endsWith('.svg');
+        if (isSvg) {
+          this.inputIcon.label = '';
+          this.inputIcon.image = emoji;
+          this.inputIcon.setAttribute('has-svg-icon', 'true');
+        } else {
+          this.inputIcon.image = '';
+          this.inputIcon.label = emoji || '';
+          this.inputIcon.removeAttribute('has-svg-icon');
+        }
+      })
+      .catch((error) => {
+        console.warn('Error changing workspace icon:', error);
+      });
+  }
+
+  set currentProfile(profile) {
+    this.inputProfile.label = profile.name;
+    this._profileId = profile.id;
+  }
+
+  get currentProfile() {
+    return this._profileId;
+  }
+
+  onProfileCommand(event) {
+    this.profilesPopup.openPopup(event.target, 'after_start');
+  }
+
+  onProfilePopupShown(event) {
+    return window.createUserContextMenu(event, {
+      isContextMenu: true,
+      showDefaultTab: true,
+    });
+  }
+
+  onProfilePopupCommand(event) {
+    let userContextId = parseInt(event.target.getAttribute('data-usercontextid'));
+    if (isNaN(userContextId)) {
+      return;
+    }
+    this.currentProfile = {
+      id: userContextId,
+      name: event.target.label,
+    };
+  }
+
+  finishSetup() {
+    gZenWorkspaces.addChangeListeners(this.handleZenWorkspacesChangeBind, { once: true });
+  }
+
+  async handleZenWorkspacesChange() {
+    await gZenWorkspaces.removeWorkspace(this.workspaceId);
+    await this.#cleanup();
+  }
+
+  async #cleanup() {
+    await gZenUIManager.motion.animate(
+      this.elementsToAnimate.reverse(),
+      {
+        y: [0, 20],
+        opacity: [1, 0],
+        filter: ['blur(0)', 'blur(2px)'],
+      },
+      {
+        duration: 0.4,
+        type: 'spring',
+        bounce: 0,
+        delay: gZenUIManager.motion.stagger(0.05),
+      }
+    );
+
+    document.getElementById('zen-sidebar-splitter').style.pointerEvents = '';
+
+    gZenWorkspaces.removeChangeListeners(this.handleZenWorkspacesChangeBind);
+    for (const element of this.constructor.elementsToDisable) {
+      const el = document.getElementById(element);
+      if (el) {
+        el.removeAttribute('disabled');
+      }
+    }
+
+    if (this.#wasInCollapsedMode) {
+      gNavToolbox.removeAttribute('zen-sidebar-expanded');
+      document.documentElement.removeAttribute('zen-sidebar-expanded');
+    }
+
+    document.documentElement.removeAttribute('zen-creating-workspace');
+
+    gBrowser.tabContainer.style.visibility = '';
+    gBrowser.tabContainer.style.opacity = 0;
+    if (gZenVerticalTabsManager._hasSetSingleToolbar) {
+      document.getElementById('nav-bar').style.visibility = '';
+      gURLBar.textbox.style.opacity = 0;
+    }
+
+    this.remove();
+    gZenUIManager.updateTabsToolbar();
+
+    const workspace = await gZenWorkspaces.getActiveWorkspace();
+    await gZenWorkspaces._organizeWorkspaceStripLocations(workspace, true);
+    await gZenWorkspaces.updateTabsContainers();
+
+    await gZenUIManager.motion.animate(
+      [gBrowser.tabContainer, gURLBar.textbox],
+      {
+        opacity: [0, 1],
+      },
+      {
+        duration: 0.3,
+        type: 'spring',
+        bounce: 0,
+      }
+    );
+
+    gBrowser.tabContainer.style.opacity = '';
+    if (gZenVerticalTabsManager._hasSetSingleToolbar) {
+      gURLBar.textbox.style.opacity = '';
+    }
+
+    for (const element of this.#hiddenElements) {
+      element.hidden = false;
+    }
+
+    this.#hiddenElements = [];
+  }
 }
+
+customElements.define('zen-workspace-creation', nsZenWorkspaceCreation);
diff --git a/src/zen/workspaces/ZenWorkspaceIcons.mjs b/src/zen/workspaces/ZenWorkspaceIcons.mjs
index 1d48a5f10..f9186c43f 100644
--- a/src/zen/workspaces/ZenWorkspaceIcons.mjs
+++ b/src/zen/workspaces/ZenWorkspaceIcons.mjs
@@ -1,210 +1,209 @@
 // 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/.
-{
-  class nsZenWorkspaceIcons extends MozXULElement {
-    constructor() {
-      super();
+
+class nsZenWorkspaceIcons extends MozXULElement {
+  constructor() {
+    super();
+  }
+
+  connectedCallback() {
+    if (this.delayConnectedCallback() || this._hasConnected) {
+      return;
     }
 
-    connectedCallback() {
-      if (this.delayConnectedCallback() || this._hasConnected) {
+    this._hasConnected = true;
+    window.addEventListener('ZenWorkspacesUIUpdate', this, true);
+
+    this.initDragAndDrop();
+    this.addEventListener('mouseover', (e) => {
+      if (this.isReorderMode) {
+        return;
+      }
+      const target = e.target.closest('toolbarbutton[zen-workspace-id]');
+      if (target) {
+        this.scrollLeft = target.offsetLeft - 10;
+      }
+    });
+  }
+
+  initDragAndDrop() {
+    let dragStart = 0;
+    let draggedTab = null;
+
+    this.addEventListener('mousedown', (e) => {
+      const target = e.target.closest('toolbarbutton[zen-workspace-id]');
+      if (!target || e.button != 0 || e.ctrlKey || e.shiftKey || e.altKey) {
         return;
       }
 
-      this._hasConnected = true;
-      window.addEventListener('ZenWorkspacesUIUpdate', this, true);
+      const isVertical = document.documentElement.getAttribute('zen-sidebar-expanded') != 'true';
+      const clientPos = isVertical ? 'clientY' : 'clientX';
+
+      this.isReorderMode = false;
+      dragStart = e[clientPos];
+      draggedTab = target;
+      draggedTab.setAttribute('dragged', 'true');
+
+      e.stopPropagation();
+
+      const mouseMoveHandler = (moveEvent) => {
+        if (Math.abs(moveEvent[clientPos] - dragStart) > 5) {
+          this.isReorderMode = true;
+        }
 
-      this.initDragAndDrop();
-      this.addEventListener('mouseover', (e) => {
         if (this.isReorderMode) {
-          return;
-        }
-        const target = e.target.closest('toolbarbutton[zen-workspace-id]');
-        if (target) {
-          this.scrollLeft = target.offsetLeft - 10;
-        }
-      });
-    }
+          const tabs = [...this.children];
+          const mouse = moveEvent[clientPos];
 
-    initDragAndDrop() {
-      let dragStart = 0;
-      let draggedTab = null;
-
-      this.addEventListener('mousedown', (e) => {
-        const target = e.target.closest('toolbarbutton[zen-workspace-id]');
-        if (!target || e.button != 0 || e.ctrlKey || e.shiftKey || e.altKey) {
-          return;
-        }
-
-        const isVertical = document.documentElement.getAttribute('zen-sidebar-expanded') != 'true';
-        const clientPos = isVertical ? 'clientY' : 'clientX';
-
-        this.isReorderMode = false;
-        dragStart = e[clientPos];
-        draggedTab = target;
-        draggedTab.setAttribute('dragged', 'true');
-
-        e.stopPropagation();
-
-        const mouseMoveHandler = (moveEvent) => {
-          if (Math.abs(moveEvent[clientPos] - dragStart) > 5) {
-            this.isReorderMode = true;
-          }
-
-          if (this.isReorderMode) {
-            const tabs = [...this.children];
-            const mouse = moveEvent[clientPos];
-
-            for (const tab of tabs) {
-              if (tab === draggedTab) continue;
-              const rect = tab.getBoundingClientRect();
+          for (const tab of tabs) {
+            if (tab === draggedTab) continue;
+            const rect = tab.getBoundingClientRect();
+            if (
+              mouse > rect[isVertical ? 'top' : 'left'] &&
+              mouse < rect[isVertical ? 'bottom' : 'right']
+            ) {
+              const nextSibling = draggedTab.nextSibling;
               if (
-                mouse > rect[isVertical ? 'top' : 'left'] &&
-                mouse < rect[isVertical ? 'bottom' : 'right']
+                mouse <
+                rect[isVertical ? 'top' : 'left'] + rect[isVertical ? 'height' : 'width'] / 2
               ) {
-                const nextSibling = draggedTab.nextSibling;
-                if (
-                  mouse <
-                  rect[isVertical ? 'top' : 'left'] + rect[isVertical ? 'height' : 'width'] / 2
-                ) {
-                  this.insertBefore(draggedTab, tab);
-                } else {
-                  this.insertBefore(draggedTab, tab.nextSibling);
-                }
-                if (nextSibling !== draggedTab.nextSibling) {
-                  Services.zen.playHapticFeedback();
-                }
+                this.insertBefore(draggedTab, tab);
+              } else {
+                this.insertBefore(draggedTab, tab.nextSibling);
+              }
+              if (nextSibling !== draggedTab.nextSibling) {
+                Services.zen.playHapticFeedback();
               }
             }
           }
-        };
-
-        const mouseUpHandler = () => {
-          document.removeEventListener('mousemove', mouseMoveHandler);
-          document.removeEventListener('mouseup', mouseUpHandler);
-
-          draggedTab.removeAttribute('dragged');
-
-          this.reorderWorkspaceToIndex(draggedTab, Array.from(this.children).indexOf(draggedTab));
-
-          draggedTab = null;
-          this.isReorderMode = false;
-        };
-
-        document.addEventListener('mousemove', mouseMoveHandler);
-        document.addEventListener('mouseup', mouseUpHandler);
-      });
-    }
-
-    #createWorkspaceIcon(workspace) {
-      const button = document.createXULElement('toolbarbutton');
-      button.setAttribute('class', 'subviewbutton toolbarbutton-1');
-      button.setAttribute('tooltiptext', workspace.name);
-      button.setAttribute('zen-workspace-id', workspace.uuid);
-      button.setAttribute('context', 'zenWorkspaceMoreActions');
-      const icon = document.createXULElement('label');
-      icon.setAttribute('class', 'zen-workspace-icon');
-      const isSvgIcon = workspace.icon && workspace.icon.endsWith('.svg');
-      if (gZenWorkspaces.workspaceHasIcon(workspace)) {
-        if (isSvgIcon) {
-          const image = document.createElement('img');
-          image.src = workspace.icon;
-          image.classList.add('zen-workspace-icon');
-          button.appendChild(image);
-        } else {
-          icon.textContent = workspace.icon;
         }
+      };
+
+      const mouseUpHandler = () => {
+        document.removeEventListener('mousemove', mouseMoveHandler);
+        document.removeEventListener('mouseup', mouseUpHandler);
+
+        draggedTab.removeAttribute('dragged');
+
+        this.reorderWorkspaceToIndex(draggedTab, Array.from(this.children).indexOf(draggedTab));
+
+        draggedTab = null;
+        this.isReorderMode = false;
+      };
+
+      document.addEventListener('mousemove', mouseMoveHandler);
+      document.addEventListener('mouseup', mouseUpHandler);
+    });
+  }
+
+  #createWorkspaceIcon(workspace) {
+    const button = document.createXULElement('toolbarbutton');
+    button.setAttribute('class', 'subviewbutton toolbarbutton-1');
+    button.setAttribute('tooltiptext', workspace.name);
+    button.setAttribute('zen-workspace-id', workspace.uuid);
+    button.setAttribute('context', 'zenWorkspaceMoreActions');
+    const icon = document.createXULElement('label');
+    icon.setAttribute('class', 'zen-workspace-icon');
+    const isSvgIcon = workspace.icon && workspace.icon.endsWith('.svg');
+    if (gZenWorkspaces.workspaceHasIcon(workspace)) {
+      if (isSvgIcon) {
+        const image = document.createElement('img');
+        image.src = workspace.icon;
+        image.classList.add('zen-workspace-icon');
+        button.appendChild(image);
       } else {
-        icon.setAttribute('no-icon', true);
+        icon.textContent = workspace.icon;
       }
-      if (!isSvgIcon) {
-        button.appendChild(icon);
-      }
-      button.addEventListener('command', this);
-      return button;
+    } else {
+      icon.setAttribute('no-icon', true);
     }
-
-    async #updateIcons() {
-      const workspaces = await gZenWorkspaces._workspaces();
-      this.innerHTML = '';
-      for (const workspace of workspaces.workspaces) {
-        const button = this.#createWorkspaceIcon(workspace);
-        this.appendChild(button);
-      }
-      if (workspaces.workspaces.length <= 1) {
-        this.setAttribute('dont-show', 'true');
-      } else {
-        this.removeAttribute('dont-show');
-      }
-      gZenWorkspaces.onWindowResize();
+    if (!isSvgIcon) {
+      button.appendChild(icon);
     }
+    button.addEventListener('command', this);
+    return button;
+  }
 
-    on_command(event) {
-      const button = event.target;
-      const uuid = button.getAttribute('zen-workspace-id');
-      if (uuid) {
-        gZenWorkspaces.changeWorkspaceWithID(uuid);
-      }
+  async #updateIcons() {
+    const workspaces = await gZenWorkspaces._workspaces();
+    this.innerHTML = '';
+    for (const workspace of workspaces.workspaces) {
+      const button = this.#createWorkspaceIcon(workspace);
+      this.appendChild(button);
     }
-
-    async on_ZenWorkspacesUIUpdate(event) {
-      await this.#updateIcons();
-      this.activeIndex = event.detail.activeIndex;
+    if (workspaces.workspaces.length <= 1) {
+      this.setAttribute('dont-show', 'true');
+    } else {
+      this.removeAttribute('dont-show');
     }
+    gZenWorkspaces.onWindowResize();
+  }
 
-    set activeIndex(uuid) {
-      const buttons = this.querySelectorAll('toolbarbutton');
-      if (!buttons.length) {
-        return;
-      }
-      let i = 0;
-      let selected = -1;
-      for (const button of buttons) {
-        if (button.getAttribute('zen-workspace-id') == uuid) {
-          selected = i;
-        } else {
-          button.removeAttribute('active');
-        }
-        i++;
-      }
-      buttons[selected].setAttribute('active', true);
-      this.scrollLeft = buttons[selected].offsetLeft - 10;
-      this.setAttribute('selected', selected);
-    }
-
-    get activeIndex() {
-      const selected = this.getAttribute('selected');
-      const buttons = this.querySelectorAll('toolbarbutton');
-      let i = 0;
-      for (const button of buttons) {
-        if (i == selected) {
-          return button.getAttribute('zen-workspace-id');
-        }
-        i++;
-      }
-      return null;
-    }
-
-    get isReorderMode() {
-      return this.hasAttribute('reorder-mode');
-    }
-
-    set isReorderMode(value) {
-      if (value) {
-        this.setAttribute('reorder-mode', 'true');
-      } else {
-        this.removeAttribute('reorder-mode');
-        this.style.removeProperty('--zen-workspace-icon-width');
-        this.style.removeProperty('--zen-workspace-icon-height');
-      }
-    }
-
-    reorderWorkspaceToIndex(draggedTab, index) {
-      const workspaceId = draggedTab.getAttribute('zen-workspace-id');
-      gZenWorkspaces.reorderWorkspace(workspaceId, index);
+  on_command(event) {
+    const button = event.target;
+    const uuid = button.getAttribute('zen-workspace-id');
+    if (uuid) {
+      gZenWorkspaces.changeWorkspaceWithID(uuid);
     }
   }
 
-  customElements.define('zen-workspace-icons', nsZenWorkspaceIcons);
+  async on_ZenWorkspacesUIUpdate(event) {
+    await this.#updateIcons();
+    this.activeIndex = event.detail.activeIndex;
+  }
+
+  set activeIndex(uuid) {
+    const buttons = this.querySelectorAll('toolbarbutton');
+    if (!buttons.length) {
+      return;
+    }
+    let i = 0;
+    let selected = -1;
+    for (const button of buttons) {
+      if (button.getAttribute('zen-workspace-id') == uuid) {
+        selected = i;
+      } else {
+        button.removeAttribute('active');
+      }
+      i++;
+    }
+    buttons[selected].setAttribute('active', true);
+    this.scrollLeft = buttons[selected].offsetLeft - 10;
+    this.setAttribute('selected', selected);
+  }
+
+  get activeIndex() {
+    const selected = this.getAttribute('selected');
+    const buttons = this.querySelectorAll('toolbarbutton');
+    let i = 0;
+    for (const button of buttons) {
+      if (i == selected) {
+        return button.getAttribute('zen-workspace-id');
+      }
+      i++;
+    }
+    return null;
+  }
+
+  get isReorderMode() {
+    return this.hasAttribute('reorder-mode');
+  }
+
+  set isReorderMode(value) {
+    if (value) {
+      this.setAttribute('reorder-mode', 'true');
+    } else {
+      this.removeAttribute('reorder-mode');
+      this.style.removeProperty('--zen-workspace-icon-width');
+      this.style.removeProperty('--zen-workspace-icon-height');
+    }
+  }
+
+  reorderWorkspaceToIndex(draggedTab, index) {
+    const workspaceId = draggedTab.getAttribute('zen-workspace-id');
+    gZenWorkspaces.reorderWorkspace(workspaceId, index);
+  }
 }
+
+customElements.define('zen-workspace-icons', nsZenWorkspaceIcons);
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 9ca190752..cb08f58d0 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2,7 +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/.
 
-var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
+import { nsZenMultiWindowFeature } from 'chrome://browser/content/zen-components/ZenCommonUtils.mjs';
+import { nsZenThemePicker } from 'chrome://browser/content/zen-components/ZenGradientGenerator.mjs';
+
+class nsZenWorkspaces extends nsZenMultiWindowFeature {
   /**
    * Stores workspace IDs and their last selected tabs.
    */
@@ -3201,4 +3204,6 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
       document.getElementById('cmd_closeWindow').doCommand();
     }
   }
-})();
+}
+
+window.gZenWorkspaces = new nsZenWorkspaces();
diff --git a/src/zen/workspaces/ZenWorkspacesStorage.mjs b/src/zen/workspaces/ZenWorkspacesStorage.mjs
index abfe72dc1..43d183d39 100644
--- a/src/zen/workspaces/ZenWorkspacesStorage.mjs
+++ b/src/zen/workspaces/ZenWorkspacesStorage.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/.
 
-var ZenWorkspacesStorage = {
+window.ZenWorkspacesStorage = {
   lazy: {},
 
   async init() {
@@ -426,7 +426,7 @@ var ZenWorkspacesStorage = {
 };
 
 // Integration of workspace-specific bookmarks into Places
-var ZenWorkspaceBookmarksStorage = {
+window.ZenWorkspaceBookmarksStorage = {
   async init() {
     await this._ensureTable();
   },
diff --git a/src/zen/workspaces/jar.inc.mn b/src/zen/workspaces/jar.inc.mn
new file mode 100644
index 000000000..1e4fd273f
--- /dev/null
+++ b/src/zen/workspaces/jar.inc.mn
@@ -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/.
+
+        content/browser/zen-components/ZenWorkspaceIcons.mjs                    (../../zen/workspaces/ZenWorkspaceIcons.mjs)
+        content/browser/zen-components/ZenWorkspace.mjs                         (../../zen/workspaces/ZenWorkspace.mjs)
+        content/browser/zen-components/ZenWorkspaces.mjs                        (../../zen/workspaces/ZenWorkspaces.mjs)
+        content/browser/zen-components/ZenWorkspaceCreation.mjs                 (../../zen/workspaces/ZenWorkspaceCreation.mjs)
+        content/browser/zen-components/ZenWorkspacesStorage.mjs                 (../../zen/workspaces/ZenWorkspacesStorage.mjs)
+        content/browser/zen-components/ZenWorkspacesSync.mjs                    (../../zen/workspaces/ZenWorkspacesSync.mjs)
+        content/browser/zen-components/ZenGradientGenerator.mjs                 (../../zen/workspaces/ZenGradientGenerator.mjs)
+*       content/browser/zen-styles/zen-workspaces.css                           (../../zen/workspaces/zen-workspaces.css)
+        content/browser/zen-styles/zen-gradient-generator.css                   (../../zen/workspaces/zen-gradient-generator.css)
\ No newline at end of file
diff --git a/src/zen/zen.globals.js b/src/zen/zen.globals.js
index 93f2484d1..197089441 100644
--- a/src/zen/zen.globals.js
+++ b/src/zen/zen.globals.js
@@ -3,10 +3,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 export default [
-  'nsZenMultiWindowFeature',
-  'nsZenDOMOperatedFeature',
-  'nsZenPreloadedFeature',
-
   'nsZenSiteDataPanel',
 
   'ZenThemeModifier',
@@ -27,6 +23,8 @@ export default [
   'ZenWorkspacesStorage',
   'ZenWorkspaceBookmarksStorage',
 
+  'ZEN_KEYSET_ID',
+
   'gZenPinnedTabManager',
   'ZenPinnedTabsStorage',
 
@@ -36,7 +34,6 @@ export default [
   'gZenMediaController',
   'gZenGlanceManager',
 
-  'nsZenThemePicker',
   'gZenThemePicker',
 
   'gZenViewSplitter',

From 37611106046430a975d65f6ff6ca1002a8e6c870 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 23 Nov 2025 01:44:40 +0100
Subject: [PATCH 117/162] fix: Fixed pinned tabs not updating sometimes,
 b=no-bug, c=tabs

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

diff --git a/src/zen/tabs/ZenPinnedTabsStorage.mjs b/src/zen/tabs/ZenPinnedTabsStorage.mjs
index 4847687cf..a407dad35 100644
--- a/src/zen/tabs/ZenPinnedTabsStorage.mjs
+++ b/src/zen/tabs/ZenPinnedTabsStorage.mjs
@@ -79,6 +79,7 @@ window.ZenPinnedTabsStorage = {
   async savePin(pin, notifyObservers = true) {
     // If we find the exact same pin in the cache, skip saving
     const existingIndex = this._saveCache.findIndex((cachedPin) => cachedPin.uuid === pin.uuid);
+    const copy = { ...pin };
     if (existingIndex !== -1) {
       const existingPin = this._saveCache[existingIndex];
       const isSame = Object.keys(pin).every((key) => pin[key] === existingPin[key]);
@@ -86,11 +87,11 @@ window.ZenPinnedTabsStorage = {
         return; // No changes, skip saving
       } else {
         // Update the cached pin
-        this._saveCache[existingIndex] = pin;
+        this._saveCache[existingIndex] = { ...copy };
       }
     } else {
       // Add to cache
-      this._saveCache.push(pin);
+      this._saveCache.push(copy);
     }
 
     const changedUUIDs = new Set();

From 59641cb952b906128c8b5b0cb4aca377126732e3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 23 Nov 2025 02:03:03 +0100
Subject: [PATCH 118/162] fix: Fixed KBS settings page, b=no-bug, c=kbs

---
 src/browser/components/preferences/zen-settings.js            | 4 ++++
 .../components/preferences/zenKeyboardShortcuts.inc.xhtml     | 1 -
 src/zen/kbs/ZenKeyboardShortcuts.mjs                          | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 6bad8d201..5da77ca5f 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -8,6 +8,10 @@ const { nsZenMultiWindowFeature } = ChromeUtils.importESModule(
   { global: 'current' }
 );
 
+ChromeUtils.importESModule('chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs', {
+  global: 'current',
+});
+
 var gZenMarketplaceManager = {
   async init() {
     const checkForUpdates = document.getElementById('zenThemeMarketplaceCheckForUpdates');
diff --git a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
index efbb535e7..3a0a1f740 100644
--- a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
+++ b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
@@ -2,7 +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/.
 
-<script type="module" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"/>
 <html:template id="template-paneZenCKS">
 <hbox id="ZenCKSCategory"
       class="subcategory"
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index d2c6f3d78..c42f3f174 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -132,7 +132,7 @@ const ZEN_WORKSPACE_SHORTCUTS_GROUP = 'zen-workspace';
 const ZEN_OTHER_SHORTCUTS_GROUP = 'zen-other';
 const ZEN_SPLIT_VIEW_SHORTCUTS_GROUP = 'zen-split-view';
 const FIREFOX_SHORTCUTS_GROUP = 'zen-kbs-invalid';
-const VALID_SHORTCUT_GROUPS = [
+window.VALID_SHORTCUT_GROUPS = [
   ZEN_COMPACT_MODE_SHORTCUTS_GROUP,
   ZEN_WORKSPACE_SHORTCUTS_GROUP,
   ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
@@ -322,7 +322,7 @@ class KeyShortcut {
     this.#key = key?.toLowerCase();
     this.#keycode = keycode;
 
-    if (!VALID_SHORTCUT_GROUPS.includes(group)) {
+    if (!window.VALID_SHORTCUT_GROUPS.includes(group)) {
       throw new Error('Illegal group value: ' + group);
     }
 

From 7ab405a2c2430c448db595bb735feaa783320cde Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 23 Nov 2025 02:12:43 +0100
Subject: [PATCH 119/162] feat: Finish update sidebar notification, b=no-bug,
 c=common

---
 src/zen/common/modules/ZenStartup.mjs           | 3 ++-
 src/zen/common/modules/ZenUpdates.mjs           | 4 ++--
 src/zen/common/styles/zen-single-components.css | 5 +++++
 surfer.json                                     | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/zen/common/modules/ZenStartup.mjs b/src/zen/common/modules/ZenStartup.mjs
index c47c1e17d..942dd27ee 100644
--- a/src/zen/common/modules/ZenStartup.mjs
+++ b/src/zen/common/modules/ZenStartup.mjs
@@ -97,7 +97,6 @@ class ZenStartup {
       // Just in case we didn't get the right size.
       gZenUIManager.updateTabsToolbar();
       this.closeWatermark();
-      checkForZenUpdates();
       this.isReady = true;
     });
   }
@@ -163,6 +162,7 @@ class ZenStartup {
     if (!Services.prefs.getBoolPref('zen.welcome-screen.seen', false)) {
       Services.prefs.setBoolPref('zen.welcome-screen.seen', true);
       Services.prefs.setStringPref('zen.updates.last-build-id', Services.appinfo.appBuildID);
+      Services.prefs.setStringPref('zen.updates.last-version', Services.appinfo.version);
       Services.scriptloader.loadSubScript(
         'chrome://browser/content/zen-components/ZenWelcome.mjs',
         window
@@ -173,6 +173,7 @@ class ZenStartup {
   }
 
   async #createUpdateAnimation() {
+    checkForZenUpdates();
     return await createWindowUpdateAnimation();
   }
 }
diff --git a/src/zen/common/modules/ZenUpdates.mjs b/src/zen/common/modules/ZenUpdates.mjs
index 8501c684b..82fbb95ca 100644
--- a/src/zen/common/modules/ZenUpdates.mjs
+++ b/src/zen/common/modules/ZenUpdates.mjs
@@ -10,8 +10,8 @@ const ZEN_UPDATE_SHOW = 'zen.updates.show-update-notification';
 
 export default function checkForZenUpdates() {
   const version = Services.appinfo.version;
-  const lastVersion = Services.prefs.getStringPref(ZEN_UPDATE_PREF, version);
-
+  const lastVersion = Services.prefs.getStringPref(ZEN_UPDATE_PREF, '');
+  Services.prefs.setStringPref(ZEN_UPDATE_PREF, version);
   if (
     version !== lastVersion &&
     !gZenUIManager.testingEnabled &&
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 309c6a15f..c6bb366a0 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -622,3 +622,8 @@ body > #confetti {
     display: none;
   }
 }
+
+/* Sidebar notification */
+:root:not([zen-sidebar-expanded='true']) zen-sidebar-notification {
+  display: none;
+}
diff --git a/surfer.json b/surfer.json
index e8f0205d8..2837916e8 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.8b",
+        "displayVersion": "1.17.9b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 56e91af8ab28fdbb09edf19d35302e840d809dc3 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 23 Nov 2025 02:17:11 +0100
Subject: [PATCH 120/162] chore: New Crowdin updates, p=#11362

* New translations zen-general.ftl (Hungarian)

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

* New translations zen-preferences.ftl (Finnish)

* New translations zen-general.ftl (Finnish)

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

* New translations zen-welcome.ftl (Finnish)

* New translations zen-workspaces.ftl (Finnish)

* New translations zen-folders.ftl (Finnish)

* 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)

* New translations zen-general.ftl (Ukrainian)
---
 locales/ar/browser/browser/zen-general.ftl    |   9 ++
 locales/ca/browser/browser/zen-general.ftl    |   9 ++
 locales/cs/browser/browser/zen-general.ftl    |   9 ++
 locales/cy/browser/browser/zen-general.ftl    |   9 ++
 locales/da/browser/browser/zen-general.ftl    |   9 ++
 locales/de/browser/browser/zen-general.ftl    |   9 ++
 locales/el/browser/browser/zen-general.ftl    |   9 ++
 locales/en-GB/browser/browser/zen-general.ftl |   9 ++
 locales/es-ES/browser/browser/zen-general.ftl |   9 ++
 locales/et/browser/browser/zen-general.ftl    |   9 ++
 locales/fa/browser/browser/zen-general.ftl    |   9 ++
 .../browser/preferences/zen-preferences.ftl   | 114 +++++++++---------
 locales/fi/browser/browser/zen-folders.ftl    |  22 ++--
 locales/fi/browser/browser/zen-general.ftl    | 105 ++++++++--------
 .../fi/browser/browser/zen-vertical-tabs.ftl  |  18 +--
 locales/fi/browser/browser/zen-welcome.ftl    |  42 +++----
 locales/fi/browser/browser/zen-workspaces.ftl |  54 ++++-----
 locales/fr/browser/browser/zen-general.ftl    |   9 ++
 locales/ga-IE/browser/browser/zen-general.ftl |   9 ++
 locales/he/browser/browser/zen-general.ftl    |   9 ++
 locales/hu/browser/browser/zen-general.ftl    |   9 ++
 locales/hu/browser/browser/zen-split-view.ftl |   2 +-
 locales/id/browser/browser/zen-general.ftl    |   9 ++
 locales/is/browser/browser/zen-general.ftl    |   9 ++
 locales/it/browser/browser/zen-general.ftl    |   9 ++
 locales/ja/browser/browser/zen-general.ftl    |   9 ++
 locales/ko/browser/browser/zen-general.ftl    |   9 ++
 locales/lt/browser/browser/zen-general.ftl    |  13 +-
 locales/nl/browser/browser/zen-general.ftl    |   9 ++
 locales/nn-NO/browser/browser/zen-general.ftl |   9 ++
 locales/pl/browser/browser/zen-general.ftl    |   9 ++
 locales/pt-BR/browser/browser/zen-general.ftl |   9 ++
 locales/pt-PT/browser/browser/zen-general.ftl |   9 ++
 locales/ru/browser/browser/zen-general.ftl    |   9 ++
 locales/sv-SE/browser/browser/zen-general.ftl |   9 ++
 locales/th/browser/browser/zen-general.ftl    |   9 ++
 locales/tr/browser/browser/zen-general.ftl    |   9 ++
 locales/uk/browser/browser/zen-general.ftl    |   9 ++
 locales/vi/browser/browser/zen-general.ftl    |   9 ++
 locales/zh-CN/browser/browser/zen-general.ftl |   9 ++
 locales/zh-TW/browser/browser/zen-general.ftl |   9 ++
 41 files changed, 491 insertions(+), 176 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index eab8ae252..105dcc7a5 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index 030c4cc35..e729ab26a 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Feu clic a la icona per gestionar
 zen-open-link-in-glance = 
     .label = Obre l'enllaç en un cop d'ull
     .accesskey = G
+zen-sidebar-notification-updated-heading = Actualització completada!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = Novetats a { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = Mostra les notes de la versió
+zen-sidebar-notification-restart-safe-mode-label = Alguna cosa no funciona?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Reinici en mode segur
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 90ba335cc..155654d68 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Klikněte na ikonu pro správu na
 zen-open-link-in-glance = 
     .label = Otevřít odkaz v Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index f771903df..4f15648b8 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index 343c2072d..cb9a9ff05 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 09b6a5b15..b951ee02b 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Klicke auf das Symbol, um Website
 zen-open-link-in-glance = 
     .label = Link in Glance öffnen
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 30770a89f..3ed8934be 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index cbfaa23b2..136714b8f 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -96,3 +96,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index ffbf76ef3..86314a0bb 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Haga clic en el icono para admini
 zen-open-link-in-glance = 
     .label = Abrir enlace en Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = ¡Actualización completada!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = Novedades en { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = Ver notas de la versión
+zen-sidebar-notification-restart-safe-mode-label = ¿Algo dejó de funcionar?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Reiniciar en modo seguro
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index 332aabcf1..2c3688cea 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index c3d119ffa..a75a80563 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl
index dbba7f1d7..eec5f9f4a 100644
--- a/locales/fi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl
@@ -6,8 +6,8 @@ pane-zen-looks-title = Katso ja tunne
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
 zen-warning-language = Muuttaminen oletuskieli voisi helpottaa Websites seurata sinua.
-zen-vertical-tabs-layout-header = Browser Layout
-zen-vertical-tabs-layout-description = Choose the layout that suits you best
+zen-vertical-tabs-layout-header = Selaimen asettelu
+zen-vertical-tabs-layout-description = Valitse asettelu, joka sopii sinulle parhaiten
 zen-layout-single-toolbar = Single toolbar
 zen-layout-multiple-toolbar = Multiple toolbars
 zen-layout-collapsed-toolbar = Collapsed toolbar
@@ -45,16 +45,16 @@ pane-settings-workspaces-title = Työtilat
 zen-tabs-unloader-enabled = 
     .label = Ota Käyttöön välilehden purkaminen
 zen-tabs-close-on-back-with-no-history = 
-    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+    .label = Sulje välilehti ja vaihda sen omistajavälilehteen (tai viimeksi käytettyyn välilehteen) kun palataan ilman historiaa
 zen-tabs-cycle-by-attribute = 
-    .label = Ctrl+Tab cycles within Essential or Workspace tabs only
+    .label = Ctrl+Tab kiertää vain keskeisissä tai Työtilojen välilehdissä
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+    .label = Ohita odottavat välilehdet Ctrl+Tab kanssa
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab selaa välilehtiä käyttöjärjestyksessä alkaen viimeisimmästä
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Use themed background for compact toolbar
+    .label = Käytä teemoitettua taustaa kompaktissa työkalupalkissa
 zen-workspace-continue-where-left-off = 
-    .label = Continue where you left off
+    .label = Jatka siitä, mihin jäit
 pane-zen-pinned-tab-manager-title = Kiinnitetyt Välilehdet
 zen-pinned-tab-manager-header = Yleiset asetukset kiinnitettäville välilehteille
 zen-pinned-tab-manager-description = Hallitse lisäkäyttäytymistä kiinnitettyjen välilehtien osalta
@@ -72,7 +72,7 @@ zen-pinned-tab-manager-reset-switch-close-shortcut-option =
 zen-pinned-tab-manager-switch-close-shortcut-option = 
     .label = Siirry seuraavaan välilehteen
 zen-pinned-tab-manager-reset-close-shortcut-option = 
-    .label = Reset URL
+    .label = Resetoi URL
 zen-pinned-tab-manager-close-close-shortcut-option = 
     .label = Sulje välilehti
 pane-zen-workspaces-header = Työtilat
@@ -83,7 +83,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 = Conflicts with { $group } -> { $shortcut }
+zen-key-conflict = Ristiriidat { $group } -> { $shortcut }
 pane-zen-theme-title = Teeman Asetukset
 zen-vertical-tabs-title = Sivupalkin ja välilehtien asettelu
 zen-vertical-tabs-header = Pystysuorat Välilehdet
@@ -99,7 +99,7 @@ zen-vertical-tabs-dont-expand-tabs-by-default = Älä laajenna välilehtiä olet
 zen-vertical-tabs-expand-tabs-on-hover = Laajenna välilehdet leijailemalla (Ei toimi kompaktitilassa)
 zen-vertical-tabs-expand-tabs-header = Kuinka laajentaa välilehdet
 zen-vertical-tabs-expand-tabs-description = Valitse, miten voit laajentaa välilehtiä sivupalkissa
-zen-theme-marketplace-header = Zen Mods
+zen-theme-marketplace-header = Zen modit
 zen-theme-disable-all-enabled = 
     .title = Poista kaikki teemat käytöstä
 zen-theme-disable-all-disabled = 
@@ -110,15 +110,15 @@ zen-theme-marketplace-remove-button =
 zen-theme-marketplace-check-for-updates-button = 
     .label = Tarkista päivitykset
 zen-theme-marketplace-import-button = 
-    .label = Import mods
+    .label = Tuo modeja
 zen-theme-marketplace-export-button = 
-    .label = Export Mods
-zen-theme-marketplace-import-success = Mods imported successfully
-zen-theme-marketplace-import-failure = There was an error importing the mods
-zen-theme-marketplace-export-success = Mods exported successfully
-zen-theme-marketplace-export-failure = There was an error exporting the mods
+    .label = Vie Modit
+zen-theme-marketplace-import-success = Modit tuotu onnistuneesti
+zen-theme-marketplace-import-failure = Modeja tuodessa tapahtui virhe
+zen-theme-marketplace-export-success = Modit viety onnistuneesti
+zen-theme-marketplace-export-failure = Modien viennissä tapahtui virhe
 zen-theme-marketplace-updates-success = Teema päivitetty onnistuneesti
-zen-theme-marketplace-updates-failure = Couldn't find any updates!
+zen-theme-marketplace-updates-failure = Päivityksiä ei löytynt!
 zen-theme-marketplace-toggle-enabled-button = 
     .title = Poista Teema Käytöstä
 zen-theme-marketplace-toggle-disabled-button = 
@@ -131,9 +131,9 @@ zen-theme-marketplace-dropdown-default-label =
     .label = Ei Mitään
 zen-theme-marketplace-input-default-placeholder = 
     .placeholder = Kirjoita jotain...
-pane-zen-marketplace-title = Zen Mods
+pane-zen-marketplace-title = Zen modit
 zen-themes-auto-update = 
-    .label = Automatically update installed mods on startup
+    .label = Päivitä asennetut modit automaattisesti käynnistyksessä
 zen-settings-workspaces-force-container-tabs-to-workspace = 
     .label = Vaihda työtilaan, jossa säiliö on asetettu oletusarvoiseksi avattaessa säiliön välilehtiä
 zen-theme-marketplace-link = Vieraile Kaupassa
@@ -145,16 +145,16 @@ zen-dark-theme-styles-colorful = Värikäs Tumma Teema
 zen-compact-mode-styles-left = Piilota välilehti
 zen-compact-mode-styles-top = Piilota yläpalkki
 zen-compact-mode-styles-both = Piilota Molemmat
-zen-urlbar-title = Zen URL Bar
-zen-urlbar-header = General settings for the URL bar
-zen-urlbar-description = Customize the URL bar to your liking
-zen-urlbar-behavior-label = Behavior
+zen-urlbar-title = Zen URL-palkki
+zen-urlbar-header = URL palkin yleiset asetukset
+zen-urlbar-description = Muokkaa URL-palkkia sinun mielesi mukaan
+zen-urlbar-behavior-label = Toiminnot
 zen-urlbar-behavior-normal = 
-    .label = Normal
+    .label = Normaali
 zen-urlbar-behavior-floating-on-type = 
-    .label = Floating only when typing
+    .label = Kelluva vain kirjoittaessasi
 zen-urlbar-behavior-float = 
-    .label = Always floating
+    .label = Aina kelluva
 pane-zen-CKS-title = Näppäimistön Pikanäppäimet
 category-zen-CKS = 
     .tooltiptext = { pane-zen-CKS-title }
@@ -164,7 +164,7 @@ zen-settings-CKS-description = Muuta oletus näppäimistön pikakuvakkeet mielty
 zen-settings-CKS-disable-firefox = 
     .label = Poista { -brand-short-name }oletusnäppäimistön pikakuvakkeet käytöstä
 zen-settings-CKS-duplicate-shortcut = 
-    .label = Duplicate Shortcut
+    .label = Monista pikanäppäin
 zen-settings-CKS-reset-shortcuts = 
     .label = Palauta oletukset
 zenCKSOption-group-other = Muu
@@ -178,10 +178,10 @@ zenCKSOption-group-zen-compact-mode = Kompakti Tila
 zenCKSOption-group-zen-workspace = Työtilat
 zenCKSOption-group-zen-other = Muut Zen-ominaisuudet
 zenCKSOption-group-zen-split-view = Jaettu Näkymä
-zenCKSOption-group-devTools = Developer Tools
+zenCKSOption-group-devTools = Kehitystyökalut
 zen-key-quick-restart = Nopea Uudelleenkäynnistys
 zen-window-new-shortcut = Uusi Ikkuna
-zen-tab-new-shortcut = New Tab
+zen-tab-new-shortcut = Uusi välilehti
 zen-key-redo = Toista
 zen-restore-last-closed-tab-shortcut = Palauta Viimeksi Suljettu Välilehti
 zen-location-open-shortcut = Avaa Sijainti
@@ -191,8 +191,8 @@ zen-text-action-undo-shortcut = Kumoa
 zen-text-action-redo-shortcut = Toista
 zen-text-action-cut-shortcut = Leikkaa
 zen-text-action-copy-shortcut = Kopioi
-zen-text-action-copy-url-shortcut = Copy current URL
-zen-text-action-copy-url-markdown-shortcut = Copy current URL as Markdown
+zen-text-action-copy-url-shortcut = Kopioi nykyinen URL-osoite
+zen-text-action-copy-url-markdown-shortcut = Kopioi nykyinen URL-osoite Markdownina
 zen-text-action-paste-shortcut = Liitä
 zen-text-action-select-all-shortcut = Valitse Kaikki
 zen-text-action-delete-shortcut = Poista
@@ -204,7 +204,7 @@ zen-picture-in-picture-toggle-shortcut-mac = Ota käyttöön kuva-kuvassa (Mac)
 zen-picture-in-picture-toggle-shortcut-mac-alt = Ota käyttöön kuva-kuvassa (Mac Alt)
 zen-page-source-shortcut-safari = Näytä Sivulähde (Safari)
 zen-nav-stop-shortcut = Lopeta Lataaminen
-zen-history-sidebar-shortcut = Show History Sidebar
+zen-history-sidebar-shortcut = Näytä historia sivupalkissa
 zen-window-minimize-shortcut = Pienennä Ikkuna
 zen-help-shortcut = Avaa Ohje
 zen-preferences-shortcut = Avoimet Asetukset
@@ -216,7 +216,7 @@ zen-downloads-shortcut = Avaa Lataukset
 zen-addons-shortcut = Avaa Lisäosat
 zen-file-open-shortcut = Avaa Tiedosto
 zen-save-page-shortcut = Tallenna Sivu
-zen-print-shortcut = Print Page
+zen-print-shortcut = Tulosta sivu
 zen-close-shortcut-2 = Sulje Välilehti
 zen-mute-toggle-shortcut = Vaihda Mykistystä
 zen-key-delete = Poista Avain
@@ -227,10 +227,10 @@ zen-nav-fwd-shortcut-alt = Siirry Eteenpäin (Alt)
 zen-history-show-all-shortcut = Näytä Kaikki Historia
 zen-key-enter-full-screen = Anna Koko Näyttö
 zen-key-exit-full-screen = Poistu Koko Näyttötilasta
-zen-ai-chatbot-sidebar-shortcut = Toggle AI Chatbot Sidebar
-zen-key-inspector-mac = Toggle Inspector (Mac)
-zen-toggle-sidebar-shortcut = Toggle Firefox Sidebar
-zen-toggle-pin-tab-shortcut = Toggle Pin Tab
+zen-ai-chatbot-sidebar-shortcut = Ota käyttöön AI chatbot sivupalkkiin
+zen-key-inspector-mac = Vaihda Tarkastaja (Mac)
+zen-toggle-sidebar-shortcut = Vaihda Firefoxin Sivupalkkia
+zen-toggle-pin-tab-shortcut = Kiinnitä välilehti
 zen-reader-mode-toggle-shortcut-other = Vaihda Lukijan Tila
 zen-picture-in-picture-toggle-shortcut = Vaihda Kuva Kuvaksi
 zen-nav-reload-shortcut-2 = Lataa Sivu Uudelleen
@@ -247,9 +247,9 @@ zen-key-stop = Lopeta Lataaminen
 zen-full-zoom-reduce-shortcut = Zoomaa Ulos
 zen-full-zoom-enlarge-shortcut = Zoomaa Sisään
 zen-full-zoom-reset-shortcut = Resetoi Zoomaus
-zen-full-zoom-reset-shortcut-alt = Reset Zoom (Alt)
-zen-full-zoom-enlarge-shortcut-alt = Zoom In (Alt)
-zen-full-zoom-enlarge-shortcut-alt2 = Zoom In (Alt 2)
+zen-full-zoom-reset-shortcut-alt = Nollaa Zoomaus (Alt)
+zen-full-zoom-enlarge-shortcut-alt = Suurenna (Alt)
+zen-full-zoom-enlarge-shortcut-alt2 = Suurenna (Alt 2)
 zen-bidi-switch-direction-shortcut = Vaihda Tekstin Suuntaa
 zen-private-browsing-shortcut = Yksityinen Selaus
 zen-screenshot-shortcut = Ota Kuvakaappaus
@@ -264,7 +264,7 @@ zen-close-tab-shortcut = Sulje Välilehti
 zen-compact-mode-shortcut-show-sidebar = Ota käyttöön Kelluva Sivupalkki
 zen-compact-mode-shortcut-show-toolbar = Ota käyttöön Kelluva Työkalurivi
 zen-compact-mode-shortcut-toggle = Ota käyttöön Kompaktitila
-zen-glance-expand = Expand Glance
+zen-glance-expand = Laajenna Vilkaisu
 zen-workspace-shortcut-switch-1 = Vaihda työtilaan 1
 zen-workspace-shortcut-switch-2 = Vaihda työtilaan 2
 zen-workspace-shortcut-switch-3 = Vaihda työtilaan 3
@@ -283,7 +283,7 @@ zen-split-view-shortcut-grid = Vaihda Jaettu Näkymä ruudukkoon
 zen-split-view-shortcut-vertical = Vaihda Jaettu Näkymä Pystysuunnassa
 zen-split-view-shortcut-horizontal = Vaihda Jaettu Näkymä Vaakasuoraan
 zen-split-view-shortcut-unsplit = Sulje Jaettu Näkymä
-zen-new-empty-split-view-shortcut = New Empty Split View
+zen-new-empty-split-view-shortcut = Uusi Tyhjä Jaettu Näkymä
 zen-key-select-tab-1 = Valitse välilehti #1
 zen-key-select-tab-2 = Valitse välilehti #2
 zen-key-select-tab-3 = Valitse välilehti #3
@@ -298,17 +298,17 @@ zen-key-goto-history = Siirry historiaan
 zen-key-go-home = Siirry Kotiin
 zen-bookmark-show-sidebar-shortcut = Näytä Kirjanmerkkien Sivupalkki
 zen-bookmark-show-toolbar-shortcut = Näytä Kirjanmerkkipalkki
-zen-devtools-toggle-shortcut = Toggle DevTools
-zen-devtools-toggle-browser-toolbox-shortcut = Toggle Browser Toolbox
-zen-devtools-toggle-browser-console-shortcut = Toggle Browser Console
-zen-devtools-toggle-responsive-design-mode-shortcut = Toggle Responsive Design Mode
-zen-devtools-toggle-inspector-shortcut = Toggle Inspector
-zen-devtools-toggle-web-console-shortcut = Toggle Web Console
-zen-devtools-toggle-js-debugger-shortcut = Toggle JavaScript Debugger
-zen-devtools-toggle-net-monitor-shortcut = Toggle Network Monitor
-zen-devtools-toggle-style-editor-shortcut = Toggle Style Editor
-zen-devtools-toggle-performance-shortcut = Toggle Performance
-zen-devtools-toggle-storage-shortcut = Toggle Storage
-zen-devtools-toggle-dom-shortcut = Toggle DOM
-zen-devtools-toggle-accessibility-shortcut = Toggle Accessibility
-zen-close-all-unpinned-tabs-shortcut = Close All Unpinned Tabs
+zen-devtools-toggle-shortcut = Vaihda DevTools
+zen-devtools-toggle-browser-toolbox-shortcut = Vaihda Selaimen Työkalupakkia
+zen-devtools-toggle-browser-console-shortcut = Vaihda Selaimen Konsoli
+zen-devtools-toggle-responsive-design-mode-shortcut = Vaihda Reagoiva Suunnittelu -tila
+zen-devtools-toggle-inspector-shortcut = Vaihda Tarkastajaa
+zen-devtools-toggle-web-console-shortcut = Vaihda Selaimen Konsoli
+zen-devtools-toggle-js-debugger-shortcut = Vaihda Javascript- Debuggeria
+zen-devtools-toggle-net-monitor-shortcut = Vaihda Verkon Valvontaa
+zen-devtools-toggle-style-editor-shortcut = Vaihda Tyylin Muokkainta
+zen-devtools-toggle-performance-shortcut = Vaihda Suorituskykyä
+zen-devtools-toggle-storage-shortcut = Vaihda Tallennustilaa
+zen-devtools-toggle-dom-shortcut = Vaihda DOM:ia
+zen-devtools-toggle-accessibility-shortcut = Vaihda Esteettömyystilaa
+zen-close-all-unpinned-tabs-shortcut = Sulje kaikki kiinnittämättömät välilehdet
diff --git a/locales/fi/browser/browser/zen-folders.ftl b/locales/fi/browser/browser/zen-folders.ftl
index 37a8b2cfe..8ed0a32a9 100644
--- a/locales/fi/browser/browser/zen-folders.ftl
+++ b/locales/fi/browser/browser/zen-folders.ftl
@@ -3,23 +3,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-folders-search-placeholder = 
-    .placeholder = Search { $folder-name }...
+    .placeholder = Etsi { $folder-name }...
 zen-folders-panel-rename-folder = 
-    .label = Rename Folder
+    .label = Nimeä kansio uudelleen
 zen-folders-panel-unpack-folder = 
-    .label = Unpack Folder
+    .label = Pura Kansio
 zen-folders-new-subfolder = 
-    .label = New Subfolder
+    .label = Uusi Alikansio
 zen-folders-panel-delete-folder = 
-    .label = Delete Folder
+    .label = Poista kansio
 zen-folders-panel-convert-folder-to-space = 
-    .label = Convert folder to Space
+    .label = Muunna kansio työtilaksi
 zen-folders-panel-change-folder-space = 
-    .label = Change Space...
+    .label = Muuta Työtilaa...
 zen-folders-panel-change-icon-folder = 
-    .label = Change Icon
+    .label = Vaihda kuvake
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Unload active in this folder
+    .tooltiptext = Poista käytöstä aktiivinen kansio
 zen-folders-unload-folder = 
-    .label = Unload All Tabs
-zen-folders-search-no-results = No tabs matching that search 🤔
+    .label = Tyhjennä Kaikki Välilehdet
+zen-folders-search-no-results = Ei hakua vastaavia välilehtiä 🤔
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 6b75aa1ab..56222d6b5 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Nollaa Kiinnitetty Välilehti
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Lisää olennaisiin
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } täytetty paikka
 tab-context-zen-remove-essential = 
     .label = Poista olennaisista
     .accesskey = R
@@ -18,83 +18,92 @@ 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.
-zen-shortcuts-corrupted = Your { -brand-short-name } shortcuts file is corrupted. They have been reset to the default shortcuts.
+zen-shortcuts-corrupted = { -brand-short-name } Oikotietä sisältävä tiedosto on korruptoitunut. Ne on palautettu oletus oikoteihin.
 # 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.<br/><br/>
-    Try opening a new tab to see the new URL bar in action!
-zen-disable = Disable
+    Uusi URL-palkki on otettu käyttöön, uusia välilehtisivuja ei enää tarvita.<br/><br/>
+    Kokeile avata uusi välilehti nähdäksesi uuden URL-palkin toiminnassa!
+zen-disable = Poista käytöstä
 pictureinpicture-minimize-btn = 
-    .aria-label = Minimize
-    .tooltip = Minimize
+    .aria-label = Minimoi
+    .tooltip = Minimoi
 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 = Copied current URL!
+zen-copy-current-url-confirmation = Nykyinen URL-osoite kopioitu!
 zen-general-cancel-label = 
-    .label = Cancel
+    .label = Peruuta
 zen-general-confirm = 
-    .label = Confirm
+    .label = Vahvista
 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-tabs-renamed = Välilehti on nimetty uudelleen!
+zen-background-tab-opened-toast = Uusi taustavälilehti avattu!
+zen-workspace-renamed-toast = Työtila on nimetty uudelleen!
 zen-library-sidebar-workspaces = 
-    .label = Spaces
+    .label = Työtilat
 zen-library-sidebar-mods = 
-    .label = Mods
+    .label = Modit
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
-    .tooltiptext = Toggle Compact Mode
+    .label = Kompakti Tila
+    .tooltiptext = Ota käyttöön Kompakti tila
 
 # note: Do not translate the "<br/>" tags in the following string
 
-zen-learn-more-text = Learn More
-zen-close-label = Close
+zen-learn-more-text = Lue Lisää
+zen-close-label = Sulje
 zen-singletoolbar-urlbar-placeholder-with-name = 
-    .placeholder = Search...
+    .placeholder = Hae...
 zen-icons-picker-emoji = 
-    .label = Emojis
+    .label = Emojit
 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
-zen-generic-next = Next
+    .label = Kuvakkeet
+urlbar-search-mode-zen_actions = Toiminnot
+zen-site-data-settings = Asetukset
+zen-generic-manage = Hallitse
+zen-generic-more = Lisää
+zen-generic-next = Seuraava
 # 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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
-zen-site-data-setting-cross-site = Cross-Site cookie
+zen-site-data-setting-allow = Sallittu
+zen-site-data-setting-block = Estetty
+zen-site-data-protections-enabled = Käytössä
+zen-site-data-protections-disabled = Pois käytöstä
+zen-site-data-setting-cross-site = Sivuston välinen eväste
 zen-site-data-security-info-extension = 
-    .label = Extension
+    .label = Laajennus
 zen-site-data-security-info-secure = 
-    .label = Secure
+    .label = Turvallinen
 zen-site-data-security-info-not-secure = 
-    .label = Not Secure
+    .label = Ei turvallinen
 zen-site-data-manage-addons = 
-    .label = Manage Extensions
+    .label = Hallita Laajennuksia
 zen-site-data-get-addons = 
-    .label = Add Extensions
+    .label = Lisää Laajennuksia
 zen-site-data-site-settings = 
-    .label = All Site Settings
+    .label = Kaikki Sivuston Asetukset
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Jaa Tämä Sivu
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Siirry lukutilaan
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Ota kuvakaappaus
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Lisää Tämä Sivu Kirjanmerkkeihin
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = Kopioi URL
+zen-site-data-setting-site-protection = Seuranta Suojaus
 
 # 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 = Uusi koti lisäosille, käyttöoikeuksille ja paljon muuta
+zen-site-data-panel-feature-callout-subtitle = Klikkaa kuvaketta hallitaksesi sivuston asetuksia, tarkastella tietoturvatietoja, käyttää laajennuksia ja suorittaa yhteisiä toimintoja.
 zen-open-link-in-glance = 
-    .label = Open Link in Glance
+    .label = Avaa linkki vilkaisussa
     .accesskey = G
+zen-sidebar-notification-updated-heading = Päivitys valmis!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = Mitä uutta { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = Katso Julkaisutiedot
+zen-sidebar-notification-restart-safe-mode-label = Jotain rikki?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Käynnistä uudelleen vianmääritystilassa
diff --git a/locales/fi/browser/browser/zen-vertical-tabs.ftl b/locales/fi/browser/browser/zen-vertical-tabs.ftl
index c4680d671..cfea15a20 100644
--- a/locales/fi/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/fi/browser/browser/zen-vertical-tabs.ftl
@@ -11,29 +11,29 @@ zen-toolbar-context-compact-mode-enable =
     .label = Ota kompakti tila käyttöön
     .accesskey = D
 zen-toolbar-context-compact-mode-just-tabs = 
-    .label = Hide sidebar
+    .label = Piilota sivupalkki
 zen-toolbar-context-compact-mode-just-toolbar = 
     .label = Piilota työkalupalkki
 zen-toolbar-context-compact-mode-hide-both = 
     .label = Piilota molemmat
     .accesskey = H
 zen-toolbar-context-new-folder = 
-    .label = New Folder
+    .label = Uusi kansio
     .accesskey = N
 sidebar-zen-expand = 
-    .label = Expand Sidebar
+    .label = Laajenna sivupalkkia
 sidebar-zen-create-new = 
-    .label = Create New...
+    .label = Luo uusi...
 tabbrowser-unload-tab-button = 
     .tooltiptext =
         { $tabCount ->
-            [one] Unload and switch to tab
-           *[other] Unload { $tabCount } tabs and switch to the first
+            [one] Pura ja vaihda välilehteen
+           *[other] Pura { $tabCount } välilehdet ja vaihda ensimmäiseen
         }
 tabbrowser-reset-pin-button = 
     .tooltiptext =
         { $tabCount ->
-            [one] Reset and pin tab
-           *[other] Reset and pin { $tabCount } tabs
+            [one] Nollaa ja kiinnitä välilehti
+           *[other] Nollaa ja kiinnitä { $tabCount } välilehdet
         }
-tab-reset-pin-label = Back to pinned url
+tab-reset-pin-label = Takaisin kiinnitettyyn URL-osoitteeseen
diff --git a/locales/fi/browser/browser/zen-welcome.ftl b/locales/fi/browser/browser/zen-welcome.ftl
index 86d517ffd..7bd3f9c97 100644
--- a/locales/fi/browser/browser/zen-welcome.ftl
+++ b/locales/fi/browser/browser/zen-welcome.ftl
@@ -2,25 +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/.
 
-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-import-description-2 = Easily bring them over from another browser and pick up right where you left off..
-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-title-line1 = Tervetuloa
+zen-welcome-title-line2 = rauhellisempaan internettiin
+zen-welcome-import-title = Tuore Aloitus, Samat Kirjanmerkit
+zen-welcome-import-description-1 = Kirjanmerkit, historia ja salasanat ovat kuin polku leivänmurteita Internetin kautta - älä jätä niitä taakse!
+zen-welcome-import-description-2 = Tuo ne helposti toisesta selaimesta ja jatka eteenpäin siitä, mihin jäit.
+zen-welcome-import-button = Tuo nyt
+zen-welcome-set-default-browser = Aseta { -brand-short-name } oletusselaimeksi
+zen-welcome-dont-set-default-browser = ÄLÄ asettanut { -brand-short-name } oletusselaimeksi
+zen-welcome-initial-essentials-title = Tärkeimmät Välilehtesi, Aina Saavutuksen Sisällä
+zen-welcome-initial-essentials-description-1 = Pidä tärkeimmät välilehdet helposti saatavilla riippumatta siitä, kuinka monta olet avannut.
+zen-welcome-initial-essentials-description-2 = Olennaiset välilehdet ovat aina näkyvissä, riippumatta siitä, missä työtilassa olet.
+zen-welcome-workspace-colors-title = Sinun Työtilasi, Sinun Värisi
+zen-welcome-workspace-colors-description = Mukauta selainta antamalla jokaiselle työtilalle oma väri-identiteetti.
 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-finished = Your Zen has been set up correctly!
+    Kaikki asetettu?<br/>
+    Aletaan toimiin!
+zen-welcome-start-browsing-description-1 = Kaikki on asetettu ja olet valmis menemään. Napsauta alla olevaa painiketta aloittaaksesi selailun { -brand-short-name } -sovelluksella.
+zen-welcome-start-browsing = Sukella sisään!
+zen-welcome-default-search-title = Sinun Oletushakukone
+zen-welcome-default-search-description = Valitse oletushakukone. Voit aina muuttaa sitä myöhemmin!
+zen-welcome-skip-button = Ohita
+zen-welcome-finished = Zen on määritetty oikein!
diff --git a/locales/fi/browser/browser/zen-workspaces.ftl b/locales/fi/browser/browser/zen-workspaces.ftl
index 3d722b080..48f7b9f64 100644
--- a/locales/fi/browser/browser/zen-workspaces.ftl
+++ b/locales/fi/browser/browser/zen-workspaces.ftl
@@ -4,26 +4,26 @@
 
 zen-panel-ui-workspaces-text = Työtilat
 zen-panel-ui-workspaces-create = 
-    .label = Create Space
+    .label = Luo työtila
 zen-panel-ui-folder-create = 
-    .label = Create Folder
+    .label = Luo kansio
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Uusi Jako
 zen-workspaces-panel-context-delete = 
     .label = Poista Työtila
     .accesskey = D
 zen-workspaces-panel-change-name = 
-    .label = Change Name
+    .label = Vaihda nimi
 zen-workspaces-panel-change-icon = 
-    .label = Change Icon
+    .label = Vaihda kuvake
 zen-workspaces-panel-context-default-profile = 
-    .label = Set Profile
+    .label = Aseta Profiili
 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
+    .label = Poista Työtila
+zen-workspaces-how-to-reorder-title = Kuinka järjestää työtiloja
+zen-workspaces-how-to-reorder-desc = Vedä työtilan kuvakkeet sivupalkin alareunaan järjestääksesi ne uudelleen
 zen-workspaces-change-theme = 
-    .label = Edit Theme
+    .label = Muokkaa teemaa
 zen-workspaces-panel-context-open = 
     .label = Avaa Työtila
     .accesskey = O
@@ -37,29 +37,29 @@ zen-bookmark-edit-panel-workspace-selector =
     .value = Työtilat
     .accesskey = W
 zen-panel-ui-gradient-generator-algo-complementary = 
-    .label = Complementary
+    .label = Täydentävä
 zen-panel-ui-gradient-generator-algo-splitComplementary = 
-    .label = Split
+    .label = Jaa osiin
 zen-panel-ui-gradient-generator-algo-analogous = 
-    .label = Analogous
+    .label = Analoginen
 zen-panel-ui-gradient-generator-algo-triadic = 
-    .label = Triadic
+    .label = Triadiikki
 zen-panel-ui-gradient-generator-algo-floating = 
-    .label = Floating
-zen-panel-ui-gradient-click-to-add = Click to add a color
+    .label = Kelluva
+zen-panel-ui-gradient-click-to-add = Klikkaa lisätäksesi väri
 zen-workspace-creation-name = 
-    .placeholder = Space Name
+    .placeholder = Työtilan nimi
 zen-workspaces-panel-context-reorder = 
-    .label = Reorder Spaces
-zen-workspace-creation-profile = Profile
-    .tooltiptext = Profiles are used to separate cookies and site data between spaces.
-zen-workspace-creation-header = Create a Space
-zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
-zen-workspaces-delete-workspace-title = Delete Workspace?
-zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.
+    .label = Järjestä Työtilat Uudelleen
+zen-workspace-creation-profile = Profiili
+    .tooltiptext = Profiileja käytetään erottamaan evästeet ja sivustontiedot tiloihin.
+zen-workspace-creation-header = Luo työtila
+zen-workspace-creation-label = Työtiloja käytetään järjestämään sinun välilehtiä ja istuntoja.
+zen-workspaces-delete-workspace-title = Poista Työtila?
+zen-workspaces-delete-workspace-body = Oletko varma, että haluat poistaa { $name }? Tätä toimintoa ei voi peruuttaa.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs Closed! Use <span>{ $shortcut }</span> to undo.
+zen-workspaces-close-all-unpinned-tabs-toast = Välilehdet suljettu! Peruuta toiminto käyttämällä <span>{ $shortcut }</span>.
 zen-workspaces-close-all-unpinned-tabs-title = 
-    .label = Clear
-    .tooltiptext = Close all unpinned tabs
+    .label = Tyhjennä
+    .tooltiptext = Sulje kaikki kiinnittämättömät välilehdet
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 4b8c300ba..33b7ead44 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Cliquez sur l'icône pour gérer
 zen-open-link-in-glance = 
     .label = Ouvrir le lien dans Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Mise à jour terminée !
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = Quoi de neuf dans { -brand-short-name } ?
+zen-sidebar-notification-updated-tooltip = 
+    .title = Voir les notes de version
+zen-sidebar-notification-restart-safe-mode-label = Un problème est survenu ?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Redémarrer en mode de dépannage
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index 23d98022d..d054d330d 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Cliceáil an deilbhín chun socru
 zen-open-link-in-glance = 
     .label = Oscail an Nasc i Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Nuashonrú críochnaithe!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = Cad atá nua i { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = Féach ar Nótaí Eisiúna
+zen-sidebar-notification-restart-safe-mode-label = Bhris rud éigin?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Atosaigh i Mód Sábháilte
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index c546889ce..3fb522ee1 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = ניתן ללחוץ על הסמל
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 68c695255..38fb6624f 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Kattints az ikonra a webhely beá
 zen-open-link-in-glance = 
     .label = Link megnyitása a bepillantóban
     .accesskey = G
+zen-sidebar-notification-updated-heading = Frissítés befejezve!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = { -brand-short-name } újdonságai
+zen-sidebar-notification-updated-tooltip = 
+    .title = Változások listájának megtekintése
+zen-sidebar-notification-restart-safe-mode-label = Valami elromlott?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Újraindítás biztonságos módban
diff --git a/locales/hu/browser/browser/zen-split-view.ftl b/locales/hu/browser/browser/zen-split-view.ftl
index 81ecdc17c..56a1bb7c3 100644
--- a/locales/hu/browser/browser/zen-split-view.ftl
+++ b/locales/hu/browser/browser/zen-split-view.ftl
@@ -10,7 +10,7 @@ tab-zen-split-tabs =
         }
     .accesskey = S
 zen-split-link = 
-    .label = Link felosztása új lapban
+    .label = Hivatkozás felosztása új lapban
     .accesskey = S
 zen-split-view-modifier-header = Osztott nézet
 zen-split-view-modifier-activate-reallocation = 
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 90d834f96..caa4ccb81 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Klik ikon untuk mengelola pengatu
 zen-open-link-in-glance = 
     .label = Buka Tautan di Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index 5c89851d1..0e3361087 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 58de35cf5..77561855d 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -96,3 +96,12 @@ zen-site-data-panel-feature-callout-subtitle = Clicca l'icona per gestire le imp
 zen-open-link-in-glance = 
     .label = Apri collegamento in Sguardo
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 213a2d47e..4ff080d82 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 49e7f7783..d5d76e675 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = 아이콘을 클릭해 사이트
 zen-open-link-in-glance = 
     .label = 글랜스로 링크 열기
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index 654935d28..e60c742a2 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Atkurti prisegtą kortelę
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Įtraukti į būtiniausius
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } užpildytų vietų
 tab-context-zen-remove-essential = 
     .label = Šalinti iš būtiniausių
     .accesskey = R
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Spustelėkite piktogramą, kad tv
 zen-open-link-in-glance = 
     .label = Atverti nuorodą spartiuojame pažiūrėjime
     .accesskey = G
+zen-sidebar-notification-updated-heading = Naujinimas baigtas.
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = Kas naujo naršyklėje „{ -brand-short-name }“
+zen-sidebar-notification-updated-tooltip = 
+    .title = Peržiūrėti leidimo pastabas
+zen-sidebar-notification-restart-safe-mode-label = Kažkas sugedo?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 2e749ec15..1b9e29433 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Klik op het icoon om de site-inst
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 7f2d3ec8c..4a0bf6481 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 5e6b01a9e..19db7ab0f 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Kliknij ikonę, aby zarządzać u
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 9018a53b1..217a65ebc 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -96,3 +96,12 @@ zen-site-data-panel-feature-callout-subtitle = Clique no ícone para gerenciar c
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 68239dba0..a3f347c24 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Clique no ícone para gerir defin
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index add11add8..41538608f 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Нажмите на значок
 zen-open-link-in-glance = 
     .label = Открыть ссылку в предпросмотре
     .accesskey = П
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 55732320a..442a17899 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 7f2d3ec8c..4a0bf6481 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index a6acb4375..0b98163a9 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 68f2cdefb..4c24ad4b7 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Натисніть значок,
 zen-open-link-in-glance = 
     .label = Відкрити посилання в передперегляді
     .accesskey = G
+zen-sidebar-notification-updated-heading = Оновлення завершено!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = Що нового в { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = Переглянути примітки до випуску
+zen-sidebar-notification-restart-safe-mode-label = Щось зламалося?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Перезапустити в безпечному режимі
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 8f97f5c6c..9ac48b555 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -98,3 +98,12 @@ zen-site-data-panel-feature-callout-subtitle = Bấm vào biểu tượng để
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index e04c359ba..03fa1bacf 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -96,3 +96,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index f972deb48..e25ca942d 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -96,3 +96,12 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
+zen-sidebar-notification-updated-heading = Update Complete!
+# See ZenSidebarNotification.mjs to see how these would be used
+
+zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-tooltip = 
+    .title = View Release Notes
+zen-sidebar-notification-restart-safe-mode-label = Something broke?
+zen-sidebar-notification-restart-safe-mode-tooltip = 
+    .title = Restart in Safe Mode

From 6dc16988176c1ef28a49d5a389b26cbd50713c3c Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 23 Nov 2025 12:19:09 +0100
Subject: [PATCH 121/162] fix: Fixed translations strings having a syntax
 error, b=no-bug, c=no-component

---
 locales/en-US/browser/browser/zen-general.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index 3792765fe..07a7546c8 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -124,7 +124,7 @@ zen-open-link-in-glance =
 
 zen-sidebar-notification-updated-heading = Update Complete!
 
-# See ZenSidebarNotification.mjs to see how these would be used
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip =

From 894fce098f7dcf7689f16cb368380b3ec8dac7c7 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 23 Nov 2025 12:53:04 +0100
Subject: [PATCH 122/162] chore: New Crowdin updates, p=#11397

* Update source file zen-general.ftl

* Update source file zen-general.ftl

* New translations zen-general.ftl (French)

* New translations zen-general.ftl (Spanish)

* New translations zen-general.ftl (Arabic)

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

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

* 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 ++-
 locales/ca/browser/browser/zen-general.ftl    | 3 ++-
 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 | 3 ++-
 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    | 3 ++-
 locales/ga-IE/browser/browser/zen-general.ftl | 3 ++-
 locales/he/browser/browser/zen-general.ftl    | 3 ++-
 locales/hu/browser/browser/zen-general.ftl    | 3 ++-
 locales/id/browser/browser/zen-general.ftl    | 3 ++-
 locales/is/browser/browser/zen-general.ftl    | 3 ++-
 locales/it/browser/browser/zen-general.ftl    | 3 ++-
 locales/ja/browser/browser/zen-general.ftl    | 3 ++-
 locales/ko/browser/browser/zen-general.ftl    | 3 ++-
 locales/lt/browser/browser/zen-general.ftl    | 5 +++--
 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 | 3 ++-
 locales/ru/browser/browser/zen-general.ftl    | 3 ++-
 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    | 3 ++-
 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 ++-
 35 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index 105dcc7a5..8d1ecb22f 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index e729ab26a..f6d32932d 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Obre l'enllaç en un cop d'ull
     .accesskey = G
 zen-sidebar-notification-updated-heading = Actualització completada!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = Novetats a { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 155654d68..c23343186 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Otevřít odkaz v Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index 4f15648b8..31e74eb80 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index cb9a9ff05..1693d949f 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index b951ee02b..744d889b3 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Link in Glance öffnen
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 3ed8934be..2636d6f65 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index 136714b8f..6c1cbe3e6 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -97,7 +97,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index 86314a0bb..4132f5c83 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Abrir enlace en Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = ¡Actualización completada!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = Novedades en { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index 2c3688cea..926798332 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index a75a80563..c612ba8c0 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index 56222d6b5..a912293b4 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Avaa linkki vilkaisussa
     .accesskey = G
 zen-sidebar-notification-updated-heading = Päivitys valmis!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = Mitä uutta { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index 33b7ead44..f5942b8fb 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Ouvrir le lien dans Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Mise à jour terminée !
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = Quoi de neuf dans { -brand-short-name } ?
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index d054d330d..be10d5c16 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Oscail an Nasc i Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Nuashonrú críochnaithe!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = Cad atá nua i { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index 3fb522ee1..2e1ec9146 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index 38fb6624f..db2f60a84 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Link megnyitása a bepillantóban
     .accesskey = G
 zen-sidebar-notification-updated-heading = Frissítés befejezve!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = { -brand-short-name } újdonságai
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index caa4ccb81..0b1f62cff 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Buka Tautan di Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index 0e3361087..1cbafccec 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index 77561855d..3e18e6b68 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -97,7 +97,8 @@ zen-open-link-in-glance =
     .label = Apri collegamento in Sguardo
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index 4ff080d82..e563a24f8 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index d5d76e675..b160e5958 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = 글랜스로 링크 열기
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index e60c742a2..9f3f8e176 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -99,11 +99,12 @@ zen-open-link-in-glance =
     .label = Atverti nuorodą spartiuojame pažiūrėjime
     .accesskey = G
 zen-sidebar-notification-updated-heading = Naujinimas baigtas.
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = Kas naujo naršyklėje „{ -brand-short-name }“
 zen-sidebar-notification-updated-tooltip = 
     .title = Peržiūrėti leidimo pastabas
 zen-sidebar-notification-restart-safe-mode-label = Kažkas sugedo?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
-    .title = Restart in Safe Mode
+    .title = Paleisti iš naujo saugioje režime
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 1b9e29433..7b54aa88b 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 4a0bf6481..e2d00e72e 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 19db7ab0f..ca23dab91 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index 217a65ebc..43526daae 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -97,7 +97,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index a3f347c24..9993c0ab1 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index 41538608f..e52773d1a 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Открыть ссылку в предпросмотре
     .accesskey = П
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 442a17899..24e2a18cb 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 4a0bf6481..e2d00e72e 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 0b98163a9..f8ccb8014 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 4c24ad4b7..f42b54040 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Відкрити посилання в передперегляді
     .accesskey = G
 zen-sidebar-notification-updated-heading = Оновлення завершено!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = Що нового в { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 9ac48b555..b00610740 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -99,7 +99,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index 03fa1bacf..19825ce2f 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -97,7 +97,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index e25ca942d..315d28688 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -97,7 +97,8 @@ zen-open-link-in-glance =
     .label = Open Link in Glance
     .accesskey = G
 zen-sidebar-notification-updated-heading = Update Complete!
-# See ZenSidebarNotification.mjs to see how these would be used
+
+# See ZenSidebarNotification.mjs to see how these would be used
 
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 

From 8612e0d1e9a995ae3d2945a7bdfe65b48f58ab23 Mon Sep 17 00:00:00 2001
From: Lukas Spiss <35728419+Spissable@users.noreply.github.com>
Date: Sun, 23 Nov 2025 11:58:07 +0000
Subject: [PATCH 123/162] fix: allow selection within link, b=closes
 https://github.com/zen-browser/desktop/issues/8391, p=#11394

* fix: allow selection within link

fixes: #8391

The glance feature was clashing with the possibility to select text within a link.
To avoid the conflict, glance will only open upon mouseup and only if the mouse hasn't moved since the mouse was pressed.

* remove redundant condition

* register listeners in correct place

* feat: Listen to mouse move only once, b=no-bug, c=common, glance

---------

Co-authored-by: mr. m <mr.m@tuta.com>
---
 src/zen/common/sys/ZenActorsManager.sys.mjs  |  3 +++
 src/zen/glance/actors/ZenGlanceChild.sys.mjs | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/zen/common/sys/ZenActorsManager.sys.mjs b/src/zen/common/sys/ZenActorsManager.sys.mjs
index 2d7b8c10a..5208c221c 100644
--- a/src/zen/common/sys/ZenActorsManager.sys.mjs
+++ b/src/zen/common/sys/ZenActorsManager.sys.mjs
@@ -45,6 +45,9 @@ let JSWINDOWACTORS = {
         mousedown: {
           capture: true,
         },
+        mouseup: {
+          capture: true,
+        },
         keydown: {
           capture: true,
         },
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index 47337790a..b01caa8af 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -3,9 +3,11 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 export class ZenGlanceChild extends JSWindowActorChild {
   #activationMethod;
+  #glanceTarget = null;
 
   constructor() {
     super();
+    this.mousemoveCallback = this.mousemoveCallback.bind(this);
   }
 
   async handleEvent(event) {
@@ -80,11 +82,23 @@ export class ZenGlanceChild extends JSWindowActorChild {
     } else if (activationMethod === 'meta' && !event.metaKey) {
       return;
     }
-    if (target) {
+    this.#glanceTarget = target;
+    window.addEventListener('mousemove', this.mousemoveCallback, { once: true });
+  }
+
+  on_mouseup(event) {
+    if (this.#glanceTarget) {
       event.preventDefault();
       event.stopPropagation();
+      this.#openGlance(this.#glanceTarget);
+      this.#glanceTarget = null;
+      window.removeEventListener('mousemove', this.mousemoveCallback);
+    }
+  }
 
-      this.#openGlance(target);
+  mousemoveCallback() {
+    if (this.#glanceTarget) {
+      this.#glanceTarget = null;
     }
   }
 

From 9e1f272e29c5809e719d0a30450eac75f701d5a4 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 23 Nov 2025 13:37:27 +0100
Subject: [PATCH 124/162] chore: Bump surfer version, p=#11401

* chore: Bump surfer version, b=no-bug, c=no-component

* chore: Bump surfer version, b=no-bug, c=no-component

* chore: Bump surfer version, b=no-bug, c=no-component
---
 package-lock.json | 113 ++++++++++++++++++++++++++++++++--------------
 package.json      |   2 +-
 2 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 709f0fcee..4be119e91 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.23"
+        "@zen-browser/surfer": "^1.11.26"
       },
       "devDependencies": {
         "@babel/preset-typescript": "^7.27.0",
@@ -812,51 +812,51 @@
       }
     },
     "node_modules/@oozcitak/dom": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-2.0.1.tgz",
-      "integrity": "sha512-Un5k8MKqGak1LQM/behcHylmGdRopBXZax19weVedEAIrOCRZooY+MvX4Ehcz0ftOEPgYZ7vjIm/+MokVBFO3w==",
+      "version": "1.15.10",
+      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-1.15.10.tgz",
+      "integrity": "sha512-0JT29/LaxVgRcGKvHmSrUTEvZ8BXvZhGl2LASRUgHqDTC1M5g1pLmVv56IYNyt3bG2CUjDkc67wnyZC14pbQrQ==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/infra": "^2.0.1",
-        "@oozcitak/url": "^2.0.1",
-        "@oozcitak/util": "^9.0.2"
+        "@oozcitak/infra": "1.0.8",
+        "@oozcitak/url": "1.0.4",
+        "@oozcitak/util": "8.3.8"
       },
       "engines": {
-        "node": ">=20.0"
+        "node": ">=8.0"
       }
     },
     "node_modules/@oozcitak/infra": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-2.0.1.tgz",
-      "integrity": "sha512-TtjI+kducm0ExL3OTKglPLkAIQ3alq0Otbokml62haZESfQaL3ojLJxl7+UTBhWCkBBuCshzGEEYmX5MXo8WOg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-1.0.8.tgz",
+      "integrity": "sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/util": "~9.0.2"
+        "@oozcitak/util": "8.3.8"
       },
       "engines": {
-        "node": ">=20.0"
+        "node": ">=6.0"
       }
     },
     "node_modules/@oozcitak/url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-2.0.1.tgz",
-      "integrity": "sha512-lLHUQUyYy86q+qbALr0TMVh+VQAYwNGbsxBx4LhfjvkNYG0hgAwWtq7ePebGs2nEhZmmIFl24ikuCpH2r5d3+A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-1.0.4.tgz",
+      "integrity": "sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/infra": "^2.0.1",
-        "@oozcitak/util": "^9.0.2"
+        "@oozcitak/infra": "1.0.8",
+        "@oozcitak/util": "8.3.8"
       },
       "engines": {
-        "node": ">=20.0"
+        "node": ">=8.0"
       }
     },
     "node_modules/@oozcitak/util": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-9.0.4.tgz",
-      "integrity": "sha512-kmx1hRJlsvxiTCpK97off59LqSEOtkWOPe4rdfFL8TjZtihYSTVNObIfc86jtLngfnuIuuTRt+TUCgRS220RSQ==",
+      "version": "8.3.8",
+      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-8.3.8.tgz",
+      "integrity": "sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==",
       "license": "MIT",
       "engines": {
-        "node": ">=20.0"
+        "node": ">=8.0"
       }
     },
     "node_modules/@resvg/resvg-js": {
@@ -1109,9 +1109,9 @@
       "license": "MIT"
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.11.23",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.23.tgz",
-      "integrity": "sha512-nPJ8oH1r4yncPCymuVxFRJMKbj9elpLIuSMW7botJT1UpyTKeGPrpFukpc+fq4U8TXa1tNddpoUvI8ZRfk0sxA==",
+      "version": "1.11.26",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.26.tgz",
+      "integrity": "sha512-NZcFZ4a/HWvEJlEr5IlQto/xHLOr6tZjkZALue2qHg+rjRKR5v2BEV4hV5mfAo85gKhyM2Ism0sD+0+/VQIESg==",
       "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
@@ -1135,7 +1135,7 @@
         "semver": "^7.3.7",
         "sharp": "^0.32.6",
         "tiny-glob": "^0.2.9",
-        "xmlbuilder2": "^4.0.0"
+        "xmlbuilder2": "^3.0.2"
       },
       "bin": {
         "surfer": "dist/index.js"
@@ -1230,6 +1230,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
       "license": "Python-2.0"
     },
     "node_modules/array-buffer-byte-length": {
@@ -3025,6 +3026,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/esquery": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
@@ -4367,6 +4381,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
       "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -6294,6 +6309,12 @@
       "integrity": "sha512-lgxErLl/7A5+vgIIXsh9MbeukOaCb2axgQ+bKCdIE+ibNT4XNYGNCR1qFEGq6F+YDASXK3Fh/c5FgtZchFolxw==",
       "license": "MIT"
     },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/stack-base-iterator": {
       "version": "1.1.20",
       "resolved": "https://registry.npmjs.org/stack-base-iterator/-/stack-base-iterator-1.1.20.tgz",
@@ -7181,18 +7202,40 @@
       "license": "ISC"
     },
     "node_modules/xmlbuilder2": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-4.0.0.tgz",
-      "integrity": "sha512-zIoY033NGmbzHX1cYOGKNfeWpZyiGLzXGHNoxQ6tR/R+WqT7mqz+EDtFdPwqnhIms6vHz9BNtMS47DiGPyGfwg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-3.1.1.tgz",
+      "integrity": "sha512-WCSfbfZnQDdLQLiMdGUQpMxxckeQ4oZNMNhLVkcekTu7xhD4tuUDyAPoY8CwXvBYE6LwBHd6QW2WZXlOWr1vCw==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/dom": "^2.0.1",
-        "@oozcitak/infra": "^2.0.1",
-        "@oozcitak/util": "^9.0.4",
-        "js-yaml": "^4.1.0"
+        "@oozcitak/dom": "1.15.10",
+        "@oozcitak/infra": "1.0.8",
+        "@oozcitak/util": "8.3.8",
+        "js-yaml": "3.14.1"
       },
       "engines": {
-        "node": ">=20.0"
+        "node": ">=12.0"
+      }
+    },
+    "node_modules/xmlbuilder2/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/xmlbuilder2/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/xtend": {
diff --git a/package.json b/package.json
index fc84a6d66..17ae8137e 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.23"
+    "@zen-browser/surfer": "^1.11.26"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.27.0",

From b2ea2d44207a1770d31b216ea133869c1a4e0b99 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 23 Nov 2025 21:59:41 +0100
Subject: [PATCH 125/162] fix: Fixed using the wrong window for glance dragging
 detection, b=no-bug, c=glance

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

diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index b01caa8af..8a379f17a 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -83,7 +83,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
       return;
     }
     this.#glanceTarget = target;
-    window.addEventListener('mousemove', this.mousemoveCallback, { once: true });
+    this.contentWindow.addEventListener('mousemove', this.mousemoveCallback, { once: true });
   }
 
   on_mouseup(event) {
@@ -92,8 +92,8 @@ export class ZenGlanceChild extends JSWindowActorChild {
       event.stopPropagation();
       this.#openGlance(this.#glanceTarget);
       this.#glanceTarget = null;
-      window.removeEventListener('mousemove', this.mousemoveCallback);
     }
+    this.contentWindow.removeEventListener('mousemove', this.mousemoveCallback);
   }
 
   mousemoveCallback() {

From 886b559b507438c38b640dce0657bd627acfeb51 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 23 Nov 2025 23:00:24 +0100
Subject: [PATCH 126/162] fix: Don't add folder indents to glance tabs,
 b=no-bug, c=tabs

---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index b75d8467d..20bcccefc 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -313,7 +313,7 @@
         var(--zen-tabbox-element-indent-transition);
     }
 
-    :root[zen-sidebar-expanded='true'] & {
+    :root[zen-sidebar-expanded='true'] &:not([zen-glance-tab]) {
       margin-inline-start: var(--zen-folder-indent) !important;
     }
 

From e500e04418088c9867847da7a05f4734bed375ba Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 24 Nov 2025 13:05:23 +0100
Subject: [PATCH 127/162] fix: Fixed keyboard shortcuts not saving correctly,
 b=no-bug, c=kbs

---
 src/browser/components/preferences/zen-settings.js | 9 ++++++---
 src/zen/kbs/ZenKeyboardShortcuts.mjs               | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 5da77ca5f..06dfd78c3 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -8,9 +8,12 @@ const { nsZenMultiWindowFeature } = ChromeUtils.importESModule(
   { global: 'current' }
 );
 
-ChromeUtils.importESModule('chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs', {
-  global: 'current',
-});
+const { nsKeyShortcutModifiers } = ChromeUtils.importESModule(
+  'chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs',
+  {
+    global: 'current',
+  }
+);
 
 var gZenMarketplaceManager = {
   async init() {
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index c42f3f174..ced9f9488 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -141,7 +141,7 @@ window.VALID_SHORTCUT_GROUPS = [
   'other',
 ];
 
-class nsKeyShortcutModifiers {
+export class nsKeyShortcutModifiers {
   #control = false;
   #alt = false;
   #shift = false;

From d110dcaa35bc15ef8e022b8acfef3f8f9bdd9a2a Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 24 Nov 2025 22:49:50 +0100
Subject: [PATCH 128/162] feat: Remove legacy pref checking for gradient
 themes, b=bug #11375, c=common, workspaces

---
 prefs/zen/theme.yaml                        |  3 --
 src/zen/common/styles/zen-browser-ui.css    | 34 ++++++++++-----------
 src/zen/workspaces/ZenGradientGenerator.mjs |  6 +---
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/prefs/zen/theme.yaml b/prefs/zen/theme.yaml
index 28250f6f9..4d1cf3180 100644
--- a/prefs/zen/theme.yaml
+++ b/prefs/zen/theme.yaml
@@ -11,9 +11,6 @@
 - name: zen.theme.dark-mode-bias
   value: 0.3
 
-- name: zen.theme.gradient
-  value: true
-
 - name: zen.theme.gradient.show-custom-colors
   value: false
 
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index 959c16d4e..a46036d07 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -54,29 +54,27 @@
     pointer-events: none;
   }
 
-  @media -moz-pref('zen.theme.gradient') {
+  &::after {
+    background: var(--zen-main-browser-background);
+    opacity: var(--zen-background-opacity);
+    transition: 0s;
+  }
+
+  &:is(.zen-toolbar-background) {
     &::after {
-      background: var(--zen-main-browser-background);
-      opacity: var(--zen-background-opacity);
-      transition: 0s;
+      background: var(--zen-main-browser-background-toolbar);
     }
+  }
 
-    &:is(.zen-toolbar-background) {
-      &::after {
-        background: var(--zen-main-browser-background-toolbar);
-      }
-    }
+  &::before {
+    background: var(--zen-main-browser-background-old);
+    opacity: calc(1 - var(--zen-background-opacity));
+    transition: 0s;
+  }
 
+  &:is(.zen-toolbar-background) {
     &::before {
-      background: var(--zen-main-browser-background-old);
-      opacity: calc(1 - var(--zen-background-opacity));
-      transition: 0s;
-    }
-
-    &:is(.zen-toolbar-background) {
-      &::before {
-        background: var(--zen-main-browser-background-toolbar-old);
-      }
+      background: var(--zen-main-browser-background-toolbar-old);
     }
   }
 
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index 52c328bec..ba3f1edbe 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -66,11 +66,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
 
   constructor() {
     super();
-    if (
-      !Services.prefs.getBoolPref('zen.theme.gradient', true) ||
-      !gZenWorkspaces.shouldHaveWorkspaces ||
-      gZenWorkspaces.privateWindowOrDisabled
-    ) {
+    if (!gZenWorkspaces.shouldHaveWorkspaces || gZenWorkspaces.privateWindowOrDisabled) {
       return;
     }
     this.promiseInitialized = new Promise((resolve) => {

From 58c45339392c1e24688dd6074bcfd48dd906cd1a Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:54:23 +0100
Subject: [PATCH 129/162] chore: New Crowdin updates, p=#11418

---
 .../browser/preferences/zen-preferences.ftl   |  2 +-
 locales/el/browser/browser/zen-general.ftl    | 62 +++++++++----------
 .../browser/preferences/zen-preferences.ftl   |  6 +-
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/locales/el/browser/browser/preferences/zen-preferences.ftl b/locales/el/browser/browser/preferences/zen-preferences.ftl
index 0faae2d4f..a79092412 100644
--- a/locales/el/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/el/browser/browser/preferences/zen-preferences.ftl
@@ -45,7 +45,7 @@ pane-settings-workspaces-title = Χώροι Εργασίας
 zen-tabs-unloader-enabled = 
     .label = Ενεργοποίηση Εκφορτωτή Καρτέλας
 zen-tabs-close-on-back-with-no-history = 
-    .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
+    .label = Κλείσιμο καρτέλας και αλλαγή στην καρτέλα ιδιοκτήτη (ή στην πιο πρόσφατα χρησιμοποιούμενη καρτέλα) όταν επιστρέφεις χωρίς ιστορικό
 zen-tabs-cycle-by-attribute = 
     .label = Ctrl+Tab cycles within Essential or Workspace tabs only
 zen-tabs-cycle-ignore-pending-tabs = 
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index 2636d6f65..571018c23 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -8,9 +8,9 @@ tab-context-zen-reset-pinned-tab =
     .label = Επαναφορά Καρφιτσωμένης Καρτέλας
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Προσθήκη στα Απαραίτητα
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } / { $max } γεμισμένες θέσεις
 tab-context-zen-remove-essential = 
     .label = Αφαίρεση από Απαραίτητα
     .accesskey = R
@@ -29,7 +29,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 = 
@@ -43,7 +43,7 @@ zen-library-sidebar-workspaces =
 zen-library-sidebar-mods = 
     .label = Mods
 zen-toggle-compact-mode-button = 
-    .label = Compact Mode
+    .label = Συμπαγής Λειτουργία
     .tooltiptext = Toggle Compact Mode
 
 # note: Do not translate the "<br/>" tags in the following string
@@ -55,41 +55,41 @@ zen-singletoolbar-urlbar-placeholder-with-name =
 zen-icons-picker-emoji = 
     .label = Emojis
 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
-zen-generic-next = Next
+    .label = Εικονίδια
+urlbar-search-mode-zen_actions = Ενέργειες
+zen-site-data-settings = Ρυθμίσεις
+zen-generic-manage = Διαχείριση
+zen-generic-more = Περισσότερα
+zen-generic-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-protections-enabled = Enabled
-zen-site-data-protections-disabled = Disabled
+zen-site-data-setting-allow = Επιτρέπεται
+zen-site-data-setting-block = Αποκλείστηκε
+zen-site-data-protections-enabled = Ενεργό
+zen-site-data-protections-disabled = Ανενεργό
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension = 
-    .label = Extension
+    .label = Επέκταση
 zen-site-data-security-info-secure = 
-    .label = Secure
+    .label = Ασφαλές
 zen-site-data-security-info-not-secure = 
-    .label = Not Secure
+    .label = Μη Ασφαλές
 zen-site-data-manage-addons = 
-    .label = Manage Extensions
+    .label = Διαχείριση Επεκτάσεων
 zen-site-data-get-addons = 
-    .label = Add Extensions
+    .label = Προσθήκη Επεκτάσεων
 zen-site-data-site-settings = 
-    .label = All Site Settings
+    .label = Όλες Οι Ρυθμίσεις Ιστοσελίδας
 zen-site-data-header-share = 
-    .tooltiptext = Share This Page
+    .tooltiptext = Κοινοποίηση Αυτή Της Σελίδας
 zen-site-data-header-reader-mode = 
-    .tooltiptext = Enter Reader Mode
+    .tooltiptext = Είσοδος Σε Λειτουργία Ανάγνωσης
 zen-site-data-header-screenshot = 
-    .tooltiptext = Take a Screenshot
+    .tooltiptext = Λήψη στιγμιότυπου οθόνης
 zen-site-data-header-bookmark = 
-    .tooltiptext = Bookmark This Page
+    .tooltiptext = Σελιδοδείκτης στη Σελίδα
 zen-urlbar-copy-url-button = 
-    .tooltiptext = Copy URL
-zen-site-data-setting-site-protection = Tracking Protection
+    .tooltiptext = Αντιγραφή URL
+zen-site-data-setting-site-protection = Προστασία Ανίχνευσης
 
 # Section: Feature callouts
 
@@ -98,13 +98,13 @@ zen-site-data-panel-feature-callout-subtitle = Click the icon to manage site set
 zen-open-link-in-glance = 
     .label = Open Link in Glance
     .accesskey = G
-zen-sidebar-notification-updated-heading = Update Complete!
+zen-sidebar-notification-updated-heading = Η Ενημέρωση Ολοκληρώθηκε!
 
 # See ZenSidebarNotification.mjs to see how these would be used
 
-zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-label = Τι νέο υπάρχει στο { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
-    .title = View Release Notes
-zen-sidebar-notification-restart-safe-mode-label = Something broke?
+    .title = Προβολή Σημειώσεων Έκδοσης
+zen-sidebar-notification-restart-safe-mode-label = Χάλασε κάτι;
 zen-sidebar-notification-restart-safe-mode-tooltip = 
-    .title = Restart in Safe Mode
+    .title = Επανεκκίνηση σε Ασφαλή Λειτουργία
diff --git a/locales/fi/browser/browser/preferences/zen-preferences.ftl b/locales/fi/browser/browser/preferences/zen-preferences.ftl
index eec5f9f4a..07858b31e 100644
--- a/locales/fi/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/fi/browser/browser/preferences/zen-preferences.ftl
@@ -164,7 +164,7 @@ zen-settings-CKS-description = Muuta oletus näppäimistön pikakuvakkeet mielty
 zen-settings-CKS-disable-firefox = 
     .label = Poista { -brand-short-name }oletusnäppäimistön pikakuvakkeet käytöstä
 zen-settings-CKS-duplicate-shortcut = 
-    .label = Monista pikanäppäin
+    .label = Monista pikakuvake
 zen-settings-CKS-reset-shortcuts = 
     .label = Palauta oletukset
 zenCKSOption-group-other = Muu
@@ -306,9 +306,9 @@ zen-devtools-toggle-inspector-shortcut = Vaihda Tarkastajaa
 zen-devtools-toggle-web-console-shortcut = Vaihda Selaimen Konsoli
 zen-devtools-toggle-js-debugger-shortcut = Vaihda Javascript- Debuggeria
 zen-devtools-toggle-net-monitor-shortcut = Vaihda Verkon Valvontaa
-zen-devtools-toggle-style-editor-shortcut = Vaihda Tyylin Muokkainta
+zen-devtools-toggle-style-editor-shortcut = Vaihda Tyylin Muokkausohjelmaa
 zen-devtools-toggle-performance-shortcut = Vaihda Suorituskykyä
 zen-devtools-toggle-storage-shortcut = Vaihda Tallennustilaa
 zen-devtools-toggle-dom-shortcut = Vaihda DOM:ia
-zen-devtools-toggle-accessibility-shortcut = Vaihda Esteettömyystilaa
+zen-devtools-toggle-accessibility-shortcut = Vaihda Esteettömyystilaan
 zen-close-all-unpinned-tabs-shortcut = Sulje kaikki kiinnittämättömät välilehdet

From 8d12ade0bf5ffbf24448171066f77a0b3eaba4e5 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:55:05 +0100
Subject: [PATCH 130/162] fix: prevent new window when shift-clicking links in
 split view glance, b=closes
 https://github.com/zen-browser/desktop/issues/11409, p=#11424

Co-authored-by: Nihal <121309701+nihalxkumar@users.noreply.github.com>
---
 .../themes/shared/preferences/zen-preferences.css   |  1 +
 src/zen/common/styles/zen-sidebar-notification.css  |  2 +-
 src/zen/common/sys/ZenActorsManager.sys.mjs         |  3 +++
 src/zen/downloads/ZenDownloadAnimation.mjs          |  2 +-
 src/zen/glance/actors/ZenGlanceChild.sys.mjs        | 13 ++++++++++---
 surfer.json                                         |  2 +-
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index c33c0f945..14bc2f65f 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -559,6 +559,7 @@ groupbox h2 {
 #helpButton,
 #support-firefox,
 #tabGroupSuggestions,
+#web-appearance-manage-themes-link,
 .mission-message {
   display: none !important;
 }
diff --git a/src/zen/common/styles/zen-sidebar-notification.css b/src/zen/common/styles/zen-sidebar-notification.css
index 1e8a6782d..a54e6b05f 100644
--- a/src/zen/common/styles/zen-sidebar-notification.css
+++ b/src/zen/common/styles/zen-sidebar-notification.css
@@ -20,7 +20,7 @@
   min-width: 0;
   border-radius: var(--border-radius-medium);
   box-shadow: var(--zen-sidebar-notification-shadow);
-  font-size: var(--font-size-medium);
+  font-size: 12px;
 }
 
 .zen-sidebar-notification-header {
diff --git a/src/zen/common/sys/ZenActorsManager.sys.mjs b/src/zen/common/sys/ZenActorsManager.sys.mjs
index 5208c221c..f53f80af2 100644
--- a/src/zen/common/sys/ZenActorsManager.sys.mjs
+++ b/src/zen/common/sys/ZenActorsManager.sys.mjs
@@ -51,6 +51,9 @@ let JSWINDOWACTORS = {
         keydown: {
           capture: true,
         },
+        click: {
+          capture: true,
+        },
       },
     },
     allFrames: true,
diff --git a/src/zen/downloads/ZenDownloadAnimation.mjs b/src/zen/downloads/ZenDownloadAnimation.mjs
index 4affc0ae8..f205d80b8 100644
--- a/src/zen/downloads/ZenDownloadAnimation.mjs
+++ b/src/zen/downloads/ZenDownloadAnimation.mjs
@@ -2,7 +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/.
 
-import { Downloads } from 'resource://gre/modules/Downloads.sys.mjs';
 import {
   nsZenDOMOperatedFeature,
   nsZenMultiWindowFeature,
@@ -24,6 +23,7 @@ class nsZenDownloadAnimation extends nsZenDOMOperatedFeature {
 
   async #setupDownloadListeners() {
     try {
+      const Downloads = window.Downloads;
       const list = await Downloads.getList(Downloads.ALL);
       list.addView({
         onDownloadAdded: this.#handleNewDownload.bind(this),
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index 8a379f17a..7d39efdc9 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -86,14 +86,21 @@ export class ZenGlanceChild extends JSWindowActorChild {
     this.contentWindow.addEventListener('mousemove', this.mousemoveCallback, { once: true });
   }
 
-  on_mouseup(event) {
+  on_mouseup() {
+    if (this.#glanceTarget) {
+      // Don't clear the glance target here, we need it in the click handler
+      // See issue https://github.com/zen-browser/desktop/issues/11409
+      this.#openGlance(this.#glanceTarget);
+    }
+    this.contentWindow.removeEventListener('mousemove', this.mousemoveCallback);
+  }
+
+  on_click(event) {
     if (this.#glanceTarget) {
       event.preventDefault();
       event.stopPropagation();
-      this.#openGlance(this.#glanceTarget);
       this.#glanceTarget = null;
     }
-    this.contentWindow.removeEventListener('mousemove', this.mousemoveCallback);
   }
 
   mousemoveCallback() {
diff --git a/surfer.json b/surfer.json
index 2837916e8..1ce7d9305 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.9b",
+        "displayVersion": "1.17.10b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 1d36f05abcd842de3fe8ec9e1b220ecb41d9ebbc Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 25 Nov 2025 18:03:52 +0100
Subject: [PATCH 131/162] chore: Sync upstream Firefox to version 145.0.2,
 p=#11425

* chore: Sync upstream to `Firefox 145.0.2`

* Update Twilight version to RC 145.0.2 in README

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

* Update candidate version to 145.0.2

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 README.md                                 | 4 ++--
 build/firefox-cache/l10n-last-commit-hash | 2 +-
 surfer.json                               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 538f3a383..f59803ce6 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 `145.0.1`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0.1`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `145.0.2`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0.2`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 9839d1fa1..46bf23512 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-99a389c2413be0374ee04b10021ed269c0387b45
\ No newline at end of file
+37df51b9bc9a584158ac1b42dc2da8c5e49fac83
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index 1ce7d9305..7f1885ec2 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "145.0.1",
-    "candidate": "145.0.1"
+    "version": "145.0.2",
+    "candidate": "145.0.2"
   },
   "buildOptions": {
     "generateBranding": true
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}

From 833caf2f8188c874acfd70eb854caae19972c605 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 27 Nov 2025 16:43:51 +0100
Subject: [PATCH 132/162] fix: Fixed crash on macos when quiting and glance
 opening a new window, b=bug #11416 and bug
 https://github.com/zen-browser/desktop/issues/11409, c=common, compact-mode,
 glance, tabs, workspaces

---
 .../urlbar/UrlbarInput-sys-mjs.patch          |  8 ++--
 src/firefox-patches/147_https3_fix.patch      | 19 ++++++++
 src/zen/common/sys/ZenActorsManager.sys.mjs   |  3 --
 src/zen/compact-mode/ZenCompactMode.mjs       | 34 ++++++++-----
 src/zen/glance/actors/ZenGlanceChild.sys.mjs  | 48 ++++++++-----------
 src/zen/tabs/ZenPinnedTabManager.mjs          |  2 +-
 src/zen/workspaces/ZenWorkspaces.mjs          |  6 ++-
 surfer.json                                   |  2 +-
 8 files changed, 74 insertions(+), 48 deletions(-)
 create mode 100644 src/firefox-patches/147_https3_fix.patch

diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index ac3e26172..13c96ab97 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 4b7232f3261f8589b734c2238170e6968d7ea0bf..d8c0b404724e9b0dc2b5a2d21420357586fb7f14 100644
+index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c10e8a36f2 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -84,6 +84,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -189,11 +189,13 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..d8c0b404724e9b0dc2b5a2d214203575
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3248,7 +3335,7 @@ export class UrlbarInput {
+@@ -3247,8 +3334,8 @@ export class UrlbarInput {
+     if (!this.isAddressbar) {
        return val;
      }
-     let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
+-    let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
 -      ? lazy.BrowserUIUtils.trimURL(val)
++    let trimmedValue = lazy.UrlbarPrefs.get("trimURLs") && this._zenTrimURL
 +      ? this._zenTrimURL(val)
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
diff --git a/src/firefox-patches/147_https3_fix.patch b/src/firefox-patches/147_https3_fix.patch
new file mode 100644
index 000000000..3cad042c8
--- /dev/null
+++ b/src/firefox-patches/147_https3_fix.patch
@@ -0,0 +1,19 @@
+diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
+index daf10b9adb4b6a3c376edc5b0d8586e97483626a..415f64dbb2da5ea6da42f1ce29d6dc09cf86f713 100644
+--- a/netwerk/protocol/http/nsHttpTransaction.cpp
++++ b/netwerk/protocol/http/nsHttpTransaction.cpp
+@@ -1332,6 +1332,14 @@ void nsHttpTransaction::Close(nsresult reason) {
+     mDNSRequest = nullptr;
+   }
+ 
++  // If an HTTP/3 backup timer is active and this transaction ends in error,
++  // treat it as NS_ERROR_NET_RESET so the transaction will retry once.
++  // NOTE: This is a temporary workaround; the proper fix belongs in
++  // the Happy Eyeballs project.
++  if (NS_FAILED(reason) && mHttp3BackupTimerCreated && mHttp3BackupTimer) {
++    reason = NS_ERROR_NET_RESET;
++  }
++
+   MaybeCancelFallbackTimer();
+ 
+   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
diff --git a/src/zen/common/sys/ZenActorsManager.sys.mjs b/src/zen/common/sys/ZenActorsManager.sys.mjs
index f53f80af2..da9930c1b 100644
--- a/src/zen/common/sys/ZenActorsManager.sys.mjs
+++ b/src/zen/common/sys/ZenActorsManager.sys.mjs
@@ -45,9 +45,6 @@ let JSWINDOWACTORS = {
         mousedown: {
           capture: true,
         },
-        mouseup: {
-          capture: true,
-        },
         keydown: {
           capture: true,
         },
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index f5f54fe05..72df3790f 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -52,9 +52,13 @@ window.gZenCompactModeManager = {
     this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);
 
     this.addContextMenu();
+    this._resolvePreInit();
   },
 
-  init() {
+  async init() {
+    await this._preInitPromise;
+    delete this._resolvePreInit;
+    delete this._preInitPromise;
     this.addMouseActions();
 
     const tabIsRightObserver = this._updateSidebarIsOnRight.bind(this);
@@ -227,6 +231,9 @@ window.gZenCompactModeManager = {
     const isIllegalState = this.checkIfIllegalState();
     const menuitem = document.getElementById('zen-context-menu-compact-mode-toggle');
     const menu = document.getElementById('zen-context-menu-compact-mode');
+    if (!menu) {
+      return;
+    }
     if (isSingleToolbar) {
       menu.setAttribute('hidden', 'true');
       menu.before(menuitem);
@@ -528,9 +535,11 @@ window.gZenCompactModeManager = {
   },
 
   updateContextMenu() {
-    document
-      .getElementById('zen-context-menu-compact-mode-toggle')
-      .setAttribute('checked', this.preference);
+    const toggle = document.getElementById('zen-context-menu-compact-mode-toggle');
+    if (!toggle) {
+      return;
+    }
+    toggle.setAttribute('checked', this.preference);
 
     const hideTabBar = this.canHideSidebar;
     const hideToolbar = this.canHideToolbar;
@@ -855,10 +864,13 @@ window.gZenCompactModeManager = {
   },
 };
 
-document.addEventListener(
-  'MozBeforeInitialXULLayout',
-  () => {
-    gZenCompactModeManager.preInit();
-  },
-  { once: true }
-);
+(gZenCompactModeManager._preInitPromise = new Promise((resolve) => {
+  gZenCompactModeManager._resolvePreInit = resolve;
+})),
+  document.addEventListener(
+    'MozBeforeInitialXULLayout',
+    () => {
+      gZenCompactModeManager.preInit();
+    },
+    { once: true }
+  );
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index 7d39efdc9..8de0fc65f 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -3,11 +3,9 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 export class ZenGlanceChild extends JSWindowActorChild {
   #activationMethod;
-  #glanceTarget = null;
 
   constructor() {
     super();
-    this.mousemoveCallback = this.mousemoveCallback.bind(this);
   }
 
   async handleEvent(event) {
@@ -59,16 +57,32 @@ export class ZenGlanceChild extends JSWindowActorChild {
     });
   }
 
-  on_mousedown(event) {
+  /**
+   * Returns the closest A element from the event target
+   * and the element to record (originalTarget or target)
+   */
+  #getTargetFromEvent(event) {
     // get closest A element
     const target = event.target.closest('A');
     const elementToRecord = event.originalTarget || event.target;
+    return {
+      target,
+      elementToRecord,
+    };
+  }
+
+  on_mousedown(event) {
+    const { target, elementToRecord } = this.#getTargetFromEvent(event);
     // We record the link data anyway, even if the glance may be invoked
     // or not. We have some cases where glance would open, for example,
     // when clicking on a link with a different domain where glance would open.
     // The problem is that at that stage we don't know the rect or even what
     // element has been clicked, so we send the data here.
     this.#sendClickDataToParent(target, elementToRecord);
+  }
+
+  on_click(event) {
+    const { target } = this.#getTargetFromEvent(event);
     if (event.button !== 0 || event.defaultPrevented || this.#ensureOnlyKeyModifiers(event)) {
       return;
     }
@@ -82,31 +96,9 @@ export class ZenGlanceChild extends JSWindowActorChild {
     } else if (activationMethod === 'meta' && !event.metaKey) {
       return;
     }
-    this.#glanceTarget = target;
-    this.contentWindow.addEventListener('mousemove', this.mousemoveCallback, { once: true });
-  }
-
-  on_mouseup() {
-    if (this.#glanceTarget) {
-      // Don't clear the glance target here, we need it in the click handler
-      // See issue https://github.com/zen-browser/desktop/issues/11409
-      this.#openGlance(this.#glanceTarget);
-    }
-    this.contentWindow.removeEventListener('mousemove', this.mousemoveCallback);
-  }
-
-  on_click(event) {
-    if (this.#glanceTarget) {
-      event.preventDefault();
-      event.stopPropagation();
-      this.#glanceTarget = null;
-    }
-  }
-
-  mousemoveCallback() {
-    if (this.#glanceTarget) {
-      this.#glanceTarget = null;
-    }
+    event.preventDefault();
+    event.stopPropagation();
+    this.#openGlance(target);
   }
 
   on_keydown(event) {
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 8598858a4..c922d1166 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -164,7 +164,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
       if (init) {
         this._hasFinishedLoading = true;
       }
-    }, 10);
+    }, 100);
   }
 
   async #initializePinsCache() {
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index cb08f58d0..0816696b6 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -51,7 +51,11 @@ class nsZenWorkspaces extends nsZenMultiWindowFeature {
     if (this.privateWindowOrDisabled) {
       return;
     }
-    await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized]);
+    await Promise.all([
+      this.promiseDBInitialized,
+      this.promisePinnedInitialized,
+      SessionStore.promiseAllWindowsRestored,
+    ]);
   }
 
   async init() {
diff --git a/surfer.json b/surfer.json
index 7f1885ec2..fef136899 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.10b",
+        "displayVersion": "1.17.11b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From 5dd5414bf1af37ac16385dd6eb047c2105e26731 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 27 Nov 2025 16:44:58 +0100
Subject: [PATCH 133/162] chore: New Crowdin updates, p=#11438

* New translations zen-preferences.ftl (Polish)

* New translations zen-general.ftl (Czech)
---
 locales/cs/browser/browser/zen-general.ftl             | 10 +++++-----
 .../pl/browser/browser/preferences/zen-preferences.ftl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index c23343186..31cb08df7 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -98,13 +98,13 @@ zen-site-data-panel-feature-callout-subtitle = Klikněte na ikonu pro správu na
 zen-open-link-in-glance = 
     .label = Otevřít odkaz v Glance
     .accesskey = G
-zen-sidebar-notification-updated-heading = Update Complete!
+zen-sidebar-notification-updated-heading = Aktualizace byla dokončena!
 
 # See ZenSidebarNotification.mjs to see how these would be used
 
-zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-label = Co je nového v prohlížeči { -brand-short-name }
 zen-sidebar-notification-updated-tooltip = 
-    .title = View Release Notes
-zen-sidebar-notification-restart-safe-mode-label = Something broke?
+    .title = Zobrazit změny
+zen-sidebar-notification-restart-safe-mode-label = Něco se rozbilo?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
-    .title = Restart in Safe Mode
+    .title = Restartovat v Nouzovém Režimu
diff --git a/locales/pl/browser/browser/preferences/zen-preferences.ftl b/locales/pl/browser/browser/preferences/zen-preferences.ftl
index c51c95c8f..687fb4377 100644
--- a/locales/pl/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/pl/browser/browser/preferences/zen-preferences.ftl
@@ -50,7 +50,7 @@ zen-tabs-cycle-by-attribute =
     .label = Ctrl+Tab cycles within Essential or Workspace tabs only
 zen-tabs-cycle-ignore-pending-tabs = 
     .label = Ignore Pending tabs when cycling with Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab będzie przełączał karty według ostatnio używanej kolejności, ponieważ jest włączona
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Użyj tła motywu dla kompaktowego paska narzędzi
 zen-workspace-continue-where-left-off = 

From 445baecb5669a566e97c567fea712225010e91e9 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 27 Nov 2025 18:59:08 +0100
Subject: [PATCH 134/162] chore: Apply patches to fix double click on the
 sidebar, p=#11456

---
 .../147_windows_border_fix_1.patch            | 90 +++++++++++++++++++
 .../147_windows_border_fix_2.patch            | 57 ++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 src/firefox-patches/147_windows_border_fix_1.patch
 create mode 100644 src/firefox-patches/147_windows_border_fix_2.patch

diff --git a/src/firefox-patches/147_windows_border_fix_1.patch b/src/firefox-patches/147_windows_border_fix_1.patch
new file mode 100644
index 000000000..fded21ca5
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_1.patch
@@ -0,0 +1,90 @@
+From 433cc8224790300fdabe76bd225b644c1812da34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Thu, 27 Nov 2025 15:28:12 +0000
+Subject: [PATCH] Bug 1993474 - Ensure our WNDPROC has precedence over
+ WinAppSDK's. r=gstoll,win-reviewers
+
+See the comment for reasoning. WM_NCCALCSIZE wasn't getting called, and
+we rely on that to get the right client area on things like maximized
+windows.
+
+Differential Revision: https://phabricator.services.mozilla.com/D274281
+---
+ widget/windows/nsWindow.cpp | 32 ++++++++++++++++++++++----------
+ widget/windows/nsWindow.h   |  2 ++
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index 0b98d157097da..b357df236cfcd 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -1520,12 +1520,31 @@ DWORD nsWindow::WindowExStyle() {
+  *
+  **************************************************************/
+ 
++bool nsWindow::ShouldAssociateWithWinAppSDK() const {
++  // We currently don't need any SDK functionality for for PiP windows,
++  // and using the SDK on these windows causes them to go under the
++  // taskbar (bug 1995838).
++  //
++  // TODO(emilio): That might not be true anymore after bug 1993474,
++  // consider re-testing and removing that special-case.
++  return IsTopLevelWidget() && !mIsPIPWindow;
++}
++
+ bool nsWindow::AssociateWithNativeWindow() {
+   if (!mWnd || !IsWindow(mWnd)) {
+     NS_ERROR("Invalid window handle");
+     return false;
+   }
+ 
++  if (ShouldAssociateWithWinAppSDK()) {
++    // Make sure to call this here to associate our window with the
++    // Windows App SDK _before_ setting our WNDPROC, if needed.
++    // This is important because the SDKs WNDPROC might handle messages like
++    // WM_NCCALCSIZE without calling into us, and that can cause sizing issues,
++    // see bug 1993474.
++    WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
++  }
++
+   // Connect the this pointer to the native window handle.
+   // This should be done before SetWindowLongPtrW, because nsWindow::WindowProc
+   // uses WinUtils::GetNSWindowPtr internally.
+@@ -1552,12 +1571,7 @@ void nsWindow::DissociateFromNativeWindow() {
+   DebugOnly<WNDPROC> wndProcBeforeDissociate =
+       reinterpret_cast<WNDPROC>(::SetWindowLongPtrW(
+           mWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(*mPrevWndProc)));
+-  // If we've used the Windows App SDK to remove the minimize/maximize/close
+-  // entries from the titlebar, then the Windows App SDK sets its own WNDPROC
+-  // own the window, so this assertion would fail. But we only do this if
+-  // Mica is available.
+-  NS_ASSERTION(WinUtils::MicaAvailable() ||
+-                   wndProcBeforeDissociate == nsWindow::WindowProc,
++  NS_ASSERTION(wndProcBeforeDissociate == nsWindow::WindowProc,
+                "Unstacked an unexpected native window procedure");
+ 
+   WinUtils::SetNSWindowPtr(mWnd, nullptr);
+@@ -2835,9 +2849,7 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
+     mCustomNonClientMetrics = {};
+     ResetLayout();
+   }
+-  // Not needed for PiP windows, and using the Windows App SDK on
+-  // these windows causes them to go under the taskbar (bug 1995838)
+-  if (!mPIPWindow) {
++  if (ShouldAssociateWithWinAppSDK()) {
+     WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
+   }
+ }
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+index 20f016757dfee..2756b248368a3 100644
+--- a/widget/windows/nsWindow.h
++++ b/widget/windows/nsWindow.h
+@@ -335,6 +335,8 @@ class nsWindow final : public nsIWidget {
+ 
+   bool IsRTL() const { return mIsRTL; }
+ 
++  bool ShouldAssociateWithWinAppSDK() const;
++
+   /**
+    * AssociateDefaultIMC() associates or disassociates the default IMC for
+    * the window.
diff --git a/src/firefox-patches/147_windows_border_fix_2.patch b/src/firefox-patches/147_windows_border_fix_2.patch
new file mode 100644
index 000000000..ada457907
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_2.patch
@@ -0,0 +1,57 @@
+From 418e274c76f9e6b2d1149048cb399f1f6d709553 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Thu, 27 Nov 2025 15:31:40 +0000
+Subject: [PATCH] Bug 1993474 - Remove redundant nsWindow::mPIPWindow.
+ r=win-reviewers,gstoll
+
+nsIWidget already has a member for this.
+
+Differential Revision: https://phabricator.services.mozilla.com/D274282
+---
+ widget/windows/nsWindow.cpp | 4 +---
+ widget/windows/nsWindow.h   | 3 ---
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index b357df236cfc..19f5980a106f 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -817,7 +817,6 @@ static bool IsCloaked(HWND hwnd) {
+ nsWindow::nsWindow()
+     : nsBaseWidget(BorderStyle::Default),
+       mFrameState(std::in_place, this),
+-      mPIPWindow(false),
+       mMicaBackdrop(false),
+       mLastPaintEndTime(TimeStamp::Now()),
+       mCachedHitTestTime(TimeStamp::Now()),
+@@ -1028,7 +1027,6 @@ nsresult nsWindow::Create(nsIWidget* aParent, const LayoutDeviceIntRect& aRect,
+       aParent ? (HWND)aParent->GetNativeData(NS_NATIVE_WINDOW) : nullptr;
+
+   mIsRTL = aInitData->mRTL;
+-  mPIPWindow = aInitData->mPIPWindow;
+   mOpeningAnimationSuppressed = aInitData->mIsAnimationSuppressed;
+   mAlwaysOnTop = aInitData->mAlwaysOnTop;
+   mIsAlert = aInitData->mIsAlert;
+@@ -2807,7 +2805,7 @@ bool nsWindow::UpdateNonClientMargins(bool aReflowWindow) {
+     // frame sizes for left, right and bottom since Windows will automagically
+     // position the edges "offscreen" for maximized windows.
+     metrics.mOffset.top = metrics.mCaptionHeight;
+-  } else if (mPIPWindow &&
++  } else if (mIsPIPWindow &&
+              !StaticPrefs::widget_windows_pip_decorations_enabled()) {
+     metrics.mOffset = metrics.DefaultMargins();
+   } else {
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+index 2756b248368a..9e6b4d41d721 100644
+--- a/widget/windows/nsWindow.h
++++ b/widget/windows/nsWindow.h
+@@ -852,9 +852,6 @@ class nsWindow final : public nsIWidget {
+   // Whether we're in the process of sending a WM_SETTEXT ourselves
+   bool mSendingSetText = false;
+ 
+-  // Whether we're a PIP window.
+-  bool mPIPWindow : 1;
+-
+   // Whether we are asked to render a mica backdrop.
+   bool mMicaBackdrop : 1;
+ 

From 706505cc5086bfafe4d7b7e4b2c9e5117439d5e3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 28 Nov 2025 12:36:40 +0100
Subject: [PATCH 135/162] chore: Fix patch corruption for FF 147 Windows border
 fix, b=no-bug, c=no-component

---
 src/firefox-patches/147_windows_border_fix_2.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/firefox-patches/147_windows_border_fix_2.patch b/src/firefox-patches/147_windows_border_fix_2.patch
index ada457907..1556c30a6 100644
--- a/src/firefox-patches/147_windows_border_fix_2.patch
+++ b/src/firefox-patches/147_windows_border_fix_2.patch
@@ -26,7 +26,7 @@ index b357df236cfc..19f5980a106f 100644
        mCachedHitTestTime(TimeStamp::Now()),
 @@ -1028,7 +1027,6 @@ nsresult nsWindow::Create(nsIWidget* aParent, const LayoutDeviceIntRect& aRect,
        aParent ? (HWND)aParent->GetNativeData(NS_NATIVE_WINDOW) : nullptr;
-
+ 
    mIsRTL = aInitData->mRTL;
 -  mPIPWindow = aInitData->mPIPWindow;
    mOpeningAnimationSuppressed = aInitData->mIsAnimationSuppressed;

From d4f1916382a392b5a7ed84def2ae365054266800 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 29 Nov 2025 00:37:43 +0100
Subject: [PATCH 136/162] fix: Fixed pinned tabs wrongly restoring on macos,
 making it crash, b=closes #11416, c=no-component

---
 .../sessionstore/SessionStore-sys-mjs.patch   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 5cf576c24..2423488bd 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 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0eeba2381c 100644
+index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..7a46b3b9819d2abe5801a99984788a3ccf6f32bb 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -127,6 +127,8 @@ const TAB_EVENTS = [
@@ -20,15 +20,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
          this.saveStateDelayed(win);
          break;
        case "TabGroupCreate":
-@@ -2151,7 +2155,6 @@ var SessionStoreInternal = {
-       if (closedWindowState) {
-         let newWindowState;
-         if (
--          AppConstants.platform == "macosx" ||
-           !lazy.SessionStartup.willRestore()
-         ) {
-           // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2384,11 +2387,9 @@ var SessionStoreInternal = {
+@@ -2384,11 +2388,9 @@ var SessionStoreInternal = {
            tabbrowser.selectedTab.label;
        }
  
@@ -40,7 +32,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
  
        // 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
-@@ -3373,7 +3374,7 @@ var SessionStoreInternal = {
+@@ -3373,7 +3375,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -49,7 +41,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
        return;
      }
  
-@@ -4089,6 +4090,12 @@ var SessionStoreInternal = {
+@@ -4089,6 +4091,12 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -62,7 +54,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4525,6 +4532,7 @@ var SessionStoreInternal = {
+@@ -4525,6 +4533,7 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -70,7 +62,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5374,7 +5382,7 @@ var SessionStoreInternal = {
+@@ -5374,7 +5383,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -79,7 +71,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
          removableTabs.push(tab);
        }
      }
-@@ -5434,7 +5442,7 @@ var SessionStoreInternal = {
+@@ -5434,7 +5443,7 @@ var SessionStoreInternal = {
      }
  
      let workspaceID = aWindow.getWorkspaceID();
@@ -88,7 +80,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
        winData.workspaceID = workspaceID;
      }
    },
-@@ -5625,11 +5633,12 @@ var SessionStoreInternal = {
+@@ -5625,11 +5634,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -102,7 +94,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5640,6 +5649,7 @@ var SessionStoreInternal = {
+@@ -5640,6 +5650,7 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -110,7 +102,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5652,7 +5662,7 @@ var SessionStoreInternal = {
+@@ -5652,7 +5663,7 @@ var SessionStoreInternal = {
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
      if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -119,7 +111,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5764,8 +5774,8 @@ var SessionStoreInternal = {
+@@ -5764,8 +5775,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -130,7 +122,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5808,6 +5818,8 @@ var SessionStoreInternal = {
+@@ -5808,6 +5819,8 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -139,7 +131,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6371,6 +6383,25 @@ var SessionStoreInternal = {
+@@ -6371,6 +6384,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -165,7 +157,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -7289,7 +7320,7 @@ var SessionStoreInternal = {
+@@ -7289,7 +7321,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -174,3 +166,12 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..4eac2fed26d779908107ef60f1c2bd0e
            // Adjust window.selected
            if (tIndex + 1 < window.selected) {
              window.selected -= 1;
+@@ -7304,7 +7336,7 @@ var SessionStoreInternal = {
+           );
+           // We don't want to increment tIndex here.
+           continue;
+-        } else if (window.tabs[tIndex].groupId) {
++        } else if (window.tabs[tIndex].groupId && false) {
+           // Convert any open groups into saved groups.
+           let groupStateToSave = window.groups.find(
+             groupState => groupState.id == window.tabs[tIndex].groupId

From 600d1c209baaa93b26e3a276a6084d532b582a95 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 29 Nov 2025 00:56:44 +0100
Subject: [PATCH 137/162] feat: Let styled status panel ride the trains on
 macos, b=no-bug, c=no-component

---
 prefs/zen/theme.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/prefs/zen/theme.yaml b/prefs/zen/theme.yaml
index 4d1cf3180..d03379110 100644
--- a/prefs/zen/theme.yaml
+++ b/prefs/zen/theme.yaml
@@ -32,6 +32,10 @@
 - name: zen.theme.styled-status-panel
   value: '@IS_TWILIGHT@'
 
+- name: zen.theme.styled-status-panel
+  value: true
+  condition: 'defined(XP_MACOSX)'
+
 - name: zen.theme.hide-unified-extensions-button
   value: true
 

From 8e7a3a915707c57ff4ab8eda6a821c9a0e2c56c9 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 30 Nov 2025 14:36:06 +0100
Subject: [PATCH 138/162] chore: New Crowdin updates, p=#11462

---
 .../browser/preferences/zen-preferences.ftl   | 22 ++++-----
 locales/de/browser/browser/zen-folders.ftl    |  8 ++--
 locales/de/browser/browser/zen-general.ftl    | 46 +++++++++----------
 locales/de/browser/browser/zen-split-view.ftl | 12 ++---
 .../de/browser/browser/zen-vertical-tabs.ftl  | 16 +++----
 locales/de/browser/browser/zen-welcome.ftl    |  4 +-
 locales/de/browser/browser/zen-workspaces.ftl | 14 +++---
 7 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/locales/de/browser/browser/preferences/zen-preferences.ftl b/locales/de/browser/browser/preferences/zen-preferences.ftl
index 1af3340d9..b848cf544 100644
--- a/locales/de/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/de/browser/browser/preferences/zen-preferences.ftl
@@ -5,9 +5,9 @@
 pane-zen-looks-title = Aussehen
 category-zen-looks = 
     .tooltiptext = { pane-zen-looks-title }
-zen-warning-language = Das Ändern der Standardsprache könnte es Websites einfacher machen, Sie zu verfolgen.
+zen-warning-language = Das Ändern der Standardsprache könnte es Websites erleichtern, dich zu verfolgen.
 zen-vertical-tabs-layout-header = Browser-Layout
-zen-vertical-tabs-layout-description = Wählen Sie das Layout, das am besten zu Ihnen passt
+zen-vertical-tabs-layout-description = Wähle das Layout, das am besten zu dir passt
 zen-layout-single-toolbar = Einzelne Symbolleiste
 zen-layout-multiple-toolbar = Mehrere Symbolleisten
 zen-layout-collapsed-toolbar = Eingeklappte Symbolleiste
@@ -18,7 +18,7 @@ sync-engine-workspaces =
     .accesskey = W
 zen-glance-title = Schnellansicht
 zen-glance-header = Allgemeine Einstellungen für die Schnellansicht
-zen-glance-description = Erhalten Sie einen schnellen Überblick über Ihre Links, ohne sie in einem neuen Tab zu öffnen
+zen-glance-description = Verschaffe dir einen schnellen Überblick über deine Links, ohne sie in einem neuen Tab zu öffnen
 zen-glance-trigger-label = Auslösemethode
 zen-glance-enabled = 
     .label = Schnellansicht aktivieren
@@ -31,7 +31,7 @@ zen-glance-trigger-shift-click =
 zen-glance-trigger-meta-click = 
     .label = Meta (Befehlstaste) + Klick
 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-description = Zeige nur die Symbolleisten an, die du verwendest!
 zen-look-and-feel-compact-view-enabled = 
     .label = { -brand-short-name } Kompaktmodus aktivieren
 zen-look-and-feel-compact-view-top-toolbar = 
@@ -45,16 +45,16 @@ pane-settings-workspaces-title = Arbeitsbereiche
 zen-tabs-unloader-enabled = 
     .label = Tab-Entlader aktivieren
 zen-tabs-close-on-back-with-no-history = 
-    .label = Tab schließen und zum Besitzer-Tab (oder den zuletzt benutzten Tab) wechseln, wenn kein Tab-Verlauf vorhanden ist
+    .label = Tab schließen und zum Besitzer-Tab (oder dem zuletzt benutzten Tab) wechseln, wenn kein Tab-Verlauf vorhanden ist
 zen-tabs-cycle-by-attribute = 
     .label = Strg+Tab wechselt nur zwischen Essential- oder Arbeitsbereich-Tabs
 zen-tabs-cycle-ignore-pending-tabs = 
     .label = Ausstehende Tabs beim Wechseln mit Strg+Tab ignorieren
 zen-tabs-cycle-by-attribute-warning = Strg+Tab wechselt in der zuletzt verwendeten Reihenfolge, da diese Option aktiviert ist
 zen-look-and-feel-compact-toolbar-themed = 
-    .label = Theme Hintergrund für kompakte Symbolleiste verwenden
+    .label = Theme-Hintergrund für kompakte Symbolleiste verwenden
 zen-workspace-continue-where-left-off = 
-    .label = Dort fortfahren, wo Sie aufgehört haben
+    .label = Dort fortfahren, wo du aufgehört hast
 pane-zen-pinned-tab-manager-title = Angepinnte Tabs
 zen-pinned-tab-manager-header = Allgemeine Einstellungen für angepinnte Tabs
 zen-pinned-tab-manager-description = Zusätzliches Verhalten von angepinnten Tabs verwalten
@@ -82,7 +82,7 @@ zen-settings-workspaces-enabled =
     .label = Arbeitsbereiche aktivieren (Experimentell)
 zen-settings-workspaces-hide-default-container-indicator = 
     .label = Container-Indikator 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-unsaved = Nicht gespeichertes Tastenkürzel! Bitte speichere es, indem du nach der Eingabe die "Escape"-Taste drückst.
 zen-key-conflict = Konflikt mit { $group } -> { $shortcut }
 pane-zen-theme-title = Design-Einstellungen
 zen-vertical-tabs-title = Seitenleiste und Tab-Layout
@@ -138,13 +138,13 @@ zen-settings-workspaces-force-container-tabs-to-workspace =
     .label = Zum Arbeitsbereich wechseln, in dem Container als Standard gesetzt ist, wenn Container-Tabs geöffnet werden
 zen-theme-marketplace-link = Store besuchen
 zen-dark-theme-styles-header = Dunkles Design - Stile
-zen-dark-theme-styles-description = Passen Sie das dunkle Design nach Ihren Wünschen an
+zen-dark-theme-styles-description = Passe das dunkle Design nach deinen Wünschen an
 zen-dark-theme-styles-amoled = Nacht-Design
 zen-dark-theme-styles-default = Standard dunkles Design
 zen-dark-theme-styles-colorful = Farbenfrohes dunkles Design
 zen-compact-mode-styles-left = Tab-Leiste ausblenden
 zen-compact-mode-styles-top = Obere Leiste ausblenden
-zen-compact-mode-styles-both = Beide ausblenden
+zen-compact-mode-styles-both = Beides ausblenden
 zen-urlbar-title = Zen Adressleiste
 zen-urlbar-header = Allgemeine Einstellungen für die Adressleiste
 zen-urlbar-description = Passen Sie die Adressleiste nach Ihren Wünschen an
@@ -230,7 +230,7 @@ zen-key-exit-full-screen = Vollbild verlassen
 zen-ai-chatbot-sidebar-shortcut = KI-Chatbot-Seitenleiste umschalten
 zen-key-inspector-mac = Inspektor umschalten (Mac)
 zen-toggle-sidebar-shortcut = Firefox-Seitenleiste umschalten
-zen-toggle-pin-tab-shortcut = Angepinnter Tab umschalten
+zen-toggle-pin-tab-shortcut = Tab anheften/lösen
 zen-reader-mode-toggle-shortcut-other = Lesemodus umschalten
 zen-picture-in-picture-toggle-shortcut = Bild-im-Bild umschalten
 zen-nav-reload-shortcut-2 = Seite neu laden
diff --git a/locales/de/browser/browser/zen-folders.ftl b/locales/de/browser/browser/zen-folders.ftl
index 0c56c64cc..9a43b2384 100644
--- a/locales/de/browser/browser/zen-folders.ftl
+++ b/locales/de/browser/browser/zen-folders.ftl
@@ -13,13 +13,13 @@ zen-folders-new-subfolder =
 zen-folders-panel-delete-folder = 
     .label = Ordner löschen
 zen-folders-panel-convert-folder-to-space = 
-    .label = Ordner in Arbeitsbereich umwandeln
+    .label = In Arbeitsbereich umwandeln
 zen-folders-panel-change-folder-space = 
     .label = Arbeitsbereich wechseln...
 zen-folders-panel-change-icon-folder = 
-    .label = Symbol ändern
+    .label = Icon ändern
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Aktive Tabs in diesem Ordner entladen
+    .tooltiptext = Alle aktiven Tabs in diesem Ordner entladen
 zen-folders-unload-folder = 
     .label = Alle Tabs entladen
-zen-folders-search-no-results = Keine passenden Tabs gefunden
+zen-folders-search-no-results = Keine Tabs gefunden
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 744d889b3..16bf74017 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -2,42 +2,42 @@
 # 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-panel-ui-current-profile-text = Aktuelles Profil
-unified-extensions-description = Erweiterungen werden verwendet, um { -brand-short-name } zusätzliche Funktionen hinzuzufügen.
+zen-panel-ui-current-profile-text = Dein aktuelles Profil
+unified-extensions-description = Mit Erweiterungen kannst du { -brand-short-name } um zusätzliche Funktionen erweitern.
 tab-context-zen-reset-pinned-tab = 
     .label = Angehefteten Tab zurücksetzen
     .accesskey = R
 tab-context-zen-add-essential = 
-    .label = Add to Essentials
+    .label = Zu Essentials hinzufügen
     .accesskey = E
-tab-context-zen-add-essential-badge = { $num } / { $max } slots filled
+tab-context-zen-add-essential-badge = { $num } von { $max } Plätzen belegt
 tab-context-zen-remove-essential = 
     .label = Aus Essentials entfernen
     .accesskey = R
 tab-context-zen-replace-pinned-url-with-current = 
     .label = Angeheftete URL durch aktuelle ersetzen
     .accesskey = C
-zen-themes-corrupted = Deine { -brand-short-name } Mods-Datei ist beschädigt. Sie wurde auf das Standard-Design zurückgesetzt.
-zen-shortcuts-corrupted = Deine { -brand-short-name } Tastenkürzel-Datei ist beschädigt. Sie wurde auf die Standard-Tastenkürzel zurückgesetzt.
+zen-themes-corrupted = Deine { -brand-short-name } Mods-Datei ist beschädigt. Wir haben sie auf das Standard-Design zurückgesetzt.
+zen-shortcuts-corrupted = Deine { -brand-short-name } Tastenkürzel-Datei ist beschädigt. Wir haben sie auf die Standard-Tastenkürzel zurückgesetzt.
 # note: Do not translate the "<br/>" tags in the following string
 zen-new-urlbar-notification =
-    Die neue Adressleiste wurde aktiviert und macht neue Tab-Seiten überflüssig.<br/><br/>
-    Öffne einen neuen Tab, um die neue Adressleiste in Aktion zu sehen!
+    Die neue Adressleiste ist jetzt aktiv! Dadurch brauchst du keine neuen Tab-Seiten mehr.<br/><br/>
+    Öffne einfach einen neuen Tab, um die neue Adressleiste auszuprobieren!
 zen-disable = Deaktivieren
 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 = Aktuelle URL kopiert!
+zen-panel-ui-gradient-generator-custom-color = Eigene Farbe
+zen-panel-ui-gradient-generator-saved-message = Farbverlauf gespeichert!
+zen-copy-current-url-confirmation = URL kopiert!
 zen-general-cancel-label = 
     .label = Abbrechen
 zen-general-confirm = 
     .label = Bestätigen
-zen-pinned-tab-replaced = Die URL des angehefteten 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-pinned-tab-replaced = Die URL des angehefteten Tabs wurde aktualisiert!
+zen-tabs-renamed = Tab umbenannt!
+zen-background-tab-opened-toast = Neuer Tab im Hintergrund geöffnet!
+zen-workspace-renamed-toast = Arbeitsbereich umbenannt!
 zen-library-sidebar-workspaces = 
     .label = Arbeitsbereiche
 zen-library-sidebar-mods = 
@@ -86,25 +86,25 @@ zen-site-data-header-reader-mode =
 zen-site-data-header-screenshot = 
     .tooltiptext = Screenshot erstellen
 zen-site-data-header-bookmark = 
-    .tooltiptext = Diese Seite als Lesezeichen hinzufügen
+    .tooltiptext = Diese Seite als Lesezeichen speichern
 zen-urlbar-copy-url-button = 
     .tooltiptext = URL kopieren
 zen-site-data-setting-site-protection = Tracking-Schutz
 
 # Section: Feature callouts
 
-zen-site-data-panel-feature-callout-title = Ein neuer Ort für Add-ons, Berechtigungen und mehr
-zen-site-data-panel-feature-callout-subtitle = Klicke auf das Symbol, um Website-Einstellungen zu verwalten, Sicherheitsinformationen anzuzeigen, auf Erweiterungen zuzugreifen und häufige Aktionen auszuführen.
+zen-site-data-panel-feature-callout-title = Hier findest du Add-ons, Berechtigungen und mehr
+zen-site-data-panel-feature-callout-subtitle = Klicke auf das Symbol, um Website-Einstellungen anzupassen, Sicherheitsinfos anzuzeigen, auf Erweiterungen zuzugreifen und häufige Aktionen auszuführen.
 zen-open-link-in-glance = 
     .label = Link in Glance öffnen
     .accesskey = G
-zen-sidebar-notification-updated-heading = Update Complete!
+zen-sidebar-notification-updated-heading = Update abgeschlossen!
 
 # See ZenSidebarNotification.mjs to see how these would be used
 
-zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
+zen-sidebar-notification-updated-label = Was in { -brand-short-name } neu ist
 zen-sidebar-notification-updated-tooltip = 
-    .title = View Release Notes
-zen-sidebar-notification-restart-safe-mode-label = Something broke?
+    .title = Versionshinweise anzeigen
+zen-sidebar-notification-restart-safe-mode-label = Funktioniert etwas nicht?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
-    .title = Restart in Safe Mode
+    .title = Im abgesicherten Modus neu starten
diff --git a/locales/de/browser/browser/zen-split-view.ftl b/locales/de/browser/browser/zen-split-view.ftl
index 33422e9db..08599073c 100644
--- a/locales/de/browser/browser/zen-split-view.ftl
+++ b/locales/de/browser/browser/zen-split-view.ftl
@@ -5,16 +5,16 @@
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
-            [1] Tab aufteilen (mehrere ausgewählte Tabs erforderlich)
+            [1] Tab aufteilen (wähle mehrere Tabs aus)
            *[other] { $tabCount } Tabs aufteilen
         }
     .accesskey = S
 zen-split-link = 
-    .label = Link in neuem Tab aufteilen
+    .label = Link in geteiltem Tab öffnen
     .accesskey = S
 zen-split-view-modifier-header = Geteilte Ansicht
 zen-split-view-modifier-activate-reallocation = 
-    .label = Neuanordnung aktivieren
-zen-split-view-modifier-enabled-toast = Neuanordnung der geteilten Ansicht ist EIN.
-zen-split-view-modifier-enabled-toast-description = Ziehen Sie die Ansicht per Drag & Drop, um sie neu anzuordnen. Drücken Sie Esc zum Beenden.
-zen-split-view-modifier-disabled-toast = Neuanordnung der geteilten Ansicht ist AUS.
+    .label = Anordnung ändern
+zen-split-view-modifier-enabled-toast = Anordnung der geteilten Ansicht aktiv.
+zen-split-view-modifier-enabled-toast-description = Ziehe die Ansicht per Drag & Drop, um sie neu anzuordnen. Drücke Esc zum Beenden.
+zen-split-view-modifier-disabled-toast = Anordnung der geteilten Ansicht deaktiviert.
diff --git a/locales/de/browser/browser/zen-vertical-tabs.ftl b/locales/de/browser/browser/zen-vertical-tabs.ftl
index b8f7da8a5..7ee5e7127 100644
--- a/locales/de/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/de/browser/browser/zen-vertical-tabs.ftl
@@ -3,31 +3,31 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 zen-toolbar-context-tabs-right = 
-    .label = Tabs rechts
+    .label = Tabs rechts anzeigen
     .accesskey = R
 zen-toolbar-context-compact-mode = 
     .label = Kompaktmodus
 zen-toolbar-context-compact-mode-enable = 
-    .label = Kompaktmodus aktivieren
+    .label = Kompaktmodus einschalten
     .accesskey = D
 zen-toolbar-context-compact-mode-just-tabs = 
-    .label = Seitenleiste ausblenden
+    .label = Nur Seitenleiste ausblenden
 zen-toolbar-context-compact-mode-just-toolbar = 
-    .label = Symbolleiste ausblenden
+    .label = Nur Symbolleiste ausblenden
 zen-toolbar-context-compact-mode-hide-both = 
-    .label = Beide ausblenden
+    .label = Beides ausblenden
     .accesskey = H
 zen-toolbar-context-new-folder = 
     .label = Neuer Ordner
     .accesskey = N
 sidebar-zen-expand = 
-    .label = Seitenleiste erweitern
+    .label = Seitenleiste ausklappen
 sidebar-zen-create-new = 
     .label = Neu erstellen...
 tabbrowser-unload-tab-button = 
     .tooltiptext =
         { $tabCount ->
-            [one] Tab entladen und dorthin wechseln
+            [one] Tab entladen und öffnen
            *[other] { $tabCount } Tabs entladen und zum ersten wechseln
         }
 tabbrowser-reset-pin-button = 
@@ -36,4 +36,4 @@ tabbrowser-reset-pin-button =
             [one] Tab zurücksetzen und anheften
            *[other] { $tabCount } Tabs zurücksetzen und anheften
         }
-tab-reset-pin-label = Zurück zur angehefteten URL
+tab-reset-pin-label = Zur ursprünglichen URL zurückkehren
diff --git a/locales/de/browser/browser/zen-welcome.ftl b/locales/de/browser/browser/zen-welcome.ftl
index ddcd9d751..9ef0d9a60 100644
--- a/locales/de/browser/browser/zen-welcome.ftl
+++ b/locales/de/browser/browser/zen-welcome.ftl
@@ -5,8 +5,8 @@
 zen-welcome-title-line1 = Willkommen zu
 zen-welcome-title-line2 = einem ruhigeren Internet
 zen-welcome-import-title = Ein neuer Anfang, dieselben Lesezeichen
-zen-welcome-import-description-1 = Ihre Lesezeichen, Ihr Verlauf und Ihre Passwörter sind wie eine Spur durch das Internet – lassen Sie sie nicht zurück!
-zen-welcome-import-description-2 = Übertrage sie ganz einfach aus einem anderen Browser und mache genau dort weiter, wo du aufgehört hast.
+zen-welcome-import-description-1 = Deine Lesezeichen, dein Verlauf und deine Passwörter sind wie eine Spur durch das Internet – lass sie nicht zurück!
+zen-welcome-import-description-2 = Übertrage sie ganz einfach aus einem anderen Browser und mach genau dort weiter, wo du aufgehört hast..
 zen-welcome-import-button = Jetzt importieren
 zen-welcome-set-default-browser = { -brand-short-name } als Standardbrowser festlegen
 zen-welcome-dont-set-default-browser = { -brand-short-name } NICHT als Standardbrowser festlegen
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index fc0cac6b3..e3a6b4998 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -21,9 +21,9 @@ zen-workspaces-panel-context-default-profile =
 zen-workspaces-panel-unload = 
     .label = Arbeitsbereich entladen
 zen-workspaces-how-to-reorder-title = So ordnest du Arbeitsbereiche neu an
-zen-workspaces-how-to-reorder-desc = Ziehe die Arbeitsbereich-Symbole am unteren Rand der Seitenleiste, um sie neu anzuordnen
+zen-workspaces-how-to-reorder-desc = Zieh die Arbeitsbereich-Symbole am unteren Rand der Seitenleiste, um sie neu anzuordnen
 zen-workspaces-change-theme = 
-    .label = Design bearbeiten
+    .label = Design anpassen
 zen-workspaces-panel-context-open = 
     .label = Arbeitsbereich öffnen
     .accesskey = O
@@ -31,7 +31,7 @@ zen-workspaces-panel-context-edit =
     .label = Arbeitsbereich bearbeiten
     .accesskey = E
 context-zen-change-workspace-tab = 
-    .label = Tab(s) zu Arbeitsbereich verschieben
+    .label = Tabs zu Arbeitsbereich verschieben
     .accesskey = C
 zen-bookmark-edit-panel-workspace-selector = 
     .value = Arbeitsbereiche
@@ -46,20 +46,20 @@ zen-panel-ui-gradient-generator-algo-triadic =
     .label = Triadisch
 zen-panel-ui-gradient-generator-algo-floating = 
     .label = Fließend
-zen-panel-ui-gradient-click-to-add = Klicken Sie, um eine Farbe hinzuzufügen
+zen-panel-ui-gradient-click-to-add = Klick hier, um eine Farbe hinzuzufügen
 zen-workspace-creation-name = 
     .placeholder = Name des Arbeitsbereichs
 zen-workspaces-panel-context-reorder = 
     .label = Arbeitsbereiche neu anordnen
 zen-workspace-creation-profile = Profil
-    .tooltiptext = Profile werden verwendet, um Cookies und Website-Daten zwischen Arbeitsbereichen zu trennen.
+    .tooltiptext = Profile trennen Cookies und Website-Daten zwischen verschiedenen Arbeitsbereichen.
 zen-workspace-creation-header = Arbeitsbereich erstellen
 zen-workspace-creation-label = Arbeitsbereiche helfen dir, deine Tabs und Sitzungen zu organisieren.
 zen-workspaces-delete-workspace-title = Arbeitsbereich löschen?
-zen-workspaces-delete-workspace-body = Möchtest du { $name } wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.
+zen-workspaces-delete-workspace-body = Möchtest du { $name } wirklich löschen? Das lässt sich nicht rückgängig machen.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
-zen-workspaces-close-all-unpinned-tabs-toast = Tabs geschlossen! Nutze <span>{ $shortcut }</span>, um rückgängig zu machen.
+zen-workspaces-close-all-unpinned-tabs-toast = Tabs geschlossen! Nutze <span>{ $shortcut }</span>, um das rückgängig zu machen.
 zen-workspaces-close-all-unpinned-tabs-title = 
     .label = Aufräumen
     .tooltiptext = Alle nicht angehefteten Tabs schließen

From 2b0d509230497891e67924fbd895cf42a878ef65 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 30 Nov 2025 14:36:15 +0100
Subject: [PATCH 139/162] fix: Fixed windows titlebar not initializing
 correctly, b=closes #11479, closes #11475, closes #11470 and closes #11471,
 c=compact-mode

---
 src/firefox-patches/147_https3_fix.patch      |  19 --
 .../147_windows_border_fix_3.patch            |  33 +++
 .../147_windows_border_fix_4.patch            | 221 ++++++++++++++++++
 src/zen/compact-mode/ZenCompactMode.mjs       |  23 +-
 surfer.json                                   |   2 +-
 5 files changed, 263 insertions(+), 35 deletions(-)
 delete mode 100644 src/firefox-patches/147_https3_fix.patch
 create mode 100644 src/firefox-patches/147_windows_border_fix_3.patch
 create mode 100644 src/firefox-patches/147_windows_border_fix_4.patch

diff --git a/src/firefox-patches/147_https3_fix.patch b/src/firefox-patches/147_https3_fix.patch
deleted file mode 100644
index 3cad042c8..000000000
--- a/src/firefox-patches/147_https3_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
-index daf10b9adb4b6a3c376edc5b0d8586e97483626a..415f64dbb2da5ea6da42f1ce29d6dc09cf86f713 100644
---- a/netwerk/protocol/http/nsHttpTransaction.cpp
-+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
-@@ -1332,6 +1332,14 @@ void nsHttpTransaction::Close(nsresult reason) {
-     mDNSRequest = nullptr;
-   }
- 
-+  // If an HTTP/3 backup timer is active and this transaction ends in error,
-+  // treat it as NS_ERROR_NET_RESET so the transaction will retry once.
-+  // NOTE: This is a temporary workaround; the proper fix belongs in
-+  // the Happy Eyeballs project.
-+  if (NS_FAILED(reason) && mHttp3BackupTimerCreated && mHttp3BackupTimer) {
-+    reason = NS_ERROR_NET_RESET;
-+  }
-+
-   MaybeCancelFallbackTimer();
- 
-   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
diff --git a/src/firefox-patches/147_windows_border_fix_3.patch b/src/firefox-patches/147_windows_border_fix_3.patch
new file mode 100644
index 000000000..5b7d03a47
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_3.patch
@@ -0,0 +1,33 @@
+From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:06:26 +0000
+Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
+ non-collapsed titlebar. r=win-reviewers,gstoll
+
+This seems to actually go to the default DWM stuff and is the documented
+way of doing so:
+
+https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
+
+Differential Revision: https://phabricator.services.mozilla.com/D274413
+---
+ widget/windows/WindowsUIUtils.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index a5a6c893e7056..abaabfba69dfa 100644
+--- a/widget/windows/WindowsUIUtils.cpp
++++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+     return;
+   }
+-  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
++  if (aIsCollapsed) {
++    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
++  } else {
++    hr = titleBar->ResetToDefault();
++  }
+   if (FAILED(hr)) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+             ("Skipping SetIsTitlebarCollapsed() because "
diff --git a/src/firefox-patches/147_windows_border_fix_4.patch b/src/firefox-patches/147_windows_border_fix_4.patch
new file mode 100644
index 000000000..597ffa21e
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_4.patch
@@ -0,0 +1,221 @@
+From bb40796bb2ff8be97e2adcdad78d9b9ea1d3ea18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:27:41 +0000
+Subject: [PATCH] Bug 2002990 - Save some work on startup to associate a native
+ window with the app sdk. r=gstoll,win-reviewers
+
+We only need to grab its AppWindow for that to happen. Save some useless
+QI while at it.
+
+I'm pretty sure bug 2002986 would also help here but this seems worth
+doing regardless.
+
+Differential Revision: https://phabricator.services.mozilla.com/D274419
+---
+ widget/windows/WindowsUIUtils.cpp | 126 ++++++++++++++----------------
+ widget/windows/WindowsUIUtils.h   |   1 +
+ widget/windows/nsWindow.cpp       |   2 +-
+ 3 files changed, 62 insertions(+), 67 deletions(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index abaabfba69dfa..1ad39b98c20e0 100644
+--- a/widget/windows/WindowsUIUtils.cpp
++++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1211,7 +1211,35 @@ using GetWindowIdFromWindowType = HRESULT(STDAPICALLTYPE*)(
+ static GetWindowIdFromWindowType sGetWindowIdFromWindowProc = nullptr;
+ 
+ // Returns whether initialization succeeded
+-bool InitializeWindowsAppSDKStatics() {
++[[nodiscard]] static bool InitializeWindowsAppSDKStatics() {
++  MOZ_ASSERT(NS_IsMainThread());
++  // This function is needed to avoid drawing the titlebar buttons
++  // when the Windows mica backdrop is enabled. (bug 1934040)
++  // If it isn't possible for mica to be enabled, we don't need to do anything.
++  // The Windows App SDK that we use here doesn't support older versions of
++  // Windows 10 that Firefox does.
++  if (!widget::WinUtils::MicaAvailable()) {
++    MOZ_LOG(
++        gWindowsLog, LogLevel::Info,
++        ("Skipping SetIsTitlebarCollapsed() because mica is not available"));
++    return false;
++  }
++  // This pref is only false on certain test runs (most notably
++  // opt-talos-xperf), the Windows App SDK fails calling
++  // DCompositionCreateDevice3() with ERROR_ACCESS_DENIED, and the code assumes
++  // it is going to succeed so it proceeds to crash deferencing null.
++  //
++  // We're not exactly sure why this is happening right now, but I'm pretty sure
++  // it's specific to how we're running Firefox on those test runs, and
++  // I don't think any users will run into this. So those tests pass the
++  // --disable-windowsappsdk command line argument to avoid using
++  // the Windows App SDK.
++  if (!StaticPrefs::widget_windows_windowsappsdk_enabled()) {
++    MOZ_LOG(gWindowsLog, LogLevel::Info,
++            ("Skipping SetIsTitlebarCollapsed() because "
++             "widget.windows.windowsappsdk.enabled is false"));
++    return false;
++  }
+   if (!sGetWindowIdFromWindowProc) {
+     HMODULE frameworkUdkModule =
+         ::LoadLibraryW(L"Microsoft.Internal.FrameworkUdk.dll");
+@@ -1303,51 +1331,14 @@ bool InitializeWindowsAppSDKStatics() {
+   }
+   return true;
+ }
+-#endif
+ 
+-void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+-#ifndef __MINGW32__
+-  // Used to avoid synchronization for loading libraries below
+-  MOZ_ASSERT(NS_IsMainThread());
+-  // This function is needed to avoid drawing the titlebar buttons
+-  // when the Windows mica backdrop is enabled. (bug 1934040)
+-  // If it isn't possible for mica to be enabled, we don't need to do anything.
+-  // This also helps prevent problems because the Windows App SDK that we use
+-  // here doesn't support older versions of Windows 10 that Firefox does.
+-  if (!widget::WinUtils::MicaAvailable()) {
+-    MOZ_LOG(
+-        gWindowsLog, LogLevel::Info,
+-        ("Skipping SetIsTitlebarCollapsed() because mica is not available"));
+-    return;
+-  }
+-  // This pref is only false on certain test runs (most notably
+-  // opt-talos-xperf), the Windows App SDK fails calling
+-  // DCompositionCreateDevice3() with ERROR_ACCESS_DENIED, and the code assumes
+-  // it is going to succeed so it proceeds to crash deferencing null.
+-  //
+-  // We're not exactly sure why this is happening right now, but I'm pretty sure
+-  // it's specific to how we're running Firefox on those test runs, and
+-  // I don't think any users will run into this. So those tests pass the
+-  // --disable-windowsappsdk command line argument to avoid using
+-  // the Windows App SDK.
+-  if (!StaticPrefs::widget_windows_windowsappsdk_enabled()) {
+-    MOZ_LOG(gWindowsLog, LogLevel::Info,
+-            ("Skipping SetIsTitlebarCollapsed() because "
+-             "widget.windows.windowsappsdk.enabled is false"));
+-    return;
+-  }
++static RefPtr<winrt::Microsoft::UI::Windowing::IAppWindow>
++GetAppWindowForWindow(HWND aWnd) {
+   if (!InitializeWindowsAppSDKStatics()) {
+-    return;
++    return nullptr;
+   }
+-
+-  // The Microsoft documentation says that we should be checking
+-  // AppWindowTitleBar::IsCustomizationSupported() before calling methods
+-  // on the title bar. However, it also says that customization is fully
+-  // supported since Windows App SDK v1.2 on Windows 11, and Mica is only
+-  // available on Windows 11, so it should be safe to skip this check.
+-
+   // Retrieve the WindowId that corresponds to hWnd.
+-  struct winrt::Microsoft::UI::WindowId windowId;
++  struct winrt::Microsoft::UI::WindowId windowId{0};
+   HRESULT hr = sGetWindowIdFromWindowProc(aWnd, &windowId);
+   if (FAILED(hr) || windowId.value == 0) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+@@ -1355,25 +1346,40 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+              "GetWindowIdFromWindow failed, hr=0x%" PRIX32,
+              static_cast<uint32_t>(hr)));
+     MOZ_ASSERT_UNREACHABLE("GetWindowIdFromWindow failed");
+-    return;
++    return nullptr;
+   }
+ 
+   RefPtr<winrt::Microsoft::UI::Windowing::IAppWindow> appWindow;
+-  hr = (HRESULT)sAppWindowStatics->GetFromWindowId(windowId,
+-                                                   getter_AddRefs(appWindow));
+-  if (FAILED(hr) || !appWindow) {
+-    // Hedge our bets here and don't assert because it's possible this
+-    // is a weird sort of window or something.
++  sAppWindowStatics->GetFromWindowId(windowId, getter_AddRefs(appWindow));
++  return appWindow;
++}
++#endif
++
++void WindowsUIUtils::AssociateWithWinAppSDK(HWND aWnd) {
++#ifndef __MINGW32__
++  RefPtr win = GetAppWindowForWindow(aWnd);
++  (void)win;
++#endif
++}
++
++void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
++#ifndef __MINGW32__
++  // The Microsoft documentation says that we should be checking
++  // AppWindowTitleBar::IsCustomizationSupported() before calling methods
++  // on the title bar. However, it also says that customization is fully
++  // supported since Windows App SDK v1.2 on Windows 11, and Mica is only
++  // available on Windows 11, so it should be safe to skip this check.
++  RefPtr appWindow = GetAppWindowForWindow(aWnd);
++  if (!appWindow) {
+     MOZ_LOG(gWindowsLog, LogLevel::Warning,
+             ("Skipping SetIsTitlebarCollapsed() because "
+-             "IAppWindow could not be acquired from window id, hr=%" PRIX32,
+-             static_cast<uint32_t>(hr)));
++             "IAppWindow could not be acquired from window id"));
+     return;
+   }
+ 
+-  RefPtr<IInspectable> inspectableTitleBar;
+-  hr = appWindow->get_TitleBar(getter_AddRefs(inspectableTitleBar));
+-  if (FAILED(hr) || !inspectableTitleBar) {
++  RefPtr<winrt::Microsoft::UI::Windowing::IAppWindowTitleBar> titleBar;
++  HRESULT hr = appWindow->get_TitleBar(getter_AddRefs(titleBar));
++  if (FAILED(hr) || !titleBar) {
+     // Hedge our bets here and don't assert because it's possible this
+     // is a weird sort of window or something.
+     MOZ_LOG(gWindowsLog, LogLevel::Warning,
+@@ -1382,18 +1388,6 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+              static_cast<uint32_t>(hr)));
+     return;
+   }
+-  RefPtr<winrt::Microsoft::UI::Windowing::IAppWindowTitleBar> titleBar;
+-  hr = inspectableTitleBar->QueryInterface(
+-      __uuidof(winrt::Microsoft::UI::Windowing::IAppWindowTitleBar),
+-      (void**)getter_AddRefs(titleBar));
+-  if (FAILED(hr) || !titleBar) {
+-    MOZ_LOG(gWindowsLog, LogLevel::Error,
+-            ("Skipping SetIsTitlebarCollapsed() because "
+-             "IAppWindowTitleBar could not be acquired, hr=%" PRIX32,
+-             static_cast<uint32_t>(hr)));
+-    MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+-    return;
+-  }
+   if (aIsCollapsed) {
+     hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+   } else {
+@@ -1410,7 +1404,7 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+   if (aIsCollapsed) {
+     // PreferredHeightOption is only valid if ExtendsContentIntoTitleBar is true
+     RefPtr<winrt::Microsoft::UI::Windowing::IAppWindowTitleBar2> titleBar2;
+-    hr = inspectableTitleBar->QueryInterface(
++    hr = titleBar->QueryInterface(
+         __uuidof(winrt::Microsoft::UI::Windowing::IAppWindowTitleBar2),
+         (void**)getter_AddRefs(titleBar2));
+     if (FAILED(hr) || !titleBar2) {
+diff --git a/widget/windows/WindowsUIUtils.h b/widget/windows/WindowsUIUtils.h
+index 17a5aac583758..0abd4dfe9875a 100644
+--- a/widget/windows/WindowsUIUtils.h
++++ b/widget/windows/WindowsUIUtils.h
+@@ -59,6 +59,7 @@ class WindowsUIUtils final : public nsIWindowsUIUtils {
+   static bool ComputeOverlayScrollbars();
+   static double ComputeTextScaleFactor();
+   static bool ComputeTransparencyEffects();
++  static void AssociateWithWinAppSDK(HWND aWnd);
+   static void SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed);
+ 
+  protected:
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index 19f5980a106fb..a2a288e793046 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -1540,7 +1540,7 @@ bool nsWindow::AssociateWithNativeWindow() {
+     // This is important because the SDKs WNDPROC might handle messages like
+     // WM_NCCALCSIZE without calling into us, and that can cause sizing issues,
+     // see bug 1993474.
+-    WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
++    WindowsUIUtils::AssociateWithWinAppSDK(mWnd);
+   }
+ 
+   // Connect the this pointer to the native window handle.
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 72df3790f..65469e7b7 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -52,13 +52,9 @@ window.gZenCompactModeManager = {
     this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);
 
     this.addContextMenu();
-    this._resolvePreInit();
   },
 
-  async init() {
-    await this._preInitPromise;
-    delete this._resolvePreInit;
-    delete this._preInitPromise;
+  init() {
     this.addMouseActions();
 
     const tabIsRightObserver = this._updateSidebarIsOnRight.bind(this);
@@ -864,13 +860,10 @@ window.gZenCompactModeManager = {
   },
 };
 
-(gZenCompactModeManager._preInitPromise = new Promise((resolve) => {
-  gZenCompactModeManager._resolvePreInit = resolve;
-})),
-  document.addEventListener(
-    'MozBeforeInitialXULLayout',
-    () => {
-      gZenCompactModeManager.preInit();
-    },
-    { once: true }
-  );
+document.addEventListener(
+  'MozBeforeInitialXULLayout',
+  () => {
+    gZenCompactModeManager.preInit();
+  },
+  { once: true }
+);
diff --git a/surfer.json b/surfer.json
index fef136899..2b561311c 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.11b",
+        "displayVersion": "1.17.12b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From a1774ee4269f4b53cc584f1fa8fa89fa82b98aa2 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 30 Nov 2025 21:28:14 +0100
Subject: [PATCH 140/162] feat: Preload compact mode and other UI components,
 b=no-bug, c=common

---
 src/browser/base/content/zen-assets.inc.xhtml    | 3 ---
 src/browser/base/content/zen-preloaded.inc.xhtml | 2 --
 src/zen/common/ZenPreloadedScripts.js            | 5 +++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 2ab4e638e..47f083c49 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -43,9 +43,7 @@
 <script type="text/javascript" src="chrome://browser/content/ZenPreloadedScripts.js"></script>
 
 # Scripts used all over the browser
-<script type="module" src="chrome://browser/content/ZenUIManager.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenFolder.mjs"></script>
-<script type="module" src="chrome://browser/content/zen-components/ZenCompactMode.mjs"></script>
 
 <script type="module" src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs"></script>
@@ -58,4 +56,3 @@
 <script type="module" src="chrome://browser/content/zen-components/ZenFolders.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenEmojiPicker.mjs"></script>
-<script type="module" src="chrome://browser/content/zen-components/ZenMods.mjs"></script>
diff --git a/src/browser/base/content/zen-preloaded.inc.xhtml b/src/browser/base/content/zen-preloaded.inc.xhtml
index 6cd7ba1dc..ab5354092 100644
--- a/src/browser/base/content/zen-preloaded.inc.xhtml
+++ b/src/browser/base/content/zen-preloaded.inc.xhtml
@@ -8,9 +8,7 @@
 <script type="text/javascript" src="chrome://browser/content/zen-sets.js"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs"></script>
 
-<script type="module" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenHasPolyfill.mjs"></script>
-<script type="module" src="chrome://browser/content/zen-components/ZenSessionStore.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenWorkspaces.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenWorkspace.mjs"></script>
 <script type="module" src="chrome://browser/content/zen-components/ZenWorkspaceIcons.mjs"></script>
\ No newline at end of file
diff --git a/src/zen/common/ZenPreloadedScripts.js b/src/zen/common/ZenPreloadedScripts.js
index 6d7dd4a7f..c511febfc 100644
--- a/src/zen/common/ZenPreloadedScripts.js
+++ b/src/zen/common/ZenPreloadedScripts.js
@@ -6,4 +6,9 @@
 
 {
   ChromeUtils.importESModule("chrome://browser/content/ZenStartup.mjs", { global: "current" });
+  ChromeUtils.importESModule("chrome://browser/content/zen-components/ZenCompactMode.mjs", { global: "current" });
+  ChromeUtils.importESModule("chrome://browser/content/ZenUIManager.mjs", { global: "current" });
+  ChromeUtils.importESModule("chrome://browser/content/zen-components/ZenMods.mjs", { global: "current" });
+  ChromeUtils.importESModule("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs", { global: "current" });
+  ChromeUtils.importESModule("chrome://browser/content/zen-components/ZenSessionStore.mjs", { global: "current" });
 }

From 1cbed758a91be870eb95ca055ff276170fd5d47f Mon Sep 17 00:00:00 2001
From: mr-cheffy <91018726+mr-cheffy@users.noreply.github.com>
Date: Mon, 1 Dec 2025 02:56:27 +0000
Subject: [PATCH 141/162] docs: Update monthly issue metrics, b=(no bug),
 c={docs}

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

diff --git a/docs/issue-metrics/2025_2025-11-01..2025-11-30.md b/docs/issue-metrics/2025_2025-11-01..2025-11-30.md
new file mode 100644
index 000000000..2d06a58a3
--- /dev/null
+++ b/docs/issue-metrics/2025_2025-11-01..2025-11-30.md
@@ -0,0 +1,256 @@
+# Issue Metrics
+
+| Metric | Average | Median | 90th percentile |
+| --- | --- | --- | ---: |
+| Time to first response | 16:46:00 | 5:17:03 | 1 day, 12:16:08 |
+| Time to close | 1 day, 16:51:17 | 10:24:05 | 6 days, 16:29:29 |
+
+| Metric | Count |
+| --- | ---: |
+| Number of items that remain open | 117 |
+| Number of items closed | 121 |
+| Total number of items created | 238 |
+
+| Title | URL | Time to first response | Time to close |
+| --- | --- | --- | --- |
+| Middle Mouse Click to close a tab with tab peek not working | https://github.com/zen-browser/desktop/issues/11492 | None | None |
+| Accessing bookmarks in full screen mode on MacOS is awkward | https://github.com/zen-browser/desktop/issues/11491 | None | None |
+| Youtube player going off screen at the bottom on MacOS, making the media controls harder to access | https://github.com/zen-browser/desktop/issues/11489 | None | 1:12:11 |
+| browser.tabs.closeWindowWithLastTab closes the window even if you have tabs open in other workspaces | https://github.com/zen-browser/desktop/issues/11487 | None | None |
+| Deleting a workspace in one window leaves the others in a strange state | https://github.com/zen-browser/desktop/issues/11486 | None | None |
+| Creating a new workspace in one window breaks other windows | https://github.com/zen-browser/desktop/issues/11485 | None | None |
+| Compact mode unusable on non-primary windows | https://github.com/zen-browser/desktop/issues/11484 | 0:14:09 | None |
+| 1password keyboard shortcut (Cmd+.) no longer works when sidebar is collapsed | https://github.com/zen-browser/desktop/issues/11483 | None | None |
+| sidebar does not popup in compact mode once the window is snapped | https://github.com/zen-browser/desktop/issues/11482 | None | None |
+| Alt + number keys unexpectedly trigger Split View | https://github.com/zen-browser/desktop/issues/11481 | None | None |
+| UI bug: bookmark icons invisible/missing | https://github.com/zen-browser/desktop/issues/11480 | None | 0:11:24 |
+| Title Bar has a broken appearence and the Window Control buttons are in positions like on MacOS despite being on Windows | https://github.com/zen-browser/desktop/issues/11479 | 0:45:21 | 10:17:29 |
+| Theme does not update when switching spaces in an inactive window | https://github.com/zen-browser/desktop/issues/11477 | 0:22:04 | None |
+| Compact mode deactivate in Private Mode and can't be reactivate | https://github.com/zen-browser/desktop/issues/11475 | None | 22:01:31 |
+| Flawed Search Bar & Undifferentiated Essentials for Each Workspaces | https://github.com/zen-browser/desktop/issues/11474 | 20:29:53 | 20:29:53 |
+| Can't run Netflix ( Error code UI3012 ) | https://github.com/zen-browser/desktop/issues/11473 | 5:30:12 | 7:42:29 |
+| I lost connectivity at all after updating to version v1.17.11b | https://github.com/zen-browser/desktop/issues/11471 | 6:39:25 | 1 day, 0:59:28 |
+| Opening a private window occasionally breaks UI | https://github.com/zen-browser/desktop/issues/11470 | None | 1 day, 1:10:14 |
+| Cannot switch space with trackpad swipe gestures on macOS | https://github.com/zen-browser/desktop/issues/11469 | 3:51:59 | 1 day, 4:15:09 |
+| I cannot access Google's AI mode on Zen browser | https://github.com/zen-browser/desktop/issues/11468 | 2:05:10 | None |
+| ico loading problem for essentials when 'Open Previous WIndows and Tabs' is disabled | https://github.com/zen-browser/desktop/issues/11466 | None | 0:05:48 |
+| Session restoration mixing workspaces | https://github.com/zen-browser/desktop/issues/11465 | None | None |
+| Title: URL bar loses focus when switching keyboard layout on GNOME (Linux, Arch/Manjaro) | https://github.com/zen-browser/desktop/issues/11464 | None | 0:29:03 |
+| The splitscreen break the ui and ux of the browser | https://github.com/zen-browser/desktop/issues/11461 | 3:30:24 | None |
+| Sound not playing on any website execpt youtube | https://github.com/zen-browser/desktop/issues/11459 | 2:18:55 | None |
+| Using glance on essential tab creates duplicate of essential tab | https://github.com/zen-browser/desktop/issues/11457 | 4:22:37 | 4:22:36 |
+| Sidebar getting corrupted and crashing browser | https://github.com/zen-browser/desktop/issues/11455 | 18:13:54 | 1 day, 2:55:36 |
+| Double clicking the tabs list not opening a new tab on Windows (It does on Linux) | https://github.com/zen-browser/desktop/issues/11453 | 0:05:41 | 0:05:01 |
+| Compact Mode resets toolbar and sidebar visibility settings after restart | https://github.com/zen-browser/desktop/issues/11452 | 1:55:49 | None |
+| Bookmarks/History hidden behind side pane on new tab when compact mode used. | https://github.com/zen-browser/desktop/issues/11450 | 4:29:59 | None |
+| Pinned extensions keep disappearing from sidebar after closing and opening Zen | https://github.com/zen-browser/desktop/issues/11449 | 0:38:40 | None |
+| MacOS SidePanel Spaces Converge When Offline | https://github.com/zen-browser/desktop/issues/11448 | None | None |
+| Cursor and address bar disappear when switching keyboard layout on GNOME (Wayland) | https://github.com/zen-browser/desktop/issues/11445 | 1 day, 8:37:33 | None |
+| Telegram link | https://github.com/zen-browser/desktop/issues/11444 | 11:39:00 | 11:39:00 |
+| Unable to open extensions | https://github.com/zen-browser/desktop/issues/11443 | 3:25:58 | 13:29:15 |
+| Tab must be Unloaded before it can be Closed, via Cmd+W | https://github.com/zen-browser/desktop/issues/11442 | 2:10:53 | 2:10:53 |
+| Update to Firefox 145.0.2 has made Zen Browser unusable | https://github.com/zen-browser/desktop/issues/11441 | 2:21:19 | 18:05:42 |
+| MacOS Crash - enclosing crash log | https://github.com/zen-browser/desktop/issues/11439 | 23:30:54 | 1 day, 0:09:38 |
+| Using Ctrl for Glance create extra tabs | https://github.com/zen-browser/desktop/issues/11437 | None | 0:28:39 |
+| how to remove the white line? | https://github.com/zen-browser/desktop/issues/11436 | 2:58:39 | 10:37:48 |
+| New tab opens in essentials area | https://github.com/zen-browser/desktop/issues/11435 | 0:43:56 | 3:46:27 |
+| Bookmarks got multiplied in toolbar when opening a new window | https://github.com/zen-browser/desktop/issues/11434 | None | 10:05:27 |
+| moving profile directory makes it non-functional (has fix!) | https://github.com/zen-browser/desktop/issues/11432 | None | None |
+| Network login button renders beind viewport | https://github.com/zen-browser/desktop/issues/11430 | 2:18:48 | None |
+| tabs not going into respective workspaces after closing zen browser window | https://github.com/zen-browser/desktop/issues/11429 | 8:31:21 | None |
+| Download Animation Gone Since Upgrading To 1.17.9b | https://github.com/zen-browser/desktop/issues/11428 | 2:07:15 | 15:04:59 |
+| Startup option "Continue where you left off" and "Open previous windows and tabs" synchronization issues with windows, tabs and Spaces | https://github.com/zen-browser/desktop/issues/11427 | 15:38:00 | 16:06:49 |
+| Buggy CMD+Q behavior with tab glance | https://github.com/zen-browser/desktop/issues/11426 | None | None |
+| Extensions button doesnt exist | https://github.com/zen-browser/desktop/issues/11423 | 0:00:56 | 0:00:56 |
+| Usage Issues [Stuck Content, Ineffective Themes, and Glances] | https://github.com/zen-browser/desktop/issues/11421 | 1:36:19 | 1:37:09 |
+| Zen opens two windows on startup (second window shows only the home page with no restored tabs) | https://github.com/zen-browser/desktop/issues/11420 | 2:31:45 | None |
+| Pinned tabs revert to normal tabs after window restore, causing browser freeze on close | https://github.com/zen-browser/desktop/issues/11416 | 5:04:47 | 5 days, 4:53:53 |
+| Address bar gets cut off in a pop out window | https://github.com/zen-browser/desktop/issues/11415 | 11:53:51 | None |
+| Opening a tab in glance also opens a new window with the selected link. | https://github.com/zen-browser/desktop/issues/11414 | 9:45:31 | 13:23:52 |
+| glance creating new windows | https://github.com/zen-browser/desktop/issues/11413 | None | 1:41:08 |
+| Restoration of previous session is not working automatically but after Ctrl+Shift+t in windows | https://github.com/zen-browser/desktop/issues/11412 | None | None |
+| duplicate tab shortcut missing | https://github.com/zen-browser/desktop/issues/11411 | 1 day, 0:23:07 | None |
+| Zen 1.17.8b is really laggy in windowed mode (Arch Linux)  (not just the websites but buttons in the browser ui too) | https://github.com/zen-browser/desktop/issues/11410 | 0:52:24 | 10:41:30 |
+| Opening a glance in split view also opens the link in a new window when using "Shift" as modifier | https://github.com/zen-browser/desktop/issues/11409 | 12:21:00 | 1 day, 6:44:30 |
+| Browser broken after an update (pages are opened in a little stripe) | https://github.com/zen-browser/desktop/issues/11408 | 18:47:35 | 23:43:06 |
+| Workspaces are not synced across different devices on a single firefox account | https://github.com/zen-browser/desktop/issues/11407 | 4:33:42 | 3 days, 10:56:38 |
+| Youtube not loading ever | https://github.com/zen-browser/desktop/issues/11406 | 19:47:23 | None |
+| After collapsing sidebar, layout shifts from "Only Sidebar" to "Sidebar and Top Toolbar" | https://github.com/zen-browser/desktop/issues/11405 | 1 day, 13:18:36 | 1 day, 20:49:48 |
+| Open new window when already a window is open. | https://github.com/zen-browser/desktop/issues/11402 | None | None |
+| Tab unpinning causes Tab Stash to crash | https://github.com/zen-browser/desktop/issues/11398 | None | None |
+| Strange Pink Rendering Glitch | https://github.com/zen-browser/desktop/issues/11393 | None | None |
+| Gradient line below the toolbar | https://github.com/zen-browser/desktop/issues/11391 | 8:24:14 | 8:24:14 |
+| After 1.17.7b, zen browser is extremely slow | https://github.com/zen-browser/desktop/issues/11390 | 5:27:46 | None |
+| Zen forgets all tabs when the main browser is closed while a private browsing window is open | https://github.com/zen-browser/desktop/issues/11389 | 2:56:12 | 3:40:47 |
+| UI Issue | https://github.com/zen-browser/desktop/issues/11388 | 2:25:00 | 2:25:00 |
+| Glance Stutter on Windows 10 Specifically | https://github.com/zen-browser/desktop/issues/11387 | 2:31:16 | None |
+| прошу помочь решить данную проблему | https://github.com/zen-browser/desktop/issues/11386 | 6:34:42 | 6:34:42 |
+| The "Slow page warning" toast is just shown in compact mode | https://github.com/zen-browser/desktop/issues/11385 | None | None |
+| Zen browser opens a new instance for each tab or opens a tab inside of a tab | https://github.com/zen-browser/desktop/issues/11384 | 4:05:56 | 4:06:03 |
+| Issue with extensions HUD | https://github.com/zen-browser/desktop/issues/11383 | 0:49:47 | 3:01:53 |
+| about:support does not show version, build ID etc. | https://github.com/zen-browser/desktop/issues/11382 | 2:39:09 | 4:08:48 |
+| Sharing screen in google meet on macOS Sequoia 15.7.2 breaks browser | https://github.com/zen-browser/desktop/issues/11380 | None | None |
+| No deletion option for the folders | https://github.com/zen-browser/desktop/issues/11379 | 0:13:25 | None |
+| When debugging in the console, the SSE request does not return a value. | https://github.com/zen-browser/desktop/issues/11378 | None | None |
+| Bitwarden extension autofill login shortcut not auto-focusing input field when locked | https://github.com/zen-browser/desktop/issues/11377 | 1 day, 7:53:09 | None |
+| In Niri in Nixos, the theme changes to light | https://github.com/zen-browser/desktop/issues/11375 | 2 days, 17:42:19 | 4 days, 14:40:38 |
+| Cannot provide optional extension permissions | https://github.com/zen-browser/desktop/issues/11374 | 14:12:47 | None |
+| Double click on sidebar doesn't open a new tab | https://github.com/zen-browser/desktop/issues/11373 | None | 1:36:14 |
+| Zen fullscreen does not trigger KDE Plasma fullscreen state (bottom panel stays visible) | https://github.com/zen-browser/desktop/issues/11372 | None | None |
+| Gap above window when maximized on monitor | https://github.com/zen-browser/desktop/issues/11369 | 4:03:49 | 9:53:29 |
+| Rapid janky movement of sidebar when its width is set to certain sizes | https://github.com/zen-browser/desktop/issues/11368 | None | None |
+| Media control latency and timestamp inconsistencies on YT Music | https://github.com/zen-browser/desktop/issues/11367 | None | None |
+| extension toolbar gone / cant pin extensions to toolbar | https://github.com/zen-browser/desktop/issues/11366 | 3:05:26 | 3:05:26 |
+| Links using text fragments (#:~:text=..." do not work | https://github.com/zen-browser/desktop/issues/11365 | 16:32:29 | 1 day, 4:18:54 |
+| Passbolt Password Manager doesn't work properly | https://github.com/zen-browser/desktop/issues/11360 | None | None |
+| opening a new window doesn't bring in pinned tabs on first open, and then on second open not all of the pinned tabs are in their folders | https://github.com/zen-browser/desktop/issues/11359 | 8:59:41 | None |
+| Extensions box closed abruptely | https://github.com/zen-browser/desktop/issues/11358 | 2:10:35 | None |
+| No return sound from discord audio input check | https://github.com/zen-browser/desktop/issues/11356 | None | None |
+| Janky movement for favorites group when transitioning between first and last workspaces | https://github.com/zen-browser/desktop/issues/11355 | 10:30:48 | None |
+| Viewport is slimmed down far too much | https://github.com/zen-browser/desktop/issues/11352 | 7:07:05 | 21:48:04 |
+| Zen doesnt remember tabs when starting | https://github.com/zen-browser/desktop/issues/11350 | 5:29:24 | None |
+| Clear tabs sidebar button is not visible if there are no pinned tabs | https://github.com/zen-browser/desktop/issues/11349 | 0:42:08 | 23:37:58 |
+| ctrl+tab tab switcher (mission control tab view) not showing when holding down ctrl + tab when only essentials are open | https://github.com/zen-browser/desktop/issues/11348 | None | None |
+| Modules missing top-level preference defaults can break features for new users | https://github.com/zen-browser/desktop/issues/11346 | 1:16:02 | 1:16:02 |
+| 1.17.7b no longer allows hiding only the toolbar in Compact Mode | https://github.com/zen-browser/desktop/issues/11344 | 1:58:40 | 6:04:31 |
+| Browser extension icons not visible | https://github.com/zen-browser/desktop/issues/11341 | 3:00:42 | 9:19:38 |
+| Corner bleed bug | https://github.com/zen-browser/desktop/issues/11340 | 5:32:29 | 10 days, 4:54:09 |
+| Double click the side bar now can't open "new tab" | https://github.com/zen-browser/desktop/issues/11339 | None | 0:11:54 |
+| Sidebar blur (backdrop-filter) not applying in Compact Mode except in Settings Page | https://github.com/zen-browser/desktop/issues/11337 | 2:12:20 | 2:12:20 |
+| Extended URL bar in the sidebar only mode. | https://github.com/zen-browser/desktop/issues/11334 | 4:41:50 | None |
+| All Unloaded Tabs Closed after Every Update | https://github.com/zen-browser/desktop/issues/11330 | None | None |
+| Zen Browser: blank page when accessing app.datadoghq.eu | https://github.com/zen-browser/desktop/issues/11328 | 0:05:29 | 0:56:10 |
+| Double-clicking on sidebar no longer opens a new tab - 1.17.7b | https://github.com/zen-browser/desktop/issues/11327 | None | 0:37:46 |
+| Unintuitive drag-and-drop behavior when moving tabs into folders | https://github.com/zen-browser/desktop/issues/11326 | 0:37:20 | 1 day, 3:01:46 |
+| Moving the last tab from a window doesn't close it, even with `browser.tabs.closeWindowWithLastTab = true` | https://github.com/zen-browser/desktop/issues/11323 | 0:20:33 | None |
+| Error 2069 while watching DRM protected content | https://github.com/zen-browser/desktop/issues/11322 | 3:43:18 | None |
+| moving tabs among themselves breaks as the number u move them by increases | https://github.com/zen-browser/desktop/issues/11320 | 3 days, 0:34:57 | None |
+| draging the window by using the sidebar | https://github.com/zen-browser/desktop/issues/11319 | 1:05:02 | 1:05:02 |
+| Double-clicking on the sidebar no longer opens a new tab. | https://github.com/zen-browser/desktop/issues/11317 | 2:09:26 | 2:09:26 |
+| Pinned and essentials tabs automatically unloaded on startup after updating to 1.17.7b | https://github.com/zen-browser/desktop/issues/11315 | 4 days, 4:53:59 | 12 days, 9:07:43 |
+| Zen Browser opens two windows on startup after update to 1.17.7b | https://github.com/zen-browser/desktop/issues/11314 | 3 days, 5:12:02 | 8 days, 7:16:06 |
+| Extensions that add themselves into the URL bar are not hidden in single mode, resulting in too little space to reliably click on the URL. | https://github.com/zen-browser/desktop/issues/11313 | None | None |
+| container name is no longer visible in URL bar | https://github.com/zen-browser/desktop/issues/11312 | 3 days, 14:24:15 | None |
+| Compact Toolbar: | https://github.com/zen-browser/desktop/issues/11307 | 2 days, 9:21:05 | 2 days, 23:15:20 |
+| Cant install on linux (AUR) | https://github.com/zen-browser/desktop/issues/11306 | 2:13:01 | 5:09:46 |
+| Maximized Window Disregards System Work Area | https://github.com/zen-browser/desktop/issues/11304 | 5:14:50 | 13:10:35 |
+| CMD+TABbing away while picture-in-picture is open means PiP takes focus (does not happen in raw Firefox) | https://github.com/zen-browser/desktop/issues/11303 | None | None |
+| Split View Closing Shortcut Doesn't Work And Opens Weird CSS File | https://github.com/zen-browser/desktop/issues/11301 | 5 days, 21:24:35 | None |
+| Compact Mode: Top Toolbar not closing automatically after clicking away from Extensions | https://github.com/zen-browser/desktop/issues/11300 | None | None |
+| Window hidden while adjusting slider on theme | https://github.com/zen-browser/desktop/issues/11299 | None | None |
+| I found a very unfriendly experience | https://github.com/zen-browser/desktop/issues/11298 | 18:02:40 | 7 days, 19:19:59 |
+| Simple HTML dialog closes when I click the first text box within it | https://github.com/zen-browser/desktop/issues/11297 | None | None |
+| Paste and Go or Paste + Enter Key Overwriting tabs | https://github.com/zen-browser/desktop/issues/11294 | None | None |
+| Collapsed Toolbar: Ctrl+T Temporarily Expands Top Toolbar in Compact Mode | https://github.com/zen-browser/desktop/issues/11291 | None | None |
+| Extensions Window not opening after startup | https://github.com/zen-browser/desktop/issues/11290 | None | 1 day, 9:57:38 |
+| Opening new tab with middle click leaks data via unexpected search | https://github.com/zen-browser/desktop/issues/11289 | 1 day, 10:13:56 | 1 day, 10:13:56 |
+| When submitting bug reports, remove the requirement for confirming the issue can't be reproduced on Firefox. | https://github.com/zen-browser/desktop/issues/11287 | 3:58:51 | 17:59:36 |
+| Application Menu overflows out of screen | https://github.com/zen-browser/desktop/issues/11284 | None | 9 days, 17:48:08 |
+| Copy current URL with a keyboard shortcut missing in shortcut settings | https://github.com/zen-browser/desktop/issues/11281 | 0:04:41 | 6 days, 23:58:41 |
+| tel: links : incomplete functionality - do not copy the number to default tel link handling application | https://github.com/zen-browser/desktop/issues/11280 | None | None |
+| CORS Request Fails - Power Automate in Zen | https://github.com/zen-browser/desktop/issues/11279 | 6:14:35 | None |
+| Tabs and essentials easy to accidentally drag off | https://github.com/zen-browser/desktop/issues/11278 | 5:34:54 | None |
+| (Fixed - Client side) Minor visual clipping when scrolling with a hidden taskbar | https://github.com/zen-browser/desktop/issues/11276 | None | 0:01:03 |
+| Firefox's select link feature conflicted with Zen Glance | https://github.com/zen-browser/desktop/issues/11273 | None | 13 days, 12:00:56 |
+| Split screen gaps disappearing while in compact mode | https://github.com/zen-browser/desktop/issues/11269 | 3:31:14 | 6 days, 16:29:29 |
+| Change Tab(s) to Workspace does not respect profile/container. | https://github.com/zen-browser/desktop/issues/11268 | 1:59:44 | None |
+| Youtube Fullscreen Problem | https://github.com/zen-browser/desktop/issues/11265 | None | 5:09:01 |
+| Certificate error @ learn.microsoft.com (SEC_ERROR_INVALID_TIME) | https://github.com/zen-browser/desktop/issues/11260 | 2:18:34 | 1 day, 17:17:46 |
+| Extentions pin toolbar bug | https://github.com/zen-browser/desktop/issues/11257 | 1 day, 8:06:21 | None |
+| Links only open in the browser if the browser is already opening, otherwise links will just launch the browser | https://github.com/zen-browser/desktop/issues/11256 | 1 day, 22:41:45 | None |
+| Share menu opens again rather than closing when share button is pressed while share menu is open. | https://github.com/zen-browser/desktop/issues/11248 | None | None |
+| Browser layout setting selection has low contrast in dark mode | https://github.com/zen-browser/desktop/issues/11246 | None | None |
+| "Change Tab to Workspace" does not respect "Move the new tab button to the top" setting | https://github.com/zen-browser/desktop/issues/11245 | None | None |
+| Cmd+Shift+B on sidebar-only mode flashes bookmarks bar | https://github.com/zen-browser/desktop/issues/11244 | None | None |
+| Multiple windows reopen on launch despite disabling "Open previous windows and tabs" | https://github.com/zen-browser/desktop/issues/11243 | None | None |
+| Crunchyroll doesn't work on Zen Windows on latest version 1.7.6b (Error : SHAK-6007) | https://github.com/zen-browser/desktop/issues/11237 | 0:14:37 | 10:24:05 |
+| White space & transparency issues in spaces. | https://github.com/zen-browser/desktop/issues/11236 | None | None |
+| Folders briefly auto-open then close on launch | https://github.com/zen-browser/desktop/issues/11235 | None | None |
+| Phantom tabs present in detached Zen Window | https://github.com/zen-browser/desktop/issues/11234 | None | None |
+| Trying to open a tab to amazon.de will open to amazon.com | https://github.com/zen-browser/desktop/issues/11233 | 1:53:48 | None |
+| Glance icons grayed out | https://github.com/zen-browser/desktop/issues/11232 | None | None |
+| Most websites dont load past initial state | https://github.com/zen-browser/desktop/issues/11231 | None | 0:10:07 |
+| Keep crashing on Windows 11, it starts with the version 1.17.3b | https://github.com/zen-browser/desktop/issues/11230 | 5:57:35 | 2 days, 8:53:01 |
+| Zen Browser suggests to update despite having the latest version installed | https://github.com/zen-browser/desktop/issues/11228 | 0:20:38 | 2:38:54 |
+| Extensions menu not appearing in the upper right corner | https://github.com/zen-browser/desktop/issues/11227 | 23:02:30 | 0:54:37 |
+| Toolbar still visible after toggling Sidebar's width | https://github.com/zen-browser/desktop/issues/11225 | 8 days, 18:39:49 | 8 days, 19:59:54 |
+| Cannot install addons in compact mode | https://github.com/zen-browser/desktop/issues/11223 | None | 0:02:33 |
+| Slow performance when refreshing | https://github.com/zen-browser/desktop/issues/11222 | 13:44:26 | 13:44:26 |
+| When switching search engines in the address bar, the control center buttons will disappear. | https://github.com/zen-browser/desktop/issues/11221 | 7 days, 17:29:07 | 7 days, 17:29:07 |
+| Browser switches to another workspace upon clicking a pinned tab | https://github.com/zen-browser/desktop/issues/11220 | 5 days, 14:59:49 | 5 days, 19:54:54 |
+| DRM ISSUE (Crunchyroll, Netflix, Prime, and etc.) | https://github.com/zen-browser/desktop/issues/11218 | 6:12:26 | 6:51:11 |
+| "Replace pinned URL with current" stopped working | https://github.com/zen-browser/desktop/issues/11217 | None | 3:23:47 |
+| Zen high memory usage | https://github.com/zen-browser/desktop/issues/11216 | 4:09:50 | 4:09:50 |
+| Visual glitches, ghosting, and screen tearing on Linux for Zen browser versions above 1.15.5b-1 | https://github.com/zen-browser/desktop/issues/11214 | None | None |
+| Broken [browser&#124;chrome].tabs.query({}) making Tab Session Manager unusable | https://github.com/zen-browser/desktop/issues/11210 | None | None |
+| Click interactions not working on some sites | https://github.com/zen-browser/desktop/issues/11208 | None | 0:11:33 |
+| Tabs not closing properly while they are inside a folder. | https://github.com/zen-browser/desktop/issues/11207 | None | 3:59:22 |
+| Management of synced tabs is split between two "sidebars" | https://github.com/zen-browser/desktop/issues/11206 | None | None |
+| Tab saving broken | https://github.com/zen-browser/desktop/issues/11205 | None | None |
+| URL bar focused when starting zen browser with --new-window 'url' flag | https://github.com/zen-browser/desktop/issues/11204 | None | None |
+| Unable to connect to local network as of 1.17.5b | https://github.com/zen-browser/desktop/issues/11201 | 0:44:35 | None |
+| After wakeup Zen queries DNS for all tabs, even unloaded ones and stalls meanwhile | https://github.com/zen-browser/desktop/issues/11200 | None | None |
+| Dublicate entry in Default Apps in KDE Plasma Setting | https://github.com/zen-browser/desktop/issues/11198 | None | None |
+| Extension Menu's not working in the home page. | https://github.com/zen-browser/desktop/issues/11193 | 3:04:23 | None |
+| space is changed automatically when whatsapp & any other tab is in split view. | https://github.com/zen-browser/desktop/issues/11189 | None | None |
+| Opening links from external apps does not work as excepted if Zen is not already running | https://github.com/zen-browser/desktop/issues/11188 | 7:34:42 | 7:57:27 |
+| Top suggestion in location bar is unremovable search engine | https://github.com/zen-browser/desktop/issues/11187 | 8:08:43 | 5 days, 21:13:30 |
+| Extension installation prompt rendered outside of browser frame | https://github.com/zen-browser/desktop/issues/11186 | 9:29:30 | 23:50:25 |
+| Launching Zen with Reopen Previous Windows and Tabs opens outdated tab list | https://github.com/zen-browser/desktop/issues/11185 | None | None |
+| Websites just outright broken | https://github.com/zen-browser/desktop/issues/11183 | 6:08:20 | 17:11:50 |
+| New extensions button does not appear on blank tab | https://github.com/zen-browser/desktop/issues/11182 | 2 days, 8:40:31 | 10 days, 2:29:48 |
+| Prompted to install extension, install erroneously canceled | https://github.com/zen-browser/desktop/issues/11181 | None | None |
+| URL Bar history search only matches URL beginning | https://github.com/zen-browser/desktop/issues/11179 | 20:55:48 | 21:09:44 |
+| Missing Visual Indicators In "Privacy & Security" Settings | https://github.com/zen-browser/desktop/issues/11178 | 22:31:51 | 9 days, 11:01:53 |
+| Extension Install Menu Appears Off Screen | https://github.com/zen-browser/desktop/issues/11177 | None | 5:50:00 |
+| Split view bug if switching vertical to horizontal or otherwise | https://github.com/zen-browser/desktop/issues/11176 | None | None |
+| Bookmark sidebar does'nt close | https://github.com/zen-browser/desktop/issues/11174 | 0:03:15 | 0:28:44 |
+| Jupyterhub terminal didn't show correctly | https://github.com/zen-browser/desktop/issues/11173 | 1 day, 12:00:31 | None |
+| Split view container tabs have their highlight in the centre of the tab in compact mode. | https://github.com/zen-browser/desktop/issues/11172 | None | None |
+| no extension menu/button in the url bar | https://github.com/zen-browser/desktop/issues/11171 | 11:09:25 | 17:18:29 |
+| Double click to open new tab doesnt work | https://github.com/zen-browser/desktop/issues/11170 | 1 day, 9:51:08 | 3 days, 6:19:08 |
+| Sidebar not closing in compact mode frequently | https://github.com/zen-browser/desktop/issues/11168 | 17:06:30 | None |
+| HiDpi screen issue with Zen Browser | https://github.com/zen-browser/desktop/issues/11165 | None | None |
+| With compact mode enabled, this problem occurs when trying to move a tab from one window to another. | https://github.com/zen-browser/desktop/issues/11164 | None | None |
+| Microsoft Company Portal flags Zen as Firefox hence preventing it from installing on company managed devices | https://github.com/zen-browser/desktop/issues/11163 | 0:21:58 | None |
+| Brew Install Hash Mismatch on MacOS Silicon | https://github.com/zen-browser/desktop/issues/11162 | 3 days, 5:01:22 | 4 days, 5:17:58 |
+| Extensions that take over/replace passkeys does not work | https://github.com/zen-browser/desktop/issues/11161 | 20:42:26 | None |
+| [CRASH] Segmentation fault error on macOS M4 Pro | https://github.com/zen-browser/desktop/issues/11159 | None | None |
+| Upon browser close or restart, all pinned tabs and tabs from "essentials" are removed and closed. | https://github.com/zen-browser/desktop/issues/11157 | 6:21:54 | None |
+| Video Lag when Laptop Charger Connected or Disconnected | https://github.com/zen-browser/desktop/issues/11156 | 1:39:07 | None |
+| Multiple inconsistancies with private window theme | https://github.com/zen-browser/desktop/issues/11155 | None | None |
+| Website immediately switches to blank page | https://github.com/zen-browser/desktop/issues/11152 | 7:52:22 | None |
+| URL bar doesn't move back to the sidebar | https://github.com/zen-browser/desktop/issues/11150 | 0:01:40 | 0:04:56 |
+| New unified panel icon not showing in sidebar only mode | https://github.com/zen-browser/desktop/issues/11149 | 0:19:16 | 1 day, 3:04:30 |
+| Glance animation starts from wrong origin when triggered via right-click search | https://github.com/zen-browser/desktop/issues/11148 | 1:03:12 | 12 days, 22:48:29 |
+| Zen no longer shows the Profile icon associated with the current Workspace | https://github.com/zen-browser/desktop/issues/11146 | 0:10:36 | None |
+| Double-clicking on the toolbar should fill the screen. | https://github.com/zen-browser/desktop/issues/11145 | 1:08:26 | None |
+| Cannot move or drag browser window when tabs are on right | https://github.com/zen-browser/desktop/issues/11142 | None | None |
+| MediaSource.addSourceBuffer: Type not supported in MediaSource when playing MP3 (works in Chrome) | https://github.com/zen-browser/desktop/issues/11141 | 1:09:43 | 1:13:18 |
+| Cannot access https://zen-browser.app with Zen Browser but can with Firefox, Safari and Comet on macOS Tahoe | https://github.com/zen-browser/desktop/issues/11140 | 0:34:57 | None |
+| Extensions don't show up | https://github.com/zen-browser/desktop/issues/11137 | None | 0:01:49 |
+| Problem with the whole browser | https://github.com/zen-browser/desktop/issues/11136 | 6:34:23 | 9:22:27 |
+| Essential and Pinned don’t load after quitting with multiple windows (Ctrl+Shift+Q) on Windows | https://github.com/zen-browser/desktop/issues/11135 | None | None |
+| Firefox's grouped tabs do not collapse on toggle | https://github.com/zen-browser/desktop/issues/11134 | 7:02:37 | 7:02:37 |
+| Spotify is not working properly | https://github.com/zen-browser/desktop/issues/11133 | 9:28:56 | 11:23:38 |
+| Picture-in-Picture (PiP) Feature Does Not Appear | https://github.com/zen-browser/desktop/issues/11132 | 5:41:39 | 11:58:40 |
+| Video controls cut off in fullscreen mode, only when Zen itself is also fullscreen. | https://github.com/zen-browser/desktop/issues/11131 | None | 6:38:36 |
+| Glance closing animation replays when escape is spammed during closing | https://github.com/zen-browser/desktop/issues/11130 | 19:25:23 | 22:20:06 |
+| Little bit of url sticks out of top right or left side when using only sidebar style | https://github.com/zen-browser/desktop/issues/11126 | 1 day, 3:59:29 | None |
+| Empty space in the tabs if close a tab in unexpected way | https://github.com/zen-browser/desktop/issues/11125 | None | None |
+| Extensions icon dissapeared | https://github.com/zen-browser/desktop/issues/11121 | -1 day, 23:11:28 | 4:25:16 |
+| Unable to close hisory/ download/ bookmarks/ tags window without closing the whole application. [Linux] | https://github.com/zen-browser/desktop/issues/11119 | None | None |
+| Suddenly lost all of my essential tabs; Can't add container'd tabs as Essential tabs | https://github.com/zen-browser/desktop/issues/11118 | 3:07:03 | 3:07:03 |
+| Onboarding unskippable with a large number of search shortcuts | https://github.com/zen-browser/desktop/issues/11117 | 14:58:00 | None |
+| Newly created Workspaces are shown behind the active Workspace in existing windows | https://github.com/zen-browser/desktop/issues/11116 | None | None |
+| Apple websites' font spacing broken | https://github.com/zen-browser/desktop/issues/11115 | 6 days, 15:27:12 | None |
+| Allow pinned tabs to update their titles dynamically with the page, as normal | https://github.com/zen-browser/desktop/issues/11114 | 6:52:55 | None |
+| Copy Me That extension stopped working with latest update | https://github.com/zen-browser/desktop/issues/11111 | 0:12:46 | 4:14:11 |
+| Browser layout does not reset to previous state | https://github.com/zen-browser/desktop/issues/11109 | 5:17:03 | 5:17:03 |
+| On mac bookmarks menu is not appaering then hover coursor on the top edge like it works on windows. | https://github.com/zen-browser/desktop/issues/11108 | 6:13:53 | 6:14:03 |
+| Loading icon visible behind all favicons | https://github.com/zen-browser/desktop/issues/11107 | 3:39:00 | None |
+| Extensions that already exist cannot be pinned to the Toolbar | https://github.com/zen-browser/desktop/issues/11106 | 7:55:13 | 11:51:53 |
+| Sidebar URL is almost entirely overtaken by icons, seriously needs options to hide icons | https://github.com/zen-browser/desktop/issues/11105 | 12:24:07 | 23:18:25 |
+
+_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-11-01..2025-11-30`

From fa6bb8d27f10b363ae7002d39986e279a63c9854 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Wed, 3 Dec 2025 16:26:18 +0100
Subject: [PATCH 142/162] chore: Sync upstream Firefox to version 146.0,
 p=#11519

---
 README.md                                     |   2 +-
 build/firefox-cache/l10n-last-commit-hash     |   2 +-
 scripts/recalculate-patches.sh                |   5 +
 src/Cargo-lock.patch                          |   4 +-
 src/Cargo-toml.patch                          |   4 +-
 src/browser/actors/WebRTCParent-sys-mjs.patch |   2 +-
 .../app/macbuild/Contents/Info-plist-in.patch |  12 +-
 .../base/content/browser-addons-js.patch      |  10 +-
 .../browser-fullScreenAndPointerLock-js.patch |   4 +-
 .../base/content/browser-init-js.patch        |   2 +-
 src/browser/base/content/browser-js.patch     |  14 +-
 .../base/content/browser-sets-inc.patch       |   4 +-
 .../base/content/browser-sets-js.patch        |   4 +-
 .../content/main-popupset-inc-xhtml.patch     |   8 +-
 .../content/navigator-toolbox-inc-xhtml.patch |   2 +-
 .../base/content/nsContextMenu-sys-mjs.patch  |  19 +-
 .../components/BrowserGlue-sys-mjs.patch      |   2 +-
 .../content/aboutLogins-html.patch            |   2 +-
 .../content/components/login-list-css.patch   |   2 +-
 .../CustomizableUI-sys-mjs.patch              |  30 +-
 .../CustomizeMode-sys-mjs.patch               |   2 +-
 .../ToolbarContextMenu-sys-mjs.patch          |   7 +-
 .../places/PlacesUIUtils-sys-mjs.patch        |   2 +-
 .../components/preferences/jar-mn.patch       |   6 +-
 .../preferences/main-inc-xhtml.patch          |   2 +-
 .../components/preferences/main-js.patch      |   4 +-
 .../preferences/preferences-js.patch          |   6 +-
 .../preferences/preferences-xhtml.patch       |  10 +-
 .../preferences/sync-inc-xhtml.patch          |   2 +-
 .../search/SearchOneOffs-sys-mjs.patch        |   4 +-
 .../sessionstore/SessionStore-sys-mjs.patch   |  12 +-
 .../tabbrowser/TabUnloader-sys-mjs.patch      |   2 +-
 .../tabbrowser/content/drag-and-drop-js.patch | 128 +--
 .../tabbrowser/content/tab-js.patch           |  24 +-
 .../tabbrowser/content/tabbrowser-js.patch    |  98 +-
 .../tabbrowser/content/tabgroup-js.patch      |  26 +-
 .../tabbrowser/content/tabs-js.patch          |  40 +-
 .../urlbar/UrlbarController-sys-mjs.patch     |   6 +-
 .../urlbar/UrlbarInput-sys-mjs.patch          |  64 +-
 .../urlbar/UrlbarPrefs-sys-mjs.patch          |   4 +-
 .../urlbar/UrlbarProviderPlaces-sys-mjs.patch |   8 +-
 .../UrlbarProvidersManager-sys-mjs.patch      |   4 +-
 .../urlbar/UrlbarResult-sys-mjs.patch         |   4 +-
 .../urlbar/UrlbarUtils-sys-mjs.patch          |   8 +-
 .../urlbar/UrlbarValueFormatter-sys-mjs.patch |  26 +-
 .../urlbar/UrlbarView-sys-mjs.patch           |   6 +-
 .../newtab/lib/ActivityStream-sys-mjs.patch   |   4 +-
 .../installer/package-manifest-in.patch       |   4 +-
 .../windows/nsis/defines-nsi-in.patch         |   4 +-
 .../windows/nsis/installer-nsi.patch          |   6 +-
 .../windows/nsis/uninstaller-nsi.patch        |   4 +-
 .../modules/URILoadingHelper-sys-mjs.patch    |   8 +-
 src/browser/themes/linux/browser-css.patch    |   2 +-
 src/browser/themes/osx/browser-css.patch      |   4 +-
 .../themes/shared/browser-shared-css.patch    |   4 +-
 .../identity-block/identity-block-css.patch   |   2 +-
 src/browser/themes/shared/jar-inc-mn.patch    |   4 +-
 .../shared/tabbrowser/content-area-css.patch  |   4 +-
 .../shared/tabbrowser/ctrlTab-css.patch       |   4 +-
 .../themes/shared/tabbrowser/tabs-css.patch   |  32 +-
 .../themes/shared/urlbar-searchbar-css.patch  |   2 +-
 .../themes/shared/urlbarView-css.patch        |   2 +-
 src/browser/themes/windows/browser-css.patch  |   6 +-
 .../actors/animation-type-longhand-js.patch   |   2 +-
 .../startup/DevToolsStartup-sys-mjs.patch     |   4 +-
 src/docshell/base/nsAboutRedirector-cpp.patch |   4 +-
 src/dom/base/Document-cpp.patch               |   6 +-
 src/dom/base/use_counter_metrics-yaml.patch   |   6 +-
 .../mediacontrol/MediaStatusManager-cpp.patch |   2 +-
 .../mediaelement/HTMLMediaElement-cpp.patch   |   6 +-
 .../147_windows_border_fix_1.patch            |  90 --
 .../147_windows_border_fix_2.patch            |  57 --
 .../147_windows_border_fix_3.patch            |  33 -
 .../147_windows_border_fix_4.patch            | 221 -----
 .../no_liquid_glass_icon.patch                |  13 +
 src/layout/generic/nsIFrame-cpp.patch         |   4 +-
 src/layout/style/nsStyleSheetService-h.patch  |   4 +-
 src/layout/style/nsStyleStruct-cpp.patch      |   6 +-
 src/layout/style/nsStyleStruct-h.patch        |   4 +-
 .../style/test/ListCSSProperties-cpp.patch    |   2 +-
 .../libpref/init/StaticPrefList-yaml.patch    |   4 +-
 .../style/gecko/media_features-rs.patch       |   8 +-
 .../style/queries/feature_expression-rs.patch |  10 +-
 src/testing/mochitest/browser-test-js.patch   |   6 +-
 .../PictureInPictureChild-sys-mjs.patch       |   2 +-
 .../PictureInPicture-sys-mjs.patch            |   2 +-
 .../widgets/browser-custom-element-mjs.patch  |   4 +-
 src/toolkit/content/widgets/infobar-css.patch |   2 +-
 src/toolkit/content/widgets/panel-js.patch    |   6 +-
 src/toolkit/content/widgets/tabbox-js.patch   |  12 +-
 .../LightweightThemeConsumer-sys-mjs.patch    |  16 +-
 src/toolkit/modules/moz-build.patch           |   4 +-
 src/toolkit/moz-configure.patch               |   4 +-
 .../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  |   2 +-
 .../shared/pictureinpicture/player-css.patch  |   2 +-
 src/widget/gtk/nsAppShell-cpp.patch           |   4 +-
 src/xpfe/appshell/AppWindow-cpp.patch         |   6 +-
 src/zen/@types/index.d.ts                     |   3 +
 src/zen/@types/lib.gecko.darwin.d.ts          |   5 +-
 src/zen/@types/lib.gecko.dom.d.ts             | 911 ++++++++++++++++--
 src/zen/@types/lib.gecko.glean.d.ts           | 521 +++++++---
 src/zen/@types/lib.gecko.modules.d.ts         |  20 +-
 src/zen/@types/lib.gecko.nsresult.d.ts        |  14 +
 src/zen/@types/lib.gecko.tweaks.d.ts          |  13 +-
 src/zen/@types/lib.gecko.xpcom.d.ts           | 202 ++--
 src/zen/mods/nsZenModsBackend.cpp             |   5 +-
 src/zen/mods/nsZenModsBackend.h               |   2 +-
 .../toolkit/common/cocoa/ZenShareInternal.mm  |   1 -
 .../common/windows/ZenShareInternal.cpp       |   1 -
 src/zen/urlbar/ZenUBActionsProvider.sys.mjs   |   4 +-
 surfer.json                                   |   4 +-
 115 files changed, 1880 insertions(+), 1139 deletions(-)
 delete mode 100644 src/firefox-patches/147_windows_border_fix_1.patch
 delete mode 100644 src/firefox-patches/147_windows_border_fix_2.patch
 delete mode 100644 src/firefox-patches/147_windows_border_fix_3.patch
 delete mode 100644 src/firefox-patches/147_windows_border_fix_4.patch
 create mode 100644 src/firefox-patches/no_liquid_glass_icon.patch

diff --git a/README.md b/README.md
index f59803ce6..6609e9fbe 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 `145.0.2`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 145.0.2`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 146.0`!
 
 ### Contributing
 
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index 46bf23512..b4368f57d 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-37df51b9bc9a584158ac1b42dc2da8c5e49fac83
\ No newline at end of file
+acd4663cd1530303fcca85b420a78f4686c4628b
\ No newline at end of file
diff --git a/scripts/recalculate-patches.sh b/scripts/recalculate-patches.sh
index 05d10f361..fb846e20f 100644
--- a/scripts/recalculate-patches.sh
+++ b/scripts/recalculate-patches.sh
@@ -3,6 +3,11 @@
 # 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/.
 
+set -e
+
+# FIrst check if importing the patches succeeds
+npm run import
+
 IGNORE_FILES=(
   "shared.nsh"
   "ignorePrefs.json"
diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch
index 9d6b283dd..6ecc1e0ff 100644
--- a/src/Cargo-lock.patch
+++ b/src/Cargo-lock.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 4386724a82baa72678b7228ef3af9fabc2da318e..01f7ac42ff96f8f96984537f19bde4bbc8cd8d72 100644
+index 6f6632e9747e281aac3ea177225c03b73f25456e..06756e08041835c203490057855d537118647cd0 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -4167,8 +4167,6 @@ dependencies = [
+@@ -4171,8 +4171,6 @@ dependencies = [
  [[package]]
  name = "mime_guess"
  version = "2.0.4"
diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch
index 81b7afcbe..e362b5478 100644
--- a/src/Cargo-toml.patch
+++ b/src/Cargo-toml.patch
@@ -1,8 +1,8 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 772a74e7439d87e9c5486abcf003617240190710..522b5459b30b943832369ff7a73755ad4c7d8140 100644
+index e2846a08008684f18799d75e5c28fd244c10361a..ba72071baef49ed494f78d1cc6752b53d1841f46 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -227,6 +227,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
+@@ -232,6 +232,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 7a99c8301..200262649 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 4ff6ae4d6f272936f0aa1c80a488df16159b42f2..85e4d7bf500603fcd5724658e96c7fd0a04432d3 100644
+index a9612920f86ef5f37328497bf62255497e96b02d..a5643cd7e9c7a71da391408c14e00185b7db3f24 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/app/macbuild/Contents/Info-plist-in.patch b/src/browser/app/macbuild/Contents/Info-plist-in.patch
index c6684c4ce..3fa8021f7 100644
--- a/src/browser/app/macbuild/Contents/Info-plist-in.patch
+++ b/src/browser/app/macbuild/Contents/Info-plist-in.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
-index ea28831b90662b12bdcb137c35b6bb83626c77e7..d28f4eca976ad9de12b03d995d2363e643224421 100644
+index 0c4fb837a24490c66b284abf2bd9299c2e021de0..ea28831b90662b12bdcb137c35b6bb83626c77e7 100644
 --- a/browser/app/macbuild/Contents/Info.plist.in
 +++ b/browser/app/macbuild/Contents/Info.plist.in
-@@ -191,7 +191,7 @@
+@@ -190,8 +190,6 @@
+ 	<string>@MAC_APP_NAME@ @APP_VERSION@</string>
  	<key>CFBundleIconFile</key>
  	<string>firefox.icns</string>
+-	<key>CFBundleIconName</key>
+-	<string>AppIcon</string>
  	<key>CFBundleIdentifier</key>
--	<string>@MOZ_MACBUNDLE_ID@</string>
-+	<string>app.zen-browser.zen</string>
+ 	<string>@MOZ_MACBUNDLE_ID@</string>
  	<key>CFBundleInfoDictionaryVersion</key>
- 	<string>6.0</string>
- 	<key>CFBundleName</key>
diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch
index acb98ccc7..63afb40df 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 f33a300eb0eed74e286da24919ad3e8505f632c3..9f400e887424693d0ecceb9db79fccf2bd5a757d 100644
+index fadcbfca95ee28140579430c0371baad0e2f216a..7454b801b4ad892d6ad122277eb7c7736e976f9f 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
 @@ -1069,7 +1069,7 @@ var gXPInstallObserver = {
@@ -38,7 +38,7 @@ index f33a300eb0eed74e286da24919ad3e8505f632c3..9f400e887424693d0ecceb9db79fccf2
      }
  
      return anchorID;
-@@ -2646,11 +2646,7 @@ var gUnifiedExtensions = {
+@@ -2657,11 +2657,7 @@ var gUnifiedExtensions = {
      // Lazy load the unified-extensions-panel panel the first time we need to
      // display it.
      if (!this._panel) {
@@ -51,7 +51,7 @@ index f33a300eb0eed74e286da24919ad3e8505f632c3..9f400e887424693d0ecceb9db79fccf2
        let customizationArea = this._panel.querySelector(
          "#unified-extensions-area"
        );
-@@ -2703,6 +2699,7 @@ var gUnifiedExtensions = {
+@@ -2714,6 +2710,7 @@ var gUnifiedExtensions = {
          // and no alternative content is available for display in the panel.
          const policies = this.getActivePolicies();
          if (
@@ -59,7 +59,7 @@ index f33a300eb0eed74e286da24919ad3e8505f632c3..9f400e887424693d0ecceb9db79fccf2
            policies.length &&
            !this.hasExtensionsInPanel(policies) &&
            !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
-@@ -2743,7 +2740,7 @@ var gUnifiedExtensions = {
+@@ -2754,7 +2751,7 @@ var gUnifiedExtensions = {
          this.recordButtonTelemetry(reason || "extensions_panel_showing");
          this.ensureButtonShownBeforeAttachingPanel(panel);
          PanelMultiView.openPopup(panel, this._button, {
@@ -68,7 +68,7 @@ index f33a300eb0eed74e286da24919ad3e8505f632c3..9f400e887424693d0ecceb9db79fccf2
            triggerEvent: aEvent,
          });
        }
-@@ -2930,18 +2927,20 @@ var gUnifiedExtensions = {
+@@ -2941,18 +2938,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  
diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
index ce5b0041f..0a56038db 100644
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
-index bef746dc594ad974c91075cf3657c199f8f8830f..bb671341b6715c42df76f7298ba55e1fac73f33b 100644
+index f459f3ca4048c29a32832b46ba87de8552a0ab8a..d317676e6d12d756ddf5dfbffe73050de07c2375 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -424,10 +424,10 @@ var FullScreen = {
+@@ -423,10 +423,10 @@ var FullScreen = {
      gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
  
      let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch
index b8b27c308..14a2b2e88 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..3cebc9bb057f51cea639130fecd7576e1c9db79c 100644
+index 02f601d859ea32557af572d2499ad8be75b684b5..b1a6f66a74f75150d7e2fbc50528965bb16cb4d9 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
 @@ -198,6 +198,7 @@ var gBrowserInit = {
diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index 4165d22e5..3c0fb48ec 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 b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd61ee1828 100644
+index 15ef352c147eff781d34a3e5fa02fa791bdd6188..b0784e817ad25c7a4983e9f1cb08b293de15a99d 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 b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -822,7 +823,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
+@@ -821,7 +822,12 @@ function UpdateBackForwardCommands(aWebNavigation) {
  
    var backDisabled = backCommand.hasAttribute("disabled");
    var forwardDisabled = forwardCommand.hasAttribute("disabled");
@@ -24,7 +24,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd
      if (backDisabled) {
        backCommand.removeAttribute("disabled");
      } else {
-@@ -2298,6 +2304,8 @@ var XULBrowserWindow = {
+@@ -2297,6 +2303,8 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
@@ -33,7 +33,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -3809,7 +3817,7 @@ function warnAboutClosingWindow() {
+@@ -3808,7 +3816,7 @@ function warnAboutClosingWindow() {
  
    if (!isPBWindow && !toolbar.visible) {
      return gBrowser.warnAboutClosingTabs(
@@ -42,7 +42,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd
        gBrowser.closingTabsEnum.ALL
      );
    }
-@@ -3849,7 +3857,7 @@ function warnAboutClosingWindow() {
+@@ -3848,7 +3856,7 @@ function warnAboutClosingWindow() {
      return (
        isPBWindow ||
        gBrowser.warnAboutClosingTabs(
@@ -51,7 +51,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd
          gBrowser.closingTabsEnum.ALL
        )
      );
-@@ -3874,7 +3882,7 @@ function warnAboutClosingWindow() {
+@@ -3873,7 +3881,7 @@ function warnAboutClosingWindow() {
      AppConstants.platform != "macosx" ||
      isPBWindow ||
      gBrowser.warnAboutClosingTabs(
@@ -60,7 +60,7 @@ index b4b79e7fb3228ba91bd8afa08659be0d88883725..b4801e2a3076139622d58f81943e61cd
        gBrowser.closingTabsEnum.ALL
      )
    );
-@@ -4796,6 +4804,9 @@ var ConfirmationHint = {
+@@ -4795,6 +4803,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-sets-inc.patch b/src/browser/base/content/browser-sets-inc.patch
index 837f55c92..3ed82c454 100644
--- a/src/browser/base/content/browser-sets-inc.patch
+++ b/src/browser/base/content/browser-sets-inc.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
-index 2e7654036647796715aec392f9e714e7256c9864..0b3b76ab479bb6ae5439dd424b69f641d3b86c28 100644
+index 8d97b6e669954a09afe6a46d1c79652264494e92..86877b983207c5f9852c9192ee0257a909c5ea7a 100644
 --- a/browser/base/content/browser-sets.inc
 +++ b/browser/base/content/browser-sets.inc
-@@ -405,3 +405,4 @@
+@@ -406,3 +406,4 @@
           internal="true"/>
  #endif
    </keyset>
diff --git a/src/browser/base/content/browser-sets-js.patch b/src/browser/base/content/browser-sets-js.patch
index b2968174e..dc7ab61db 100644
--- a/src/browser/base/content/browser-sets-js.patch
+++ b/src/browser/base/content/browser-sets-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
-index 9cff49a7b86f7697f70c4ef61d3c3561f058dc45..15ac9a8a79e8642b3add2f6df63ed32eb0c8bcb9 100644
+index 0bb581aa34ddeef1e3eb85b0fadd41a539b4b9d6..cbe2df8b1775cb8194007ee995fd91769618b48d 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -253,7 +253,7 @@ document.addEventListener(
+@@ -254,7 +254,7 @@ document.addEventListener(
          }
        });
  
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index 9adb099f4..609164180 100644
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 78030413c4125362e056a8ec249b597292be050b..90fc935e105d594cd4cc925c70c29b18b8dffccd 100644
+index e688ba37c40ea602a32a84af6c1497d884ddc27b..ad8515eae1d4e697b9329d9d5babfd59679c9288 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -208,6 +208,10 @@
+@@ -216,6 +216,10 @@
             hidden="true"
             tabspecific="true"
             aria-labelledby="editBookmarkPanelTitle">
@@ -13,7 +13,7 @@ index 78030413c4125362e056a8ec249b597292be050b..90fc935e105d594cd4cc925c70c29b18
        <box class="panel-header">
          <html:h1>
            <html:span id="editBookmarkPanelTitle"/>
-@@ -233,6 +237,7 @@
+@@ -241,6 +245,7 @@
                    class="footer-button"/>
          </html:moz-button-group>
        </vbox>
@@ -21,7 +21,7 @@ index 78030413c4125362e056a8ec249b597292be050b..90fc935e105d594cd4cc925c70c29b18
      </panel>
    </html:template>
  
-@@ -628,6 +633,8 @@
+@@ -636,6 +641,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 98bcbfa15..88a40f89f 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 328a9b052e2f758f48df1caa8165347ed0301b33..1c111abe148f2e16afa6b5f33eb118b7c02dfd69 100644
+index 40dddda5a6191c2ac012767ca55ed5fa35c03a6b..2e96a7ca233529ee2b570f94154008be5b0088e3 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 b872d46b7..6b8e980b4 100644
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,13 +1,14 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 259b440375c7e84d373a134fea20cdbc1c1bae4b..c4a251f0169d22186c2766992ab40366d53582f1 100644
+index b77c12da637ba31aca6e8100187d0ac14db33298..4fbec0dda932bcaa77ce714826ac8ab20b9e8e63 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1103,6 +1103,8 @@ export class nsContextMenu {
-         !this.onMozExtLink &&
-         !this.isSecureAboutPage()
-     );
-+    this.showItem("context-zenSplitLink", this.onLink && !this.onMailtoLink && !this.onTelLink);
-+    this.showItem("context-zenOpenLinkInGlance", this.onLink && !this.onMailtoLink && !this.onTelLink);
+@@ -376,6 +376,9 @@ export class nsContextMenu {
+     this.initPDFItems();
+     this.initTextFragmentItems();
  
-     let canNotStrip =
-       lazy.STRIP_ON_SHARE_CAN_DISABLE && !this.#canStripParams();
++    this.showItem("context-zenSplitLink", this.onLink && !this.onMailtoLink && !this.onTelLink);
++    this.showItem("context-zenOpenLinkInGlance", this.onLink && !this.onMailtoLink && !this.onTelLink); 
++
+     this.showHideSeparators(aXulMenu);
+     if (!aXulMenu.showHideSeparators) {
+       // Set the showHideSeparators function on the menu itself so that
diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch
index 1b6d97eba..baedfac8e 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 f1cabb13ca4f86a2bafc1d93b7f882218a108eb2..2389b1addf24d17bd41fca65cfeb6f944479076d 100644
+index 5dcbb1705625746afd7c57b7a6044c4fa2f00afd..c0872057ec65fe8ebdb2f81e47198dec5d6f0faf 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";
diff --git a/src/browser/components/aboutlogins/content/aboutLogins-html.patch b/src/browser/components/aboutlogins/content/aboutLogins-html.patch
index eaa43f4ea..e0b9b140d 100644
--- a/src/browser/components/aboutlogins/content/aboutLogins-html.patch
+++ b/src/browser/components/aboutlogins/content/aboutLogins-html.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
-index a2b9a3c3bd60b7c679fc4babf2cc085f79ba84f5..3acd8da43d31cf8e9eb25d74421f522fdbd41094 100644
+index ca69defe40c57704ab6ec331ce11c95a98b03e8f..bc5be4555adbe3389bceee0f01730ee57f1e69ef 100644
 --- a/browser/components/aboutlogins/content/aboutLogins.html
 +++ b/browser/components/aboutlogins/content/aboutLogins.html
 @@ -6,7 +6,7 @@
diff --git a/src/browser/components/aboutlogins/content/components/login-list-css.patch b/src/browser/components/aboutlogins/content/components/login-list-css.patch
index e2a10dbec..66be640df 100644
--- a/src/browser/components/aboutlogins/content/components/login-list-css.patch
+++ b/src/browser/components/aboutlogins/content/components/login-list-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/aboutlogins/content/components/login-list.css b/browser/components/aboutlogins/content/components/login-list.css
-index 3c766eaa80c00ef145168f7a2ceced95ce94295e..db7a7da03c8346f97b472b8e561fec79c1036337 100644
+index e8d2077ca425d9a2b924aa6ac6ba8ada36b76615..95a8ab3dcff832f16068b6739526e8e29f0b4e26 100644
 --- a/browser/components/aboutlogins/content/components/login-list.css
 +++ b/browser/components/aboutlogins/content/components/login-list.css
 @@ -3,7 +3,7 @@
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index c21b3604e..d6b203a2f 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..c359e5115b315dbb4b14e07ab34526aab438565f 100644
+index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..39e947ce083ce3b293337f5dbb40cd0b46db12e2 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -68,7 +68,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1250,6 +1242,9 @@ var CustomizableUIInternal = {
+@@ -1242,6 +1234,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -78,7 +78,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1757,7 +1752,7 @@ var CustomizableUIInternal = {
+@@ -1749,7 +1744,7 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -87,7 +87,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1767,7 +1762,7 @@ var CustomizableUIInternal = {
+@@ -1759,7 +1754,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 d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -1935,16 +1930,16 @@ var CustomizableUIInternal = {
+@@ -1927,16 +1922,16 @@ var CustomizableUIInternal = {
          elem.setAttribute("skipintoolbarset", "true");
        }
      }
@@ -116,7 +116,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
      // Handle initial state of vertical tabs.
      if (isVerticalTabs) {
        // Show the vertical tabs toolbar
-@@ -2186,6 +2181,10 @@ var CustomizableUIInternal = {
+@@ -2178,6 +2173,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 d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
      this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
        this.setLocationAttributes(aNode, aAreaId);
        aContainer.insertBefore(aNode, aNextNode);
-@@ -4541,7 +4540,7 @@ var CustomizableUIInternal = {
+@@ -4533,7 +4532,7 @@ var CustomizableUIInternal = {
     * For all registered areas, builds those areas to reflect the current
     * placement state of all widgets.
     */
@@ -136,7 +136,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -4552,7 +4551,7 @@ var CustomizableUIInternal = {
+@@ -4544,7 +4543,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -145,7 +145,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -5843,6 +5842,7 @@ export var CustomizableUI = {
+@@ -5835,6 +5834,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -153,7 +153,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
    /**
     * 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 {
+@@ -7858,7 +7858,7 @@ class OverflowableToolbar {
          ) {
            continue;
          }
@@ -162,7 +162,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
          if (child != aExceptChild) {
            sum += getInlineSize(child);
          }
-@@ -7890,11 +7890,11 @@ class OverflowableToolbar {
+@@ -7882,11 +7882,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -176,7 +176,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
      });
  
      lazy.log.debug(
-@@ -7909,7 +7909,14 @@ class OverflowableToolbar {
+@@ -7901,7 +7901,14 @@ class OverflowableToolbar {
        Math.max(targetWidth, targetChildrenWidth)
      );
      totalAvailWidth = Math.ceil(totalAvailWidth);
@@ -192,7 +192,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -7970,7 +7977,11 @@ class OverflowableToolbar {
+@@ -7962,7 +7969,11 @@ class OverflowableToolbar {
              return;
            }
          }
@@ -205,7 +205,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
            lazy.log.debug(
              `Need ${minSize} but width is ${totalAvailWidth} so bailing`
            );
-@@ -8003,7 +8014,7 @@ class OverflowableToolbar {
+@@ -7995,7 +8006,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -214,7 +214,7 @@ index d9a059f608779fea7cd8c595a432f6fe95183e0c..c359e5115b315dbb4b14e07ab34526aa
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8348,7 +8359,7 @@ class OverflowableToolbar {
+@@ -8340,7 +8351,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {
diff --git a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
index e4a83fbfb..7472a3627 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..3178bd28affd8bd2e18c347fde6c3ec00068710c 100644
+index 52e93e9d9d77f6e410d72bee707fccf26f728004..1142f096e1221213195453d60507ba1bd2f7aed9 100644
 --- a/browser/components/customizableui/CustomizeMode.sys.mjs
 +++ b/browser/components/customizableui/CustomizeMode.sys.mjs
 @@ -503,7 +503,7 @@ export class CustomizeMode {
diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
index 88bc51a65..d4ac42499 100644
--- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
+++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
@@ -1,14 +1,15 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index 95621ae202378fb1ebceca5623a98b790b9eb5ff..835b831fb4f005ae4be72ce0953ac9254e6b4891 100644
+index 5be4e8ea7867e93bda2cd3eb49d966ebd73dc786..650d0008e755583392e07f35bd8e541dff7c43c4 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-@@ -242,9 +242,7 @@ export var ToolbarContextMenu = {
+@@ -246,10 +246,7 @@ export var ToolbarContextMenu = {
      // Show/hide sidebar and vertical tabs menu items
      let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
      let showSidebarActions =
 -      ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
 -      toolbarItem?.localName == "toolbarspring" ||
--      isTitlebarSpacer;
+-      isTitlebarSpacer ||
+-      isMenuBarSpacer;
 +      false;
  
      let toggleVerticalTabsItem = document.getElementById(
diff --git a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
index f6b6cbd07..884380fc2 100644
--- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
+++ b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index 86cc499f9b959ef87ab57fc4195e0c65f25e8c7c..a928ea83b9f4d0133238e744d2fb91318d36d4de 100644
+index 615efa4238a3c0084354383a128e0dd8712c720e..29e9dbe7039ba3dc1413da45908ca8418103f6e6 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
 @@ -60,6 +60,7 @@ class BookmarkState {
diff --git a/src/browser/components/preferences/jar-mn.patch b/src/browser/components/preferences/jar-mn.patch
index 59429d78a..ebc62b7f3 100644
--- a/src/browser/components/preferences/jar-mn.patch
+++ b/src/browser/components/preferences/jar-mn.patch
@@ -1,11 +1,11 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index 65efb0666785cc79e58015e19ec55216bf4ec9c4..95941c52ffd4c9ee36f584413fb96d59721113db 100644
+index 7c5f6e9053f119a790f83a68c75ee11a6c172d98..cb0e1386318e8a8df24dfbbf8430d0a09fe07d16 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -33,3 +33,5 @@ browser.jar:
-    content/browser/preferences/widgets/setting-pane.mjs                 (widgets/setting-pane/setting-pane.mjs)
+@@ -37,3 +37,5 @@ browser.jar:
     content/browser/preferences/widgets/security-privacy-card.mjs        (widgets/security-privacy/security-privacy-card/security-privacy-card.mjs)
     content/browser/preferences/widgets/security-privacy-card.css        (widgets/security-privacy/security-privacy-card/security-privacy-card.css)
+    content/browser/preferences/widgets/sync-device-name.mjs          (widgets/sync-device-name/sync-device-name.mjs)
 +
 +   content/browser/preferences/zen-settings.js
 \ No newline at end of file
diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch
index a0683e114..6d458377b 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 ff577c035ff6128f7ae948bc810082c92b3a624c..40f94fff53c63bdff28eaa68f9b0736d53c5b4f8 100644
+index bfddd91e6b524f2ebced985f5d12a4963e5c6075..7e80c0a293aae6356e53d9c9760017290e97ffa0 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
 @@ -141,7 +141,8 @@
diff --git a/src/browser/components/preferences/main-js.patch b/src/browser/components/preferences/main-js.patch
index ece242110..c9c6b02a0 100644
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 46283d3eacfea0f419afa3bdfd2a51e411502a20..4fe229706eb0145a21042b8b3cca323682e89e76 100644
+index a184086f10d6a919c8125ab5d7728319256b3b73..7c826000ccdc8a55a12a08bdc2c547d886e5610c 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
 @@ -1117,6 +1117,11 @@ let SETTINGS_CONFIG = {
@@ -14,7 +14,7 @@ index 46283d3eacfea0f419afa3bdfd2a51e411502a20..4fe229706eb0145a21042b8b3cca3236
        {
          id: "windowsLaunchOnLogin",
          l10nId: "windows-launch-on-login",
-@@ -1611,7 +1616,7 @@ function getBundleForLocales(newLocales) {
+@@ -1700,7 +1705,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 8b2db49d4..bf1d1d963 100644
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index c949c1800cb4c200c273c4019a61553b0e236994..0846ab1a348d3c5904e967aeb36eb846ba3cffa9 100644
+index a0e16b375f0ad7ef58bf68d7574453ef37d4557f..2d5b5a0715b5ed8ebe592eebea0219a6cde17b52 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -117,6 +117,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
+@@ -118,6 +118,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
        styleSheets: [
          "chrome://browser/skin/preferences/dialog.css",
          "chrome://browser/skin/preferences/preferences.css",
@@ -10,7 +10,7 @@ index c949c1800cb4c200c273c4019a61553b0e236994..0846ab1a348d3c5904e967aeb36eb846
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -224,6 +225,10 @@ function init_all() {
+@@ -225,6 +226,10 @@ function init_all() {
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);
    register_module("paneContainers", gContainersPane);
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
index 4227b80db..d696a22d5 100644
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 4500e3a3a7d54bd7647cd09ab0e11df782fb7a69..9506e860966e974b377b3e2e71c91f9d2c4a0c92 100644
+index 993554d64efa6ce39fbcc01d4676a69199e158ff..e69aec388162997ef7cb93481cfedb9d102b4fe0 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -45,6 +45,8 @@
@@ -11,7 +11,7 @@ index 4500e3a3a7d54bd7647cd09ab0e11df782fb7a69..9506e860966e974b377b3e2e71c91f9d
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -109,6 +111,11 @@
+@@ -113,6 +115,11 @@
    <hbox flex="1">
  
      <vbox class="navigation">
@@ -23,7 +23,7 @@ index 4500e3a3a7d54bd7647cd09ab0e11df782fb7a69..9506e860966e974b377b3e2e71c91f9d
        <!-- category list -->
        <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
          <richlistitem id="category-general"
-@@ -121,6 +128,50 @@
+@@ -125,6 +132,50 @@
            <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
          </richlistitem>
  
@@ -74,7 +74,7 @@ index 4500e3a3a7d54bd7647cd09ab0e11df782fb7a69..9506e860966e974b377b3e2e71c91f9d
          <richlistitem id="category-home"
                        class="category"
                        value="paneHome"
-@@ -232,11 +283,6 @@
+@@ -236,11 +287,6 @@
                  <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
                </hbox>
              </hbox>
@@ -86,7 +86,7 @@ index 4500e3a3a7d54bd7647cd09ab0e11df782fb7a69..9506e860966e974b377b3e2e71c91f9d
            </hbox>
          </hbox>
          <vbox id="mainPrefPane">
-@@ -250,6 +296,10 @@
+@@ -254,6 +300,10 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml
diff --git a/src/browser/components/preferences/sync-inc-xhtml.patch b/src/browser/components/preferences/sync-inc-xhtml.patch
index 406ca8fe2..f3823eb17 100644
--- a/src/browser/components/preferences/sync-inc-xhtml.patch
+++ b/src/browser/components/preferences/sync-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
-index 31b95644f820eda3267d3b52913ed0845abc1c80..1c8869418f7c88ed33601860dafd2c4eb0d5731f 100644
+index 4ecdbdb129577165ed0df619577327f7610e138f..761a4d4f26a21ba555b7af180e8a6030615db500 100644
 --- a/browser/components/preferences/sync.inc.xhtml
 +++ b/browser/components/preferences/sync.inc.xhtml
 @@ -223,6 +223,10 @@
diff --git a/src/browser/components/search/SearchOneOffs-sys-mjs.patch b/src/browser/components/search/SearchOneOffs-sys-mjs.patch
index 17f9becee..ef27cf200 100644
--- a/src/browser/components/search/SearchOneOffs-sys-mjs.patch
+++ b/src/browser/components/search/SearchOneOffs-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/search/SearchOneOffs.sys.mjs b/browser/components/search/SearchOneOffs.sys.mjs
-index 3930862215a667e223f1bf6959dcf1c08421b37d..68d767b6d8490a374973eb86a032a6386879fd93 100644
+index 3e5b29bc0a740df503e69f811ef01de1d6f0340a..b1bcdfc8c1bba506370f1a05fb31630c64bbd6d3 100644
 --- a/browser/components/search/SearchOneOffs.sys.mjs
 +++ b/browser/components/search/SearchOneOffs.sys.mjs
-@@ -466,7 +466,7 @@ export class SearchOneOffs {
+@@ -473,7 +473,7 @@ export class SearchOneOffs {
      // For the search-bar, always show the one-off buttons where there is an
      // option to add an engine.
      let addEngineNeeded = isSearchBar && addEngines.length;
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 2423488bd..7efaefb17 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 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..7a46b3b9819d2abe5801a99984788a3ccf6f32bb 100644
+index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..61bfa1b530c407dd1236543f785eb22176c60c4e 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -127,6 +127,8 @@ const TAB_EVENTS = [
@@ -111,7 +111,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..7a46b3b9819d2abe5801a99984788a3c
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5764,8 +5775,8 @@ var SessionStoreInternal = {
+@@ -5765,8 +5776,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -122,7 +122,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..7a46b3b9819d2abe5801a99984788a3c
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5808,6 +5819,8 @@ var SessionStoreInternal = {
+@@ -5809,6 +5820,8 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -131,7 +131,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..7a46b3b9819d2abe5801a99984788a3c
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6371,6 +6384,25 @@ var SessionStoreInternal = {
+@@ -6372,6 +6385,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -157,7 +157,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..7a46b3b9819d2abe5801a99984788a3c
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -7289,7 +7321,7 @@ var SessionStoreInternal = {
+@@ -7290,7 +7322,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -166,7 +166,7 @@ index 1cdbc0f41bf5b55dfbbd850cb618c6d870f7a261..7a46b3b9819d2abe5801a99984788a3c
            // Adjust window.selected
            if (tIndex + 1 < window.selected) {
              window.selected -= 1;
-@@ -7304,7 +7336,7 @@ var SessionStoreInternal = {
+@@ -7305,7 +7337,7 @@ var SessionStoreInternal = {
            );
            // We don't want to increment tIndex here.
            continue;
diff --git a/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch b/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch
index efdc1235e..b8bd536e5 100644
--- a/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch
+++ b/src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/TabUnloader.sys.mjs b/browser/components/tabbrowser/TabUnloader.sys.mjs
-index 0c62cdf29a72a7518cc54c014b5042f9695311eb..d5ac63d5005065863391e415f7072145d3247cad 100644
+index 2a3fcbe9dfb6328cabba891697990e2467973f6e..22fdaaefa71b3c37cbccbd7ae4db044b1057f1f2 100644
 --- a/browser/components/tabbrowser/TabUnloader.sys.mjs
 +++ b/browser/components/tabbrowser/TabUnloader.sys.mjs
 @@ -52,7 +52,7 @@ let CRITERIA_WEIGHT = 1;
diff --git a/src/browser/components/tabbrowser/content/drag-and-drop-js.patch b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
index a6b01c804..3cc560c34 100644
--- a/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
+++ b/src/browser/components/tabbrowser/content/drag-and-drop-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/drag-and-drop.js b/browser/components/tabbrowser/content/drag-and-drop.js
-index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812307b9a04 100644
+index 97b931c3c7385a52d20204369fcf6d6999053687..bc49f4f5a90638d725eca016d00f30d9548dce83 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
 @@ -32,6 +32,9 @@
@@ -12,7 +12,7 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
      if (isTab(element)) {
        return element;
      }
-@@ -118,6 +121,10 @@
+@@ -112,6 +115,10 @@
        }
  
        let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -23,9 +23,9 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        if (
          (dropEffect == "move" || dropEffect == "copy") &&
          document == draggedTab.ownerDocument &&
-@@ -272,6 +279,18 @@
+@@ -266,6 +273,18 @@
  
-       this.#tabDropIndicator.hidden = true;
+       this._tabDropIndicator.hidden = true;
        event.stopPropagation();
 +      if (draggedTab?.hasAttribute("zen-has-splitted")) {
 +        draggedTab.removeAttribute("zen-has-splitted");
@@ -42,7 +42,7 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        if (draggedTab && dropEffect == "copy") {
          let duplicatedDraggedTab;
          let duplicatedTabs = [];
-@@ -297,8 +316,9 @@
+@@ -291,8 +310,9 @@
          let translateOffsetY = oldTranslateY % tabHeight;
          let newTranslateX = oldTranslateX - translateOffsetX;
          let newTranslateY = oldTranslateY - translateOffsetY;
@@ -52,21 +52,21 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 +        let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
 +        let essential = draggedTab.hasAttribute("zen-essential");
  
-         if (this.#isContainerVerticalPinnedGrid(draggedTab)) {
+         if (this._isContainerVerticalPinnedGrid(draggedTab)) {
            // Update both translate axis for pinned vertical expanded tabs
-@@ -314,8 +334,8 @@
+@@ -308,8 +328,8 @@
            }
          } else {
-           let tabs = this.#tabbrowserTabs.ariaFocusableItems.slice(
+           let tabs = this._tabbrowserTabs.ariaFocusableItems.slice(
 -            isPinned ? 0 : numPinned,
 -            isPinned ? numPinned : undefined
 +            isPinned ? (essential ? 0 : gBrowser._numZenEssentials) : numPinned,
 +            isPinned ? (essential ? gBrowser._numZenEssentials : numPinned) : undefined 
            );
-           let size = this.#tabbrowserTabs.verticalMode ? "height" : "width";
-           let screenAxis = this.#tabbrowserTabs.verticalMode
-@@ -368,11 +388,13 @@
-           this.#dragToPinPromoCard,
+           let size = this._tabbrowserTabs.verticalMode ? "height" : "width";
+           let screenAxis = this._tabbrowserTabs.verticalMode
+@@ -362,11 +382,13 @@
+           this._dragToPinPromoCard,
          ];
          let shouldPin =
 +          false &&  
@@ -78,16 +78,16 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 +          false &&
            isTab(draggedTab) &&
            draggedTab.pinned &&
-           this.#tabbrowserTabs.arrowScrollbox.contains(event.target);
-@@ -390,6 +412,7 @@
+           this._tabbrowserTabs.arrowScrollbox.contains(event.target);
+@@ -384,6 +406,7 @@
              (oldTranslateY && oldTranslateY != newTranslateY);
-         } else if (this.#tabbrowserTabs.verticalMode) {
+         } else if (this._tabbrowserTabs.verticalMode) {
            shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
 +          shouldTranslate = false;
          } else {
            shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
          }
-@@ -446,7 +469,7 @@
+@@ -440,7 +463,7 @@
                  item.removeAttribute("tabdrop-samewindow");
                  resolve();
                };
@@ -96,18 +96,18 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -586,6 +609,7 @@
+@@ -581,6 +604,7 @@
  
-           let nextItem = this.#tabbrowserTabs.ariaFocusableItems[newIndex];
+           let nextItem = this._tabbrowserTabs.ariaFocusableItems[newIndex];
            let tabGroup = isTab(nextItem) && nextItem.group;
 +          if (gZenViewSplitter.handleTabDrop(event, urls, replace, inBackground)) return;
            gBrowser.loadTabs(urls, {
              inBackground,
              replace,
-@@ -623,7 +647,16 @@
-         this.#expandGroupOnDrop(draggedTab);
+@@ -618,7 +642,16 @@
+         this._expandGroupOnDrop(draggedTab);
        }
-       this.#resetTabsAfterDrop(draggedTab.ownerDocument);
+       this._resetTabsAfterDrop(draggedTab.ownerDocument);
 -
 +      if (!dt.mozUserCancelled && dt.dropEffect == "none" && !this._isCustomizing) {
 +        const moved = gZenViewSplitter.moveTabToSplitView(event, draggedTab);
@@ -122,8 +122,8 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
-@@ -827,7 +860,10 @@
-     #getDragTarget(event, { ignoreSides = false } = {}) {
+@@ -822,7 +855,10 @@
+     _getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
 -        if (isTab(target) || isTabGroupLabel(target)) {
@@ -134,7 +134,7 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
            break;
          }
          target = target.parentNode;
-@@ -844,14 +880,17 @@
+@@ -839,14 +875,17 @@
            return null;
          }
        }
@@ -144,17 +144,17 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        return target;
      }
  
-     #isContainerVerticalPinnedGrid(tab) {
+     _isContainerVerticalPinnedGrid(tab) {
        return (
-         this.#tabbrowserTabs.verticalMode &&
+         this._tabbrowserTabs.verticalMode &&
 -        tab.pinned &&
--        this.#tabbrowserTabs.hasAttribute("expanded") &&
+-        this._tabbrowserTabs.hasAttribute("expanded") &&
 +        tab.hasAttribute("zen-essential") &&
-+        (this.#tabbrowserTabs.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
-         !this.#tabbrowserTabs.expandOnHover
++        (this._tabbrowserTabs.hasAttribute("expanded") || document.documentElement.hasAttribute("zen-sidebar-expanded")) &&
+         !this._tabbrowserTabs.expandOnHover
        );
      }
-@@ -882,7 +921,8 @@
+@@ -877,7 +916,8 @@
          isTabGroupLabel(draggedTab) &&
          draggedTab._dragData?.expandGroupOnDrop
        ) {
@@ -164,19 +164,19 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        }
      }
  
-@@ -947,10 +987,7 @@
-       if (this.#isContainerVerticalPinnedGrid(tab)) {
+@@ -942,10 +982,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
--        let pinnedTabs = this.#tabbrowserTabs.visibleTabs.slice(
+-        let pinnedTabs = this._tabbrowserTabs.visibleTabs.slice(
 -          0,
 -          gBrowser.pinnedTabCount
 -        );
-+        let pinnedTabs = this.#tabbrowserTabs.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
++        let pinnedTabs = this._tabbrowserTabs.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
          let tabsPerRow = 0;
          let position = RTL_UI
            ? window.windowUtils.getBoundsWithoutFlushing(
-@@ -1117,7 +1154,7 @@
+@@ -1112,7 +1149,7 @@
        let dropEffect = this.getDropEffectForTabDrag(event);
        let isMovingInTabStrip = !fromTabList && dropEffect == "move";
        let collapseTabGroupDuringDrag =
@@ -184,17 +184,17 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 +        isMovingInTabStrip && isTabGroupLabel(tab) && (!tab.group.collapsed || tab.group.hasAttribute("has-active"));
  
        tab._dragData = {
-         offsetX: this.#tabbrowserTabs.verticalMode
-@@ -1127,7 +1164,7 @@
+         offsetX: this._tabbrowserTabs.verticalMode
+@@ -1122,7 +1159,7 @@
            ? event.screenY - window.screenY - tabOffset
            : event.screenY - window.screenY,
          scrollPos:
--          this.#tabbrowserTabs.verticalMode && tab.pinned
-+          this.#tabbrowserTabs.verticalMode && tab.pinned && false
-             ? this.#tabbrowserTabs.pinnedTabsContainer.scrollPosition
-             : this.#tabbrowserTabs.arrowScrollbox.scrollPosition,
+-          this._tabbrowserTabs.verticalMode && tab.pinned
++          this._tabbrowserTabs.verticalMode && tab.pinned && false
+             ? this._tabbrowserTabs.pinnedTabsContainer.scrollPosition
+             : this._tabbrowserTabs.arrowScrollbox.scrollPosition,
          screenX: event.screenX,
-@@ -1156,6 +1193,7 @@
+@@ -1149,6 +1186,7 @@
  
            if (collapseTabGroupDuringDrag) {
              tab.group.collapsed = true;
@@ -202,10 +202,10 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
            }
          }
        }
-@@ -1174,6 +1212,16 @@
-       when the tab is first selected to be dragged.
-     */
-     #updateTabStylesOnDrag(tab) {
+@@ -1173,6 +1211,16 @@
+       if (tabStripItemElement.hasAttribute("dragtarget")) {
+         return;
+       }
 +      let { movingTabs: zenMovingTabs } = tab._dragData;
 +      for (let movingTab of zenMovingTabs.slice(zenMovingTabs.findIndex(t => t._tPos == tab._tPos))) {
 +        if (isTabGroupLabel(tab)) {
@@ -218,16 +218,16 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 +      return;
        let isPinned = tab.pinned;
        let numPinned = gBrowser.pinnedTabCount;
-       let allTabs = this.#tabbrowserTabs.ariaFocusableItems;
+       let allTabs = this._tabbrowserTabs.ariaFocusableItems;
 @@ -1624,10 +1672,7 @@
          return;
        }
  
--      let tabs = this.#tabbrowserTabs.visibleTabs.slice(
+-      let tabs = this._tabbrowserTabs.visibleTabs.slice(
 -        0,
 -        gBrowser.pinnedTabCount
 -      );
-+      let tabs = this.#tabbrowserTabs.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
++      let tabs = this._tabbrowserTabs.ariaFocusableItems.slice(0, gBrowser._numZenEssentials);
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
@@ -252,7 +252,7 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
  
 @@ -1833,13 +1880,18 @@
-       this.#clearDragOverGroupingTimer();
+       this._clearDragOverGroupingTimer();
        this.#clearPinnedDropIndicatorTimer();
  
 -      let isPinned = draggedTab.pinned;
@@ -261,7 +261,7 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 +      let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
 +      let essential = draggedTab.hasAttribute("zen-essential");
 +      const isDraggingFolder = isTabGroupLabel(draggedTab) && draggedTab.group?.isZenFolder;
-       let allTabs = this.#tabbrowserTabs.ariaFocusableItems;
+       let allTabs = this._tabbrowserTabs.ariaFocusableItems;
        let tabs = allTabs.slice(
 -        isPinned ? 0 : numPinned,
 -        isPinned ? numPinned : undefined
@@ -272,15 +272,15 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 +        draggedTab = draggedTab.group.labelElement;
 +      }
  
-       if (this.#rtlMode) {
+       if (this._rtlMode) {
          tabs.reverse();
 @@ -1854,7 +1906,7 @@
-       let translateAxis = this.#tabbrowserTabs.verticalMode
+       let translateAxis = this._tabbrowserTabs.verticalMode
          ? "translateY"
          : "translateX";
 -      let { width: tabWidth, height: tabHeight } = bounds(draggedTab);
 +      let { width: tabWidth, height: tabHeight } = bounds(draggedTab.group?.hasAttribute("split-view-group") ? draggedTab.group : draggedTab);
-       let tabSize = this.#tabbrowserTabs.verticalMode ? tabHeight : tabWidth;
+       let tabSize = this._tabbrowserTabs.verticalMode ? tabHeight : tabWidth;
        let translateX = event.screenX - dragData.screenX;
        let translateY = event.screenY - dragData.screenY;
 @@ -1870,6 +1922,12 @@
@@ -297,12 +297,12 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        let lastMovingTabScreen = endEdge(lastMovingTab);
        let firstMovingTabScreen = firstMovingTab[screenAxis];
 @@ -1884,6 +1942,13 @@
-       let endBound = this.#rtlMode
-         ? endEdge(this.#tabbrowserTabs) - lastMovingTabScreen
+       let endBound = this._rtlMode
+         ? endEdge(this._tabbrowserTabs) - lastMovingTabScreen
          : periphery[screenAxis] - 1 - lastMovingTabScreen;
 +      {
-+        let firstTab = tabs.at(this.#rtlMode ? -1 : 0);
-+        let lastTab = tabs.at(this.#rtlMode ? 0 : -1);
++        let firstTab = tabs.at(this._rtlMode ? -1 : 0);
++        let lastTab = tabs.at(this._rtlMode ? 0 : -1);
 +        startBound = firstTab[screenAxis] - firstMovingTabScreen;
 +        endBound = endEdge(lastTab) - lastMovingTabScreen;
 +        endBound = gZenPinnedTabManager.getLastTabBound(endBound, lastTab, isDraggingFolder);
@@ -342,7 +342,7 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
            : dropElement.elementIndex < numPinned;
 -        if (isOutOfBounds) {
 -          // Drop after last pinned tab
--          dropElement = this.#tabbrowserTabs.ariaFocusableItems[numPinned - 1];
+-          dropElement = this._tabbrowserTabs.ariaFocusableItems[numPinned - 1];
 -          dropBefore = false;
 -        }
        }
@@ -351,7 +351,7 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 -        gBrowser._tabGroupsEnabled &&
 -        isTab(draggedTab) &&
 -        !isPinned &&
--        (!numPinned || newDropElementIndex > numPinned)
+-        (!numPinned || newDropElementIndex >= numPinned)
 -      ) {
 +      if (isTab(draggedTab) || isTabGroupLabel(draggedTab)) {
          let dragOverGroupingThreshold = 1 - moveOverThreshold;
@@ -390,8 +390,8 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
 +              colorCode
 +            ));
            }
-           this.#setDragOverGroupColor(colorCode);
-           this.#tabbrowserTabs.toggleAttribute(
+           this._setDragOverGroupColor(colorCode);
+           this._tabbrowserTabs.toggleAttribute(
 @@ -2324,10 +2395,11 @@
        dragData.dropBefore = dropBefore;
        dragData.animDropElementIndex = newDropElementIndex;
@@ -417,8 +417,8 @@ index c97c661656868bc7faaf7c66c9702eea056aafe1..3a2b4bd1a017697539a3b81432199812
        this.#setMovingTabMode(false);
 +      gZenFolders.highlightGroupOnDragOver(null);
  
-       for (let item of this.#tabbrowserTabs.ariaFocusableItems) {
-         this.#resetGroupTarget(item);
+       for (let item of this._tabbrowserTabs.ariaFocusableItems) {
+         this._resetGroupTarget(item);
 @@ -2457,7 +2531,7 @@
          tab.style.left = "";
          tab.style.top = "";
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 3452bced0..3f27154b7 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 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577b5fad08c 100644
+index 2dacb325190b6ae42ebeb3e9f0e862dc690ecdca..02d70e9b0261f92917d274759838cfbfd6214f77 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -78,7 +78,7 @@ index 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577
      }
  
      get hidden() {
-@@ -297,7 +310,7 @@
+@@ -305,7 +318,7 @@
          return false;
        }
  
@@ -87,21 +87,21 @@ index 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577
      }
  
      get lastAccessed() {
-@@ -374,8 +387,11 @@
+@@ -382,7 +395,12 @@
      }
  
      get group() {
--      if (this.parentElement?.tagName == "tab-group") {
--        return this.parentElement;
+-      return this.closest("tab-group");
 +      if (typeof gBrowser === "undefined") {
 +        return null;
 +      }
 +      if (gBrowser.isTabGroup(this.parentElement?.parentElement)) {
 +        return this.parentElement.parentElement;
-       }
-       return null;
++      }
      }
-@@ -470,6 +486,8 @@
+ 
+     get splitview() {
+@@ -473,6 +491,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (
          event.target.classList.contains("tab-close-button") ||
@@ -110,7 +110,7 @@ index 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577
          event.target.classList.contains("tab-icon-overlay") ||
          event.target.classList.contains("tab-audio-button")
        ) {
-@@ -524,6 +542,10 @@
+@@ -527,6 +547,10 @@
        this.style.MozUserFocus = "";
      }
  
@@ -121,7 +121,7 @@ index 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577
      on_click(event) {
        if (event.button != 0) {
          return;
-@@ -572,6 +594,7 @@
+@@ -575,6 +599,7 @@
              )
            );
          } else {
@@ -129,7 +129,7 @@ index 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577
            gBrowser.removeTab(this, {
              animate: true,
              triggeringEvent: event,
-@@ -584,6 +607,14 @@
+@@ -587,6 +612,14 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
@@ -144,7 +144,7 @@ index 4c1a48424316b29d27ae2bc8b64004df41c87bb6..f1ff9bf0947127a8e9115357cedac577
      }
  
      on_dblclick(event) {
-@@ -607,6 +638,8 @@
+@@ -610,6 +643,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 1bb770059..8a71eaaae 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e6923fe5f 100644
+index 42027bfa55eab8ea9298a7d425f2ded45188f7f3..6aa725c0e5a6a29dc33fcb162f83522f53bc059b 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -386,6 +386,7 @@
@@ -315,7 +315,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3330,10 +3428,10 @@
+@@ -3349,10 +3447,10 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -327,7 +327,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        }
  
        if (!color) {
-@@ -3354,9 +3452,14 @@
+@@ -3373,9 +3471,14 @@
          label,
          isAdoptingGroup
        );
@@ -344,7 +344,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        );
        group.addTabs(tabs);
  
-@@ -3477,7 +3580,7 @@
+@@ -3496,7 +3599,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -353,7 +353,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        );
      }
  
-@@ -3679,6 +3782,7 @@
+@@ -3698,6 +3801,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -361,7 +361,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3748,6 +3852,7 @@
+@@ -3767,6 +3871,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -369,7 +369,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          });
        }
  
-@@ -3935,7 +4040,7 @@
+@@ -3955,7 +4060,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -378,7 +378,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -3972,8 +4077,10 @@
+@@ -3992,8 +4097,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -390,7 +390,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
            if (select) {
              tabToSelect = tab;
            }
-@@ -3985,7 +4092,8 @@
+@@ -4005,7 +4112,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -400,7 +400,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3999,7 +4107,10 @@
+@@ -4019,7 +4127,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -412,7 +412,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4044,9 +4155,23 @@
+@@ -4064,9 +4175,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -436,7 +436,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4237,11 +4362,14 @@
+@@ -4257,11 +4382,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -452,7 +452,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4253,7 +4381,7 @@
+@@ -4273,7 +4401,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -461,7 +461,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
              tabGroup = previousTab.group;
            }
            if (
-@@ -4264,7 +4392,7 @@
+@@ -4284,7 +4412,7 @@
            ) {
              elementIndex = Infinity;
            } else if (previousTab.visible) {
@@ -470,7 +470,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4292,14 +4420,14 @@
+@@ -4312,14 +4440,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -489,7 +489,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4310,7 +4438,7 @@
+@@ -4330,7 +4458,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -498,7 +498,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          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);
-@@ -4338,7 +4466,11 @@
+@@ -4358,7 +4486,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -510,7 +510,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        }
  
        this._updateTabsAfterInsert();
-@@ -4346,6 +4478,7 @@
+@@ -4366,6 +4498,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -518,7 +518,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
  
        TabBarVisibility.update();
      }
-@@ -4635,6 +4768,9 @@
+@@ -4655,6 +4788,9 @@
          return;
        }
  
@@ -528,7 +528,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
      }
  
-@@ -4896,6 +5032,7 @@
+@@ -4916,6 +5052,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -536,7 +536,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -4985,6 +5122,7 @@
+@@ -5005,6 +5142,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -544,7 +544,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        } catch (e) {
          console.error(e);
        }
-@@ -5023,6 +5161,12 @@
+@@ -5043,6 +5181,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -557,7 +557,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -5037,6 +5181,9 @@
+@@ -5057,6 +5201,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -567,7 +567,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5085,7 +5232,13 @@
+@@ -5105,7 +5252,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -582,7 +582,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          return;
        }
  
-@@ -5219,7 +5372,7 @@
+@@ -5239,7 +5392,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -591,7 +591,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5243,6 +5396,7 @@
+@@ -5263,6 +5416,7 @@
  
          newTab = true;
        }
@@ -599,7 +599,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5283,13 +5437,7 @@
+@@ -5303,13 +5457,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -614,7 +614,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        } else {
          TabBarVisibility.update();
        }
-@@ -5422,6 +5570,7 @@
+@@ -5442,6 +5590,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -622,7 +622,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5643,6 +5792,7 @@
+@@ -5663,6 +5812,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -630,7 +630,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5655,13 +5805,13 @@
+@@ -5675,13 +5825,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -646,7 +646,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        );
  
        let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5677,7 +5827,7 @@
+@@ -5697,7 +5847,7 @@
        }
  
        if (tab) {
@@ -655,7 +655,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5698,7 +5848,7 @@
+@@ -5718,7 +5868,7 @@
          });
        }
  
@@ -664,7 +664,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
      }
  
      _blurTab(aTab) {
-@@ -6104,10 +6254,10 @@
+@@ -6124,10 +6274,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -677,7 +677,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6166,6 +6316,7 @@
+@@ -6186,6 +6336,7 @@
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
      replaceTabWithWindow(aTab, aOptions) {
@@ -685,7 +685,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6299,7 +6450,7 @@
+@@ -6319,7 +6470,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -694,7 +694,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
      }
  
      /**
-@@ -6375,8 +6526,8 @@
+@@ -6404,8 +6555,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -705,7 +705,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6402,10 +6553,16 @@
+@@ -6431,10 +6582,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -724,7 +724,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6463,23 +6620,28 @@
+@@ -6492,23 +6649,28 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -759,7 +759,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        } 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
-@@ -6492,14 +6654,34 @@
+@@ -6521,14 +6683,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.
@@ -795,7 +795,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6508,7 +6690,7 @@
+@@ -6537,7 +6719,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -804,7 +804,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6580,10 +6762,10 @@
+@@ -6607,10 +6789,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -817,7 +817,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6613,6 +6795,7 @@
+@@ -6656,6 +6838,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -825,7 +825,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6639,7 +6822,7 @@
+@@ -6682,7 +6865,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -834,7 +834,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6676,6 +6859,10 @@
+@@ -6723,6 +6906,10 @@
  
        moveActionCallback();
  
@@ -845,7 +845,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7576,7 +7763,7 @@
+@@ -7623,7 +7810,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -854,7 +854,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7593,7 +7780,6 @@
+@@ -7640,7 +7827,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -862,7 +862,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
            });
            break;
          case "TabGroupCreateByUser":
-@@ -8542,6 +8728,7 @@
+@@ -8589,6 +8775,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -870,7 +870,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9543,7 +9730,7 @@ var TabContextMenu = {
+@@ -9623,7 +9810,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -879,7 +879,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..cead9e6e52f7354e20b8b64ad06a075e
      // Build Ask Chat items
      TabContextMenu.GenAI.buildTabMenu(
        document.getElementById("context_askChat"),
-@@ -9863,6 +10050,7 @@ var TabContextMenu = {
+@@ -9943,6 +10130,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 49d3342cf..3842442c7 100644
--- a/src/browser/components/tabbrowser/content/tabgroup-js.patch
+++ b/src/browser/components/tabbrowser/content/tabgroup-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41fbf97ac20 100644
+index 394b2af2e187b82bb3e98ebcdc6e66b63036e20d..4757555c7654a14578a5d057323057ebc71c2f5f 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -14,11 +14,11 @@
@@ -87,7 +87,7 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
  
      resetDefaultGroupName = () => {
        this.#defaultGroupName = "";
-@@ -227,7 +248,10 @@
+@@ -211,7 +232,10 @@
            }
          });
        }
@@ -99,7 +99,7 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
      }
  
      get color() {
-@@ -321,6 +345,9 @@
+@@ -305,6 +329,9 @@
      }
  
      set collapsed(val) {
@@ -109,7 +109,7 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
        if (!!val == this.collapsed) {
          return;
        }
-@@ -406,7 +433,6 @@
+@@ -391,7 +418,6 @@
            tabGroupName,
          })
          .then(result => {
@@ -117,11 +117,14 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
          });
      }
  
-@@ -425,7 +451,57 @@
+@@ -466,13 +492,57 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
--      return Array.from(this.children).filter(node => node.matches("tab"));
+-      let childrenArray = Array.from(this.children);
+-      for (let i = childrenArray.length - 1; i >= 0; i--) {
+-        if (childrenArray[i].tagName == "tab-split-view-wrapper") {
+-          childrenArray.splice(i, 1, ...childrenArray[i].tabs);
 +      // add other group tabs if they are under this group
 +      let childs = Array.from(this.querySelector(".tab-group-container")?.children ?? []);
 +      const tabsCollect = [];
@@ -166,8 +169,9 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
 +        currentGroup = currentGroup?.group;
 +        if (currentGroup.collapsed) {
 +          return false;
-+        }
-+      }
+         }
+       }
+-      return childrenArray.filter(node => node.matches("tab"));
 +      return true;
 +    }
 +
@@ -176,7 +180,7 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
      }
  
      /**
-@@ -506,7 +582,6 @@
+@@ -553,7 +623,6 @@
      addTabs(tabs, metricsContext) {
        for (let tab of tabs) {
          if (tab.pinned) {
@@ -184,7 +188,7 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
          }
          let tabToMove =
            this.ownerGlobal === tab.ownerGlobal
-@@ -569,7 +644,7 @@
+@@ -616,7 +685,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -193,7 +197,7 @@ index aa8b22c558f9dbc0b0b1e63993477b9126fb6821..feb90bb75b78e2513362679a5b5da41f
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -638,5 +713,6 @@
+@@ -687,5 +756,6 @@
      }
    }
  
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index b8834ec23..ef5bb94e3 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2a736d9f8 100644
+index 6b6c04599fe80983d13d2069ca62b99d8ad70271..a765f2decc3a565226ac8793422474052f476573 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
-@@ -411,7 +411,7 @@
+@@ -436,7 +436,7 @@
        // and we're not hitting the scroll buttons.
        if (
          event.button != 0 ||
@@ -11,7 +11,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;
-@@ -492,7 +492,6 @@
+@@ -517,7 +517,6 @@
              });
            }
          } else if (isTabGroupLabel(event.target)) {
@@ -19,7 +19,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
          } else if (
            event.originalTarget.closest("scrollbox") &&
            !Services.prefs.getBoolPref(
-@@ -528,6 +527,9 @@
+@@ -553,6 +552,9 @@
      }
  
      on_keydown(event) {
@@ -29,15 +29,15 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
        let { altKey, shiftKey } = event;
        let [accel, nonAccel] =
          AppConstants.platform == "macosx"
-@@ -720,7 +722,6 @@
- 
-       this.toggleAttribute("overflow", true);
+@@ -747,7 +749,6 @@
        this._updateCloseButtons();
--      this._handleTabSelect(true);
+ 
+       if (!this.#animatingGroups.size) {
+-        this._handleTabSelect(true);
+       }
  
        document
-         .getElementById("tab-preview-panel")
-@@ -780,7 +781,7 @@
+@@ -808,7 +809,7 @@
      }
  
      get newTabButton() {
@@ -46,7 +46,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
      }
  
      get verticalMode() {
-@@ -796,6 +797,7 @@
+@@ -824,6 +825,7 @@
      }
  
      get overflowing() {
@@ -54,7 +54,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
        return this.hasAttribute("overflow");
      }
  
-@@ -809,29 +811,54 @@
+@@ -837,29 +839,54 @@
        if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
          pinnedChildren.pop();
        }
@@ -119,7 +119,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
      }
  
      /**
-@@ -898,17 +925,10 @@
+@@ -926,17 +953,10 @@
  
        let elementIndex = 0;
  
@@ -139,7 +139,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
          if (isTab(child) && child.visible) {
            child.elementIndex = elementIndex++;
            focusableItems.push(child);
-@@ -916,11 +936,13 @@
+@@ -944,11 +964,13 @@
            child.labelElement.elementIndex = elementIndex++;
            focusableItems.push(child.labelElement);
  
@@ -154,7 +154,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
          } else if (child.tagName == "tab-split-view-wrapper") {
            let visibleTabsInSplitView = child.tabs.filter(tab => tab.visible);
            visibleTabsInSplitView.forEach(tab => {
-@@ -964,6 +986,7 @@
+@@ -992,6 +1014,7 @@
      _invalidateCachedTabs() {
        this.#allTabs = null;
        this._invalidateCachedVisibleTabs();
@@ -162,7 +162,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
      }
  
      _invalidateCachedVisibleTabs() {
-@@ -1067,7 +1090,7 @@
+@@ -1095,7 +1118,7 @@
  
        if (node == null) {
          // We have a container for non-tab elements at the end of the scrollbox.
@@ -171,7 +171,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
        }
  
        node.before(tab);
-@@ -1162,7 +1185,7 @@
+@@ -1193,7 +1216,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.
@@ -180,7 +180,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
            const newTab2 = this.newTabButton;
            const newTabVertical = document.getElementById(
              "vertical-tabs-newtab-button"
-@@ -1263,8 +1286,10 @@
+@@ -1294,8 +1317,10 @@
       */
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
@@ -191,7 +191,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1273,7 +1298,7 @@
+@@ -1304,7 +1329,7 @@
       * @param {boolean} [shouldScrollInstantly=false]
       */
      #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
@@ -200,7 +200,7 @@ index 258b9627aaa8a1d26e8aeb987a0b4c67bc1b7abc..6d334761033a0654f28fd417193d2ac2
        if (arrowScrollbox?.overflowing) {
          arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
        }
-@@ -1406,7 +1431,7 @@
+@@ -1437,7 +1462,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
diff --git a/src/browser/components/urlbar/UrlbarController-sys-mjs.patch b/src/browser/components/urlbar/UrlbarController-sys-mjs.patch
index dc004d516..2323991d8 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 880f65b493ba5e9b9750e84c2ba5d08b99e3dad9..c4a495887926fc6f13312a29998d03bfe907f0e2 100644
+index 09c1a7d4e156fe5e606f097277420333efe88976..f31e183e7b92c616d81dae509ef0448c4d507cc7 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -299,7 +299,6 @@ export class UrlbarController {
+@@ -296,7 +296,6 @@ export class UrlbarController {
      const isMac = AppConstants.platform == "macosx";
      // Handle readline/emacs-style navigation bindings on Mac.
      if (
@@ -10,7 +10,7 @@ index 880f65b493ba5e9b9750e84c2ba5d08b99e3dad9..c4a495887926fc6f13312a29998d03bf
        this.view.isOpen &&
        event.ctrlKey &&
        (event.key == "n" || event.key == "p")
-@@ -443,6 +442,8 @@ export class UrlbarController {
+@@ -445,6 +444,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 13c96ab97..d0ef058f5 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c10e8a36f2 100644
+index 6ad064710da20f7a13fda3517780c2f38b3d2865..58a01eef024d8b9992068a6a5b7be68f5f45accf 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
-@@ -84,6 +84,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
-   lazy.UrlbarUtils.getLogger({ prefix: "Input" })
- );
+@@ -68,6 +68,13 @@ const lazy = XPCOMUtils.declareLazy({
+   logger: () => lazy.UrlbarUtils.getLogger({ prefix: "Input" }),
+ });
  
 +XPCOMUtils.defineLazyPreferenceGetter(
 +  lazy,
@@ -16,7 +16,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  
  const UNLIMITED_MAX_RESULTS = 99;
-@@ -454,7 +461,16 @@ export class UrlbarInput {
+@@ -445,7 +452,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 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -530,6 +546,10 @@ export class UrlbarInput {
+@@ -521,6 +537,10 @@ export class UrlbarInput {
      hideSearchTerms = false,
      isSameDocument = false
    ) {
@@ -41,10 +41,10 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
 +      return;
 +    }
 +
-     if (!this.isAddressbar) {
+     if (!this.#isAddressbar) {
        throw new Error(
          "Cannot set URI for UrlbarInput that is not an address bar"
-@@ -807,8 +827,16 @@ export class UrlbarInput {
+@@ -798,8 +818,16 @@ export class UrlbarInput {
          return;
        }
      }
@@ -62,7 +62,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
    }
  
    /**
-@@ -1224,7 +1252,11 @@ export class UrlbarInput {
+@@ -1215,7 +1243,11 @@ export class UrlbarInput {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      }
  
      if (isCanonized) {
-@@ -2347,6 +2379,32 @@ export class UrlbarInput {
+@@ -2335,6 +2367,32 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -108,7 +108,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2361,6 +2419,13 @@ export class UrlbarInput {
+@@ -2349,6 +2407,13 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -122,7 +122,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      // 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")) {
-@@ -2380,6 +2445,24 @@ export class UrlbarInput {
+@@ -2368,6 +2433,24 @@ export class UrlbarInput {
        return;
      }
  
@@ -147,7 +147,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2410,7 +2493,7 @@ export class UrlbarInput {
+@@ -2398,7 +2481,7 @@ export class UrlbarInput {
      forceUnifiedSearchButtonAvailable = false
    ) {
      let prevState = this.getAttribute("pageproxystate");
@@ -156,7 +156,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      this.setAttribute("pageproxystate", state);
      this._inputContainer.setAttribute("pageproxystate", state);
      this._identityBox?.setAttribute("pageproxystate", state);
-@@ -2646,10 +2729,12 @@ export class UrlbarInput {
+@@ -2635,10 +2718,12 @@ export class UrlbarInput {
        return;
      }
      this.textbox.style.top = px(
@@ -169,7 +169,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      );
    }
  
-@@ -2709,9 +2794,10 @@ export class UrlbarInput {
+@@ -2698,9 +2783,10 @@ export class UrlbarInput {
            return;
          }
  
@@ -181,7 +181,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
          );
          this.textbox.style.setProperty(
            "--urlbar-height",
-@@ -3144,6 +3230,7 @@ export class UrlbarInput {
+@@ -3134,6 +3220,7 @@ export class UrlbarInput {
    }
  
    _toggleActionOverride(event) {
@@ -189,8 +189,8 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3247,8 +3334,8 @@ export class UrlbarInput {
-     if (!this.isAddressbar) {
+@@ -3237,8 +3324,8 @@ export class UrlbarInput {
+     if (!this.#isAddressbar) {
        return val;
      }
 -    let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -200,15 +200,15 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3552,6 +3639,7 @@ export class UrlbarInput {
+@@ -3544,6 +3631,7 @@ export class UrlbarInput {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
 +    openUILinkWhere = this.window.gZenUIManager.getOpenUILinkWhere(url, browser, openUILinkWhere);
-     if (this.isAddressbar) {
+     if (this.#isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -3659,6 +3747,10 @@ export class UrlbarInput {
+@@ -3651,6 +3739,10 @@ export class UrlbarInput {
        }
        reuseEmpty = true;
      }
@@ -219,7 +219,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -3666,6 +3758,9 @@ export class UrlbarInput {
+@@ -3658,6 +3750,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -229,7 +229,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      return where;
    }
  
-@@ -3923,6 +4018,7 @@ export class UrlbarInput {
+@@ -3909,6 +4004,7 @@ export class UrlbarInput {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -237,7 +237,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
  
        this._suppressStartQuery = false;
      });
-@@ -3930,7 +4026,6 @@ export class UrlbarInput {
+@@ -3916,7 +4012,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.
@@ -245,7 +245,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4040,7 +4135,11 @@ export class UrlbarInput {
+@@ -4026,7 +4121,11 @@ export class UrlbarInput {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -258,7 +258,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -4351,6 +4450,7 @@ export class UrlbarInput {
+@@ -4338,6 +4437,7 @@ export class UrlbarInput {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -266,7 +266,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
        l10nId,
        l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
      );
-@@ -4462,6 +4562,11 @@ export class UrlbarInput {
+@@ -4449,6 +4549,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -278,7 +278,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer
-@@ -4534,7 +4639,7 @@ export class UrlbarInput {
+@@ -4521,7 +4626,7 @@ export class UrlbarInput {
        }
      }
  
@@ -287,7 +287,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4574,9 +4679,16 @@ export class UrlbarInput {
+@@ -4561,9 +4666,16 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -305,7 +305,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
  
          if (
            event.target != this.inputField &&
-@@ -4587,6 +4699,10 @@ export class UrlbarInput {
+@@ -4574,6 +4686,10 @@ export class UrlbarInput {
  
          this.focusedViaMousedown = !this.focused;
          this._preventClickSelectsAll = this.focused;
@@ -316,7 +316,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -4622,7 +4738,7 @@ export class UrlbarInput {
+@@ -4609,7 +4725,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.
@@ -325,7 +325,7 @@ index 4b7232f3261f8589b734c2238170e6968d7ea0bf..6c68a2e93b7287f92ff394789c50d1c1
            break;
          }
  
-@@ -4939,7 +5055,7 @@ export class UrlbarInput {
+@@ -4930,7 +5046,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/UrlbarPrefs-sys-mjs.patch b/src/browser/components/urlbar/UrlbarPrefs-sys-mjs.patch
index b4a67ce95..e4d68bcc3 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 531cecb9da3465d392ea82248e6ebb3fe6476b47..f3cce2a66bb8465ae022df0c1b9823e7e88cba21 100644
+index 0cc0db4889d66872bce2aa775a79a4c68e8cec51..604106e328843b3a6eb0922cc8663474ddb008f4 100644
 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
 +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-@@ -731,6 +731,7 @@ function makeResultGroups({ showSearchSuggestionsFirst }) {
+@@ -763,6 +763,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 396ba65f0..31608dbe0 100644
--- a/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarProviderPlaces-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
-index 91abb674d26dc7e2a919c94087b180a6148248fd..80551acd18228f19cb179f71adc4f58bc893ac14 100644
+index 4db61038e5e476bad3a61dbdb707e5222c1f08f8..9eca13d9cfac3b762917aaaa942267effb743cf7 100644
 --- a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
-@@ -44,11 +44,13 @@ function defaultQuery(conditions = "") {
+@@ -45,11 +45,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,
@@ -17,7 +17,7 @@ index 91abb674d26dc7e2a919c94087b180a6148248fd..80551acd18228f19cb179f71adc4f58b
       WHERE (
          (:switchTabsEnabled AND t.open_count > 0) OR
          ${lazy.PAGES_FRECENCY_FIELD} <> 0
-@@ -62,7 +64,7 @@ function defaultQuery(conditions = "") {
+@@ -63,7 +65,7 @@ function defaultQuery(conditions = "") {
                                :matchBehavior, :searchBehavior, NULL)
           ELSE
             AUTOCOMPLETE_MATCH(:searchString, h.url,
@@ -26,7 +26,7 @@ index 91abb674d26dc7e2a919c94087b180a6148248fd..80551acd18228f19cb179f71adc4f58b
                                h.visit_count, h.typed,
                                0, t.open_count,
                                :matchBehavior, :searchBehavior, NULL)
-@@ -1126,11 +1128,13 @@ Search.prototype = {
+@@ -1176,11 +1178,13 @@ class Search {
        ? 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 d2dbed260..0ff16663b 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 b864cf9a9159d1f4e162ff5e8895a2bc95dee881..b30ee47b4f6d9025648ca5d93ee79f993cb6f4c2 100644
+index 15dd29152cf349b5ed23f1bae0a74a8d7dbe4c3d..f44f5dd87f778f432b0028969ca5732305c98915 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-@@ -873,6 +873,7 @@ export class Query {
+@@ -883,6 +883,7 @@ export class Query {
      if (
        result.heuristic &&
        this.context.searchMode &&
diff --git a/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch b/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
index 8aa60156a..97c731865 100644
--- a/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarResult-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs
-index 0882c0a01d17184cadb56aa1236ca97adf7f866b..4a5842eda6280205b96f9aee9b6f3b49fac7077c 100644
+index 99f331b2c6e4f8eda1bda02cbc6bc6d3f9f4a572..d504632a3f689aefb7d22b863649cb1a8bb3c6a4 100644
 --- a/browser/components/urlbar/UrlbarResult.sys.mjs
 +++ b/browser/components/urlbar/UrlbarResult.sys.mjs
-@@ -172,6 +172,10 @@ export class UrlbarResult {
+@@ -179,6 +179,10 @@ export class UrlbarResult {
      return this.#heuristic;
    }
  
diff --git a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch
index f2d58b268..d6d4318cc 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 079c9f18550b54b2a1cc030174849896fd23234e..605bb3433b61443037659d126ba17b033e5a4394 100644
+index 7e9ede3dae5c2099c45e0221ad1cb8ebd622fc39..f82db27dbd07961ad6af7dbe2cb5d79e5f7a9828 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -77,6 +77,7 @@ export var UrlbarUtils = {
+@@ -79,6 +79,7 @@ export var UrlbarUtils = {
      RESTRICT_SEARCH_KEYWORD: "restrictSearchKeyword",
      SUGGESTED_INDEX: "suggestedIndex",
      TAIL_SUGGESTION: "tailSuggestion",
@@ -10,7 +10,7 @@ index 079c9f18550b54b2a1cc030174849896fd23234e..605bb3433b61443037659d126ba17b03
    }),
  
    // Defines provider types.
-@@ -136,6 +137,7 @@ export var UrlbarUtils = {
+@@ -138,6 +139,7 @@ export var UrlbarUtils = {
      OTHER_NETWORK: 6,
      ADDON: 7,
      ACTIONS: 8,
@@ -18,7 +18,7 @@ index 079c9f18550b54b2a1cc030174849896fd23234e..605bb3433b61443037659d126ba17b03
    }),
  
    // Per-result exposure telemetry.
-@@ -547,6 +549,8 @@ export var UrlbarUtils = {
+@@ -549,6 +551,8 @@ export var UrlbarUtils = {
            return this.RESULT_GROUP.HEURISTIC_FALLBACK;
          case "UrlbarProviderHistoryUrlHeuristic":
            return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;
diff --git a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
index 4a44486be..d469e3a14 100644
--- a/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch
@@ -1,10 +1,28 @@
 diff --git a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
-index beff1d41e47efad09256459589176d96c69f7a8a..c850dad31454d61c4edb6e183db07b2d51fb9fc8 100644
+index 307b3cac259c05e616cf7d5eb1ce50a146550cd9..72252a6363154b6c5f926bf2acf3282e8396d2ad 100644
 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
-@@ -585,6 +585,7 @@ export class UrlbarValueFormatter {
-       this.window.requestAnimationFrame(() => {
-         if (instance == this._resizeInstance) {
+@@ -76,7 +76,7 @@ export class UrlbarValueFormatter {
+       if (this.#updateInstance != instance) {
+         return;
+       }
+-      this.#formattingApplied = this.#formatURL() || this.#formatSearchAlias();
++      this.#formattingApplied = this._formatURL() || this.#formatSearchAlias();
+     });
+   }
+ 
+@@ -370,7 +370,7 @@ export class UrlbarValueFormatter {
+    * @returns {boolean}
+    *   True if formatting was applied and false if not.
+    */
+-  #formatURL() {
++  _formatURL() {
+     let urlMetaData = this.#getUrlMetaData();
+     if (!urlMetaData) {
+       return false;
+@@ -639,6 +639,7 @@ export class UrlbarValueFormatter {
+       this.#window.requestAnimationFrame(() => {
+         if (instance == this.#resizeInstance) {
            this.#ensureFormattedHostVisible();
 +          this._formatURL();
          }
diff --git a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
index ad96d3e95..2f9b688a7 100644
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index 38e4987dc906cf3c668995aab79fc15a02834677..de9d69a4faab3cfa249de41ef573ae2ef873b348 100644
+index c58bc4871fbfb5ca924df822a09d783f21db616a..68fd73055d30ec4f4128fb8639369f07b167955a 100644
 --- a/browser/components/urlbar/UrlbarView.sys.mjs
 +++ b/browser/components/urlbar/UrlbarView.sys.mjs
 @@ -620,7 +620,7 @@ export class UrlbarView {
@@ -11,7 +11,7 @@ index 38e4987dc906cf3c668995aab79fc15a02834677..de9d69a4faab3cfa249de41ef573ae2e
          // 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.
-@@ -2751,6 +2751,8 @@ export class UrlbarView {
+@@ -2855,6 +2855,8 @@ export class UrlbarView {
        if (row?.hasAttribute("row-selectable")) {
          row?.toggleAttribute("selected", true);
        }
@@ -20,7 +20,7 @@ index 38e4987dc906cf3c668995aab79fc15a02834677..de9d69a4faab3cfa249de41ef573ae2e
        if (element != row) {
          row?.toggleAttribute("descendant-selected", true);
        }
-@@ -3232,7 +3234,7 @@ export class UrlbarView {
+@@ -3336,7 +3338,7 @@ export class UrlbarView {
    }
  
    #enableOrDisableRowWrap() {
diff --git a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
index 20abe082c..84d8a7803 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 7e50d7f5512cb4304d6fd2ecb6952fbff0b8f98e..ba09805f07b754b4b36d5a650252d5578184d031 100644
+index bd453da1b0eca276f319aadf451258e7db021365..da64e88eb58ba1b15c31034684f9d259339f4438 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -250,7 +250,7 @@ export const PREFS_CONFIG = new Map([
+@@ -251,7 +251,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 f4bb3e12d..b49cc0fd6 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 bb06e9224a4e195122d8a47ccf97c3481342cf86..959862e95ec00c7dc18256bd2572c1d7285415d4 100644
+index 6bb2e64906d6fe173c9129dd9c9c80b5323416b1..9f1fb4764c8c13a02cf0d384cfa71cc16e3c8701 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -372,17 +372,17 @@ bin/libfreebl_64int_3.so
+@@ -373,17 +373,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
diff --git a/src/browser/installer/windows/nsis/defines-nsi-in.patch b/src/browser/installer/windows/nsis/defines-nsi-in.patch
index 09d60e5e3..5f2a50789 100644
--- a/src/browser/installer/windows/nsis/defines-nsi-in.patch
+++ b/src/browser/installer/windows/nsis/defines-nsi-in.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
-index 51743f6157d69e9303ed480254c199791f1a4db8..2e113512c2f0b094aa50a4f0499607ad9eb7eaf8 100644
+index c6bb41695d70d17e5691e0d1856b79f7111d5026..8a9393a79a60aca23f80fc989fe2ae333ba54e39 100644
 --- a/browser/installer/windows/nsis/defines.nsi.in
 +++ b/browser/installer/windows/nsis/defines.nsi.in
 @@ -90,7 +90,7 @@
@@ -11,7 +11,7 @@ index 51743f6157d69e9303ed480254c199791f1a4db8..2e113512c2f0b094aa50a4f0499607ad
  
  # ARCH is used when it is necessary to differentiate the x64 registry keys from
  # the x86 registry keys (e.g. the uninstall registry key).
-@@ -153,7 +153,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
+@@ -152,7 +152,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
  !define APPROXIMATE_REQUIRED_SPACE_MB "145"
  
  # Constants for parts of the telemetry submission URL
diff --git a/src/browser/installer/windows/nsis/installer-nsi.patch b/src/browser/installer/windows/nsis/installer-nsi.patch
index 5c43ebe60..1b32fe7df 100644
--- a/src/browser/installer/windows/nsis/installer-nsi.patch
+++ b/src/browser/installer/windows/nsis/installer-nsi.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
-index 4ecf1ea7e325b23a901ec75687c6b959085c8207..28c4b462dab0c4830a4bfb4c9cdf82a8aa919456 100755
+index e877b4b8a8cc6fc233025d0b58de50a68ecb9fd9..9d7d9064d0b4c62a3de3b81e852b2b49170bf8a3 100755
 --- a/browser/installer/windows/nsis/installer.nsi
 +++ b/browser/installer/windows/nsis/installer.nsi
-@@ -842,7 +842,7 @@ Section "-InstallEndCleanup"
+@@ -836,7 +836,7 @@ Section "-InstallEndCleanup"
    ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't
    ; invoked when we're running silently.
    ${If} ${Silent}
@@ -11,7 +11,7 @@ index 4ecf1ea7e325b23a901ec75687c6b959085c8207..28c4b462dab0c4830a4bfb4c9cdf82a8
    ${EndIf}
  SectionEnd
  
-@@ -1970,5 +1970,5 @@ FunctionEnd
+@@ -1964,5 +1964,5 @@ FunctionEnd
  
  Function .onGUIEnd
    ${OnEndCommon}
diff --git a/src/browser/installer/windows/nsis/uninstaller-nsi.patch b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
index 2136ef157..55290f036 100644
--- a/src/browser/installer/windows/nsis/uninstaller-nsi.patch
+++ b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
@@ -1,10 +1,10 @@
 diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
 old mode 100755
 new mode 100644
-index fd104f8ab0bd51d6a99c121b60e2695a54b0dfd0..9b117e5a1f5e8adac7d22cd65154529418fd2e5b
+index 4eecccea6e053073fafad35cc97b326f7d0f5162..e4d077415294d456539637868144331ea9a46753
 --- a/browser/installer/windows/nsis/uninstaller.nsi
 +++ b/browser/installer/windows/nsis/uninstaller.nsi
-@@ -519,6 +519,7 @@ Section "Uninstall"
+@@ -514,6 +514,7 @@ Section "Uninstall"
    ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
    ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"
    ${un.RegCleanFileHandler}  ".avif"  "FirefoxHTML-$AppUserModelID"
diff --git a/src/browser/modules/URILoadingHelper-sys-mjs.patch b/src/browser/modules/URILoadingHelper-sys-mjs.patch
index d507c1852..b525e3bc6 100644
--- a/src/browser/modules/URILoadingHelper-sys-mjs.patch
+++ b/src/browser/modules/URILoadingHelper-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/modules/URILoadingHelper.sys.mjs b/browser/modules/URILoadingHelper.sys.mjs
-index 04d0b47099648cfd00e72ef260d44628718809ee..49cd0215778a33a80d1f45b8e2701410d016a5a3 100644
+index a3a84f96e54e5b74ad15f3825b380c30c117695f..ca702841c1df404a6f270ac08f962c8a225549d8 100644
 --- a/browser/modules/URILoadingHelper.sys.mjs
 +++ b/browser/modules/URILoadingHelper.sys.mjs
-@@ -541,7 +541,7 @@ export const URILoadingHelper = {
+@@ -542,7 +542,7 @@ export const URILoadingHelper = {
        // page. If a load request bounces off for the currently selected tab,
        // we'll open a new tab instead.
        let tab = w.gBrowser.getTabForBrowser(targetBrowser);
@@ -11,7 +11,7 @@ index 04d0b47099648cfd00e72ef260d44628718809ee..49cd0215778a33a80d1f45b8e2701410
          where = "tab";
          targetBrowser = null;
        } else if (
-@@ -971,7 +971,7 @@ export const URILoadingHelper = {
+@@ -972,7 +972,7 @@ export const URILoadingHelper = {
          ignoreQueryString || replaceQueryString,
          ignoreFragmentWhenComparing
        );
@@ -20,7 +20,7 @@ index 04d0b47099648cfd00e72ef260d44628718809ee..49cd0215778a33a80d1f45b8e2701410
        for (let i = 0; i < browsers.length; i++) {
          let browser = browsers[i];
          let browserCompare = cleanURL(
-@@ -1017,7 +1017,7 @@ export const URILoadingHelper = {
+@@ -1018,7 +1018,7 @@ export const URILoadingHelper = {
            }
  
            if (!doAdopt) {
diff --git a/src/browser/themes/linux/browser-css.patch b/src/browser/themes/linux/browser-css.patch
index d22b13b43..03ca83a6f 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 b0ec88f361399cea255ef8fb6c7f2b87779a8e04..5b0d0bd663c309be3ddd0e946e1681b66938ee4d 100644
+index 646cf238ebfbd5ac1826cf47f578f66aa020199f..ba5a1950f683c4d8cb836ee9cd466c0b446f2241 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
 @@ -14,7 +14,6 @@
diff --git a/src/browser/themes/osx/browser-css.patch b/src/browser/themes/osx/browser-css.patch
index 7cf8f61bb..9dbafc524 100644
--- a/src/browser/themes/osx/browser-css.patch
+++ b/src/browser/themes/osx/browser-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
-index 0a15e3d60d408f119bd03007567d5dd1fa178c36..443901657296d0d15a95e1d39e826b1c008aac4d 100644
+index 79f62b14809196e6ac073b8e560331e96be5d990..dcec04606e78c66673fb602b6a986321d20e1d4c 100644
 --- a/browser/themes/osx/browser.css
 +++ b/browser/themes/osx/browser.css
-@@ -38,7 +38,7 @@
+@@ -37,7 +37,7 @@
  
  .titlebar-buttonbox {
    &:-moz-locale-dir(ltr) {
diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch
index 2a7d63eb1..e3bfed1e3 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 2b013ee77bb50db11e73152bd0265dd86e40b726..dc0ba2c8651470bcd81439953adbaca26a4a5b8c 100644
+index 3cecc295f3ac764ed07094021372d35107df78ed..760f8bdcff87a6b803b115b249269438a27f8d80 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
 @@ -102,7 +102,7 @@ body {
@@ -20,7 +20,7 @@ index 2b013ee77bb50db11e73152bd0265dd86e40b726..dc0ba2c8651470bcd81439953adbaca2
    }
  
    /* Themes define a set of toolbox foreground and background colors which we
-@@ -282,13 +280,13 @@ body {
+@@ -281,13 +279,13 @@ body {
  
    @media (-moz-platform: macos) and (not (-moz-mac-rtl)) {
      &:-moz-locale-dir(ltr) {
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 6f4941ae0..575bfe1bf 100644
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index d542e962d42b17140888e299ed43a838047ee48c..806bc4f9d7b7557abf316a84858046e04c4f7ff5 100644
+index 34e9206ff45592db2b1b24568f1f6f1bf16b4c3a..6fa3f13dd18f90bcc0c715c4896617fdfce4887e 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
 @@ -7,7 +7,7 @@
diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch
index ca613d9f9..7e4a54e8e 100644
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index 6085ce0614c9ea7d650c9526b295953f46b30cb6..06b4af758d9ae033dd0b7436f08e6748047c8bbe 100644
+index ff198352720d7935b497e43f3e6b8ca04905e885..63e09db981a7ae35b1bb2c610133f624e8f61b74 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -317,3 +317,5 @@
+@@ -323,3 +323,5 @@
  
    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)
diff --git a/src/browser/themes/shared/tabbrowser/content-area-css.patch b/src/browser/themes/shared/tabbrowser/content-area-css.patch
index b719d9abf..f5d463470 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 db68a04d85c12a383ed33b459b9c8d942fe916f7..2941cf4010e24b31a3d9b2194fe9536f23063dbd 100644
+index 55f33b3f630ca0eea7e4bde19f9875802c8aec78..f11fdaab05baf85fe2b56fa07442ded3c9641abc 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
 @@ -140,7 +140,6 @@
@@ -10,7 +10,7 @@ index db68a04d85c12a383ed33b459b9c8d942fe916f7..2941cf4010e24b31a3d9b2194fe9536f
    }
  
    browser[type="content"] {
-@@ -323,7 +322,7 @@
+@@ -377,7 +376,7 @@ split-view-footer {
  
  .dialogStack {
    z-index: var(--browser-stack-z-index-dialog-stack);
diff --git a/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch b/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
index 5393678e5..e9c53ae18 100644
--- a/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
+++ b/src/browser/themes/shared/tabbrowser/ctrlTab-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/ctrlTab.css b/browser/themes/shared/tabbrowser/ctrlTab.css
-index 259e11f3c9a761e158dc32a3ecb9ee90c11d27c6..c5e30314090fe8f33b37c809bcf871c7b8c4d3da 100644
+index ffda4922c675f6159c825334cba9d49658d316ba..7b3d4d2b5c6d732a1d0074e05cc48131fe57c630 100644
 --- a/browser/themes/shared/tabbrowser/ctrlTab.css
 +++ b/browser/themes/shared/tabbrowser/ctrlTab.css
 @@ -11,6 +11,7 @@
@@ -8,5 +8,5 @@ index 259e11f3c9a761e158dc32a3ecb9ee90c11d27c6..c5e30314090fe8f33b37c809bcf871c7
    -moz-window-shadow: none;
 +  --panel-shadow-margin: 0;
    @media not (-moz-platform: macos) {
-     font-weight: bold;
+     font-weight: var(--font-weight-bold);
    }
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index 2bd6bb28d..cd32f20e4 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 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2bff889716 100644
+index 8a4d3860b344e2dc2128cfc2b1673de582e19c7c..f8e108d2c1c71070375fdae12df432311b0081e1 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -21,7 +21,7 @@
@@ -23,7 +23,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
    --tab-selected-bgcolor: var(--toolbar-bgcolor);
    --tab-selected-color-scheme: var(--toolbar-color-scheme);
    &[lwt-tab-selected="light"] {
-@@ -267,7 +267,6 @@
+@@ -285,7 +285,6 @@
    }
  
    :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -31,7 +31,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
    }
  
    &:is([selected], [multiselected]) {
-@@ -281,6 +280,7 @@
+@@ -299,6 +298,7 @@
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -39,7 +39,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
  
      &::before {
        position: absolute;
-@@ -480,14 +480,11 @@
+@@ -498,14 +498,11 @@
  .tab-icon-image {
    -moz-context-properties: fill, stroke;
    fill: currentColor;
@@ -55,7 +55,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -504,10 +501,6 @@
+@@ -522,10 +519,6 @@
    /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
      &[pending][discarded] {
@@ -66,7 +66,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -575,7 +568,7 @@
+@@ -593,7 +586,7 @@
    z-index: 1; /* Overlay tab title */
  
    #tabbrowser-tabs[orient="vertical"] & {
@@ -75,7 +75,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
    }
  
    &[crashed] {
-@@ -583,7 +576,7 @@
+@@ -601,7 +594,7 @@
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -84,7 +84,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -640,7 +633,7 @@
+@@ -658,7 +651,7 @@
      }
    }
  
@@ -93,7 +93,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
    &[crashed] {
      display: revert;
    }
-@@ -741,7 +734,7 @@
+@@ -759,7 +752,7 @@
        has not been added to root. There are certain scenarios when that attribute is temporarily
        removed from root such as when toggling the sidebar to expand with the toolbar button. */
      #tabbrowser-tabs[orient="horizontal"] &:not([pinned]):not([crashed]),
@@ -102,7 +102,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1245,7 +1238,7 @@ tab-group {
+@@ -1446,7 +1439,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
@@ -111,7 +111,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
    &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -1692,7 +1685,7 @@ tab-group {
+@@ -1893,7 +1886,7 @@ tab-group {
    }
  }
  
@@ -120,7 +120,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -1703,7 +1696,7 @@ tab-group {
+@@ -1904,7 +1897,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -129,7 +129,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
    }
  
    &:hover {
-@@ -1727,7 +1720,7 @@ tab-group {
+@@ -1928,7 +1921,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 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
    margin-block: var(--tab-block-margin);
  }
  
-@@ -1915,7 +1908,6 @@ tab-group {
+@@ -2116,7 +2109,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -146,7 +146,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
      }
  
      .tab-background {
-@@ -1955,8 +1947,8 @@ tab-group {
+@@ -2156,8 +2148,8 @@ tab-group {
        display: block;
        position: absolute;
        inset: auto;
@@ -157,7 +157,7 @@ index 13edfa4a6975828ab8dbdce15215f2e4ee548249..9fc2cd93235eb14d8d8d5a7611ec8f2b
  
        &:-moz-window-inactive {
          background-image:
-@@ -2075,7 +2067,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2276,7 +2268,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  
diff --git a/src/browser/themes/shared/urlbar-searchbar-css.patch b/src/browser/themes/shared/urlbar-searchbar-css.patch
index 1c291ce84..b7a9ced81 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 15dcfbc95afab9f28bd58379da0ef3e24d1b4595..73827cc5cffe47099feea36cbeffb547e955b37e 100644
+index 45a87b96db14f64e0d8a3a3aae07f76c8f7e765f..d75f61cb2d27205aa2c47cf902d38e26098fbf2c 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
 @@ -6,7 +6,7 @@
diff --git a/src/browser/themes/shared/urlbarView-css.patch b/src/browser/themes/shared/urlbarView-css.patch
index 4c7e0779e..fa66900c8 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 e0a05846eb0a329fc58b660f806912a1afe7c6c9..0d02e227a84ff4229104dd9cf9cd20f50a8d136c 100644
+index d59a4e8514c3e8f16c2512abacf8e95d7e7255c5..5c226bed71203dc39723f07107b3de89e0d1776f 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 c8e03bdee..7a420ac41 100644
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index e1a79cd22180738d2ca16e9a6c5591499d337325..d36996359bfa4dd7d98c4f5aeb192c7b144339bb 100644
+index b114781254018a27cd559c28d5d469fbab8673b5..79e6e21dd6e0a63237850bd315558540f050793c 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
-@@ -31,7 +31,6 @@
+@@ -39,7 +39,6 @@
      /* stylelint-disable-next-line media-query-no-invalid */
      @media -moz-pref("widget.windows.mica.toplevel-backdrop", 2) {
        /* For acrylic, do the same we do for popups to guarantee some contrast */
@@ -10,7 +10,7 @@ index e1a79cd22180738d2ca16e9a6c5591499d337325..d36996359bfa4dd7d98c4f5aeb192c7b
      }
  
      /* Using a semitransparent background preserves the tinting from the backdrop.
-@@ -60,14 +59,13 @@
+@@ -68,14 +67,13 @@
  }
  
  /* This is needed for Windows 10, see bug 1961257 */
diff --git a/src/devtools/server/actors/animation-type-longhand-js.patch b/src/devtools/server/actors/animation-type-longhand-js.patch
index 8ac01e934..37951d646 100644
--- a/src/devtools/server/actors/animation-type-longhand-js.patch
+++ b/src/devtools/server/actors/animation-type-longhand-js.patch
@@ -1,5 +1,5 @@
 diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
-index a0026f953e8383741221d60ed5c02d0c12740f09..fd5c49d0b8997f29d3dee8dc23e2c373341eb972 100644
+index 76c58a23422b923e191870f27090c7fc6d63884e..b19f47d31195774cec2c7e67903c892aa1329f3d 100644
 --- a/devtools/server/actors/animation-type-longhand.js
 +++ b/devtools/server/actors/animation-type-longhand.js
 @@ -342,6 +342,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
diff --git a/src/devtools/startup/DevToolsStartup-sys-mjs.patch b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
index 2293dd2d0..c21547187 100644
--- a/src/devtools/startup/DevToolsStartup-sys-mjs.patch
+++ b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs
-index 7d26af162be5620649ff36d7cf7d3835a8ac7a20..c0fbd46c22f1eacc82058919714174d15e8106f1 100644
+index 50fd07c1365ad25dc31c806f11751368f0d27a46..e26e90ece2d5dc42312f95661b5a38eec3556986 100644
 --- a/devtools/startup/DevToolsStartup.sys.mjs
 +++ b/devtools/startup/DevToolsStartup.sys.mjs
-@@ -816,6 +816,7 @@ DevToolsStartup.prototype = {
+@@ -829,6 +829,7 @@ DevToolsStartup.prototype = {
      // account (see bug 832984).
      const mainKeyset = doc.getElementById("mainKeyset");
      mainKeyset.parentNode.insertBefore(keyset, mainKeyset);
diff --git a/src/docshell/base/nsAboutRedirector-cpp.patch b/src/docshell/base/nsAboutRedirector-cpp.patch
index 527a48635..f1a78228a 100644
--- a/src/docshell/base/nsAboutRedirector-cpp.patch
+++ b/src/docshell/base/nsAboutRedirector-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index 625640eef45baba74255c00c603f0834e1f0aa2c..8b7893cf3848edf9121f7cbefcc3a1c76894fa37 100644
+index 49779b7cc79a602e764c8346e17a02310808aab8..1b1000cf7177bd83ca6d6c484a1c3b48c7216fc9 100644
 --- a/docshell/base/nsAboutRedirector.cpp
 +++ b/docshell/base/nsAboutRedirector.cpp
-@@ -118,7 +118,7 @@ static const RedirEntry kRedirMap[] = {
+@@ -117,7 +117,7 @@ static const RedirEntry kRedirMap[] = {
      {"crashes", "chrome://global/content/crashes.html",
       nsIAboutModule::IS_SECURE_CHROME_UI},
  #endif
diff --git a/src/dom/base/Document-cpp.patch b/src/dom/base/Document-cpp.patch
index 18ca663f2..46c246c18 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 55d24fe16311a286813f7668a227d2ef0cc7e5d7..1a7c2352daf1e04e38a8fb81f80a1f9a58ba2cb5 100644
+index 5a890d76ef8398c1a8dc6d84a6c43ec7e2b7c39e..aa25c68e36010004b95c14b8a8a88ca7e85de84d 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -465,6 +465,7 @@
+@@ -461,6 +461,7 @@
  #include "prtime.h"
  #include "prtypes.h"
  #include "xpcpublic.h"
@@ -10,7 +10,7 @@ index 55d24fe16311a286813f7668a227d2ef0cc7e5d7..1a7c2352daf1e04e38a8fb81f80a1f9a
  
  // clang-format off
  #include "mozilla/Encoding.h"
-@@ -3442,6 +3443,10 @@ void Document::FillStyleSetUserAndUASheets() {
+@@ -3446,6 +3447,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 0ec931469..9c3e53f05 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 81d73c33af8c95e6f687c05354fb8a0e894dcd44..775742e1e4f84618dce45cbcb14229dc6c4f2b64 100644
+index 0635fe4dc5bf231300c1b53b093e2200c4fde134..c1d868cb7ebcf322885d562217ff9c03b16f7119 100644
 --- a/dom/base/use_counter_metrics.yaml
 +++ b/dom/base/use_counter_metrics.yaml
-@@ -21086,6 +21086,22 @@ use.counter.css.page:
+@@ -21154,6 +21154,22 @@ use.counter.css.page:
      send_in_pings:
        - use-counters
  
@@ -25,7 +25,7 @@ index 81d73c33af8c95e6f687c05354fb8a0e894dcd44..775742e1e4f84618dce45cbcb14229dc
    css_transform_origin:
      type: counter
      description: >
-@@ -33056,6 +33072,22 @@ use.counter.css.doc:
+@@ -33124,6 +33140,22 @@ use.counter.css.doc:
      send_in_pings:
        - use-counters
  
diff --git a/src/dom/media/mediacontrol/MediaStatusManager-cpp.patch b/src/dom/media/mediacontrol/MediaStatusManager-cpp.patch
index 9e005e88c..4ec84b181 100644
--- a/src/dom/media/mediacontrol/MediaStatusManager-cpp.patch
+++ b/src/dom/media/mediacontrol/MediaStatusManager-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/dom/media/mediacontrol/MediaStatusManager.cpp b/dom/media/mediacontrol/MediaStatusManager.cpp
-index 9d62b302fb519df9c00e26e8876dc6adcbc0b448..ece3509d2a99dee1cf7c22749b38959340c85976 100644
+index c1282b8b1d99327df972c8f0aa848816fcbc4b2b..acaaff389838886267f96993a7f0d27950f08624 100644
 --- a/dom/media/mediacontrol/MediaStatusManager.cpp
 +++ b/dom/media/mediacontrol/MediaStatusManager.cpp
 @@ -427,7 +427,8 @@ void MediaStatusManager::UpdateGuessedPositionState(
diff --git a/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
index 19c73e158..47846b210 100644
--- a/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
+++ b/src/dom/media/mediaelement/HTMLMediaElement-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
-index 3cb7a43dd9535ccf6ffaa60df39b487f07760208..ed3632e9f38ee88df39500356777ae5b3ba7202a 100644
+index f26c8c26354fd65ebf2c5f4797cb2bd200f764e6..90e0b81b471d8bfa0140fa3c7996f7b796564d50 100644
 --- a/dom/media/mediaelement/HTMLMediaElement.cpp
 +++ b/dom/media/mediaelement/HTMLMediaElement.cpp
-@@ -453,6 +453,7 @@ class HTMLMediaElement::MediaControlKeyListener final
+@@ -451,6 +451,7 @@ class HTMLMediaElement::MediaControlKeyListener final
      // audible state. Therefore, in that case we would noitfy the audible state
      // when media starts playing.
      if (mState == MediaPlaybackState::ePlayed) {
@@ -10,7 +10,7 @@ index 3cb7a43dd9535ccf6ffaa60df39b487f07760208..ed3632e9f38ee88df39500356777ae5b
        NotifyAudibleStateChanged(mIsOwnerAudible
                                      ? MediaAudibleState::eAudible
                                      : MediaAudibleState::eInaudible);
-@@ -7234,6 +7235,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+@@ -7232,6 +7233,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
      QueueTask(std::move(runner));
      mQueueTimeUpdateRunnerTime = TimeStamp::Now();
      mLastCurrentTime = CurrentTime();
diff --git a/src/firefox-patches/147_windows_border_fix_1.patch b/src/firefox-patches/147_windows_border_fix_1.patch
deleted file mode 100644
index fded21ca5..000000000
--- a/src/firefox-patches/147_windows_border_fix_1.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 433cc8224790300fdabe76bd225b644c1812da34 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Thu, 27 Nov 2025 15:28:12 +0000
-Subject: [PATCH] Bug 1993474 - Ensure our WNDPROC has precedence over
- WinAppSDK's. r=gstoll,win-reviewers
-
-See the comment for reasoning. WM_NCCALCSIZE wasn't getting called, and
-we rely on that to get the right client area on things like maximized
-windows.
-
-Differential Revision: https://phabricator.services.mozilla.com/D274281
----
- widget/windows/nsWindow.cpp | 32 ++++++++++++++++++++++----------
- widget/windows/nsWindow.h   |  2 ++
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index 0b98d157097da..b357df236cfcd 100644
---- a/widget/windows/nsWindow.cpp
-+++ b/widget/windows/nsWindow.cpp
-@@ -1520,12 +1520,31 @@ DWORD nsWindow::WindowExStyle() {
-  *
-  **************************************************************/
- 
-+bool nsWindow::ShouldAssociateWithWinAppSDK() const {
-+  // We currently don't need any SDK functionality for for PiP windows,
-+  // and using the SDK on these windows causes them to go under the
-+  // taskbar (bug 1995838).
-+  //
-+  // TODO(emilio): That might not be true anymore after bug 1993474,
-+  // consider re-testing and removing that special-case.
-+  return IsTopLevelWidget() && !mIsPIPWindow;
-+}
-+
- bool nsWindow::AssociateWithNativeWindow() {
-   if (!mWnd || !IsWindow(mWnd)) {
-     NS_ERROR("Invalid window handle");
-     return false;
-   }
- 
-+  if (ShouldAssociateWithWinAppSDK()) {
-+    // Make sure to call this here to associate our window with the
-+    // Windows App SDK _before_ setting our WNDPROC, if needed.
-+    // This is important because the SDKs WNDPROC might handle messages like
-+    // WM_NCCALCSIZE without calling into us, and that can cause sizing issues,
-+    // see bug 1993474.
-+    WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
-+  }
-+
-   // Connect the this pointer to the native window handle.
-   // This should be done before SetWindowLongPtrW, because nsWindow::WindowProc
-   // uses WinUtils::GetNSWindowPtr internally.
-@@ -1552,12 +1571,7 @@ void nsWindow::DissociateFromNativeWindow() {
-   DebugOnly<WNDPROC> wndProcBeforeDissociate =
-       reinterpret_cast<WNDPROC>(::SetWindowLongPtrW(
-           mWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(*mPrevWndProc)));
--  // If we've used the Windows App SDK to remove the minimize/maximize/close
--  // entries from the titlebar, then the Windows App SDK sets its own WNDPROC
--  // own the window, so this assertion would fail. But we only do this if
--  // Mica is available.
--  NS_ASSERTION(WinUtils::MicaAvailable() ||
--                   wndProcBeforeDissociate == nsWindow::WindowProc,
-+  NS_ASSERTION(wndProcBeforeDissociate == nsWindow::WindowProc,
-                "Unstacked an unexpected native window procedure");
- 
-   WinUtils::SetNSWindowPtr(mWnd, nullptr);
-@@ -2835,9 +2849,7 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
-     mCustomNonClientMetrics = {};
-     ResetLayout();
-   }
--  // Not needed for PiP windows, and using the Windows App SDK on
--  // these windows causes them to go under the taskbar (bug 1995838)
--  if (!mPIPWindow) {
-+  if (ShouldAssociateWithWinAppSDK()) {
-     WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
-   }
- }
-diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
-index 20f016757dfee..2756b248368a3 100644
---- a/widget/windows/nsWindow.h
-+++ b/widget/windows/nsWindow.h
-@@ -335,6 +335,8 @@ class nsWindow final : public nsIWidget {
- 
-   bool IsRTL() const { return mIsRTL; }
- 
-+  bool ShouldAssociateWithWinAppSDK() const;
-+
-   /**
-    * AssociateDefaultIMC() associates or disassociates the default IMC for
-    * the window.
diff --git a/src/firefox-patches/147_windows_border_fix_2.patch b/src/firefox-patches/147_windows_border_fix_2.patch
deleted file mode 100644
index 1556c30a6..000000000
--- a/src/firefox-patches/147_windows_border_fix_2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 418e274c76f9e6b2d1149048cb399f1f6d709553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Thu, 27 Nov 2025 15:31:40 +0000
-Subject: [PATCH] Bug 1993474 - Remove redundant nsWindow::mPIPWindow.
- r=win-reviewers,gstoll
-
-nsIWidget already has a member for this.
-
-Differential Revision: https://phabricator.services.mozilla.com/D274282
----
- widget/windows/nsWindow.cpp | 4 +---
- widget/windows/nsWindow.h   | 3 ---
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index b357df236cfc..19f5980a106f 100644
---- a/widget/windows/nsWindow.cpp
-+++ b/widget/windows/nsWindow.cpp
-@@ -817,7 +817,6 @@ static bool IsCloaked(HWND hwnd) {
- nsWindow::nsWindow()
-     : nsBaseWidget(BorderStyle::Default),
-       mFrameState(std::in_place, this),
--      mPIPWindow(false),
-       mMicaBackdrop(false),
-       mLastPaintEndTime(TimeStamp::Now()),
-       mCachedHitTestTime(TimeStamp::Now()),
-@@ -1028,7 +1027,6 @@ nsresult nsWindow::Create(nsIWidget* aParent, const LayoutDeviceIntRect& aRect,
-       aParent ? (HWND)aParent->GetNativeData(NS_NATIVE_WINDOW) : nullptr;
- 
-   mIsRTL = aInitData->mRTL;
--  mPIPWindow = aInitData->mPIPWindow;
-   mOpeningAnimationSuppressed = aInitData->mIsAnimationSuppressed;
-   mAlwaysOnTop = aInitData->mAlwaysOnTop;
-   mIsAlert = aInitData->mIsAlert;
-@@ -2807,7 +2805,7 @@ bool nsWindow::UpdateNonClientMargins(bool aReflowWindow) {
-     // frame sizes for left, right and bottom since Windows will automagically
-     // position the edges "offscreen" for maximized windows.
-     metrics.mOffset.top = metrics.mCaptionHeight;
--  } else if (mPIPWindow &&
-+  } else if (mIsPIPWindow &&
-              !StaticPrefs::widget_windows_pip_decorations_enabled()) {
-     metrics.mOffset = metrics.DefaultMargins();
-   } else {
-diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
-index 2756b248368a..9e6b4d41d721 100644
---- a/widget/windows/nsWindow.h
-+++ b/widget/windows/nsWindow.h
-@@ -852,9 +852,6 @@ class nsWindow final : public nsIWidget {
-   // Whether we're in the process of sending a WM_SETTEXT ourselves
-   bool mSendingSetText = false;
- 
--  // Whether we're a PIP window.
--  bool mPIPWindow : 1;
--
-   // Whether we are asked to render a mica backdrop.
-   bool mMicaBackdrop : 1;
- 
diff --git a/src/firefox-patches/147_windows_border_fix_3.patch b/src/firefox-patches/147_windows_border_fix_3.patch
deleted file mode 100644
index 5b7d03a47..000000000
--- a/src/firefox-patches/147_windows_border_fix_3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Fri, 28 Nov 2025 15:06:26 +0000
-Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
- non-collapsed titlebar. r=win-reviewers,gstoll
-
-This seems to actually go to the default DWM stuff and is the documented
-way of doing so:
-
-https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
-
-Differential Revision: https://phabricator.services.mozilla.com/D274413
----
- widget/windows/WindowsUIUtils.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
-index a5a6c893e7056..abaabfba69dfa 100644
---- a/widget/windows/WindowsUIUtils.cpp
-+++ b/widget/windows/WindowsUIUtils.cpp
-@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
-     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
-     return;
-   }
--  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
-+  if (aIsCollapsed) {
-+    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
-+  } else {
-+    hr = titleBar->ResetToDefault();
-+  }
-   if (FAILED(hr)) {
-     MOZ_LOG(gWindowsLog, LogLevel::Error,
-             ("Skipping SetIsTitlebarCollapsed() because "
diff --git a/src/firefox-patches/147_windows_border_fix_4.patch b/src/firefox-patches/147_windows_border_fix_4.patch
deleted file mode 100644
index 597ffa21e..000000000
--- a/src/firefox-patches/147_windows_border_fix_4.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From bb40796bb2ff8be97e2adcdad78d9b9ea1d3ea18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Fri, 28 Nov 2025 15:27:41 +0000
-Subject: [PATCH] Bug 2002990 - Save some work on startup to associate a native
- window with the app sdk. r=gstoll,win-reviewers
-
-We only need to grab its AppWindow for that to happen. Save some useless
-QI while at it.
-
-I'm pretty sure bug 2002986 would also help here but this seems worth
-doing regardless.
-
-Differential Revision: https://phabricator.services.mozilla.com/D274419
----
- widget/windows/WindowsUIUtils.cpp | 126 ++++++++++++++----------------
- widget/windows/WindowsUIUtils.h   |   1 +
- widget/windows/nsWindow.cpp       |   2 +-
- 3 files changed, 62 insertions(+), 67 deletions(-)
-
-diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
-index abaabfba69dfa..1ad39b98c20e0 100644
---- a/widget/windows/WindowsUIUtils.cpp
-+++ b/widget/windows/WindowsUIUtils.cpp
-@@ -1211,7 +1211,35 @@ using GetWindowIdFromWindowType = HRESULT(STDAPICALLTYPE*)(
- static GetWindowIdFromWindowType sGetWindowIdFromWindowProc = nullptr;
- 
- // Returns whether initialization succeeded
--bool InitializeWindowsAppSDKStatics() {
-+[[nodiscard]] static bool InitializeWindowsAppSDKStatics() {
-+  MOZ_ASSERT(NS_IsMainThread());
-+  // This function is needed to avoid drawing the titlebar buttons
-+  // when the Windows mica backdrop is enabled. (bug 1934040)
-+  // If it isn't possible for mica to be enabled, we don't need to do anything.
-+  // The Windows App SDK that we use here doesn't support older versions of
-+  // Windows 10 that Firefox does.
-+  if (!widget::WinUtils::MicaAvailable()) {
-+    MOZ_LOG(
-+        gWindowsLog, LogLevel::Info,
-+        ("Skipping SetIsTitlebarCollapsed() because mica is not available"));
-+    return false;
-+  }
-+  // This pref is only false on certain test runs (most notably
-+  // opt-talos-xperf), the Windows App SDK fails calling
-+  // DCompositionCreateDevice3() with ERROR_ACCESS_DENIED, and the code assumes
-+  // it is going to succeed so it proceeds to crash deferencing null.
-+  //
-+  // We're not exactly sure why this is happening right now, but I'm pretty sure
-+  // it's specific to how we're running Firefox on those test runs, and
-+  // I don't think any users will run into this. So those tests pass the
-+  // --disable-windowsappsdk command line argument to avoid using
-+  // the Windows App SDK.
-+  if (!StaticPrefs::widget_windows_windowsappsdk_enabled()) {
-+    MOZ_LOG(gWindowsLog, LogLevel::Info,
-+            ("Skipping SetIsTitlebarCollapsed() because "
-+             "widget.windows.windowsappsdk.enabled is false"));
-+    return false;
-+  }
-   if (!sGetWindowIdFromWindowProc) {
-     HMODULE frameworkUdkModule =
-         ::LoadLibraryW(L"Microsoft.Internal.FrameworkUdk.dll");
-@@ -1303,51 +1331,14 @@ bool InitializeWindowsAppSDKStatics() {
-   }
-   return true;
- }
--#endif
- 
--void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
--#ifndef __MINGW32__
--  // Used to avoid synchronization for loading libraries below
--  MOZ_ASSERT(NS_IsMainThread());
--  // This function is needed to avoid drawing the titlebar buttons
--  // when the Windows mica backdrop is enabled. (bug 1934040)
--  // If it isn't possible for mica to be enabled, we don't need to do anything.
--  // This also helps prevent problems because the Windows App SDK that we use
--  // here doesn't support older versions of Windows 10 that Firefox does.
--  if (!widget::WinUtils::MicaAvailable()) {
--    MOZ_LOG(
--        gWindowsLog, LogLevel::Info,
--        ("Skipping SetIsTitlebarCollapsed() because mica is not available"));
--    return;
--  }
--  // This pref is only false on certain test runs (most notably
--  // opt-talos-xperf), the Windows App SDK fails calling
--  // DCompositionCreateDevice3() with ERROR_ACCESS_DENIED, and the code assumes
--  // it is going to succeed so it proceeds to crash deferencing null.
--  //
--  // We're not exactly sure why this is happening right now, but I'm pretty sure
--  // it's specific to how we're running Firefox on those test runs, and
--  // I don't think any users will run into this. So those tests pass the
--  // --disable-windowsappsdk command line argument to avoid using
--  // the Windows App SDK.
--  if (!StaticPrefs::widget_windows_windowsappsdk_enabled()) {
--    MOZ_LOG(gWindowsLog, LogLevel::Info,
--            ("Skipping SetIsTitlebarCollapsed() because "
--             "widget.windows.windowsappsdk.enabled is false"));
--    return;
--  }
-+static RefPtr<winrt::Microsoft::UI::Windowing::IAppWindow>
-+GetAppWindowForWindow(HWND aWnd) {
-   if (!InitializeWindowsAppSDKStatics()) {
--    return;
-+    return nullptr;
-   }
--
--  // The Microsoft documentation says that we should be checking
--  // AppWindowTitleBar::IsCustomizationSupported() before calling methods
--  // on the title bar. However, it also says that customization is fully
--  // supported since Windows App SDK v1.2 on Windows 11, and Mica is only
--  // available on Windows 11, so it should be safe to skip this check.
--
-   // Retrieve the WindowId that corresponds to hWnd.
--  struct winrt::Microsoft::UI::WindowId windowId;
-+  struct winrt::Microsoft::UI::WindowId windowId{0};
-   HRESULT hr = sGetWindowIdFromWindowProc(aWnd, &windowId);
-   if (FAILED(hr) || windowId.value == 0) {
-     MOZ_LOG(gWindowsLog, LogLevel::Error,
-@@ -1355,25 +1346,40 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
-              "GetWindowIdFromWindow failed, hr=0x%" PRIX32,
-              static_cast<uint32_t>(hr)));
-     MOZ_ASSERT_UNREACHABLE("GetWindowIdFromWindow failed");
--    return;
-+    return nullptr;
-   }
- 
-   RefPtr<winrt::Microsoft::UI::Windowing::IAppWindow> appWindow;
--  hr = (HRESULT)sAppWindowStatics->GetFromWindowId(windowId,
--                                                   getter_AddRefs(appWindow));
--  if (FAILED(hr) || !appWindow) {
--    // Hedge our bets here and don't assert because it's possible this
--    // is a weird sort of window or something.
-+  sAppWindowStatics->GetFromWindowId(windowId, getter_AddRefs(appWindow));
-+  return appWindow;
-+}
-+#endif
-+
-+void WindowsUIUtils::AssociateWithWinAppSDK(HWND aWnd) {
-+#ifndef __MINGW32__
-+  RefPtr win = GetAppWindowForWindow(aWnd);
-+  (void)win;
-+#endif
-+}
-+
-+void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
-+#ifndef __MINGW32__
-+  // The Microsoft documentation says that we should be checking
-+  // AppWindowTitleBar::IsCustomizationSupported() before calling methods
-+  // on the title bar. However, it also says that customization is fully
-+  // supported since Windows App SDK v1.2 on Windows 11, and Mica is only
-+  // available on Windows 11, so it should be safe to skip this check.
-+  RefPtr appWindow = GetAppWindowForWindow(aWnd);
-+  if (!appWindow) {
-     MOZ_LOG(gWindowsLog, LogLevel::Warning,
-             ("Skipping SetIsTitlebarCollapsed() because "
--             "IAppWindow could not be acquired from window id, hr=%" PRIX32,
--             static_cast<uint32_t>(hr)));
-+             "IAppWindow could not be acquired from window id"));
-     return;
-   }
- 
--  RefPtr<IInspectable> inspectableTitleBar;
--  hr = appWindow->get_TitleBar(getter_AddRefs(inspectableTitleBar));
--  if (FAILED(hr) || !inspectableTitleBar) {
-+  RefPtr<winrt::Microsoft::UI::Windowing::IAppWindowTitleBar> titleBar;
-+  HRESULT hr = appWindow->get_TitleBar(getter_AddRefs(titleBar));
-+  if (FAILED(hr) || !titleBar) {
-     // Hedge our bets here and don't assert because it's possible this
-     // is a weird sort of window or something.
-     MOZ_LOG(gWindowsLog, LogLevel::Warning,
-@@ -1382,18 +1388,6 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
-              static_cast<uint32_t>(hr)));
-     return;
-   }
--  RefPtr<winrt::Microsoft::UI::Windowing::IAppWindowTitleBar> titleBar;
--  hr = inspectableTitleBar->QueryInterface(
--      __uuidof(winrt::Microsoft::UI::Windowing::IAppWindowTitleBar),
--      (void**)getter_AddRefs(titleBar));
--  if (FAILED(hr) || !titleBar) {
--    MOZ_LOG(gWindowsLog, LogLevel::Error,
--            ("Skipping SetIsTitlebarCollapsed() because "
--             "IAppWindowTitleBar could not be acquired, hr=%" PRIX32,
--             static_cast<uint32_t>(hr)));
--    MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
--    return;
--  }
-   if (aIsCollapsed) {
-     hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
-   } else {
-@@ -1410,7 +1404,7 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
-   if (aIsCollapsed) {
-     // PreferredHeightOption is only valid if ExtendsContentIntoTitleBar is true
-     RefPtr<winrt::Microsoft::UI::Windowing::IAppWindowTitleBar2> titleBar2;
--    hr = inspectableTitleBar->QueryInterface(
-+    hr = titleBar->QueryInterface(
-         __uuidof(winrt::Microsoft::UI::Windowing::IAppWindowTitleBar2),
-         (void**)getter_AddRefs(titleBar2));
-     if (FAILED(hr) || !titleBar2) {
-diff --git a/widget/windows/WindowsUIUtils.h b/widget/windows/WindowsUIUtils.h
-index 17a5aac583758..0abd4dfe9875a 100644
---- a/widget/windows/WindowsUIUtils.h
-+++ b/widget/windows/WindowsUIUtils.h
-@@ -59,6 +59,7 @@ class WindowsUIUtils final : public nsIWindowsUIUtils {
-   static bool ComputeOverlayScrollbars();
-   static double ComputeTextScaleFactor();
-   static bool ComputeTransparencyEffects();
-+  static void AssociateWithWinAppSDK(HWND aWnd);
-   static void SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed);
- 
-  protected:
-diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index 19f5980a106fb..a2a288e793046 100644
---- a/widget/windows/nsWindow.cpp
-+++ b/widget/windows/nsWindow.cpp
-@@ -1540,7 +1540,7 @@ bool nsWindow::AssociateWithNativeWindow() {
-     // This is important because the SDKs WNDPROC might handle messages like
-     // WM_NCCALCSIZE without calling into us, and that can cause sizing issues,
-     // see bug 1993474.
--    WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
-+    WindowsUIUtils::AssociateWithWinAppSDK(mWnd);
-   }
- 
-   // Connect the this pointer to the native window handle.
diff --git a/src/firefox-patches/no_liquid_glass_icon.patch b/src/firefox-patches/no_liquid_glass_icon.patch
new file mode 100644
index 000000000..3fa8021f7
--- /dev/null
+++ b/src/firefox-patches/no_liquid_glass_icon.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
+index 0c4fb837a24490c66b284abf2bd9299c2e021de0..ea28831b90662b12bdcb137c35b6bb83626c77e7 100644
+--- a/browser/app/macbuild/Contents/Info.plist.in
++++ b/browser/app/macbuild/Contents/Info.plist.in
+@@ -190,8 +190,6 @@
+ 	<string>@MAC_APP_NAME@ @APP_VERSION@</string>
+ 	<key>CFBundleIconFile</key>
+ 	<string>firefox.icns</string>
+-	<key>CFBundleIconName</key>
+-	<string>AppIcon</string>
+ 	<key>CFBundleIdentifier</key>
+ 	<string>@MOZ_MACBUNDLE_ID@</string>
+ 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/src/layout/generic/nsIFrame-cpp.patch b/src/layout/generic/nsIFrame-cpp.patch
index 214996601..7e42fa2d6 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 a7b60e40e6947754374dcda2fc69cdb329c337ac..c7e025109c4c43865205cbd445d9d20305974974 100644
+index 794d02a892eaa180cb2aa4fdc46428e37aee2e1e..40daffbb32a2ec43ae2364bcadadbdb9813a3186 100644
 --- a/layout/generic/nsIFrame.cpp
 +++ b/layout/generic/nsIFrame.cpp
-@@ -11899,6 +11899,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
+@@ -11918,6 +11918,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
    gfx::Matrix4x4 matrix = nsStyleTransformMatrix::ReadTransforms(
        uiReset->mMozWindowTransform, refBox, float(appUnitsPerDevPixel));
  
diff --git a/src/layout/style/nsStyleSheetService-h.patch b/src/layout/style/nsStyleSheetService-h.patch
index 80f767f5b..553bd3fc6 100644
--- a/src/layout/style/nsStyleSheetService-h.patch
+++ b/src/layout/style/nsStyleSheetService-h.patch
@@ -1,8 +1,8 @@
 diff --git a/layout/style/nsStyleSheetService.h b/layout/style/nsStyleSheetService.h
-index 83fc829aad19f8b80692e67bddb781778fbc4f8d..04806a1f51686a82c1dc2555dae86a4397b181fb 100644
+index 86a6767302820221f879e31e06cf012137185ffd..50c8cdfb94f186ffdc9f1ebdedf8db294f8b8366 100644
 --- a/layout/style/nsStyleSheetService.h
 +++ b/layout/style/nsStyleSheetService.h
-@@ -50,6 +50,8 @@ class nsStyleSheetService final : public nsIStyleSheetService,
+@@ -49,6 +49,8 @@ class nsStyleSheetService final : public nsIStyleSheetService,
  
    size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
  
diff --git a/src/layout/style/nsStyleStruct-cpp.patch b/src/layout/style/nsStyleStruct-cpp.patch
index adc1c8369..0af32a1b4 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 9f86fdfe6a70394c5fcd9e07177e5f325c2e4951..f9b3bc2e366f0cee2fbc992c4babce068b954413 100644
+index ee49683ebfee306e23aed808006fd34f4db6d4c6..d7f55a861aa8a3d1e4d8c343b7da008ee559fd8a 100644
 --- a/layout/style/nsStyleStruct.cpp
 +++ b/layout/style/nsStyleStruct.cpp
-@@ -3233,6 +3233,9 @@ nsStyleUIReset::nsStyleUIReset()
+@@ -3231,6 +3231,9 @@ nsStyleUIReset::nsStyleUIReset()
        mWindowShadow(StyleWindowShadow::Auto),
        mWindowOpacity(1.0),
        mMozWindowInputRegionMargin(StyleLength::Zero()),
@@ -12,7 +12,7 @@ index 9f86fdfe6a70394c5fcd9e07177e5f325c2e4951..f9b3bc2e366f0cee2fbc992c4babce06
        mTransitions(
            nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
        mTransitionTimingFunctionCount(1),
-@@ -3277,6 +3280,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
+@@ -3275,6 +3278,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 dcc8877e3..19a0798dd 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 46f9312292b6f332947e68586ae770acffe8c418..2408eb06ab466faba99e83b5c92759cf3277edad 100644
+index 37945cdc8fc664f9a21999ee147fb241f3e55dfd..2694aae35e911cce2fa2c39409333960675fdeeb 100644
 --- a/layout/style/nsStyleStruct.h
 +++ b/layout/style/nsStyleStruct.h
-@@ -2055,6 +2055,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
+@@ -2087,6 +2087,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/layout/style/test/ListCSSProperties-cpp.patch b/src/layout/style/test/ListCSSProperties-cpp.patch
index 31a2d1c8f..e410cc1ea 100644
--- a/src/layout/style/test/ListCSSProperties-cpp.patch
+++ b/src/layout/style/test/ListCSSProperties-cpp.patch
@@ -1,5 +1,5 @@
 diff --git a/layout/style/test/ListCSSProperties.cpp b/layout/style/test/ListCSSProperties.cpp
-index 673c1677703ef2de3fafbe86f0ffab720738f4cb..267556f66de3180fc6ae91d5b54b8648f1b41cc4 100644
+index 1870bfc3735255f2d41356b00dc52faf95d9d9f2..59ad4fb11c7d48d9ba84dceef09a67a42b486ed8 100644
 --- a/layout/style/test/ListCSSProperties.cpp
 +++ b/layout/style/test/ListCSSProperties.cpp
 @@ -110,6 +110,7 @@ const char* gInaccessibleProperties[] = {
diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index 7fd0507a6..5ab3dcbb6 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 34f519ad1107736f47719679be7f4fa20cd718c1..7f886071259d6ddd971ca5c92180de0cca9a0f5d 100644
+index 6c725ea8c727920cf85244ff5b13f24a41e93456..1a16c8cc6585786f87cbea54eb548099cf3a66b4 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -19496,6 +19496,7 @@
+@@ -19534,6 +19534,7 @@
    mirror: always
  #endif
  
diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch
index 7c10d5265..513e9d502 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 ddbcd495260b5bcc4f55ebf7c06fcb6b5dc595c7..c629ac40f4fe3e03ffc765d3b65f3d348f4b05c6 100644
+index 26871fb68d4eae54c750b7fcc4db2cf73f9bb9c9..cca3546d0a25aa34be578427ced241856c6a63a7 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};
@@ -26,12 +26,12 @@ index ddbcd495260b5bcc4f55ebf7c06fcb6b5dc595c7..c629ac40f4fe3e03ffc765d3b65f3d34
  
  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 {
+@@ -652,7 +662,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.
--pub static MEDIA_FEATURES: [QueryFeatureDescription; 59] = [
-+pub static MEDIA_FEATURES: [QueryFeatureDescription; 60] = [
+-pub static MEDIA_FEATURES: [QueryFeatureDescription; 60] = [
++pub static MEDIA_FEATURES: [QueryFeatureDescription; 61] = [
 +    feature!(
 +        atom!("-moz-bool-pref"),
 +        AllowsRanges::No,
diff --git a/src/servo/components/style/queries/feature_expression-rs.patch b/src/servo/components/style/queries/feature_expression-rs.patch
index 8265a0588..23eeb11f2 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 91e1d1572cbd3682ec977f21751e067968ed8884..6e618ac765f698bf3d9ce120167a6906ae3ce5ff 100644
+index e0787193559ccd32b214272f1a0560cb058e3729..4388de8e2bcba9c3610dfc791fb751d916820e6f 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};
@@ -11,7 +11,7 @@ index 91e1d1572cbd3682ec977f21751e067968ed8884..6e618ac765f698bf3d9ce120167a6906
  use crate::{Atom, Zero};
  use cssparser::{Parser, Token};
  use selectors::kleene_value::KleeneValue;
-@@ -639,6 +639,10 @@ impl QueryFeatureExpression {
+@@ -623,6 +623,10 @@ impl QueryFeatureExpression {
                      .map(|v| *expect!(Enumerated, v));
                  return evaluator(context, computed);
              },
@@ -22,7 +22,7 @@ index 91e1d1572cbd3682ec977f21751e067968ed8884..6e618ac765f698bf3d9ce120167a6906
              Evaluator::BoolInteger(eval) => {
                  let computed = self
                      .kind
-@@ -677,6 +681,7 @@ pub enum QueryExpressionValue {
+@@ -661,6 +665,7 @@ pub enum QueryExpressionValue {
      /// An enumerated value, defined by the variant keyword table in the
      /// feature's `mData` member.
      Enumerated(KeywordDiscriminant),
@@ -30,7 +30,7 @@ index 91e1d1572cbd3682ec977f21751e067968ed8884..6e618ac765f698bf3d9ce120167a6906
  }
  
  impl QueryExpressionValue {
-@@ -695,6 +700,7 @@ impl QueryExpressionValue {
+@@ -679,6 +684,7 @@ impl QueryExpressionValue {
                  Evaluator::Enumerated { serializer, .. } => dest.write_str(&*serializer(value)),
                  _ => unreachable!(),
              },
@@ -38,7 +38,7 @@ index 91e1d1572cbd3682ec977f21751e067968ed8884..6e618ac765f698bf3d9ce120167a6906
          }
      }
  
-@@ -732,6 +738,9 @@ impl QueryExpressionValue {
+@@ -716,6 +722,9 @@ impl QueryExpressionValue {
              Evaluator::Resolution(..) => {
                  QueryExpressionValue::Resolution(Resolution::parse(context, input)?)
              },
diff --git a/src/testing/mochitest/browser-test-js.patch b/src/testing/mochitest/browser-test-js.patch
index 231a99e9b..80019526a 100644
--- a/src/testing/mochitest/browser-test-js.patch
+++ b/src/testing/mochitest/browser-test-js.patch
@@ -1,8 +1,8 @@
 diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
-index d5f320c5e97aae9bfd43d28e3d4a274d9bbc0787..24dc32a5bf6ae9abaa8f3fe8c37b031a76fb4d60 100644
+index 91bd995c2910fae5a3f67a960d15d90de3c997df..a7157331184e099ee468a719d6ec0f2d766dbed1 100644
 --- a/testing/mochitest/browser-test.js
 +++ b/testing/mochitest/browser-test.js
-@@ -438,10 +438,10 @@ Tester.prototype = {
+@@ -442,10 +442,10 @@ Tester.prototype = {
      // But not the Thunderbird window, it doesn't have these things!
      if (AppConstants.MOZ_APP_NAME != "thunderbird") {
        // Remove stale tabs
@@ -15,7 +15,7 @@ index d5f320c5e97aae9bfd43d28e3d4a274d9bbc0787..24dc32a5bf6ae9abaa8f3fe8c37b031a
            let lastTab = gBrowser.tabs[gBrowser.tabs.length - 1];
            if (!lastTab.closing) {
              // Report the stale tab as an error only when they're not closing.
-@@ -476,12 +476,6 @@ Tester.prototype = {
+@@ -480,12 +480,6 @@ Tester.prototype = {
  
        // Replace the last tab with a fresh one
        if (window.gBrowser) {
diff --git a/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch b/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
index 11a3e7f28..a71cb9a62 100644
--- a/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
+++ b/src/toolkit/actors/PictureInPictureChild-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/actors/PictureInPictureChild.sys.mjs b/toolkit/actors/PictureInPictureChild.sys.mjs
-index ea47bd1029de4571a045c1ee17c313dc9d62cad8..0f8afca693e0fc112839cfb998fd8baa20227f06 100644
+index 25ae1e984e3dbd610b60930492e1fa63ef889b9a..2680f2bdabf9884bc2c68b2db7b2fbedbb8af317 100644
 --- a/toolkit/actors/PictureInPictureChild.sys.mjs
 +++ b/toolkit/actors/PictureInPictureChild.sys.mjs
 @@ -295,6 +295,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {
diff --git a/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch b/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch
index 4b8069e8b..17604acc6 100644
--- a/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch
+++ b/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
-index 5644bad94bd4741c4c807eaf5633ee18aacd633f..f59eb65928f74c8080a0b26394e17a6ef6cc1977 100644
+index ad325b45b882e8444b1b4bfc9c78950cf090b411..14f7d840bb91dfef0887537ef95de733d5591265 100644
 --- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
 +++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
 @@ -122,6 +122,9 @@ export class PictureInPictureToggleParent extends JSWindowActorParent {
diff --git a/src/toolkit/content/widgets/browser-custom-element-mjs.patch b/src/toolkit/content/widgets/browser-custom-element-mjs.patch
index 52362b570..1bc326580 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 b5eb24e15cc97b004f182c35901505cb740e8571..f2dd435ba072affff3b4fdada6c360a575c22910 100644
+index 98cbfdbe56bccc954aecca2b12950c74842fe201..303c86f29b532a7139f36f3cd86dfc72d2df8ab5 100644
 --- a/toolkit/content/widgets/browser-custom-element.mjs
 +++ b/toolkit/content/widgets/browser-custom-element.mjs
-@@ -483,11 +483,11 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
+@@ -495,11 +495,11 @@ export class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
      if (!this.browsingContext) {
        return;
      }
diff --git a/src/toolkit/content/widgets/infobar-css.patch b/src/toolkit/content/widgets/infobar-css.patch
index e612fa27b..de241f2df 100644
--- a/src/toolkit/content/widgets/infobar-css.patch
+++ b/src/toolkit/content/widgets/infobar-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/infobar.css b/toolkit/content/widgets/infobar.css
-index a13978527bf921b412ec4729612ce8f831caccb9..8f0dfad852d7f5e4fbade48e2d114767bacdda36 100644
+index 4c224f90b747aa674743ac2182066f5da5e730e0..0ef2c8691459a5c3ace5b3530bfaf245b440678b 100644
 --- a/toolkit/content/widgets/infobar.css
 +++ b/toolkit/content/widgets/infobar.css
 @@ -102,3 +102,18 @@ strong {
diff --git a/src/toolkit/content/widgets/panel-js.patch b/src/toolkit/content/widgets/panel-js.patch
index baa70cc0c..011e87349 100644
--- a/src/toolkit/content/widgets/panel-js.patch
+++ b/src/toolkit/content/widgets/panel-js.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/content/widgets/panel.js b/toolkit/content/widgets/panel.js
-index 1dd4fc2a839fc6fde1ce2fc6437625e8d22bbb90..04fcb049225148f1b1f9c4b16cf2d2537887fbec 100644
+index dc3e34847f1b6dfd58f5e036fd7d714ef51c1380..8d8e370ca8549d8208669d4fb344fc8abb54fadd 100644
 --- a/toolkit/content/widgets/panel.js
 +++ b/toolkit/content/widgets/panel.js
-@@ -138,6 +138,9 @@
+@@ -137,6 +137,9 @@
              this.anchorNode.closest("toolbarbutton, .anchor-root") ||
              this.anchorNode;
            anchorRoot.setAttribute("open", "true");
@@ -12,7 +12,7 @@ index 1dd4fc2a839fc6fde1ce2fc6437625e8d22bbb90..04fcb049225148f1b1f9c4b16cf2d253
          }
  
          if (this.getAttribute("animate") != "false") {
-@@ -208,6 +211,9 @@
+@@ -183,6 +186,9 @@
              this.anchorNode.closest("toolbarbutton, .anchor-root") ||
              this.anchorNode;
            anchorRoot.removeAttribute("open");
diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch
index 0d4d37b05..204071c79 100644
--- a/src/toolkit/content/widgets/tabbox-js.patch
+++ b/src/toolkit/content/widgets/tabbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
-index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a0722627f9ed4b 100644
+index 4f5886c6142f8061f40a54aa3a5d99e47fd4d5ea..c57e169f5c73c4bc9b8253dd99ddb7f3c4547364 100644
 --- a/toolkit/content/widgets/tabbox.js
 +++ b/toolkit/content/widgets/tabbox.js
 @@ -11,6 +11,23 @@
@@ -35,7 +35,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
          this._selectedPanel?.classList.add("deck-selected");
        }
        this.setAttribute("selectedIndex", val);
-@@ -697,7 +714,7 @@
+@@ -718,7 +735,7 @@
        if (!tab) {
          return;
        }
@@ -44,7 +44,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
          if (otherTab != tab && otherTab.selected) {
            otherTab._selected = false;
          }
-@@ -733,6 +750,7 @@
+@@ -754,6 +771,7 @@
       * @param {MozTab|null} [val]
       */
      set selectedItem(val) {
@@ -52,7 +52,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
        if (val && !val.selected) {
          // The selectedIndex setter ignores invalid values
          // such as -1 if |val| isn't one of our child nodes.
-@@ -910,7 +928,7 @@
+@@ -931,7 +949,7 @@
          if (tab == startTab) {
            return null;
          }
@@ -61,7 +61,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
            return tab;
          }
        }
-@@ -972,13 +990,30 @@
+@@ -993,13 +1011,30 @@
       * @param {boolean} [aWrap]
       */
      advanceSelectedTab(aDir, aWrap) {
@@ -93,7 +93,7 @@ index cfe2da6e199667bd668f117cc8972212c7f57da2..470033466eae0e853855e21b86a07226
        // Handle keyboard navigation for a hidden tab that can be selected, like the Firefox View tab,
        // which has a random placement in this.allTabs.
        if (startTab.hidden) {
-@@ -991,7 +1026,7 @@
+@@ -1012,7 +1047,7 @@
          newTab = this.findNextTab(startTab, {
            direction: aDir,
            wrap: aWrap,
diff --git a/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch
index 0429b305b..95321d291 100644
--- a/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch
+++ b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs
-index 1d16b3f191a53b6877122086de9bba1fbcaa71f4..64df5577aac095ddd3d9a381bf118496bf279276 100644
+index 57d5bf70c2584359f09b03932852a6e3fafb1008..39a798817f1a3e4a77a95fc04e9697c7b93ee044 100644
 --- a/toolkit/modules/LightweightThemeConsumer.sys.mjs
 +++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs
-@@ -31,7 +31,7 @@ const toolkitVariableMap = [
+@@ -32,7 +32,7 @@ const toolkitVariableMap = [
        lwtProperty: "accentcolor",
        processColor(rgbaChannels) {
          if (!rgbaChannels || rgbaChannels.a == 0) {
@@ -12,11 +12,11 @@ index 1d16b3f191a53b6877122086de9bba1fbcaa71f4..64df5577aac095ddd3d9a381bf118496
          // Remove the alpha channel
          const { r, g, b } = rgbaChannels;
 @@ -320,7 +320,7 @@ LightweightThemeConsumer.prototype = {
-     }
- 
-     let theme = useDarkTheme ? themeData.darkTheme : themeData.theme;
--    if (!theme) {
-+    if (!theme || Services.prefs.getBoolPref("zen.theme.disable-lightweight")) {
+     let forcedColorsThemeOverride =
+       this.FORCED_COLORS_OVERRIDE_ENABLED &&
+       this.forcedColorsMediaQuery?.matches;
+-    if (!theme || forcedColorsThemeOverride) {
++    if (!theme || forcedColorsThemeOverride || Services.prefs.getBoolPref("zen.theme.disable-lightweight")) {
        theme = { id: DEFAULT_THEME_ID };
      }
-     let hasTheme = theme.id != DEFAULT_THEME_ID;
+     let builtinThemeConfig = lazy.BuiltInThemeConfig.get(theme.id);
diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch
index ee6a3f71a..256648972 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 a17e15c74c8e627cf805d1f026438759af7e4a97..fc6e1e6b2711e474d65a688b2481b7a26cad2a71 100644
+index abc630955c18de629d3ffff3e8f9aa29f57950be..97d6d5f25d0859684c405c659e0eef26007027c4 100644
 --- a/toolkit/modules/moz.build
 +++ b/toolkit/modules/moz.build
-@@ -280,6 +280,7 @@ for var in (
+@@ -281,6 +281,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 2427976d1..6b6aade83 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 f3032042d34766b0e94c56872f91271f307ffc89..8c8540e8bf8d3df5b33e2f0da6b94a32e75684b5 100644
+index 52bca068f90cd8e214900e8f3159e1f7e37fb3e8..bfb5a38258141ed28def7c9a340a61253b0e3274 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project):
@@ -46,7 +46,7 @@ index f3032042d34766b0e94c56872f91271f307ffc89..8c8540e8bf8d3df5b33e2f0da6b94a32
          return True
  
  
-@@ -2064,7 +2069,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
+@@ -2070,7 +2075,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
  # ==============================================================
  @depends(milestone)
  def require_signing(milestone):
diff --git a/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch b/src/toolkit/mozapps/extensions/content/aboutaddons-css.patch
index f0290fa86..6d7811e7c 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 232fca6975de67bc0d84969204e75bad358b6bc7..4bbfb2abb9ea4812005734eb95a0bd7b8bbab7ce 100644
+index 60c64468fb23abc68296ebbe1a6fb7a260ab509c..25b93a2c6b587a50e9a900e822ef06e64959c7d0 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 c796e9ba9..b11281d28 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 1d8c95cc10d158e86254f45d8f955c8f8ce50394..3708da5d0780298589b89dbb4a03152749911dee 100644
+index c9f742dc4588a21db5011b3386999a5832defd33..4a4a6fc28822200c3e254d682d303b38d10d9c67 100644
 --- a/toolkit/profile/nsToolkitProfileService.cpp
 +++ b/toolkit/profile/nsToolkitProfileService.cpp
-@@ -84,6 +84,8 @@ using namespace mozilla;
+@@ -83,6 +83,8 @@ using namespace mozilla;
  #define INSTALL_PREFIX_LENGTH 7
  #define STORE_ID_PREF "toolkit.profiles.storeID"
  
@@ -11,7 +11,7 @@ index 1d8c95cc10d158e86254f45d8f955c8f8ce50394..3708da5d0780298589b89dbb4a031527
  struct KeyValue {
    KeyValue(const char* aKey, const char* aValue) : key(aKey), value(aValue) {}
  
-@@ -1370,7 +1372,7 @@ nsresult nsToolkitProfileService::CreateDefaultProfile(
+@@ -1369,7 +1371,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 f037197ad..3c6aac2c4 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 e9dedcacb868fb0908c3432e1ccf3956b383aea7..6418c08550b9b4876df20ca5f93d093be0583f83 100644
+index f1166fb9b8251ee7d631c53c443e5986cbf4d29d..9233941bbdbf235c0ce6ce9b680002f2023d659c 100644
 --- a/toolkit/themes/shared/aboutReader.css
 +++ b/toolkit/themes/shared/aboutReader.css
-@@ -1181,3 +1181,43 @@ pre code {
+@@ -1187,3 +1187,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 0f1788dfb..3a658eac0 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 2d068aa3472887e089254834d92f75b9f6d9894b..1a6d5b87fdcfb338222475bb6362820e3915955d 100644
+index 41f65a1f2c3065631780b02d820f632abdf542af..c01c2957367da968d106c83117e45800bb6b15e5 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 2d068aa3472887e089254834d92f75b9f6d9894b..1a6d5b87fdcfb338222475bb6362820e
  @namespace html "http://www.w3.org/1999/xhtml";
  @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
  
-@@ -68,7 +68,7 @@
+@@ -66,7 +66,7 @@
     * this in forced colors mode, as we should be using system colours then.
     */
    :root[dialogroot] {
@@ -20,7 +20,7 @@ index 2d068aa3472887e089254834d92f75b9f6d9894b..1a6d5b87fdcfb338222475bb6362820e
    }
  }
  
-@@ -706,7 +706,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
+@@ -702,7 +702,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
    fill-opacity: 1;
  }
  
@@ -29,7 +29,7 @@ index 2d068aa3472887e089254834d92f75b9f6d9894b..1a6d5b87fdcfb338222475bb6362820e
    :root {
      --in-content-sidebar-width: 118px;
    }
-@@ -1096,7 +1096,7 @@ xul|*.sidebar-footer-link {
+@@ -1092,7 +1092,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 d295c0745..091bd3be3 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 73149025f13e8805774c004820d57755d2bf89a9..f503e6bcd1c466757fc58e033aa0d68343685e28 100644
+index 56e61a11aa1180ed637104838a802d1dd2808e7b..3b44880e1aa194f0ff2f05760fd2f36d5e167738 100644
 --- a/toolkit/themes/shared/menulist.css
 +++ b/toolkit/themes/shared/menulist.css
 @@ -53,7 +53,7 @@
diff --git a/src/toolkit/themes/shared/pictureinpicture/player-css.patch b/src/toolkit/themes/shared/pictureinpicture/player-css.patch
index 1bdc8564d..e326f8855 100644
--- a/src/toolkit/themes/shared/pictureinpicture/player-css.patch
+++ b/src/toolkit/themes/shared/pictureinpicture/player-css.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/pictureinpicture/player.css b/toolkit/themes/shared/pictureinpicture/player.css
-index 12dba9ec5eee93476034b1e8b503a301fc18dbcb..b81c9e997d85e78cdf6ab460e14a5128117639bd 100644
+index 67d04f0f5a2ec003c4fa484df72c070afaa825c7..7cb0839d44c5c1988bc8a62d14ecd5e8cb581e2f 100644
 --- a/toolkit/themes/shared/pictureinpicture/player.css
 +++ b/toolkit/themes/shared/pictureinpicture/player.css
 @@ -738,3 +738,17 @@ input:checked + .slider::before {
diff --git a/src/widget/gtk/nsAppShell-cpp.patch b/src/widget/gtk/nsAppShell-cpp.patch
index 8b6af079a..fc6c0666a 100644
--- a/src/widget/gtk/nsAppShell-cpp.patch
+++ b/src/widget/gtk/nsAppShell-cpp.patch
@@ -1,8 +1,8 @@
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 99fd6dc873362de36dca4c93d5acc604cadb7caf..b5cf7ef750a489e32099884cc25af611ad622e8e 100644
+index 3e57fab78f630eba8401cc77d9cc7e024d482a76..248d1271ca257dbe415d477827f90c8d6902bb86 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
-@@ -420,7 +420,8 @@ nsresult nsAppShell::Init() {
+@@ -504,7 +504,8 @@ nsresult nsAppShell::Init() {
      gchar* name = gdk_pixbuf_format_get_name(format);
      if (strcmp(name, "jpeg") && strcmp(name, "png") && strcmp(name, "gif") &&
          strcmp(name, "bmp") && strcmp(name, "ico") && strcmp(name, "xpm") &&
diff --git a/src/xpfe/appshell/AppWindow-cpp.patch b/src/xpfe/appshell/AppWindow-cpp.patch
index 61deb9ea7..6e5433301 100644
--- a/src/xpfe/appshell/AppWindow-cpp.patch
+++ b/src/xpfe/appshell/AppWindow-cpp.patch
@@ -1,13 +1,13 @@
 diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
-index 64f18c991b0b9a8bf3690a54624b447f347a210e..0b00a29956cd6a750d5feadd4b2a4ceb8338410b 100644
+index eba6c332249bfe936da285f73b7a1723cf480950..85db9031b6605da91987901d0c6ce31ddb56c3ad 100644
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
-@@ -1874,7 +1874,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
+@@ -1873,7 +1873,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
      }
    }
  
 -  settings.verticalTabs = Preferences::GetBool("sidebar.verticalTabs", false);
 +  settings.verticalTabs = Preferences::GetBool("zen.tabs.vertical", false);
  
-   Unused << PersistPreXULSkeletonUIValues(settings);
+   (void)PersistPreXULSkeletonUIValues(settings);
  #endif
diff --git a/src/zen/@types/index.d.ts b/src/zen/@types/index.d.ts
index b59acd110..2f6a529bc 100644
--- a/src/zen/@types/index.d.ts
+++ b/src/zen/@types/index.d.ts
@@ -19,8 +19,11 @@
 /// <reference types="./generated/lib.gecko.win32.d.ts" />
 
 /// Order of references matters here, for overriding type signatures.
+/// <reference types="./lib.gecko.esnext.d.ts" />
 /// <reference types="./lib.gecko.tweaks.d.ts" />
 
+import type {} from './lib.gecko.augmentations.d.ts';
+
 declare global {
   const Cc: nsXPCComponents_Classes;
   const Ci: nsIXPCComponents_Interfaces;
diff --git a/src/zen/@types/lib.gecko.darwin.d.ts b/src/zen/@types/lib.gecko.darwin.d.ts
index 9fbe0954c..209fd23ae 100644
--- a/src/zen/@types/lib.gecko.darwin.d.ts
+++ b/src/zen/@types/lib.gecko.darwin.d.ts
@@ -18,6 +18,7 @@ declare global {
     readonly actionNames: string[];
     getAttributeValue(attributeName: string): any;
     getParameterizedAttributeValue(attributeName: string, parameter: any): any;
+    getActionDescription(actionName: string): string;
     performAction(actionName: string): void;
     isAttributeSettable(attributeName: string): boolean;
     setAttributeValue(attributeName: string, attributeValue: any): void;
@@ -173,13 +174,9 @@ declare global {
   // https://searchfox.org/mozilla-central/source/xpcom/io/nsILocalFileMac.idl
 
   interface nsILocalFileMac extends nsIFile {
-    readonly fileSizeWithResFork: i64;
     launchWithDoc(aDocToLoad: nsIFile, aLaunchInBackground: boolean): void;
-    openDocWithApp(aAppToOpenWith: nsIFile, aLaunchInBackground: boolean): void;
     isPackage(): boolean;
     readonly bundleDisplayName: string;
-    readonly bundleIdentifier: string;
-    readonly bundleContentsLastModifiedTime: i64;
     hasXAttr(aAttrName: string): boolean;
     getXAttr(aAttrName: string): u8[];
     setXAttr(aAttrName: string, aAttrValue: u8[]): void;
diff --git a/src/zen/@types/lib.gecko.dom.d.ts b/src/zen/@types/lib.gecko.dom.d.ts
index e45189432..a10730211 100644
--- a/src/zen/@types/lib.gecko.dom.d.ts
+++ b/src/zen/@types/lib.gecko.dom.d.ts
@@ -349,7 +349,6 @@ interface BufferRange {
 interface CDMInformation {
   capabilities: string;
   clearlead: boolean;
-  isHDCP22Compatible: boolean;
   isHardwareDecryption: boolean;
   keySystemName: string;
 }
@@ -1684,12 +1683,6 @@ interface InspectorVariationValue {
   value: number;
 }
 
-interface InstallTriggerData {
-  Hash?: string | null;
-  IconURL?: string | null;
-  URL?: string;
-}
-
 interface InteractionData {
   interactionCount?: number;
   interactionTimeInMilliseconds?: number;
@@ -1778,11 +1771,103 @@ interface LibcConstants {
   WNOHANG?: number;
 }
 
+interface LlamaChatMessage {
+  content: string;
+  role: string;
+}
+
+interface LlamaChatOptions {
+  deTokenizationOptions?: LlamaDeTokenizationOptions;
+  maxGeneratedTokens?: number;
+  minOutputBufferSize?: number;
+  prompt: string;
+  samplers?: LlamaSamplerConfig[];
+  stopOnEndOfGenerationTokens?: boolean;
+  stopTokens?: number[];
+  tokenizationOptions?: LlamaTokenizationOptions;
+}
+
+interface LlamaContextOptions {
+  flashAttn?: boolean;
+  kCacheDtype?: LlamaKVCacheDtype;
+  nBatch?: number;
+  nCtx?: number;
+  nSeqMax?: number;
+  nThreads: number;
+  nThreadsBatch: number;
+  nUbatch?: number;
+  noPerf?: boolean;
+  offloadKqv?: boolean;
+  opOffload?: boolean;
+  swaFull?: boolean;
+  vCacheDtype?: LlamaKVCacheDtype;
+}
+
+interface LlamaDeTokenizationOptions {
+  maxCharsPerToken?: number;
+  renderSpecialTokens?: boolean;
+}
+
+interface LlamaFormatChatOptions {
+  addAssistant?: boolean;
+  messages: LlamaChatMessage[];
+}
+
+interface LlamaLogitBias {
+  bias: number;
+  token: number;
+}
+
+interface LlamaModelOptions {
+  checkTensors?: boolean;
+  context?: LlamaContextOptions;
+  nGpuLayers?: number;
+  useMlock?: boolean;
+  useMmap?: boolean;
+}
+
+interface LlamaSamplerConfig {
+  dryAllowedLength?: number;
+  dryBase?: number;
+  dryMultiplier?: number;
+  dryPenaltyLastN?: number;
+  dynatempExponent?: number;
+  dynatempRange?: number;
+  logitBias?: LlamaLogitBias[];
+  minKeep?: number;
+  minP?: number;
+  mirostat?: number;
+  mirostatEta?: number;
+  mirostatTau?: number;
+  noPerf?: boolean;
+  penaltyFreq?: number;
+  penaltyLastN?: number;
+  penaltyPresent?: number;
+  penaltyRepeat?: number;
+  seed?: number;
+  temp?: number;
+  topK?: number;
+  topNSigma?: number;
+  topP?: number;
+  typP?: number;
+  type: LlamaSamplerType;
+  xtcProbability?: number;
+  xtcThreshold?: number;
+}
+
+interface LlamaTokenizationOptions {
+  addBosAndEos?: boolean;
+  parseSpecilControlTokens?: boolean;
+}
+
 interface LoadURIOptions {
+  appLinkLaunchType?: number;
   baseURI?: URI | null;
   cancelContentJSEpoch?: number;
+  forceMediaDocument?: ForceMediaDocument;
   hasValidUserGestureActivation?: boolean;
   headers?: InputStream | null;
+  isCaptivePortalTab?: boolean;
   loadFlags?: number;
   policyContainer?: PolicyContainer | null;
   postData?: InputStream | null;
@@ -2341,6 +2426,7 @@ interface NavigationCurrentEntryChangeEventInit extends EventInit {
 interface NavigationInterceptOptions {
   focusReset?: NavigationFocusReset;
   handler?: NavigationInterceptHandler;
+  precommitHandler?: NavigationPrecommitHandler;
   scroll?: NavigationScrollBehavior;
 }
 
@@ -2927,6 +3013,7 @@ interface PublicKeyCredentialCreationOptions {
   challenge: BufferSource;
   excludeCredentials?: PublicKeyCredentialDescriptor[];
   extensions?: AuthenticationExtensionsClientInputs;
+  hints?: string[];
   pubKeyCredParams: PublicKeyCredentialParameters[];
   rp: PublicKeyCredentialRpEntity;
   timeout?: number;
@@ -2972,6 +3059,7 @@ interface PublicKeyCredentialRequestOptions {
   allowCredentials?: PublicKeyCredentialDescriptor[];
   challenge: BufferSource;
   extensions?: AuthenticationExtensionsClientInputs;
+  hints?: string[];
   rpId?: string;
   timeout?: number;
   userVerification?: string;
@@ -2979,8 +3067,6 @@ interface PublicKeyCredentialRequestOptions {
 
 interface PublicKeyCredentialRequestOptionsJSON {
   allowCredentials?: PublicKeyCredentialDescriptorJSON[];
-  attestation?: string;
-  attestationFormats?: string[];
   challenge: Base64URLString;
   extensions?: AuthenticationExtensionsClientInputsJSON;
   hints?: string[];
@@ -3116,6 +3202,10 @@ interface RTCEncodedAudioFrameMetadata {
   synchronizationSource?: number;
 }
 
+interface RTCEncodedAudioFrameOptions {
+  metadata?: RTCEncodedAudioFrameMetadata;
+}
+
 interface RTCEncodedVideoFrameMetadata {
   contributingSources?: number[];
   dependencies?: number[];
@@ -3129,6 +3219,10 @@ interface RTCEncodedVideoFrameMetadata {
   width?: number;
 }
 
+interface RTCEncodedVideoFrameOptions {
+  metadata?: RTCEncodedVideoFrameMetadata;
+}
+
 interface RTCIceCandidateInit {
   candidate?: string;
   sdpMLineIndex?: number | null;
@@ -3550,8 +3644,14 @@ interface ReceiveMessageArgument {
   targetFrameLoader?: FrameLoader;
 }
 
+interface RedirectBlockedEventInit extends EventInit {
+  redirectURI?: URI | null;
+  requestingWindow?: Window | null;
+}
+
 interface RegistrationOptions {
   scope?: string;
+  type?: WorkerType;
   updateViaCache?: ServiceWorkerUpdateViaCache;
 }
 
@@ -3704,6 +3804,7 @@ interface ShadowRootInit {
   clonable?: boolean;
   delegatesFocus?: boolean;
   mode: ShadowRootMode;
+  referenceTarget?: string;
   serializable?: boolean;
   slotAssignment?: SlotAssignmentMode;
 }
@@ -3834,6 +3935,7 @@ interface SynthesizeMouseEventData {
 
 interface SynthesizeMouseEventOptions {
   ignoreRootScrollFrame?: boolean;
+  isAsyncEnabled?: boolean;
   isDOMEventSynthesized?: boolean;
   isWidgetEventSynthesized?: boolean;
   toWindow?: boolean;
@@ -3919,6 +4021,7 @@ interface ThreadInfoDictionary {
 interface ToggleEventInit extends EventInit {
   newState?: string;
   oldState?: string;
+  source?: Element | null;
 }
 
 interface TogglePopoverOptions extends ShowPopoverOptions {
@@ -4217,6 +4320,7 @@ interface WebAccessibleResourceInit {
 }
 
 interface WebExtensionContentScriptInit extends MozDocumentMatcherInit {
+  cssOrigin?: ContentScriptCssOrigin;
   cssPaths?: string[];
   jsPaths?: string[];
   runAt?: ContentScriptRunAt;
@@ -5721,6 +5825,7 @@ interface BrowsingContext extends LoadContextMixin {
   suspendMediaWhenInactive: boolean;
   readonly targetTopLevelLinkClicksToBlank: boolean;
   textZoom: number;
+  timezoneOverride: string;
   readonly top: BrowsingContext;
   readonly topWindowContext: WindowContext | null;
   readonly touchEventsOverride: TouchEventsOverride;
@@ -5729,9 +5834,10 @@ interface BrowsingContext extends LoadContextMixin {
   readonly window: WindowProxy | null;
   getAllBrowsingContextsInSubtree(): BrowsingContext[];
   resetNavigationRateLimit(): void;
+  resetOrientationOverride(): void;
   setGeolocationServiceOverride(position?: nsIDOMGeoPosition): void;
+  setOrientationOverride(type: OrientationType, rotationAngle: number): void;
   setRDMPaneMaxTouchPoints(maxTouchPoints: number): void;
-  setRDMPaneOrientation(type: OrientationType, rotationAngle: number): void;
 }
 
 declare var BrowsingContext: {
@@ -5889,6 +5995,17 @@ declare var CSSCounterStyleRule: {
   isInstance: IsInstance<CSSCounterStyleRule>;
 };
 
+interface CSSCustomMediaRule extends CSSRule {
+  readonly name: string;
+  readonly query: CustomMediaQuery;
+}
+
+declare var CSSCustomMediaRule: {
+  prototype: CSSCustomMediaRule;
+  new (): CSSCustomMediaRule;
+  isInstance: IsInstance<CSSCustomMediaRule>;
+};
+
 interface CSSCustomPropertyRegisteredEvent extends Event {
   readonly propertyDefinition: InspectorCSSPropertyDefinition;
 }
@@ -5998,7 +6115,7 @@ declare var CSSImportRule: {
 
 interface CSSKeyframeRule extends CSSRule {
   keyText: string;
-  readonly style: CSSStyleDeclaration;
+  readonly style: CSSStyleProperties;
 }
 
 declare var CSSKeyframeRule: {
@@ -6212,7 +6329,7 @@ declare var CSSNamespaceRule: {
 };
 
 interface CSSNestedDeclarations extends CSSRule {
-  readonly style: CSSStyleDeclaration;
+  readonly style: CSSStyleProperties;
 }
 
 declare var CSSNestedDeclarations: {
@@ -6282,7 +6399,15 @@ declare var CSSOKLab: {
   isInstance: IsInstance<CSSOKLab>;
 };
 
-interface CSSPageDescriptors {}
+interface CSSPageDescriptors extends CSSStyleDeclaration {
+  margin: string;
+  marginBottom: string;
+  marginLeft: string;
+  marginRight: string;
+  marginTop: string;
+  pageOrientation: string;
+  size: string;
+}
 
 interface CSSPageRule extends CSSGroupingRule {
   selectorText: string;
@@ -6305,7 +6430,47 @@ declare var CSSPerspective: {
   isInstance: IsInstance<CSSPerspective>;
 };
 
-interface CSSPositionTryDescriptors {}
+interface CSSPositionTryDescriptors extends CSSStyleDeclaration {
+  alignSelf: string;
+  blockSize: string;
+  bottom: string;
+  height: string;
+  inlineSize: string;
+  inset: string;
+  insetBlock: string;
+  insetBlockEnd: string;
+  insetBlockStart: string;
+  insetInline: string;
+  insetInlineEnd: string;
+  insetInlineStart: string;
+  justifySelf: string;
+  left: string;
+  margin: string;
+  marginBlock: string;
+  marginBlockEnd: string;
+  marginBlockStart: string;
+  marginBottom: string;
+  marginInline: string;
+  marginInlineEnd: string;
+  marginInlineStart: string;
+  marginLeft: string;
+  marginRight: string;
+  marginTop: string;
+  maxBlockSize: string;
+  maxHeight: string;
+  maxInlineSize: string;
+  maxWidth: string;
+  minBlockSize: string;
+  minHeight: string;
+  minInlineSize: string;
+  minWidth: string;
+  placeSelf: string;
+  positionAnchor: string;
+  positionArea: string;
+  right: string;
+  top: string;
+  width: string;
+}
 
 interface CSSPositionTryRule extends CSSRule {
   readonly name: string;
@@ -6502,10 +6667,526 @@ declare var CSSStyleDeclaration: {
   isInstance: IsInstance<CSSStyleDeclaration>;
 };
 
+interface CSSStyleProperties extends CSSStyleDeclaration {
+  MozAnimation: string;
+  MozAnimationDelay: string;
+  MozAnimationDirection: string;
+  MozAnimationDuration: string;
+  MozAnimationFillMode: string;
+  MozAnimationIterationCount: string;
+  MozAnimationName: string;
+  MozAnimationPlayState: string;
+  MozAnimationTimingFunction: string;
+  MozAppearance: string;
+  MozBackfaceVisibility: string;
+  MozBorderImage: string;
+  MozBoxAlign: string;
+  MozBoxCollapse: string;
+  MozBoxDirection: string;
+  MozBoxFlex: string;
+  MozBoxOrdinalGroup: string;
+  MozBoxOrient: string;
+  MozBoxPack: string;
+  MozBoxSizing: string;
+  MozContextProperties: string;
+  MozControlCharacterVisibility: string;
+  MozDefaultAppearance: string;
+  MozFloatEdge: string;
+  MozFontFeatureSettings: string;
+  MozFontLanguageOverride: string;
+  MozForceBrokenImageIcon: string;
+  MozOrient: string;
+  MozOsxFontSmoothing: string;
+  MozPerspective: string;
+  MozPerspectiveOrigin: string;
+  MozSubtreeHiddenOnlyVisually: string;
+  MozTextSizeAdjust: string;
+  MozTheme: string;
+  MozTransform: string;
+  MozTransformOrigin: string;
+  MozTransformStyle: string;
+  MozTransition: string;
+  MozTransitionDelay: string;
+  MozTransitionDuration: string;
+  MozTransitionProperty: string;
+  MozTransitionTimingFunction: string;
+  MozUserFocus: string;
+  MozWindowDragging: string;
+  MozWindowInputRegionMargin: string;
+  MozWindowOpacity: string;
+  MozWindowShadow: string;
+  MozWindowTransform: string;
+  accentColor: string;
+  alignContent: string;
+  alignItems: string;
+  alignSelf: string;
+  all: string;
+  anchorName: string;
+  anchorScope: string;
+  animation: string;
+  animationComposition: string;
+  animationDelay: string;
+  animationDirection: string;
+  animationDuration: string;
+  animationFillMode: string;
+  animationIterationCount: string;
+  animationName: string;
+  animationPlayState: string;
+  animationTimeline: string;
+  animationTimingFunction: string;
+  appearance: string;
+  aspectRatio: string;
+  backdropFilter: string;
+  backfaceVisibility: string;
+  background: string;
+  backgroundAttachment: string;
+  backgroundBlendMode: string;
+  backgroundClip: string;
+  backgroundColor: string;
+  backgroundImage: string;
+  backgroundOrigin: string;
+  backgroundPosition: string;
+  backgroundPositionX: string;
+  backgroundPositionY: string;
+  backgroundRepeat: string;
+  backgroundSize: string;
+  baselineSource: string;
+  blockSize: string;
+  border: string;
+  borderBlock: string;
+  borderBlockColor: string;
+  borderBlockEnd: string;
+  borderBlockEndColor: string;
+  borderBlockEndStyle: string;
+  borderBlockEndWidth: string;
+  borderBlockStart: string;
+  borderBlockStartColor: string;
+  borderBlockStartStyle: string;
+  borderBlockStartWidth: string;
+  borderBlockStyle: string;
+  borderBlockWidth: string;
+  borderBottom: string;
+  borderBottomColor: string;
+  borderBottomLeftRadius: string;
+  borderBottomRightRadius: string;
+  borderBottomStyle: string;
+  borderBottomWidth: string;
+  borderCollapse: string;
+  borderColor: string;
+  borderEndEndRadius: string;
+  borderEndStartRadius: string;
+  borderImage: string;
+  borderImageOutset: string;
+  borderImageRepeat: string;
+  borderImageSlice: string;
+  borderImageSource: string;
+  borderImageWidth: string;
+  borderInline: string;
+  borderInlineColor: string;
+  borderInlineEnd: string;
+  borderInlineEndColor: string;
+  borderInlineEndStyle: string;
+  borderInlineEndWidth: string;
+  borderInlineStart: string;
+  borderInlineStartColor: string;
+  borderInlineStartStyle: string;
+  borderInlineStartWidth: string;
+  borderInlineStyle: string;
+  borderInlineWidth: string;
+  borderLeft: string;
+  borderLeftColor: string;
+  borderLeftStyle: string;
+  borderLeftWidth: string;
+  borderRadius: string;
+  borderRight: string;
+  borderRightColor: string;
+  borderRightStyle: string;
+  borderRightWidth: string;
+  borderSpacing: string;
+  borderStartEndRadius: string;
+  borderStartStartRadius: string;
+  borderStyle: string;
+  borderTop: string;
+  borderTopColor: string;
+  borderTopLeftRadius: string;
+  borderTopRightRadius: string;
+  borderTopStyle: string;
+  borderTopWidth: string;
+  borderWidth: string;
+  bottom: string;
+  boxDecorationBreak: string;
+  boxShadow: string;
+  boxSizing: string;
+  breakAfter: string;
+  breakBefore: string;
+  breakInside: string;
+  captionSide: string;
+  caretColor: string;
+  clear: string;
+  clip: string;
+  clipPath: string;
+  clipRule: string;
+  color: string;
+  colorInterpolation: string;
+  colorInterpolationFilters: string;
+  colorScheme: string;
+  columnCount: string;
+  columnFill: string;
+  columnGap: string;
+  columnRule: string;
+  columnRuleColor: string;
+  columnRuleStyle: string;
+  columnRuleWidth: string;
+  columnSpan: string;
+  columnWidth: string;
+  columns: string;
+  contain: string;
+  containIntrinsicBlockSize: string;
+  containIntrinsicHeight: string;
+  containIntrinsicInlineSize: string;
+  containIntrinsicSize: string;
+  containIntrinsicWidth: string;
+  container: string;
+  containerName: string;
+  containerType: string;
+  content: string;
+  contentVisibility: string;
+  counterIncrement: string;
+  counterReset: string;
+  counterSet: string;
+  cssFloat: string;
+  cursor: string;
+  cx: string;
+  cy: string;
+  d: string;
+  direction: string;
+  display: string;
+  dominantBaseline: string;
+  emptyCells: string;
+  fieldSizing: string;
+  fill: string;
+  fillOpacity: string;
+  fillRule: string;
+  filter: string;
+  flex: string;
+  flexBasis: string;
+  flexDirection: string;
+  flexFlow: string;
+  flexGrow: string;
+  flexShrink: string;
+  flexWrap: string;
+  floodColor: string;
+  floodOpacity: string;
+  font: string;
+  fontFamily: string;
+  fontFeatureSettings: string;
+  fontKerning: string;
+  fontLanguageOverride: string;
+  fontOpticalSizing: string;
+  fontPalette: string;
+  fontSize: string;
+  fontSizeAdjust: string;
+  fontStretch: string;
+  fontStyle: string;
+  fontSynthesis: string;
+  fontSynthesisPosition: string;
+  fontSynthesisSmallCaps: string;
+  fontSynthesisStyle: string;
+  fontSynthesisWeight: string;
+  fontVariant: string;
+  fontVariantAlternates: string;
+  fontVariantCaps: string;
+  fontVariantEastAsian: string;
+  fontVariantEmoji: string;
+  fontVariantLigatures: string;
+  fontVariantNumeric: string;
+  fontVariantPosition: string;
+  fontVariationSettings: string;
+  fontWeight: string;
+  forcedColorAdjust: string;
+  gap: string;
+  grid: string;
+  gridArea: string;
+  gridAutoColumns: string;
+  gridAutoFlow: string;
+  gridAutoRows: string;
+  gridColumn: string;
+  gridColumnEnd: string;
+  gridColumnStart: string;
+  gridRow: string;
+  gridRowEnd: string;
+  gridRowStart: string;
+  gridTemplate: string;
+  gridTemplateAreas: string;
+  gridTemplateColumns: string;
+  gridTemplateRows: string;
+  height: string;
+  hyphenateCharacter: string;
+  hyphenateLimitChars: string;
+  hyphens: string;
+  imageOrientation: string;
+  imageRendering: string;
+  imeMode: string;
+  initialLetter: string;
+  inlineSize: string;
+  inset: string;
+  insetBlock: string;
+  insetBlockEnd: string;
+  insetBlockStart: string;
+  insetInline: string;
+  insetInlineEnd: string;
+  insetInlineStart: string;
+  isolation: string;
+  justifyContent: string;
+  justifyItems: string;
+  justifySelf: string;
+  left: string;
+  letterSpacing: string;
+  lightingColor: string;
+  lineBreak: string;
+  lineHeight: string;
+  listStyle: string;
+  listStyleImage: string;
+  listStylePosition: string;
+  listStyleType: string;
+  margin: string;
+  marginBlock: string;
+  marginBlockEnd: string;
+  marginBlockStart: string;
+  marginBottom: string;
+  marginInline: string;
+  marginInlineEnd: string;
+  marginInlineStart: string;
+  marginLeft: string;
+  marginRight: string;
+  marginTop: string;
+  marker: string;
+  markerEnd: string;
+  markerMid: string;
+  markerStart: string;
+  mask: string;
+  maskClip: string;
+  maskComposite: string;
+  maskImage: string;
+  maskMode: string;
+  maskOrigin: string;
+  maskPosition: string;
+  maskPositionX: string;
+  maskPositionY: string;
+  maskRepeat: string;
+  maskSize: string;
+  maskType: string;
+  masonryAutoFlow: string;
+  mathDepth: string;
+  mathShift: string;
+  mathStyle: string;
+  maxBlockSize: string;
+  maxHeight: string;
+  maxInlineSize: string;
+  maxWidth: string;
+  minBlockSize: string;
+  minHeight: string;
+  minInlineSize: string;
+  minWidth: string;
+  mixBlendMode: string;
+  objectFit: string;
+  objectPosition: string;
+  offset: string;
+  offsetAnchor: string;
+  offsetDistance: string;
+  offsetPath: string;
+  offsetPosition: string;
+  offsetRotate: string;
+  opacity: string;
+  order: string;
+  outline: string;
+  outlineColor: string;
+  outlineOffset: string;
+  outlineStyle: string;
+  outlineWidth: string;
+  overflow: string;
+  overflowAnchor: string;
+  overflowBlock: string;
+  overflowClipMargin: string;
+  overflowInline: string;
+  overflowWrap: string;
+  overflowX: string;
+  overflowY: string;
+  overscrollBehavior: string;
+  overscrollBehaviorBlock: string;
+  overscrollBehaviorInline: string;
+  overscrollBehaviorX: string;
+  overscrollBehaviorY: string;
+  padding: string;
+  paddingBlock: string;
+  paddingBlockEnd: string;
+  paddingBlockStart: string;
+  paddingBottom: string;
+  paddingInline: string;
+  paddingInlineEnd: string;
+  paddingInlineStart: string;
+  paddingLeft: string;
+  paddingRight: string;
+  paddingTop: string;
+  page: string;
+  pageBreakAfter: string;
+  pageBreakBefore: string;
+  pageBreakInside: string;
+  paintOrder: string;
+  perspective: string;
+  perspectiveOrigin: string;
+  placeContent: string;
+  placeItems: string;
+  placeSelf: string;
+  pointerEvents: string;
+  position: string;
+  positionAnchor: string;
+  positionArea: string;
+  positionTry: string;
+  positionTryFallbacks: string;
+  positionTryOrder: string;
+  positionVisibility: string;
+  printColorAdjust: string;
+  quotes: string;
+  r: string;
+  resize: string;
+  right: string;
+  rotate: string;
+  rowGap: string;
+  rubyAlign: string;
+  rubyPosition: string;
+  rx: string;
+  ry: string;
+  scale: string;
+  scrollBehavior: string;
+  scrollMargin: string;
+  scrollMarginBlock: string;
+  scrollMarginBlockEnd: string;
+  scrollMarginBlockStart: string;
+  scrollMarginBottom: string;
+  scrollMarginInline: string;
+  scrollMarginInlineEnd: string;
+  scrollMarginInlineStart: string;
+  scrollMarginLeft: string;
+  scrollMarginRight: string;
+  scrollMarginTop: string;
+  scrollPadding: string;
+  scrollPaddingBlock: string;
+  scrollPaddingBlockEnd: string;
+  scrollPaddingBlockStart: string;
+  scrollPaddingBottom: string;
+  scrollPaddingInline: string;
+  scrollPaddingInlineEnd: string;
+  scrollPaddingInlineStart: string;
+  scrollPaddingLeft: string;
+  scrollPaddingRight: string;
+  scrollPaddingTop: string;
+  scrollSnapAlign: string;
+  scrollSnapStop: string;
+  scrollSnapType: string;
+  scrollTimeline: string;
+  scrollTimelineAxis: string;
+  scrollTimelineName: string;
+  scrollbarColor: string;
+  scrollbarGutter: string;
+  scrollbarWidth: string;
+  shapeImageThreshold: string;
+  shapeMargin: string;
+  shapeOutside: string;
+  shapeRendering: string;
+  stopColor: string;
+  stopOpacity: string;
+  stroke: string;
+  strokeDasharray: string;
+  strokeDashoffset: string;
+  strokeLinecap: string;
+  strokeLinejoin: string;
+  strokeMiterlimit: string;
+  strokeOpacity: string;
+  strokeWidth: string;
+  tabSize: string;
+  tableLayout: string;
+  textAlign: string;
+  textAlignLast: string;
+  textAnchor: string;
+  textAutospace: string;
+  textCombineUpright: string;
+  textDecoration: string;
+  textDecorationColor: string;
+  textDecorationInset: string;
+  textDecorationLine: string;
+  textDecorationSkipInk: string;
+  textDecorationStyle: string;
+  textDecorationThickness: string;
+  textEmphasis: string;
+  textEmphasisColor: string;
+  textEmphasisPosition: string;
+  textEmphasisStyle: string;
+  textIndent: string;
+  textJustify: string;
+  textOrientation: string;
+  textOverflow: string;
+  textRendering: string;
+  textShadow: string;
+  textTransform: string;
+  textUnderlineOffset: string;
+  textUnderlinePosition: string;
+  textWrap: string;
+  textWrapMode: string;
+  textWrapStyle: string;
+  top: string;
+  touchAction: string;
+  transform: string;
+  transformBox: string;
+  transformOrigin: string;
+  transformStyle: string;
+  transition: string;
+  transitionBehavior: string;
+  transitionDelay: string;
+  transitionDuration: string;
+  transitionProperty: string;
+  transitionTimingFunction: string;
+  translate: string;
+  unicodeBidi: string;
+  userSelect: string;
+  vectorEffect: string;
+  verticalAlign: string;
+  viewTimeline: string;
+  viewTimelineAxis: string;
+  viewTimelineInset: string;
+  viewTimelineName: string;
+  viewTransitionClass: string;
+  viewTransitionName: string;
+  visibility: string;
+  webkitLineClamp: string;
+  webkitTextFillColor: string;
+  webkitTextSecurity: string;
+  webkitTextStroke: string;
+  webkitTextStrokeColor: string;
+  webkitTextStrokeWidth: string;
+  whiteSpace: string;
+  whiteSpaceCollapse: string;
+  width: string;
+  willChange: string;
+  wordBreak: string;
+  wordSpacing: string;
+  writingMode: string;
+  x: string;
+  y: string;
+  zIndex: string;
+  zoom: string;
+}
+
+declare var CSSStyleProperties: {
+  prototype: CSSStyleProperties;
+  new (): CSSStyleProperties;
+  isInstance: IsInstance<CSSStyleProperties>;
+};
+
 interface CSSStyleRule extends CSSGroupingRule {
   readonly selectorCount: number;
   selectorText: string;
-  readonly style: CSSStyleDeclaration;
+  readonly style: CSSStyleProperties;
   readonly styleMap: StylePropertyMap;
   getScopeRootFor(
     selectorIndex: number,
@@ -8344,8 +9025,6 @@ interface DocumentEventMap
   extends GlobalEventHandlersEventMap,
     OnErrorEventHandlerForNodesEventMap,
     TouchEventHandlersEventMap {
-  afterscriptexecute: Event;
-  beforescriptexecute: Event;
   fullscreenchange: Event;
   fullscreenerror: Event;
   pointerlockchange: Event;
@@ -8400,6 +9079,7 @@ interface Document
   readonly embeds: HTMLCollection;
   readonly featurePolicy: FeaturePolicy;
   fgColor: string;
+  forceNonNativeTheme: boolean;
   readonly forms: HTMLCollection;
   readonly fragmentDirective: FragmentDirective;
   readonly fullscreen: boolean;
@@ -8427,8 +9107,6 @@ interface Document
   readonly mozFullScreen: boolean;
   readonly mozFullScreenEnabled: boolean;
   readonly mozSyntheticDocument: boolean;
-  onafterscriptexecute: ((this: Document, ev: Event) => any) | null;
-  onbeforescriptexecute: ((this: Document, ev: Event) => any) | null;
   onfullscreenchange: ((this: Document, ev: Event) => any) | null;
   onfullscreenerror: ((this: Document, ev: Event) => any) | null;
   onpointerlockchange: ((this: Document, ev: Event) => any) | null;
@@ -8540,8 +9218,6 @@ interface Document
   createEvent(eventInterface: 'MouseEvents'): MouseEvent;
   createEvent(eventInterface: 'MouseScrollEvent'): MouseScrollEvent;
   createEvent(eventInterface: 'MozSharedMapChangeEvent'): MozSharedMapChangeEvent;
-  createEvent(eventInterface: 'MutationEvent'): MutationEvent;
-  createEvent(eventInterface: 'MutationEvents'): MutationEvent;
   createEvent(eventInterface: 'NavigateEvent'): NavigateEvent;
   createEvent(
     eventInterface: 'NavigationCurrentEntryChangeEvent'
@@ -8564,6 +9240,7 @@ interface Document
   createEvent(eventInterface: 'RTCDataChannelEvent'): RTCDataChannelEvent;
   createEvent(eventInterface: 'RTCPeerConnectionIceEvent'): RTCPeerConnectionIceEvent;
   createEvent(eventInterface: 'RTCTrackEvent'): RTCTrackEvent;
+  createEvent(eventInterface: 'RedirectBlockedEvent'): RedirectBlockedEvent;
   createEvent(eventInterface: 'ScrollAreaEvent'): ScrollAreaEvent;
   createEvent(eventInterface: 'SecurityPolicyViolationEvent'): SecurityPolicyViolationEvent;
   createEvent(eventInterface: 'SimpleGestureEvent'): SimpleGestureEvent;
@@ -9058,7 +9735,7 @@ declare var Element: {
 
 interface ElementCSSInlineStyle {
   readonly attributeStyleMap: StylePropertyMap;
-  readonly style: CSSStyleDeclaration;
+  readonly style: CSSStyleProperties;
 }
 
 interface ElementInternals extends ARIAMixin {
@@ -14005,6 +14682,7 @@ interface HTMLTemplateElement extends HTMLElement {
   shadowRootClonable: boolean;
   shadowRootDelegatesFocus: boolean;
   shadowRootMode: string;
+  shadowRootReferenceTarget: string;
   shadowRootSerializable: boolean;
   addEventListener<K extends keyof HTMLElementEventMap>(
     type: K,
@@ -15051,31 +15729,6 @@ declare var InspectorFontFace: {
   isInstance: IsInstance<InspectorFontFace>;
 };
 
-interface InstallTriggerImpl {
-  enabled(): boolean;
-  install(
-    installs: Record<string, string | InstallTriggerData>,
-    callback?: InstallTriggerCallback
-  ): boolean;
-  installChrome(type: number, url: string, skin: string): boolean;
-  startSoftwareUpdate(url: string, flags?: number): boolean;
-  updateEnabled(): boolean;
-  readonly SKIN: 1;
-  readonly LOCALE: 2;
-  readonly CONTENT: 4;
-  readonly PACKAGE: 7;
-}
-
-declare var InstallTriggerImpl: {
-  prototype: InstallTriggerImpl;
-  new (): InstallTriggerImpl;
-  readonly SKIN: 1;
-  readonly LOCALE: 2;
-  readonly CONTENT: 4;
-  readonly PACKAGE: 7;
-  isInstance: IsInstance<InstallTriggerImpl>;
-};
-
 interface IntersectionObserver {
   readonly root: Node | null;
   readonly rootMargin: string;
@@ -15892,6 +16545,18 @@ interface LinkStyle {
   readonly sheet: StyleSheet | null;
 }
 
+interface LlamaRunner {
+  createGenerationStream(options: LlamaChatOptions): ReadableStream;
+  formatChat(options: LlamaFormatChatOptions): Promise<string>;
+  initialize(options: LlamaModelOptions, modelBlob: Blob): Promise<void>;
+}
+
+declare var LlamaRunner: {
+  prototype: LlamaRunner;
+  new (): LlamaRunner;
+  isInstance: IsInstance<LlamaRunner>;
+};
+
 interface LoadContextMixin {
   readonly associatedWindow: WindowProxy | null;
   readonly isContent: boolean;
@@ -17411,36 +18076,6 @@ declare var MozWritableSharedMap: {
   isInstance: IsInstance<MozWritableSharedMap>;
 };
 
-interface MutationEvent extends Event {
-  readonly attrChange: number;
-  readonly attrName: string;
-  readonly newValue: string;
-  readonly prevValue: string;
-  readonly relatedNode: Node | null;
-  initMutationEvent(
-    type: string,
-    canBubble?: boolean,
-    cancelable?: boolean,
-    relatedNode?: Node | null,
-    prevValue?: string,
-    newValue?: string,
-    attrName?: string,
-    attrChange?: number
-  ): void;
-  readonly MODIFICATION: 1;
-  readonly ADDITION: 2;
-  readonly REMOVAL: 3;
-}
-
-declare var MutationEvent: {
-  prototype: MutationEvent;
-  new (): MutationEvent;
-  readonly MODIFICATION: 1;
-  readonly ADDITION: 2;
-  readonly REMOVAL: 3;
-  isInstance: IsInstance<MutationEvent>;
-};
-
 interface MutationObserver {
   mergeAttributeRecords: boolean;
   readonly mutationCallback: MutationCallback;
@@ -17650,6 +18285,16 @@ declare var NavigationHistoryEntry: {
   isInstance: IsInstance<NavigationHistoryEntry>;
 };
 
+interface NavigationPrecommitController {
+  redirect(url: string | URL, options?: NavigationNavigateOptions): void;
+}
+
+declare var NavigationPrecommitController: {
+  prototype: NavigationPrecommitController;
+  new (): NavigationPrecommitController;
+  isInstance: IsInstance<NavigationPrecommitController>;
+};
+
 /** Available only in secure contexts. */
 interface NavigationPreloadManager {
   disable(): Promise<void>;
@@ -17665,6 +18310,7 @@ declare var NavigationPreloadManager: {
 };
 
 interface NavigationTransition {
+  readonly committed: Promise<void>;
   readonly finished: Promise<void>;
   readonly from: NavigationHistoryEntry;
   readonly navigationType: NavigationType;
@@ -19607,6 +20253,7 @@ declare var RTCDTMFToneChangeEvent: {
 interface RTCDataChannelEventMap {
   bufferedamountlow: Event;
   close: Event;
+  closing: Event;
   error: Event;
   message: Event;
   open: Event;
@@ -19623,6 +20270,7 @@ interface RTCDataChannel extends EventTarget {
   readonly negotiated: boolean;
   onbufferedamountlow: ((this: RTCDataChannel, ev: Event) => any) | null;
   onclose: ((this: RTCDataChannel, ev: Event) => any) | null;
+  onclosing: ((this: RTCDataChannel, ev: Event) => any) | null;
   onerror: ((this: RTCDataChannel, ev: Event) => any) | null;
   onmessage: ((this: RTCDataChannel, ev: Event) => any) | null;
   onopen: ((this: RTCDataChannel, ev: Event) => any) | null;
@@ -19716,7 +20364,10 @@ interface RTCEncodedAudioFrame {
 
 declare var RTCEncodedAudioFrame: {
   prototype: RTCEncodedAudioFrame;
-  new (): RTCEncodedAudioFrame;
+  new (
+    originalFrame: RTCEncodedAudioFrame,
+    options?: RTCEncodedAudioFrameOptions
+  ): RTCEncodedAudioFrame;
   isInstance: IsInstance<RTCEncodedAudioFrame>;
 };
 
@@ -19729,7 +20380,10 @@ interface RTCEncodedVideoFrame {
 
 declare var RTCEncodedVideoFrame: {
   prototype: RTCEncodedVideoFrame;
-  new (): RTCEncodedVideoFrame;
+  new (
+    originalFrame: RTCEncodedVideoFrame,
+    options?: RTCEncodedVideoFrameOptions
+  ): RTCEncodedVideoFrame;
   isInstance: IsInstance<RTCEncodedVideoFrame>;
 };
 
@@ -20238,6 +20892,17 @@ interface ReadableStreamGenericReader {
   cancel(reason?: any): Promise<void>;
 }
 
+interface RedirectBlockedEvent extends Event {
+  readonly redirectURI: URI | null;
+  readonly requestingWindow: Window | null;
+}
+
+declare var RedirectBlockedEvent: {
+  prototype: RedirectBlockedEvent;
+  new (type: string, eventInitDict?: RedirectBlockedEventInit): RedirectBlockedEvent;
+  isInstance: IsInstance<RedirectBlockedEvent>;
+};
+
 interface Report {
   readonly body: ReportBody | null;
   readonly type: string;
@@ -22360,7 +23025,7 @@ interface SVGMatrix {
   flipX(): SVGMatrix;
   flipY(): SVGMatrix;
   inverse(): SVGMatrix;
-  multiply(secondMatrix: SVGMatrix): SVGMatrix;
+  multiply(secondMatrix?: DOMMatrix2DInit): SVGMatrix;
   rotate(angle: number): SVGMatrix;
   rotateFromVector(x: number, y: number): SVGMatrix;
   scale(scaleFactor: number): SVGMatrix;
@@ -23342,15 +24007,15 @@ interface SVGZoomAndPan {
 }
 
 interface Sanitizer {
-  allowAttribute(attribute: SanitizerAttribute): void;
-  allowElement(element: SanitizerElementWithAttributes): void;
+  allowAttribute(attribute: SanitizerAttribute): boolean;
+  allowElement(element: SanitizerElementWithAttributes): boolean;
   get(): SanitizerConfig;
-  removeAttribute(attribute: SanitizerAttribute): void;
-  removeElement(element: SanitizerElement): void;
-  removeUnsafe(): void;
-  replaceElementWithChildren(element: SanitizerElement): void;
-  setComments(allow: boolean): void;
-  setDataAttributes(allow: boolean): void;
+  removeAttribute(attribute: SanitizerAttribute): boolean;
+  removeElement(element: SanitizerElement): boolean;
+  removeUnsafe(): boolean;
+  replaceElementWithChildren(element: SanitizerElement): boolean;
+  setComments(allow: boolean): boolean;
+  setDataAttributes(allow: boolean): boolean;
 }
 
 declare var Sanitizer: {
@@ -23789,6 +24454,7 @@ interface ShadowRoot extends DocumentFragment, DocumentOrShadowRoot {
   innerHTML: TrustedHTML | string;
   readonly mode: ShadowRootMode;
   onslotchange: ((this: ShadowRoot, ev: Event) => any) | null;
+  referenceTarget: string;
   readonly serializable: boolean;
   readonly slotAssignment: SlotAssignmentMode;
   createElementAndAppendChildAt(parentNode: Node, localName: string): Node;
@@ -25452,6 +26118,7 @@ declare var TimeRanges: {
 interface ToggleEvent extends Event {
   readonly newState: string;
   readonly oldState: string;
+  readonly source: Element | null;
 }
 
 declare var ToggleEvent: {
@@ -26781,6 +27448,7 @@ interface WebBrowserPersistable {
 }
 
 interface WebExtensionContentScript extends MozDocumentMatcher {
+  readonly cssOrigin: ContentScriptCssOrigin;
   readonly cssPaths: string[];
   readonly jsPaths: string[];
   readonly runAt: ContentScriptRunAt;
@@ -30027,7 +30695,7 @@ interface Window
     WindowSessionStorage {
   readonly Glean: GleanImpl;
   readonly GleanPings: GleanPingsImpl;
-  readonly InstallTrigger: InstallTriggerImpl | null;
+  readonly InstallTrigger: any;
   browserDOMWindow: nsIBrowserDOMWindow | null;
   readonly browsingContext: BrowsingContext;
   readonly clientInformation: Navigator;
@@ -30051,6 +30719,7 @@ interface Window
   readonly innerWidth: number;
   readonly intlUtils: IntlUtils;
   readonly isChromeWindow: boolean;
+  readonly isCloaked: boolean;
   readonly isFullyOccluded: boolean;
   readonly isInFullScreenTransition: boolean;
   readonly length: number;
@@ -30131,7 +30800,7 @@ interface Window
   focus(): void;
   getAttention(): void;
   getAttentionWithCycleCount(aCycleCount: number): void;
-  getComputedStyle(elt: Element, pseudoElt?: string | null): CSSStyleDeclaration | null;
+  getComputedStyle(elt: Element, pseudoElt?: string | null): CSSStyleProperties | null;
   getDefaultComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration | null;
   getGroupMessageManager(aGroup: string): ChromeMessageBroadcaster;
   getInterface(iid: any): any;
@@ -30188,7 +30857,8 @@ interface Window
     offsetX: number,
     offsetY: number,
     mouseEventData?: SynthesizeMouseEventData,
-    options?: SynthesizeMouseEventOptions
+    options?: SynthesizeMouseEventOptions,
+    callback?: VoidFunction
   ): boolean;
   updateCommands(action: string): void;
   readonly STATE_MAXIMIZED: 1;
@@ -30405,6 +31075,7 @@ interface WindowOrWorkerGlobalScope {
     aOptions?: ImageBitmapOptions
   ): Promise<ImageBitmap>;
   fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
+  isRFPTargetActive(aTargetName: string): boolean;
   queueMicrotask(callback: VoidFunction): void;
   reportError(e: any): void;
   setInterval(handler: TimerHandler, timeout?: number, ...unused: any[]): number;
@@ -31644,6 +32315,8 @@ declare namespace ChromeUtils {
     aOptions?: ImportESModuleOptionsDictionary
   ): void;
   function defineLazyGetter(aTarget: any, aName: any, aLambda: any): void;
+  function enableAllPerfStatsFeatures(): void;
+  function encodeURIForSrcset(uri: string): string;
   function endWheelTransaction(window: WindowProxy): Promise<void>;
   function ensureHeadlessContentProcess(aRemoteType: string): Promise<nsIContentParentKeepAlive>;
   function ensureJSOracleStarted(): void;
@@ -31658,6 +32331,7 @@ declare namespace ChromeUtils {
   function getClassName(obj: any, unwrap?: boolean): string;
   function getFormAutofillConfidences(elements: Element[]): FormAutofillConfidences[];
   function getGMPContentDecryptionModuleInformation(): Promise<CDMInformation[]>;
+  function getGlobalWindowCommandEnabled(name: string): boolean | null;
   function getLibcConstants(): LibcConstants;
   function getObjectNodeId(obj: any): NodeId;
   function getPartitionKeyFromURL(
@@ -31701,7 +32375,7 @@ declare namespace ChromeUtils {
   function resetLastExternalProtocolIframeAllowed(): void;
   function saveHeapSnapshot(boundaries?: HeapSnapshotBoundaries): string;
   function saveHeapSnapshotGetId(boundaries?: HeapSnapshotBoundaries): string;
-  function setPerfStatsCollectionMask(aCollectionMask: number): void;
+  function setPerfStatsFeatures(aMetrics: string[]): void;
   function shallowClone(obj: any, target?: any): any;
   function shouldResistFingerprinting(
     target: JSRFPTarget,
@@ -31721,6 +32395,7 @@ declare namespace FuzzingFunctions {
   function enableAccessibility(): void;
   function garbageCollect(): void;
   function garbageCollectCompacting(): void;
+  function killGPUProcess(): void;
   function memoryPressure(): void;
   function signalIPCReady(): void;
   function spinEventLoopFor(aMilliseconds: number): void;
@@ -31767,7 +32442,11 @@ declare namespace IOUtils {
   function setMacXAttr(path: string, attr: string, value: Uint8Array): Promise<void>;
   function setModificationTime(path: string, modification?: number): Promise<number>;
   function setPermissions(path: string, permissions: number, honorUmask?: boolean): Promise<void>;
-  function setWindowsAttributes(path: string, attrs?: WindowsFileAttributes): Promise<void>;
+  function setWindowsAttributes(
+    path: string,
+    attrs?: WindowsFileAttributes,
+    recursive?: boolean
+  ): Promise<void>;
   function stat(path: string): Promise<FileInfo>;
   function write(path: string, data: Uint8Array, options?: WriteOptions): Promise<number>;
   function writeJSON(path: string, value: any, options?: WriteOptions): Promise<number>;
@@ -31799,6 +32478,7 @@ declare namespace InspectorUtils {
     includeAssignedNodes: boolean
   ): Node[];
   function getContentState(element: Element): number;
+  function getGridContainerType(aElement: Element): number;
   function getMatchingCSSRules(
     element: Element,
     pseudo?: string,
@@ -31824,7 +32504,8 @@ declare namespace InspectorUtils {
   ): InspectorFontFace[];
   function hasPseudoClassLock(element: Element, pseudoClass: string): boolean;
   function hasRulesModifiedByCSSOM(sheet: CSSStyleSheet): boolean;
-  function hsvToRgb(r: number, g: number, b: number): number[] | Float32Array;
+  function hsvToRgb(h: number, s: number, v: number): number[] | Float32Array;
+  function isBlockContainer(element: Element): boolean;
   function isCustomElementName(name: string | null, namespaceURI: string | null): boolean;
   function isElementThemed(element: Element): boolean;
   function isIgnorableWhitespace(dataNode: CharacterData): boolean;
@@ -32140,10 +32821,6 @@ interface IdleRequestCallback {
   (deadline: IdleDeadline): void;
 }
 
-interface InstallTriggerCallback {
-  (url: string, status: number): void;
-}
-
 interface IntersectionCallback {
   (entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;
 }
@@ -32164,6 +32841,10 @@ interface NavigationInterceptHandler {
   (): void | PromiseLike<void>;
 }
 
+interface NavigationPrecommitHandler {
+  (controller: NavigationPrecommitController): void | PromiseLike<void>;
+}
+
 interface NavigatorUserMediaErrorCallback {
   (error: MediaStreamError): void;
 }
@@ -32490,7 +33171,7 @@ declare var webkitSpeechRecognition: {
 };
 declare var Glean: GleanImpl;
 declare var GleanPings: GleanPingsImpl;
-declare var InstallTrigger: InstallTriggerImpl | null;
+declare var InstallTrigger: any;
 declare var browserDOMWindow: nsIBrowserDOMWindow | null;
 declare var browsingContext: BrowsingContext;
 declare var clientInformation: Navigator;
@@ -32514,6 +33195,7 @@ declare var innerHeight: number;
 declare var innerWidth: number;
 declare var intlUtils: IntlUtils;
 declare var isChromeWindow: boolean;
+declare var isCloaked: boolean;
 declare var isFullyOccluded: boolean;
 declare var isInFullScreenTransition: boolean;
 declare var length: number;
@@ -32598,7 +33280,7 @@ declare function getAttentionWithCycleCount(aCycleCount: number): void;
 declare function getComputedStyle(
   elt: Element,
   pseudoElt?: string | null
-): CSSStyleDeclaration | null;
+): CSSStyleProperties | null;
 declare function getDefaultComputedStyle(
   elt: Element,
   pseudoElt?: string
@@ -32661,7 +33343,8 @@ declare function synthesizeMouseEvent(
   offsetX: number,
   offsetY: number,
   mouseEventData?: SynthesizeMouseEventData,
-  options?: SynthesizeMouseEventOptions
+  options?: SynthesizeMouseEventOptions,
+  callback?: VoidFunction
 ): boolean;
 declare function updateCommands(action: string): void;
 declare function toString(): string;
@@ -32822,6 +33505,7 @@ declare function createImageBitmap(
   aOptions?: ImageBitmapOptions
 ): Promise<ImageBitmap>;
 declare function fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
+declare function isRFPTargetActive(aTargetName: string): boolean;
 declare function queueMicrotask(callback: VoidFunction): void;
 declare function reportError(e: any): void;
 declare function setInterval(handler: TimerHandler, timeout?: number, ...unused: any[]): number;
@@ -32883,6 +33567,7 @@ type ConstrainLong = number | ConstrainLongRange;
 type ContentSecurityPolicy = nsIContentSecurityPolicy;
 type Cookie = nsICookie;
 type CookieList = CookieListItem[];
+type CustomMediaQuery = MediaList | boolean;
 type DOMHighResTimeStamp = number;
 type DOMTimeStamp = number;
 type EpochTimeStamp = number;
@@ -33121,6 +33806,7 @@ type ConsoleLogLevel =
   | 'TimeLog'
   | 'Trace'
   | 'Warn';
+type ContentScriptCssOrigin = 'author' | 'user';
 type ContentScriptExecutionWorld = 'ISOLATED' | 'MAIN' | 'USER_SCRIPT';
 type ContentScriptRunAt = 'document_end' | 'document_idle' | 'document_start';
 type CookieSameSite = 'lax' | 'none' | 'strict';
@@ -33142,6 +33828,7 @@ type DebuggerNotificationType =
   | 'setTimeoutCallback';
 type DeclarationOrigin =
   | 'animations'
+  | 'position-fallback'
   | 'pres-hints'
   | 'smil'
   | 'style-attribute'
@@ -33180,6 +33867,7 @@ type FlexLineGrowthState = 'growing' | 'shrinking';
 type FlexPhysicalDirection = 'horizontal-lr' | 'horizontal-rl' | 'vertical-bt' | 'vertical-tb';
 type FontFaceLoadStatus = 'error' | 'loaded' | 'loading' | 'unloaded';
 type FontFaceSetLoadStatus = 'loaded' | 'loading';
+type ForceMediaDocument = 'image' | 'none' | 'video';
 type ForcedColorsOverride = 'active' | 'none';
 type GPUAddressMode = 'clamp-to-edge' | 'mirror-repeat' | 'repeat';
 type GPUAutoLayoutMode = 'auto';
@@ -33224,6 +33912,7 @@ type GPUFeatureName =
   | 'float32-blendable'
   | 'float32-filterable'
   | 'indirect-first-instance'
+  | 'primitive-index'
   | 'rg11b10ufloat-renderable'
   | 'shader-f16'
   | 'subgroups'
@@ -33433,6 +34122,22 @@ type JSRFPTarget =
 type L10nFileSourceHasFileStatus = 'missing' | 'present' | 'unknown';
 type LatencyMode = 'quality' | 'realtime';
 type LineAlignSetting = 'center' | 'end' | 'start';
+type LlamaKVCacheDtype = 'f16' | 'f32' | 'q4_0' | 'q4_1' | 'q5_0' | 'q5_1' | 'q8_0';
+type LlamaSamplerType =
+  | 'dist'
+  | 'dry'
+  | 'infill'
+  | 'logit-bias'
+  | 'min-p'
+  | 'mirostat'
+  | 'penalties'
+  | 'temperature'
+  | 'temperature-ext'
+  | 'top-k'
+  | 'top-n-sigma'
+  | 'top-p'
+  | 'typical'
+  | 'xtc';
 type LockMode = 'exclusive' | 'shared';
 type LoginStatus = 'logged-in' | 'logged-out';
 type MIDIPortConnectionState = 'closed' | 'open' | 'pending';
@@ -33700,7 +34405,7 @@ type RTCStatsIceCandidatePairState =
   | 'cancelled'
   | 'failed'
   | 'frozen'
-  | 'inprogress'
+  | 'in-progress'
   | 'succeeded'
   | 'waiting';
 type RTCStatsType =
@@ -33777,7 +34482,7 @@ type ScrollRestoration = 'auto' | 'manual';
 type ScrollSetting = '' | 'up';
 type SecurityPolicyViolationEventDisposition = 'enforce' | 'report';
 type SelectionMode = 'end' | 'preserve' | 'select' | 'start';
-type SelectorWarningKind = 'UnconstrainedHas';
+type SelectorWarningKind = 'SiblingCombinatorAfterScope' | 'UnconstrainedHas';
 type ServiceWorkerState =
   | 'activated'
   | 'activating'
diff --git a/src/zen/@types/lib.gecko.glean.d.ts b/src/zen/@types/lib.gecko.glean.d.ts
index 6b62c5590..efcc19d50 100644
--- a/src/zen/@types/lib.gecko.glean.d.ts
+++ b/src/zen/@types/lib.gecko.glean.d.ts
@@ -82,10 +82,6 @@ interface GleanImpl {
     cacheMetadataFirstReadTime: GleanTimingDistribution;
     cacheMetadataSecondReadTime: GleanTimingDistribution;
     cacheMetadataSize: GleanMemoryDistribution;
-    cachePurgeDueToMemoryLimit: Record<
-      'cache_memory_limit' | 'meta_data_file_size_limit',
-      GleanCounter
-    >;
     cookieAccessFixupDiff: GleanCustomDistribution;
     cookieChipsPartitionLimitOverflow: GleanCustomDistribution;
     cookieCountPartByKey: GleanCustomDistribution;
@@ -122,8 +118,6 @@ interface GleanImpl {
     dnsNativeHttpsCallTime: GleanTimingDistribution;
     dnsRenewalTime: GleanTimingDistribution;
     dnsRenewalTimeForTtl: GleanTimingDistribution;
-    fetchKeepaliveDiscardCount: Record<'per_origin_limit' | 'total_keepalive_limit', GleanCounter>;
-    fetchKeepaliveRequestCount: Record<'main' | 'worker', GleanCounter>;
     http3ChannelOnstartSuccess: GleanDualLabeledCounter;
     http1DownloadThroughput: GleanCustomDistribution;
     http1DownloadThroughput100: GleanCustomDistribution;
@@ -310,13 +304,6 @@ interface GleanImpl {
     httpChannelPageOpenToFirstSentHttpsRr: GleanTimingDistribution;
     httpChannelSubOpenToFirstSent: GleanTimingDistribution;
     httpChannelSubOpenToFirstSentHttpsRr: GleanTimingDistribution;
-    httpContentCssloaderOndatafinishedToOnstopDelay: GleanTimingDistribution;
-    httpContentHtml5parserOndatafinishedToOnstopDelay: GleanTimingDistribution;
-    httpContentOndatafinishedDelay: GleanTimingDistribution;
-    httpContentOndatafinishedDelay2: GleanTimingDistribution;
-    httpContentOndatafinishedToOnstopDelay: GleanTimingDistribution;
-    httpContentOnstartDelay: GleanTimingDistribution;
-    httpContentOnstopDelay: GleanTimingDistribution;
     httpOnstartSuspendTotalTime: GleanTimingDistribution;
     httpRedirectToSchemeSubresource: Record<string, GleanCounter>;
     httpRedirectToSchemeTopLevel: Record<string, GleanCounter>;
@@ -411,10 +398,6 @@ interface GleanImpl {
     >;
     residualCacheFolderCount: GleanCounter;
     residualCacheFolderRemoval: Record<'failure' | 'success', GleanCounter>;
-    setCookie: GleanDenominator;
-    setCookieForeign: GleanNumerator;
-    setCookieForeignPartitioned: GleanNumerator;
-    setCookiePartitioned: GleanNumerator;
     speculativeConnectOutcome: Record<
       'aborted_https_not_enabled' | 'aborted_socket_fail' | 'aborted_socket_limit' | 'successful',
       GleanCounter
@@ -757,11 +740,15 @@ interface GleanImpl {
   };
 
   browserBackup: {
+    archiveDisabledReason: GleanString;
+    archiveEnabled: GleanBoolean;
+    backupStart: GleanEventWithExtras<{ reason?: string }>;
+    backupThrottled: GleanEventNoExtras;
     browserExtensionDataSize: GleanQuantity;
     changeLocation: GleanEventNoExtras;
     compressedArchiveSize: GleanMemoryDistribution;
     cookiesSize: GleanQuantity;
-    created: GleanEventNoExtras;
+    created: GleanEventWithExtras<{ encrypted?: string; location?: string; size?: string }>;
     credentialsDataSize: GleanQuantity;
     enabled: GleanBoolean;
     error: GleanEventWithExtras<{ backup_step?: string; error_code?: string }>;
@@ -782,13 +769,15 @@ interface GleanImpl {
     preferencesSize: GleanQuantity;
     profDDiskSpace: GleanQuantity;
     pswdEncrypted: GleanBoolean;
+    restoreDisabledReason: GleanString;
+    restoreEnabled: GleanBoolean;
     schedulerEnabled: GleanBoolean;
     securityDataSize: GleanQuantity;
     sessionStoreBackupsDirectorySize: GleanQuantity;
     sessionStoreSize: GleanQuantity;
     storageSyncSize: GleanQuantity;
     toggleOff: GleanEventNoExtras;
-    toggleOn: GleanEventNoExtras;
+    toggleOn: GleanEventWithExtras<{ encrypted?: string; location?: string }>;
     totalBackupSize: GleanMemoryDistribution;
     totalBackupTime: GleanTimingDistribution;
   };
@@ -1374,22 +1363,6 @@ interface GleanImpl {
       user_prefs?: string;
       value?: string;
     }>;
-    eventFakespotCategory: GleanEventWithExtras<{
-      action_position?: string;
-      addon_version?: string;
-      page?: string;
-      session_id?: string;
-      user_prefs?: string;
-      value?: string;
-    }>;
-    eventFakespotClick: GleanEventWithExtras<{
-      action_position?: string;
-      addon_version?: string;
-      page?: string;
-      session_id?: string;
-      user_prefs?: string;
-      value?: string;
-    }>;
     eventHidePersonalize: GleanEventWithExtras<{
       action_position?: string;
       addon_version?: string;
@@ -1682,27 +1655,13 @@ interface GleanImpl {
     addonXpiUsed: GleanBoolean;
     blockedSponsors: GleanStringList;
     closed: GleanEventWithExtras<{ newtab_visit_id?: string }>;
-    fakespotAboutClick: GleanEventWithExtras<{ newtab_visit_id?: string }>;
-    fakespotCategory: GleanEventWithExtras<{ category?: string; newtab_visit_id?: string }>;
-    fakespotClick: GleanEventWithExtras<{
-      category?: string;
-      newtab_visit_id?: string;
-      product_id?: string;
-    }>;
-    fakespotCtaClick: GleanEventWithExtras<{ newtab_visit_id?: string }>;
-    fakespotDismiss: GleanEventWithExtras<{ newtab_visit_id?: string }>;
-    fakespotProductImpression: GleanEventWithExtras<{
-      category?: string;
-      newtab_visit_id?: string;
-      product_id?: string;
-      product_title?: string;
-    }>;
     featureHighlightDismiss: GleanEventWithExtras<{ feature?: string; newtab_visit_id?: string }>;
     featureHighlightImpression: GleanEventWithExtras<{
       feature?: string;
       newtab_visit_id?: string;
     }>;
     featureHighlightOpen: GleanEventWithExtras<{ feature?: string; newtab_visit_id?: string }>;
+    highlightsEnabled: GleanBoolean;
     homepageCategory: GleanString;
     inlineSelectionClick: GleanEventWithExtras<{
       is_followed?: string;
@@ -1799,11 +1758,16 @@ interface GleanImpl {
       newtab_visit_id?: string;
       weather_display_mode?: string;
     }>;
+    weatherDetectLocation: GleanEventWithExtras<{ newtab_visit_id?: string }>;
     weatherEnabled: GleanBoolean;
     weatherImpression: GleanEventWithExtras<{ newtab_visit_id?: string }>;
     weatherLoadError: GleanEventWithExtras<{ newtab_visit_id?: string }>;
     weatherLocationSelected: GleanEventWithExtras<{ newtab_visit_id?: string }>;
     weatherOpenProviderUrl: GleanEventWithExtras<{ newtab_visit_id?: string }>;
+    weatherOptInSelection: GleanEventWithExtras<{
+      newtab_visit_id?: string;
+      user_selection?: string;
+    }>;
     widgetsListsChangeDisplay: GleanEventWithExtras<{
       display_status?: string;
       newtab_visit_id?: string;
@@ -1839,7 +1803,6 @@ interface GleanImpl {
     click: GleanEventWithExtras<{
       corpus_item_id?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
       matches_selected_topic?: string;
@@ -1876,7 +1839,6 @@ interface GleanImpl {
     impression: GleanEventWithExtras<{
       corpus_item_id?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
       position?: string;
@@ -1937,7 +1899,6 @@ interface GleanImpl {
     thumbVotingInteraction: GleanEventWithExtras<{
       corpus_item_id?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       position?: string;
       received_rank?: string;
@@ -1960,7 +1921,6 @@ interface GleanImpl {
       corpus_item_id?: string;
       event_source?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
       layout_name?: string;
@@ -1978,9 +1938,9 @@ interface GleanImpl {
       topic?: string;
     }>;
     dismiss: GleanEventWithExtras<{
+      content_redacted?: string;
       corpus_item_id?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
       newtab_visit_id?: string;
@@ -1999,7 +1959,6 @@ interface GleanImpl {
       content_redacted?: string;
       corpus_item_id?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
       layout_name?: string;
@@ -2020,7 +1979,6 @@ interface GleanImpl {
     save: GleanEventWithExtras<{
       corpus_item_id?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       is_sponsored?: string;
       matches_selected_topic?: string;
@@ -2042,7 +2000,6 @@ interface GleanImpl {
       content_redacted?: string;
       corpus_item_id?: string;
       format?: string;
-      is_list_card?: string;
       is_section_followed?: string;
       newtab_visit_id?: string;
       position?: string;
@@ -2084,6 +2041,8 @@ interface GleanImpl {
       is_sponsored?: string;
       newtab_visit_id?: string;
       position?: string;
+      smart_scores?: string;
+      smart_weights?: string;
       tile_id?: string;
       visible_topsites?: string;
     }>;
@@ -2111,6 +2070,8 @@ interface GleanImpl {
       is_sponsored?: string;
       newtab_visit_id?: string;
       position?: string;
+      smart_scores?: string;
+      smart_weights?: string;
       tile_id?: string;
       visible_topsites?: string;
     }>;
@@ -2654,6 +2615,12 @@ interface GleanImpl {
   browserUiInteraction: {
     allTabsPanelDragstartTabEventCount: GleanCounter;
     allTabsPanelEntrypoint: Record<string, GleanCounter>;
+    tabMovement: Record<
+      | 'from_external_app_next_to_active_tab'
+      | 'from_external_app_tab_strip_end'
+      | 'not_from_external_app',
+      GleanCounter
+    >;
     textrecognitionError: GleanCounter;
     appMenu: Record<string, GleanCounter>;
     bookmarksBar: Record<string, GleanCounter>;
@@ -2682,6 +2649,12 @@ interface GleanImpl {
     keyboard: Record<string, GleanCounter>;
   };
 
+  linkHandling: {
+    openFromExternalApp: GleanEventWithExtras<{ next_to_active_tab?: string }>;
+    openNextToActiveTabSettingsChange: GleanEventWithExtras<{ checked?: string }>;
+    openNextToActiveTabSettingsEnabled: GleanBoolean;
+  };
+
   tabgroup: {
     activeGroups: Record<'collapsed' | 'expanded', GleanQuantity>;
     addTab: GleanEventWithExtras<{
@@ -2766,10 +2739,11 @@ interface GleanImpl {
     activate: GleanEventNoExtras;
     eject: GleanEventNoExtras;
     install: GleanEventNoExtras;
+    installedWebAppCount: GleanQuantity;
     moveToTaskbar: GleanEventNoExtras;
     pin: GleanEventWithExtras<{ result?: string }>;
     uninstall: GleanEventNoExtras;
-    unpin: GleanEventWithExtras<{ result?: string }>;
+    unpin: GleanEventWithExtras<{ removal_result?: string; result?: string }>;
     usageTime: GleanTimingDistribution;
   };
 
@@ -2898,16 +2872,12 @@ interface GleanImpl {
     heuristicResultMissing: GleanRate;
     keywordExposure: GleanEventWithExtras<{ keyword?: string; result?: string; terminal?: string }>;
     prefMaxResults: GleanQuantity;
-    prefSuggestDataCollection: GleanBoolean;
-    prefSuggestNonsponsored: GleanBoolean;
+    prefSuggestAll: GleanBoolean;
+    prefSuggestOnlineAvailable: GleanBoolean;
+    prefSuggestOnlineEnabled: GleanBoolean;
     prefSuggestSponsored: GleanBoolean;
     prefSuggestTopsites: GleanBoolean;
     prefSwitchTabsSearchAllContainers: GleanBoolean;
-    quickSuggestContextualOptIn: GleanEventWithExtras<{
-      interaction?: string;
-      say_hello?: string;
-      top_position?: string;
-    }>;
   };
 
   urlbarMerino: {
@@ -4277,9 +4247,6 @@ interface GleanImpl {
     cssOverflow: GleanCounter;
     cssOverflowAnchor: GleanCounter;
     cssOverflowBlock: GleanCounter;
-    cssOverflowClipBox: GleanCounter;
-    cssOverflowClipBoxBlock: GleanCounter;
-    cssOverflowClipBoxInline: GleanCounter;
     cssOverflowClipMargin: GleanCounter;
     cssOverflowInline: GleanCounter;
     cssOverflowWrap: GleanCounter;
@@ -4388,11 +4355,11 @@ interface GleanImpl {
     cssTextCombineUpright: GleanCounter;
     cssTextDecoration: GleanCounter;
     cssTextDecorationColor: GleanCounter;
+    cssTextDecorationInset: GleanCounter;
     cssTextDecorationLine: GleanCounter;
     cssTextDecorationSkipInk: GleanCounter;
     cssTextDecorationStyle: GleanCounter;
     cssTextDecorationThickness: GleanCounter;
-    cssTextDecorationTrim: GleanCounter;
     cssTextEmphasis: GleanCounter;
     cssTextEmphasisColor: GleanCounter;
     cssTextEmphasisPosition: GleanCounter;
@@ -4987,9 +4954,6 @@ interface GleanImpl {
     cssOverflow: GleanCounter;
     cssOverflowAnchor: GleanCounter;
     cssOverflowBlock: GleanCounter;
-    cssOverflowClipBox: GleanCounter;
-    cssOverflowClipBoxBlock: GleanCounter;
-    cssOverflowClipBoxInline: GleanCounter;
     cssOverflowClipMargin: GleanCounter;
     cssOverflowInline: GleanCounter;
     cssOverflowWrap: GleanCounter;
@@ -5098,11 +5062,11 @@ interface GleanImpl {
     cssTextCombineUpright: GleanCounter;
     cssTextDecoration: GleanCounter;
     cssTextDecorationColor: GleanCounter;
+    cssTextDecorationInset: GleanCounter;
     cssTextDecorationLine: GleanCounter;
     cssTextDecorationSkipInk: GleanCounter;
     cssTextDecorationStyle: GleanCounter;
     cssTextDecorationThickness: GleanCounter;
-    cssTextDecorationTrim: GleanCounter;
     cssTextEmphasis: GleanCounter;
     cssTextEmphasisColor: GleanCounter;
     cssTextEmphasisPosition: GleanCounter;
@@ -5329,10 +5293,8 @@ interface GleanImpl {
   };
 
   useCounterDeprecatedOpsDoc: {
-    afterScriptExecuteEvent: GleanCounter;
     ambientLightEvent: GleanCounter;
     appCache: GleanCounter;
-    beforeScriptExecuteEvent: GleanCounter;
     components: GleanCounter;
     createImageBitmapCanvasRenderingContext2D: GleanCounter;
     deprecatedTestingAttribute: GleanCounter;
@@ -5345,6 +5307,7 @@ interface GleanImpl {
     elementSetCapture: GleanCounter;
     externalAddSearchProvider: GleanCounter;
     formSubmissionUntrustedEvent: GleanCounter;
+    fullscreenAttribute: GleanCounter;
     idbobjectStoreCreateIndexLocale: GleanCounter;
     idbopenDboptionsStorageType: GleanCounter;
     imageBitmapRenderingContextTransferImageBitmap: GleanCounter;
@@ -5378,10 +5341,8 @@ interface GleanImpl {
   };
 
   useCounterDeprecatedOpsPage: {
-    afterScriptExecuteEvent: GleanCounter;
     ambientLightEvent: GleanCounter;
     appCache: GleanCounter;
-    beforeScriptExecuteEvent: GleanCounter;
     components: GleanCounter;
     createImageBitmapCanvasRenderingContext2D: GleanCounter;
     deprecatedTestingAttribute: GleanCounter;
@@ -5394,6 +5355,7 @@ interface GleanImpl {
     elementSetCapture: GleanCounter;
     externalAddSearchProvider: GleanCounter;
     formSubmissionUntrustedEvent: GleanCounter;
+    fullscreenAttribute: GleanCounter;
     idbobjectStoreCreateIndexLocale: GleanCounter;
     idbopenDboptionsStorageType: GleanCounter;
     imageBitmapRenderingContextTransferImageBitmap: GleanCounter;
@@ -5615,6 +5577,8 @@ interface GleanImpl {
     svgsvgelementGetelementbyid: GleanCounter;
     textDirectiveNotCreated: GleanCounter;
     textDirectivePages: GleanCounter;
+    webgpuRenderOutput: GleanCounter;
+    webgpuRequestAdapter: GleanCounter;
     windowAbsoluteorientationsensor: GleanCounter;
     windowAccelerometer: GleanCounter;
     windowBackgroundfetchmanager: GleanCounter;
@@ -5973,6 +5937,8 @@ interface GleanImpl {
     svgsvgelementGetelementbyid: GleanCounter;
     textDirectiveNotCreated: GleanCounter;
     textDirectivePages: GleanCounter;
+    webgpuRenderOutput: GleanCounter;
+    webgpuRequestAdapter: GleanCounter;
     windowAbsoluteorientationsensor: GleanCounter;
     windowAccelerometer: GleanCounter;
     windowBackgroundfetchmanager: GleanCounter;
@@ -6196,6 +6162,7 @@ interface GleanImpl {
     pushmanagerSubscribe: GleanCounter;
     pushsubscriptionUnsubscribe: GleanCounter;
     schedulerPosttask: GleanCounter;
+    webgpuRequestAdapter: GleanCounter;
   };
 
   useCounterWorkerService: {
@@ -6252,6 +6219,7 @@ interface GleanImpl {
     pushmanagerSubscribe: GleanCounter;
     pushsubscriptionUnsubscribe: GleanCounter;
     schedulerPosttask: GleanCounter;
+    webgpuRequestAdapter: GleanCounter;
   };
 
   useCounterWorkerShared: {
@@ -6308,6 +6276,7 @@ interface GleanImpl {
     pushmanagerSubscribe: GleanCounter;
     pushsubscriptionUnsubscribe: GleanCounter;
     schedulerPosttask: GleanCounter;
+    webgpuRequestAdapter: GleanCounter;
   };
 
   canvas: {
@@ -6358,11 +6327,7 @@ interface GleanImpl {
 
   mediadrm: {
     decryption: Record<
-      | 'has_hardware_clearlead'
-      | 'has_hardware_decryption'
-      | 'has_hdcp22_plus'
-      | 'has_software_clearlead'
-      | 'has_wmf',
+      'has_hardware_clearlead' | 'has_hardware_decryption' | 'has_software_clearlead' | 'has_wmf',
       GleanBoolean
     >;
     emePlayback: GleanEventWithExtras<{
@@ -6503,6 +6468,49 @@ interface GleanImpl {
     notSupportedVideoPerMimeType: Record<string, GleanCounter>;
   };
 
+  mediaRecorder: {
+    mimeTypeQuery: Record<
+      | 'empty'
+      | 'mkv_aac'
+      | 'mkv_av1'
+      | 'mkv_flac'
+      | 'mkv_h264'
+      | 'mkv_h265'
+      | 'mkv_opus'
+      | 'mkv_others'
+      | 'mkv_pcm'
+      | 'mkv_unspecified'
+      | 'mkv_vorbis'
+      | 'mkv_vp8'
+      | 'mkv_vp9'
+      | 'mp4_aac'
+      | 'mp4_av1'
+      | 'mp4_flac'
+      | 'mp4_h264'
+      | 'mp4_h265'
+      | 'mp4_opus'
+      | 'mp4_others'
+      | 'mp4_unspecified'
+      | 'mp4_vp9'
+      | 'ogg_flac'
+      | 'ogg_opus'
+      | 'ogg_others'
+      | 'ogg_unspecified'
+      | 'ogg_vorbis'
+      | 'ogg_vp8'
+      | 'ogg_vp9'
+      | 'others'
+      | 'webm_av1'
+      | 'webm_opus'
+      | 'webm_others'
+      | 'webm_unspecified'
+      | 'webm_vorbis'
+      | 'webm_vp8'
+      | 'webm_vp9',
+      GleanCounter
+    >;
+  };
+
   mediaMp4Parse: {
     numSampleDescriptionEntries: GleanCustomDistribution;
     sampleDescriptionEntriesHaveMultipleCodecs: Record<'false' | 'true', GleanCounter>;
@@ -6726,6 +6734,8 @@ interface GleanImpl {
       using_webdriver?: string;
     }>;
     pageLoadDomain: GleanEventWithExtras<{
+      app_version_major?: string;
+      channel?: string;
       document_features?: string;
       domain?: string;
       http_ver?: string;
@@ -6975,7 +6985,6 @@ interface GleanImpl {
     supportsHdr: GleanBoolean;
     adapters: GleanObject;
     contentBackend: GleanString;
-    d2dEnabled: GleanBoolean;
     dwriteEnabled: GleanBoolean;
     headless: GleanBoolean;
     monitors: GleanObject;
@@ -9268,16 +9277,16 @@ interface GleanImpl {
     imagesContentUsedUncompressed: GleanMemoryDistribution;
     jsCompartmentsSystem: GleanCustomDistribution;
     jsCompartmentsUser: GleanCustomDistribution;
-    jsGcHeap: GleanMemoryDistribution;
+    jsGcHeap: Record<string, GleanMemoryDistribution>;
     jsRealmsSystem: GleanCustomDistribution;
     jsRealmsUser: GleanCustomDistribution;
     lowMemoryEventsPhysical: GleanCustomDistribution;
     pageFaultsHard: GleanCustomDistribution;
-    residentFast: GleanMemoryDistribution;
-    residentPeak: GleanMemoryDistribution;
+    residentFast: Record<string, GleanMemoryDistribution>;
+    residentPeak: Record<string, GleanMemoryDistribution>;
     storageSqlite: GleanMemoryDistribution;
     total: GleanMemoryDistribution;
-    unique: GleanMemoryDistribution;
+    unique: Record<string, GleanMemoryDistribution>;
     uniqueContentStartup: GleanMemoryDistribution;
     vsize: GleanMemoryDistribution;
     vsizeMaxContiguous: GleanMemoryDistribution;
@@ -9388,6 +9397,13 @@ interface GleanImpl {
       has_olddata?: string;
     }>;
     migrateResultCount: Record<'failure' | 'success', GleanCounter>;
+    storageLocalCorruptedReset: GleanEventWithExtras<{
+      addon_id?: string;
+      after_reset?: string;
+      reason?: string;
+      reset_disabled?: string;
+      reset_error_name?: string;
+    }>;
     storageLocalError: GleanEventWithExtras<{
       addon_id?: string;
       error_name?: string;
@@ -9674,7 +9690,7 @@ interface GleanImpl {
   };
 
   geckoTrace: {
-    traces: GleanObject;
+    tracesData: GleanObject;
   };
 
   fog: {
@@ -9819,7 +9835,17 @@ interface GleanImpl {
     reachFxmsMessage13: GleanEventWithExtras<{ branches?: string; value?: string }>;
     reachFxmsMessage14: GleanEventWithExtras<{ branches?: string; value?: string }>;
     reachFxmsMessage15: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage16: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage17: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage18: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage19: GleanEventWithExtras<{ branches?: string; value?: string }>;
     reachFxmsMessage2: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage20: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage21: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage22: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage23: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage24: GleanEventWithExtras<{ branches?: string; value?: string }>;
+    reachFxmsMessage25: GleanEventWithExtras<{ branches?: string; value?: string }>;
     reachFxmsMessage3: GleanEventWithExtras<{ branches?: string; value?: string }>;
     reachFxmsMessage4: GleanEventWithExtras<{ branches?: string; value?: string }>;
     reachFxmsMessage5: GleanEventWithExtras<{ branches?: string; value?: string }>;
@@ -9849,12 +9875,24 @@ interface GleanImpl {
       | 'ml-suggest-intent'
       | 'ml-suggest-ner'
       | 'pdfjs'
+      | 'smart-intent'
       | 'smart-tab-embedding-engine'
       | 'smart-tab-topic-engine'
       | 'webextension'
       | 'wllamapreview',
       GleanTimingDistribution
     >;
+    engineRun: GleanEventWithExtras<{
+      backend?: string;
+      cores?: string;
+      cpu_milliseconds?: string;
+      cpu_utilization?: string;
+      engine_id?: string;
+      feature_id?: string;
+      memory_bytes?: string;
+      model_id?: string;
+      wall_milliseconds?: string;
+    }>;
     modelDeletion: GleanEventWithExtras<{
       deletedBy?: string;
       error?: string;
@@ -9884,6 +9922,7 @@ interface GleanImpl {
       | 'ml-suggest-intent'
       | 'ml-suggest-ner'
       | 'pdfjs'
+      | 'smart-intent'
       | 'smart-tab-embedding-engine'
       | 'smart-tab-topic-engine'
       | 'webextension'
@@ -9968,12 +10007,10 @@ interface GleanImpl {
       migration_id?: string;
       success?: string;
     }>;
-    remoteSettingsSync: GleanEventWithExtras<{
-      experiments_empty?: string;
-      experiments_success?: string;
+    remoteSettingsSyncError: GleanEventWithExtras<{
+      collection?: string;
       force_sync?: string;
-      secure_experiments_empty?: string;
-      secure_experiments_success?: string;
+      reason?: string;
       trigger?: string;
     }>;
     startupDatabaseConsistency: GleanEventWithExtras<{
@@ -10033,6 +10070,7 @@ interface GleanImpl {
     os: GleanObject;
     primaryResolution: GleanObject;
     profileAgeCreated: GleanQuantity;
+    profileGroupProfileCount: GleanQuantity;
     region: GleanString;
     totalBookmarksCount: GleanQuantity;
     userMonthlyActivity: GleanObject;
@@ -10071,6 +10109,7 @@ interface GleanImpl {
       | 'os'
       | 'primaryResolution'
       | 'profileAgeCreated'
+      | 'profileGroupProfileCount'
       | 'region'
       | 'totalBookmarksCount'
       | 'userMonthlyActivity'
@@ -10088,8 +10127,10 @@ interface GleanImpl {
       | 'browser.newtabpage.activity-stream.showSearch'
       | 'browser.newtabpage.activity-stream.showSponsoredTopSites'
       | 'browser.newtabpage.enabled'
+      | 'browser.profiles.created'
       | 'browser.startup.page'
       | 'browser.toolbars.bookmarks.visibility'
+      | 'browser.urlbar.lastUrlbarSearchSeconds'
       | 'browser.urlbar.quicksuggest.dataCollection.enabled'
       | 'browser.urlbar.showSearchSuggestionsFirst'
       | 'browser.urlbar.suggest.quicksuggest.sponsored'
@@ -10101,6 +10142,7 @@ interface GleanImpl {
       | 'nimbus.qa.pref-1'
       | 'nimbus.qa.pref-2'
       | 'security.sandbox.content.level'
+      | 'termsofuse.acceptedDate'
       | 'trailhead.firstrun.didSeeAboutWelcome',
       GleanCounter
     >;
@@ -10470,6 +10512,26 @@ interface GleanImpl {
       value?: string;
     }>;
     requireOsReauthToggle: GleanEventWithExtras<{ toggle_state?: string }>;
+    rustIncompatibleLoginFormat: GleanEventWithExtras<{
+      issue?: string;
+      operation?: string;
+      run_id?: string;
+    }>;
+    rustMigrationFailure: GleanEventWithExtras<{ error_message?: string; run_id?: string }>;
+    rustMigrationStatus: GleanEventWithExtras<{
+      duration_ms?: string;
+      had_errors?: string;
+      number_of_logins_migrated?: string;
+      number_of_logins_to_migrate?: string;
+      run_id?: string;
+    }>;
+    rustMirrorStatus: GleanEventWithExtras<{
+      error_message?: string;
+      operation?: string;
+      poisoned?: string;
+      run_id?: string;
+      status?: string;
+    }>;
     saveExistingLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
     saveNewLogin: GleanEventWithExtras<{ breached?: string; vulnerable?: string }>;
     savedLoginUsedAuthLogin: GleanEventWithExtras<{ filled?: string }>;
@@ -10547,16 +10609,10 @@ interface GleanImpl {
     used: GleanCounter;
   };
 
-  pdfjsDigitalSignature: {
-    certificate: Record<
-      | 'adbe_pkcs7_detached'
-      | 'adbe_pkcs7_sha1'
-      | 'adbe_x509_rsa_sha1'
-      | 'etsi_cades_detached'
-      | 'etsi_rfc3161'
-      | 'unsupported',
-      GleanCounter
-    >;
+  pdfjsComment: {
+    edit: Record<'deleted' | 'edited', GleanCounter>;
+    save: GleanEventWithExtras<{ deleted?: string; edited?: string }>;
+    sidebar: GleanEventWithExtras<{ comments_count?: string }>;
   };
 
   pdfjsEditingHighlight: {
@@ -10766,6 +10822,7 @@ interface GleanImpl {
       | 'extension'
       | 'gmplugin'
       | 'gpu'
+      | 'inference'
       | 'parent.active'
       | 'parent.active.playing-audio'
       | 'parent.active.playing-video'
@@ -10790,6 +10847,7 @@ interface GleanImpl {
       | 'extension'
       | 'gmplugin'
       | 'gpu'
+      | 'inference'
       | 'parent.active'
       | 'parent.active.playing-audio'
       | 'parent.active.playing-video'
@@ -10811,6 +10869,7 @@ interface GleanImpl {
       | 'extension'
       | 'gmplugin'
       | 'gpu'
+      | 'inference'
       | 'parent.active'
       | 'parent.active.playing-audio'
       | 'parent.active.playing-video'
@@ -10834,6 +10893,7 @@ interface GleanImpl {
       | 'extension'
       | 'gmplugin'
       | 'gpu'
+      | 'inference'
       | 'parent.active'
       | 'parent.active.playing-audio'
       | 'parent.active.playing-video'
@@ -10921,6 +10981,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11031,6 +11092,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11141,6 +11203,118 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    inferenceProcess: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11251,6 +11425,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11361,6 +11536,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11474,6 +11650,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11584,6 +11761,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11694,6 +11872,118 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
+      | 'pacerthread'
+      | 'permission'
+      | 'playeventsound'
+      | 'processhangmon'
+      | 'profilerchild'
+      | 'proxyresolution'
+      | 'quotamanager_io'
+      | 'registerfonts'
+      | 'remotebackbuffer'
+      | 'remotelzystream'
+      | 'remvidchild'
+      | 'renderer'
+      | 'sandboxreporter'
+      | 'savescripts'
+      | 'socket_thread'
+      | 'softwarevsyncthread'
+      | 'sqldb_content-prefs_sqlite'
+      | 'sqldb_cookies_sqlite'
+      | 'sqldb_formhistory_sqlite'
+      | 'ssl_cert'
+      | 'startupcache'
+      | 'streamtrans'
+      | 'stylethread'
+      | 'swcomposite'
+      | 'taskcontroller'
+      | 'timer'
+      | 'toastbgthread'
+      | 'trr_background'
+      | 'untrusted_modules'
+      | 'url_classifier'
+      | 'videocapture'
+      | 'vsynciothread'
+      | 'webrtccallthread'
+      | 'webrtcworker'
+      | 'wifi_tickler'
+      | 'wincompositor'
+      | 'windowsvsyncthread'
+      | 'winwindowocclusioncalc'
+      | 'worker_launcher'
+      | 'wrrenderbackend'
+      | 'wrscenebuilder'
+      | 'wrscenebuilderlp'
+      | 'wrworker'
+      | 'wrworkerlp',
+      GleanCounter
+    >;
+    inferenceProcess: Record<
+      | 'androidui'
+      | 'asynclogger'
+      | 'audioipc'
+      | 'audioipc_callback_rpc'
+      | 'audioipc_client_callback'
+      | 'audioipc_client_rpc'
+      | 'audioipc_devicecollection_rpc'
+      | 'audioipc_server_callback'
+      | 'audioipc_server_rpc'
+      | 'backgroundthreadpool'
+      | 'bgiothreadpool'
+      | 'bgreadurls'
+      | 'bhmgr_monitor'
+      | 'bhmgr_processor'
+      | 'cameras_ipc'
+      | 'canvasrenderer'
+      | 'capturethread'
+      | 'classifier_update'
+      | 'com_mta'
+      | 'compositor'
+      | 'convolverworker'
+      | 'cookie'
+      | 'cubeboperation'
+      | 'datachannel_io'
+      | 'dns_resolver'
+      | 'dom_worker'
+      | 'dom_worklet'
+      | 'domcachethread'
+      | 'extensionprotocolhandler'
+      | 'font_loader'
+      | 'fontenumthread'
+      | 'fs_broker'
+      | 'geckomain'
+      | 'gmpthread'
+      | 'graphrunner'
+      | 'hrtfdatabaseldr'
+      | 'html5_parser'
+      | 'imagebridgechld'
+      | 'imageio'
+      | 'indexeddb'
+      | 'indexeddb_io'
+      | 'initfontlist'
+      | 'inotifyeventthread'
+      | 'ipc_i_o_child'
+      | 'ipc_i_o_parent'
+      | 'ipc_launch'
+      | 'ipdl_background'
+      | 'js_watchdog'
+      | 'jump_list'
+      | 'libwebrtcmodulethread'
+      | 'link_monitor'
+      | 'ls_thread'
+      | 'mdns_service'
+      | 'mediacache'
+      | 'mediadecoderstatemachine'
+      | 'mediapdecoder'
+      | 'mediasupervisor'
+      | 'mediatimer'
+      | 'mediatrackgrph'
+      | 'memorypoller'
+      | 'mozstorage'
+      | 'mtransport'
+      | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11804,6 +12094,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -11914,6 +12205,7 @@ interface GleanImpl {
       | 'mozstorage'
       | 'mtransport'
       | 'netlink_monitor'
+      | 'onnx_worker'
       | 'pacerthread'
       | 'permission'
       | 'playeventsound'
@@ -12050,9 +12342,10 @@ interface GleanImpl {
   };
 
   webcompatreporting: {
+    learnMore: GleanEventNoExtras;
     opened: GleanEventWithExtras<{ source?: string }>;
     reasonDropdown: GleanEventWithExtras<{ setting?: string }>;
-    send: GleanEventNoExtras;
+    send: GleanEventWithExtras<{ sent_with_blocked_trackers?: string }>;
     sendMoreInfo: GleanEventNoExtras;
   };
 
@@ -12600,7 +12893,6 @@ interface GleanImpl {
     enginePerformance: GleanEventWithExtras<{
       average_words_per_request?: string;
       average_words_per_second?: string;
-      flow_id?: string;
       from_language?: string;
       to_language?: string;
       total_completed_requests?: string;
@@ -12608,6 +12900,17 @@ interface GleanImpl {
       total_translated_words?: string;
     }>;
     error: GleanEventWithExtras<{ flow_id?: string; reason?: string }>;
+    identifyPageLanguage: GleanEventWithExtras<{
+      confident?: string;
+      extracted_code_units?: string;
+      extraction_time?: string;
+      html_lang_attribute?: string;
+      identification_time?: string;
+      identified_language?: string;
+      is_lang_attribute_valid?: string;
+      lang_tags_match?: string;
+      total_time?: string;
+    }>;
     requestCount: Record<'full_page' | 'select', GleanCounter>;
     restorePage: GleanEventWithExtras<{ flow_id?: string }>;
     translationRequest: GleanEventWithExtras<{
@@ -12903,6 +13206,7 @@ interface GleanImpl {
     loadAboutcerterror: GleanEventWithExtras<{
       channel_status?: string;
       has_sts?: string;
+      hyphen_compat?: string;
       is_frame?: string;
       issued_by_cca?: string;
       value?: string;
@@ -13693,6 +13997,7 @@ interface GleanImpl {
     stateCodePartialStartup: GleanCustomDistribution;
     stateCodeUnknownStage: GleanCustomDistribution;
     stateCodeUnknownStartup: GleanCustomDistribution;
+    stateWriteFailure: GleanCounter;
     statusErrorCodeCompleteStage: GleanCustomDistribution;
     statusErrorCodeCompleteStartup: GleanCustomDistribution;
     statusErrorCodePartialStage: GleanCustomDistribution;
@@ -13764,7 +14069,6 @@ interface GleanImpl {
 
   gfxFeatures: {
     compositor: GleanString;
-    d2d: GleanObject;
     d3d11: GleanObject;
     gpuProcess: GleanObject;
     hwCompositing: GleanObject;
@@ -13866,7 +14170,6 @@ interface GleanPingsImpl {
   newtabContent: GleanPingWithReason<'component_init' | 'newtab_session_end'>;
   spoc: GleanPingWithReason<'click' | 'impression' | 'save'>;
   topSites: GleanPingNoReason;
-  pocketButton: GleanPingNoReason;
   profiles: GleanPingNoReason;
   searchWith: GleanPingNoReason;
   serpCategorization: GleanPingWithReason<'inactivity' | 'startup' | 'threshold_reached'>;
@@ -13887,7 +14190,7 @@ interface GleanPingsImpl {
   backgroundTasks: GleanPingNoReason;
   captchaDetection: GleanPingNoReason;
   crash: GleanPingWithReason<'crash' | 'event_found'>;
-  traces: GleanPingWithReason<'buffer_full' | 'idle' | 'shutdown'>;
+  geckoTrace: GleanPingWithReason<'buffer_full' | 'idle' | 'shutdown'>;
   dauReporting: GleanPingWithReason<'active' | 'dirty_startup' | 'inactive'>;
   tempFogInitialState: GleanPingWithReason<'startup'>;
   collectionDisabledPing: GleanPingNoReason;
diff --git a/src/zen/@types/lib.gecko.modules.d.ts b/src/zen/@types/lib.gecko.modules.d.ts
index baaabf92f..948968db9 100644
--- a/src/zen/@types/lib.gecko.modules.d.ts
+++ b/src/zen/@types/lib.gecko.modules.d.ts
@@ -55,10 +55,10 @@ export interface Modules {
   'chrome://mochitests/content/browser/accessible/tests/browser/Common.sys.mjs': typeof import('chrome://mochitests/content/browser/accessible/tests/browser/Common.sys.mjs');
   'chrome://mochitests/content/browser/accessible/tests/browser/Layout.sys.mjs': typeof import('chrome://mochitests/content/browser/accessible/tests/browser/Layout.sys.mjs');
   'chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/examples/worker-esm-dep.mjs': typeof import('chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/examples/worker-esm-dep.mjs');
+  'chrome://mochitests/content/browser/devtools/shared/test-helpers/trace-objects.sys.mjs': typeof import('chrome://mochitests/content/browser/devtools/shared/test-helpers/trace-objects.sys.mjs');
   'chrome://mochitests/content/browser/js/xpconnect/tests/browser/worker_source.mjs': typeof import('chrome://mochitests/content/browser/js/xpconnect/tests/browser/worker_source.mjs');
   'chrome://mochitests/content/browser/remote/shared/messagehandler/test/browser/resources/modules/ModuleRegistry.sys.mjs': typeof import('chrome://mochitests/content/browser/remote/shared/messagehandler/test/browser/resources/modules/ModuleRegistry.sys.mjs');
   'chrome://mochitests/content/browser/toolkit/components/translations/tests/browser/translations-test.mjs': typeof import('chrome://mochitests/content/browser/toolkit/components/translations/tests/browser/translations-test.mjs');
-  'chrome://mochitests/content/browser/tools/profiler/tests/browser/value_summary_reader.mjs': typeof import('chrome://mochitests/content/browser/tools/profiler/tests/browser/value_summary_reader.mjs');
   'chrome://mochitests/content/chrome/dom/network/tests/tcpsocket_test.sys.mjs': typeof import('chrome://mochitests/content/chrome/dom/network/tests/tcpsocket_test.sys.mjs');
   'chrome://mochitests/content/chrome/dom/url/tests/file_worker_url.sys.mjs': typeof import('chrome://mochitests/content/chrome/dom/url/tests/file_worker_url.sys.mjs');
   'chrome://mochitests/content/chrome/dom/url/tests/test_bug883784.sys.mjs': typeof import('chrome://mochitests/content/chrome/dom/url/tests/test_bug883784.sys.mjs');
@@ -99,6 +99,7 @@ export interface Modules {
   'chrome://remote/content/shared/Format.sys.mjs': typeof import('chrome://remote/content/shared/Format.sys.mjs');
   'chrome://remote/content/shared/Log.sys.mjs': typeof import('chrome://remote/content/shared/Log.sys.mjs');
   'chrome://remote/content/shared/MobileTabBrowser.sys.mjs': typeof import('chrome://remote/content/shared/MobileTabBrowser.sys.mjs');
+  'chrome://remote/content/shared/NavigableManager.sys.mjs': typeof import('chrome://remote/content/shared/NavigableManager.sys.mjs');
   'chrome://remote/content/shared/Navigate.sys.mjs': typeof import('chrome://remote/content/shared/Navigate.sys.mjs');
   'chrome://remote/content/shared/NavigationManager.sys.mjs': typeof import('chrome://remote/content/shared/NavigationManager.sys.mjs');
   'chrome://remote/content/shared/NetworkCacheManager.sys.mjs': typeof import('chrome://remote/content/shared/NetworkCacheManager.sys.mjs');
@@ -254,7 +255,6 @@ export interface Modules {
   'moz-src:///browser/components/urlbar/MerinoClient.sys.mjs': typeof import('moz-src:///browser/components/urlbar/MerinoClient.sys.mjs');
   'moz-src:///browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs': typeof import('moz-src:///browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs');
   'moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs': typeof import('moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs');
-  'moz-src:///browser/components/urlbar/SearchModeSwitcher.sys.mjs': typeof import('moz-src:///browser/components/urlbar/SearchModeSwitcher.sys.mjs');
   'moz-src:///browser/components/urlbar/UrlbarController.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarController.sys.mjs');
   'moz-src:///browser/components/urlbar/UrlbarEventBufferer.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarEventBufferer.sys.mjs');
   'moz-src:///browser/components/urlbar/UrlbarInput.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarInput.sys.mjs');
@@ -280,7 +280,6 @@ export interface Modules {
   'moz-src:///browser/components/urlbar/UrlbarSearchUtils.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarSearchUtils.sys.mjs');
   'moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs');
   'moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs');
-  'moz-src:///browser/components/urlbar/UrlbarValueFormatter.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarValueFormatter.sys.mjs');
   'moz-src:///browser/components/urlbar/UrlbarView.sys.mjs': typeof import('moz-src:///browser/components/urlbar/UrlbarView.sys.mjs');
   'moz-src:///browser/components/urlbar/private/AmpSuggestions.sys.mjs': typeof import('moz-src:///browser/components/urlbar/private/AmpSuggestions.sys.mjs');
   'moz-src:///browser/components/urlbar/private/GeolocationUtils.sys.mjs': typeof import('moz-src:///browser/components/urlbar/private/GeolocationUtils.sys.mjs');
@@ -301,6 +300,7 @@ export interface Modules {
   'moz-src:///toolkit/components/doh/DoHController.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHController.sys.mjs');
   'moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs': typeof import('moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs');
   'moz-src:///toolkit/components/doh/TRRPerformance.sys.mjs': typeof import('moz-src:///toolkit/components/doh/TRRPerformance.sys.mjs');
+  'moz-src:///toolkit/components/pageextractor/DOMExtractor.sys.mjs': typeof import('moz-src:///toolkit/components/pageextractor/DOMExtractor.sys.mjs');
   'moz-src:///toolkit/components/reader/AboutReader.sys.mjs': typeof import('moz-src:///toolkit/components/reader/AboutReader.sys.mjs');
   'moz-src:///toolkit/components/reader/ReaderMode.sys.mjs': typeof import('moz-src:///toolkit/components/reader/ReaderMode.sys.mjs');
   'moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs': typeof import('moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs');
@@ -325,6 +325,7 @@ export interface Modules {
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs');
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs');
   'moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs': typeof import('moz-src:///toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs');
+  'moz-src:///toolkit/modules/PrefUtils.sys.mjs': typeof import('moz-src:///toolkit/modules/PrefUtils.sys.mjs');
   'moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs': typeof import('moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs');
   'resource:///actors/AboutLoginsParent.sys.mjs': typeof import('resource:///actors/AboutLoginsParent.sys.mjs');
   'resource:///actors/AboutNewTabParent.sys.mjs': typeof import('resource:///actors/AboutNewTabParent.sys.mjs');
@@ -462,9 +463,14 @@ export interface Modules {
   'resource:///modules/firefox-view-tabs-setup-manager.sys.mjs': typeof import('resource:///modules/firefox-view-tabs-setup-manager.sys.mjs');
   'resource:///modules/ipprotection/GuardianClient.sys.mjs': typeof import('resource:///modules/ipprotection/GuardianClient.sys.mjs');
   'resource:///modules/ipprotection/IPPChannelFilter.sys.mjs': typeof import('resource:///modules/ipprotection/IPPChannelFilter.sys.mjs');
+  'resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs': typeof import('resource:///modules/ipprotection/IPPExceptionsManager.sys.mjs');
   'resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs': typeof import('resource:///modules/ipprotection/IPPNetworkErrorObserver.sys.mjs');
+  'resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs': typeof import('resource:///modules/ipprotection/IPPNimbusHelper.sys.mjs');
   'resource:///modules/ipprotection/IPPProxyManager.sys.mjs': typeof import('resource:///modules/ipprotection/IPPProxyManager.sys.mjs');
+  'resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs': typeof import('resource:///modules/ipprotection/IPPSignInWatcher.sys.mjs');
+  'resource:///modules/ipprotection/IPPStartupCache.sys.mjs': typeof import('resource:///modules/ipprotection/IPPStartupCache.sys.mjs');
   'resource:///modules/ipprotection/IPProtection.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtection.sys.mjs');
+  'resource:///modules/ipprotection/IPProtectionHelpers.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionHelpers.sys.mjs');
   'resource:///modules/ipprotection/IPProtectionPanel.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionPanel.sys.mjs');
   'resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionServerlist.sys.mjs');
   'resource:///modules/ipprotection/IPProtectionService.sys.mjs': typeof import('resource:///modules/ipprotection/IPProtectionService.sys.mjs');
@@ -538,6 +544,7 @@ export interface Modules {
   'resource://devtools/client/shared/components/reps/reps/rep.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/rep.mjs');
   'resource://devtools/client/shared/components/reps/reps/string.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/string.mjs');
   'resource://devtools/client/shared/components/reps/reps/text-node.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/text-node.mjs');
+  'resource://devtools/client/shared/components/reps/reps/value-summary-reader.mjs': typeof import('resource://devtools/client/shared/components/reps/reps/value-summary-reader.mjs');
   'resource://devtools/client/shared/components/tabs/Tabs.mjs': typeof import('resource://devtools/client/shared/components/tabs/Tabs.mjs');
   'resource://devtools/client/shared/components/tree/LabelCell.mjs': typeof import('resource://devtools/client/shared/components/tree/LabelCell.mjs');
   'resource://devtools/client/shared/components/tree/ObjectProvider.mjs': typeof import('resource://devtools/client/shared/components/tree/ObjectProvider.mjs');
@@ -888,6 +895,7 @@ export interface Modules {
   'resource://gre/modules/UpdateTimerManager.sys.mjs': typeof import('resource://gre/modules/UpdateTimerManager.sys.mjs');
   'resource://gre/modules/UpdateUtils.sys.mjs': typeof import('resource://gre/modules/UpdateUtils.sys.mjs');
   'resource://gre/modules/UrlClassifierRemoteSettingsService.sys.mjs': typeof import('resource://gre/modules/UrlClassifierRemoteSettingsService.sys.mjs');
+  'resource://gre/modules/UrlUtils.sys.mjs': typeof import('resource://gre/modules/UrlUtils.sys.mjs');
   'resource://gre/modules/UsageReporting.sys.mjs': typeof import('resource://gre/modules/UsageReporting.sys.mjs');
   'resource://gre/modules/WPTEventsParent.sys.mjs': typeof import('resource://gre/modules/WPTEventsParent.sys.mjs');
   'resource://gre/modules/WebAuthnFeature.sys.mjs': typeof import('resource://gre/modules/WebAuthnFeature.sys.mjs');
@@ -949,6 +957,7 @@ export interface Modules {
   'resource://gre/modules/shared/AddressMetaDataExtension.sys.mjs': typeof import('resource://gre/modules/shared/AddressMetaDataExtension.sys.mjs');
   'resource://gre/modules/shared/AddressMetaDataLoader.sys.mjs': typeof import('resource://gre/modules/shared/AddressMetaDataLoader.sys.mjs');
   'resource://gre/modules/shared/AddressParser.sys.mjs': typeof import('resource://gre/modules/shared/AddressParser.sys.mjs');
+  'resource://gre/modules/shared/AddressRecord.sys.mjs': typeof import('resource://gre/modules/shared/AddressRecord.sys.mjs');
   'resource://gre/modules/shared/AutofillFormFactory.sys.mjs': typeof import('resource://gre/modules/shared/AutofillFormFactory.sys.mjs');
   'resource://gre/modules/shared/AutofillTelemetry.sys.mjs': typeof import('resource://gre/modules/shared/AutofillTelemetry.sys.mjs');
   'resource://gre/modules/shared/CreditCardRecord.sys.mjs': typeof import('resource://gre/modules/shared/CreditCardRecord.sys.mjs');
@@ -962,10 +971,12 @@ export interface Modules {
   'resource://gre/modules/shared/FormStateManager.sys.mjs': typeof import('resource://gre/modules/shared/FormStateManager.sys.mjs');
   'resource://gre/modules/shared/LabelUtils.sys.mjs': typeof import('resource://gre/modules/shared/LabelUtils.sys.mjs');
   'resource://gre/modules/shared/LoginFormFactory.sys.mjs': typeof import('resource://gre/modules/shared/LoginFormFactory.sys.mjs');
+  'resource://gre/modules/shared/NewPasswordModel.sys.mjs': typeof import('resource://gre/modules/shared/NewPasswordModel.sys.mjs');
   'resource://gre/modules/shared/PasswordGenerator.sys.mjs': typeof import('resource://gre/modules/shared/PasswordGenerator.sys.mjs');
   'resource://gre/modules/shared/PasswordRulesParser.sys.mjs': typeof import('resource://gre/modules/shared/PasswordRulesParser.sys.mjs');
   'resource://gre/modules/shared/PhoneNumber.sys.mjs': typeof import('resource://gre/modules/shared/PhoneNumber.sys.mjs');
   'resource://gre/modules/shared/PhoneNumberNormalizer.sys.mjs': typeof import('resource://gre/modules/shared/PhoneNumberNormalizer.sys.mjs');
+  'resource://gre/modules/storage-rust.sys.mjs': typeof import('resource://gre/modules/storage-rust.sys.mjs');
   'resource://gre/modules/subprocess/subprocess_unix.sys.mjs': typeof import('resource://gre/modules/subprocess/subprocess_unix.sys.mjs');
   'resource://gre/modules/subprocess/subprocess_win.sys.mjs': typeof import('resource://gre/modules/subprocess/subprocess_win.sys.mjs');
   'resource://gre/modules/third_party/jsesc/jsesc.mjs': typeof import('resource://gre/modules/third_party/jsesc/jsesc.mjs');
@@ -993,6 +1004,8 @@ export interface Modules {
   'resource://newtab/lib/InferredModel/FeatureModel.sys.mjs': typeof import('resource://newtab/lib/InferredModel/FeatureModel.sys.mjs');
   'resource://newtab/lib/InferredModel/GreedyContentRanker.mjs': typeof import('resource://newtab/lib/InferredModel/GreedyContentRanker.mjs');
   'resource://newtab/lib/InferredPersonalizationFeed.sys.mjs': typeof import('resource://newtab/lib/InferredPersonalizationFeed.sys.mjs');
+  'resource://newtab/lib/NewTabAttributionFeed.sys.mjs': typeof import('resource://newtab/lib/NewTabAttributionFeed.sys.mjs');
+  'resource://newtab/lib/NewTabAttributionService.sys.mjs': typeof import('resource://newtab/lib/NewTabAttributionService.sys.mjs');
   'resource://newtab/lib/NewTabContentPing.sys.mjs': typeof import('resource://newtab/lib/NewTabContentPing.sys.mjs');
   'resource://newtab/lib/NewTabGleanUtils.sys.mjs': typeof import('resource://newtab/lib/NewTabGleanUtils.sys.mjs');
   'resource://newtab/lib/NewTabInit.sys.mjs': typeof import('resource://newtab/lib/NewTabInit.sys.mjs');
@@ -1057,7 +1070,6 @@ export interface Modules {
   'resource://normandy/lib/NormandyAddonManager.sys.mjs': typeof import('resource://normandy/lib/NormandyAddonManager.sys.mjs');
   'resource://normandy/lib/NormandyApi.sys.mjs': typeof import('resource://normandy/lib/NormandyApi.sys.mjs');
   'resource://normandy/lib/NormandyUtils.sys.mjs': typeof import('resource://normandy/lib/NormandyUtils.sys.mjs');
-  'resource://normandy/lib/PrefUtils.sys.mjs': typeof import('resource://normandy/lib/PrefUtils.sys.mjs');
   'resource://normandy/lib/PreferenceExperiments.sys.mjs': typeof import('resource://normandy/lib/PreferenceExperiments.sys.mjs');
   'resource://normandy/lib/PreferenceRollouts.sys.mjs': typeof import('resource://normandy/lib/PreferenceRollouts.sys.mjs');
   'resource://normandy/lib/RecipeRunner.sys.mjs': typeof import('resource://normandy/lib/RecipeRunner.sys.mjs');
diff --git a/src/zen/@types/lib.gecko.nsresult.d.ts b/src/zen/@types/lib.gecko.nsresult.d.ts
index 615709a0d..450bac34b 100644
--- a/src/zen/@types/lib.gecko.nsresult.d.ts
+++ b/src/zen/@types/lib.gecko.nsresult.d.ts
@@ -570,6 +570,20 @@ interface nsIXPCComponents_Results {
   /** The PKCS#7 information is not signed. */
   NS_ERROR_CMS_VERIFY_NOT_SIGNED: 0x805a0400;
 
+  // Codes related to pdf signature verification
+
+  /** The PKCS#7 parsing has failed. */
+  NS_ERROR_CMS_VERIFY_ERROR_PROCESSING: 0x805a0408;
+
+  /** The PKCS#7 certificate verification was cancelled. */
+  NS_ERROR_CMS_VERIFY_NOT_YET_ATTEMPTED: 0x805a040f;
+
+  /** Invalid signature. */
+  NS_ERROR_CMS_VERIFY_BAD_SIGNATURE: 0x805a0409;
+
+  /** No certificate was found. */
+  NS_ERROR_CMS_VERIFY_NOCERT: 0x805a0404;
+
   // Codes related to signed manifests
 
   /** The signed app manifest or signature file is invalid. */
diff --git a/src/zen/@types/lib.gecko.tweaks.d.ts b/src/zen/@types/lib.gecko.tweaks.d.ts
index 3f3392bf2..1169d5521 100644
--- a/src/zen/@types/lib.gecko.tweaks.d.ts
+++ b/src/zen/@types/lib.gecko.tweaks.d.ts
@@ -7,7 +7,7 @@
 
 // More specific types for parent process browsing contexts.
 interface CanonicalBrowsingContext extends LoadContextMixin {
-  embedderElement: XULBrowserElement;
+  embedderElement: MozBrowser;
   currentWindowContext: WindowGlobalParent;
   parent: CanonicalBrowsingContext;
   parentWindowContext: WindowGlobalParent;
@@ -29,7 +29,7 @@ interface ChromeWindow extends Window {
 }
 
 interface Document {
-  createXULElement(name: 'browser'): XULBrowserElement;
+  createXULElement(name: 'browser'): MozBrowser;
 }
 
 type nsIGleanPingNoReason = {
@@ -127,15 +127,6 @@ interface WindowGlobalParent extends WindowContext {
   readonly browsingContext: CanonicalBrowsingContext;
 }
 
-// Hand-crafted artisanal types.
-interface XULBrowserElement extends XULFrameElement, FrameLoader {
-  currentURI: nsIURI;
-  documentURI: nsIURI | null;
-  docShellIsActive: boolean;
-  isRemoteBrowser: boolean;
-  remoteType: string;
-}
-
 // https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1736
 interface Localization {
   formatValuesSync(aKeys: L10nKey[]): (string | null)[];
diff --git a/src/zen/@types/lib.gecko.xpcom.d.ts b/src/zen/@types/lib.gecko.xpcom.d.ts
index 17b7fa253..84facb30b 100644
--- a/src/zen/@types/lib.gecko.xpcom.d.ts
+++ b/src/zen/@types/lib.gecko.xpcom.d.ts
@@ -467,6 +467,8 @@ declare global {
     readonly RELATION_ERRORMSG?: 23;
     readonly RELATION_ERRORMSG_FOR?: 24;
     readonly RELATION_LINKS_TO?: 25;
+    readonly RELATION_ACTION?: 32;
+    readonly RELATION_ACTION_FOR?: 33;
 
     readonly relationType: u32;
     readonly targetsCount: u32;
@@ -1736,6 +1738,38 @@ declare global {
     RunPluginCrashCallbacks(pluginId: u32, pluginName: string): void;
   }
 
+  // https://searchfox.org/mozilla-central/source/toolkit/components/dap/nsIDAPTelemetry.idl
+
+  interface nsIDAPTelemetry extends nsISupports {
+    GetReportPrioSum(
+      leaderHpkeConfig: u8[],
+      helperHpkeConfig: u8[],
+      measurement: u32,
+      task_id: u8[],
+      bits: u32,
+      time_precision: u64,
+      report: OutParam<u8[]>
+    ): void;
+    GetReportPrioSumVec(
+      leaderHpkeConfig: u8[],
+      helperHpkeConfig: u8[],
+      measurement: u32[],
+      task_id: u8[],
+      bits: u32,
+      time_precision: u64,
+      report: OutParam<u8[]>
+    ): void;
+    GetReportPrioHistogram(
+      leaderHpkeConfig: u8[],
+      helperHpkeConfig: u8[],
+      measurement: u32,
+      task_id: u8[],
+      length: u32,
+      time_precision: u64,
+      report: OutParam<u8[]>
+    ): void;
+  }
+
   // https://searchfox.org/mozilla-central/source/docshell/base/nsIDocShell.idl
 } // global
 
@@ -3285,6 +3319,7 @@ declare global {
     setAsyncZoom(aRootElement: Element, aValue: float): void;
     flushApzRepaints(aElement?: Element): boolean;
     disableApzForElement(aElement: Element): void;
+    isApzDisabledForElement(aElement: Element): boolean;
     zoomToFocusedInput(): void;
     computeAnimationDistance(
       element: Element,
@@ -6050,7 +6085,8 @@ declare global {
       height: u32,
       stride: u32,
       inputFormat: u32,
-      outputOptions: string
+      outputOptions: string,
+      randomizationKey: string
     ): void;
     startImageEncode(width: u32, height: u32, inputFormat: u32, outputOptions: string): void;
     addImageFrame(
@@ -6567,6 +6603,11 @@ declare global {
     availableLocales: string[];
     readonly isAppLocaleRTL: boolean;
     readonly packagedLocales: string[];
+    readonly ellipsis: string;
+    readonly alwaysAppendAccesskeys: boolean;
+    readonly insertSeparatorBeforeAccesskeys: boolean;
+    readonly acceptLanguages: string;
+    readonly fontLanguageGroup: string;
   }
 
   // https://searchfox.org/mozilla-central/source/intl/locale/mozIOSPreferences.idl
@@ -8451,7 +8492,6 @@ declare global {
       aHost: string,
       aPort: i32,
       aPathTemplate: string,
-      aAlpn: string,
       aProxyAuthorizationHeader: string,
       aConnectionIsolationKey: string,
       aFlags: u32,
@@ -8521,7 +8561,6 @@ declare global {
     readonly proxyAuthorizationHeader: string;
     readonly connectionIsolationKey: string;
     pathTemplate: string;
-    alpn: string;
   }
 
   // https://searchfox.org/mozilla-central/source/netwerk/base/nsIRandomGenerator.idl
@@ -9277,12 +9316,14 @@ declare global {
     readonly CONTENT_TYPE_MEDIA?: 4;
     readonly CONTENT_TYPE_STYLESHEET?: 5;
     readonly CONTENT_TYPE_WASM?: 6;
-    readonly CONTENT_TYPE_LAST?: 7;
+    readonly CONTENT_TYPE_DICTIONARY?: 7;
+    readonly CONTENT_TYPE_LAST?: 8;
     readonly NO_EXPIRATION_TIME?: 4294967295;
 
     readonly key: string;
     readonly cacheEntryId: u64;
     readonly persistent: boolean;
+    readonly readyOrRevalidating: boolean;
     readonly fetchCount: u32;
     readonly lastFetched: u32;
     readonly lastModified: u32;
@@ -9302,6 +9343,7 @@ declare global {
     asyncDoom(listener: nsICacheEntryDoomCallback): void;
     getMetaDataElement(key: string): string;
     setMetaDataElement(key: string, value: string): void;
+    readonly isEmpty: boolean;
     visitMetaData(visitor: nsICacheEntryMetaDataVisitor): void;
     metaDataReady(): void;
     setValid(): void;
@@ -9314,6 +9356,7 @@ declare global {
     openAlternativeOutputStream(type: string, predictedSize: i64): nsIAsyncOutputStream;
     openAlternativeInputStream(type: string): nsIInputStream;
     readonly loadContextInfo: nsILoadContextInfo;
+    setBypassWriterLock(aBypass: boolean): void;
   }
 
   interface nsICacheEntryMetaDataVisitor extends nsISupports {
@@ -9358,6 +9401,7 @@ declare global {
     readonly CHECK_MULTITHREADED?: 16;
     readonly OPEN_SECRETLY?: 32;
     readonly OPEN_INTERCEPTED?: 64;
+    readonly OPEN_COMPLETE_ONLY?: 128;
 
     asyncOpenURI(
       aURI: nsIURI,
@@ -9365,6 +9409,12 @@ declare global {
       aFlags: u32,
       aCallback: nsICacheEntryOpenCallback
     ): void;
+    asyncOpenURIString(
+      aURI: string,
+      aIdExtension: string,
+      aFlags: u32,
+      aCallback: nsICacheEntryOpenCallback
+    ): void;
     openTruncate(aURI: nsIURI, aIdExtension: string): nsICacheEntry;
     exists(aURI: nsIURI, aIdExtension: string): boolean;
     getCacheIndexEntryAttrs(
@@ -9392,6 +9442,8 @@ declare global {
     clearBaseDomain(aBaseDomain: string): void;
     clearOriginsByOriginAttributes(aOriginAttributes: string): void;
     clear(): void;
+    clearOriginDictionary(aURI: nsIURI): void;
+    clearAllOriginDictionaries(): void;
     purgeFromMemory(aWhat: u32): void;
     readonly ioTarget: nsIEventTarget;
     asyncGetDiskConsumption(aObserver: nsICacheStorageConsumptionObserver): void;
@@ -9467,6 +9519,7 @@ declare global {
     readonly isSession: boolean;
     readonly isHttpOnly: boolean;
     readonly creationTime: i64;
+    readonly updateTime: i64;
     readonly lastAccessed: i64;
     readonly sameSite: i32;
     readonly schemeMap: nsICookie.schemeType;
@@ -10163,7 +10216,6 @@ declare global {
     visitOriginalResponseHeaders(aVisitor: nsIHttpHeaderVisitor): void;
     isNoStoreResponse(): boolean;
     isNoCacheResponse(): boolean;
-    isPrivateResponse(): boolean;
     redirectTo(aTargetURI: nsIURI): void;
     upgradeToSecure(): void;
     topLevelContentWindowId: u64;
@@ -11395,7 +11447,7 @@ declare global {
     readonly securityState: u32;
     readonly errorCode: i32;
     readonly errorCodeString: string;
-    readonly failedCertChain: nsIX509Cert[];
+    readonly handshakeCertificates: nsIX509Cert[];
     readonly serverCert: nsIX509Cert;
     readonly succeededCertChain: nsIX509Cert[];
     readonly cipherName: string;
@@ -11481,6 +11533,12 @@ declare global {
     ): void;
   }>;
 
+  interface nsIPDFVerificationResult extends nsISupports {
+    readonly signatureResult: nsresult;
+    readonly certificateResult: nsresult;
+    readonly signerCertificate: nsIX509Cert;
+  }
+
   type nsICertVerificationCallback = Callable<{
     verifyCertFinished(
       aPRErrorCode: i32,
@@ -11500,12 +11558,30 @@ declare enum nsIX509CertDB_VerifyUsage {
   verifyUsageEmailCA = 7,
 }
 
+declare enum nsIX509CertDB_QWACType {
+  OneQWAC = 0,
+  TwoQWAC = 1,
+}
+
+declare enum nsIX509CertDB_PDFSignatureAlgorithm {
+  ADBE_PKCS7_DETACHED = 0,
+  ADBE_PKCS7_SHA1 = 1,
+}
+
 declare global {
   namespace nsIX509CertDB {
     type VerifyUsage = nsIX509CertDB_VerifyUsage;
+    type QWACType = nsIX509CertDB_QWACType;
+    type PDFSignatureAlgorithm = nsIX509CertDB_PDFSignatureAlgorithm;
   }
 
-  interface nsIX509CertDB extends nsISupports, Enums<typeof nsIX509CertDB_VerifyUsage> {
+  interface nsIX509CertDB
+    extends nsISupports,
+      Enums<
+        typeof nsIX509CertDB_VerifyUsage &
+          typeof nsIX509CertDB_QWACType &
+          typeof nsIX509CertDB_PDFSignatureAlgorithm
+      > {
     readonly UNTRUSTED?: 0;
     readonly TRUSTED_SSL?: 1;
     readonly TRUSTED_EMAIL?: 2;
@@ -11557,6 +11633,17 @@ declare global {
     getCerts(): nsIX509Cert[];
     asPKCS7Blob(certList: nsIX509Cert[]): string;
     getAndroidCertificateFromAlias(alias: string): nsIX509Cert;
+    asyncVerifyQWAC(
+      type: nsIX509CertDB.QWACType,
+      cert: nsIX509Cert,
+      hostname: string,
+      collectedCerts: nsIX509Cert[]
+    ): Promise<any>;
+    asyncVerifyPKCS7Object(
+      pkcs7: u8[],
+      data: u8[][],
+      signatureType: nsIX509CertDB.PDFSignatureAlgorithm
+    ): Promise<any>;
   }
 
   // https://searchfox.org/mozilla-central/source/security/manager/ssl/nsIX509CertValidity.idl
@@ -11603,26 +11690,39 @@ declare global {
   }
 
   // https://searchfox.org/mozilla-central/source/toolkit/components/places/mozIPlacesAutoComplete.idl
+} // global
 
-  interface mozIPlacesAutoComplete extends nsISupports {
-    readonly MATCH_ANYWHERE?: 0;
-    readonly MATCH_BOUNDARY_ANYWHERE?: 1;
-    readonly MATCH_BOUNDARY?: 2;
-    readonly MATCH_BEGINNING?: 3;
-    readonly MATCH_ANYWHERE_UNMODIFIED?: 4;
-    readonly MATCH_BEGINNING_CASE_SENSITIVE?: 5;
-    readonly BEHAVIOR_HISTORY?: 1;
-    readonly BEHAVIOR_BOOKMARK?: 2;
-    readonly BEHAVIOR_TAG?: 4;
-    readonly BEHAVIOR_TITLE?: 8;
-    readonly BEHAVIOR_URL?: 16;
-    readonly BEHAVIOR_TYPED?: 32;
-    readonly BEHAVIOR_JAVASCRIPT?: 64;
-    readonly BEHAVIOR_OPENPAGE?: 128;
-    readonly BEHAVIOR_RESTRICT?: 256;
-    readonly BEHAVIOR_SEARCH?: 512;
+declare enum mozIPlacesAutoComplete_MatchBehaviors {
+  MATCH_ANYWHERE = 0,
+  MATCH_BOUNDARY = 2,
+  MATCH_ANYWHERE_UNMODIFIED = 4,
+}
+
+declare enum mozIPlacesAutoComplete_SearchBehaviors {
+  BEHAVIOR_HISTORY = 1,
+  BEHAVIOR_BOOKMARK = 2,
+  BEHAVIOR_TAG = 4,
+  BEHAVIOR_TITLE = 8,
+  BEHAVIOR_URL = 16,
+  BEHAVIOR_TYPED = 32,
+  BEHAVIOR_JAVASCRIPT = 64,
+  BEHAVIOR_OPENPAGE = 128,
+  BEHAVIOR_RESTRICT = 256,
+  BEHAVIOR_SEARCH = 512,
+}
+
+declare global {
+  namespace mozIPlacesAutoComplete {
+    type MatchBehaviors = mozIPlacesAutoComplete_MatchBehaviors;
+    type SearchBehaviors = mozIPlacesAutoComplete_SearchBehaviors;
   }
 
+  interface mozIPlacesAutoComplete
+    extends nsISupports,
+      Enums<
+        typeof mozIPlacesAutoComplete_MatchBehaviors & typeof mozIPlacesAutoComplete_SearchBehaviors
+      > {}
+
   // https://searchfox.org/mozilla-central/source/toolkit/components/places/mozIPlacesPendingOperation.idl
 
   interface mozIPlacesPendingOperation extends nsISupports {
@@ -12284,7 +12384,7 @@ declare global {
   // https://searchfox.org/mozilla-central/source/toolkit/components/satchel/nsIFormFillController.idl
 
   interface nsIFormFillController extends nsISupports {
-    readonly focusedElement: Element;
+    controlledElement: Element;
     readonly passwordPopupAutomaticallyOpened: boolean;
     markAsAutoCompletableField(aElement: Element): void;
     showPopup(): void;
@@ -12452,6 +12552,8 @@ declare global {
     GetChildAt(aIndex: i32): nsISHEntry;
     readonly bfcacheID: u64;
     wireframe: any;
+    navigationKey: nsID;
+    navigationId: nsID;
   }
 
   // https://searchfox.org/mozilla-central/source/docshell/shistory/nsISHistory.idl
@@ -12892,38 +12994,6 @@ declare global {
     gatherMemory(): Promise<any>;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/dap/nsIDAPTelemetry.idl
-
-  interface nsIDAPTelemetry extends nsISupports {
-    GetReportPrioSum(
-      leaderHpkeConfig: u8[],
-      helperHpkeConfig: u8[],
-      measurement: u32,
-      task_id: u8[],
-      bits: u32,
-      time_precision: u64,
-      report: OutParam<u8[]>
-    ): void;
-    GetReportPrioSumVec(
-      leaderHpkeConfig: u8[],
-      helperHpkeConfig: u8[],
-      measurement: u32[],
-      task_id: u8[],
-      bits: u32,
-      time_precision: u64,
-      report: OutParam<u8[]>
-    ): void;
-    GetReportPrioHistogram(
-      leaderHpkeConfig: u8[],
-      helperHpkeConfig: u8[],
-      measurement: u32,
-      task_id: u8[],
-      length: u32,
-      time_precision: u64,
-      report: OutParam<u8[]>
-    ): void;
-  }
-
   // https://searchfox.org/mozilla-central/source/netwerk/test/httpserver/nsIHttpServer.idl
 
   interface nsIHttpServer extends nsISupports {
@@ -14162,6 +14232,7 @@ declare global {
     readonly DOWNLOAD_SUCCESS?: 1;
     readonly DOWNLOAD_FAILURE_CANNOT_RESUME_IN_BACKGROUND?: 2;
     readonly DOWNLOAD_FAILURE_GENERIC?: 3;
+    readonly DOWNLOAD_FAILURE_CANNOT_WRITE_STATE?: 4;
     readonly STATE_IDLE?: 1;
     readonly STATE_DOWNLOADING?: 2;
     readonly STATE_STAGING?: 4;
@@ -15598,13 +15669,11 @@ declare global {
   interface nsIGfxInfo
     extends nsISupports,
       Enums<typeof nsIGfxInfo_FontVisibilityDeviceDetermination> {
-    readonly D2DEnabled: boolean;
     readonly DWriteEnabled: boolean;
     readonly EmbeddedInFirefoxReality: boolean;
     readonly AzureCanvasBackend: string;
     readonly AzureContentBackend: string;
     readonly usingGPUProcess: boolean;
-    readonly usingRemoteCanvas: boolean;
     readonly usingAcceleratedCanvas: boolean;
     readonly hasBattery: boolean;
     readonly DWriteVersion: string;
@@ -18392,6 +18461,7 @@ declare global {
     nsIEventListenerService: nsJSIID<nsIEventListenerService>;
     mozIGeckoMediaPluginChromeService: nsJSIID<mozIGeckoMediaPluginChromeService>;
     mozIGeckoMediaPluginService: nsJSIID<mozIGeckoMediaPluginService>;
+    nsIDAPTelemetry: nsJSIID<nsIDAPTelemetry>;
     nsIDocShell: nsJSIID<
       nsIDocShell,
       typeof nsIDocShell_DocShellEnumeratorDirection &
@@ -19064,15 +19134,24 @@ declare global {
       typeof nsIAppSignatureInfo_SignatureAlgorithm
     >;
     nsIOpenSignedAppFileCallback: nsJSIID<nsIOpenSignedAppFileCallback>;
+    nsIPDFVerificationResult: nsJSIID<nsIPDFVerificationResult>;
     nsICertVerificationCallback: nsJSIID<nsICertVerificationCallback>;
-    nsIX509CertDB: nsJSIID<nsIX509CertDB, typeof nsIX509CertDB_VerifyUsage>;
+    nsIX509CertDB: nsJSIID<
+      nsIX509CertDB,
+      typeof nsIX509CertDB_VerifyUsage &
+        typeof nsIX509CertDB_QWACType &
+        typeof nsIX509CertDB_PDFSignatureAlgorithm
+    >;
     nsIX509CertValidity: nsJSIID<nsIX509CertValidity>;
     mozIVisitInfo: nsJSIID<mozIVisitInfo>;
     mozIPlaceInfo: nsJSIID<mozIPlaceInfo>;
     mozIVisitInfoCallback: nsJSIID<mozIVisitInfoCallback>;
     mozIVisitedStatusCallback: nsJSIID<mozIVisitedStatusCallback>;
     mozIAsyncHistory: nsJSIID<mozIAsyncHistory>;
-    mozIPlacesAutoComplete: nsJSIID<mozIPlacesAutoComplete>;
+    mozIPlacesAutoComplete: nsJSIID<
+      mozIPlacesAutoComplete,
+      typeof mozIPlacesAutoComplete_MatchBehaviors & typeof mozIPlacesAutoComplete_SearchBehaviors
+    >;
     mozIPlacesPendingOperation: nsJSIID<mozIPlacesPendingOperation>;
     mozISyncedBookmarksMirrorProgressListener: nsJSIID<mozISyncedBookmarksMirrorProgressListener>;
     mozISyncedBookmarksMirrorCallback: nsJSIID<mozISyncedBookmarksMirrorCallback>;
@@ -19157,7 +19236,6 @@ declare global {
     mozIStorageValueArray: nsJSIID<mozIStorageValueArray>;
     nsIFetchTelemetryDataCallback: nsJSIID<nsIFetchTelemetryDataCallback>;
     nsITelemetry: nsJSIID<nsITelemetry>;
-    nsIDAPTelemetry: nsJSIID<nsIDAPTelemetry>;
     nsIHttpServer: nsJSIID<nsIHttpServer>;
     nsIHttpServerStoppedCallback: nsJSIID<nsIHttpServerStoppedCallback>;
     nsIHttpServerIdentity: nsJSIID<nsIHttpServerIdentity>;
diff --git a/src/zen/mods/nsZenModsBackend.cpp b/src/zen/mods/nsZenModsBackend.cpp
index 346adb7a5..7280d00a8 100644
--- a/src/zen/mods/nsZenModsBackend.cpp
+++ b/src/zen/mods/nsZenModsBackend.cpp
@@ -29,10 +29,10 @@ static auto GetZenStyleSheetCache() -> ZenStyleSheetCache* {
 NS_IMPL_ISUPPORTS(nsZenModsBackend, nsIZenModsBackend)
 
 nsZenModsBackend::nsZenModsBackend() {
-  mozilla::Unused << CheckEnabled();
+  (void)CheckEnabled();
 }
 
-auto nsZenModsBackend::CheckEnabled() -> bool {
+auto nsZenModsBackend::CheckEnabled() -> void {
   // Check if the mods backend is enabled based on the preference.
   nsCOMPtr<nsIXULRuntime> appInfo =
       do_GetService("@mozilla.org/xre/app-info;1");
@@ -42,7 +42,6 @@ auto nsZenModsBackend::CheckEnabled() -> bool {
   }
   mEnabled = !inSafeMode &&
              !mozilla::Preferences::GetBool("zen.themes.disable-all", false);
-  return mEnabled; 
 }
 
 auto nsZenModsBackend::RebuildModsStyles(const nsACString& aContents) -> nsresult {
diff --git a/src/zen/mods/nsZenModsBackend.h b/src/zen/mods/nsZenModsBackend.h
index 21ffbf9f4..2c5e1fa6b 100644
--- a/src/zen/mods/nsZenModsBackend.h
+++ b/src/zen/mods/nsZenModsBackend.h
@@ -24,7 +24,7 @@ class nsZenModsBackend final : public nsIZenModsBackend {
   /**
    * @brief Check for the preference and see if the app is on safe mode.
    */
-  auto CheckEnabled() -> bool;
+  auto CheckEnabled() -> void;
 
  private:
   ~nsZenModsBackend() = default;
diff --git a/src/zen/toolkit/common/cocoa/ZenShareInternal.mm b/src/zen/toolkit/common/cocoa/ZenShareInternal.mm
index ae5bd5577..b59904b69 100644
--- a/src/zen/toolkit/common/cocoa/ZenShareInternal.mm
+++ b/src/zen/toolkit/common/cocoa/ZenShareInternal.mm
@@ -50,7 +50,6 @@ auto nsZenNativeShareInternal::ShowNativeDialog(nsCOMPtr<mozIDOMWindowProxy>& aW
   if (aUrl) {
     nsresult rv = aUrl->GetSpec(pageUrlAsStringTemp);
     MOZ_ASSERT(NS_SUCCEEDED(rv));
-    mozilla::Unused << rv;
   } else {
     pageUrlAsStringTemp.SetIsVoid(true);
   }
diff --git a/src/zen/toolkit/common/windows/ZenShareInternal.cpp b/src/zen/toolkit/common/windows/ZenShareInternal.cpp
index 15b721585..3d7248ac4 100644
--- a/src/zen/toolkit/common/windows/ZenShareInternal.cpp
+++ b/src/zen/toolkit/common/windows/ZenShareInternal.cpp
@@ -27,7 +27,6 @@ auto nsZenNativeShareInternal::ShowNativeDialog(
   if (aUrl) {
     nsresult rv = aUrl->GetSpec(urlString);
     MOZ_ASSERT(NS_SUCCEEDED(rv));
-    mozilla::Unused << rv;
   } else {
     urlString.SetIsVoid(true);
   }
diff --git a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
index 792bb4850..66de639a9 100644
--- a/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
+++ b/src/zen/urlbar/ZenUBActionsProvider.sys.mjs
@@ -22,11 +22,11 @@ const MINIMUM_PREFIXED_QUERY_SCORE = 30;
 
 ChromeUtils.defineESModuleGetters(lazy, {
   UrlbarResult: 'moz-src:///browser/components/urlbar/UrlbarResult.sys.mjs',
-  UrlbarTokenizer: 'moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs',
   QueryScorer: 'moz-src:///browser/components/urlbar/UrlbarProviderInterventions.sys.mjs',
   BrowserWindowTracker: 'resource:///modules/BrowserWindowTracker.sys.mjs',
   AddonManager: 'resource://gre/modules/AddonManager.sys.mjs',
   zenUrlbarResultsLearner: 'resource:///modules/ZenUBResultsLearner.sys.mjs',
+  UrlUtils: 'resource://gre/modules/UrlUtils.sys.mjs',
 });
 
 XPCOMUtils.defineLazyPreferenceGetter(
@@ -72,7 +72,7 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
         queryContext.searchString &&
         queryContext.searchString.length < UrlbarUtils.MAX_TEXT_LENGTH &&
         queryContext.searchString.length > 2 &&
-        !lazy.UrlbarTokenizer.REGEXP_LIKE_PROTOCOL.test(queryContext.searchString))
+        !lazy.UrlUtils.REGEXP_LIKE_PROTOCOL.test(queryContext.searchString))
     );
   }
 
diff --git a/surfer.json b/surfer.json
index 2b561311c..cecf1e613 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "145.0.2",
-    "candidate": "145.0.2"
+    "candidate": "146.0"
   },
   "buildOptions": {
     "generateBranding": true
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file

From 53181ea34caf11d41a2d6d8bfa31ec792df8e015 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Sun, 7 Dec 2025 00:25:24 +0100
Subject: [PATCH 143/162] chore: Import windows titlebar calculation for RC
 build 2, b=no-bug, c=no-component

---
 package-lock.json                             | 37 +++++---
 package.json                                  |  2 +-
 .../147_windows_border_fix_1.patch            | 91 +++++++++++++++++++
 .../147_windows_border_fix_2.patch            | 58 ++++++++++++
 .../147_windows_border_fix_3.patch            | 34 +++++++
 .../147_windows_border_fix_4.patch            | 34 +++++++
 6 files changed, 243 insertions(+), 13 deletions(-)
 create mode 100644 src/firefox-patches/147_windows_border_fix_1.patch
 create mode 100644 src/firefox-patches/147_windows_border_fix_2.patch
 create mode 100644 src/firefox-patches/147_windows_border_fix_3.patch
 create mode 100644 src/firefox-patches/147_windows_border_fix_4.patch

diff --git a/package-lock.json b/package-lock.json
index 4be119e91..db79a9ecd 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.26"
+        "@zen-browser/surfer": "^1.12.0"
       },
       "devDependencies": {
         "@babel/preset-typescript": "^7.27.0",
@@ -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"
@@ -1109,9 +1115,9 @@
       "license": "MIT"
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.11.26",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.26.tgz",
-      "integrity": "sha512-NZcFZ4a/HWvEJlEr5IlQto/xHLOr6tZjkZALue2qHg+rjRKR5v2BEV4hV5mfAo85gKhyM2Ism0sD+0+/VQIESg==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.12.0.tgz",
+      "integrity": "sha512-I5nxDgGpFGtdOAC9DZkoQp9GJ4cAqCW+0p0DoQRjW/jdnQJUH20ygvPyPr+sgjXISPFclYX+KrVoT2kJqTdlTw==",
       "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
@@ -1147,7 +1153,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1819,7 +1824,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",
@@ -2006,7 +2012,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",
@@ -2326,7 +2333,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",
@@ -2562,6 +2570,7 @@
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -2585,7 +2594,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",
@@ -3433,6 +3441,7 @@
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -4430,6 +4439,7 @@
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -4864,6 +4874,7 @@
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -5078,7 +5089,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",
@@ -5534,7 +5546,6 @@
       "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -6949,6 +6960,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/package.json b/package.json
index 17ae8137e..355f9be11 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.26"
+    "@zen-browser/surfer": "^1.12.0"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.27.0",
diff --git a/src/firefox-patches/147_windows_border_fix_1.patch b/src/firefox-patches/147_windows_border_fix_1.patch
new file mode 100644
index 000000000..3a4dfb7d2
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_1.patch
@@ -0,0 +1,91 @@
+From 433cc8224790300fdabe76bd225b644c1812da34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Thu, 27 Nov 2025 15:28:12 +0000
+Subject: [PATCH] Bug 1993474 - Ensure our WNDPROC has precedence over
+ WinAppSDK's. r=gstoll,win-reviewers
+
+See the comment for reasoning. WM_NCCALCSIZE wasn't getting called, and
+we rely on that to get the right client area on things like maximized
+windows.
+
+Differential Revision: https://phabricator.services.mozilla.com/D274281
+---
+ widget/windows/nsWindow.cpp | 32 ++++++++++++++++++++++----------
+ widget/windows/nsWindow.h   |  2 ++
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index 0b98d157097da..b357df236cfcd 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -1520,12 +1520,31 @@ DWORD nsWindow::WindowExStyle() {
+  *
+  **************************************************************/
+ 
++bool nsWindow::ShouldAssociateWithWinAppSDK() const {
++  // We currently don't need any SDK functionality for for PiP windows,
++  // and using the SDK on these windows causes them to go under the
++  // taskbar (bug 1995838).
++  //
++  // TODO(emilio): That might not be true anymore after bug 1993474,
++  // consider re-testing and removing that special-case.
++  return IsTopLevelWidget() && !mIsPIPWindow;
++}
++
+ bool nsWindow::AssociateWithNativeWindow() {
+   if (!mWnd || !IsWindow(mWnd)) {
+     NS_ERROR("Invalid window handle");
+     return false;
+   }
+ 
++  if (ShouldAssociateWithWinAppSDK()) {
++    // Make sure to call this here to associate our window with the
++    // Windows App SDK _before_ setting our WNDPROC, if needed.
++    // This is important because the SDKs WNDPROC might handle messages like
++    // WM_NCCALCSIZE without calling into us, and that can cause sizing issues,
++    // see bug 1993474.
++    WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
++  }
++
+   // Connect the this pointer to the native window handle.
+   // This should be done before SetWindowLongPtrW, because nsWindow::WindowProc
+   // uses WinUtils::GetNSWindowPtr internally.
+@@ -1552,12 +1571,7 @@ void nsWindow::DissociateFromNativeWindow() {
+   DebugOnly<WNDPROC> wndProcBeforeDissociate =
+       reinterpret_cast<WNDPROC>(::SetWindowLongPtrW(
+           mWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(*mPrevWndProc)));
+-  // If we've used the Windows App SDK to remove the minimize/maximize/close
+-  // entries from the titlebar, then the Windows App SDK sets its own WNDPROC
+-  // own the window, so this assertion would fail. But we only do this if
+-  // Mica is available.
+-  NS_ASSERTION(WinUtils::MicaAvailable() ||
+-                   wndProcBeforeDissociate == nsWindow::WindowProc,
++  NS_ASSERTION(wndProcBeforeDissociate == nsWindow::WindowProc,
+                "Unstacked an unexpected native window procedure");
+ 
+   WinUtils::SetNSWindowPtr(mWnd, nullptr);
+@@ -2835,9 +2849,7 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
+     mCustomNonClientMetrics = {};
+     ResetLayout();
+   }
+-  // Not needed for PiP windows, and using the Windows App SDK on
+-  // these windows causes them to go under the taskbar (bug 1995838)
+-  if (!mPIPWindow) {
++  if (ShouldAssociateWithWinAppSDK()) {
+     WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
+   }
+ }
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+index 20f016757dfee..2756b248368a3 100644
+--- a/widget/windows/nsWindow.h
++++ b/widget/windows/nsWindow.h
+@@ -335,6 +335,8 @@ class nsWindow final : public nsIWidget {
+ 
+   bool IsRTL() const { return mIsRTL; }
+ 
++  bool ShouldAssociateWithWinAppSDK() const;
++
+   /**
+    * AssociateDefaultIMC() associates or disassociates the default IMC for
+    * the window.
+ 
\ No newline at end of file
diff --git a/src/firefox-patches/147_windows_border_fix_2.patch b/src/firefox-patches/147_windows_border_fix_2.patch
new file mode 100644
index 000000000..de070e124
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_2.patch
@@ -0,0 +1,58 @@
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+--- a/widget/windows/nsWindow.h
++++ b/widget/windows/nsWindow.h
+@@ -850,13 +850,10 @@
+   bool mHasTaskbarIconBeenCreated = false;
+ 
+   // Whether we're in the process of sending a WM_SETTEXT ourselves
+   bool mSendingSetText = false;
+ 
+-  // Whether we're a PIP window.
+-  bool mPIPWindow : 1;
+-
+   // Whether we are asked to render a mica backdrop.
+   bool mMicaBackdrop : 1;
+ 
+   int32_t mCachedHitTestResult = 0;
+ 
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -815,11 +815,10 @@
+  **************************************************************/
+ 
+ nsWindow::nsWindow()
+     : nsIWidget(BorderStyle::Default),
+       mFrameState(std::in_place, this),
+-      mPIPWindow(false),
+       mMicaBackdrop(false),
+       mLastPaintEndTime(TimeStamp::Now()),
+       mCachedHitTestTime(TimeStamp::Now()),
+       mSizeConstraintsScale(GetDefaultScale().scale) {
+   if (!gInitializedVirtualDesktopManager) {
+@@ -1026,11 +1025,10 @@
+ 
+   HWND parent =
+       aParent ? (HWND)aParent->GetNativeData(NS_NATIVE_WINDOW) : nullptr;
+ 
+   mIsRTL = aInitData.mRTL;
+-  mPIPWindow = aInitData.mPIPWindow;
+   mOpeningAnimationSuppressed = aInitData.mIsAnimationSuppressed;
+   mAlwaysOnTop = aInitData.mAlwaysOnTop;
+   mIsAlert = aInitData.mIsAlert;
+   mResizable = aInitData.mResizable;
+ 
+@@ -2805,11 +2803,11 @@
+   } else if (sizeMode == nsSizeMode_Maximized) {
+     // We make the entire frame part of the client area. We leave the default
+     // frame sizes for left, right and bottom since Windows will automagically
+     // position the edges "offscreen" for maximized windows.
+     metrics.mOffset.top = metrics.mCaptionHeight;
+-  } else if (mPIPWindow &&
++  } else if (mIsPIPWindow &&
+              !StaticPrefs::widget_windows_pip_decorations_enabled()) {
+     metrics.mOffset = metrics.DefaultMargins();
+   } else {
+     metrics.mOffset = NormalWindowNonClientOffset();
+   }
+
diff --git a/src/firefox-patches/147_windows_border_fix_3.patch b/src/firefox-patches/147_windows_border_fix_3.patch
new file mode 100644
index 000000000..8c93f7304
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_3.patch
@@ -0,0 +1,34 @@
+From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:06:26 +0000
+Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
+ non-collapsed titlebar. r=win-reviewers,gstoll
+
+This seems to actually go to the default DWM stuff and is the documented
+way of doing so:
+
+https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
+
+Differential Revision: https://phabricator.services.mozilla.com/D274413
+---
+ widget/windows/WindowsUIUtils.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index a5a6c893e7056..abaabfba69dfa 100644
+--- a/widget/windows/WindowsUIUtils.cpp
++++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+     return;
+   }
+-  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
++  if (aIsCollapsed) {
++    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
++  } else {
++    hr = titleBar->ResetToDefault();
++  }
+   if (FAILED(hr)) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+             ("Skipping SetIsTitlebarCollapsed() because "
+ 
\ No newline at end of file
diff --git a/src/firefox-patches/147_windows_border_fix_4.patch b/src/firefox-patches/147_windows_border_fix_4.patch
new file mode 100644
index 000000000..8c93f7304
--- /dev/null
+++ b/src/firefox-patches/147_windows_border_fix_4.patch
@@ -0,0 +1,34 @@
+From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:06:26 +0000
+Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
+ non-collapsed titlebar. r=win-reviewers,gstoll
+
+This seems to actually go to the default DWM stuff and is the documented
+way of doing so:
+
+https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
+
+Differential Revision: https://phabricator.services.mozilla.com/D274413
+---
+ widget/windows/WindowsUIUtils.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index a5a6c893e7056..abaabfba69dfa 100644
+--- a/widget/windows/WindowsUIUtils.cpp
++++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+     return;
+   }
+-  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
++  if (aIsCollapsed) {
++    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
++  } else {
++    hr = titleBar->ResetToDefault();
++  }
+   if (FAILED(hr)) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+             ("Skipping SetIsTitlebarCollapsed() because "
+ 
\ No newline at end of file

From 57ee00bf3e0a98fef84f0fb46fe2c5f46f9cfd1c Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 7 Dec 2025 18:05:30 +0100
Subject: [PATCH 144/162] feat: Add black / white color shades options for
 gradients, b=no-bug, c=common, workspaces

---
 .../content/zen-panels/gradient-generator.inc | 28 ++++++--
 src/browser/themes/shared/zen-icons/icons.css |  4 ++
 .../themes/shared/zen-icons/jar.inc.mn        |  3 +
 .../themes/shared/zen-icons/lin/algorithm.svg |  5 ++
 .../themes/shared/zen-icons/lin/face-sun.svg  |  2 +-
 .../shared/zen-icons/lin/moon-stars.svg       |  2 +-
 .../themes/shared/zen-icons/lin/sparkles.svg  |  2 +-
 src/zen/common/styles/zen-animations.css      |  6 +-
 src/zen/workspaces/ZenGradientGenerator.mjs   | 65 ++++++++++++++-----
 src/zen/workspaces/zen-gradient-generator.css | 37 ++++++-----
 10 files changed, 109 insertions(+), 45 deletions(-)
 create mode 100644 src/browser/themes/shared/zen-icons/lin/algorithm.svg

diff --git a/src/browser/base/content/zen-panels/gradient-generator.inc b/src/browser/base/content/zen-panels/gradient-generator.inc
index b5f87468b..6bc5830d2 100644
--- a/src/browser/base/content/zen-panels/gradient-generator.inc
+++ b/src/browser/base/content/zen-panels/gradient-generator.inc
@@ -12,10 +12,9 @@
           <button id="PanelUI-zen-gradient-generator-scheme-dark" class="subviewbutton"/> 
         </hbox>
         <hbox id="PanelUI-zen-gradient-generator-color-actions">
-          <button id="PanelUI-zen-gradient-generator-color-add" class="subviewbutton">
-          </button>
-          <button id="PanelUI-zen-gradient-generator-color-remove" class="subviewbutton">
-          </button>
+          <button id="PanelUI-zen-gradient-generator-color-add" class="subviewbutton" />
+          <button id="PanelUI-zen-gradient-generator-color-remove" class="subviewbutton" />
+          <button id="PanelUI-zen-gradient-generator-color-toggle-algo" class="subviewbutton" />
         </hbox>
         <label data-l10n-id="zen-panel-ui-gradient-click-to-add" id="PanelUI-zen-gradient-generator-color-click-to-add"></label>
       </hbox>
@@ -78,6 +77,27 @@
             <box data-lightness="20" data-algo="analogous" data-num-dots="3" data-position="118,215"
                 style="--c1: rgb(22, 80, 61); --c2: rgb(26, 60, 76); --c3: rgb(27, 87, 15);" />
           </hbox>
+          <hbox>
+# Start from black to white in a span on 8 steps and.
+# They must all go from the middle to the right side. They must always stay verically centered.
+# And reach to 180 on the right side, meaning we must divide the width in 16 segments.
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="180,180" style="background: rgb(0, 0, 0);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="202.5,180" style="background: rgb(32, 32, 32);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="225,180" style="background: rgb(64, 64, 64);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="247.5,180" style="background: rgb(96, 96, 96);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="270,180" style="background: rgb(128, 128, 128);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="292.5,180" style="background: rgb(160, 160, 160);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="315,180" style="background: rgb(192, 192, 192);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="337.5,180" style="background: rgb(224, 224, 224);"></box>
+          </hbox>
         </hbox>
         <toolbarbutton id="PanelUI-zen-gradient-generator-color-page-right" class="toolbarbutton-1" />
       </hbox>
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 258f007f3..80db0d71d 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -692,6 +692,10 @@
   list-style-image: url('container-tab.svg') !important;
 }
 
+#PanelUI-zen-gradient-generator-color-toggle-algo {
+  list-style-image: url('algorithm.svg');
+}
+
 #appMenuClearRecentHistory {
   list-style-image: url('edit-delete.svg') !important;
 }
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index 485933c80..2efa99098 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifdef XP_WIN
+*  skin/classic/browser/zen-icons/algorithm.svg                      (../shared/zen-icons/lin/algorithm.svg) 
 *  skin/classic/browser/zen-icons/arrow-down.svg                      (../shared/zen-icons/lin/arrow-down.svg) 
 *  skin/classic/browser/zen-icons/arrow-left.svg                      (../shared/zen-icons/lin/arrow-left.svg) 
 *  skin/classic/browser/zen-icons/arrow-right.svg                      (../shared/zen-icons/lin/arrow-right.svg) 
@@ -131,6 +132,7 @@
 *  skin/classic/browser/zen-icons/zoom-out.svg                      (../shared/zen-icons/lin/zoom-out.svg) 
 #endif
 #ifdef XP_MACOSX
+*  skin/classic/browser/zen-icons/algorithm.svg                      (../shared/zen-icons/lin/algorithm.svg) 
 *  skin/classic/browser/zen-icons/arrow-down.svg                      (../shared/zen-icons/lin/arrow-down.svg) 
 *  skin/classic/browser/zen-icons/arrow-left.svg                      (../shared/zen-icons/lin/arrow-left.svg) 
 *  skin/classic/browser/zen-icons/arrow-right.svg                      (../shared/zen-icons/lin/arrow-right.svg) 
@@ -259,6 +261,7 @@
 *  skin/classic/browser/zen-icons/zoom-out.svg                      (../shared/zen-icons/lin/zoom-out.svg) 
 #endif
 #ifdef XP_LINUX
+*  skin/classic/browser/zen-icons/algorithm.svg                      (../shared/zen-icons/lin/algorithm.svg) 
 *  skin/classic/browser/zen-icons/arrow-down.svg                      (../shared/zen-icons/lin/arrow-down.svg) 
 *  skin/classic/browser/zen-icons/arrow-left.svg                      (../shared/zen-icons/lin/arrow-left.svg) 
 *  skin/classic/browser/zen-icons/arrow-right.svg                      (../shared/zen-icons/lin/arrow-right.svg) 
diff --git a/src/browser/themes/shared/zen-icons/lin/algorithm.svg b/src/browser/themes/shared/zen-icons/lin/algorithm.svg
new file mode 100644
index 000000000..f35991ccc
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/lin/algorithm.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" width="18" height="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="M4.75 15.25C5.99264 15.25 7 14.2426 7 13C7 11.7574 5.99264 10.75 4.75 10.75C3.50736 10.75 2.5 11.7574 2.5 13C2.5 14.2426 3.50736 15.25 4.75 15.25Z"/><path d="M13.25 15.25C14.4926 15.25 15.5 14.2426 15.5 13C15.5 11.7574 14.4926 10.75 13.25 10.75C12.0074 10.75 11 11.7574 11 13C11 14.2426 12.0074 15.25 13.25 15.25Z"/><path d="M9 7.25C10.2426 7.25 11.25 6.24264 11.25 5C11.25 3.75736 10.2426 2.75 9 2.75C7.75736 2.75 6.75 3.75736 6.75 5C6.75 6.24264 7.75736 7.25 9 7.25Z"/></g></svg>
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/lin/face-sun.svg b/src/browser/themes/shared/zen-icons/lin/face-sun.svg
index 432970d42..543e131a0 100644
--- a/src/browser/themes/shared/zen-icons/lin/face-sun.svg
+++ b/src/browser/themes/shared/zen-icons/lin/face-sun.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" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M17.25,8.25h-1.292c-.146-1.369-.69-2.619-1.512-3.637l1.583-1.583c.293-.293,.293-.768,0-1.061s-.767-.294-1.061,0l-1.583,1.583c-1.018-.821-2.268-1.365-3.636-1.511V.75c0-.414-.336-.75-.75-.75s-.75,.336-.75,.75v1.292c-1.368,.146-2.618,.69-3.636,1.511l-1.583-1.583c-.293-.293-.768-.293-1.061,0s-.293,.768,0,1.061l1.583,1.583c-.821,1.018-1.365,2.268-1.511,3.637H.75c-.414,0-.75,.336-.75,.75s.336,.75,.75,.75h1.292c.146,1.369,.69,2.619,1.511,3.637l-1.583,1.583c-.293,.293-.293,.768,0,1.061,.146,.146,.338,.22,.53,.22,.191,0,.384-.073,.53-.22l1.583-1.583c1.018,.821,2.268,1.365,3.636,1.511v1.292c0,.414,.336,.75,.75,.75s.75-.336,.75-.75v-1.292c1.368-.146,2.618-.69,3.636-1.511l1.583,1.583c.146,.146,.338,.22,.53,.22s.384-.073,.53-.22c.293-.293,.293-.768,0-1.061l-1.583-1.583c.821-1.018,1.365-2.268,1.512-3.637h1.292c.414,0,.75-.336,.75-.75s-.336-.75-.75-.75Zm-11.25,1.75c-.552,0-1-.448-1-1s.448-1,1-1,1,.448,1,1-.448,1-1,1Zm3,2c-.828,0-1.5-.672-1.5-1.5,0-.276,.224-.5,.5-.5h2c.276,0,.5,.224,.5,.5,0,.828-.672,1.5-1.5,1.5Zm2-3c0-.552,.448-1,1-1s1,.448,1,1-.448,1-1,1-1-.448-1-1Z" fill="currentColor"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M17.25,8.25h-1.292c-.146-1.369-.69-2.619-1.512-3.637l1.583-1.583c.293-.293,.293-.768,0-1.061s-.767-.294-1.061,0l-1.583,1.583c-1.018-.821-2.268-1.365-3.636-1.511V.75c0-.414-.336-.75-.75-.75s-.75,.336-.75,.75v1.292c-1.368,.146-2.618,.69-3.636,1.511l-1.583-1.583c-.293-.293-.768-.293-1.061,0s-.293,.768,0,1.061l1.583,1.583c-.821,1.018-1.365,2.268-1.511,3.637H.75c-.414,0-.75,.336-.75,.75s.336,.75,.75,.75h1.292c.146,1.369,.69,2.619,1.511,3.637l-1.583,1.583c-.293,.293-.293,.768,0,1.061,.146,.146,.338,.22,.53,.22,.191,0,.384-.073,.53-.22l1.583-1.583c1.018,.821,2.268,1.365,3.636,1.511v1.292c0,.414,.336,.75,.75,.75s.75-.336,.75-.75v-1.292c1.368-.146,2.618-.69,3.636-1.511l1.583,1.583c.146,.146,.338,.22,.53,.22s.384-.073,.53-.22c.293-.293,.293-.768,0-1.061l-1.583-1.583c.821-1.018,1.365-2.268,1.512-3.637h1.292c.414,0,.75-.336,.75-.75s-.336-.75-.75-.75Zm-11.25,1.75c-.552,0-1-.448-1-1s.448-1,1-1,1,.448,1,1-.448,1-1,1Zm3,2c-.828,0-1.5-.672-1.5-1.5,0-.276,.224-.5,.5-.5h2c.276,0,.5,.224,.5,.5,0,.828-.672,1.5-1.5,1.5Zm2-3c0-.552,.448-1,1-1s1,.448,1,1-.448,1-1,1-1-.448-1-1Z" fill="context-fill"></path></svg>
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/lin/moon-stars.svg b/src/browser/themes/shared/zen-icons/lin/moon-stars.svg
index 031c60f8e..f4739fbae 100644
--- a/src/browser/themes/shared/zen-icons/lin/moon-stars.svg
+++ b/src/browser/themes/shared/zen-icons/lin/moon-stars.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" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M16.705,10.223c-.246-.183-.578-.197-.838-.037-.868,.532-1.859,.813-2.867,.813-3.033,0-5.5-2.467-5.5-5.5,0-1.146,.354-2.247,1.023-3.186,.177-.249,.186-.581,.021-.839-.164-.258-.467-.386-.77-.334C3.994,1.847,1.25,5.152,1.25,9c0,4.411,3.589,8,8,8,3.638,0,6.819-2.461,7.735-5.986,.077-.296-.034-.609-.28-.791Z" fill="currentColor"></path><path d="M12.743,4.492l-.946-.315-.316-.947c-.102-.306-.609-.306-.711,0l-.316,.947-.946,.315c-.153,.051-.257,.194-.257,.356s.104,.305,.257,.356l.946,.315,.316,.947c.051,.153,.194,.256,.355,.256s.305-.104,.355-.256l.316-.947,.946-.315c.153-.051,.257-.194,.257-.356s-.104-.305-.257-.356Z" fill="currentColor" data-color="color-2"></path><circle cx="14.25" cy="7.75" r=".75" fill="currentColor" data-color="color-2"></circle></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M16.705,10.223c-.246-.183-.578-.197-.838-.037-.868,.532-1.859,.813-2.867,.813-3.033,0-5.5-2.467-5.5-5.5,0-1.146,.354-2.247,1.023-3.186,.177-.249,.186-.581,.021-.839-.164-.258-.467-.386-.77-.334C3.994,1.847,1.25,5.152,1.25,9c0,4.411,3.589,8,8,8,3.638,0,6.819-2.461,7.735-5.986,.077-.296-.034-.609-.28-.791Z" fill="context-fill"></path><path d="M12.743,4.492l-.946-.315-.316-.947c-.102-.306-.609-.306-.711,0l-.316,.947-.946,.315c-.153,.051-.257,.194-.257,.356s.104,.305,.257,.356l.946,.315,.316,.947c.051,.153,.194,.256,.355,.256s.305-.104,.355-.256l.316-.947,.946-.315c.153-.051,.257-.194,.257-.356s-.104-.305-.257-.356Z" fill="currentColor" data-color="color-2"></path><circle cx="14.25" cy="7.75" r=".75" fill="currentColor" data-color="color-2"></circle></svg>
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/lin/sparkles.svg b/src/browser/themes/shared/zen-icons/lin/sparkles.svg
index 77cc7d3ff..63f0bf063 100644
--- a/src/browser/themes/shared/zen-icons/lin/sparkles.svg
+++ b/src/browser/themes/shared/zen-icons/lin/sparkles.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" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M3.025,5.623c.068,.204,.26,.342,.475,.342s.406-.138,.475-.342l.421-1.263,1.263-.421c.204-.068,.342-.259,.342-.474s-.138-.406-.342-.474l-1.263-.421-.421-1.263c-.137-.408-.812-.408-.949,0l-.421,1.263-1.263,.421c-.204,.068-.342,.259-.342,.474s.138,.406,.342,.474l1.263,.421,.421,1.263Z" fill="currentColor" data-color="color-2"></path><path d="M16.525,8.803l-4.535-1.793-1.793-4.535c-.227-.572-1.168-.572-1.395,0l-1.793,4.535-4.535,1.793c-.286,.113-.475,.39-.475,.697s.188,.584,.475,.697l4.535,1.793,1.793,4.535c.113,.286,.39,.474,.697,.474s.584-.188,.697-.474l1.793-4.535,4.535-1.793c.286-.113,.475-.39,.475-.697s-.188-.584-.475-.697Z" fill="currentColor"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M3.025,5.623c.068,.204,.26,.342,.475,.342s.406-.138,.475-.342l.421-1.263,1.263-.421c.204-.068,.342-.259,.342-.474s-.138-.406-.342-.474l-1.263-.421-.421-1.263c-.137-.408-.812-.408-.949,0l-.421,1.263-1.263,.421c-.204,.068-.342,.259-.342,.474s.138,.406,.342,.474l1.263,.421,.421,1.263Z" fill="context-fill" data-color="color-2"></path><path d="M16.525,8.803l-4.535-1.793-1.793-4.535c-.227-.572-1.168-.572-1.395,0l-1.793,4.535-4.535,1.793c-.286,.113-.475,.39-.475,.697s.188,.584,.475,.697l4.535,1.793,1.793,4.535c.113,.286,.39,.474,.697,.474s.584-.188,.697-.474l1.793-4.535,4.535-1.793c.286-.113,.475-.39,.475-.697s-.188-.584-.475-.697Z" fill="currentColor"></path></svg>
\ No newline at end of file
diff --git a/src/zen/common/styles/zen-animations.css b/src/zen/common/styles/zen-animations.css
index ae77e9502..1c2bd3c69 100644
--- a/src/zen/common/styles/zen-animations.css
+++ b/src/zen/common/styles/zen-animations.css
@@ -18,13 +18,13 @@
 
 @keyframes zen-theme-picker-dot-animation {
   from {
-    transform: scale(0.8) translate(-50%, -50%);
+    transform: scale(0.8) translate(-25%, -25%);
   }
   50% {
-    transform: scale(1.2) translate(-50%, -50%);
+    transform: scale(1.2) translate(-25%, -25%);
   }
   to {
-    transform: scale(1) translate(-50%, -50%);
+    transform: scale(1) translate(-25%, -25%);
   }
 }
 
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index ba3f1edbe..377765efb 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -45,6 +45,7 @@ const MAX_OPACITY = 0.9;
 const MIN_OPACITY = AppConstants.platform === 'macosx' ? 0.25 : 0.35;
 
 const EXPLICIT_LIGHTNESS_TYPE = 'explicit-lightness';
+const EXPLICIT_BLACKWHITE_TYPE = 'explicit-black-white';
 
 export class nsZenThemePicker extends nsZenMultiWindowFeature {
   static MAX_DOTS = 3;
@@ -146,6 +147,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
   get colorHarmonies() {
     return [
       { type: 'complementary', angles: [180] },
+      { type: 'singleAnalogous', angles: [310] },
       { type: 'splitComplementary', angles: [150, 210] },
       { type: 'analogous', angles: [50, 310] },
       { type: 'triadic', angles: [120, 240] },
@@ -198,6 +200,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
           }
           this.dots = this.dots.slice(0, numDots);
         }
+        const type = target.getAttribute('data-type') || EXPLICIT_LIGHTNESS_TYPE;
         // Generate new gradient from the single color given
         const [x, y] = rawPosition.split(',').map((pos) => parseInt(pos));
         let dots = [
@@ -205,18 +208,18 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
             ID: 0,
             position: { x, y },
             isPrimary: true,
-            type: EXPLICIT_LIGHTNESS_TYPE,
+            type,
           },
         ];
         for (let i = 1; i < numDots; i++) {
           dots.push({
             ID: i,
             position: { x: 0, y: 0 },
-            type: EXPLICIT_LIGHTNESS_TYPE,
+            type,
           });
         }
         this.useAlgo = algo;
-        this.#currentLightness = lightness;
+        if (lightness !== null) this.#currentLightness = lightness;
         dots = this.calculateCompliments(dots, 'update', this.useAlgo);
         this.handleColorPositions(dots, true);
         this.updateCurrentWorkspace();
@@ -416,10 +419,10 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
   calculateInitialPosition([r, g, b]) {
     // This function is called before the picker is even rendered, so we hard code the dimensions
     // important: If any sort of sizing is changed, make sure changes are reflected here
-    const padding = 30;
+    const padding = 0;
     const rect = {
-      width: 338,
-      height: 338,
+      width: 380 + padding * 2,
+      height: 380 + padding * 2,
     };
     const centerX = rect.width / 2;
     const centerY = rect.height / 2;
@@ -437,7 +440,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
     const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
     const rect = gradient.getBoundingClientRect();
     const padding = 30; // each side
-    const dotHalfSize = 36 / 2; // half the size of the dot
+    const dotHalfSize = 38 / 2; // half the size of the dot
     x += dotHalfSize;
     y += dotHalfSize;
     rect.width += padding * 2; // Adjust width and height for padding
@@ -452,7 +455,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
       angle += 360; // Normalize to [0, 360)
     }
     const normalizedDistance = 1 - Math.min(distance / radius, 1); // Normalize distance to [0, 1]
-    const hue = (angle / 360) * 360; // Normalize angle to [0, 360)
+    let hue = (angle / 360) * 360; // Normalize angle to [0, 360)
     let saturation = normalizedDistance * 100; // stays high even in center
     if (type !== EXPLICIT_LIGHTNESS_TYPE) {
       saturation = 80 + (1 - normalizedDistance) * 20;
@@ -460,7 +463,12 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
       // For example, moving the dot outside will have higher lightness, while moving it inside will have lower lightness
       this.#currentLightness = Math.round((1 - normalizedDistance) * 100);
     }
-    const lightness = this.#currentLightness; // Fixed lightness for simplicity
+    let lightness = this.#currentLightness; // Fixed lightness for simplicity
+    if (type === EXPLICIT_BLACKWHITE_TYPE) {
+      // We can only get grayscales from white to black
+      saturation = 0;
+      lightness = Math.round((1 - normalizedDistance) * 100);
+    }
     const [r, g, b] = this.hslToRgb(hue / 360, saturation / 100, lightness / 100);
     return [
       Math.min(255, Math.max(0, r)),
@@ -675,7 +683,13 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
       }
 
       if (action === 'remove') {
-        return colorHarmonies.find((harmony) => harmony.angles.length === numDots);
+        let harmony = colorHarmonies.find((harmony) => harmony.angles.length === numDots);
+        // If we are coming from 3 analogous dots, we should now go to singleAnalogous if
+        // there are 2 dots left
+        if (harmony.type === 'analogous' && numDots === 1) {
+          harmony = colorHarmonies.find((harmony) => harmony.type === 'singleAnalogous');
+        }
+        return harmony;
       }
       if (action === 'add') {
         return colorHarmonies.find((harmony) => harmony.angles.length + 1 === numDots);
@@ -700,7 +714,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
 
     const dotPad = this.panel.querySelector('.zen-theme-picker-gradient');
     const rect = dotPad.getBoundingClientRect();
-    const padding = 30;
+    const padding = 0;
 
     let updatedDots = [...dots];
     const centerPosition = { x: rect.width / 2, y: rect.height / 2 };
@@ -843,16 +857,30 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
       this.handleColorPositions(colorPositions);
       this.updateCurrentWorkspace();
       return;
+    } else if (target.id === 'PanelUI-zen-gradient-generator-color-toggle-algo') {
+      const applicableHarmonies = this.colorHarmonies.filter(
+        (harmony) => harmony.angles.length + 1 === this.dots.length
+      );
+
+      let currentIndex = applicableHarmonies.findIndex((harmony) => harmony.type === this.useAlgo);
+
+      const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % applicableHarmonies.length;
+      this.useAlgo = applicableHarmonies[nextIndex].type;
+
+      let colorPositions = this.calculateCompliments(this.dots, 'update', this.useAlgo);
+      this.handleColorPositions(colorPositions);
+      this.updateCurrentWorkspace();
+      return;
     }
 
     if (event.button !== 0 || this.dragging || this.recentlyDragged) return;
 
     const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
     const rect = gradient.getBoundingClientRect();
-    const padding = 30;
+    const padding = 0;
 
-    const centerX = rect.left + rect.width / 2;
-    const centerY = rect.top + rect.height / 2;
+    const centerX = rect.left + rect.width / 2 - padding;
+    const centerY = rect.top + rect.height / 2 - padding;
     const radius = (rect.width - padding) / 2;
     let pixelX = event.clientX;
     let pixelY = event.clientY;
@@ -982,7 +1010,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
     if (this.dragging) {
       event.preventDefault();
       const rect = this.panel.querySelector('.zen-theme-picker-gradient').getBoundingClientRect();
-      const padding = 30; // each side
+      const padding = 0; // each side
       // do NOT let the ball be draged outside of an imaginary circle. You can drag it anywhere inside the circle
       // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball
       // should be placed on the edge of the circle. If it's inside the circle, then the ball just follows the mouse
@@ -1164,7 +1192,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
         if (!forToolbar) {
           return [
             `linear-gradient(${rotation}deg, ${this.getSingleRGBColor(themedColors[1], forToolbar)} 0%, transparent 100%)`,
-            `linear-gradient(${rotation + 180}deg, ${this.getSingleRGBColor(themedColors[0], forToolbar)} 0%, transparent 80%)`,
+            `linear-gradient(${rotation + 180}deg, ${this.getSingleRGBColor(themedColors[0], forToolbar)} 0%, transparent 100%)`,
           ]
             .reverse()
             .join(', ');
@@ -1175,8 +1203,8 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
         let color2 = this.getSingleRGBColor(themedColors[0], forToolbar);
         let color3 = this.getSingleRGBColor(themedColors[1], forToolbar);
         return [
+          `radial-gradient(circle at 0% 0%, ${color2} -10%, transparent 100%)`,
           `linear-gradient(to top, ${color1} -50%, transparent 125%)`,
-          `radial-gradient(circle at 0% 0%, ${color2} 10%, transparent 80%)`,
           `radial-gradient(circle at 100% -100%, ${color3} -100%, transparent 400%)`,
         ].join(', ');
       }
@@ -1389,6 +1417,9 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
           workspaceTheme.gradientColors.length === 0 ||
           (button.id === 'PanelUI-zen-gradient-generator-color-add'
             ? workspaceTheme.gradientColors.length >= nsZenThemePicker.MAX_DOTS
+            : false) ||
+          (button.id === 'PanelUI-zen-gradient-generator-color-toggle-algo'
+            ? workspaceTheme.gradientColors.length < 2
             : false);
       }
       const clickToAdd = browser.document.getElementById(
diff --git a/src/zen/workspaces/zen-gradient-generator.css b/src/zen/workspaces/zen-gradient-generator.css
index 24004a1d5..3e4ca8911 100644
--- a/src/zen/workspaces/zen-gradient-generator.css
+++ b/src/zen/workspaces/zen-gradient-generator.css
@@ -5,7 +5,7 @@
  */
 
 #PanelUI-zen-gradient-generator {
-  --panel-width: 360px;
+  --panel-width: 380px;
   --panel-padding: 10px;
   min-width: var(--panel-width);
 }
@@ -102,15 +102,16 @@
   overflow: auto;
   scrollbar-width: none;
   scroll-behavior: smooth;
-  mask-image: linear-gradient(to right, transparent 0%, black 2.5%, black 97.5%, transparent 100%);
 
   & > hbox {
-    justify-content: space-around;
+    justify-content: space-between;
     min-width: 100%;
+    padding: 0 1px;
 
     & > box {
-      width: 22px;
-      height: 22px;
+      width: 26px;
+      height: 26px;
+      box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
       border-radius: 50%;
       cursor: pointer;
       position: relative;
@@ -251,17 +252,17 @@
   min-height: calc(var(--panel-width) - var(--panel-padding) * 2 - 2px);
   background: light-dark(rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.03));
   background-image: radial-gradient(
-    light-dark(rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.1)) 1px,
+    light-dark(rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.1)) 0.5px,
     transparent 0
   );
   background-position: -23px -23px;
   background-size: 6px 6px;
 
   & .zen-theme-picker-dot {
-    position: absolute;
+    position: fixed;
     z-index: 2;
-    width: 18px;
-    height: 18px;
+    width: 20px;
+    height: 20px;
     border-radius: 50%;
     background: var(--zen-theme-picker-dot-color);
     @media (-prefers-color-scheme: dark) {
@@ -270,25 +271,25 @@
     cursor: pointer;
     border: 3px solid #ffffff;
     animation: zen-theme-picker-dot-animation 0.5s;
-    transform: translate(-50%, -50%);
+    transform: translate(-25%, -25%);
     pointer-events: none;
     transform-origin: center center;
 
     &:first-of-type {
-      width: 36px;
-      height: 36px;
+      width: 38px;
+      height: 38px;
       border-width: 4px;
       z-index: 2;
       pointer-events: all;
       transition: transform 0.2s;
       z-index: 999;
       &:hover {
-        transform: scale(1.05) translate(-50%, -50%);
+        transform: scale(1.05) translate(-25%, -25%);
       }
     }
 
     &[dragging='true'] {
-      transform: scale(1.2) translate(-50%, -50%) !important;
+      transform: scale(1.2) translate(-25%, -25%) !important;
     }
   }
 }
@@ -329,10 +330,10 @@
     min-width: fit-content !important;
     transition: background 0.2s;
     appearance: none;
-    max-height: 26px;
-    max-width: 26px;
-    min-height: 26px;
-    min-width: 26px !important;
+    max-height: 30px;
+    max-width: 30px;
+    min-height: 30px;
+    min-width: 30px !important;
     color: light-dark(rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.9));
 
     & .button-box {

From 832b0c4fe3750a9c7dec2902023b6fa2a2762976 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 7 Dec 2025 19:02:14 +0100
Subject: [PATCH 145/162] feat: Increase the space of grid for devices that
 dont support sub-pixel rendering, b=no-bug, c=workspaces

---
 src/zen/workspaces/zen-gradient-generator.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/workspaces/zen-gradient-generator.css b/src/zen/workspaces/zen-gradient-generator.css
index 3e4ca8911..9f0fd95c5 100644
--- a/src/zen/workspaces/zen-gradient-generator.css
+++ b/src/zen/workspaces/zen-gradient-generator.css
@@ -252,7 +252,7 @@
   min-height: calc(var(--panel-width) - var(--panel-padding) * 2 - 2px);
   background: light-dark(rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.03));
   background-image: radial-gradient(
-    light-dark(rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.1)) 0.5px,
+    light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.05)) 1px,
     transparent 0
   );
   background-position: -23px -23px;

From 85d52d15c2ac8d35fc45da2c9b1c7789df5c08a7 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 8 Dec 2025 01:40:53 +0100
Subject: [PATCH 146/162] fix: Fixed incorrect dot possition and scaling,
 b=no-bug, c=common, workspaces

---
 src/zen/common/styles/zen-animations.css      | 6 +++---
 src/zen/workspaces/ZenGradientGenerator.mjs   | 8 ++++++--
 src/zen/workspaces/zen-gradient-generator.css | 7 ++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/zen/common/styles/zen-animations.css b/src/zen/common/styles/zen-animations.css
index 1c2bd3c69..ae77e9502 100644
--- a/src/zen/common/styles/zen-animations.css
+++ b/src/zen/common/styles/zen-animations.css
@@ -18,13 +18,13 @@
 
 @keyframes zen-theme-picker-dot-animation {
   from {
-    transform: scale(0.8) translate(-25%, -25%);
+    transform: scale(0.8) translate(-50%, -50%);
   }
   50% {
-    transform: scale(1.2) translate(-25%, -25%);
+    transform: scale(1.2) translate(-50%, -50%);
   }
   to {
-    transform: scale(1) translate(-25%, -25%);
+    transform: scale(1) translate(-50%, -50%);
   }
 }
 
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index 377765efb..ac5aaf517 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -799,8 +799,12 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
           gZenUIManager.motion.animate(
             existingDot.element,
             {
-              left: `${dotPosition.position.x}px`,
-              top: `${dotPosition.position.y}px`,
+              left: existingDot.element.style.left
+                ? [existingDot.element.style.left, `${dotPosition.position.x}px`]
+                : `${dotPosition.position.x}px`,
+              top: existingDot.element.style.top
+                ? [existingDot.element.style.top, `${dotPosition.position.y}px`]
+                : `${dotPosition.position.y}px`,
             },
             {
               duration: 0.4,
diff --git a/src/zen/workspaces/zen-gradient-generator.css b/src/zen/workspaces/zen-gradient-generator.css
index 9f0fd95c5..d609aeaae 100644
--- a/src/zen/workspaces/zen-gradient-generator.css
+++ b/src/zen/workspaces/zen-gradient-generator.css
@@ -271,9 +271,10 @@
     cursor: pointer;
     border: 3px solid #ffffff;
     animation: zen-theme-picker-dot-animation 0.5s;
-    transform: translate(-25%, -25%);
+    transform: translate(-50%, -50%);
     pointer-events: none;
-    transform-origin: center center;
+    transform-origin: left top;
+    margin: 10px 0 0 10px;
 
     &:first-of-type {
       width: 38px;
@@ -284,7 +285,7 @@
       transition: transform 0.2s;
       z-index: 999;
       &:hover {
-        transform: scale(1.05) translate(-25%, -25%);
+        transform: scale(1.05) translate(-50%, -50%);
       }
     }
 

From 43de5c69e95797faa00879b5e892be3b092c8fa3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 8 Dec 2025 18:06:58 +0100
Subject: [PATCH 147/162] fix: Fixed minor aligment and coloring issues,
 b=no-bug, c=tabs, workspaces

---
 .../content/zen-panels/gradient-generator.inc |  6 ++--
 src/zen/tabs/zen-tabs/vertical-tabs.css       | 29 ++++++++++++-------
 src/zen/workspaces/ZenGradientGenerator.mjs   |  4 +--
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/browser/base/content/zen-panels/gradient-generator.inc b/src/browser/base/content/zen-panels/gradient-generator.inc
index 6bc5830d2..6360ff8ca 100644
--- a/src/browser/base/content/zen-panels/gradient-generator.inc
+++ b/src/browser/base/content/zen-panels/gradient-generator.inc
@@ -120,11 +120,13 @@
                 </defs>
               </svg>
             </box>
-            <html:input type="range" max="0.9" value="0.4" step="0.001" id="PanelUI-zen-gradient-generator-opacity"
+            <html:input type="range" value="0.4" step="0.001" id="PanelUI-zen-gradient-generator-opacity"
 #ifdef XP_MACOSX
-              min="0.25"
+              min="0.15"
+              max="0.8"
 #else
               min="0.35"
+              max="0.9"
 #endif
               />
           </vbox>
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 20bcccefc..2c4a548b2 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -131,7 +131,6 @@
    ========================================================================== */
 .pinned-tabs-container-separator {
   height: 22px;
-  padding-bottom: 2px;
   border: none;
   width: 100%;
   transition:
@@ -142,6 +141,7 @@
   position: relative;
   opacity: 1;
   align-items: center;
+  padding: 0 5px;
 
   & toolbarseparator {
     height: 1px;
@@ -488,7 +488,6 @@
 #navigator-toolbox[zen-sidebar-expanded='true'] {
   --zen-toolbox-min-width: fit-content;
 
-  --tab-icon-end-margin: 8.5px;
   padding: var(--zen-toolbox-padding);
   padding-left: 0;
   padding-top: 0;
@@ -545,7 +544,7 @@
   }
 
   & #zen-essentials {
-    --tab-min-height: 44px;
+    --tab-min-height: 48px;
   }
 
   &[zen-right-side='true'] {
@@ -566,8 +565,8 @@
     & #tabbrowser-arrowscrollbox-periphery > toolbarbutton {
       width: 100% !important;
       border-radius: var(--border-radius-medium) !important;
-      padding-left: var(--toolbarbutton-inner-padding) !important;
-      padding-right: var(--toolbarbutton-inner-padding) !important;
+      padding-left: var(--tab-inline-padding) !important;
+      padding-right: var(--tab-inline-padding) !important;
 
       & label {
         display: flex;
@@ -600,6 +599,7 @@
 
   & #tabbrowser-tabs {
     --tab-inline-padding: 8px;
+    --tab-icon-end-margin: 8.5px;
 
     & .tabbrowser-tab {
       & .tab-label-container {
@@ -667,8 +667,8 @@
       .tab-icon-image,
       .tab-sharing-icon-overlay,
       .tab-icon-overlay {
-        margin-inline-end: var(--toolbarbutton-inner-padding) !important;
-        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 4) !important;
+        margin-inline-end: calc(var(--toolbarbutton-inner-padding) * 1.5) !important;
+        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 2) !important;
       }
     }
   }
@@ -1110,14 +1110,22 @@
     max-height 0.3s ease-out,
     grid-template-columns 0.3s ease-out;
   opacity: 1;
-  grid-template-columns: repeat(auto-fit, minmax(max(23.7%, 48px), 1fr));
+  --min-essentials-width-wrap: calc(var(--tab-min-height) + 4px);
+  grid-template-columns: repeat(
+    auto-fit,
+    minmax(max(23.7%, var(--min-essentials-width-wrap)), 1fr)
+  );
   &[data-hack-type='1'] {
-    grid-template-columns: repeat(auto-fit, minmax(max(30%, 48px), auto));
+    grid-template-columns: repeat(
+      auto-fit,
+      minmax(max(30%, var(--min-essentials-width-wrap)), auto)
+    );
   }
   &[data-hack-type='2'] {
     grid-template-columns: repeat(
       auto-fit,
-      minmax(max(23%, 48px), 1fr) minmax(max(23%, 48px), 1fr)
+      minmax(max(23%, var(--min-essentials-width-wrap)), 1fr)
+        minmax(max(23%, var(--min-essentials-width-wrap)), 1fr)
     );
   }
   &[data-hack-type='3'] {
@@ -1160,7 +1168,6 @@
 
   & .tab-background {
     border-radius: var(--border-radius-medium) !important;
-    transition: background 0.1s ease-in-out;
   }
 
   --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.2));
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index ac5aaf517..4866d12a5 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -41,8 +41,8 @@ function parseSinePath(pathStr) {
   return points;
 }
 
-const MAX_OPACITY = 0.9;
-const MIN_OPACITY = AppConstants.platform === 'macosx' ? 0.25 : 0.35;
+const MAX_OPACITY = AppConstants.platform === 'macosx' ? 0.8 : 0.9;
+const MIN_OPACITY = AppConstants.platform === 'macosx' ? 0.15 : 0.35;
 
 const EXPLICIT_LIGHTNESS_TYPE = 'explicit-lightness';
 const EXPLICIT_BLACKWHITE_TYPE = 'explicit-black-white';

From 9caf32de38d09397040510aa8f0e588015d787aa Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 9 Dec 2025 01:12:11 +0100
Subject: [PATCH 148/162] feat: Lower the size for essential tabs, b=no-bug,
 c=tabs

---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 2c4a548b2..ab7679a6c 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -544,7 +544,7 @@
   }
 
   & #zen-essentials {
-    --tab-min-height: 48px;
+    --tab-min-height: 44px;
   }
 
   &[zen-right-side='true'] {

From cd4d2e4f53705e53b29cc652b84b321ca6ea9e38 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 9 Dec 2025 14:25:24 +0100
Subject: [PATCH 149/162] fix: Fixed regression on tab label aligment,
 b=no-bug, c=tabs

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

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index ab7679a6c..c5ff1cd70 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -667,8 +667,8 @@
       .tab-icon-image,
       .tab-sharing-icon-overlay,
       .tab-icon-overlay {
-        margin-inline-end: calc(var(--toolbarbutton-inner-padding) * 1.5) !important;
-        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 2) !important;
+        margin-inline-end: var(--toolbarbutton-inner-padding) !important;
+        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 4) !important;
       }
     }
   }

From ef257649a8a25c8d4f0f253a3fea39fece2ea469 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 9 Dec 2025 16:49:43 +0100
Subject: [PATCH 150/162] chore: Sync upstream to `Firefox 146.0`, p=#11566

---
 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 6609e9fbe..aa6693b26 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 `145.0.2`! 🚀
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `146.0`! 🚀
 - [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 146.0`!
 
 ### Contributing
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index b4368f57d..5880c1442 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-acd4663cd1530303fcca85b420a78f4686c4628b
\ No newline at end of file
+8908c8eb566c64521e2a777ad8a80b62bd6aa193
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index cecf1e613..06f03389c 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "145.0.2",
+    "version": "146.0",
     "candidate": "146.0"
   },
   "buildOptions": {

From ad7c9688b91f4b6a98c047096b063adc40c11682 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 9 Dec 2025 20:22:53 +0100
Subject: [PATCH 151/162] 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 cecf1e613..935362da8 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.12b",
+        "displayVersion": "1.17.13b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From e4c36574b96f024df3642abdbb7bcb4d3102f128 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 10 Dec 2025 00:47:01 +0100
Subject: [PATCH 152/162] feat: Fixed coloring issue for urlbar and use lazy
 getters for gradient generator, b=no-bug, c=common, workspaces

---
 .../content/zen-panels/gradient-generator.inc | 30 ++++++++++---------
 src/zen/common/styles/zen-omnibox.css         |  6 ++--
 src/zen/workspaces/ZenGradientGenerator.mjs   | 26 +++++++++-------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/browser/base/content/zen-panels/gradient-generator.inc b/src/browser/base/content/zen-panels/gradient-generator.inc
index 6360ff8ca..5db5839eb 100644
--- a/src/browser/base/content/zen-panels/gradient-generator.inc
+++ b/src/browser/base/content/zen-panels/gradient-generator.inc
@@ -82,21 +82,23 @@
 # They must all go from the middle to the right side. They must always stay verically centered.
 # And reach to 180 on the right side, meaning we must divide the width in 16 segments.
             <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
-                data-position="180,180" style="background: rgb(0, 0, 0);"></box>
+                data-position="337.5,180" style="background: rgb(224, 224, 224);"></box>
             <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
-                data-position="202.5,180" style="background: rgb(32, 32, 32);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
-                data-position="225,180" style="background: rgb(64, 64, 64);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
-                data-position="247.5,180" style="background: rgb(96, 96, 96);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
-                data-position="270,180" style="background: rgb(128, 128, 128);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
-                data-position="292.5,180" style="background: rgb(160, 160, 160);"></box>
+                data-position="337.5,180" style="background: rgb(224, 224, 224);"></box>
             <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="315,180" style="background: rgb(192, 192, 192);"></box>
             <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
-                data-position="337.5,180" style="background: rgb(224, 224, 224);"></box>
+                data-position="292.5,180" style="background: rgb(160, 160, 160);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="270,180" style="background: rgb(128, 128, 128);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="247.5,180" style="background: rgb(96, 96, 96);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="225,180" style="background: rgb(64, 64, 64);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="202.5,180" style="background: rgb(32, 32, 32);"></box>
+            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+                data-position="180,180" style="background: rgb(0, 0, 0);"></box>
           </hbox>
         </hbox>
         <toolbarbutton id="PanelUI-zen-gradient-generator-color-page-right" class="toolbarbutton-1" />
@@ -122,11 +124,11 @@
             </box>
             <html:input type="range" value="0.4" step="0.001" id="PanelUI-zen-gradient-generator-opacity"
 #ifdef XP_MACOSX
-              min="0.15"
-              max="0.8"
-#else
+              max="0.75"
               min="0.35"
+#else
               max="0.9"
+              min="0.35"
 #endif
               />
           </vbox>
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 4a916ef08..5993d6510 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -263,7 +263,7 @@
   & .urlbar-background {
     --zen-urlbar-background-base: light-dark(
       #fbfbfb,
-      color-mix(in srgb, hsl(0, 0%, 1%), var(--zen-colors-primary) 30%)
+      color-mix(in srgb, hsl(0, 0%, 6.7%), var(--zen-colors-primary) 30%)
     );
     @media -moz-pref('zen.theme.acrylic-elements') {
       --zen-urlbar-background-transparent: color-mix(
@@ -505,8 +505,8 @@
   --urlbar-container-height: 62px !important;
   --urlbar-margin-inline: 10px !important;
 
-  min-width: min(90%, 50rem) !important;
-  width: var(--zen-urlbar-width, min(90%, 50rem)) !important;
+  min-width: min(90%, 62rem) !important;
+  width: var(--zen-urlbar-width, min(90%, 62rem)) !important;
   font-size: 1.15em !important;
   @media (-moz-platform: macos) {
     font-size: 1.5em !important;
diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index 4866d12a5..8103a1779 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -41,8 +41,15 @@ function parseSinePath(pathStr) {
   return points;
 }
 
-const MAX_OPACITY = AppConstants.platform === 'macosx' ? 0.8 : 0.9;
-const MIN_OPACITY = AppConstants.platform === 'macosx' ? 0.15 : 0.35;
+const lazy = {};
+
+ChromeUtils.defineLazyGetter(lazy, 'MAX_OPACITY', () => {
+  return parseFloat(document.getElementById('PanelUI-zen-gradient-generator-opacity').max);
+});
+
+ChromeUtils.defineLazyGetter(lazy, 'MIN_OPACITY', () => {
+  return parseFloat(document.getElementById('PanelUI-zen-gradient-generator-opacity').min);
+});
 
 const EXPLICIT_LIGHTNESS_TYPE = 'explicit-lightness';
 const EXPLICIT_BLACKWHITE_TYPE = 'explicit-black-white';
@@ -440,7 +447,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
     const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
     const rect = gradient.getBoundingClientRect();
     const padding = 30; // each side
-    const dotHalfSize = 38 / 2; // half the size of the dot
+    const dotHalfSize = 29; // half the size of the dot. -11 for correct centering
     x += dotHalfSize;
     y += dotHalfSize;
     rect.width += padding * 2; // Adjust width and height for padding
@@ -1095,15 +1102,14 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
       colorToBlendOpacity = 0.35;
     } else if (AppConstants.platform === 'macosx') {
       colorToBlend = [255, 255, 255];
-      colorToBlendOpacity = 0.3;
+      colorToBlendOpacity = 0.35;
     }
     if (colorToBlend) {
       const blendedAlpha = Math.min(
         1,
-        opacity + MIN_OPACITY + colorToBlendOpacity * (1 - (opacity + MIN_OPACITY))
+        opacity + lazy.MIN_OPACITY + colorToBlendOpacity * (1 - (opacity + lazy.MIN_OPACITY))
       );
       baseColor = this.blendColors(baseColor, colorToBlend, blendedAlpha * 100);
-      opacity += colorToBlendOpacity * (1 - opacity);
     }
     return `rgba(${baseColor[0]}, ${baseColor[1]}, ${baseColor[2]}, ${opacity})`;
   }
@@ -1386,13 +1392,13 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
         const [_, secondStop, thirdStop] = document.querySelectorAll(
           '#PanelUI-zen-gradient-generator-slider-wave-gradient stop'
         );
-        // Opacity can only be between MIN_OPACITY to MAX_OPACITY. Make opacity relative to that range
-        if (opacity < MIN_OPACITY) {
+        // Opacity can only be between lazy.MIN_OPACITY to lazy.MAX_OPACITY. Make opacity relative to that range
+        if (opacity < lazy.MIN_OPACITY) {
           opacity = 0;
-        } else if (opacity > MAX_OPACITY) {
+        } else if (opacity > lazy.MAX_OPACITY) {
           opacity = 1;
         } else {
-          opacity = (opacity - MIN_OPACITY) / (MAX_OPACITY - MIN_OPACITY);
+          opacity = (opacity - lazy.MIN_OPACITY) / (lazy.MAX_OPACITY - lazy.MIN_OPACITY);
         }
         if (isDefaultTheme) {
           opacity = 1; // If it's the default theme, we want the wave to be

From bcf4c4d1a3b7e230f2d0f25f7e3a5b4b8ea0679d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 10 Dec 2025 18:12:17 +0100
Subject: [PATCH 153/162] feat: Revert not modifying the opacity for windows
 and linux, b=no-bug, c=workspaces

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

diff --git a/src/zen/workspaces/ZenGradientGenerator.mjs b/src/zen/workspaces/ZenGradientGenerator.mjs
index 8103a1779..5ece76491 100644
--- a/src/zen/workspaces/ZenGradientGenerator.mjs
+++ b/src/zen/workspaces/ZenGradientGenerator.mjs
@@ -1110,6 +1110,9 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
         opacity + lazy.MIN_OPACITY + colorToBlendOpacity * (1 - (opacity + lazy.MIN_OPACITY))
       );
       baseColor = this.blendColors(baseColor, colorToBlend, blendedAlpha * 100);
+      if (AppConstants.platform !== 'macosx') {
+        opacity += colorToBlendOpacity * (1 - opacity);
+      }
     }
     return `rgba(${baseColor[0]}, ${baseColor[1]}, ${baseColor[2]}, ${opacity})`;
   }

From 0c0c982bc256c2c36c575fb955e43c5a9659e2b0 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Thu, 11 Dec 2025 13:26:28 +0100
Subject: [PATCH 154/162] =?UTF-8?q?chore:=20Implement=20settings=20dump=20?=
 =?UTF-8?q?schema=20to=20update=20firefox=20remote=20servic=E2=80=A6,=20p?=
 =?UTF-8?q?=3D#11579?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Implement settings dump schema to update firefox remote services data, b=no-bug, c=configs, scripts

* feat: Also update with timestamps, b=no-bug, c=configs, scripts

* chore: Move JSON with comments to a new module, b=no-bug, c=scripts, tests

---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
---
 configs/dumps/search-config-v2.json | 20 +++++++++
 package.json                        |  3 +-
 prefs/firefox/ai.yaml               |  3 ++
 scripts/json_with_comments.py       | 14 +++++++
 scripts/run_tests.py                | 10 +----
 scripts/update_service_dumps.py     | 63 +++++++++++++++++++++++++++++
 6 files changed, 103 insertions(+), 10 deletions(-)
 create mode 100644 configs/dumps/search-config-v2.json
 create mode 100644 scripts/json_with_comments.py
 create mode 100644 scripts/update_service_dumps.py

diff --git a/configs/dumps/search-config-v2.json b/configs/dumps/search-config-v2.json
new file mode 100644
index 000000000..2596da9ac
--- /dev/null
+++ b/configs/dumps/search-config-v2.json
@@ -0,0 +1,20 @@
+// 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/.
+{
+  "remove": {
+    "identifiers": [
+      // Firefox adds Perplexity by default, we don't want it as
+      // its not very privacy focused.
+      "perplexity",
+
+      // These are not search engines, Firefox adds them by default
+      // but we don't want them.
+      "wikipedia",
+      "wikipedia-*",
+      "ebay",
+      "ebay-*"
+    ]
+  },
+  "timestamp": 1765455207275
+}
diff --git a/package.json b/package.json
index 355f9be11..963e0b0b2 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "build": "surfer build",
     "build:ui": "surfer build --ui",
     "start": "cd engine && python3 ./mach run --noprofile",
-    "import": "npm run ffprefs && surfer import",
+    "import": "npm run ffprefs && npm run import:dumps && surfer import",
+    "import:dumps": "python3 scripts/update_service_dumps.py",
     "export": "surfer export",
     "init": "npm run download && npm run import && npm run bootstrap",
     "download": "surfer download",
diff --git a/prefs/firefox/ai.yaml b/prefs/firefox/ai.yaml
index e54bb0d38..a89b6a439 100644
--- a/prefs/firefox/ai.yaml
+++ b/prefs/firefox/ai.yaml
@@ -20,3 +20,6 @@
 
 - name: browser.ml.chat.menu
   value: false
+
+- name: browser.ml.linkPreview.enabled
+  value: false
diff --git a/scripts/json_with_comments.py b/scripts/json_with_comments.py
new file mode 100644
index 000000000..18eab24fc
--- /dev/null
+++ b/scripts/json_with_comments.py
@@ -0,0 +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/.
+
+import json
+
+
+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)
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index 90a7995a8..5fdbd6d53 100644
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -7,6 +7,7 @@ import sys
 import json
 from pathlib import Path
 from typing import Any
+from json_with_comments import JSONWithCommentsDecoder
 
 IGNORE_PREFS_FILE_IN = os.path.join(
     'src', 'zen', 'tests', 'ignorePrefs.json'
@@ -16,15 +17,6 @@ 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
diff --git a/scripts/update_service_dumps.py b/scripts/update_service_dumps.py
new file mode 100644
index 000000000..63ef85c34
--- /dev/null
+++ b/scripts/update_service_dumps.py
@@ -0,0 +1,63 @@
+# 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/.
+
+import os
+import json
+from json_with_comments import JSONWithCommentsDecoder
+
+DUMPS_FOLDER = os.path.join(
+    'configs', 'dumps'
+)
+ENGINE_DUMPS_FOLDER = os.path.join(
+    'engine', 'services', 'settings', 'dumps', 'main'
+)
+
+
+def merge_dumps(original, updates):
+  """Filters entries from the original dump, removing those whose identifiers are specified in the updates removal list."""
+  remove_ids = updates.get('remove', {"identifiers": []}).get('identifiers', [])
+
+  # Filter out entries in original that are in remove_ids.
+  #  We may find example-* patterns, so we need to handle that as well.
+  merged_data = [
+      entry for entry in original.get('data', [])
+      if not any(
+          entry.get('identifier', '') == rid or
+          (rid.endswith('*') and entry.get('identifier', '').startswith(rid[:-1]))
+          for rid in remove_ids
+      )
+  ]
+
+  return {
+      'data': merged_data,
+      **{k: v for k, v in original.items() if k != 'data'},
+      'timestamp': updates.get('timestamp', original.get('timestamp'))
+  }
+
+
+def main():
+  for filename in os.listdir(DUMPS_FOLDER):
+    if filename.endswith('.json'):
+      #  parse json with comments
+      with open(os.path.join(DUMPS_FOLDER, filename), 'r') as f:
+        data = json.load(f, cls=JSONWithCommentsDecoder)
+      original_path = os.path.join(ENGINE_DUMPS_FOLDER, filename)
+      if os.path.exists(original_path):
+        with open(original_path, 'r', encoding='utf-8') as f:
+          original_content = f.read()
+          original_content = '\n'.join(
+              line for line in original_content.split('\n') if not line.lstrip(' ').startswith('//')
+          )
+          original_data = json.loads(original_content)
+        merged_data = merge_dumps(original_data, data)
+        with open(original_path, 'w', encoding='utf-8') as f:
+          json.dump(merged_data, f, indent=2, ensure_ascii=False)
+        print(f"Updated dump: {filename}")
+      else:
+        print(f"Original dump file not found: {original_path}")
+        exit(1)
+
+
+if __name__ == "__main__":
+  main()

From a6dd6ab98448ff50f874b346a31a25ffbeea7c44 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 11 Dec 2025 13:31:44 +0100
Subject: [PATCH 155/162] fix: Move 'Any' import to the JSON with comments
 module, b=no-bug, c=scripts, tests

---
 scripts/json_with_comments.py | 2 +-
 scripts/run_tests.py          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/json_with_comments.py b/scripts/json_with_comments.py
index 18eab24fc..2defb73ca 100644
--- a/scripts/json_with_comments.py
+++ b/scripts/json_with_comments.py
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import json
-
+from typing import Any
 
 class JSONWithCommentsDecoder(json.JSONDecoder):
   def __init__(self, **kw):
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index 5fdbd6d53..2e0fb516f 100644
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -6,7 +6,6 @@ import os
 import sys
 import json
 from pathlib import Path
-from typing import Any
 from json_with_comments import JSONWithCommentsDecoder
 
 IGNORE_PREFS_FILE_IN = os.path.join(

From 6a218d109a7ce4187542a5f06bf7e3e4ff5b8f80 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 11 Dec 2025 13:35:17 +0100
Subject: [PATCH 156/162] feat: Use github runners instead of blacksmith for
 less intensive tasks, b=no-bug, c=workflows

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1ded9dfe..46dbbffc2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -190,7 +190,7 @@ jobs:
     name: Lint
 
   check-release:
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     needs: [build-data, lint]
     steps:
       - name: Checkout repository
@@ -231,7 +231,7 @@ jobs:
   source:
     permissions:
       contents: write
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     needs: [build-data, check-release]
 
     steps:

From f1c6c1b321eb6beb14e07ef3f581184a084ba9b6 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 12 Dec 2025 19:54:15 +0100
Subject: [PATCH 157/162] fix: Fixed missing space between update and media
 player, b=closes #11592, c=scripts, common, tabs, workspaces

---
 scripts/json_with_comments.py                 |  1 +
 .../common/styles/zen-single-components.css   |  1 +
 src/zen/tabs/zen-tabs/vertical-tabs.css       |  1 -
 src/zen/workspaces/ZenWorkspaces.mjs          |  6 +--
 src/zen/workspaces/overflow-icons.inc.css     | 47 +++++++++++--------
 src/zen/workspaces/zen-workspaces.css         |  4 +-
 6 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/scripts/json_with_comments.py b/scripts/json_with_comments.py
index 2defb73ca..8fc15be80 100644
--- a/scripts/json_with_comments.py
+++ b/scripts/json_with_comments.py
@@ -5,6 +5,7 @@
 import json
 from typing import Any
 
+
 class JSONWithCommentsDecoder(json.JSONDecoder):
   def __init__(self, **kw):
     super().__init__(**kw)
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index c6bb366a0..4a05e4bd6 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -261,6 +261,7 @@ body > #confetti {
 }
 
 #TabsToolbar {
+  gap: var(--zen-toolbox-padding);
   -moz-window-dragging: unset;
 }
 
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index c5ff1cd70..5414b54db 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -439,7 +439,6 @@
   background: transparent;
   gap: 5px;
   align-items: center;
-  padding-top: var(--zen-element-separation);
 
   & > toolbarbutton:not(#zen-workspaces-button) {
     padding: 0 !important;
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 0816696b6..5d87a17c4 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -3140,7 +3140,7 @@ class nsZenWorkspaces extends nsZenMultiWindowFeature {
       return;
     }
     const maxButtonSize = 32; // IMPORTANT: This should match the CSS size of the icons
-    const minButtonSize = 15;
+    const minButtonSize = maxButtonSize / 2; // Minimum size for icons when space is limited
     const separation = 3; // Space between icons
 
     // Calculate the total width needed for all icons
@@ -3160,9 +3160,7 @@ class nsZenWorkspaces extends nsZenMultiWindowFeature {
 
     // Set the width of each icon to the maximum size they can fit on
     const widthPerButton = Math.max(
-      Math.floor(
-        (parent.clientWidth - separation * (parent.children.length - 1)) / parent.children.length
-      ),
+      (parent.clientWidth - separation * (parent.children.length - 1)) / parent.children.length,
       minButtonSize
     );
     for (const icon of parent.children) {
diff --git a/src/zen/workspaces/overflow-icons.inc.css b/src/zen/workspaces/overflow-icons.inc.css
index 3bd66a6b5..e1caf4dd9 100644
--- a/src/zen/workspaces/overflow-icons.inc.css
+++ b/src/zen/workspaces/overflow-icons.inc.css
@@ -4,31 +4,40 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+&::after {
+  content: '';
+  position: absolute;
+  width: 4px;
+  border-radius: 99px;
+  height: 4px;
+  background: color-mix(
+    in srgb,
+    var(--zen-primary-color) 10%,
+    light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4)) 90%
+  );
+  left: 50%;
+  top: 50%;
+  filter: saturate(140%) brightness(110%) !important;
+  transform: translate(-50%, -50%);
+  transition: opacity 150ms ease-in-out;
+  opacity: 0;
+}
+
+& .zen-workspace-icon {
+  transition: opacity 150ms ease-in-out, transform 150ms ease-in-out;
+  z-index: 2;
+  transform-origin: center;
+}
+
 &:not(:hover) {
   min-width: 10px;
 
   &::after {
-    content: '';
-    position: absolute;
-    width: 4px;
-    border-radius: 99px;
-    height: 4px;
-    background: color-mix(
-      in srgb,
-      var(--zen-primary-color) 10%,
-      light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4)) 90%
-    );
-    left: 50%;
-    top: 50%;
-    filter: saturate(140%) brightness(110%) !important;
-    transform: translate(-50%, -50%);
+    opacity: 1;
   }
 
   & .zen-workspace-icon {
-    display: none;
+    opacity: 0;
+    transform: scale(0);
   }
 }
-
-&:hover {
-  width: 20px !important;
-}
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index 674a9cd44..71e29815f 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -94,7 +94,7 @@
 
   &[icons-overflow] {
     gap: 0 !important;
-    justify-content: space-between;
+    justify-content: center;
 
     & toolbarbutton {
       margin: 0;
@@ -108,7 +108,7 @@
     }
 
     &:has(toolbarbutton:hover) toolbarbutton[active='true']:not([dragged='true']) {
-%include overflow-icons.inc.css 
+%include overflow-icons.inc.css
     }
   }
 }

From bdfb8102128c48696fefeb0b38b88a01fe1e85bb Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 13 Dec 2025 21:15:37 +0100
Subject: [PATCH 158/162] fix: Dont use a new timestamp when changing config
 dumps, b=closes #11601, c=configs

---
 configs/dumps/search-config-v2.json | 3 +--
 surfer.json                         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configs/dumps/search-config-v2.json b/configs/dumps/search-config-v2.json
index 2596da9ac..15ab7a6d4 100644
--- a/configs/dumps/search-config-v2.json
+++ b/configs/dumps/search-config-v2.json
@@ -15,6 +15,5 @@
       "ebay",
       "ebay-*"
     ]
-  },
-  "timestamp": 1765455207275
+  }
 }
diff --git a/surfer.json b/surfer.json
index 0772744ce..059c43263 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.17.13b",
+        "displayVersion": "1.17.14b",
         "github": {
           "repo": "zen-browser/desktop"
         },

From fb9bbc3a5118c4969d10c9e66f021c5d2ae32db2 Mon Sep 17 00:00:00 2001
From: salmonumbrella <182032677+salmonumbrella@users.noreply.github.com>
Date: Sat, 13 Dec 2025 16:08:13 -0800
Subject: [PATCH 159/162] feat(downloads): add pref to control download popup
 position independently, p=#11607

* feat(downloads): add pref to control download popup position independently

Add `zen.downloads.icon-popup-position` preference that allows users to
control the download popup/indicator position independently from the
vertical tabs position.

Valid values:
- "follow-tabs" (default): popup appears on same side as vertical tabs
- "left": popup always appears on the left
- "right": popup always appears on the right

This is useful for users who have vertical tabs on the right but prefer
the download indicator to appear on the left side of the screen.

* feat: Convert pref to integers, b=no-bug, c=no-component

---------

Co-authored-by: salmonumbrella <salmonumbrella@users.noreply.github.com>
Co-authored-by: mr. m <mr.m@tuta.com>
---
 prefs/zen/downloads.yaml                   | 6 ++++++
 src/zen/downloads/ZenDownloadAnimation.mjs | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/prefs/zen/downloads.yaml b/prefs/zen/downloads.yaml
index 94a507fb6..c0326efcd 100644
--- a/prefs/zen/downloads.yaml
+++ b/prefs/zen/downloads.yaml
@@ -7,3 +7,9 @@
 
 - name: zen.downloads.download-animation-duration
   value: 1000 # ms
+
+- name: zen.downloads.icon-popup-position
+  # 0: Follow tab's position
+  # 1: Left side always
+  # 2: Right side always
+  value: 0
diff --git a/src/zen/downloads/ZenDownloadAnimation.mjs b/src/zen/downloads/ZenDownloadAnimation.mjs
index f205d80b8..5001f636d 100644
--- a/src/zen/downloads/ZenDownloadAnimation.mjs
+++ b/src/zen/downloads/ZenDownloadAnimation.mjs
@@ -131,6 +131,9 @@ class nsZenDownloadAnimationElement extends HTMLElement {
   }
 
   #areTabsOnRightSide() {
+    const position = Services.prefs.getIntPref('zen.downloads.icon-popup-position', 0);
+    if (position === 1) return false;
+    if (position === 2) return true;
     return Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
   }
 

From e73ea97ea0cc8f17ff3a7be3e069f6cd2df142ea Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 14 Dec 2025 01:47:54 +0100
Subject: [PATCH 160/162] fix: Fixed zen not starting up on macos, b=closes
 #11599, c=no-component

---
 prefs/firefox/performance.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/prefs/firefox/performance.yaml b/prefs/firefox/performance.yaml
index 5b4455ee5..fcc1d294f 100644
--- a/prefs/firefox/performance.yaml
+++ b/prefs/firefox/performance.yaml
@@ -8,3 +8,12 @@
 
 - name: network.predictor.enable-hover-on-ssl
   value: true
+
+# See https://github.com/zen-browser/desktop/issues/11599, this pref seems to
+# have disabled itself on macos for some unknown reason.
+# Make sure its in sync with:
+# https://searchfox.org/firefox-main/rev/1477feb9706f4ccc5bd571c1c215832a6fbb7464/modules/libpref/init/StaticPrefList.yaml#7741-7748
+- name: gfx.webrender.compositor
+  condition: 'defined(XP_WIN) || defined(XP_DARWIN)'
+  value: '@cond'
+  mirror: once

From e3d13d534eb890fb04afcd27a873fa7e0bdc44c5 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 14 Dec 2025 18:21:28 +0100
Subject: [PATCH 161/162] chore: Stick closer to firefox default preferences,
 p=#11611, c=no-component

---
 prefs/firefox/browser.yaml | 18 ------------------
 prefs/firefox/urlbar.yaml  |  1 -
 2 files changed, 19 deletions(-)

diff --git a/prefs/firefox/browser.yaml b/prefs/firefox/browser.yaml
index 7c8c8dfcd..924755134 100644
--- a/prefs/firefox/browser.yaml
+++ b/prefs/firefox/browser.yaml
@@ -8,9 +8,6 @@
 - name: browser.sessionstore.restore_pinned_tabs_on_demand
   value: true
 
-- name: browser.tabs.loadBookmarksInTabs
-  value: false
-
 - name: browser.tabs.hoverPreview.enabled
   value: false
 
@@ -23,18 +20,6 @@
 - name: browser.toolbars.bookmarks.visibility
   value: 'never'
 
-- name: browser.bookmarks.openInTabClosesMenu
-  value: false
-
-- name: browser.menu.showViewImageInfo
-  value: true
-
-- name: findbar.highlightAll
-  value: true
-
-- name: layout.word_select.eat_space_to_next_word
-  value: false
-
 - name: widget.non-native-theme.scrollbar.style
   value: 2
 
@@ -58,9 +43,6 @@
 - name: browser.download.manager.addToRecentDocs
   value: false
 
-- name: browser.download.open_pdf_attachments_inline
-  value: true
-
 - name: browser.download.alwaysOpenPanel
   value: false
 
diff --git a/prefs/firefox/urlbar.yaml b/prefs/firefox/urlbar.yaml
index 76eb974a6..742163a60 100644
--- a/prefs/firefox/urlbar.yaml
+++ b/prefs/firefox/urlbar.yaml
@@ -26,7 +26,6 @@
   value: true
   locked: true
 
-# Enable private suggestions
 - name: browser.search.suggest.enabled
   value: false
 

From e525b32c18dddfcff7207c98c3957869303b03b2 Mon Sep 17 00:00:00 2001
From: Blake Gearin <hello@blakeg.me>
Date: Mon, 15 Dec 2025 03:19:03 -0700
Subject: [PATCH 162/162] feat: Enable original extensions panel on
 hide-unified-extensions-button: false, p=#11335

* feat: Enable original extensions panel on hide-unified-extensions-button: false

* Update to fix prettier issues

* Add site-data attribute for CSS usage

* Update to set gUnifiedExtensions._panel

* Update to fix prettier issues

* Set default panel on onToolbarVisibilityChange

* Update panel initialization

* Remove extra char

* Restore unified-extensions-panel-template deletion

* Reduce reimplementation

* Update patch against Firefox 145.0.2

* Fix conflict

* Add panelUIPosition case

* Fix lint

* feat: Improve and reduce patch sizes, b=no-bug, c=common

---------

Signed-off-by: Blake Gearin <hello@blakeg.me>
Co-authored-by: mr. m <mr.m@tuta.com>
---
 .../base/content/browser-addons-js.patch      | 142 +++++++++++++++---
 .../base/content/navigator-toolbox-js.patch   |  27 ++--
 .../base/content/zen-panels/site-data.inc     |   6 +-
 src/zen/common/modules/ZenUIManager.mjs       |   4 +-
 .../common/styles/zen-single-components.css   |  12 +-
 src/zen/urlbar/ZenSiteDataPanel.sys.mjs       |  58 ++++++-
 6 files changed, 198 insertions(+), 51 deletions(-)

diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch
index 63afb40df..6e89d9b92 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 fadcbfca95ee28140579430c0371baad0e2f216a..7454b801b4ad892d6ad122277eb7c7736e976f9f 100644
+index fadcbfca95ee28140579430c0371baad0e2f216a..22a92ca450ef5087610169b15d7f3344c9accddf 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
 @@ -1069,7 +1069,7 @@ var gXPInstallObserver = {
@@ -38,37 +38,131 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..7454b801b4ad892d6ad122277eb7c773
      }
  
      return anchorID;
-@@ -2657,11 +2657,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"
+@@ -2547,7 +2547,7 @@ var gUnifiedExtensions = {
+     requestAnimationFrame(() => this.updateAttention());
+   },
+ 
+-  onToolbarVisibilityChange(toolbarId, isVisible) {
++  onToolbarVisibilityChange(toolbarId, isVisible, panel = this.panel) {
+     // A list of extension widget IDs (possibly empty).
+     let widgetIDs;
+ 
+@@ -2561,7 +2561,7 @@ var gUnifiedExtensions = {
+     }
+ 
+     // The list of overflowed extensions in the extensions panel.
+-    const overflowedExtensionsList = this.panel.querySelector(
++    const overflowedExtensionsList = panel.querySelector(
+       "#overflowed-extensions-list"
+     );
+ 
+@@ -2662,37 +2662,41 @@ var gUnifiedExtensions = {
        );
-@@ -2714,6 +2710,7 @@ var gUnifiedExtensions = {
-         // and no alternative content is available for display in the panel.
-         const policies = this.getActivePolicies();
+       template.replaceWith(template.content);
+       this._panel = document.getElementById("unified-extensions-panel");
+-      let customizationArea = this._panel.querySelector(
+-        "#unified-extensions-area"
+-      );
+-      CustomizableUI.registerPanelNode(
+-        customizationArea,
+-        CustomizableUI.AREA_ADDONS
+-      );
+-      CustomizableUI.addPanelCloseListeners(this._panel);
+-
+-      this._panel
+-        .querySelector("#unified-extensions-manage-extensions")
+-        .addEventListener("command", () => {
+-          BrowserAddonUI.openAddonsMgr("addons://list/extension");
+-        });
+-
+-      // Lazy-load the l10n strings. Those strings are used for the CUI and
+-      // non-CUI extensions in the unified extensions panel.
+-      document
+-        .getElementById("unified-extensions-context-menu")
+-        .querySelectorAll("[data-lazy-l10n-id]")
+-        .forEach(el => {
+-          el.setAttribute("data-l10n-id", el.getAttribute("data-lazy-l10n-id"));
+-          el.removeAttribute("data-lazy-l10n-id");
+-        });
++      this.initializePanel(this._panel);
+     }
+     return this._panel;
+   },
+ 
++  initializePanel(panel) {
++    let customizationArea = panel.querySelector(
++      "#unified-extensions-area"
++    );
++    CustomizableUI.registerPanelNode(
++      customizationArea,
++      CustomizableUI.AREA_ADDONS
++    );
++    CustomizableUI.addPanelCloseListeners(panel);
++
++    panel
++      .querySelector("#unified-extensions-manage-extensions")
++      .addEventListener("command", () => {
++        BrowserAddonUI.openAddonsMgr("addons://list/extension");
++      });
++
++    // Lazy-load the l10n strings. Those strings are used for the CUI and
++    // non-CUI extensions in the unified extensions panel.
++    document
++      .getElementById("unified-extensions-context-menu")
++      .querySelectorAll("[data-lazy-l10n-id]")
++      .forEach(el => {
++        el.setAttribute("data-l10n-id", el.getAttribute("data-lazy-l10n-id"));
++        el.removeAttribute("data-lazy-l10n-id");
++      });
++  },
++
+   // `aEvent` and `reason` are optional. If `reason` is specified, it should be
+   // a valid argument to gUnifiedExtensions.recordButtonTelemetry().
+-  async togglePanel(aEvent, reason) {
++  async togglePanel(aEvent, reason, panel = this._panel, view = "unified-extensions-view", button = this._button) {
+     if (!CustomizationHandler.isCustomizing()) {
+       if (aEvent) {
          if (
-+          false &&
-           policies.length &&
-           !this.hasExtensionsInPanel(policies) &&
-           !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
-@@ -2754,7 +2751,7 @@ var gUnifiedExtensions = {
+@@ -2729,32 +2733,30 @@ var gUnifiedExtensions = {
+       this.blocklistAttentionInfo =
+         await AddonManager.getBlocklistAttentionInfo();
+ 
+-      let panel = this.panel;
+-
+       if (!this._listView) {
+         this._listView = PanelMultiView.getViewNode(
+           document,
+-          "unified-extensions-view"
++          view,
+         );
+         this._listView.addEventListener("ViewShowing", this);
+         this._listView.addEventListener("ViewHiding", this);
+       }
+ 
+-      if (this._button.open) {
++      if (button.open) {
+         PanelMultiView.hidePopup(panel);
+-        this._button.open = false;
++        button.open = false;
+       } else {
+         // Overflow extensions placed in collapsed toolbars, if any.
+         for (const toolbarId of CustomizableUI.getCollapsedToolbarIds(window)) {
+           // We pass `false` because all these toolbars are collapsed.
+-          this.onToolbarVisibilityChange(toolbarId, /* isVisible */ false);
++          this.onToolbarVisibilityChange(toolbarId, /* isVisible */ false, panel);
+         }
+ 
+         panel.hidden = false;
          this.recordButtonTelemetry(reason || "extensions_panel_showing");
          this.ensureButtonShownBeforeAttachingPanel(panel);
-         PanelMultiView.openPopup(panel, this._button, {
+-        PanelMultiView.openPopup(panel, this._button, {
 -          position: "bottomright topright",
-+          position: gZenUIManager.panelUIPosition(panel, this._button),
++        PanelMultiView.openPopup(panel, button, {
++          position: gZenUIManager.panelUIPosition(panel, button),
            triggerEvent: aEvent,
          });
        }
-@@ -2941,18 +2938,20 @@ var gUnifiedExtensions = {
+@@ -2941,18 +2943,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index 9dc57d082..19790013b 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 7b776b15d52367a008ce6bf53dcfcbbe007b7453..d9a3404905b73db7c8f202ab166d5f3c625351f6 100644
+index 7b776b15d52367a008ce6bf53dcfcbbe007b7453..da23f716c753f5a43f17bb5ed7a3d335891168c2 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -6,7 +6,7 @@
@@ -27,21 +27,28 @@ index 7b776b15d52367a008ce6bf53dcfcbbe007b7453..d9a3404905b73db7c8f202ab166d5f3c
            gBrowser.handleNewTabMiddleClick(element, event);
            break;
  
-@@ -315,7 +317,7 @@ document.addEventListener(
-         #pageActionButton,
+@@ -316,6 +318,7 @@ document.addEventListener(
          #downloads-button,
          #fxa-toolbar-menu-button,
--        #unified-extensions-button,
+         #unified-extensions-button,
 +        #zen-site-data-icon-button,
          #library-button
        `);
        if (!element) {
-@@ -394,7 +396,7 @@ document.addEventListener(
-           gSync.toggleAccountPanel(element, event);
-           break;
- 
--        case "unified-extensions-button":
-+        case "zen-site-data-icon-button":
+@@ -398,6 +401,16 @@ document.addEventListener(
            gUnifiedExtensions.togglePanel(event);
            break;
  
++        case "zen-site-data-icon-button":
++          gUnifiedExtensions.togglePanel(
++            event,
++            null,
++            window.gZenSiteDataPanel.unifiedPanel,
++            window.gZenSiteDataPanel.unifiedPanelView,
++            window.gZenSiteDataPanel.anchor,
++          );
++          break;
++
+         case "library-button":
+           PanelUI.showSubView("appMenu-libraryView", element, event);
+           break;
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index e149df52e..4929a1645 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -32,7 +32,7 @@
                         command="Browser:AddBookmarkAs"
                         flex="1" />
       </hbox>
-      <vbox class="zen-site-data-section">
+      <vbox id="zen-site-data-section-addons" 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" />
@@ -72,7 +72,7 @@
 # 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" 
+                        data-l10n-id="unified-extensions-manage-extensions"
                         hidden="true" />
       </vbox>
       <vbox class="zen-site-data-section">
@@ -85,7 +85,7 @@
         </vbox>
       </vbox>
       <hbox id="zen-site-data-footer">
-        <toolbarbutton id="zen-site-data-security-info" 
+        <toolbarbutton id="zen-site-data-security-info"
                        class="subviewbutton zen-interactive-button" />
         <toolbarbutton id="zen-site-data-actions"
                        class="subviewbutton zen-interactive-button"
diff --git a/src/zen/common/modules/ZenUIManager.mjs b/src/zen/common/modules/ZenUIManager.mjs
index e16fc982f..36c559a12 100644
--- a/src/zen/common/modules/ZenUIManager.mjs
+++ b/src/zen/common/modules/ZenUIManager.mjs
@@ -669,7 +669,9 @@ window.gZenUIManager = {
     }
     if (
       (gZenVerticalTabsManager._hasSetSingleToolbar && gZenVerticalTabsManager._prefsRightSide) ||
-      (panel?.id === 'zen-unified-site-data-panel' && !gZenVerticalTabsManager._hasSetSingleToolbar)
+      (panel?.id === 'zen-unified-site-data-panel' &&
+        !gZenVerticalTabsManager._hasSetSingleToolbar) ||
+      (panel?.id === 'unified-extensions-panel' && gZenVerticalTabsManager._hasSetSingleToolbar)
     ) {
       block = 'bottomright';
       inline = 'topright';
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 4a05e4bd6..0c319269b 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -495,20 +495,22 @@ body > #confetti {
 }
 
 @media -moz-pref('zen.theme.hide-unified-extensions-button') {
-  #unified-extensions-button {
+  #unified-extensions-button:not([showing]) {
     display: none !important;
   }
 }
 
-#unified-extensions-button:not([showing]) {
-  display: none !important;
+@media not -moz-pref('zen.theme.hide-unified-extensions-button') {
+  #zen-site-data-section-addons {
+    display: none;
+  }
 }
 
 #zen-site-data-header {
   gap: 8px;
   align-items: center;
   padding: 10px 9px;
-  padding-bottom: 0;
+  padding-bottom: 8px;
 
   :root[zen-single-toolbar='true']:not([zen-right-side='true']) & {
     flex-direction: row-reverse;
@@ -520,7 +522,7 @@ body > #confetti {
     -moz-context-properties: fill;
     fill: currentColor;
     color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
-    max-width: 48px;
+    width: 48px;
     height: 32px;
     position: relative;
 
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 48b94bace..e6869da6a 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -4,6 +4,11 @@
 
 import { AppConstants } from 'resource://gre/modules/AppConstants.sys.mjs';
 
+const ADDONS_BUTTONS_HIDDEN = Services.prefs.getBoolPref(
+  'zen.theme.hide-unified-extensions-button',
+  true
+);
+
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
@@ -21,7 +26,19 @@ export class nsZenSiteDataPanel {
     this.window = window;
     this.document = window.document;
 
-    this.panel = this.document.getElementById('zen-unified-site-data-panel');
+    this.unifiedPanel = this.#initUnifiedPanel();
+    this.unifiedPanelView = 'unified-extensions-view';
+    this.extensionsPanelView = 'original-unified-extensions-view';
+
+    if (ADDONS_BUTTONS_HIDDEN) {
+      this.window.gUnifiedExtensions._panel = this.unifiedPanel;
+
+      // Remove the old permissions dialog
+      this.document.getElementById('unified-extensions-panel-template').remove();
+    } else {
+      this.extensionsPanel = this.#initExtensionsPanel();
+    }
+
     this.#init();
   }
 
@@ -34,22 +51,23 @@ export class nsZenSiteDataPanel {
     `);
     this.anchor = button.querySelector('#zen-site-data-icon-button');
     this.document.getElementById('identity-icon-box').before(button);
-    this.window.gUnifiedExtensions._button = this.anchor;
+
+    this.extensionsPanelButton = this.document.getElementById('unified-extensions-button');
+    this.window.gUnifiedExtensions._button = ADDONS_BUTTONS_HIDDEN
+      ? this.anchor
+      : this.extensionsPanelButton;
 
     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.#initCopyUrlButton();
     this.#initEventListeners();
     this.#maybeShowFeatureCallout();
   }
 
   #initEventListeners() {
-    this.panel.addEventListener('popupshowing', this);
+    this.unifiedPanel.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);
     this.anchor.addEventListener('click', this);
@@ -124,6 +142,24 @@ export class nsZenSiteDataPanel {
     }
   }
 
+  #initExtensionsPanel() {
+    const panel = this.window.gUnifiedExtensions.panel;
+
+    const extensionsView = panel?.querySelector('#unified-extensions-view');
+    extensionsView.setAttribute('id', this.extensionsPanelView);
+
+    const panelMultiView = panel?.querySelector('panelmultiview');
+    panelMultiView.setAttribute('mainViewId', this.extensionsPanelView);
+
+    return panel;
+  }
+
+  #initUnifiedPanel() {
+    const panel = this.document.getElementById('zen-unified-site-data-panel');
+    this.window.gUnifiedExtensions.initializePanel(panel);
+    return panel;
+  }
+
   #preparePanel() {
     this.#setSitePermissions();
     this.#setSiteSecurityInfo();
@@ -498,7 +534,7 @@ export class nsZenSiteDataPanel {
           this.window.gZenCommonActions.copyCurrentURLToClipboard();
         }
         if (AppConstants.platform !== 'macosx') {
-          this.panel.hidePopup();
+          this.unifiedPanel.hidePopup();
         }
       }
     }
@@ -556,7 +592,13 @@ export class nsZenSiteDataPanel {
         break;
       }
       case 'zen-site-data-icon-button': {
-        this.window.gUnifiedExtensions.togglePanel(event);
+        this.window.gUnifiedExtensions.togglePanel(
+          event,
+          null,
+          this.unifiedPanel,
+          this.unifiedPanelView,
+          this.anchor
+        );
         break;
       }
       default: {