Merge remote-tracking branch 'origin/dev' into little-zen

# Conflicts:
#	src/zen/kbs/ZenKeyboardShortcuts.sys.mjs

Co-authored-by: mr-cheffy <91018726+mr-cheffy@users.noreply.github.com>

.github/workflows/src/generate_release_notes.sh

@@ -35,7 +35,7 @@ fi
     if echo "$LATEST_RELEASE" | jq -e '.security != null and .security != ""' > /dev/null; then
       echo
       echo "## Security"
-      echo "$LATEST_RELEASE" | jq -r 'if (.security | type) == "string" then "- " + .security else .security[] | "- " + . end'
+      echo "[Various security fixes]($(echo "$LATEST_RELEASE" | jq -r '.security'))"
     fi
 
     if echo "$LATEST_RELEASE" | jq -e '(.features // []) | length > 0' > /dev/null; then

.github/workflows/sync-upstream.yml

@@ -129,7 +129,7 @@ jobs:
           token: ${{ secrets.DEPLOY_KEY }}
           commit-message: "chore: Sync upstream to `Firefox ${{ steps.build-data.outputs.version }}`"
           branch: "chore/upstream-sync"
-          title: "no-bug: Sync upstream Firefox to version ${{ 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 }}.
 

.gitignore

@@ -34,4 +34,3 @@ build/signing/cert.pem
 build/signing/private_key.pem
 build/signing/private_key.p12
 
-bloat-dump.log

README.md

@@ -34,12 +34,12 @@ 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 `151.0.1`! 🚀
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.2`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 151.0.1`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.2`!
 
 ### Contributing
 
-If you'd like to report a bug, please do so on our [GitHub Issues page](https://github.com/zen-browser/desktop/issues/) and for feature requests, you can use [GitHub Discussions](https://github.com/zen-browser/desktop/discussions).
+If you'd like to report a bug, please do so on our [GitHub Issues page](https://github.com/zen-browser/desktop/issues/) and for feature requests, you can use [Github Discussions](https://github.com/zen-browser/desktop/discussions).
 
 Zen is an open-source project, and we welcome contributions from the community! Please take a look at the [contribution guidelines](./docs/contribute.md) before getting started!
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-10b4efc5a79c2ab80de3b22771b1d36b9b225920
+73901ca17f4a2159dd4488cea8684e9abbfdcc89

configs/macos/mozconfig

@@ -7,10 +7,6 @@ unset MOZ_STDCXX_COMPAT
 ac_add_options --disable-dmd
 ac_add_options --enable-eme=widevine
 
-if test "$ZEN_RELEASE"; then
-  ac_add_options --with-macos-sdk=/Library/Developer/CommandLineTools/SDKs/MacOSX26.4.sdk
-fi
-
 if test "$ZEN_RELEASE"; then
   if ! test "$ZEN_GA_DISABLE_PGO"; then
     if test "$ZEN_GA_GENERATE_PROFILE"; then

locales/en-US/browser/browser/zen-boosts.ftl

@@ -11,7 +11,6 @@ zen-boost-edit-reset =
 zen-boost-edit-delete = 
     .label = Delete Boost
 zen-boost-size = Size
-zen-boost-case = Case
 zen-boost-zap = Zap
 zen-boost-code = Code
 zen-boost-back = Back
@@ -49,9 +48,9 @@ zen-unzap-tooltip =
             *[other] { $elementCount } elements zapped
     }
 zen-boost-save =
-    .label = Export Boost
+    .tooltiptext = Export Boost
 zen-boost-load =
-    .label = Import Boost
+    .tooltiptext = Import Boost
 zen-panel-ui-boosts-exported-message = Boost exported!
 zen-site-data-boosts = Boosts
 zen-site-data-create-boost =

locales/en-US/browser/browser/zen-general.ftl

@@ -151,3 +151,5 @@ zen-window-sync-migration-dialog-accept = Got It
 zen-appmenu-new-blank-window =
     .label = New blank window
 
+zen-spaces-search-placeholder =
+    .placeholder = Search your spaces...

package.json

@@ -10,7 +10,6 @@
     "build": "surfer build",
     "build:ui": "surfer build --ui",
     "start": "cd engine && python3 ./mach run --noprofile",
-    "start:bloat": "XPCOM_MEM_BLOAT_LOG=1 npm start",
     "import": "npm run ffprefs && npm run import:dumps && surfer import",
     "import:dumps": "python3 scripts/update_service_dumps.py",
     "export": "surfer export",
@@ -28,8 +27,7 @@
     "surfer": "surfer",
     "test": "python3 scripts/run_tests.py",
     "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure",
-    "test:gtest": "cd engine && ./mach gtest",
+    "ffprefs": "${CARGO:-cargo} run --manifest-path tools/ffprefs/Cargo.toml --bin ffprefs -- prefs engine",
-    "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
     "lc": "surfer license-check",
     "lc:fix": "surfer license-check --fix",
     "use-moz-src": "cd engine && ./mach use-moz-src",

prefs/firefox/fullscreen.yaml

@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Fullscreen API preferences
+- name: full-screen-api.transition-duration.enter
+  value: "0 0"
+
+- name: full-screen-api.transition-duration.leave
+  value: "0 0"
+
+- name: full-screen-api.warning.delay
+  value: -1
+
+- name: full-screen-api.warning.timeout
+  value: 0

prefs/zen/boosts.yaml

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - name: zen.boosts.enabled
-  value: true
+  value: "@IS_TWILIGHT@"
 
 - name: zen.boosts.dissolve-on-zap
   value: true

prefs/zen/kbs.yaml

@@ -7,3 +7,6 @@
 
 - name: zen.keyboard.shortcuts.disable-mainkeyset-clear
   value: false # for debugging
+
+- name: zen.keyboard.shortcuts.global.enabled
+  value: true

prefs/zen/mods.yaml

@@ -12,6 +12,9 @@
   value: "@cond"
   condition: "defined(MOZILLA_OFFICIAL)"
 
+- name: zen.rice.share.notice.accepted
+  value: false
+
 # === Mark: Site Injection ===
 
 - name: zen.injections.match-urls

prefs/zen/view.yaml

@@ -59,10 +59,10 @@
   value: true
 
 - name: zen.view.overflow-webext-toolbar
-  value: true
+  value: "@IS_TWILIGHT@"
 
 - name: zen.view.overflow-webext-toolbar-threshold
-  value: 55
+  value: 60
 
 - name: zen.view.enable-loading-indicator
   value: true

prefs/zen/workspaces.yaml

@@ -18,7 +18,7 @@
   value: true
 
 - name: zen.workspaces.swipe-actions.delta-multiplier
-  value: 100
+  value: 90
 
 - name: zen.workspaces.switch-animation-duration
   value: 200

scripts/update_service_dumps.py

@@ -60,4 +60,7 @@ def main():
 
 
 if __name__ == "__main__":
+  import sys
+  if len(sys.argv) == 3:
+    _, DUMPS_FOLDER, ENGINE_DUMPS_FOLDER = sys.argv
   main()

src/-prettierignore.patch

@@ -1,8 +1,8 @@
 diff --git a/.prettierignore b/.prettierignore
-index de2efe413e5696a3b8d0467a3a9e668dfadd8a1a..01c76d8e639d5630fca9cccb55d415fc4e903e91 100644
+index 4c6d186c501f7e1b029db186d387f73d97dfed1e..81d0f7dc7f412151256c13ed93bd34d7bd872681 100644
 --- a/.prettierignore
 +++ b/.prettierignore
-@@ -1805,3 +1805,12 @@ tools/ts/test/baselines/
+@@ -1806,3 +1806,12 @@ tools/ts/test/baselines/
  try_task_config.json
  xpcom/idl-parser/xpidl/fixtures/xpctest.d.json
  **/package-lock.json

src/browser/actors/EncryptedMediaParent-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/actors/EncryptedMediaParent.sys.mjs b/browser/actors/EncryptedMediaParent.sys.mjs
-index 492dce93d3cc7c6ec16db047c9e47b175ef3a0fe..757e5543e0e6900c414db6d7a96d511608c1e50a 100644
+index 9d3d3db9761cf5b2fde1f70992e82b1733241863..3dc64dc395d5237bf2c290cb8588cf467fb8729a 100644
 --- a/browser/actors/EncryptedMediaParent.sys.mjs
 +++ b/browser/actors/EncryptedMediaParent.sys.mjs
-@@ -199,6 +199,7 @@ export class EncryptedMediaParent extends JSWindowActorParent {
+@@ -200,6 +200,7 @@ export class EncryptedMediaParent extends JSWindowActorParent {
          "drmContentPlaying",
          aBrowser
        )

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 b743bd83529c4cd01a6bc820967186dbe41b6144..e24c48bac0f4ae3d4b26087b7e0cac7910019d0e 100644
+index e8b762b4c8f71ddafc090415abfe97674401dbc2..5dda5fe9c9bc02ebe7713f7bd21315fe4ba8b8cd 100644
 --- a/browser/actors/WebRTCParent.sys.mjs
 +++ b/browser/actors/WebRTCParent.sys.mjs
 @@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {

src/browser/app/splash-rc.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/app/splash.rc b/browser/app/splash.rc
-index 04c1d3e1db7d067d579512999a08de85a0aa212c..4e04eb5008ca1701c731c3109ba184ccf465b51b 100644
+index 259a8068c3aa256b8c50487a04f1844292b90b2e..8b9c792e1484bb801246b06b6ce43fb6d6271ee8 100644
 --- a/browser/app/splash.rc
 +++ b/browser/app/splash.rc
-@@ -5,6 +5,9 @@
+@@ -6,6 +6,9 @@
  #include <windows.h>
  #include "nsNativeAppSupportWin.h"
  

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 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05f45bce08 100644
+index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe7932eaea41 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
-@@ -1060,7 +1060,7 @@ var gXPInstallObserver = {
+@@ -1061,7 +1061,7 @@ var gXPInstallObserver = {
        persistent: true,
        hideClose: true,
        popupOptions: {
@@ -11,7 +11,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
        },
      };
  
-@@ -1282,7 +1282,7 @@ var gXPInstallObserver = {
+@@ -1283,7 +1283,7 @@ var gXPInstallObserver = {
        hideClose: true,
        timeout: Date.now() + 30000,
        popupOptions: {
@@ -20,7 +20,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
        },
      };
  
-@@ -2209,7 +2209,7 @@ var gUnifiedExtensions = {
+@@ -2210,7 +2210,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 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      const attr = anchorID + "popupnotificationanchor";
  
      if (!aBrowser[attr]) {
-@@ -2220,7 +2220,7 @@ var gUnifiedExtensions = {
+@@ -2221,7 +2221,7 @@ var gUnifiedExtensions = {
          anchorID
          // Anchor on the toolbar icon to position the popup right below the
          // button.
@@ -38,7 +38,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      }
  
      return anchorID;
-@@ -2545,7 +2545,7 @@ var gUnifiedExtensions = {
+@@ -2546,7 +2546,7 @@ var gUnifiedExtensions = {
      requestAnimationFrame(() => this.updateAttention());
    },
  
@@ -47,7 +47,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      // A list of extension widget IDs (possibly empty).
      let widgetIDs;
  
-@@ -2559,7 +2559,7 @@ var gUnifiedExtensions = {
+@@ -2560,7 +2560,7 @@ var gUnifiedExtensions = {
      }
  
      // The list of overflowed extensions in the extensions panel.
@@ -56,7 +56,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
        "#overflowed-extensions-list"
      );
  
-@@ -2660,37 +2660,41 @@ var gUnifiedExtensions = {
+@@ -2661,37 +2661,41 @@ var gUnifiedExtensions = {
        );
        template.replaceWith(template.content);
        this._panel = document.getElementById("unified-extensions-panel");
@@ -123,7 +123,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
      if (!CustomizationHandler.isCustomizing()) {
        if (aEvent) {
          if (
-@@ -2712,6 +2716,7 @@ var gUnifiedExtensions = {
+@@ -2713,6 +2717,7 @@ var gUnifiedExtensions = {
          // and no alternative content is available for display in the panel.
          const policies = this.getActivePolicies();
          if (
@@ -131,7 +131,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
            policies.length &&
            !this.hasExtensionsInPanel(policies) &&
            !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
-@@ -2727,32 +2732,30 @@ var gUnifiedExtensions = {
+@@ -2728,32 +2733,30 @@ var gUnifiedExtensions = {
        this.blocklistAttentionInfo =
          await AddonManager.getBlocklistAttentionInfo();
  
@@ -170,7 +170,7 @@ index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05
            triggerEvent: aEvent,
          });
        }
-@@ -2947,18 +2950,20 @@ var gUnifiedExtensions = {
+@@ -2948,18 +2951,20 @@ var gUnifiedExtensions = {
        this._maybeMoveWidgetNodeBack(widgetId);
      }
  

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 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de71d7c8e3 100644
+index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937dc9090628 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
-@@ -13,6 +13,10 @@ var BrowserCommands = {
+@@ -14,6 +14,10 @@ var BrowserCommands = {
      const where = BrowserUtils.whereToOpenLink(aEvent, false, true);
  
      if (where == "current") {
@@ -13,7 +13,7 @@ index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de
        try {
          gBrowser.goBack();
        } catch (ex) {}
-@@ -234,6 +238,10 @@ var BrowserCommands = {
+@@ -229,6 +233,10 @@ var BrowserCommands = {
        }
      }
  
@@ -24,7 +24,7 @@ index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de
      // 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
-@@ -318,6 +326,14 @@ var BrowserCommands = {
+@@ -313,6 +321,14 @@ var BrowserCommands = {
        return;
      }
  
@@ -39,7 +39,7 @@ index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de
      // Keyboard shortcuts that would close a tab that is pinned select the first
      // unpinned tab instead.
      if (
-@@ -325,8 +341,8 @@ var BrowserCommands = {
+@@ -320,8 +336,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {

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 1eaf79a4f6788c518a4759bbce81175fd5fba220..6fde5e944ad4a847180ca83a9e6f4fde20aa7b42 100644
+index cd46701e9f4b672f392533c9ecc1c8570c3b2c5a..beb992702ea90e0b81f7bda4a6c0522932e84dfe 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -501,8 +501,6 @@ var FullScreen = {
+@@ -464,8 +464,6 @@ var FullScreen = {
      // don't need that kind of precision in our CSS.
      shiftSize = shiftSize.toFixed(2);
      let translate = shiftSize > 0 ? `0 ${shiftSize}px` : "";

src/browser/base/content/browser-init-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index d09cf65931eda253b2a71131f42883ccf6eb5724..f617863dac8e07def02d1d4ef7e5ade1caf50df1 100644
+index b64d2f52ed1eb3d0b8aa86700bc082d3fc95152b..dd8636148d0646f6949d6279d70e20c09d8c7c17 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -302,6 +302,7 @@ var gBrowserInit = {
+@@ -252,6 +252,7 @@ var gBrowserInit = {
    },
  
    onLoad() {
@@ -10,7 +10,7 @@ index d09cf65931eda253b2a71131f42883ccf6eb5724..f617863dac8e07def02d1d4ef7e5ade1
      gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
        PopupAndRedirectBlockerObserver.handleEvent(e)
      );
-@@ -496,6 +497,7 @@ var gBrowserInit = {
+@@ -446,6 +447,7 @@ var gBrowserInit = {
  
      this._handleURIToLoad();
  

src/browser/base/content/browser-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2616b2946 100644
+index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a7296d3040d8 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -34,6 +34,7 @@ ChromeUtils.defineESModuleGetters(this, {
+@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
      "resource://gre/modules/ContextualIdentityService.sys.mjs",
    CustomizableUI:
      "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs",
@@ -24,7 +24,7 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
      if (backDisabled) {
        backCommand.removeAttribute("disabled");
      } else {
-@@ -3715,7 +3721,7 @@ function warnAboutClosingWindow() {
+@@ -3830,7 +3836,7 @@ function warnAboutClosingWindow() {
  
    if (!isPBWindow && !toolbar.visible) {
      return gBrowser.warnAboutClosingTabs(
@@ -33,7 +33,7 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
        gBrowser.closingTabsEnum.ALL
      );
    }
-@@ -3755,7 +3761,7 @@ function warnAboutClosingWindow() {
+@@ -3870,7 +3876,7 @@ function warnAboutClosingWindow() {
      return (
        isPBWindow ||
        gBrowser.warnAboutClosingTabs(
@@ -42,7 +42,7 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
          gBrowser.closingTabsEnum.ALL
        )
      );
-@@ -3780,7 +3786,7 @@ function warnAboutClosingWindow() {
+@@ -3895,7 +3901,7 @@ function warnAboutClosingWindow() {
      AppConstants.platform != "macosx" ||
      isPBWindow ||
      gBrowser.warnAboutClosingTabs(
@@ -51,7 +51,7 @@ index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2
        gBrowser.closingTabsEnum.ALL
      )
    );
-@@ -4720,6 +4726,9 @@ var ConfirmationHint = {
+@@ -4835,6 +4841,9 @@ var ConfirmationHint = {
      }
  
      document.l10n.setAttributes(this._message, messageId, options.l10nArgs);

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 e3feaebc551bfe7127b9701a7f76996022516af0..460b39f2a9f1f36d4b821c693951214098b644f7 100644
+index 543630b89bc4f1d40eda7e4e7ae68a3c9f45e1e7..fac68af45985ad2feeb1daebd470d028b49d1dde 100644
 --- a/browser/base/content/browser-places.js
 +++ b/browser/base/content/browser-places.js
 @@ -261,6 +261,8 @@ var StarUI = {
@@ -33,7 +33,7 @@ index e3feaebc551bfe7127b9701a7f76996022516af0..460b39f2a9f1f36d4b821c6939512140
    removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() {
      this._removeBookmarksOnPopupHidden = true;
      this.panel.hidePopup();
-@@ -1815,6 +1832,7 @@ var BookmarkingUI = {
+@@ -1811,6 +1828,7 @@ var BookmarkingUI = {
        document.getElementById("context-bookmarkpage"),
        PanelMultiView.getViewNode(document, "panelMenuBookmarkThisPage"),
        document.getElementById("pageAction-panel-bookmark"),

src/browser/base/content/browser-sets-inc-xhtml.patch

@@ -1,9 +0,0 @@
-diff --git a/browser/base/content/browser-sets.inc.xhtml b/browser/base/content/browser-sets.inc.xhtml
-index 1263856344c4613ea58639a64e747fd0c3f771f7..c83ed7dd6a2482354c5bd37ce2e2cbf88ee6cf60 100644
---- a/browser/base/content/browser-sets.inc.xhtml
-+++ b/browser/base/content/browser-sets.inc.xhtml
-@@ -418,3 +418,4 @@
-          internal="true"/>
- #endif
-   </keyset>
-+#include zen-keysets.inc.xhtml

src/browser/base/content/browser-sets-inc.patch

@@ -0,0 +1,9 @@
+diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
+index 8871fc984acccfd9c54c7aef9f91934d81ba00c0..923ab3bda423eae77518f437221c32ca4990f5ce 100644
+--- a/browser/base/content/browser-sets.inc
++++ b/browser/base/content/browser-sets.inc
+@@ -415,3 +415,4 @@
+          internal="true"/>
+ #endif
+   </keyset>
++#include zen-keysets.inc.xhtml

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 8b153dfac9421f0cce716ed399f33ec9b25eb311..5e461b0fc89455d38869ac70a7ce6a3b20ffd26b 100644
+index d9ab2ad00b862d56ea7aa8e2469d050d8df7f5dc..2efb25ff9cfd3a224724fffadfa0aee693ddf47d 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -285,7 +285,7 @@ document.addEventListener(
+@@ -272,7 +272,7 @@ document.addEventListener(
          }
        });
  
@@ -11,7 +11,7 @@ index 8b153dfac9421f0cce716ed399f33ec9b25eb311..5e461b0fc89455d38869ac70a7ce6a3b
        const SIDEBAR_REVAMP_PREF = "sidebar.revamp";
        const SIDEBAR_REVAMP_ENABLED = Services.prefs.getBoolPref(
          SIDEBAR_REVAMP_PREF,
-@@ -323,6 +323,8 @@ document.addEventListener(
+@@ -310,6 +310,8 @@ document.addEventListener(
                panel: SidebarController.currentID,
                opened: SidebarController._state.launcherExpanded,
              });

src/browser/base/content/browser-xhtml.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index d8ed09dca6c8ae99ed1a84cef22462a0d7b517fe..dcb65c4268913fdf32302c9b4ac723131187922e 100644
+index b42287485c2baeabe831b0d54c6f09330b0caabd..e404c2e028e24eb4fa9b97f143ba476c1b1461fd 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
          sizemode="normal"
          retargetdocumentfocus="urlbar-input"
          scrolling="false"
@@ -10,7 +10,7 @@ index d8ed09dca6c8ae99ed1a84cef22462a0d7b517fe..dcb65c4268913fdf32302c9b4ac72313
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -100,8 +101,10 @@
+@@ -101,8 +102,10 @@
  
    <title data-l10n-id="browser-main-window-default-title"></title>
  
@@ -21,7 +21,7 @@ index d8ed09dca6c8ae99ed1a84cef22462a0d7b517fe..dcb65c4268913fdf32302c9b4ac72313
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -134,9 +137,10 @@
+@@ -135,9 +138,10 @@
      </vbox>
    </html:template>
  

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 b4abfb868fc7c13e789acb57b44e386de6d31bf0..ad917f5362ed4f3ba0149c214fb53d3f087bbfcf 100644
+index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..99210f8bb5633d50d2cba24f1e13ca866c5b6959 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -12,7 +12,7 @@ index b4abfb868fc7c13e789acb57b44e386de6d31bf0..ad917f5362ed4f3ba0149c214fb53d3f
  
    <!-- Menu -->
 @@ -18,9 +18,13 @@
- #include browser-menubar.inc.xhtml
+ #include browser-menubar.inc
      </toolbaritem>
      <spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
 -#include titlebar-items.inc.xhtml
@@ -43,7 +43,7 @@ index b4abfb868fc7c13e789acb57b44e386de6d31bf0..ad917f5362ed4f3ba0149c214fb53d3f
          </tabs>
  
          <toolbarbutton id="new-tab-button"
-@@ -115,9 +122,10 @@
+@@ -114,9 +121,10 @@
  
      <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
  

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 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca05859408b6d 100644
+index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addcd177cecb 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
-@@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
+@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(this, {
  document.addEventListener(
    "DOMContentLoaded",
    () => {
@@ -11,7 +11,7 @@ index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca058
      const widgetOverflow = document.getElementById("widget-overflow");
  
      function onPopupShowing(event) {
-@@ -188,6 +188,7 @@ document.addEventListener(
+@@ -189,6 +189,7 @@ document.addEventListener(
          #forward-button,
          #reload-button ,
          #reader-mode-button,
@@ -19,7 +19,7 @@ index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca058
          #picture-in-picture-button,
          #urlbar-zoom-button,
          #star-button-box,
-@@ -214,6 +215,17 @@ document.addEventListener(
+@@ -215,6 +216,17 @@ document.addEventListener(
            gBrowser.handleNewTabMiddleClick(element, event);
            break;
  
@@ -37,7 +37,7 @@ index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca058
          case "back-button":
          case "forward-button":
          case "reload-button":
-@@ -329,6 +341,7 @@ document.addEventListener(
+@@ -330,6 +342,7 @@ document.addEventListener(
          #downloads-button,
          #fxa-toolbar-menu-button,
          #unified-extensions-button,
@@ -45,7 +45,7 @@ index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca058
          #library-button,
          #split-view-button,
          #smartwindow-ask-button
-@@ -413,6 +426,16 @@ document.addEventListener(
+@@ -414,6 +427,16 @@ document.addEventListener(
            gUnifiedExtensions.togglePanel(event);
            break;
  

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 97cb36e2ed48d00454e169fb0470b47ac994b883..1811a92885620c8a916937f467ebb7d0eb0d3a0e 100644
+index 5ee0ee4246d1c267b75328666a7f7f54e6f93246..ae778b88e1d295cdae2d0433d943ac467081b126 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -369,6 +369,9 @@ export class nsContextMenu {
+@@ -370,6 +370,9 @@ export class nsContextMenu {
      this.initTextFragmentItems();
      this.pdfjsContextMenu.initItems();
  

src/browser/base/content/zen-assets.inc.xhtml

@@ -28,6 +28,8 @@
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-welcome.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-media-controls.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-download-box-animation.css" />
+
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-little-window.css" />
 </linkset>
 
 # Startup "preloaded" scripts that requre globals such as gBrowser and gURLBar

src/browser/base/content/zen-assets.jar.inc.mn

@@ -9,7 +9,6 @@
 #include ../../../zen/mods/jar.inc.mn
 #include ../../../zen/spaces/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
@@ -20,3 +19,4 @@
 #include ../../../zen/fonts/jar.inc.mn
 #include ../../../zen/boosts/jar.inc.mn
 #include ../../../zen/live-folders/jar.inc.mn
+#include ../../../zen/little-window/jar.inc.mn

src/browser/base/content/zen-commands.inc.xhtml

@@ -68,4 +68,6 @@
   <command id="cmd_zenNewLiveFolder" />
 
   <command id="cmd_zenDuplicateTab" />
+
+  <command id="cmd_zenNewLittleWindow" />
 </commandset>

src/browser/base/content/zen-panels/spaces-search.inc

@@ -0,0 +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/.
+
+<panel id="zen-spaces-popup"
+    nonnativepopover="true"
+    type="arrow"
+    orient="vertical"
+    side="bottom"
+    hidden="true"
+    consumeoutsideclicks="never">
+  <hbox class="zen-spaces-list-header" flex="1">
+    <image class="zen-spaces-list-search-icon" src="chrome://global/skin/icons/search-glass.svg"/>
+    <html:input id="zen-spaces-list-search"
+      data-l10n-id="zen-spaces-search-placeholder"
+      type="search" />
+  </hbox>
+  <scrollbox class="zen-spaces-list-scrollbox" flex="1">
+    <vbox id="zen-spaces-list"></vbox>
+    <hbox id="zen-spaces-search-no-results" hidden="true" flex="1"
+      data-l10n-id="zen-spaces-search-no-results" />
+  </scrollbox>
+</panel>

src/browser/base/content/zen-popupset.inc.xhtml

@@ -5,6 +5,7 @@
 #include zen-panels/theme-picker.inc
 #include zen-panels/emojis-picker.inc
 #include zen-panels/folders-search.inc
+#include zen-panels/spaces-search.inc
 #include zen-panels/site-data.inc
 
 #include zen-panels/popups.inc

src/browser/base/moz-build.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/moz.build b/browser/base/moz.build
-index 286e17552e2ab2d7e44c6ba99c84630cadd24e94..076f813aea971db1e1c1429fc0b64c1784a22722 100644
+index 086b462e706bb46727d0fed85b4c98debaeaf721..44a4fcb9b8181678667ee11b0443eed681dd2a43 100644
 --- a/browser/base/moz.build
 +++ b/browser/base/moz.build
-@@ -78,3 +78,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
+@@ -82,3 +82,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
  DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
  
  JAR_MANIFESTS += ["jar.mn"]

src/browser/components/BrowserContentHandler-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 430c6877c81824d8ab318cacc997d4eda4cb6a11..e8a195e1fe09952b90a0d73d13c6c15da2006bd4 100644
+index 2152327b42c884456785ef065422e3ca6cc8c50b..932150495d23c0a63987abf14b3dc8a12eb42d6c 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
 @@ -603,6 +603,28 @@ nsBrowserContentHandler.prototype = {

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 af635211046f9f1b2d473a14e8170837cd0d93cd..f07514a7e3ab55aa3321f0a7c0c092e91c2961ce 100644
+index 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45e3822d50 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 af635211046f9f1b2d473a14e8170837cd0d93cd..f07514a7e3ab55aa3321f0a7c0c092e9
    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 = {
+@@ -1457,7 +1458,7 @@ BrowserGlue.prototype = {
        windowcount++;
        let tabbrowser = win.gBrowser;
        if (tabbrowser) {
@@ -19,7 +19,7 @@ index af635211046f9f1b2d473a14e8170837cd0d93cd..f07514a7e3ab55aa3321f0a7c0c092e9
        }
      }
  
-@@ -1623,6 +1624,8 @@ BrowserGlue.prototype = {
+@@ -1622,6 +1623,8 @@ BrowserGlue.prototype = {
      } else if (profileDataVersion < APP_DATA_VERSION) {
        lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION);
      }

src/browser/components/aboutwelcome/content/aboutwelcome-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/aboutwelcome/content/aboutwelcome.css b/browser/components/aboutwelcome/content/aboutwelcome.css
-index 98497769b135efd3200607ee2cf50e82d06ed3fd..68e0778cfc4dc70935a3d48e79542b4133b293d2 100644
+index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f6005025498644c7fc67 100644
 --- a/browser/components/aboutwelcome/content/aboutwelcome.css
 +++ b/browser/components/aboutwelcome/content/aboutwelcome.css
-@@ -330,6 +330,11 @@ panel#feature-callout {
+@@ -331,6 +331,11 @@ panel#feature-callout {
    --panel-shadow-margin: 6px;
    --panel-arrow-space: calc(var(--panel-shadow-margin) + var(--arrow-visible-height) - 1.5px);
    --panel-margin-offset: calc(-1 * (var(--panel-shadow-margin) + var(--arrow-corner-distance) + (var(--arrow-width) / 2)));
@@ -14,7 +14,7 @@ index 98497769b135efd3200607ee2cf50e82d06ed3fd..68e0778cfc4dc70935a3d48e79542b41
  }
  
  panel#feature-callout::part(content) {
-@@ -517,6 +522,12 @@ div#feature-callout.hidden {
+@@ -518,6 +523,12 @@ div#feature-callout.hidden {
    width: 25em;
    gap: 16px;
    background: var(--fc-background);
@@ -27,7 +27,7 @@ index 98497769b135efd3200607ee2cf50e82d06ed3fd..68e0778cfc4dc70935a3d48e79542b41
  }
  #feature-callout .screen[pos=callout] .section-main .main-content .main-content-inner {
    gap: 12px;
-@@ -933,6 +944,10 @@ panel#feature-callout::part(content) {
+@@ -850,6 +861,10 @@ panel#feature-callout::part(content) {
    overflow: visible;
    transform: rotate(45deg);
    transform-style: preserve-3d;

src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-index 97710ab0570a1a477ef4ed74a78c16448dfb7674..7d8ba5b1f2f330175fb57b906bb572fd7e1d36c8 100644
+index 4081f59d041e91291d5e6b6b8c9ad96db5b6b2dc..d420a2fe4ca552b7f24ce9fbefc5f7302d7f2c8e 100644
 --- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
 +++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-@@ -277,6 +277,7 @@ export const AIWindow = {
+@@ -269,6 +269,7 @@ export const AIWindow = {
    },
  
    _updateToolbarButtonPositions(win, { isToggling = false } = {}) {

src/browser/components/customizableui/CustomizableUI-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860f9295d9d 100644
+index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d89ee6ce1d 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
-@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
    BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs",
    CustomizableWidgets:
      "moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs",
@@ -10,7 +10,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
    HomePage: "resource:///modules/HomePage.sys.mjs",
    PanelMultiView:
      "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs",
-@@ -347,7 +348,7 @@ var CustomizableUIInternal = {
+@@ -348,7 +349,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_PANEL,
          defaultPlacements: [],
@@ -19,7 +19,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
        },
        false
      );
-@@ -357,20 +358,15 @@ var CustomizableUIInternal = {
+@@ -358,20 +359,15 @@ var CustomizableUIInternal = {
        "back-button",
        "forward-button",
        "stop-reload-button",
@@ -41,7 +41,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      this.registerArea(
        CustomizableUI.AREA_NAVBAR,
        {
-@@ -378,8 +374,6 @@ var CustomizableUIInternal = {
+@@ -379,8 +375,6 @@ var CustomizableUIInternal = {
          overflowable: true,
          defaultPlacements: navbarPlacements,
          verticalTabsDefaultPlacements: [
@@ -50,7 +50,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
          ],
          defaultCollapsed: false,
        },
-@@ -403,10 +397,7 @@ var CustomizableUIInternal = {
+@@ -404,10 +398,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -61,7 +61,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -486,6 +477,7 @@ var CustomizableUIInternal = {
+@@ -489,6 +480,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -69,7 +69,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1262,6 +1254,9 @@ var CustomizableUIInternal = {
+@@ -1265,6 +1257,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -79,7 +79,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1769,7 +1764,6 @@ var CustomizableUIInternal = {
+@@ -1772,7 +1767,6 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -87,7 +87,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1779,7 +1773,7 @@ var CustomizableUIInternal = {
+@@ -1782,7 +1776,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 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -1947,16 +1941,16 @@ var CustomizableUIInternal = {
+@@ -1950,16 +1944,16 @@ var CustomizableUIInternal = {
          elem.setAttribute("skipintoolbarset", "true");
        }
      }
@@ -116,7 +116,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      // Handle initial state of vertical tabs.
      if (isVerticalTabs) {
        // Show the vertical tabs toolbar
-@@ -2198,6 +2192,10 @@ var CustomizableUIInternal = {
+@@ -2201,6 +2195,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 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
        this.setLocationAttributes(aNode, aAreaId);
        aContainer.insertBefore(aNode, aNextNode);
-@@ -4562,7 +4560,7 @@ var CustomizableUIInternal = {
+@@ -4565,7 +4563,7 @@ var CustomizableUIInternal = {
     * For all registered areas, builds those areas to reflect the current
     * placement state of all widgets.
     */
@@ -136,7 +136,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -4573,7 +4571,7 @@ var CustomizableUIInternal = {
+@@ -4576,7 +4574,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -145,7 +145,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -5864,6 +5862,7 @@ export var CustomizableUI = {
+@@ -5867,6 +5865,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -153,7 +153,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -7827,7 +7826,9 @@ class OverflowableToolbar {
+@@ -7830,7 +7829,9 @@ class OverflowableToolbar {
          );
  
          if (webExtList && CustomizableUI.isWebExtensionWidget(child.id)) {
@@ -163,7 +163,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
            webExtList.insertBefore(child, webExtList.firstElementChild);
          } else {
            child.setAttribute("cui-anchorid", this.#defaultListButton.id);
-@@ -7887,7 +7888,7 @@ class OverflowableToolbar {
+@@ -7890,7 +7891,7 @@ class OverflowableToolbar {
          ) {
            continue;
          }
@@ -172,7 +172,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
          if (child != aExceptChild) {
            sum += getInlineSize(child);
          }
-@@ -7911,11 +7912,11 @@ class OverflowableToolbar {
+@@ -7914,11 +7915,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -186,7 +186,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      });
  
      lazy.log.debug(
-@@ -7930,7 +7931,37 @@ class OverflowableToolbar {
+@@ -7933,7 +7934,37 @@ class OverflowableToolbar {
        Math.max(targetWidth, targetChildrenWidth)
      );
      totalAvailWidth = Math.ceil(totalAvailWidth);
@@ -225,7 +225,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -7991,7 +8022,11 @@ class OverflowableToolbar {
+@@ -7994,7 +8025,11 @@ class OverflowableToolbar {
              return;
            }
          }
@@ -238,7 +238,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
            lazy.log.debug(
              `Need ${minSize} but width is ${totalAvailWidth} so bailing`
            );
-@@ -8024,7 +8059,7 @@ class OverflowableToolbar {
+@@ -8027,7 +8062,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -247,7 +247,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8150,6 +8185,9 @@ class OverflowableToolbar {
+@@ -8153,6 +8188,9 @@ class OverflowableToolbar {
     *   if no such list exists.
     */
    get #webExtList() {
@@ -257,7 +257,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      if (!this.#webExtListRef) {
        let targetID = this.#toolbar.getAttribute("addon-webext-overflowtarget");
        if (!targetID) {
-@@ -8161,6 +8199,9 @@ class OverflowableToolbar {
+@@ -8164,6 +8202,9 @@ class OverflowableToolbar {
        let win = this.#toolbar.ownerGlobal;
        let { panel } = win.gUnifiedExtensions;
        this.#webExtListRef = panel.querySelector(`#${targetID}`);
@@ -267,7 +267,7 @@ index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860
      }
      return this.#webExtListRef;
    }
-@@ -8369,7 +8410,7 @@ class OverflowableToolbar {
+@@ -8372,7 +8413,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {

src/browser/components/customizableui/content/panelUI-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index 5a469ce153dada011144fb4b66747c41e778ff1e..83bedb74df5b4064e8a0580f8b2ee9c0c27f81a8 100644
+index 5056ff7fba62f8340c58cbaa30833aad12b4fc70..32dbd206cbc8576ec5a5f958f43670fa90c050b8 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -666,10 +666,12 @@ const PanelUI = {
+@@ -647,10 +647,12 @@ const PanelUI = {
      if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
        this.navbar.setAttribute("nonemptyoverflow", "true");
        this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -15,7 +15,7 @@ index 5a469ce153dada011144fb4b66747c41e778ff1e..83bedb74df5b4064e8a0580f8b2ee9c0
      }
    },
  
-@@ -1017,7 +1019,7 @@ const PanelUI = {
+@@ -998,7 +1000,7 @@ const PanelUI = {
          el.removeAttribute("data-lazy-l10n-id");
        });
  

src/browser/components/extensions/parent/ext-browser-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index d1209bc2c828a19ade8cc027cdea6f42007f0de6..0a2def2f3c32618304cd8a263906b0c6e040dcbc 100644
+index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1f5aacd8c 100644
 --- a/browser/components/extensions/parent/ext-browser.js
 +++ b/browser/components/extensions/parent/ext-browser.js
-@@ -352,6 +352,7 @@ class TabTracker extends TabTrackerBase {
+@@ -354,6 +354,7 @@ class TabTracker extends TabTrackerBase {
    }
  
    getId(nativeTab) {
@@ -10,7 +10,7 @@ index d1209bc2c828a19ade8cc027cdea6f42007f0de6..0a2def2f3c32618304cd8a263906b0c6
      let id = this._tabs.get(nativeTab);
      if (id) {
        return id;
-@@ -386,6 +387,7 @@ class TabTracker extends TabTrackerBase {
+@@ -388,6 +389,7 @@ class TabTracker extends TabTrackerBase {
      if (nativeTab.ownerGlobal.closed) {
        throw new Error("Cannot attach ID to a tab in a closed window.");
      }
@@ -18,7 +18,7 @@ index d1209bc2c828a19ade8cc027cdea6f42007f0de6..0a2def2f3c32618304cd8a263906b0c6
  
      this._tabs.set(nativeTab, id);
      if (nativeTab.linkedBrowser) {
-@@ -1276,6 +1278,10 @@ class TabManager extends TabManagerBase {
+@@ -1278,6 +1280,10 @@ class TabManager extends TabManagerBase {
    }
  
    canAccessTab(nativeTab) {

src/browser/components/extensions/parent/ext-tabs-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
-index 636e0f8cd1d489658833cf101152576e9fdb52af..e7578a059504b89a852061be037c323a107fe5ce 100644
+index ae004ad48e86aae9d13fc6aa5f77f3095763f829..1e3d14a5c6fcbebbc677e0e57ef2b2176a141a3c 100644
 --- a/browser/components/extensions/parent/ext-tabs.js
 +++ b/browser/components/extensions/parent/ext-tabs.js
-@@ -514,6 +514,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -516,6 +516,7 @@ this.tabs = class extends ExtensionAPIPersistent {
          }
  
          let tab = tabManager.getWrapper(updatedTab);
@@ -10,7 +10,7 @@ index 636e0f8cd1d489658833cf101152576e9fdb52af..e7578a059504b89a852061be037c323a
  
          let changeInfo = {};
          for (let prop of needed) {
-@@ -883,6 +884,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -881,6 +882,7 @@ this.tabs = class extends ExtensionAPIPersistent {
                });
              }
  

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 b21f7721dea2d485ccba1fd6fd7e65e17480e3d3..89048d9ea2b4edf2b0cab77f661c07f4d9453c3f 100644
+index 2db11dad245dccca246cc8429a7498af9f143d5f..980ec44d9e92639b249bc83f59ea3bfae40dd921 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
 @@ -61,6 +61,7 @@ class BookmarkState {

src/browser/components/places/content/browserPlacesViews-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
-index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2720c3c49 100644
+index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432fb02cd6f 100644
 --- a/browser/components/places/content/browserPlacesViews.js
 +++ b/browser/components/places/content/browserPlacesViews.js
 @@ -328,12 +328,23 @@ class PlacesViewBase {
@@ -37,7 +37,7 @@ index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2
        } else if (PlacesUtils.containerTypes.includes(type)) {
          element = document.createXULElement("menu");
          element.setAttribute("container", "true");
-@@ -1058,25 +1070,33 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1015,25 +1027,33 @@ class PlacesToolbar extends PlacesViewBase {
        this._rootElt.firstChild.remove();
      }
  
@@ -82,7 +82,7 @@ index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2
            );
            ++startIndex;
            if (elt.localName != "toolbarseparator") {
-@@ -1084,15 +1104,12 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1041,15 +1061,12 @@ class PlacesToolbar extends PlacesViewBase {
            }
          }
          if (!elt) {
@@ -101,7 +101,7 @@ index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2
          });
        });
  
-@@ -1102,7 +1119,7 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1059,7 +1076,7 @@ class PlacesToolbar extends PlacesViewBase {
  
        let fragment = document.createDocumentFragment();
        for (let i = startIndex; i < limit; ++i) {
@@ -110,7 +110,7 @@ index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2
        }
        await new Promise(resolve => window.requestAnimationFrame(resolve));
        if (!this._isAlive) {
-@@ -1165,6 +1182,8 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1122,6 +1139,8 @@ class PlacesToolbar extends PlacesViewBase {
            "scheme",
            PlacesUIUtils.guessUrlSchemeForUI(aChild.uri)
          );
@@ -119,7 +119,7 @@ index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2
        }
      }
  
-@@ -2359,7 +2378,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
+@@ -2314,7 +2333,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
          PlacesUIUtils.guessUrlSchemeForUI(placesNode.uri)
        );
        element.setAttribute("label", PlacesUIUtils.getBestTitle(placesNode));

src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
-index a893c5ec3d007820d98f5d92dd039640faa2c181..9cbd00102e44ccf98b37845474d92d57bac0842d 100644
+index ef127a1bc2e3ea4221b641156c38a74edb3b44ae..acd39fe7f6dc7ec03ea50928e2d002791b834dcf 100644
 --- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
 +++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
-@@ -26,6 +26,10 @@
+@@ -27,6 +27,10 @@
          rel="localization"
          href="browser/preferences/preferences.ftl"
        />
@@ -13,7 +13,7 @@ index a893c5ec3d007820d98f5d92dd039640faa2c181..9cbd00102e44ccf98b37845474d92d57
      </linkset>
      <script src="chrome://global/content/preferencesBindings.js" />
      <script src="chrome://browser/content/preferences/dialogs/syncChooseWhatToSync.js" />
-@@ -86,6 +90,12 @@
+@@ -87,6 +91,12 @@
            preference="services.sync.engine.prefs"
          />
        </html:div>

src/browser/components/preferences/jar-mn.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index 78e38f98c1f69df31459fd4b6a119c93f6509c02..33abd46566146272da9f561e11ffa290d7000111 100644
+index b2d65603ec714b49249789d0e48b0b677c9eaea6..6cea34be90e2f181fd3e5770f7e2fd99c483b8d8 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
-@@ -54,3 +54,5 @@ browser.jar:
+@@ -51,3 +51,5 @@ browser.jar:
     content/browser/preferences/widgets/sync-device-name.mjs          (widgets/sync-device-name/sync-device-name.mjs)
     content/browser/preferences/widgets/sync-engines-list.mjs          (widgets/sync-engine-list/sync-engines-list.mjs)
     content/browser/preferences/widgets/sync-engines-list.css          (widgets/sync-engine-list/sync-engines-list.css)

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 6b96ff01e43087f8c609df17204441616b7013f3..df85ec789c54146b3a702169f33adf36c11b85da 100644
+index 7d6bbc54d21bf149dd1b99a38ca803654e6908eb..4da0e5fc921bb0ee24ace443c0c119fdd2707fc9 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
 @@ -96,6 +96,7 @@

src/browser/components/preferences/main-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 6f4cb34d1639ac76a6d4ca40f0d33ae6fb6bf565..1f336a09d6f2e367effdf26e8baf58b5686d252d 100644
+index 8f8da3c4cabb4a05b50431b1feeff8f1f1abcf6e..e57102247eb739ed431bd838a3004b353342defb 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -2537,6 +2537,11 @@ function createStartupConfig(hidden = false) {
+@@ -2658,6 +2658,11 @@ function createStartupConfig(hidden = false) {
          id: "browserRestoreSession",
          l10nId: "startup-restore-windows-and-tabs",
        },
@@ -14,16 +14,16 @@ index 6f4cb34d1639ac76a6d4ca40f0d33ae6fb6bf565..1f336a09d6f2e367effdf26e8baf58b5
        {
          id: "windowsLaunchOnLogin",
          l10nId: "windows-launch-on-login",
-@@ -2578,7 +2583,7 @@ function createStartupConfig(hidden = false) {
+@@ -2755,7 +2760,7 @@ SettingGroupManager.registerGroups({
- SettingGroupManager.registerGroups({
+   },
    defaultBrowser: createDefaultBrowserConfig(),
    startup: createStartupConfig(
 -    Services.prefs.getBoolPref("browser.settings-redesign.enabled", false)
 +    false
    ),
-   zoom: {
+   importBrowserData: {
-     l10nId: "preferences-zoom-header2",
+     l10nId: "preferences-data-migration-group",
-@@ -3393,7 +3398,7 @@ function getBundleForLocales(newLocales) {
+@@ -5174,7 +5179,7 @@ function getBundleForLocales(newLocales) {
      ])
    );
    return new Localization(

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 9d13733318e7a147adee1e44f96570c94f4948df..fb625d8da021dc0cebd7a14ca47446a0632e8e7a 100644
+index 2d6cba7fac0c7de6d7c4a819f2c7ad20ce10bb33..15434dac6b501cf6f7a6968c6363c59288043c3e 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -121,6 +121,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
@@ -10,7 +10,7 @@ index 9d13733318e7a147adee1e44f96570c94f4948df..fb625d8da021dc0cebd7a14ca47446a0
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -398,6 +399,10 @@ function init_all() {
+@@ -324,6 +325,10 @@ function init_all() {
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);
    register_module("paneContainers", gContainersPane);
@@ -19,5 +19,5 @@ index 9d13733318e7a147adee1e44f96570c94f4948df..fb625d8da021dc0cebd7a14ca47446a0
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
  
-   if (ExperimentAPI.labsEnabled) {
+   let redesignEnabled = Services.prefs.getBoolPref(
-     // Set hidden based on previous load's hidden value or if Nimbus is
+     "browser.settings-redesign.enabled"

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 3c4b3225c672bcb172e7f946bc5f98d424e21e84..d10824470c564b6631333f197de897c21ccc19f5 100644
+index b006d5e5e64c418fbf930c010401e4ea3a3647a3..ed75c48a2cdf47dd957b0598282fb211ca2fb1b5 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -42,6 +42,8 @@
@@ -11,34 +11,58 @@ index 3c4b3225c672bcb172e7f946bc5f98d424e21e84..d10824470c564b6631333f197de897c2
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -126,6 +128,26 @@
+@@ -124,6 +126,50 @@
-         iconsrc="chrome://browser/skin/preferences/category-general.svg"
+           <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
-         data-l10n-id="pane-general-title">
+         </richlistitem>
-       </html:moz-page-nav-button>
+ 
-+      <html:moz-page-nav-button id="category-zen-looks"
++        <richlistitem id="category-zen-looks"
-+        view="paneZenLooks"
++                      class="category"
-+        iconsrc="chrome://browser/skin/customize.svg"
++                      value="paneZenLooks"
-+        data-l10n-id="pane-zen-looks-title">
++                      helpTopic="prefs-main"
-+      </html:moz-page-nav-button>
++                      data-l10n-id="category-zen-looks"
-+      <html:moz-page-nav-button id="category-zen-tabs-management"
++                      data-l10n-attrs="tooltiptext"
-+        view="paneZenTabManagement"
++                      align="center">
-+        iconsrc="chrome://browser/skin/window.svg"
++          <image class="category-icon"/>
-+        data-l10n-id="pane-zen-tabs-title">
++          <label class="category-name" flex="1" data-l10n-id="pane-zen-looks-title"></label>
-+      </html:moz-page-nav-button>
++        </richlistitem>
-+      <html:moz-page-nav-button id="category-zen-CKS"
++
-+        view="paneZenCKS"
++        <richlistitem id="category-zen-tabs-management"
-+        iconsrc="chrome://browser/skin/quickactions.svg"
++                      class="category"
-+        data-l10n-id="pane-zen-CKS-title">
++                      value="paneZenTabManagement"
-+      </html:moz-page-nav-button>
++                      helpTopic="prefs-main"
-+      <html:moz-page-nav-button id="category-zen-marketplace"
++                      data-l10n-id="category-zen-workspaces"
-+        view="paneZenMarketplace"
++                      data-l10n-attrs="tooltiptext"
-+        iconsrc="chrome://mozapps/skin/extensions/category-themes.svg"
++                      align="center">
-+        data-l10n-id="pane-zen-marketplace-title">
++          <image class="category-icon"/>
-+      </html:moz-page-nav-button>
++          <label class="category-name" flex="1" data-l10n-id="pane-zen-tabs-title"></label>
-       <html:moz-page-nav-button id="category-home"
++        </richlistitem>
-         view="paneHome"
++
-         iconsrc="chrome://browser/skin/home.svg"
++        <richlistitem id="category-zen-CKS"
-@@ -218,6 +240,10 @@
++                      class="category"
++                      value="paneZenCKS"
++                      helpTopic="prefs-main"
++                      data-l10n-id="category-zen-CKS"
++                      data-l10n-attrs="tooltiptext"
++                      align="center">
++          <image class="category-icon"/>
++          <label class="category-name" flex="1" data-l10n-id="pane-zen-CKS-title"></label>
++        </richlistitem>
++
++        <richlistitem id="category-zen-marketplace"
++                      class="category"
++                      value="paneZenMarketplace"
++                      helpTopic="prefs-main"
++                      data-l10n-id="category-zen-marketplace"
++                      data-l10n-attrs="tooltiptext"
++                      align="center">
++          <image class="category-icon"/>
++          <label class="category-name" flex="1" data-l10n-id="pane-zen-marketplace-title"></label>
++        </richlistitem>
++
+         <richlistitem id="category-home"
+                       class="category"
+                       value="paneHome"
+@@ -266,6 +312,10 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml

src/browser/components/preferences/sync-inc-xhtml.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
-index c379e1a5f82692406a92d9fcd3bca2769dfac5b2..af037dd3d995813d966524ac44a3795d0c227071 100644
+index b889d42301de3c4f845105bf09d19b052dca9eae..015b751bd46f2499a93e328c903475ce2d60d079 100644
 --- a/browser/components/preferences/sync.inc.xhtml
 +++ b/browser/components/preferences/sync.inc.xhtml
-@@ -224,6 +224,10 @@
+@@ -223,6 +223,10 @@
                      <image class="sync-engine-image sync-engine-prefs" alt=""/>
                      <label data-l10n-id="sync-currently-syncing-settings"/>
                    </html:div>

src/browser/components/preferences/zen-settings.js

@@ -8,13 +8,16 @@ const { nsZenMultiWindowFeature } = ChromeUtils.importESModule(
   { global: "current" }
 );
 
-const { nsKeyShortcutModifiers } = ChromeUtils.importESModule(
+const {
-  "chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs",
+  nsKeyShortcutModifiers,
-  {
+  ZenKeyboardShortcuts,
-    global: "current",
+  VALID_SHORTCUT_GROUPS,
-  }
+} = ChromeUtils.importESModule(
+  "resource:///modules/zen/ZenKeyboardShortcuts.sys.mjs"
 );
 
+const gZenKeyboardShortcutsManager = ZenKeyboardShortcuts.manager;
+
 var gZenMarketplaceManager = {
   async init() {
     const checkForUpdates = document.getElementById("zenThemeMarketplaceCheckForUpdates");
@@ -1124,7 +1127,7 @@ var gZenCKSSettings = {
     this._hasSafed = false;
     input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
     input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
-    input.value = modifiers.toDisplayString() + gZenKeyboardShortcutsManager.getKeyDisplay(shortcut);
+    input.value = modifiers.toDisplayString() + shortcut;
     this._latestValidKey = shortcut;
   },
 };

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 95f4960c3d8a2a4ca9bce24bcc54971877ee55ca..5bef8eeeb7cc26c930e3884e6eede6ea30f7d70a 100644
+index 71921cec2b6aa0f103856c31254fd6c4affefccb..ed13d7e2aa5ff1199872fedbc26494aae463ace4 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -129,6 +129,9 @@ const TAB_EVENTS = [
@@ -358,7 +358,7 @@ index 95f4960c3d8a2a4ca9bce24bcc54971877ee55ca..5bef8eeeb7cc26c930e3884e6eede6ea
            Glean.sessionRestore.shutdownFlushAllOutcomes.timed_out.add(1);
            deferred.resolve();
          }
-@@ -8554,6 +8616,7 @@ var SessionStoreInternal = {
+@@ -8552,6 +8614,7 @@ var SessionStoreInternal = {
      if (
        !savedTabGroupState.tabs.length ||
        this.getSavedTabGroup(savedTabGroupState.id)

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 2c13f19ec4f962ce3ecaface0ae5d00c50ca913f..eb696819a1af4cfae6352fc5696fd95590bed342 100644
+index ae85009ad8f0a1cc6d3f3a890b27178df99e5ece..a432f7ee5d3f92bf623ff6d00d5b68ab7a6ecbe7 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
-@@ -834,7 +834,7 @@ var SidebarController = {
+@@ -807,7 +807,7 @@ var SidebarController = {
    setPosition() {
      // First reset all ordinals to match DOM ordering.
      let contentArea = document.getElementById("tabbrowser-tabbox");

src/browser/components/tabbrowser/AsyncTabSwitcher-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-index eebff0f59df42d3ef075f3eea1bd9269c47ba80d..6ab43a810f4cb61eedc02bb42026f6b5e282e785 100644
+index 9c5e92fbd555d328ce09c0cf0ff8078584f68478..2af7a428bc830d8c12b3d3c0af375c97e6942994 100644
 --- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 +++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-@@ -938,6 +938,7 @@ export class AsyncTabSwitcher {
+@@ -939,6 +939,7 @@ export class AsyncTabSwitcher {
        this.tabbrowser._printPreviewBrowsers.has(browser) ||
        this.tabbrowser.splitViewBrowsers.includes(browser) ||
        lazy.PictureInPicture.isOriginatingBrowser(browser)

src/browser/components/tabbrowser/TabUnloader-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/TabUnloader.sys.mjs b/browser/components/tabbrowser/TabUnloader.sys.mjs
-index a6d6c5405f98c839b7c0f2007e053e874bb7ce07..9d8c6066ce917e15fbf9e19284a3db50aa5a3815 100644
+index aefccef39f0b81176a5710a794e8a5e2650d6507..53c838b3bc322cadee4ef9b411d02fc0af8c35e5 100644
 --- a/browser/components/tabbrowser/TabUnloader.sys.mjs
 +++ b/browser/components/tabbrowser/TabUnloader.sys.mjs
-@@ -51,7 +51,7 @@ let CRITERIA_WEIGHT = 1;
+@@ -52,7 +52,7 @@ let CRITERIA_WEIGHT = 1;
   */
  let DefaultTabUnloaderMethods = {
    isNonDiscardable(tab, weight) {
@@ -11,7 +11,7 @@ index a6d6c5405f98c839b7c0f2007e053e874bb7ce07..9d8c6066ce917e15fbf9e19284a3db50
        return weight;
      }
  
-@@ -105,7 +105,7 @@ let DefaultTabUnloaderMethods = {
+@@ -106,7 +106,7 @@ let DefaultTabUnloaderMethods = {
  
    *iterateTabs() {
      for (let win of Services.wm.getEnumerator("navigator:browser")) {

src/browser/components/tabbrowser/content/browser-ctrlTab-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/browser-ctrlTab.js b/browser/components/tabbrowser/content/browser-ctrlTab.js
-index 727e21f1754b0842080d8f3e29060baad445df66..ee9df3a311fc72954e064a2cbc56b716d116314a 100644
+index b435917892ac77fb433ea709f2524db2f2347a1d..fcbfeb92f3ae4effbfd3333514ed4d412e3063c6 100644
 --- a/browser/components/tabbrowser/content/browser-ctrlTab.js
 +++ b/browser/components/tabbrowser/content/browser-ctrlTab.js
 @@ -252,7 +252,8 @@ var ctrlTab = {
@@ -30,7 +30,7 @@ index 727e21f1754b0842080d8f3e29060baad445df66..ee9df3a311fc72954e064a2cbc56b716
        return;
      }
  
-@@ -759,7 +760,7 @@ var ctrlTab = {
+@@ -751,7 +752,7 @@ var ctrlTab = {
    _initRecentlyUsedTabs() {
      this._recentlyUsedTabs = Array.prototype.filter.call(
        gBrowser.tabs,

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 ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c85280e74993 100644
+index b93a8fcc8b76ed888524959cbe7d6865fe830f2f..9f39316e33daa8a272e48c84d9e07ad9df197586 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
 @@ -35,6 +35,9 @@
@@ -73,7 +73,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
  
          if (this._tabbrowserTabs.isContainerVerticalPinnedGrid(draggedTab)) {
            // Update both translate axis for pinned vertical expanded tabs
-@@ -392,11 +403,13 @@
+@@ -390,11 +401,13 @@
            this._dragToPinPromoCard,
          ];
          let shouldPin =
@@ -87,7 +87,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
            isTab(draggedTab) &&
            draggedTab.pinned &&
            this._tabbrowserTabs.arrowScrollbox.contains(event.target);
-@@ -466,6 +479,7 @@
+@@ -458,6 +471,7 @@
            }
          }
  
@@ -95,7 +95,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
          if (shouldTranslate) {
            let translationPromises = [];
            for (let item of movingTabs) {
-@@ -477,7 +491,7 @@
+@@ -469,7 +483,7 @@
                  item.removeAttribute("tabdrop-samewindow");
                  resolve();
                };
@@ -104,7 +104,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -552,7 +566,7 @@
+@@ -544,7 +558,7 @@
            if (tab.selected) {
              selectedTab = tab;
              indexForSelectedTab = newIndex;
@@ -113,7 +113,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
              const droppedIntoPinnedArea = dropIndex < gBrowser.pinnedTabCount;
              const newSplitView = gBrowser.adoptSplitView(tab, {
                elementIndex: droppedIntoPinnedArea
-@@ -577,7 +591,7 @@
+@@ -569,7 +583,7 @@
              }
            }
          }
@@ -122,7 +122,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
            const newTab = gBrowser.adoptTab(selectedTab, {
              elementIndex: indexForSelectedTab,
              selectTab: selectedTab == draggedTab,
-@@ -611,10 +625,6 @@
+@@ -603,10 +617,6 @@
                this._tabbrowserTabs.dragAndDropElements[
                  gBrowser.pinnedTabCount + unpinnedSplitViews.length - 1
                ];
@@ -133,7 +133,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
            }
          }
        } else {
-@@ -664,6 +674,7 @@
+@@ -655,6 +665,7 @@
  
            let nextItem = this._tabbrowserTabs.dragAndDropElements[newIndex];
            let tabGroup = isTab(nextItem) && nextItem.group;
@@ -141,7 +141,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
            gBrowser.loadTabs(urls, {
              inBackground,
              replace,
-@@ -705,7 +716,16 @@
+@@ -696,7 +707,16 @@
          this._expandGroupOnDrop(draggedTab);
        }
        this._resetTabsAfterDrop(draggedTab.ownerDocument);
@@ -159,7 +159,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
-@@ -918,11 +938,10 @@
+@@ -909,11 +929,10 @@
          return this.#getHorizontalScrollboxDragTarget(event, ignoreSides);
        }
        while (target) {
@@ -175,7 +175,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
            break;
          }
          target = target.parentNode;
-@@ -952,6 +971,9 @@
+@@ -943,6 +962,9 @@
            return null;
          }
        }
@@ -185,7 +185,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
        return target;
      }
  
-@@ -1011,7 +1033,8 @@
+@@ -1002,7 +1024,8 @@
          isTabGroupLabel(draggedTab) &&
          draggedTab._dragData?.expandGroupOnDrop
        ) {
@@ -195,7 +195,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
        }
      }
  
-@@ -1195,7 +1218,6 @@
+@@ -1186,7 +1209,6 @@
          // using updateDragImage. On Linux, we can use a panel.
          if (platform == "win" || platform == "macosx") {
            captureListener = function () {
@@ -203,7 +203,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
            };
          } else {
            // Create a panel to use it in setDragImage
-@@ -1233,7 +1255,6 @@
+@@ -1224,7 +1246,6 @@
          );
          dragImageOffset = dragImageOffset * scale;
        }
@@ -211,7 +211,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
  
        // _dragData.offsetX/Y give the coordinates that the mouse should be
        // positioned relative to the corner of the new window created upon
-@@ -1252,7 +1273,7 @@
+@@ -1243,7 +1264,7 @@
        let dropEffect = this.getDropEffectForTabDrag(event);
        let isMovingInTabStrip = !fromTabList && dropEffect == "move";
        let collapseTabGroupDuringDrag =
@@ -220,7 +220,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
  
        tab._dragData = {
          offsetX: this._tabbrowserTabs.verticalMode
-@@ -1262,7 +1283,7 @@
+@@ -1253,7 +1274,7 @@
            ? event.screenY - window.screenY - tabOffset
            : event.screenY - window.screenY,
          scrollPos:
@@ -229,7 +229,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
              ? this._tabbrowserTabs.pinnedTabsContainer.scrollPosition
              : this._tabbrowserTabs.arrowScrollbox.scrollPosition,
          screenX: event.screenX,
-@@ -1309,6 +1330,7 @@
+@@ -1300,6 +1321,7 @@
        if (tabStripItemElement.hasAttribute("dragtarget")) {
          return;
        }
@@ -237,7 +237,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
        let isPinned = tab.pinned;
        let dragAndDropElements = this._tabbrowserTabs.dragAndDropElements;
        let isGrid = this._tabbrowserTabs.isContainerVerticalPinnedGrid(tab);
-@@ -1675,23 +1697,6 @@
+@@ -1666,23 +1688,6 @@
  
        // Slide the relevant tabs to their new position.
        // non-moving tabs adjust for RTL
@@ -261,7 +261,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
        // moving tabs don't adjust for RTL
        for (let item of selectedElements) {
          if (
-@@ -1740,7 +1745,6 @@
+@@ -1731,7 +1736,6 @@
        for (let item of this._tabbrowserTabs.dragAndDropElements) {
          delete item._moveTogetherSelectedTabsData;
          item = elementToMove(item);
@@ -269,7 +269,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
          item.removeAttribute("multiselected-move-together");
        }
      }
-@@ -2587,7 +2591,6 @@
+@@ -2578,7 +2582,6 @@
          tab.style.top = "";
          tab.style.maxWidth = "";
          tab.style.pointerEvents = "";
@@ -277,7 +277,7 @@ index ea4f83fad1757f073ea1bbe5c93a4ebe5ecc0abe..904e604e28c96757fabf0dd3a749c852
          tab.removeAttribute("small-stack");
          tab.removeAttribute("big-stack");
        }
-@@ -2596,11 +2599,9 @@
+@@ -2587,11 +2590,9 @@
        )) {
          label.style.width = "";
          label.style.maxWidth = "";

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 b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d645641cd 100644
+index 2e02bad1a7c89b4c3b5aee1e14c13bb953a64eb6..fb9ec4deb5871bc0ba57c323a413f07440e9aa42 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -140,16 +140,7 @@ index b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d
          event.target.classList.contains("tab-icon-overlay") ||
          event.target.classList.contains("tab-audio-button")
        ) {
-@@ -572,7 +607,7 @@
+@@ -594,6 +629,10 @@
-           }
-         } else if (
-           event.altKey &&
--          Services.prefs.getBoolPref("browser.tabs.splitView.enabled", false)
-+          true
-         ) {
-           eventMaySelectTab = false;
-         } else if (!this.selected && this.multiselected) {
-@@ -597,6 +632,10 @@
        this.style.MozUserFocus = "";
      }
  
@@ -160,7 +151,7 @@ index b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d
      on_click(event) {
        if (event.button != 0) {
          return;
-@@ -620,14 +659,31 @@
+@@ -617,14 +656,31 @@
              trigger: "alt_click",
            });
          }
@@ -193,7 +184,7 @@ index b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d
          gBrowser.multiSelectedTabsCount > 0 &&
          !event.target.classList.contains("tab-close-button") &&
          !event.target.classList.contains("tab-icon-overlay") &&
-@@ -639,8 +695,9 @@
+@@ -636,8 +692,9 @@
        }
  
        if (
@@ -205,7 +196,7 @@ index b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d
        ) {
          if (this.activeMediaBlocked) {
            if (this.multiselected) {
-@@ -658,7 +715,7 @@
+@@ -655,7 +712,7 @@
          return;
        }
  
@@ -214,7 +205,7 @@ index b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d
          if (this.multiselected) {
            gBrowser.removeMultiSelectedTabs(
              lazy.TabMetrics.userTriggeredContext(
-@@ -678,6 +735,14 @@
+@@ -675,6 +732,14 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
@@ -229,7 +220,7 @@ index b9381999a77ecacdb95c69494ac8972e9f13d14d..a210b53bb46373f8bab532a00b25301d
      }
  
      on_dblclick(event) {
-@@ -701,6 +766,8 @@
+@@ -698,6 +763,8 @@
            animate: true,
            triggeringEvent: event,
          });

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 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88f4eec282 100644
+index 2643e1a2aa14ba5cb4a64a92e1c2dfa5f07d242f..3a21c40eb70621968b5fbfc4b9b6d8412310b7b7 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -502,6 +502,7 @@
+@@ -413,6 +413,7 @@
       * @type {MozBrowser[]}
       */
      get splitViewBrowsers() {
@@ -10,7 +10,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        const browsers = [];
        if (this.#activeSplitView) {
          for (const tab of this.#activeSplitView.tabs) {
-@@ -575,15 +576,66 @@
+@@ -486,15 +487,66 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -79,7 +79,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -659,6 +711,10 @@
+@@ -570,6 +622,10 @@
          userContextId = parseInt(tabArgument.getAttribute("usercontextid"), 10);
        }
  
@@ -90,7 +90,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        if (tabArgument && tabArgument.linkedBrowser) {
          remoteType = tabArgument.linkedBrowser.remoteType;
          initialBrowsingContextGroupId =
-@@ -751,6 +807,8 @@
+@@ -662,6 +718,8 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -99,7 +99,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -1121,13 +1179,18 @@
+@@ -1032,13 +1090,18 @@
        }
  
        this.showTab(aTab);
@@ -119,7 +119,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -1140,11 +1203,19 @@
+@@ -1051,11 +1114,19 @@
        }
  
        this.#handleTabMove(aTab, () => {
@@ -140,7 +140,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1321,6 +1392,9 @@
+@@ -1232,6 +1303,9 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -150,7 +150,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        if (
          aIconURL &&
          !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1330,6 +1404,9 @@
+@@ -1241,6 +1315,9 @@
          );
          return;
        }
@@ -160,7 +160,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1652,7 +1729,6 @@
+@@ -1563,7 +1640,6 @@
  
        // Preview mode should not reset the owner
        if (!this._previewMode && !oldTab.selected) {
@@ -168,7 +168,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        }
  
        let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1743,6 +1819,7 @@
+@@ -1654,6 +1730,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -176,7 +176,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1957,6 +2034,9 @@
+@@ -1868,6 +1945,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -186,7 +186,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1995,7 +2075,7 @@
+@@ -1906,7 +1986,7 @@
        // Focus the location bar if it was previously focused for that tab.
        // In full screen mode, only bother making the location bar visible
        // if the tab is a blank one.
@@ -195,7 +195,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          let selectURL = () => {
            if (this._asyncTabSwitching) {
              // Set _awaitingSetURI flag to suppress popup notification
-@@ -2283,7 +2363,12 @@
+@@ -2194,7 +2274,12 @@
        return this._setTabLabel(aTab, aLabel);
      }
  
@@ -206,10 +206,10 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
 +      }
 +      aLabel = (typeof aTab.zenStaticLabel === "string" && aTab.zenStaticLabel) ? aTab.zenStaticLabel : aLabel;
 +      gZenPinnedTabManager.onTabLabelChanged(aTab);
-       if (!aLabel || (isURL && /^about:reader\?url=/.test(aLabel))) {
+       if (!aLabel || aLabel.includes("about:reader?")) {
          return false;
        }
-@@ -2408,7 +2493,7 @@
+@@ -2319,7 +2404,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -218,7 +218,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2685,6 +2770,7 @@
+@@ -2599,6 +2684,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -226,7 +226,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2758,8 +2844,7 @@
+@@ -2672,8 +2758,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -236,7 +236,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          b.setAttribute("transparent", "true");
        }
  
-@@ -2929,7 +3014,7 @@
+@@ -2843,7 +2928,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -245,7 +245,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2989,8 +3074,8 @@
+@@ -2903,8 +2988,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) {
@@ -256,7 +256,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -3175,7 +3260,6 @@
+@@ -3089,7 +3174,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -264,7 +264,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -3285,6 +3369,9 @@
+@@ -3199,6 +3283,9 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -274,7 +274,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -3295,10 +3382,17 @@
+@@ -3209,10 +3296,17 @@
          );
        }
  
@@ -292,7 +292,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        // If we're opening a foreground tab, set the owner by default.
        ownerTab ??= inBackground ? null : this.selectedTab;
  
-@@ -3306,6 +3400,7 @@
+@@ -3220,6 +3314,7 @@
        if (this.selectedTab.owner) {
          this.selectedTab.owner = null;
        }
@@ -300,7 +300,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        // Find the tab that opened this one, if any. This is used for
        // determining positioning, and inherited attributes such as the
-@@ -3358,6 +3453,22 @@
+@@ -3272,6 +3367,22 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -323,7 +323,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -3366,6 +3477,7 @@
+@@ -3280,6 +3391,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -331,7 +331,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -3384,6 +3496,7 @@
+@@ -3298,6 +3410,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -339,7 +339,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          }));
  
          if (focusUrlBar) {
-@@ -3508,6 +3621,12 @@
+@@ -3422,6 +3535,12 @@
          }
        }
  
@@ -352,7 +352,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3750,6 +3869,7 @@
+@@ -3729,6 +3848,7 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -360,7 +360,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        } = {}
      ) {
        if (
-@@ -3760,9 +3880,6 @@
+@@ -3739,9 +3859,6 @@
              !this.isSplitViewWrapper(tabOrSplitView)
          )
        ) {
@@ -370,7 +370,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        }
  
        if (!color) {
-@@ -3783,9 +3900,14 @@
+@@ -3762,9 +3879,14 @@
          label,
          isAdoptingGroup
        );
@@ -387,7 +387,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        );
        group.addTabs(tabsAndSplitViews);
  
-@@ -3906,7 +4028,7 @@
+@@ -3885,7 +4007,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -396,7 +396,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        );
      }
  
-@@ -3990,6 +4112,7 @@
+@@ -3969,6 +4091,7 @@
          color: group.color,
          insertBefore: newTabs[0],
          isAdoptingGroup: true,
@@ -404,7 +404,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        });
      }
  
-@@ -4200,6 +4323,7 @@
+@@ -4179,6 +4302,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -412,7 +412,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -4269,6 +4393,7 @@
+@@ -4248,6 +4372,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -420,7 +420,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          });
        }
  
-@@ -4482,9 +4607,9 @@
+@@ -4461,9 +4586,9 @@
          }
  
          // Add a new tab if needed.
@@ -432,7 +432,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -4521,8 +4646,10 @@
+@@ -4500,8 +4625,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -444,7 +444,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
            if (select) {
              tabToSelect = tab;
            }
-@@ -4544,7 +4671,8 @@
+@@ -4523,7 +4650,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -454,7 +454,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -4564,7 +4692,10 @@
+@@ -4543,7 +4671,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -466,7 +466,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4619,9 +4750,21 @@
+@@ -4598,9 +4729,21 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -488,7 +488,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4812,11 +4955,14 @@
+@@ -4791,11 +4934,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -504,7 +504,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4828,7 +4974,7 @@
+@@ -4807,7 +4953,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -513,7 +513,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
              tabGroup = previousTab.group;
            }
            if (
-@@ -4844,7 +4990,7 @@
+@@ -4823,7 +4969,7 @@
                  previousTab.splitview
                ) + 1;
            } else if (previousTab.visible) {
@@ -522,7 +522,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4872,14 +5018,14 @@
+@@ -4851,14 +4997,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -541,7 +541,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4896,7 +5042,7 @@
+@@ -4875,7 +5021,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -550,7 +550,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          if (
            (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
            this.isSplitViewWrapper(itemAfter)
-@@ -4927,7 +5073,11 @@
+@@ -4906,7 +5052,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -562,7 +562,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        }
  
        if (tab.group?.collapsed) {
-@@ -4942,6 +5092,7 @@
+@@ -4921,6 +5071,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -570,7 +570,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        TabBarVisibility.update();
      }
-@@ -5490,6 +5641,7 @@
+@@ -5469,6 +5620,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -578,7 +578,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -5579,6 +5731,7 @@
+@@ -5558,6 +5710,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -586,7 +586,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        } catch (e) {
          console.error(e);
        }
-@@ -5624,6 +5777,14 @@
+@@ -5603,6 +5756,14 @@
          return;
        }
  
@@ -601,7 +601,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        let isVisibleTab = aTab.visible;
        // We have to sample the tab width now, since _beginRemoveTab might
        // end up modifying the DOM in such a way that aTab gets a new
-@@ -5631,6 +5792,9 @@
+@@ -5610,6 +5771,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -611,7 +611,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5642,13 +5806,14 @@
+@@ -5621,13 +5785,14 @@
            telemetrySource,
          })
        ) {
@@ -627,7 +627,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -5679,7 +5844,13 @@
+@@ -5658,7 +5823,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -642,7 +642,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          return;
        }
  
-@@ -5813,7 +5984,7 @@
+@@ -5792,7 +5963,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -651,7 +651,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5837,6 +6008,7 @@
+@@ -5816,6 +5987,7 @@
  
          newTab = true;
        }
@@ -659,7 +659,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5877,13 +6049,7 @@
+@@ -5856,13 +6028,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -674,7 +674,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        } else {
          TabBarVisibility.update();
        }
-@@ -6016,6 +6182,7 @@
+@@ -5995,6 +6161,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -682,7 +682,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -6201,6 +6368,7 @@
+@@ -6180,6 +6347,7 @@
          memory_after: await getTotalMemoryUsage(),
          time_to_unload_in_ms: timeElapsed,
        });
@@ -690,7 +690,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
      }
  
      /**
-@@ -6246,6 +6414,7 @@
+@@ -6225,6 +6393,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -698,7 +698,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -6258,15 +6427,22 @@
+@@ -6237,15 +6406,22 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -723,7 +723,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        let tab = this.tabContainer.findNextTab(aTab, {
          direction: 1,
          filter: _tab => remainingTabs.includes(_tab),
-@@ -6280,7 +6456,7 @@
+@@ -6259,7 +6435,7 @@
        }
  
        if (tab) {
@@ -732,7 +732,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -6301,7 +6477,7 @@
+@@ -6280,7 +6456,7 @@
          });
        }
  
@@ -741,7 +741,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
      }
  
      _blurTab(aTab) {
-@@ -6312,7 +6488,7 @@
+@@ -6291,7 +6467,7 @@
       * @returns {boolean}
       *   False if swapping isn't permitted, true otherwise.
       */
@@ -750,7 +750,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        // Do not allow transfering a private tab to a non-private window
        // and vice versa.
        if (
-@@ -6366,6 +6542,7 @@
+@@ -6345,6 +6521,7 @@
        // fire the beforeunload event in the process.  Close the other
        // window if this was its last tab.
        if (
@@ -758,7 +758,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          !remoteBrowser._beginRemoveTab(aOtherTab, {
            adoptedByTab: aOurTab,
            closeWindowWithLastTab: true,
-@@ -6377,7 +6554,7 @@
+@@ -6356,7 +6533,7 @@
        // If this is the last tab of the window, hide the window
        // immediately without animation before the docshell swap, to avoid
        // about:blank being painted.
@@ -767,7 +767,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        if (closeWindow) {
          let win = aOtherTab.ownerGlobal;
          win.windowUtils.suppressAnimation(true);
-@@ -6511,11 +6688,13 @@
+@@ -6484,11 +6661,13 @@
        }
  
        // Finish tearing down the tab that's going away.
@@ -781,7 +781,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        this.setTabTitle(aOurTab);
  
-@@ -6717,10 +6896,10 @@
+@@ -6690,10 +6869,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -794,7 +794,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6780,7 +6959,8 @@
+@@ -6753,7 +6932,8 @@
       * @param {object} [aOptions={}]
       *   Key-value pairs that will be serialized into the features string.
       */
@@ -804,7 +804,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6797,7 +6977,7 @@
+@@ -6770,7 +6950,7 @@
        // tell a new window to take the "dropped" tab
        let args = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
        args.appendElement(aTab.splitview ?? aTab);
@@ -813,7 +813,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          private: PrivateBrowsingUtils.isWindowPrivate(window),
          features: Object.entries(aOptions)
            .map(([key, value]) => `${key}=${value}`)
-@@ -6805,6 +6985,8 @@
+@@ -6778,6 +6958,8 @@
          openerWindow: window,
          args,
        });
@@ -822,7 +822,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
      }
  
      /**
-@@ -6917,7 +7099,7 @@
+@@ -6890,7 +7072,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -831,7 +831,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
      }
  
      /**
-@@ -7002,8 +7184,8 @@
+@@ -6975,8 +7157,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -842,7 +842,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -7049,8 +7231,8 @@
+@@ -7005,13 +7187,19 @@
        this.#handleTabMove(
          element,
          () => {
@@ -853,9 +853,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
              neighbor = neighbor.group;
            }
            if (neighbor?.splitview) {
-@@ -7061,6 +7243,12 @@
+             neighbor = neighbor.splitview;
-               return;
-             }
            }
 +          if (element.group?.hasAttribute("split-view-group")) {
 +            element = element.group;
@@ -863,10 +861,10 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
 +          if (element.group?.hasAttribute("split-view-group") && neighbor == element.group) {
 +            return;
 +          }
- 
+           let useAfter = false;
-           if (movingForwards && neighbor) {
+           if (this.isTab(element)) {
-             neighbor.after(element);
+             useAfter = neighbor && tabIndex > element._tPos;
-@@ -7119,23 +7307,31 @@
+@@ -7076,23 +7264,31 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -904,7 +902,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        } 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
-@@ -7148,12 +7344,35 @@
+@@ -7105,12 +7301,35 @@
          //    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.
@@ -941,7 +939,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        // We want to include the splitview wrapper if it's the targetElement, but
        // not in the case where we want to reverse tabs within the same splitview.
-@@ -7162,6 +7381,7 @@
+@@ -7119,6 +7338,7 @@
        }
  
        let getContainer = () =>
@@ -949,7 +947,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -7170,11 +7390,15 @@
+@@ -7127,11 +7347,15 @@
          element,
          () => {
            if (moveBefore) {
@@ -966,7 +964,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
            }
          },
          metricsContext
-@@ -7248,11 +7472,15 @@
+@@ -7205,11 +7429,15 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -985,7 +983,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
          return;
-@@ -7324,6 +7552,7 @@
+@@ -7281,6 +7509,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -993,7 +991,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -7355,7 +7584,7 @@
+@@ -7312,7 +7541,7 @@
        let changedSplitView =
          previousTabState.splitViewId != currentTabState.splitViewId;
  
@@ -1002,7 +1000,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -7402,6 +7631,10 @@
+@@ -7354,6 +7583,10 @@
  
        moveActionCallback();
  
@@ -1013,7 +1011,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7452,7 +7685,22 @@
+@@ -7404,7 +7637,22 @@
       * @returns {object}
       *    The new tab in the current window, null if the tab couldn't be adopted.
       */
@@ -1037,7 +1035,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        // Swap the dropped tab with a new one we create and then close
        // it in the other window (making it seem to have moved between
        // windows). We also ensure that the tab we create to swap into has
-@@ -7495,6 +7743,8 @@
+@@ -7447,6 +7695,8 @@
        }
        params.skipLoad = true;
        let newTab = this.addWebTab("about:blank", params);
@@ -1046,7 +1044,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
        aTab.container.tabDragAndDrop.finishAnimateTabMove();
  
-@@ -8205,7 +8455,7 @@
+@@ -8149,7 +8399,7 @@
          // preventDefault(). It will still raise the window if appropriate.
          return;
        }
@@ -1055,7 +1053,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        window.focus();
        aEvent.preventDefault();
      }
-@@ -8222,7 +8472,6 @@
+@@ -8166,7 +8416,6 @@
  
      on_TabGroupCollapse(aEvent) {
        aEvent.target.tabs.forEach(tab => {
@@ -1063,7 +1061,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
        });
      }
  
-@@ -8556,7 +8805,9 @@
+@@ -8500,7 +8749,9 @@
  
          let filter = this._tabFilters.get(tab);
          if (filter) {
@@ -1073,7 +1071,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
  
            let listener = this._tabListeners.get(tab);
            if (listener) {
-@@ -9359,6 +9610,7 @@
+@@ -9306,6 +9557,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -1081,7 +1079,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -9439,6 +9691,7 @@
+@@ -9386,6 +9638,7 @@
          // known defaults. Note we use the original URL since about:newtab
          // redirects to a prerendered page.
          const shouldRemoveFavicon =
@@ -1089,7 +1087,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
            !this.mBrowser.mIconURL &&
            !ignoreBlank &&
            !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9613,13 +9866,6 @@
+@@ -9560,13 +9813,6 @@
              this.mBrowser.originalURI = aRequest.originalURI;
            }
  
@@ -1103,7 +1101,7 @@ index 43fb79a3060e20f671ae6ffc26350c7abf497702..146b1559b8430773bd4ec173a8f4fe88
          }
  
          let userContextId = this.mBrowser.getAttribute("usercontextid") || 0;
-@@ -10507,7 +10753,8 @@ var TabContextMenu = {
+@@ -10450,7 +10696,8 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;

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 d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a064fea9b 100644
+index 65c89aab0902cb33ad33fc523d3e0b954618778e..b42298457fdd2f8df6ff202c804122ffc999d409 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -14,11 +14,11 @@
@@ -147,7 +147,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a
          });
      }
  
-@@ -478,13 +511,68 @@
+@@ -478,13 +511,65 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
@@ -162,9 +162,8 @@ index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a
 +        tabsCollect.push(item);
 +        if (gBrowser.isTabGroup(item)) {
 +          tabsCollect.push(...item.tabs);
-         }
++        }
-       }
++      }
--      return childrenArray.filter(node => node.matches("tab"));
 +      return tabsCollect.filter(node => node.matches("tab"));
 +    }
 +
@@ -190,8 +189,9 @@ index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a
 +            result.push(labelContainer);
 +          }
 +          result.push(...item.childGroupsAndTabs);
-+        }
+         }
-+      }
+       }
+-      return childrenArray.filter(node => node.matches("tab"));
 +      return result;
 +    }
 +
@@ -210,9 +210,6 @@ index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a
 +          return false;
 +        }
 +      }
-+      if (this.pinned && gZenWorkspaces.activeWorkspaceElement?.hasCollapsedPinnedTabs) {
-+        return false;
-+      }
 +      return true;
 +    }
 +
@@ -221,7 +218,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a
      }
  
      /**
-@@ -592,7 +680,6 @@
+@@ -592,7 +677,6 @@
            );
          } else {
            if (tabOrSplitView.pinned) {
@@ -229,7 +226,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a
            }
            let tabToMove =
              this.ownerGlobal === tabOrSplitView.ownerGlobal
-@@ -661,7 +748,7 @@
+@@ -661,7 +745,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -238,7 +235,7 @@ index d1be14df27d76a191eaff05502c030fd68c46738..e9b5e90e39b594a6119081c8d707fb4a
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -740,5 +827,6 @@
+@@ -740,5 +824,6 @@
      }
    }
  

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 bb0189fbfc91b3fc3b399b077a35f7b60a3f985f..c4dd60c6fb6d7eb2288a033708836f9983530e2c 100644
+index da0a9c73118886d535d574810de8141cb96e54ba..104062e2c0142bd08a4498e7ca282fc46cda09be 100644
 --- a/browser/components/urlbar/UrlbarController.sys.mjs
 +++ b/browser/components/urlbar/UrlbarController.sys.mjs
-@@ -305,7 +305,6 @@ export class UrlbarController {
+@@ -304,7 +304,6 @@ export class UrlbarController {
      const isMac = AppConstants.platform == "macosx";
      // Handle readline/emacs-style navigation bindings on Mac.
      if (
@@ -10,7 +10,7 @@ index bb0189fbfc91b3fc3b399b077a35f7b60a3f985f..c4dd60c6fb6d7eb2288a033708836f99
        this.view.isOpen &&
        event.ctrlKey &&
        (event.key == "n" || event.key == "p")
-@@ -456,6 +455,8 @@ export class UrlbarController {
+@@ -455,6 +454,8 @@ export class UrlbarController {
              });
            }
            event.preventDefault();

src/browser/components/urlbar/UrlbarMuxerStandard-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
-index 16041c10755adced9d665539796737a9f55712de..2232bdcc02e20dbb384ca0529a8bd8ce73dc6284 100644
+index 136c66310f37bda3229b82eef32a4a22a716a0b0..4ca15850002cefda0484179839280e58eaf42cfa 100644
 --- a/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
 +++ b/browser/components/urlbar/UrlbarMuxerStandard.sys.mjs
 @@ -837,11 +837,16 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
@@ -19,7 +19,7 @@ index 16041c10755adced9d665539796737a9f55712de..2232bdcc02e20dbb384ca0529a8bd8ce
        // Discard the result if a tab-to-search result was added already.
        if (!state.canAddTabToSearch) {
          return false;
-@@ -1491,7 +1496,9 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
+@@ -1490,7 +1495,9 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
        usedLimits.maxResultCount++;
      }
  

src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-index d9048a3b8b1f18745c01e40e12f529db3cfaa79e..1ba124a710fcf734ea11f7ccfd4f2f6ebe53e7d2 100644
+index 08455d8d5da233639ccebc0e77c0810fb4f674c3..da8092b561c3dd8864e57f5a52a1a643db29ace1 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 @@ -913,6 +913,7 @@ export class Query {

src/browser/components/urlbar/UrlbarResult-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs
-index 21f7938f76375e7230f9509e4932cafa4d0e57f2..ab96b160b6c65da3bf267d9fe2f1f35c7507466e 100644
+index 65b8fb67b51c8959fe1d47b98efbb2bca591eafc..c52c50a87b37ca1c885c55b36e5beccc8dd7c5fb 100644
 --- a/browser/components/urlbar/UrlbarResult.sys.mjs
 +++ b/browser/components/urlbar/UrlbarResult.sys.mjs
 @@ -181,6 +181,10 @@ export class UrlbarResult {

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 62367c5a77614e5973791abacd068b39e0f3ab34..c930943b5bfa8a2e6dee43f0ec7a10274a7c7638 100644
+index 64afd613f454edd7786fcc1e2f307a582e4d5f51..92f91379f43785cf5417c96b178884c860db6bd3 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -109,6 +109,8 @@ export var UrlbarUtils = {
+@@ -85,6 +85,8 @@ export var UrlbarUtils = {
      RESTRICT_SEARCH_KEYWORD: "restrictSearchKeyword",
      SUGGESTED_INDEX: "suggestedIndex",
      TAIL_SUGGESTION: "tailSuggestion",
@@ -11,7 +11,7 @@ index 62367c5a77614e5973791abacd068b39e0f3ab34..c930943b5bfa8a2e6dee43f0ec7a1027
    }),
  
    // Defines provider types.
-@@ -170,6 +172,8 @@ export var UrlbarUtils = {
+@@ -146,6 +148,8 @@ export var UrlbarUtils = {
      OTHER_NETWORK: 6,
      ADDON: 7,
      ACTIONS: 8,
@@ -20,9 +20,9 @@ index 62367c5a77614e5973791abacd068b39e0f3ab34..c930943b5bfa8a2e6dee43f0ec7a1027
    }),
  
    // Per-result exposure telemetry.
-@@ -319,6 +323,14 @@ export var UrlbarUtils = {
+@@ -295,6 +299,14 @@ export var UrlbarUtils = {
          telemetryLabel: "actions",
-         uiLabel: "urlbar-searchmode-actions2",
+         uiLabel: "urlbar-searchmode-actions",
        },
 +      {
 +        source: this.RESULT_SOURCE.WORKSPACES,
@@ -35,7 +35,7 @@ index 62367c5a77614e5973791abacd068b39e0f3ab34..c930943b5bfa8a2e6dee43f0ec7a1027
      ]);
    },
  
-@@ -611,6 +623,12 @@ export var UrlbarUtils = {
+@@ -587,6 +599,12 @@ export var UrlbarUtils = {
            return this.RESULT_GROUP.HEURISTIC_FALLBACK;
          case "UrlbarProviderHistoryUrlHeuristic":
            return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;

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 344a9a5b969e679040a650dad311c7413f52bbbd..24111cef5e476253f4e69c4d99f6f220bfd8cd7e 100644
+index f28d277764158566bc9406ce0e6160d92d346a63..82dd5f8568ec1b12e87676e5c2b243824628b5af 100644
 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 @@ -77,7 +77,7 @@ export class UrlbarValueFormatter {
@@ -11,26 +11,7 @@ index 344a9a5b969e679040a650dad311c7413f52bbbd..24111cef5e476253f4e69c4d99f6f220
      });
    }
  
-@@ -105,6 +105,18 @@ export class UrlbarValueFormatter {
+@@ -371,7 +371,7 @@ export class UrlbarValueFormatter {
-   }
- 
-   #ensureFormattedHostVisible(urlMetaData) {
-+    // Make sure the domain is visible even with long subdomains when the single sidebar is being used
-+    if (
-+      this.#window.gZenVerticalTabsManager?._hasSetSingleToolbar
-+      && Services.prefs.getBoolPref("zen.urlbar.show-domain-only-in-sidebar")
-+    ) {
-+      // also compare the difference in width from this and the urlbar input, to avoid scrolling 
-+      // when urlbar buttons are showing.
-+      const urlbarInputWidth = this.#window.windowUtils.getBoundsWithoutFlushing(this.#window.gURLBar).width;
-+      const inputFieldWidth = this.#window.windowUtils.getBoundsWithoutFlushing(this.#inputField).width;
-+      this.#inputField.scrollLeft = (this.#inputField.scrollLeftMax - (urlbarInputWidth - inputFieldWidth) );
-+      return;
-+    }
-     // Make sure the host is always visible. Since it is aligned on
-     // the first strong directional character, we set scrollLeft
-     // appropriately to ensure the domain stays visible in case of an
-@@ -371,7 +383,7 @@ export class UrlbarValueFormatter {
     * @returns {boolean}
     *   True if formatting was applied and false if not.
     */
@@ -39,7 +20,7 @@ index 344a9a5b969e679040a650dad311c7413f52bbbd..24111cef5e476253f4e69c4d99f6f220
      let urlMetaData = this.#getUrlMetaData();
      if (!urlMetaData) {
        return false;
-@@ -640,6 +652,7 @@ export class UrlbarValueFormatter {
+@@ -640,6 +640,7 @@ export class UrlbarValueFormatter {
        this.#window.requestAnimationFrame(() => {
          if (instance == this.#resizeInstance) {
            this.#ensureFormattedHostVisible();

src/browser/components/urlbar/content/UrlbarInput-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/content/UrlbarInput.mjs b/browser/components/urlbar/content/UrlbarInput.mjs
-index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e6463b45191 100644
+index b23244f9d3278918b016bb3fcab19687bc2e292a..e5de81b3060a1ee76b1a6aff2e4ae1ca50f2caa9 100644
 --- a/browser/components/urlbar/content/UrlbarInput.mjs
 +++ b/browser/components/urlbar/content/UrlbarInput.mjs
-@@ -98,6 +98,13 @@ const lazy = XPCOMUtils.declareLazy({
+@@ -90,6 +90,13 @@ const lazy = XPCOMUtils.declareLazy({
    logger: () => lazy.UrlbarUtils.getLogger({ prefix: "Input" }),
  });
  
@@ -16,7 +16,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
  const UNLIMITED_MAX_RESULTS = 99;
  
  let getBoundsWithoutFlushing = element =>
-@@ -743,7 +750,16 @@ ${
+@@ -708,7 +715,16 @@ export class UrlbarInput extends HTMLElement {
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
@@ -33,7 +33,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -817,6 +833,10 @@ ${
+@@ -782,6 +798,10 @@ export class UrlbarInput extends HTMLElement {
      hideSearchTerms = false,
      isSameDocument = false,
    } = {}) {
@@ -44,7 +44,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      if (!this.#isAddressbar) {
        throw new Error(
          "Cannot set URI for UrlbarInput that is not an address bar"
-@@ -1106,8 +1126,16 @@ ${
+@@ -1071,8 +1091,16 @@ export class UrlbarInput extends HTMLElement {
          return;
        }
      }
@@ -62,7 +62,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
    }
  
    /**
-@@ -1551,7 +1579,11 @@ ${
+@@ -1496,7 +1524,11 @@ export class UrlbarInput extends HTMLElement {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -75,7 +75,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      }
  
      if (isCanonized) {
-@@ -2858,6 +2890,42 @@ ${
+@@ -2696,6 +2728,45 @@ export class UrlbarInput extends HTMLElement {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -84,7 +84,10 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
 +  }
 +
 +  get zenUrlbarBehavior() {
-+    if (this.document.documentElement.hasAttribute("inDOMFullscreen")) {
++    if (
++      this.document.documentElement.hasAttribute("inDOMFullscreen") ||
++      this.document.documentElement.hasAttribute("zen-little-window")
++    ) {
 +      return "float";
 +    }
 +    return lazy.ZEN_URLBAR_BEHAVIOR;
@@ -118,7 +121,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2872,6 +2940,13 @@ ${
+@@ -2710,6 +2781,13 @@ export class UrlbarInput extends HTMLElement {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -132,7 +135,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      // 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")) {
-@@ -2891,6 +2966,27 @@ ${
+@@ -2729,6 +2807,27 @@ export class UrlbarInput extends HTMLElement {
        return;
      }
  
@@ -160,7 +163,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2921,7 +3017,7 @@ ${
+@@ -2759,7 +2858,7 @@ export class UrlbarInput extends HTMLElement {
      forceUnifiedSearchButtonAvailable = false
    ) {
      let prevState = this.getAttribute("pageproxystate");
@@ -169,7 +172,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      this.setAttribute("pageproxystate", state);
      this._inputContainer.setAttribute("pageproxystate", state);
      this._identityBox?.setAttribute("pageproxystate", state);
-@@ -3198,10 +3294,12 @@ ${
+@@ -3031,10 +3130,12 @@ export class UrlbarInput extends HTMLElement {
        return;
      }
      this.style.top = px(
@@ -182,7 +185,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      );
    }
  
-@@ -3260,9 +3358,10 @@ ${
+@@ -3093,9 +3194,10 @@ export class UrlbarInput extends HTMLElement {
            return;
          }
  
@@ -194,7 +197,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
          );
          this.style.setProperty(
            "--urlbar-height",
-@@ -3768,6 +3867,7 @@ ${
+@@ -3597,6 +3699,7 @@ export class UrlbarInput extends HTMLElement {
    }
  
    _toggleActionOverride(event) {
@@ -202,7 +205,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3880,8 +3980,8 @@ ${
+@@ -3709,8 +3812,8 @@ export class UrlbarInput extends HTMLElement {
      if (!this.#isAddressbar) {
        return val;
      }
@@ -213,7 +216,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -4180,6 +4280,7 @@ ${
+@@ -4006,6 +4109,7 @@ export class UrlbarInput extends HTMLElement {
      resultDetails = null,
      browser = this.window.gBrowser.selectedBrowser
    ) {
@@ -221,7 +224,19 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      if (this.#isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -4291,6 +4392,10 @@ ${
+@@ -4088,6 +4192,11 @@ export class UrlbarInput extends HTMLElement {
+    * @returns {"current" | "tabshifted" | "tab" | "save" | "window"}
+    */
+   _whereToOpen(event) {
++    if (this.document.documentElement.hasAttribute("zen-little-window")) {
++      // Little windows are single-tab popups -- never spawn extra tabs
++      // or new windows from the urlbar.
++      return "current";
++    }
+     let isKeyboardEvent = KeyboardEvent.isInstance(event);
+     let reuseEmpty = isKeyboardEvent;
+     let where = undefined;
+@@ -4117,6 +4226,10 @@ export class UrlbarInput extends HTMLElement {
        }
        reuseEmpty = true;
      }
@@ -232,7 +247,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -4298,6 +4403,9 @@ ${
+@@ -4124,6 +4237,9 @@ export class UrlbarInput extends HTMLElement {
      ) {
        where = "current";
      }
@@ -242,7 +257,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      return where;
    }
  
-@@ -4552,6 +4660,7 @@ ${
+@@ -4378,6 +4494,7 @@ export class UrlbarInput extends HTMLElement {
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -250,7 +265,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
  
        this._suppressStartQuery = false;
      });
-@@ -4559,7 +4668,6 @@ ${
+@@ -4385,7 +4502,6 @@ export class UrlbarInput extends HTMLElement {
      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.
@@ -258,7 +273,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4715,7 +4823,11 @@ ${
+@@ -4541,7 +4657,11 @@ export class UrlbarInput extends HTMLElement {
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -271,7 +286,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -5031,6 +5143,7 @@ ${
+@@ -4851,6 +4971,7 @@ export class UrlbarInput extends HTMLElement {
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -279,7 +294,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
        l10nId,
        l10nId == "urlbar-placeholder-with-name"
          ? { name: engineName }
-@@ -5156,6 +5269,11 @@ ${
+@@ -4964,6 +5085,11 @@ export class UrlbarInput extends HTMLElement {
    }
  
    _on_click(event) {
@@ -291,7 +306,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
      switch (event.target) {
        case this.inputField:
        case this._inputContainer:
-@@ -5242,7 +5360,7 @@ ${
+@@ -5042,7 +5168,7 @@ export class UrlbarInput extends HTMLElement {
        }
      }
  
@@ -300,7 +315,7 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -5282,9 +5400,16 @@ ${
+@@ -5082,9 +5208,16 @@ export class UrlbarInput extends HTMLElement {
    }
  
    _on_mousedown(event) {
@@ -318,27 +333,27 @@ index d6615ec5a29f3e3327ac4171f3fc5d9a69bd09fe..e1128b0d7f5accfd48af27f99e3b2e64
          if (
            event.composedTarget != this.inputField &&
            event.composedTarget != this._inputContainer
-@@ -5294,6 +5419,10 @@ ${
+@@ -5094,6 +5227,10 @@ export class UrlbarInput extends HTMLElement {
  
          this.focusedViaMousedown = !this.focused;
-         this.#preventClickSelectsAll = this.focused;
+         this._preventClickSelectsAll = this.focused;
 +        if (isProbablyFloating) {
 +          this.focusedViaMousedown = !this.hasAttribute("breakout-extend");
-+          this.#preventClickSelectsAll = this.hasAttribute("breakout-extend");
++          this._preventClickSelectsAll = this.hasAttribute("breakout-extend");
 +        }
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -5329,7 +5458,7 @@ ${
+@@ -5129,7 +5266,7 @@ export class UrlbarInput extends HTMLElement {
          }
          // 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.
--        if (event.target.closest?.("tab")) {
+-        if (event.target.closest("tab")) {
-+        if (event.target.closest?.("tab") || event.target.closest?.("#tabs-newtab-button")) {
++        if (event.target.closest("tab") || event.target.closest("#tabs-newtab-button")) {
            break;
          }
  
-@@ -5636,7 +5765,7 @@ ${
+@@ -5411,7 +5548,7 @@ export class UrlbarInput extends HTMLElement {
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =

src/browser/components/urlbar/content/enUS-searchFeatures-ftl.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/content/enUS-searchFeatures.ftl b/browser/components/urlbar/content/enUS-searchFeatures.ftl
-index e405f0f8844eea7081e4302cc35ccd8d8124aa90..90baec46971c6bd3ec738a338834af0351872d14 100644
+index a1fb86058d1f6f015160163f75999b4a429bf1fd..83098291e21a8239513a4105a4604394a1dfabc0 100644
 --- a/browser/components/urlbar/content/enUS-searchFeatures.ftl
 +++ b/browser/components/urlbar/content/enUS-searchFeatures.ftl
 @@ -2,6 +2,9 @@

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 edb61ebece92f53d6edc8522c0dfea01159121dc..fd57751828254ebf9b05af13c26afa55ffa7ed00 100644
+index daf4e1dca839a6e882edf598bd82f13f1bf4eadd..ebb584e058c0a15f5a5fa0bd80bdce42636c9ba0 100644
 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
 +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
-@@ -347,7 +347,7 @@ export const PREFS_CONFIG = new Map([
+@@ -287,7 +287,7 @@ export const PREFS_CONFIG = new Map([
      "showSponsoredTopSites",
      {
        title: "Show sponsored top sites",

src/browser/installer/windows/nsis/defines-nsi-in.patch

@@ -1,8 +1,17 @@
 diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
-index a9bf2d67ce522054442be664bda1434c63609ea1..16e03732d78207ce602066a4bccc0d2c2385ca91 100644
+index c6bb41695d70d17e5691e0d1856b79f7111d5026..8a9393a79a60aca23f80fc989fe2ae333ba54e39 100644
 --- a/browser/installer/windows/nsis/defines.nsi.in
 +++ b/browser/installer/windows/nsis/defines.nsi.in
-@@ -147,7 +147,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
+@@ -90,7 +90,7 @@
+ !define BETA_UPDATE_CHANNEL
+ !endif
+ 
+-!define BaseURLStubPing "http://download-stats.mozilla.org/stub"
++!define BaseURLStubPing ""
+ 
+ # ARCH is used when it is necessary to differentiate the x64 registry keys from
+ # the x86 registry keys (e.g. the uninstall registry key).
+@@ -152,7 +152,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
  !define APPROXIMATE_REQUIRED_SPACE_MB "145"
  
  # Constants for parts of the telemetry submission URL

src/browser/installer/windows/nsis/installer-nsi.patch

@@ -1,20 +1,20 @@
 diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
-index 36fbee18edd138036c23ee77806f47cd10efce55..f70893700c54bdbc6d6fc5b760fd9a3654eb39e7 100755
+index b3459f8233b2509744e27bfe33884c6a92164e36..76b71e0882381f8f6becaf88bc4e3cc56f8d8ad4 100755
 --- a/browser/installer/windows/nsis/installer.nsi
 +++ b/browser/installer/windows/nsis/installer.nsi
-@@ -845,7 +845,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}
--    Call SendPingIfApplicable
+-    Call SendPing
-+    ; Call SendPingIfApplicable
++    ; Call SendPing
    ${EndIf}
  SectionEnd
  
-@@ -1800,5 +1800,5 @@ FunctionEnd
+@@ -1978,5 +1978,5 @@ FunctionEnd
  
  Function .onGUIEnd
    ${OnEndCommon}
--  Call SendPingIfApplicable
+-  Call SendPing
-+  ; Call SendPingIfApplicable
++  ; Call SendPing
  FunctionEnd

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 0e2f7fa874b865b2a354c5ca612c5714f6ac5b69..0b1182279336972705bc3ff47e69353b997eb1bd
+index a193a94e4893a8b07111d83ebdd2a6488a98be7a..ab7d84abbf6d9442cbc299194c4ffb74c5785723
 --- a/browser/installer/windows/nsis/uninstaller.nsi
 +++ b/browser/installer/windows/nsis/uninstaller.nsi
-@@ -516,6 +516,7 @@ Section "Uninstall"
+@@ -515,6 +515,7 @@ Section "Uninstall"
    ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
    ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"
    ${un.RegCleanFileHandler}  ".avif"  "FirefoxHTML-$AppUserModelID"

src/browser/modules/BrowserDOMWindow-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/modules/BrowserDOMWindow.sys.mjs b/browser/modules/BrowserDOMWindow.sys.mjs
-index 29c5b1510696cfdd993388957115709b1a149d7c..6616edbc5f992ffdf3df65028cd26c17ef13f315 100644
+index e951af5edb966718ee20422c8e46d868c177cd1c..cd41305a4da8e675417eca7df5cd4a1ecee90c3d 100644
 --- a/browser/modules/BrowserDOMWindow.sys.mjs
 +++ b/browser/modules/BrowserDOMWindow.sys.mjs
-@@ -436,7 +436,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
@@ -11,7 +11,7 @@ index 29c5b1510696cfdd993388957115709b1a149d7c..6616edbc5f992ffdf3df65028cd26c17
        null,
        aParams,
        aWhere,
-@@ -444,6 +444,10 @@ export class BrowserDOMWindow {
+@@ -445,6 +445,10 @@ export class BrowserDOMWindow {
        aName,
        true
      );

src/browser/modules/BrowserWindowTracker-sys-mjs.patch

@@ -1,22 +1,37 @@
 diff --git a/browser/modules/BrowserWindowTracker.sys.mjs b/browser/modules/BrowserWindowTracker.sys.mjs
-index 9aecab66d8f23fac9f16cea2120a5fe903ae1122..692f2bfe3899a58925789503a6bb2a547cdbf7f3 100644
+index 9aecab66d8f23fac9f16cea2120a5fe903ae1122..e023c27bcb027d29ba9b3469eca5957d42040c46 100644
 --- a/browser/modules/BrowserWindowTracker.sys.mjs
 +++ b/browser/modules/BrowserWindowTracker.sys.mjs
-@@ -330,6 +330,7 @@ export const BrowserWindowTracker = {
+@@ -210,7 +210,8 @@ export const BrowserWindowTracker = {
+         !win.closed &&
+         (options.allowPopups || win.toolbar.visible) &&
+         (options.allowTaskbarTabs ||
+-          !win.document.documentElement.hasAttribute("taskbartab")) &&
++          (!win.document.documentElement.hasAttribute("taskbartab") &&
++            !win.document.documentElement.hasAttribute("zen-little-window"))) &&
+         (!("private" in options) ||
+           lazy.PrivateBrowsingUtils.permanentPrivateBrowsing ||
+           lazy.PrivateBrowsingUtils.isWindowPrivate(win) == options.private)
+@@ -330,6 +331,8 @@ export const BrowserWindowTracker = {
        args = null,
        remote = undefined,
        fission = undefined,
 +    zenSyncedWindow = true,
++    zenLittleWindow = false,
      } = options;
  
      args = lazy.AIWindow.handleAIWindowOptions(options);
-@@ -386,6 +387,12 @@ export const BrowserWindowTracker = {
+@@ -386,6 +389,16 @@ export const BrowserWindowTracker = {
        windowFeatures,
        args
      );
 +    win._zenStartupSyncFlag = Services.prefs.getBoolPref("zen.window-sync.prefer-unsynced-windows")
 +      ? (zenSyncedWindow ? 'unsynced' : 'synced')
 +      : (zenSyncedWindow ? 'synced' : 'unsynced');
++    if (zenLittleWindow) {
++      win._zenStartupLittleWindow = true;
++      win._zenStartupSyncFlag = 'unsynced';
++    }
 +    if (win._zenStartupSyncFlag === 'unsynced' && openerWindow) {
 +      win._zenStartupUnsyncedUserContextId = openerWindow.gZenWorkspaces.getCurrentSpaceContainerId();
 +    }

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 ed6b9fda700b2b4b35836a77a4da953377a72f4b..22acedcf1006f994ec8b6bf8991b4202e12a6f39 100644
+index a005dbdf84609622ef8054f73f78c0c290e76125..2d347ac12d53ae97b61750d421a489ce10af3376 100644
 --- a/browser/modules/URILoadingHelper.sys.mjs
 +++ b/browser/modules/URILoadingHelper.sys.mjs
 @@ -224,6 +224,7 @@ function openInWindow(url, params, sourceWindow) {
@@ -19,7 +19,17 @@ index ed6b9fda700b2b4b35836a77a4da953377a72f4b..22acedcf1006f994ec8b6bf8991b4202
          where = "tab";
          targetBrowser = null;
        } else if (
-@@ -974,7 +975,7 @@ export const URILoadingHelper = {
+@@ -724,7 +725,8 @@ export const URILoadingHelper = {
+         "navigator:browser" &&
+       (!skipPopups || top.toolbar.visible) &&
+       (!skipTaskbarTabs ||
+-        !top.document.documentElement.hasAttribute("taskbartab")) &&
++        (!top.document.documentElement.hasAttribute("taskbartab") &&
++          !top.document.documentElement.hasAttribute("zen-little-window"))) &&
+       (!forceNonPrivate || !PrivateBrowsingUtils.isWindowPrivate(top))
+     ) {
+       return top;
+@@ -974,7 +976,7 @@ export const URILoadingHelper = {
          ignoreQueryString || replaceQueryString,
          ignoreFragmentWhenComparing
        );
@@ -28,8 +38,8 @@ index ed6b9fda700b2b4b35836a77a4da953377a72f4b..22acedcf1006f994ec8b6bf8991b4202
        for (let i = 0; i < browsers.length; i++) {
          let browser = browsers[i];
          let browserCompare = cleanURL(
-@@ -1026,7 +1027,7 @@ export const URILoadingHelper = {
+@@ -1030,7 +1032,7 @@ export const URILoadingHelper = {
-               aSplitView.replaceTab(tabToReplace, tabToMove);
+               );
                aSplitView.ownerGlobal.focus();
              } else {
 -              aWindow.gBrowser.tabContainer.selectedIndex = i;

src/browser/themes/linux/browser-css.patch

@@ -1,12 +1,12 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index a99181fc249a7086e9886d86d85e8650595a0a0c..dd59739078080738d28bf59a1bb26fc0783bcac6 100644
+index b82fa7229ad637a08563c06fa2c2abdf99998d7c..b5ee3aa9679244222a0e9eed4be54a41ec6a11f9 100644
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
 @@ -14,7 +14,6 @@
      @media (-moz-gtk-theme-family) {
        --tabs-navbar-separator-style: none;
        @media (prefers-color-scheme: light) {
--        --urlbar-box-background-color: #fafafa;
+-        --urlbar-box-bgcolor: #fafafa;
        }
      }
    }

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 92162e2893f7c8aea92c354f3a12cccf48f7576e..3189d75c8e47f3f76ddc1227d3cffee6b09402eb 100644
+index 8fe643be3f60da00760775c918ba3228fbd2b610..d634c09685065b4096a74a93e0373e4942fd2a29 100644
 --- a/browser/themes/osx/browser.css
 +++ b/browser/themes/osx/browser.css
 @@ -37,7 +37,7 @@

src/browser/themes/shared/browser-shared-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index 70571d8f32d60d10e59e33cb83e38229de026fc6..8e420ed6f6838499553c55265a1e35f5c3801d35 100644
+index d1b11a65e527cf7c13f42b3f980f2f09592c5e53..44fb86b570c69f7d7003d3949e330e08722fbbb8 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -253,13 +253,13 @@ body {
+@@ -250,13 +250,13 @@ body {
  
    @media (-moz-platform: macos) and (not (-moz-mac-rtl)) {
      &:-moz-locale-dir(ltr) {

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 72b6673094b80e9c109ae6f125cd25c3e00260ef..d116ab9671b02bbb05eddec8318e1f2835c29f32 100644
+index c867b8602c5b3bdce335b932a3a1cd0c538e4ad6..2dc1cf17603bcdd9b8d81a6f46ed8b6ed75b2763 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
 @@ -7,7 +7,7 @@
@@ -17,7 +17,7 @@ index 72b6673094b80e9c109ae6f125cd25c3e00260ef..d116ab9671b02bbb05eddec8318e1f28
  
 -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
 -#urlbar-label-box {
--  background-color: var(--urlbar-box-background-color);
+-  background-color: var(--urlbar-box-bgcolor);
 -  color: var(--urlbar-box-text-color);
 -  padding-inline: 8px;
 -  border-radius: var(--urlbar-inner-border-radius);

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 e59fb7f095161348e442626997bbb6dc4e1e999e..488c540b07e5ce73048cebec0d75dd33f9dcabd4 100644
+index 3a12a7a33c33cec463b3d38647bdf647827784f8..4844da4b56b3172b333f5c5eb31fcd74f43fd0b0 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -343,3 +343,5 @@
+@@ -334,3 +334,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)

src/browser/themes/shared/preferences/zen-preferences.css

@@ -6,6 +6,10 @@
 
 @namespace html "http://www.w3.org/1999/xhtml";
 
+:root {
+  --in-content-box-background: var(--zen-colors-tertiary) !important;
+}
+
 .pane-container {
   margin: auto;
 }
@@ -54,6 +58,10 @@ groupbox h2 {
   font-size: 15px;
 }
 
+#categories {
+  margin: 0 !important;
+}
+
 #categories > .category {
   margin-left: 0 !important;
   min-height: 40px !important;

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 05c1261f0085794e5e81dc8c1ef24fe1a9c5ec82..d0a1938b629338184bc462b4da1e10e1a4d6a4e7 100644
+index 13403bf438be18b5bcc9f3d497c94636b5fb5f6f..0505582a7efa212813cf39835c12d34d4d38eb4e 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
 @@ -85,7 +85,6 @@
@@ -10,7 +10,7 @@ index 05c1261f0085794e5e81dc8c1ef24fe1a9c5ec82..d0a1938b629338184bc462b4da1e10e1
  
    /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("sidebar.revamp") {
-@@ -146,7 +145,6 @@
+@@ -141,7 +140,6 @@
    }
  
    browser:is([blank], [pendingpaint]) {
@@ -18,7 +18,7 @@ index 05c1261f0085794e5e81dc8c1ef24fe1a9c5ec82..d0a1938b629338184bc462b4da1e10e1
    }
  
    /* Exclude browsers with smartwindow-content attribute which inherit
-@@ -440,7 +438,7 @@ split-view-footer {
+@@ -427,7 +425,7 @@ split-view-footer {
  
  .dialogStack {
    z-index: var(--browser-stack-z-index-dialog-stack);
@@ -27,7 +27,7 @@ index 05c1261f0085794e5e81dc8c1ef24fe1a9c5ec82..d0a1938b629338184bc462b4da1e10e1
    inset: 0;
    /* --browser-with-dialog set on browser[tabDialogShowing], we want to position the overlay
       only on the top of the <browser> element so it doesn't overlap the DevTools toolbox */
-@@ -607,7 +605,7 @@ split-view-footer {
+@@ -594,7 +592,7 @@ split-view-footer {
  
  .dialogOverlay[topmost="true"],
  #window-modal-dialog::backdrop {

src/browser/themes/shared/tabbrowser/tabs-css.patch

@@ -1,17 +1,29 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22c000e105 100644
+index 203b546933842f4b0134188fda020c4db4dcd0d2..0d67deabac2984574636248a16e58d1669f2e1a4 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@
    --tab-group-line-thickness: 2px;
    --tab-group-line-toolbar-border-distance: 1px;
    /* Collapsed tabs should be square, so set width to match the min height */
 -  --tab-collapsed-background-width: var(--tab-min-height);
 +  --tab-collapsed-background-width: 48px;
    --tab-collapsed-width: calc(var(--tab-collapsed-background-width) + 2 * var(--tab-inner-inline-margin));
-   --tab-pinned-min-width-expanded: calc(var(--tab-pinned-expanded-background-width) + 2 * var(--tab-pinned-margin-inline-expanded));
+   --tab-inner-inline-margin: var(--space-medium);
-   --tab-note-icon-end-margin: var(--dimension-4);
+   --tab-inline-padding: 8px;
-@@ -276,7 +276,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -38,9 +38,9 @@
+   --tab-block-margin: 4px;
+   --tab-icon-end-margin: 5.5px;
+   --tab-label-line-height: 1.7;
+-  --tab-loading-fill: #0a84ff;
++  --tab-loading-fill: var(--zen-primary-color);
+   --tab-hover-background-color: color-mix(in srgb, currentColor 11%, transparent);
+-  --tab-selected-textcolor: var(--toolbar-color);
++  --tab-selected-textcolor: currentColor;
+   --tab-selected-bgcolor: var(--toolbar-bgcolor);
+   --tab-selected-color-scheme: var(--toolbar-color-scheme);
+   &[lwt-tab-selected="light"] {
+@@ -298,7 +298,6 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -19,7 +31,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
    }
  
    &:is([selected], [multiselected]) {
-@@ -290,6 +289,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -312,6 +311,7 @@ tab-split-view-wrapper[dragtarget] {
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -27,7 +39,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
  
      &::before {
        position: absolute;
-@@ -489,10 +489,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -511,10 +511,6 @@ tab-split-view-wrapper[dragtarget] {
    /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("browser.tabs.fadeOutUnloadedTabs") {
      &[pending] {
@@ -38,7 +50,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -509,10 +505,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -531,10 +527,6 @@ tab-split-view-wrapper[dragtarget] {
    /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
      &[pending][discarded] {
@@ -49,7 +61,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -581,7 +573,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -603,7 +595,7 @@ tab-split-view-wrapper[dragtarget] {
    z-index: 1; /* Overlay tab title */
  
    #tabbrowser-tabs[orient="vertical"] & {
@@ -58,7 +70,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
    }
  
    &[crashed] {
-@@ -589,7 +581,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -611,7 +603,7 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -67,7 +79,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -644,7 +636,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -666,7 +658,7 @@ tab-split-view-wrapper[dragtarget] {
      }
    }
  
@@ -76,7 +88,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
    &[crashed] {
      display: revert;
    }
-@@ -810,7 +802,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -832,7 +824,7 @@ tab-split-view-wrapper[dragtarget] {
        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]),
@@ -85,7 +97,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1026,7 +1018,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -1048,7 +1040,6 @@ tab-split-view-wrapper[dragtarget] {
  .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
  .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]),
  #tabbrowser-tabs[orient="vertical"] .tabbrowser-tab > .tab-stack > .tab-content[titlechanged]:not([selected]) {
@@ -93,16 +105,16 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
    background-position: center bottom 6.5px;
    background-size: 4px 4px;
    background-repeat: no-repeat;
-@@ -1635,7 +1626,7 @@ tab-group {
+@@ -1614,7 +1605,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
 -  tab-group > :is(.tab-group-label-container, .tabbrowser-tab),
 +  tab-group > :is(.tab-group-label-container, .tab-group-container, .tabbrowser-tab),
-   &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
+   &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) tab-group > .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -2128,7 +2119,7 @@ tab-group {
+@@ -2089,7 +2080,7 @@ tab-group {
    }
  }
  
@@ -111,7 +123,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -2139,7 +2130,7 @@ tab-group {
+@@ -2100,7 +2091,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -120,7 +132,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
    }
  
    &:hover {
-@@ -2163,7 +2154,7 @@ tab-group {
+@@ -2124,7 +2115,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.
   */
@@ -129,7 +141,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
    margin-block: var(--tab-block-margin);
  }
  
-@@ -2351,7 +2342,6 @@ tab-group {
+@@ -2312,7 +2303,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -137,7 +149,7 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
      }
  
      .tab-background {
-@@ -2391,8 +2381,8 @@ tab-group {
+@@ -2352,8 +2342,8 @@ tab-group {
        display: block;
        position: absolute;
        inset: auto;
@@ -148,17 +160,17 @@ index 2ce8b135dcf087a2e2cb75c3417be8c9ba4178e6..3c297614afd323e210ebf0018d4aca22
  
        &:-moz-window-inactive {
          background-image:
-@@ -2480,9 +2470,6 @@ tab-group {
+@@ -2438,9 +2428,6 @@ tab-group {
-   ~ #tabbrowser-tabs[orient="horizontal"]::before {
+ 
-     display: flex;
+ :root:not([privatebrowsingmode]) :is(toolbarbutton, toolbarpaletteitem) ~ #tabbrowser-tabs,
-     content: "";
+ :root[privatebrowsingmode] :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) ~ #tabbrowser-tabs {
--    border-inline-start: var(--tabstrip-inner-border);
+-  border-inline-start: var(--tabstrip-inner-border);
--    padding-inline-start: 2px;
+-  padding-inline-start: 2px;
--    margin-inline-start: 2px;
+-  margin-inline-start: 2px;
-   }
  }
  
-@@ -2515,7 +2502,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+ :root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) {
+@@ -2472,7 +2459,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

src/browser/themes/shared/toolbarbuttons-css.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
-index 829501008d7b6fd6bddf899f3cf599a68ff216a0..cbdc770d56c4053d0b9afc13322f072c3376eb30 100644
+index 8c02df47ca003fa5094de0e7802cd8c10ef1bf2a..a16e8d7d3a00af8df648946950b7bb1c3f30efbb 100644
 --- a/browser/themes/shared/toolbarbuttons.css
 +++ b/browser/themes/shared/toolbarbuttons.css
 @@ -13,20 +13,6 @@
@@ -23,7 +23,7 @@ index 829501008d7b6fd6bddf899f3cf599a68ff216a0..cbdc770d56c4053d0b9afc13322f072c
    &:where([uidensity="compact"]) {
      --toolbarbutton-inner-padding: var(--toolbarbutton-inner-padding-compact);
      --bookmark-block-padding: 1px;
-@@ -123,9 +109,7 @@
+@@ -65,9 +51,7 @@
  #TabsToolbar {
    /* Override the inner padding to ensure the dimensions match the tabs, but also making sure
       different types of buttons (combined-buttons-dropmarker or text) still look correct. */
@@ -33,7 +33,7 @@ index 829501008d7b6fd6bddf899f3cf599a68ff216a0..cbdc770d56c4053d0b9afc13322f072c
  }
  
  /* Primary toolbar buttons */
-@@ -204,8 +188,8 @@ toolbar .toolbarbutton-1 {
+@@ -146,8 +130,8 @@ toolbar .toolbarbutton-1 {
  
    > .toolbarbutton-icon {
      /* horizontal padding + actual icon width */
@@ -44,7 +44,7 @@ index 829501008d7b6fd6bddf899f3cf599a68ff216a0..cbdc770d56c4053d0b9afc13322f072c
    }
  
    > .toolbarbutton-text {
-@@ -215,7 +199,7 @@ toolbar .toolbarbutton-1 {
+@@ -157,7 +141,7 @@ toolbar .toolbarbutton-1 {
       * height as the button icons and the same vertical padding, but as a minimum,
       * because otherwise an increase in text sizes would break things.
       */
@@ -53,7 +53,7 @@ index 829501008d7b6fd6bddf899f3cf599a68ff216a0..cbdc770d56c4053d0b9afc13322f072c
  
      @media (-moz-platform: macos) {
        padding-top: calc(var(--toolbarbutton-inner-padding) + 1px);
-@@ -325,7 +309,7 @@ toolbar .toolbaritem-combined-buttons {
+@@ -277,7 +261,7 @@ toolbar .toolbaritem-combined-buttons {
  #nav-bar-overflow-button {
    list-style-image: url("chrome://global/skin/icons/chevron.svg");
  
@@ -62,7 +62,7 @@ index 829501008d7b6fd6bddf899f3cf599a68ff216a0..cbdc770d56c4053d0b9afc13322f072c
      display: none;
    }
  
-@@ -535,7 +519,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
+@@ -487,7 +471,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
       */
      align-items: stretch;
      > .toolbarbutton-icon {

src/browser/themes/shared/urlbar-searchbar-css.patch

@@ -1,17 +1,17 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index 3f46c918e125f9531a536a09358c980b2c923864..cba6f00318ce5dc7b6717b6c9afd2ee916715f8f 100644
+index 0ee35cfe67c9bce37a844d4b7d9715d4fb50f709..5cdb8037e49a68ea4126af349690af8a16b5e59b 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
    /* Usually we wouldn't need snapping border widths manually, but we use this
     * for other layout calculations too */
    --urlbar-container-border-width: max(env(hairline), round(down, 1px, env(hairline)));
 -  --urlbar-container-padding: round(up, 1px, env(hairline));
 +  --urlbar-container-padding: 2px;
-   --urlbar-container-inset: calc(var(--urlbar-container-border-width) + var(--urlbar-container-padding));
+   --urlbar-container-border-padding: calc(var(--urlbar-container-border-width) + var(--urlbar-container-padding));
- 
+   --urlbar-margin-inline: 5px;
-   @media (max-width: 770px) {
+   --urlbar-padding-block: 4px;
-@@ -54,7 +54,7 @@ toolbar[inactive="true"] .urlbar,
+@@ -55,7 +55,7 @@ toolbar[inactive="true"] .urlbar,
  .urlbar:not([usertyping]) > .urlbar-input-container > .urlbar-go-button,
  .urlbar:not(#searchbar-new, [focused]) > .urlbar-input-container > .urlbar-go-button,
  #urlbar-revert-button-container {
@@ -20,18 +20,7 @@ index 3f46c918e125f9531a536a09358c980b2c923864..cba6f00318ce5dc7b6717b6c9afd2ee9
  }
  
  /* Document Picture-in-Picture API window */
-@@ -201,6 +201,10 @@ toolbar[inactive="true"] .urlbar,
+@@ -333,10 +333,14 @@ toolbar[inactive="true"] .urlbar,
-     mask-image: linear-gradient(to right, transparent var(--urlbar-scheme-size), black calc(var(--urlbar-scheme-size) + 3ch));
-   }
- 
-+  #navigator-toolbox[zen-has-implicit-hover="true"] .urlbar:not([focused])[textoverflow="left"] > .urlbar-input-container > .urlbar-input-box > & {
-+    mask-image: linear-gradient(to right, transparent, black 3ch, black calc(100% - 3ch), transparent);
-+  }
-+
-   /* stylelint-disable-next-line media-query-no-invalid */
-   @media -moz-pref("browser.nova.enabled") {
-     &::selection {
-@@ -343,10 +347,14 @@ toolbar[inactive="true"] .urlbar,
  
  .urlbar[breakout][breakout-extend] {
    height: auto;

src/browser/themes/shared/urlbar-variables-css.patch

@@ -1,7 +1,7 @@
-diff --git a/browser/themes/shared/urlbar/variables.css b/browser/themes/shared/urlbar/variables.css
+diff --git a/browser/themes/shared/urlbar-variables.css b/browser/themes/shared/urlbar-variables.css
-index 34ab3df5ed433dafed00799c902afc276a722862..1e71860631f33839bdc7e1ec3a1e877bef744b55 100644
+index 0710bcc11e8040750ff826e3d3551454fdad61c6..2be2fa3e386ad9d4296d73ee8814e09750382a0d 100644
---- a/browser/themes/shared/urlbar/variables.css
+--- a/browser/themes/shared/urlbar-variables.css
-+++ b/browser/themes/shared/urlbar/variables.css
++++ b/browser/themes/shared/urlbar-variables.css
 @@ -9,7 +9,7 @@
  :root {
    --identity-box-margin-inline: 4px;

src/browser/themes/shared/urlbar/view-proton-css.patch

@@ -1,21 +0,0 @@
-diff --git a/browser/themes/shared/urlbar/view-proton.css b/browser/themes/shared/urlbar/view-proton.css
-index 9e041b67988f590bdbea48514937b1fa25c9785c..05507782b91858dff3e181843314af7956528ba9 100644
---- a/browser/themes/shared/urlbar/view-proton.css
-+++ b/browser/themes/shared/urlbar/view-proton.css
-@@ -14,7 +14,7 @@
- 
-   --urlbarView-small-font-size: 0.85em;
- 
--  --urlbarView-results-padding: 7px;
-+  --urlbarView-results-padding: 8px;
-   --urlbarView-row-gutter: var(--space-xxsmall);
-   --urlbarView-item-inline-padding: var(--urlbar-icon-padding);
-   --urlbarView-item-block-padding: 6px;
-@@ -168,7 +168,6 @@
-       min-height: 32px;
-     }
-     :root[uidensity="touch"] & {
--      padding-block: 11px;
-     }
-   }
- 

src/browser/themes/shared/urlbarView-css.patch

@@ -0,0 +1,21 @@
+diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
+index 2d6a63328642969e23da0a41ca6c7bb23eb96e8e..3060ba3f52ae7ab2f8fc36ff546d358724909b3e 100644
+--- a/browser/themes/shared/urlbarView.css
++++ b/browser/themes/shared/urlbarView.css
+@@ -21,7 +21,7 @@
+ 
+   --urlbarView-small-font-size: 0.85em;
+ 
+-  --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;
+@@ -172,7 +172,6 @@
+       min-height: 32px;
+     }
+     :root[uidensity="touch"] & {
+-      padding-block: 11px;
+     }
+   }
+ 

src/browser/themes/shared/zen-icons/icons.css

@@ -924,7 +924,7 @@
 
   position: relative;
 
-  list-style-image: url("boost.svg");
+  list-style-image: url("paintbrush.svg");
 
   & .toolbarbutton-text {
     display: none;
@@ -937,8 +937,6 @@
   & image {
     -moz-context-properties: fill, fill-opacity;
     fill: currentColor;
-    width: 14px;
-    fill-opacity: 0.7;
   }
 }
 
@@ -1007,19 +1005,15 @@
   fill-opacity: 0.65;
 }
 
-#zen-boost-case[case-mode="none"] {
+#zen-boost-text-case-toggle {
-  list-style-image: none;
-}
-
-#zen-boost-case[case-mode="capitalize"] {
   list-style-image: url("text-title-case.svg");
 }
 
-#zen-boost-case[case-mode="uppercase"] {
+#zen-boost-text-case-toggle[case-mode="uppercase"] {
   list-style-image: url("text-uppercase.svg");
 }
 
-#zen-boost-case[case-mode="lowercase"] {
+#zen-boost-text-case-toggle[case-mode="lowercase"] {
   list-style-image: url("text-lowercase.svg");
 }
 
@@ -1068,7 +1062,7 @@
 }
 
 #zen-boost-shuffle {
-  list-style-image: url("dice.svg");
+  list-style-image: url("arrow-rotate-anticlockwise.svg");
 }
 
 #zen-boost-css-picker {

src/browser/themes/shared/zen-icons/jar.inc.mn

@@ -13,13 +13,13 @@
 *  skin/classic/browser/zen-icons/autoplay-media-fill.svg                      (../shared/zen-icons/nucleo/autoplay-media-fill.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media.svg                      (../shared/zen-icons/nucleo/autoplay-media.svg) 
 *  skin/classic/browser/zen-icons/back.svg                      (../shared/zen-icons/nucleo/back.svg) 
-*  skin/classic/browser/zen-icons/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.svg) 
 *  skin/classic/browser/zen-icons/block.svg                      (../shared/zen-icons/nucleo/block.svg) 
 *  skin/classic/browser/zen-icons/bolt.svg                      (../shared/zen-icons/nucleo/bolt.svg) 
 *  skin/classic/browser/zen-icons/bookmark-hollow.svg                      (../shared/zen-icons/nucleo/bookmark-hollow.svg) 
 *  skin/classic/browser/zen-icons/bookmark-star-on-tray.svg                      (../shared/zen-icons/nucleo/bookmark-star-on-tray.svg) 
 *  skin/classic/browser/zen-icons/bookmark.svg                      (../shared/zen-icons/nucleo/bookmark.svg) 
 *  skin/classic/browser/zen-icons/boost.svg                      (../shared/zen-icons/nucleo/boost.svg) 
+*  skin/classic/browser/zen-icons/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.svg) 
 *  skin/classic/browser/zen-icons/brackets-curly.svg                      (../shared/zen-icons/nucleo/brackets-curly.svg) 
 *  skin/classic/browser/zen-icons/camera-blocked.svg                      (../shared/zen-icons/nucleo/camera-blocked.svg) 
 *  skin/classic/browser/zen-icons/camera-fill.svg                      (../shared/zen-icons/nucleo/camera-fill.svg) 
@@ -37,7 +37,6 @@
 *  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/nucleo/desktop-notification-fill.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification.svg                      (../shared/zen-icons/nucleo/desktop-notification.svg) 
 *  skin/classic/browser/zen-icons/developer.svg                      (../shared/zen-icons/nucleo/developer.svg) 
-*  skin/classic/browser/zen-icons/dice.svg                      (../shared/zen-icons/nucleo/dice.svg) 
 *  skin/classic/browser/zen-icons/downloads.svg                      (../shared/zen-icons/nucleo/downloads.svg) 
 *  skin/classic/browser/zen-icons/drag-indicator.svg                      (../shared/zen-icons/nucleo/drag-indicator.svg) 
 *  skin/classic/browser/zen-icons/duplicate-tab.svg                      (../shared/zen-icons/nucleo/duplicate-tab.svg) 
@@ -103,26 +102,26 @@
 *  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/nucleo/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/nucleo/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/nucleo/print.svg) 
-*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/nucleo/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/nucleo/private-window.svg) 
+*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/nucleo/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/nucleo/reader-mode.svg) 
 *  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/nucleo/reload.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/nucleo/save.svg) 
 *  skin/classic/browser/zen-icons/screen-blocked.svg                      (../shared/zen-icons/nucleo/screen-blocked.svg) 
-*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/nucleo/screenshot.svg) 
 *  skin/classic/browser/zen-icons/screen.svg                      (../shared/zen-icons/nucleo/screen.svg) 
+*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/nucleo/screenshot.svg) 
 *  skin/classic/browser/zen-icons/search-glass.svg                      (../shared/zen-icons/nucleo/search-glass.svg) 
 *  skin/classic/browser/zen-icons/search-page.svg                      (../shared/zen-icons/nucleo/search-page.svg) 
 *  skin/classic/browser/zen-icons/security-broken.svg                      (../shared/zen-icons/nucleo/security-broken.svg) 
-*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/nucleo/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/nucleo/security-warning.svg) 
+*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/nucleo/security.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/nucleo/send-to-device.svg) 
 *  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/nucleo/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/nucleo/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/nucleo/share.svg) 
 *  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/nucleo/sidebar-right.svg) 
-*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/nucleo/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/nucleo/sidebar.svg) 
+*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/nucleo/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sliders.svg                      (../shared/zen-icons/nucleo/sliders.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/nucleo/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/nucleo/spell-check.svg) 
@@ -162,13 +161,13 @@
 *  skin/classic/browser/zen-icons/autoplay-media-fill.svg                      (../shared/zen-icons/nucleo/autoplay-media-fill.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media.svg                      (../shared/zen-icons/nucleo/autoplay-media.svg) 
 *  skin/classic/browser/zen-icons/back.svg                      (../shared/zen-icons/nucleo/back.svg) 
-*  skin/classic/browser/zen-icons/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.svg) 
 *  skin/classic/browser/zen-icons/block.svg                      (../shared/zen-icons/nucleo/block.svg) 
 *  skin/classic/browser/zen-icons/bolt.svg                      (../shared/zen-icons/nucleo/bolt.svg) 
 *  skin/classic/browser/zen-icons/bookmark-hollow.svg                      (../shared/zen-icons/nucleo/bookmark-hollow.svg) 
 *  skin/classic/browser/zen-icons/bookmark-star-on-tray.svg                      (../shared/zen-icons/nucleo/bookmark-star-on-tray.svg) 
 *  skin/classic/browser/zen-icons/bookmark.svg                      (../shared/zen-icons/nucleo/bookmark.svg) 
 *  skin/classic/browser/zen-icons/boost.svg                      (../shared/zen-icons/nucleo/boost.svg) 
+*  skin/classic/browser/zen-icons/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.svg) 
 *  skin/classic/browser/zen-icons/brackets-curly.svg                      (../shared/zen-icons/nucleo/brackets-curly.svg) 
 *  skin/classic/browser/zen-icons/camera-blocked.svg                      (../shared/zen-icons/nucleo/camera-blocked.svg) 
 *  skin/classic/browser/zen-icons/camera-fill.svg                      (../shared/zen-icons/nucleo/camera-fill.svg) 
@@ -186,7 +185,6 @@
 *  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/nucleo/desktop-notification-fill.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification.svg                      (../shared/zen-icons/nucleo/desktop-notification.svg) 
 *  skin/classic/browser/zen-icons/developer.svg                      (../shared/zen-icons/nucleo/developer.svg) 
-*  skin/classic/browser/zen-icons/dice.svg                      (../shared/zen-icons/nucleo/dice.svg) 
 *  skin/classic/browser/zen-icons/downloads.svg                      (../shared/zen-icons/nucleo/downloads.svg) 
 *  skin/classic/browser/zen-icons/drag-indicator.svg                      (../shared/zen-icons/nucleo/drag-indicator.svg) 
 *  skin/classic/browser/zen-icons/duplicate-tab.svg                      (../shared/zen-icons/nucleo/duplicate-tab.svg) 
@@ -252,26 +250,26 @@
 *  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/nucleo/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/nucleo/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/nucleo/print.svg) 
-*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/nucleo/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/nucleo/private-window.svg) 
+*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/nucleo/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/nucleo/reader-mode.svg) 
 *  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/nucleo/reload.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/nucleo/save.svg) 
 *  skin/classic/browser/zen-icons/screen-blocked.svg                      (../shared/zen-icons/nucleo/screen-blocked.svg) 
-*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/nucleo/screenshot.svg) 
 *  skin/classic/browser/zen-icons/screen.svg                      (../shared/zen-icons/nucleo/screen.svg) 
+*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/nucleo/screenshot.svg) 
 *  skin/classic/browser/zen-icons/search-glass.svg                      (../shared/zen-icons/nucleo/search-glass.svg) 
 *  skin/classic/browser/zen-icons/search-page.svg                      (../shared/zen-icons/nucleo/search-page.svg) 
 *  skin/classic/browser/zen-icons/security-broken.svg                      (../shared/zen-icons/nucleo/security-broken.svg) 
-*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/nucleo/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/nucleo/security-warning.svg) 
+*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/nucleo/security.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/nucleo/send-to-device.svg) 
 *  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/nucleo/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/nucleo/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/nucleo/share.svg) 
 *  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/nucleo/sidebar-right.svg) 
-*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/nucleo/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/nucleo/sidebar.svg) 
+*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/nucleo/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sliders.svg                      (../shared/zen-icons/nucleo/sliders.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/nucleo/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/nucleo/spell-check.svg) 
@@ -311,13 +309,13 @@
 *  skin/classic/browser/zen-icons/autoplay-media-fill.svg                      (../shared/zen-icons/nucleo/autoplay-media-fill.svg) 
 *  skin/classic/browser/zen-icons/autoplay-media.svg                      (../shared/zen-icons/nucleo/autoplay-media.svg) 
 *  skin/classic/browser/zen-icons/back.svg                      (../shared/zen-icons/nucleo/back.svg) 
-*  skin/classic/browser/zen-icons/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.svg) 
 *  skin/classic/browser/zen-icons/block.svg                      (../shared/zen-icons/nucleo/block.svg) 
 *  skin/classic/browser/zen-icons/bolt.svg                      (../shared/zen-icons/nucleo/bolt.svg) 
 *  skin/classic/browser/zen-icons/bookmark-hollow.svg                      (../shared/zen-icons/nucleo/bookmark-hollow.svg) 
 *  skin/classic/browser/zen-icons/bookmark-star-on-tray.svg                      (../shared/zen-icons/nucleo/bookmark-star-on-tray.svg) 
 *  skin/classic/browser/zen-icons/bookmark.svg                      (../shared/zen-icons/nucleo/bookmark.svg) 
 *  skin/classic/browser/zen-icons/boost.svg                      (../shared/zen-icons/nucleo/boost.svg) 
+*  skin/classic/browser/zen-icons/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.svg) 
 *  skin/classic/browser/zen-icons/brackets-curly.svg                      (../shared/zen-icons/nucleo/brackets-curly.svg) 
 *  skin/classic/browser/zen-icons/camera-blocked.svg                      (../shared/zen-icons/nucleo/camera-blocked.svg) 
 *  skin/classic/browser/zen-icons/camera-fill.svg                      (../shared/zen-icons/nucleo/camera-fill.svg) 
@@ -335,7 +333,6 @@
 *  skin/classic/browser/zen-icons/desktop-notification-fill.svg                      (../shared/zen-icons/nucleo/desktop-notification-fill.svg) 
 *  skin/classic/browser/zen-icons/desktop-notification.svg                      (../shared/zen-icons/nucleo/desktop-notification.svg) 
 *  skin/classic/browser/zen-icons/developer.svg                      (../shared/zen-icons/nucleo/developer.svg) 
-*  skin/classic/browser/zen-icons/dice.svg                      (../shared/zen-icons/nucleo/dice.svg) 
 *  skin/classic/browser/zen-icons/downloads.svg                      (../shared/zen-icons/nucleo/downloads.svg) 
 *  skin/classic/browser/zen-icons/drag-indicator.svg                      (../shared/zen-icons/nucleo/drag-indicator.svg) 
 *  skin/classic/browser/zen-icons/duplicate-tab.svg                      (../shared/zen-icons/nucleo/duplicate-tab.svg) 
@@ -401,26 +398,26 @@
 *  skin/classic/browser/zen-icons/popup-fill.svg                      (../shared/zen-icons/nucleo/popup-fill.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/nucleo/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/nucleo/print.svg) 
-*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/nucleo/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/private-window.svg                      (../shared/zen-icons/nucleo/private-window.svg) 
+*  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/nucleo/privateBrowsing.svg) 
 *  skin/classic/browser/zen-icons/reader-mode.svg                      (../shared/zen-icons/nucleo/reader-mode.svg) 
 *  skin/classic/browser/zen-icons/reload.svg                      (../shared/zen-icons/nucleo/reload.svg) 
 *  skin/classic/browser/zen-icons/save.svg                      (../shared/zen-icons/nucleo/save.svg) 
 *  skin/classic/browser/zen-icons/screen-blocked.svg                      (../shared/zen-icons/nucleo/screen-blocked.svg) 
-*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/nucleo/screenshot.svg) 
 *  skin/classic/browser/zen-icons/screen.svg                      (../shared/zen-icons/nucleo/screen.svg) 
+*  skin/classic/browser/zen-icons/screenshot.svg                      (../shared/zen-icons/nucleo/screenshot.svg) 
 *  skin/classic/browser/zen-icons/search-glass.svg                      (../shared/zen-icons/nucleo/search-glass.svg) 
 *  skin/classic/browser/zen-icons/search-page.svg                      (../shared/zen-icons/nucleo/search-page.svg) 
 *  skin/classic/browser/zen-icons/security-broken.svg                      (../shared/zen-icons/nucleo/security-broken.svg) 
-*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/nucleo/security.svg) 
 *  skin/classic/browser/zen-icons/security-warning.svg                      (../shared/zen-icons/nucleo/security-warning.svg) 
+*  skin/classic/browser/zen-icons/security.svg                      (../shared/zen-icons/nucleo/security.svg) 
 *  skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/nucleo/send-to-device.svg) 
 *  skin/classic/browser/zen-icons/settings-fill.svg                      (../shared/zen-icons/nucleo/settings-fill.svg) 
 *  skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/nucleo/settings.svg) 
 *  skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/nucleo/share.svg) 
 *  skin/classic/browser/zen-icons/sidebar-right.svg                      (../shared/zen-icons/nucleo/sidebar-right.svg) 
-*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/nucleo/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/nucleo/sidebar.svg) 
+*  skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/nucleo/sidebars-right.svg) 
 *  skin/classic/browser/zen-icons/sliders.svg                      (../shared/zen-icons/nucleo/sliders.svg) 
 *  skin/classic/browser/zen-icons/sparkles.svg                      (../shared/zen-icons/nucleo/sparkles.svg) 
 *  skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/nucleo/spell-check.svg) 
@@ -456,8 +453,8 @@
 *  skin/classic/browser/zen-icons/selectable/basket.svg          (../shared/zen-icons/common/selectable/basket.svg) 
 *  skin/classic/browser/zen-icons/selectable/bed.svg          (../shared/zen-icons/common/selectable/bed.svg) 
 *  skin/classic/browser/zen-icons/selectable/bell.svg          (../shared/zen-icons/common/selectable/bell.svg) 
-*  skin/classic/browser/zen-icons/selectable/bookmark.svg          (../shared/zen-icons/common/selectable/bookmark.svg) 
 *  skin/classic/browser/zen-icons/selectable/book.svg          (../shared/zen-icons/common/selectable/book.svg) 
+*  skin/classic/browser/zen-icons/selectable/bookmark.svg          (../shared/zen-icons/common/selectable/bookmark.svg) 
 *  skin/classic/browser/zen-icons/selectable/briefcase.svg          (../shared/zen-icons/common/selectable/briefcase.svg) 
 *  skin/classic/browser/zen-icons/selectable/brush.svg          (../shared/zen-icons/common/selectable/brush.svg) 
 *  skin/classic/browser/zen-icons/selectable/bug.svg          (../shared/zen-icons/common/selectable/bug.svg) 
@@ -519,8 +516,8 @@
 *  skin/classic/browser/zen-icons/selectable/shapes.svg          (../shared/zen-icons/common/selectable/shapes.svg) 
 *  skin/classic/browser/zen-icons/selectable/shirt.svg          (../shared/zen-icons/common/selectable/shirt.svg) 
 *  skin/classic/browser/zen-icons/selectable/skull.svg          (../shared/zen-icons/common/selectable/skull.svg) 
-*  skin/classic/browser/zen-icons/selectable/squares.svg          (../shared/zen-icons/common/selectable/squares.svg) 
 *  skin/classic/browser/zen-icons/selectable/square.svg          (../shared/zen-icons/common/selectable/square.svg) 
+*  skin/classic/browser/zen-icons/selectable/squares.svg          (../shared/zen-icons/common/selectable/squares.svg) 
 *  skin/classic/browser/zen-icons/selectable/star-1.svg          (../shared/zen-icons/common/selectable/star-1.svg) 
 *  skin/classic/browser/zen-icons/selectable/star.svg          (../shared/zen-icons/common/selectable/star.svg) 
 *  skin/classic/browser/zen-icons/selectable/stats-chart.svg          (../shared/zen-icons/common/selectable/stats-chart.svg) 

src/browser/themes/shared/zen-icons/nucleo/dice.svg

@@ -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" width="18" height="18" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 18 18"><path d="M5 13.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2M9.5 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2m-2.25 2.25a1 1 0 1 0 0-2 1 1 0 0 0 0 2M1 13.75v-7c.033-.705.349-1.488.805-1.945.456-.456 1.239-.773 1.945-.805h7c.706.033 1.488.349 1.945.805.456.456.773 1.239.805 1.945v7c-.033.705-.349 1.488-.805 1.945-.456.456-1.239.773-1.945.805h-7c-.706-.033-1.488-.349-1.945-.805-.456-.456-.773-1.239-.805-1.945m1.866.884c.267.267.485.399.884.366h7c.399.033.617-.099.884-.366s.399-.485.366-.884v-7c.033-.399-.099-.617-.366-.884s-.485-.399-.884-.366h-7c-.399-.033-.617.099-.884.366s-.399.485-.366.884v7c-.033.399.099.617.366.884m12.274-2.737a.75.75 0 0 0 .852-.632l.978-6.581c.071-.703-.127-1.524-.511-2.042-.384-.519-1.112-.946-1.805-1.082L7.73.53C7.191.469 6.557.562 6.11.783s-.897.66-1.167 1.092a.75.75 0 1 0 1.299.749c.129-.258.275-.37.531-.497.258-.127.437-.178.735-.114l6.924 1.03c.399.026.595.188.82.492s.323.538.232.928l-.978 6.581a.75.75 0 0 0 .632.852z"/></svg>

src/browser/themes/windows/browser-css.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index 039cd084f23ef27eb4a1d359c8caca690eb75eb5..432302ce8d29de1836aaf0a756b3aa0ebc86562a 100644
+index eca9fcfb453c6cf41c0a24f2775ad7bcf4678153..b7b609138a12695ff90663a707a7d985f9efb81a 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
 @@ -41,7 +41,6 @@

src/build/moz-build.patch

@@ -1,8 +1,8 @@
 diff --git a/build/moz.build b/build/moz.build
-index 60cf9a852efa695e09a324d8b2f291c8b43710d6..357f9549ac5a24cd5586dbf42437ba03ba6bc195 100644
+index 238caa7801292926db83b0ad4791b0400d30cba5..87bd7c541cdce8562ce6999e0b59fb5698348699 100644
 --- a/build/moz.build
 +++ b/build/moz.build
-@@ -92,7 +92,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
          if CONFIG[var]:
              appini_defines[var] = True
  

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 d604d0e00c623026928d72b1bcb1ce82e6bb6d4a..e3341c9ffc6db9b4bf360445ea031fc558e6076b 100644
+index d6428524107325bc6680947f45a890991936cad4..9dd68c54b72ee17ba2cc998634b38b6155b8b388 100644
 --- a/devtools/startup/DevToolsStartup.sys.mjs
 +++ b/devtools/startup/DevToolsStartup.sys.mjs
 @@ -836,6 +836,9 @@ export class DevToolsStartup {