New translations zen-preferences.ftl (Icelandic)

[ci skip]

.github/workflows/build.yml

@@ -26,6 +26,11 @@ on:
         required: true
         type: "boolean"
         default: false
+      disable-pgo:
+        description: "Build without PGO (skips the profile generation stages)"
+        required: false
+        type: "boolean"
+        default: false
   workflow_call:
     inputs:
       create_release:
@@ -48,6 +53,11 @@ on:
         required: true
         type: "boolean"
         default: false
+      disable-pgo:
+        description: "Build without PGO (skips the profile generation stages)"
+        required: false
+        type: "boolean"
+        default: false
 
 jobs:
   buildid:
@@ -73,6 +83,7 @@ jobs:
           echo "create_release: ${{ inputs.create_release }}"
           echo "update_version: ${{ inputs.update_version }}"
           echo "use sccache: ${{ inputs.use-sccache }}"
+          echo "disable-pgo: ${{ inputs.disable-pgo }}"
           echo "update_branch: ${{ inputs.update_branch }}"
           echo "GITHUB_REPOSITORY: ${{ github.repository }}"
           echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
@@ -102,14 +113,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download aws-cli
-        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        if: ${{ inputs.update_branch == 'release' }}
         run: |
           curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
           unzip awscliv2.zip
           sudo ./aws/install --update
 
       - name: Start self-hosted runner
-        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        if: ${{ inputs.update_branch == 'release' }}
         run: |
           echo "Starting self-hosted runner"
           echo "${{ secrets.SELF_HOSTED_RUNNER_START_SCRIPT }}" | base64 -d > start.sh
@@ -117,7 +128,7 @@ jobs:
           bash ./start.sh
 
       - name: Remove self-hosted runner script
-        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        if: always() && ${{ inputs.update_branch == 'release' }}
         run: |
           echo "Removing self-hosted runner script"
           rm start.sh || true
@@ -280,6 +291,7 @@ jobs:
   windows-step-1:
     name: Windows build step 1 (PGO build)
     uses: ./.github/workflows/windows-release-build.yml
+    if: ${{ !inputs.disable-pgo }}
     needs: [build-data, buildid]
     permissions:
       contents: write
@@ -295,6 +307,7 @@ jobs:
   windows-step-2:
     name: Windows build step 2 (Generate profile data)
     uses: ./.github/workflows/windows-profile-build.yml
+    if: ${{ !inputs.disable-pgo }}
     permissions:
       contents: write
     secrets: inherit
@@ -310,10 +323,13 @@ jobs:
     permissions:
       contents: write
     secrets: inherit
+    # windows-step-2 is skipped when PGO is disabled, so don't inherit its skip
+    if: ${{ !failure() && !cancelled() }}
     needs: [build-data, windows-step-2, start-self-host, buildid]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       generate-pgo: false
+      disable-pgo: ${{ inputs.disable-pgo }}
       release-branch: ${{ inputs.update_branch }}
       MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
       use-sccache: ${{ inputs.use-sccache }}
@@ -330,10 +346,12 @@ jobs:
       release-branch: ${{ inputs.update_branch }}
       MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
       use-sccache: ${{ inputs.use-sccache }}
+      disable-pgo: ${{ inputs.disable-pgo }}
 
   mac-step-1:
     name: macOS build step 1 (PGO build)
     uses: ./.github/workflows/macos-release-build.yml
+    if: ${{ !inputs.disable-pgo }}
     needs: [build-data, buildid]
     permissions:
       contents: write
@@ -348,6 +366,7 @@ jobs:
   mac-step-2:
     name: macOS build step 2 (Generate profile data)
     uses: ./.github/workflows/macos-profile-build.yml
+    if: ${{ !inputs.disable-pgo }}
     permissions:
       contents: write
     secrets: inherit
@@ -362,10 +381,13 @@ jobs:
     permissions:
       contents: write
     secrets: inherit
+    # mac-step-2 is skipped when PGO is disabled, so don't inherit its skip
+    if: ${{ !failure() && !cancelled() }}
     needs: [build-data, mac-step-2, start-self-host, buildid]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       generate-pgo: false
+      disable-pgo: ${{ inputs.disable-pgo }}
       release-branch: ${{ inputs.update_branch }}
       MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
       use-sccache: ${{ inputs.use-sccache }}
@@ -470,14 +492,14 @@ jobs:
     if: always()
     steps:
       - name: Download aws-cli
-        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        if: ${{ inputs.update_branch == 'release' }}
         run: |
           curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
           unzip awscliv2.zip
           sudo ./aws/install --update
 
       - name: Stop self-hosted runner
-        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        if: ${{ inputs.update_branch == 'release' }}
         run: |
           echo "Stopping self-hosted runner"
           echo "${{ secrets.SELF_HOSTED_RUNNER_STOP_SCRIPT }}" | base64 -d > stop.sh
@@ -485,13 +507,12 @@ jobs:
           bash ./stop.sh > /dev/null
 
       - name: Remove self-hosted runner script
-        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        if: always() && ${{ inputs.update_branch == 'release' }}
         run: |
           echo "Removing self-hosted runner script"
           rm stop.sh || true
 
   release:
-    if: ${{ inputs.create_release || inputs.update_branch == 'twilight' }}
     permissions: write-all
     name: Release
     needs:
@@ -585,6 +606,7 @@ jobs:
 
       - name: Commit
         uses: stefanzweifel/git-auto-commit-action@v5
+        if: ${{ inputs.create_release || inputs.update_branch == 'twilight' }}
         with:
           commit_message: 🚀 Update update manifests
           commit_user_name: Zen Browser Robot
@@ -628,9 +650,22 @@ jobs:
         env:
           GITHUB_REPOSITORY: ${{ github.repository }}
 
+      - name: Upload signed MAR files to workflow artifacts
+        if: ${{ inputs.update_branch == 'release' && !inputs.create_release }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: signed-mar-files
+          path: |
+            ./linux.mar/*
+            ./linux-aarch64.mar/*
+            ./.github/workflows/object/windows-x64-signed-x86_64/windows.mar
+            ./.github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
+            ./macos.mar/*
+
       - name: Release
         uses: softprops/action-gh-release@v2.2.2
-        if: ${{ inputs.update_branch == 'release' }}
+        if: ${{ inputs.update_branch == 'release' && inputs.create_release }}
         with:
           token: ${{ secrets.DEPLOY_KEY }}
           tag_name: ${{ needs.build-data.outputs.version }}

.github/workflows/linux-release-build.yml

@@ -20,6 +20,11 @@ on:
         required: true
         type: boolean
         default: false
+      disable-pgo:
+        description: "Build without PGO at all"
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build-linux:
@@ -122,7 +127,7 @@ jobs:
           cd ..
 
       - name: Build (PGO stage 1 - generate)
-        if: ${{ matrix.arch == 'x86_64' }}
+        if: ${{ matrix.arch == 'x86_64' && !inputs.disable-pgo }}
         env:
           SURFER_COMPAT: ${{ matrix.arch }}
           ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
@@ -139,7 +144,7 @@ jobs:
           bash .github/workflows/src/release-build.sh
 
       - name: Generate PGO profile data
-        if: ${{ matrix.arch == 'x86_64' }}
+        if: ${{ matrix.arch == 'x86_64' && !inputs.disable-pgo }}
         run: |
           set -x
           export DISPLAY=:2
@@ -157,6 +162,7 @@ jobs:
         env:
           SURFER_COMPAT: ${{ matrix.arch }}
           ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
+          ZEN_GA_DISABLE_PGO: ${{ inputs.disable-pgo && '1' || '' }}
           ZEN_SAFEBROWSING_API_KEY: ${{ secrets.ZEN_SAFEBROWSING_API_KEY }}
           ZEN_MOZILLA_API_KEY: ${{ secrets.ZEN_MOZILLA_API_KEY }}
           ZEN_GOOGLE_LOCATION_SERVICE_API_KEY: ${{ secrets.ZEN_GOOGLE_LOCATION_SERVICE_API_KEY }}

.github/workflows/macos-release-build.yml

@@ -10,6 +10,11 @@ on:
         required: true
         type: boolean
         default: false
+      disable-pgo:
+        description: "Build without PGO at all"
+        required: false
+        type: boolean
+        default: false
       build-version:
         description: "The version to build"
         required: true
@@ -140,13 +145,13 @@ jobs:
 
       - name: Download artifact (if use profdata)
         uses: actions/download-artifact@v4
-        if: ${{ !inputs.generate-pgo }}
+        if: ${{ !inputs.generate-pgo && !inputs.disable-pgo }}
         with:
           path: ~/artifact
           name: macos-profdata-${{ matrix.arch }}
 
       - name: Show artifact info
-        if: ${{ !inputs.generate-pgo }}
+        if: ${{ !inputs.generate-pgo && !inputs.disable-pgo }}
         run: |
           ls ~/artifact
           ls ~/artifact/en-US.log
@@ -166,6 +171,9 @@ jobs:
           if test ${{ inputs.generate-pgo }} = true; then
             export ZEN_GA_GENERATE_PROFILE=1
           fi
+          if test ${{ inputs.disable-pgo }} = true; then
+            export ZEN_GA_DISABLE_PGO=1
+          fi
           if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
             export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
           fi

.github/workflows/windows-release-build.yml

@@ -10,6 +10,11 @@ on:
         required: true
         type: boolean
         default: false
+      disable-pgo:
+        description: "Build without PGO at all"
+        required: false
+        type: boolean
+        default: false
       build-version:
         description: "The version to build"
         required: true
@@ -215,13 +220,13 @@ jobs:
 
       - name: Download artifact (if use profdata)
         uses: actions/download-artifact@v4
-        if: ${{ !inputs.generate-pgo && matrix.arch == 'x86_64' }}
+        if: ${{ !inputs.generate-pgo && !inputs.disable-pgo && matrix.arch == 'x86_64' }}
         with:
           path: ~/artifact
           name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
 
       - name: Show artifact info
-        if: ${{ !inputs.generate-pgo && matrix.arch == 'x86_64' }}
+        if: ${{ !inputs.generate-pgo && !inputs.disable-pgo && matrix.arch == 'x86_64' }}
         run: |
           ls ~/artifact
           ls ~/artifact/en-US.log
@@ -246,6 +251,9 @@ jobs:
           if test ${{ inputs.generate-pgo }} = true; then
             export ZEN_GA_GENERATE_PROFILE=1
           fi
+          if test ${{ inputs.disable-pgo }} = true; then
+            export ZEN_GA_DISABLE_PGO=1
+          fi
           if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
             export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
           fi

README.md

@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `154.0.1`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `155.0`!
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 154.0.1`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 155.0`!
 
 ### Contributing
 

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

@@ -1 +1 @@
-bf4b57fd7fe94054457be7018e8e7beaf754c520
+20e5abbb642ab21d943bc1261864d9c531ba421a

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

@@ -64,6 +64,10 @@ zen-tabs-select-recently-used-on-close =
 zen-tabs-close-on-back-with-no-history =
     .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history
 
+zen-settings-workspaces-sync =
+    .label = Sync your sidebar across devices
+    .description = Keep your workspaces, pinned tabs and folders in sync on all your devices through your Mozilla account.
+
 zen-settings-workspaces-sync-unpinned-tabs =
     .label = Sync only pinned tabs in workspaces
 

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

@@ -5,29 +5,28 @@
 zen-welcome-title-line1 = Welcome to
 zen-welcome-title-line2 = a calmer internet
 
-zen-welcome-import-title = A Fresh Start, Same Bookmarks
+zen-welcome-back = Back
-zen-welcome-import-description-1 = Your bookmarks, history, and passwords are like a trail of breadcrumbs through the internet—don’t leave them behind!
+zen-welcome-skip = Skip for now
-zen-welcome-import-description-2 = Easily bring them over from another browser and pick up right where you left off.
-zen-welcome-import-button = Import now
 
-zen-welcome-set-default-browser = Set { -brand-short-name } as your default browser
+zen-welcome-import-title = Bring your stuff along.
-zen-welcome-dont-set-default-browser = DON’T set { -brand-short-name } as your default browser
+zen-welcome-import-description = Import your bookmarks, history and passwords from another browser and pick up right where you left off.
+zen-welcome-import-yes = <strong>YES</strong>, import from another browser.
+zen-welcome-import-no = <strong>NO</strong>, start fresh.
 
-zen-welcome-initial-essentials-title = Your Key Tabs, Always Within Reach
+zen-welcome-default-browser-title = Make { -brand-short-name } your default?
-zen-welcome-initial-essentials-description-1 = Keep your most important tabs easily accessible and always at hand, no matter how many you open.
+zen-welcome-default-browser-description = Links from other apps will open in { -brand-short-name }. You can always change this later.
-zen-welcome-initial-essentials-description-2 = Essential tabs are always visible, no matter what workspace you are in.
+zen-welcome-set-default-browser = <strong>YES</strong>, make { -brand-short-name } default.
+zen-welcome-dont-set-default-browser = <strong>NO</strong>, still exploring my options.
 
-zen-welcome-workspace-colors-title = Your Workspaces, Your Colors
+zen-welcome-default-search-title = Pick your search engine.
-zen-welcome-workspace-colors-description = Personalize your browser by giving each workspace its own unique color identity.
-
-zen-welcome-start-browsing-title = All set?<br/>
-    Let’s get rolling!
-zen-welcome-start-browsing-description-1 = You’re all set up and ready to go. Click the button below to start browsing with { -brand-short-name }.
-zen-welcome-start-browsing = Dive in!
-
-zen-welcome-default-search-title = Your Default Search Engine
 zen-welcome-default-search-description = Choose your default search engine. You can always change it later!
 
-zen-welcome-skip-button = Skip
+zen-welcome-essentials-title = Choose the apps you use most.
+zen-welcome-essentials-description = Select your favorite apps to keep them handy in your sidebar.
 
-zen-welcome-finished = Your Zen has been set up correctly!
+zen-welcome-workspace-colors-title = Your space, your colors.
+zen-welcome-workspace-colors-description = Personalize your browser by giving each space its own unique color identity.
+
+zen-welcome-start-browsing-title = All set? Let’s get rolling!
+zen-welcome-start-browsing-description-1 = You’re all set up and ready to go. Click the button below to start browsing with { -brand-short-name }.
+zen-welcome-start-browsing = Dive in!

locales/es-ES/browser/browser/preferences/zen-preferences.ftl

@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = Al cerrar una pestaña, cambiar a la pestaña usada más recientemente en vez de a la siguiente pestaña
 zen-tabs-close-on-back-with-no-history = 
     .label = Cerrar pestaña y cambiar a su pestaña propietaria (o la pestaña usada más recientemente) al volver sin historial
+zen-settings-workspaces-sync = 
+    .label = Sincronice su barra lateral entre dispositivos
+    .description = Mantenga sincronizados sus espacios de trabajo, pestañas fijadas y carpetas en todos sus dispositivos mediante su cuenta de Mozilla.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = Sincronizar solamente las pestañas fijadas en los espacios de trabajo
 zen-tabs-cycle-by-attribute = 

locales/fr/browser/browser/preferences/zen-preferences.ftl

@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = Lors de la fermeture d'un onglet, basculer vers l'onglet le plus récent au lieu de l'onglet suivant
 zen-tabs-close-on-back-with-no-history = 
     .label = Fermer l'onglet et passer à l'onglet parent (ou à l'onglet le plus récemment utilisé) lorsque vous revenez en arrière sans historique
+zen-settings-workspaces-sync = 
+    .label = Synchronisez vos espaces de travail sur plusieurs appareils
+    .description = Gardez vos espaces de travail, onglets épinglés et dossiers synchronisés sur tous vos appareils via votre compte Mozilla.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = Synchroniser uniquement les onglets épinglés dans les espaces de travail
 zen-tabs-cycle-by-attribute = 

locales/is/browser/browser/preferences/zen-preferences.ftl

@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = Þegar flipa er lokað skal skipta á þann flipa sem síðast var notaður, í stað þess að fara á næsta flipa
 zen-tabs-close-on-back-with-no-history = 
     .label = Loka flipa og skipta yfir í upprunaflipa hans (eða síðast notaða flipa) þegar farið er til baka og enginn vafurferill er til staðar
+zen-settings-workspaces-sync = 
+    .label = Samstilltu hliðarstikuna þína á milli tækja
+    .description = Keep your workspaces, pinned tabs and folders in sync on all your devices through your Mozilla account.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = Samstilla einungis festa flipa í vinnusvæðum
 zen-tabs-cycle-by-attribute = 

locales/ko/browser/browser/preferences/zen-preferences.ftl

@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = 탭을 닫을 때 다음 탭 대신 가장 최근에 쓰인 탭으로 변경
 zen-tabs-close-on-back-with-no-history = 
     .label = 뒤로 가기 시 이전 기록이 없으면 탭을 닫고 원래 탭(또는 가장 최근에 쓰인 탭)으로 전환
+zen-settings-workspaces-sync = 
+    .label = 기기마다 사이드바를 동기화하기
+    .description = Mozilla 계정을 통해 워크스페이스, 고정된 탭과 폴더를 당신의 모든 기기에서 동기화하세요.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = 워크스페이스의 고정된 탭만 동기화
 zen-tabs-cycle-by-attribute = 

locales/pl/browser/browser/preferences/zen-preferences.ftl

@@ -8,9 +8,9 @@ category-zen-looks =
 zen-warning-language = Zmiana domyślnego języka może ułatwić stronom internetowym śledzenie Twojej aktywności.
 zen-vertical-tabs-layout-header = Układ przeglądarki
 zen-vertical-tabs-layout-description = Wybierz układ, który najbardziej Ci odpowiada
-zen-layout-single-toolbar = Tylko pasek boczny
+zen-layout-single-toolbar = Tylko panel boczny
-zen-layout-multiple-toolbar = Pasek boczny i górny pasek narzędzi
+zen-layout-multiple-toolbar = Panel boczny i górny pasek narzędzi
-zen-layout-collapsed-toolbar = Zwinięty pasek boczny
+zen-layout-collapsed-toolbar = Zwinięty panel boczny
 sync-currently-syncing-workspaces = Obszary robocze
 sync-engine-workspaces = 
     .label = Obszary robocze
@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = Podczas zamykania karty, przełącz na ostatnio używaną kartę zamiast na następną kartę
 zen-tabs-close-on-back-with-no-history = 
     .label = Zamknij kartę i przełącz na kartę nadrzędną (lub ostatnio używaną kartę) podczas cofania bez historii
+zen-settings-workspaces-sync = 
+    .label = Synchronizuj panel boczny między urządzeniami
+    .description = Utrzymuj synchronizację obszarów roboczych, przypiętych kart i folderów na wszystkich swoich urządzeniach za pomocą konta Mozilla.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = Zsynchronizuj tylko przypięte karty w obszarach roboczych
 zen-tabs-cycle-by-attribute = 
@@ -91,7 +94,7 @@ zen-settings-workspaces-hide-default-container-indicator =
 zen-key-unsaved = Niezapisany skrót! Zapisz go, naciskając klawisz "Escape" po ponownym wpisaniu.
 zen-key-conflict = Konflikty z { $group } -> { $shortcut }
 pane-zen-theme-title = Ustawienia motywu
-zen-vertical-tabs-title = Pasek boczny i układ kart
+zen-vertical-tabs-title = Panel boczny i układ kart
 zen-vertical-tabs-header = Pionowe karty
 zen-vertical-tabs-description = Zarządzaj kartami w pionowym układzie
 zen-vertical-tabs-show-expand-button = 
@@ -104,7 +107,7 @@ zen-vertical-tabs-expand-tabs-by-default = Rozwiń karty domyślnie
 zen-vertical-tabs-dont-expand-tabs-by-default = Nie rozwijaj domyślnie kart
 zen-vertical-tabs-expand-tabs-on-hover = Rozwiń karty po najechaniu kursorem (nie działa w trybie kompaktowym)
 zen-vertical-tabs-expand-tabs-header = Jak rozwinąć karty
-zen-vertical-tabs-expand-tabs-description = Wybierz sposób rozwijania kart na pasku bocznym
+zen-vertical-tabs-expand-tabs-description = Wybierz sposób rozwijania kart na panelu bocznym
 zen-theme-marketplace-header = Modyfikacje Zen
 zen-theme-disable-all-enabled = 
     .title = Wyłącz wszystkie modyfikacje
@@ -212,7 +215,7 @@ zen-picture-in-picture-toggle-shortcut-mac = Przełącz obraz w obrazie (Mac)
 zen-picture-in-picture-toggle-shortcut-mac-alt = Przełącz obraz w obrazie (Mac Alt)
 zen-page-source-shortcut-safari = Zobacz źródło strony (Safari)
 zen-nav-stop-shortcut = Zatrzymaj ładowanie
-zen-history-sidebar-shortcut = Pokaż pasek boczny historii
+zen-history-sidebar-shortcut = Pokaż panel boczny historii
 zen-window-minimize-shortcut = Minimalizuj okno
 zen-help-shortcut = Otwórz pomoc
 zen-preferences-shortcut = Otwórz ustawienia
@@ -235,9 +238,9 @@ zen-nav-fwd-shortcut-alt = Nawiguj do przodu (Alt)
 zen-history-show-all-shortcut = Pokaż całą historię
 zen-key-enter-full-screen = Przejdź do trybu pełnoekranowego
 zen-key-exit-full-screen = Zamknij pełny ekran
-zen-ai-chatbot-sidebar-shortcut = Przełącz panel boczny czatbotów AI
+zen-ai-chatbot-sidebar-shortcut = Przełącz panel boczny asystenta AI
 zen-key-inspector-mac = Przełącz tryb inspektora (Mac)
-zen-toggle-sidebar-shortcut = Przełącz pasek boczny Firefoksa
+zen-toggle-sidebar-shortcut = Przełącz panel boczny Firefoksa
 zen-toggle-pin-tab-shortcut = Przełącz przypięcie karty
 zen-reader-mode-toggle-shortcut-other = Przełącz tryb czytnika
 zen-picture-in-picture-toggle-shortcut = Przełącz obraz w obrazie
@@ -270,7 +273,7 @@ zen-nav-reload-shortcut = Odśwież stronę
 zen-nav-reload-shortcut-skip-cache = Przeładuj stronę (pomiń cache)
 zen-close-shortcut = Zamknij okno
 zen-close-tab-shortcut = Zamknij kartę
-zen-compact-mode-shortcut-show-sidebar = Przełącz pływający pasek boczny
+zen-compact-mode-shortcut-show-sidebar = Przełącz pływający panel boczny
 zen-compact-mode-shortcut-show-toolbar = Przełącz pływający pasek narzędzi
 zen-compact-mode-shortcut-toggle = Przełącz tryb kompaktowy
 zen-glance-expand = Rozwiń podgląd
@@ -306,7 +309,7 @@ zen-key-select-tab-last = Wybierz ostatnią kartę
 zen-key-show-all-tabs = Pokaż wszystkie karty
 zen-key-goto-history = Przejdź do historii
 zen-key-go-home = Przejdź do strony głównej
-zen-bookmark-show-sidebar-shortcut = Pokaż pasek boczny zakładek
+zen-bookmark-show-sidebar-shortcut = Pokaż panel boczny zakładek
 zen-bookmark-show-toolbar-shortcut = Pokaż pasek zakładek
 zen-devtools-toggle-shortcut = Przełącz narzędzia deweloperskie
 zen-devtools-toggle-browser-toolbox-shortcut = Włącz narzędzia przeglądarki

locales/pl/browser/browser/zen-welcome.ftl

@@ -4,23 +4,22 @@
 
 zen-welcome-title-line1 = Witaj w
 zen-welcome-title-line2 = spokojniejszym internecie
-zen-welcome-import-title = Świeży start, te same zakładki
+zen-welcome-back = Wstecz
-zen-welcome-import-description-1 = Twoje zakładki, historia przeglądania i hasła są jak ślady okruchów w internecie—nie zostawiaj ich za sobą!
+zen-welcome-skip = Na razie pomiń
-zen-welcome-import-description-2 = Łatwo przenieś je z innej przeglądarki i kontynuuj od miejsca, w którym skończyłeś.
+zen-welcome-import-title = Zabierz swoje dane ze sobą.
-zen-welcome-import-button = Zaimportuj teraz
+zen-welcome-import-description = Zaimportuj zakładki, historię i hasła z innej przeglądarki i zacznij dokładnie tam, gdzie skończyłeś.
-zen-welcome-set-default-browser = Ustaw { -brand-short-name } jako swoją domyślną przeglądarkę
+zen-welcome-import-yes = <strong>TAK</strong>, zaimportuj z innej przeglądarki.
-zen-welcome-dont-set-default-browser = NIE ustawiaj { -brand-short-name } jako swoja domyślna przeglądarka
+zen-welcome-import-no = <strong>NIE</strong>, zacznij od nowa.
-zen-welcome-initial-essentials-title = Twoje kluczowe karty, zawsze pod ręką
+zen-welcome-default-browser-title = Ustawić { -brand-short-name } jako domyślną przeglądarkę?
-zen-welcome-initial-essentials-description-1 = Utrzymuj swoje najważniejsze karty zawsze pod ręką, niezależnie od tego, jak wiele masz ich otwartych.
+zen-welcome-default-browser-description = Linki z innych aplikacji będą otwierane w { -brand-short-name }. Zawsze możesz to później zmienić.
-zen-welcome-initial-essentials-description-2 = Niezbędne karty są zawsze widoczne, niezależnie od bieżącego obszaru roboczego.
+zen-welcome-set-default-browser = <strong>TAK</strong>, ustaw { -brand-short-name } jako domyślną przeglądarkę.
-zen-welcome-workspace-colors-title = Twój obszar roboczy, Twoje kolory
+zen-welcome-dont-set-default-browser = <strong>NIE</strong>, jeszcze się rozglądam.
-zen-welcome-workspace-colors-description = Spersonalizuj przeglądarkę, nadając każdemu obszarowi roboczemu unikatową identyfikację kolorystyczną.
+zen-welcome-default-search-title = Wybierz swoją wyszukiwarkę.
-zen-welcome-start-browsing-title =
+zen-welcome-default-search-description = Wybierz swój domyślny silnik wyszukiwania. Możesz to zmienić w przyszłości!
-    Wszystko gotowe?<br/>
+zen-welcome-essentials-title = Wybierz aplikacje, których używasz najczęściej.
-    No to śmigamy!
+zen-welcome-essentials-description = Wybierz ulubione aplikacje, aby mieć je pod ręką na panelu bocznym.
+zen-welcome-workspace-colors-title = Twoja przestrzeń, Twoje kolory.
+zen-welcome-workspace-colors-description = Spersonalizuj przeglądarkę, nadając każdej przestrzeni własny, wyjątkowy motyw kolorystyczny.
+zen-welcome-start-browsing-title = Wszystko gotowe? Zaczynajmy!
 zen-welcome-start-browsing-description-1 = Wszystko gotowe, możesz zaczynać. Kliknij przycisk poniżej, aby zacząć przeglądanie z { -brand-short-name }.
 zen-welcome-start-browsing = Wskakuj!
-zen-welcome-default-search-title = Twój domyślny silnik wyszukiwania
-zen-welcome-default-search-description = Wybierz swój domyślny silnik wyszukiwania. Możesz to zmienić w przyszłości!
-zen-welcome-skip-button = Pomiń
-zen-welcome-finished = Twoja przeglądarka Zen została prawidłowo przygotowana!

locales/pl/browser/browser/zen-workspaces.ftl

@@ -27,7 +27,7 @@ zen-workspaces-panel-unload =
 zen-workspaces-panel-unload-others = 
     .label = Wyładuj wszystkie inne przestrzenie
 zen-workspaces-how-to-reorder-title = Jak przesuwać przestrzenie
-zen-workspaces-how-to-reorder-desc = Przesuwaj ikony przestrzeni na dole paska, aby zmienić ich kolejność
+zen-workspaces-how-to-reorder-desc = Przesuwaj ikony przestrzeni na dole panelu, aby zmienić ich kolejność
 zen-workspaces-change-theme = 
     .label = Edytuj motyw
 zen-workspaces-panel-context-open = 
@@ -64,6 +64,8 @@ zen-workspace-creation-label = Przestrzenie są wykorzystywane do zorganizowania
 zen-workspace-default-profile = Domyślny
 zen-workspaces-delete-workspace-title = Usunąć przestrzeń?
 zen-workspaces-delete-workspace-body = Czy na pewno chcesz usunąć { $name }? Tej czynności nie można cofnąć.
+zen-workspaces-remote-delete-title = Usunąć zsynchronizowaną przestrzeń?
+zen-workspaces-remote-delete-body = Przestrzeń { $name } została usunięta na innym urządzeniu. Czy usunąć ją również tutaj? Jeśli ją zachowasz, zostanie przywrócona na pozostałych urządzeniach.
 # Note that the html tag MUST not be changed or removed, as it is used to better
 # display the shortcut in the toast notification.
 zen-workspaces-close-all-unpinned-tabs-toast = Zamknięto karty! Użyj <span>{ $shortcut }</span> aby przywrócić.

locales/ro/browser/browser/preferences/zen-preferences.ftl

@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = La închiderea unei file, comută la cea mai recent folosită filă în loc de fila următoare
 zen-tabs-close-on-back-with-no-history = 
     .label = Închide fila și comută la fila părinte (sau cea mai recent folosită filă) când revii fără istoric
+zen-settings-workspaces-sync = 
+    .label = Sincronizează-ți bara laterală pe toate dispozitivele
+    .description = Păstrează-ți spațiile de lucru, filele și folderele fixate sincronizate pe toate dispozitivele prin contul tău Mozilla.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = Sincronizează doar Filele Fixate din Spațiile de Lucru
 zen-tabs-cycle-by-attribute = 

locales/ro/browser/browser/zen-welcome.ftl

@@ -4,23 +4,22 @@
 
 zen-welcome-title-line1 = Bine ai venit la
 zen-welcome-title-line2 = un internet mai calm
-zen-welcome-import-title = Un Început Proaspăt, Aceleași Marcaje
+zen-welcome-back = Înapoi
-zen-welcome-import-description-1 = Marcajele, istoricul și parolele tale sunt ca un șir de firimituri care îți dezvăluie traseul pe internet — nu le lăsa în urmă!
+zen-welcome-skip = Omite momentan
-zen-welcome-import-description-2 = Adu-le cu ușurință din alt browser și continuă exact de unde ai rămas.
+zen-welcome-import-title = Adu-ți lucrurile cu tine.
-zen-welcome-import-button = Importă acum
+zen-welcome-import-description = Importă-ți marcajele, istoricul și parolele dintr-un alt browser și continuă exact de unde ai rămas.
-zen-welcome-set-default-browser = Setează { -brand-short-name } ca browser principal
+zen-welcome-import-yes = <strong>DA</strong>, importă din alt browser.
-zen-welcome-dont-set-default-browser = NU seta { -brand-short-name } ca browser principal
+zen-welcome-import-no = <strong>NU</strong>, începe proaspăt.
-zen-welcome-initial-essentials-title = Filele tale cheie, întotdeauna la îndemână
+zen-welcome-default-browser-title = Faci { -brand-short-name } să fie implicit?
-zen-welcome-initial-essentials-description-1 = Păstrează-ți cele mai importante file ușor de accesat, indiferent de câte ai deschise.
+zen-welcome-default-browser-description = Link-urile din alte aplicații se vor deschide în { -brand-short-name }. Poți schimba asta oricând.
-zen-welcome-initial-essentials-description-2 = Filele Esențiale sunt mereu vizibile, indiferent de Spațiul de Lucru în care te afli.
+zen-welcome-set-default-browser = <strong>DA</strong>, setează { -brand-short-name } ca implicit.
-zen-welcome-workspace-colors-title = Spațiul Tău de Lucru, Culorile Tale
+zen-welcome-dont-set-default-browser = <strong>NO</strong>, încă îmi explorez opțiunile.
+zen-welcome-default-search-title = Alege motorul de căutare.
+zen-welcome-default-search-description = Alege-ți motorul tău de căutare principal. Îl poți schimba oricând mai târziu!
+zen-welcome-essentials-title = Alege aplicațiile pe care le folosești cel mai des.
+zen-welcome-essentials-description = Selectează-ți aplicațiile preferate pe care să le ai la îndemână în bara laterală.
+zen-welcome-workspace-colors-title = Spațiul Tău de Lucru, Culorile Tale.
 zen-welcome-workspace-colors-description = Personalizează-ți browser-ul dând fiecărui Spațiu de Lucru o culoare de identitate unică.
-zen-welcome-start-browsing-title =
+zen-welcome-start-browsing-title = Totul este gata? Haide să începem!
-    Totul este gata?<br/>
-    Haide să începem!
 zen-welcome-start-browsing-description-1 = Totul este pregătit. Dă click pe butonul de mai jos și începe navigarea cu { -brand-short-name }.
 zen-welcome-start-browsing = Începe acum!
-zen-welcome-default-search-title = Motorul Tău de Căutare Principal
-zen-welcome-default-search-description = Alege-ți motorul tău de căutare principal. Îl poți schimba oricând mai târziu!
-zen-welcome-skip-button = Treci peste
-zen-welcome-finished = Zen-ul tău a fost configurat corect!

locales/sv-SE/browser/browser/preferences/zen-preferences.ftl

@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = När du stänger en flik, växla till den senast använda fliken istället för nästa flik
 zen-tabs-close-on-back-with-no-history = 
     .label = Stäng flik och växla till dess ägarflik (eller senast använda flik) när man går tillbaka utan historik
+zen-settings-workspaces-sync = 
+    .label = Synkronisera ditt sidofält mellan enheter
+    .description = Behåll dina arbetsytor, flikar och mappar synkroniserade på alla dina enheter via ditt Mozilla-konto.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = Synkronisera endast fästa flikar i arbetsytor
 zen-tabs-cycle-by-attribute = 

locales/tr/browser/browser/preferences/zen-preferences.ftl

@@ -50,6 +50,9 @@ zen-tabs-select-recently-used-on-close =
     .label = Sekme kapatıldığında sıradaki yerine en son kullanılan sekmeyi seç
 zen-tabs-close-on-back-with-no-history = 
     .label = Geçmiş kaydı olmadan geri dönerken sekmeyi kapat ve ait olduğu sekmeye (veya en son kullanılan sekmeye) geç
+zen-settings-workspaces-sync = 
+    .label = Kenar çubuğunuzu cihazlar arasında eşitleyin
+    .description = Mozilla hesabınız aracılığıyla çalışma alanlarınızı, sabitlenmiş sekmelerinizi ve klasörlerinizi tüm cihazlarınızda eşitlenmiş halde tutun.
 zen-settings-workspaces-sync-unpinned-tabs = 
     .label = Çalışma alanlarında yalnızca sabitlenmiş sekmeleri eşitle
 zen-tabs-cycle-by-attribute = 

package-lock.json

@@ -11,7 +11,7 @@
       "devDependencies": {
         "@babel/preset-typescript": "^7.27.0",
         "@zen-browser/prettier": "^3.9.3",
-        "@zen-browser/surfer": "^1.14.8",
+        "@zen-browser/surfer": "^1.14.9",
         "formal-git": "^1.2.9",
         "globals": "^16.3.0",
         "husky": "^9.1.7",
@@ -860,9 +860,9 @@
       }
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.14.8",
+      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.14.8.tgz",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.14.9.tgz",
-      "integrity": "sha512-5HHcfibwHIK5n3huhJL2TLBX2+8odj6ebCMA6U2EcUj9ROSrcz7/bjY2n5MIa9oIRL9gtV3ott0jwJj6SlapxA==",
+      "integrity": "sha512-XbMzG4GHSRoGzKR/DkpyywcbTYemieDRD1A6qgJ8CaVDixenj/uzMhp6HXAUksRTeh1u9j3lzNcVrI99axcZLw==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {

package.json

@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.27.0",
     "@zen-browser/prettier": "^3.9.3",
-    "@zen-browser/surfer": "^1.14.8",
+    "@zen-browser/surfer": "^1.14.9",
     "formal-git": "^1.2.9",
     "globals": "^16.3.0",
     "husky": "^9.1.7",

prefs/zen/sync.yaml

@@ -3,13 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - name: services.sync.engine.spaces
-  value: true
+  value: "@cond"
   condition: "@IS_TWILIGHT@"
 
-- name: services.sync.engine.spaces
-  value: false
-  locked: true
-  condition: "!@IS_TWILIGHT@"
-
 - name: zen.spaces-sync.debug
   value: false

src/-stylelintrc-js.patch

@@ -1,5 +1,5 @@
 diff --git a/.stylelintrc.js b/.stylelintrc.js
-index b484bf6600a7e1b8ad2aed8c8b7fe5e84cc3d023..f89712e2c13dfa0bcb48e55cd3872c67f5c98dad 100644
+index b5f8245fa04ffb8fc82240261d63f893f4629f19..1b6ead24adbe69fcb5aeb95cfd3e7fa9662d89d8 100644
 --- a/.stylelintrc.js
 +++ b/.stylelintrc.js
 @@ -67,7 +67,7 @@ module.exports = {
@@ -11,10 +11,10 @@ index b484bf6600a7e1b8ad2aed8c8b7fe5e84cc3d023..f89712e2c13dfa0bcb48e55cd3872c67
        {
          ignore: ["blockless-at-rules"],
        },
-@@ -280,7 +280,7 @@ module.exports = {
+@@ -281,7 +281,7 @@ module.exports = {
-     "media-query-no-invalid": null,
      "stylelint-plugin-mozilla/media-query-no-invalid": true,
      "stylelint-plugin-mozilla/no-base-design-tokens": true,
+     "stylelint-plugin-mozilla/no-has-selector": true,
 -    "stylelint-plugin-mozilla/use-design-tokens": true,
 +    "stylelint-plugin-mozilla/use-design-tokens": false,
    },

src/browser/base/content/zen-panels/theme-picker.inc

@@ -14,14 +14,14 @@
     <panelview id="PanelUI-zen-gradient-generator-view" class="PanelUI-subView zen-theme-picker" role="document" mainview-with-header="true" has-custom-header="true">
       <hbox class="zen-theme-picker-gradient">
         <hbox id="PanelUI-zen-gradient-generator-scheme">
-          <button id="PanelUI-zen-gradient-generator-scheme-auto" class="subviewbutton"/>
+          <button id="PanelUI-zen-gradient-generator-scheme-auto" class="no-squircles subviewbutton"/>
-          <button id="PanelUI-zen-gradient-generator-scheme-light" class="subviewbutton"/>
+          <button id="PanelUI-zen-gradient-generator-scheme-light" class="no-squircles subviewbutton"/>
-          <button id="PanelUI-zen-gradient-generator-scheme-dark" class="subviewbutton"/> 
+          <button id="PanelUI-zen-gradient-generator-scheme-dark" class="no-squircles subviewbutton"/> 
         </hbox>
         <hbox id="PanelUI-zen-gradient-generator-color-actions">
-          <button id="PanelUI-zen-gradient-generator-color-add" class="subviewbutton" />
+          <button id="PanelUI-zen-gradient-generator-color-add" class="no-squircles subviewbutton" />
-          <button id="PanelUI-zen-gradient-generator-color-remove" class="subviewbutton" />
+          <button id="PanelUI-zen-gradient-generator-color-remove" class="no-squircles subviewbutton" />
-          <button id="PanelUI-zen-gradient-generator-color-toggle-algo" class="subviewbutton" />
+          <button id="PanelUI-zen-gradient-generator-color-toggle-algo" class="no-squircles subviewbutton" />
         </hbox>
         <label data-l10n-id="zen-panel-ui-gradient-click-to-add" id="PanelUI-zen-gradient-generator-color-click-to-add"></label>
       </hbox>
@@ -29,82 +29,82 @@
         <toolbarbutton id="PanelUI-zen-gradient-generator-color-page-left" class="toolbarbutton-1" disabled="true" />
         <hbox id="PanelUI-zen-gradient-generator-color-pages">
           <hbox>
-            <box data-lightness="90" data-algo="float" data-num-dots="1" data-position="240,240" style="background: #f4efdf;"></box>
+            <box class="no-squircles" data-lightness="90" data-algo="float" data-num-dots="1" data-position="240,240" style="background: #f4efdf;"></box>
-            <box data-lightness="80" data-algo="float" data-num-dots="1" data-position="233,157" style="background: #f0b8cd;"></box>
+            <box class="no-squircles" data-lightness="80" data-algo="float" data-num-dots="1" data-position="233,157" style="background: #f0b8cd;"></box>
-            <box data-lightness="80" data-algo="float" data-num-dots="1" data-position="236,111" style="background: #e9c3e3;"></box>
+            <box class="no-squircles" data-lightness="80" data-algo="float" data-num-dots="1" data-position="236,111" style="background: #e9c3e3;"></box>
-            <box data-lightness="70" data-algo="float" data-num-dots="1" data-position="234,173" style="background: #da7682;"></box>
+            <box class="no-squircles" data-lightness="70" data-algo="float" data-num-dots="1" data-position="234,173" style="background: #da7682;"></box>
-            <box data-lightness="70" data-algo="float" data-num-dots="1" data-position="220,187" style="background: #eb8570;"></box>
+            <box class="no-squircles" data-lightness="70" data-algo="float" data-num-dots="1" data-position="220,187" style="background: #eb8570;"></box>
-            <box data-lightness="60" data-algo="float" data-num-dots="1" data-position="225,237" style="background: #dcce7f;"></box>
+            <box class="no-squircles" data-lightness="60" data-algo="float" data-num-dots="1" data-position="225,237" style="background: #dcce7f;"></box>
-            <box data-lightness="60" data-algo="float" data-num-dots="1" data-position="147,195" style="background: #5becad;"></box>
+            <box class="no-squircles" data-lightness="60" data-algo="float" data-num-dots="1" data-position="147,195" style="background: #5becad;"></box>
-            <box data-lightness="50" data-algo="float" data-num-dots="1" data-position="81,84" style="background: #919bb5;"></box>
+            <box class="no-squircles" data-lightness="50" data-algo="float" data-num-dots="1" data-position="81,84" style="background: #919bb5;"></box>
           </hbox>
           <hbox>
-            <box data-lightness="90" data-algo="analogous" data-num-dots="3" data-position="240,240"
+            <box class="no-squircles" data-lightness="90" data-algo="analogous" data-num-dots="3" data-position="240,240"
                 style="--c1: rgb(245, 237, 214); --c2: rgb(221, 243, 216); --c3: rgb(243, 216, 225);" />
-            <box data-lightness="85" data-algo="analogous" data-num-dots="3" data-position="233,157"
+            <box class="no-squircles" data-lightness="85" data-algo="analogous" data-num-dots="3" data-position="233,157"
                 style="--c1: rgb(243, 190, 222); --c2: rgb(247, 222, 186); --c3: rgb(223, 195, 238);" />
-            <box data-lightness="80" data-algo="analogous" data-num-dots="3" data-position="236,111"
+            <box class="no-squircles" data-lightness="80" data-algo="analogous" data-num-dots="3" data-position="236,111"
                 style="--c1: rgb(229, 179, 228); --c2: rgb(236, 172, 178); --c3: rgb(197, 185, 223);" />
-            <box data-lightness="70" data-algo="analogous" data-num-dots="3" data-position="234,173"
+            <box class="no-squircles" data-lightness="70" data-algo="analogous" data-num-dots="3" data-position="234,173"
                 style="--c1: rgb(235, 122, 159); --c2: rgb(239, 239, 118); --c3: rgb(210, 133, 224);" />
-            <box data-lightness="70" data-algo="analogous" data-num-dots="3" data-position="220,187"
+            <box class="no-squircles" data-lightness="70" data-algo="analogous" data-num-dots="3" data-position="220,187"
                 style="--c1: rgb(242, 115, 123); --c2: rgb(175, 242, 115); --c3: rgb(230, 125, 232);" />
-            <box data-lightness="60" data-algo="analogous" data-num-dots="3" data-position="225,237"
+            <box class="no-squircles" data-lightness="60" data-algo="analogous" data-num-dots="3" data-position="225,237"
                 style="--c1: rgb(221, 205, 85); --c2: rgb(97, 212, 94); --c3: rgb(215, 91, 124);" />
-            <box data-lightness="60" data-algo="analogous" data-num-dots="3" data-position="147,195"
+            <box class="no-squircles" data-lightness="60" data-algo="analogous" data-num-dots="3" data-position="147,195"
                 style="--c1: rgb(75, 231, 210); --c2: rgb(84, 175, 222); --c3: rgb(62, 244, 112);" />
-            <box data-lightness="55" data-algo="analogous" data-num-dots="3" data-position="81,84"
+            <box class="no-squircles" data-lightness="55" data-algo="analogous" data-num-dots="3" data-position="81,84"
                 style="--c1: rgb(122, 132, 158); --c2: rgb(137, 117, 164); --c3: rgb(116, 162, 164);" />
           </hbox>
           <hbox>
-            <box data-lightness="10" data-algo="float" data-num-dots="1" data-position="171,72" style="background:rgb(93, 86, 106);"></box>
+            <box class="no-squircles" data-lightness="10" data-algo="float" data-num-dots="1" data-position="171,72" style="background:rgb(93, 86, 106);"></box>
-            <box data-lightness="40" data-algo="float" data-num-dots="1" data-position="265,79" style="background: #997096;"></box>
+            <box class="no-squircles" data-lightness="40" data-algo="float" data-num-dots="1" data-position="265,79" style="background: #997096;"></box>
-            <box data-lightness="35" data-algo="float" data-num-dots="1" data-position="301,176" style="background: #956066;"></box>
+            <box class="no-squircles" data-lightness="35" data-algo="float" data-num-dots="1" data-position="301,176" style="background: #956066;"></box>
-            <box data-lightness="30" data-algo="float" data-num-dots="1" data-position="237,210" style="background: #9c6645;"></box>
+            <box class="no-squircles" data-lightness="30" data-algo="float" data-num-dots="1" data-position="237,210" style="background: #9c6645;"></box>
-            <box data-lightness="30" data-algo="float" data-num-dots="1" data-position="91,228" style="background: #517b6c;"></box>
+            <box class="no-squircles" data-lightness="30" data-algo="float" data-num-dots="1" data-position="91,228" style="background: #517b6c;"></box>
-            <box data-lightness="25" data-algo="float" data-num-dots="1" data-position="67,159" style="background: #576e75;"></box>
+            <box class="no-squircles" data-lightness="25" data-algo="float" data-num-dots="1" data-position="67,159" style="background: #576e75;"></box>
-            <box data-lightness="20" data-algo="float" data-num-dots="1" data-position="314,235" style="background:rgb(131, 109, 95);"></box>
+            <box class="no-squircles" data-lightness="20" data-algo="float" data-num-dots="1" data-position="314,235" style="background:rgb(131, 109, 95);"></box>
-            <box data-lightness="20" data-algo="float" data-num-dots="1" data-position="118,215" style="background: #447464;"></box>
+            <box class="no-squircles" data-lightness="20" data-algo="float" data-num-dots="1" data-position="118,215" style="background: #447464;"></box>
           </hbox>
           <hbox>
-            <box data-lightness="10" data-algo="analogous" data-num-dots="3" data-position="171,72"
+            <box class="no-squircles" data-lightness="10" data-algo="analogous" data-num-dots="3" data-position="171,72"
                 style="--c1: rgb(23, 17, 34); --c2: rgb(37, 14, 35); --c3: rgb(18, 22, 33);" />
-            <box data-lightness="40" data-algo="analogous" data-num-dots="3" data-position="265,79"
+            <box class="no-squircles" data-lightness="40" data-algo="analogous" data-num-dots="3" data-position="265,79"
                 style="--c1: rgb(128, 76, 124); --c2: rgb(141, 63, 66); --c3: rgb(97, 88, 116);" />
-            <box data-lightness="35" data-algo="analogous" data-num-dots="3" data-position="301,176"
+            <box class="no-squircles" data-lightness="35" data-algo="analogous" data-num-dots="3" data-position="301,176"
                 style="--c1: rgb(122, 56, 64); --c2: rgb(126, 121, 52); --c3: rgb(111, 68, 110);" />
-            <box data-lightness="30" data-algo="analogous" data-num-dots="3" data-position="237,210"
+            <box class="no-squircles" data-lightness="30" data-algo="analogous" data-num-dots="3" data-position="237,210"
                 style="--c1: rgb(131, 65, 22); --c2: rgb(64, 128, 25); --c3: rgb(122, 31, 91);" />
-            <box data-lightness="30" data-algo="analogous" data-num-dots="3" data-position="91,228"
+            <box class="no-squircles" data-lightness="30" data-algo="analogous" data-num-dots="3" data-position="91,228"
                 style="--c1: rgb(45, 108, 85); --c2: rgb(52, 85, 101); --c3: rgb(52, 118, 35);" />
-            <box data-lightness="25" data-algo="analogous" data-num-dots="3" data-position="67,159"
+            <box class="no-squircles" data-lightness="25" data-algo="analogous" data-num-dots="3" data-position="67,159"
                 style="--c1: rgb(45, 74, 83); --c2: rgb(46, 50, 81); --c3: rgb(38, 90, 65);" />
-            <box data-lightness="20" data-algo="analogous" data-num-dots="3" data-position="314,235"
+            <box class="no-squircles" data-lightness="20" data-algo="analogous" data-num-dots="3" data-position="314,235"
                 style="--c1: rgb(64, 47, 38); --c2: rgb(55, 64, 38); --c3: rgb(59, 43, 52);" />
-            <box data-lightness="20" data-algo="analogous" data-num-dots="3" data-position="118,215"
+            <box class="no-squircles" data-lightness="20" data-algo="analogous" data-num-dots="3" data-position="118,215"
                 style="--c1: rgb(22, 80, 61); --c2: rgb(26, 60, 76); --c3: rgb(27, 87, 15);" />
           </hbox>
           <hbox>
 # Start from black to white in a span on 8 steps and.
 # They must all go from the middle to the right side. They must always stay verically centered.
 # And reach to 180 on the right side, meaning we must divide the width in 16 segments.
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="340,180" style="background: rgb(224, 224, 224);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="337.5,180" style="background: rgb(224, 224, 224);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="315,180" style="background: rgb(192, 192, 192);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="292.5,180" style="background: rgb(160, 160, 160);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="270,180" style="background: rgb(128, 128, 128);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="247.5,180" style="background: rgb(96, 96, 96);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="225,180" style="background: rgb(64, 64, 64);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="202.5,180" style="background: rgb(32, 32, 32);"></box>
-            <box data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
+            <box class="no-squircles" data-type="explicit-black-white" data-algo="float" data-num-dots="1" 
                 data-position="180,180" style="background: rgb(0, 0, 0);"></box>
           </hbox>
         </hbox>

src/browser/components/contextualidentity/content/ContainerCreationPanel-mjs.patch

@@ -0,0 +1,21 @@
+diff --git a/browser/components/contextualidentity/content/ContainerCreationPanel.mjs b/browser/components/contextualidentity/content/ContainerCreationPanel.mjs
+index e04d7a4738192703e8f7f8555f50aaf0a619a5bd..b86e4853c421856f84ad8e017062f0d611b88aad 100644
+--- a/browser/components/contextualidentity/content/ContainerCreationPanel.mjs
++++ b/browser/components/contextualidentity/content/ContainerCreationPanel.mjs
+@@ -4,7 +4,7 @@
+ 
+ import { ContainerEditor } from "chrome://browser/content/usercontext/ContainerEditor.mjs";
+ 
+-const ANCHOR_ID = "userContext-icons";
++const ANCHOR_ID = "navigator-toolbox";
+ const ANCHOR_PINNED_CLASS = "container-anchor-pinned";
+ 
+ const lazy = {};
+@@ -95,6 +95,6 @@ export const ContainerCreationPanel = {
+       anchor.hidden = false;
+     }
+ 
+-    panel.openPopup(anchor, "bottomright topright");
++    panel.openPopup(anchor, win.gZenUIManager.panelUIPosition());
+   },
+ };

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2681652e5 100644
+index 6d1885a54815d10b3a4e79f7e5acd61ab3abb159..3d6e092e7ed126cdee8c32229df2cfa13303d3a3 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -10,7 +10,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
    HomePage: "resource:///modules/HomePage.sys.mjs",
    PanelMultiView:
      "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs",
-@@ -348,7 +349,7 @@ var CustomizableUIInternal = {
+@@ -352,7 +353,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_PANEL,
          defaultPlacements: [],
@@ -19,7 +19,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
        },
        false
      );
-@@ -358,27 +359,23 @@ var CustomizableUIInternal = {
+@@ -362,27 +363,23 @@ var CustomizableUIInternal = {
        "back-button",
        "forward-button",
        "stop-reload-button",
@@ -50,17 +50,18 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
          defaultCollapsed: false,
        },
        true
-@@ -402,9 +399,6 @@ var CustomizableUIInternal = {
+@@ -406,10 +403,6 @@ var CustomizableUIInternal = {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
            "tabbrowser-tabs",
 -          "new-tab-button",
+-          "spring",
 -          "alltabs-button",
 -          "ai-window-toggle",
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -484,6 +478,7 @@ var CustomizableUIInternal = {
+@@ -502,6 +495,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -68,7 +69,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1285,6 +1280,9 @@ var CustomizableUIInternal = {
+@@ -1334,6 +1328,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -78,7 +79,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1793,7 +1791,6 @@ var CustomizableUIInternal = {
+@@ -1842,7 +1839,6 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -86,7 +87,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1803,7 +1800,7 @@ var CustomizableUIInternal = {
+@@ -1852,7 +1848,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)) {
@@ -95,7 +96,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -1971,16 +1968,16 @@ var CustomizableUIInternal = {
+@@ -2020,16 +2016,16 @@ var CustomizableUIInternal = {
          elem.setAttribute("skipintoolbarset", "true");
        }
      }
@@ -115,7 +116,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      // Handle initial state of vertical tabs.
      if (isVerticalTabs) {
        // Show the vertical tabs toolbar
-@@ -2222,6 +2219,10 @@ var CustomizableUIInternal = {
+@@ -2271,6 +2267,10 @@ var CustomizableUIInternal = {
     *   The identifier string of the area that aNode is being inserted into.
     */
    insertWidgetBefore(aNode, aNextNode, aContainer, aAreaId) {
@@ -126,7 +127,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
        this.setLocationAttributes(aNode, aAreaId);
        aContainer.insertBefore(aNode, aNextNode);
-@@ -4592,7 +4593,7 @@ var CustomizableUIInternal = {
+@@ -4647,7 +4647,7 @@ var CustomizableUIInternal = {
     * For all registered areas, builds those areas to reflect the current
     * placement state of all widgets.
     */
@@ -135,7 +136,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -4603,7 +4604,7 @@ var CustomizableUIInternal = {
+@@ -4658,7 +4658,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.documentGlobal;
@@ -144,7 +145,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -5899,6 +5900,7 @@ export var CustomizableUI = {
+@@ -5971,6 +5971,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -152,7 +153,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -7869,7 +7871,9 @@ class OverflowableToolbar {
+@@ -7946,7 +7947,9 @@ class OverflowableToolbar {
          );
  
          if (webExtList && CustomizableUI.isWebExtensionWidget(child.id)) {
@@ -162,16 +163,27 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
            webExtList.insertBefore(child, webExtList.firstElementChild);
          } else {
            child.setAttribute("cui-anchorid", this.#defaultListButton.id);
-@@ -7929,7 +7933,7 @@ class OverflowableToolbar {
+@@ -7995,6 +7998,7 @@ class OverflowableToolbar {
+       return aElement.getBoundingClientRect().width;
+     }
+ 
++    let toolbar = this.#toolbar;
+     function sumChildrenInlineSize(aParent, aExceptChild = null) {
+       let sum = 0;
+       for (let child of aParent.children) {
+@@ -8006,7 +8010,10 @@ class OverflowableToolbar {
          ) {
            continue;
          }
 -        sum += parseFloat(style.marginLeft) + parseFloat(style.marginRight);
 +        sum += parseFloat(style.marginLeft) + (win.gZenVerticalTabsManager._hasSetSingleToolbar ? Math.max(0, parseFloat(style.marginRight)) : parseFloat(style.marginRight));
++        if (toolbar.id == 'zen-sidebar-top-buttons' && toolbar.hasAttribute("overflowing")) {
++          sum += 2; // Add extra padding that we remove from the CSS
++        }
          if (child != aExceptChild) {
            sum += getInlineSize(child);
          }
-@@ -7953,11 +7957,11 @@ class OverflowableToolbar {
+@@ -8030,11 +8037,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -185,7 +197,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      });
  
      lazy.log.debug(
-@@ -7972,7 +7976,39 @@ class OverflowableToolbar {
+@@ -8049,7 +8056,39 @@ class OverflowableToolbar {
        Math.max(targetWidth, targetChildrenWidth)
      );
      totalAvailWidth = Math.ceil(totalAvailWidth);
@@ -226,7 +238,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -8033,7 +8069,11 @@ class OverflowableToolbar {
+@@ -8110,7 +8149,11 @@ class OverflowableToolbar {
              return;
            }
          }
@@ -239,7 +251,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
            lazy.log.debug(
              `Need ${minSize} but width is ${totalAvailWidth} so bailing`
            );
-@@ -8066,7 +8106,7 @@ class OverflowableToolbar {
+@@ -8143,7 +8186,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -248,7 +260,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8192,6 +8232,9 @@ class OverflowableToolbar {
+@@ -8269,6 +8312,9 @@ class OverflowableToolbar {
     *   if no such list exists.
     */
    get #webExtList() {
@@ -258,7 +270,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      if (!this.#webExtListRef) {
        let targetID = this.#toolbar.getAttribute("addon-webext-overflowtarget");
        if (!targetID) {
-@@ -8203,6 +8246,9 @@ class OverflowableToolbar {
+@@ -8280,6 +8326,9 @@ class OverflowableToolbar {
        let win = this.#toolbar.documentGlobal;
        let { panel } = win.gUnifiedExtensions;
        this.#webExtListRef = panel.querySelector(`#${targetID}`);
@@ -268,7 +280,7 @@ index 491161e48044f75167a8e8a0348779cfa22fc40e..867d51b8a6b74f841afc6d84dcdfd8f2
      }
      return this.#webExtListRef;
    }
-@@ -8411,7 +8457,7 @@ class OverflowableToolbar {
+@@ -8488,7 +8537,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {

src/browser/components/preferences/config/account-sync-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/config/account-sync.mjs b/browser/components/preferences/config/account-sync.mjs
-index b503987a08e2ce64bfc01c4e3a21e5e19ef834f0..b1c03a0b219fd3eddd93c1deaeb18ab79c85f168 100644
+index b01fd4bb163ad53139fcbd8e79e12ef994d1fa13..dd60be4fe268618d6596cd5cfac3342975bd241a 100644
 --- a/browser/components/preferences/config/account-sync.mjs
 +++ b/browser/components/preferences/config/account-sync.mjs
-@@ -42,6 +42,7 @@ Preferences.addAll([
+@@ -46,6 +46,7 @@ Preferences.addAll([
    { id: "services.sync.engine.creditcards", type: "bool" },
    { id: "services.sync.engine.addons", type: "bool" },
    { id: "services.sync.engine.prefs", type: "bool" },
@@ -10,7 +10,7 @@ index b503987a08e2ce64bfc01c4e3a21e5e19ef834f0..b1c03a0b219fd3eddd93c1deaeb18ab7
  ]);
  
  /**
-@@ -546,6 +547,7 @@ const SYNC_ENGINE_SETTINGS = [
+@@ -557,6 +558,7 @@ const SYNC_ENGINE_SETTINGS = [
      type: "payments",
    },
    { id: "syncAddons", pref: "services.sync.engine.addons", type: "addons" },
@@ -18,3 +18,37 @@ index b503987a08e2ce64bfc01c4e3a21e5e19ef834f0..b1c03a0b219fd3eddd93c1deaeb18ab7
    { id: "syncSettings", pref: "services.sync.engine.prefs", type: "settings" },
  ];
  
+@@ -564,6 +566,12 @@ SYNC_ENGINE_SETTINGS.forEach(({ id, pref }) => {
+   Preferences.addSetting({ id, pref });
+ });
+ 
++Preferences.addSetting({ id: "zenSyncWorkspacesGroup" });
++Preferences.addSetting({
++  id: "zenSyncWorkspaces",
++  pref: "services.sync.engine.spaces",
++});
++
+ Preferences.addSetting({
+   id: "syncEngines",
+   deps: SYNC_ENGINE_SETTINGS.map(({ id }) => id),
+@@ -995,6 +1003,20 @@ SettingGroupManager.registerGroups({
+             id: "syncEnginesList",
+             control: "sync-engines-list",
+           },
++          {
++            id: "zenSyncWorkspacesGroup",
++            control: "moz-box-item",
++            items: [
++              {
++                id: "zenSyncWorkspaces",
++                l10nId: "zen-settings-workspaces-sync",
++                control: "moz-toggle",
++                controlAttrs: {
++                  inputlayout: "inline-end",
++                },
++              },
++            ],
++          },
+           {
+             id: "syncChangeOptions",
+             control: "moz-box-button",

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 a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d520470c7 100644
+index 94612d8e28af58fcb04914440348b899a0a1e08f..da3b1ffd09745d09589283356d1001dbfb76a468 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -132,6 +132,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
@@ -10,7 +10,7 @@ index a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -462,6 +463,8 @@ const CONFIG_PANES = Object.freeze({
+@@ -471,6 +472,8 @@ const CONFIG_PANES = Object.freeze({
    tabsBrowsing: {
      l10nId: "tabs-browsing-section",
      groupIds: [
@@ -19,7 +19,7 @@ index a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d
        "browserLayout",
        "tabs",
        "pageNavigation",
-@@ -509,7 +512,7 @@ function register_module(categoryName, categoryObject) {
+@@ -518,7 +521,7 @@ function register_module(categoryName, categoryObject) {
        }
        this._initted = true;
        let template = document.getElementById("template-" + categoryName);
@@ -28,7 +28,7 @@ index a76699af75252bec31e17b562463c37236cbbfe5..6355a6ee92754846ffcdd123ac49545d
          // Replace the template element with the nodes inside of it.
          template.replaceWith(template.content);
  
-@@ -553,6 +556,10 @@ function init_all() {
+@@ -562,6 +565,10 @@ function init_all() {
    register_module("paneHome", gHomePane);
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);

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

@@ -27,7 +27,7 @@ index 1b8c38159314b6edee9e6f455beb2b63db1ad3f0..1308345db640dba6b2848b49ef7c1181
 +      </html:moz-page-nav-button>
 +      <html:moz-page-nav-button id="category-zen-CKS"
 +        view="paneZenCKS"
-+        iconsrc="chrome://browser/skin/quickactions.svg"
++        iconsrc="chrome://browser/skin/preferences/category-accessibility.svg"
 +        data-l10n-id="pane-zen-CKS-title">
 +      </html:moz-page-nav-button>
 +      <html:moz-page-nav-button id="category-zen-marketplace"

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 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b15a030046 100644
+index 70b37f93c4e8ff4ad9a2452681e468d23914c1b5..dbf2d9c83dafbe0e0b4e6caf3835edc8edf9bcf4 100644
 --- a/browser/components/tabbrowser/content/drag-and-drop.js
 +++ b/browser/components/tabbrowser/content/drag-and-drop.js
 @@ -35,6 +35,9 @@
@@ -12,7 +12,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
      if (isTab(element) || isSplitViewWrapper(element)) {
        return element;
      }
-@@ -118,6 +121,9 @@
+@@ -128,6 +131,9 @@
        }
  
        let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -22,7 +22,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
        if (
          (dropEffect == "move" || dropEffect == "copy") &&
          document == draggedTab.ownerDocument &&
-@@ -138,6 +144,7 @@
+@@ -148,6 +154,7 @@
            !draggedTab.group.collapsed
          ) {
            draggedTab.group.collapsed = true;
@@ -30,7 +30,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
          }
  
          if (dropEffect == "move") {
-@@ -145,10 +152,6 @@
+@@ -155,10 +162,6 @@
  
            // Pinned tabs in expanded vertical mode are on a grid format and require
            // different logic to drag and drop.
@@ -41,7 +41,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
            this._animateTabMove(event);
            return;
          }
-@@ -287,6 +290,10 @@
+@@ -297,6 +300,10 @@
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
@@ -52,7 +52,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
        if (draggedTab && dropEffect == "copy") {
          let duplicatedDraggedTab;
          let duplicatedTabs = [];
-@@ -312,12 +319,16 @@
+@@ -324,12 +331,16 @@
          let translateOffsetY = oldTranslateY % tabHeight;
          let newTranslateX = oldTranslateX - translateOffsetX;
          let newTranslateY = oldTranslateY - translateOffsetY;
@@ -73,7 +73,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
  
          if (this._tabbrowserTabs.isContainerVerticalPinnedGrid(draggedTab)) {
            // Update both translate axis for pinned vertical expanded tabs
-@@ -392,11 +403,13 @@
+@@ -404,11 +415,13 @@
            this._dragToPinPromoCard,
          ];
          let shouldPin =
@@ -87,15 +87,15 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
            isTab(draggedTab) &&
            draggedTab.pinned &&
            this._tabbrowserTabs.arrowScrollbox.contains(event.target);
-@@ -466,6 +479,7 @@
+@@ -484,6 +497,7 @@
            }
          }
  
 +        shouldTranslate = false;
          if (shouldTranslate) {
+           this.#dropAnimationEndTime = Date.now() + DROP_ANIMATION_GRACE_MS;
            let translationPromises = [];
-           for (let item of movingTabs) {
+@@ -496,7 +510,7 @@
-@@ -477,7 +491,7 @@
                  item.removeAttribute("tabdrop-samewindow");
                  resolve();
                };
@@ -104,7 +104,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -552,7 +566,7 @@
+@@ -580,7 +594,7 @@
            if (tab.selected) {
              selectedTab = tab;
              indexForSelectedTab = newIndex;
@@ -113,7 +113,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
              const droppedIntoPinnedArea = dropIndex < gBrowser.pinnedTabCount;
              const newSplitView = gBrowser.adoptSplitView(tab, {
                elementIndex: droppedIntoPinnedArea
-@@ -577,7 +591,7 @@
+@@ -605,7 +619,7 @@
              }
            }
          }
@@ -122,7 +122,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
            const newTab = gBrowser.adoptTab(selectedTab, {
              elementIndex: indexForSelectedTab,
              selectTab: selectedTab == draggedTab,
-@@ -611,10 +625,6 @@
+@@ -639,10 +653,6 @@
                this._tabbrowserTabs.dragAndDropElements[
                  gBrowser.pinnedTabCount + unpinnedSplitViews.length - 1
                ];
@@ -133,7 +133,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
            }
          }
        } else {
-@@ -664,6 +674,7 @@
+@@ -703,6 +713,7 @@
  
            let nextItem = this._tabbrowserTabs.dragAndDropElements[newIndex];
            let tabGroup = isTab(nextItem) && nextItem.group;
@@ -141,12 +141,15 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
            gBrowser.loadTabs(urls, {
              inBackground,
              replace,
-@@ -705,7 +716,16 @@
+@@ -744,6 +755,22 @@
          this._expandGroupOnDrop(draggedTab);
        }
-       this._resetTabsAfterDrop(draggedTab.ownerDocument);
+       this._resetTabsAfterDrop(draggedTab);
--
++      if (
-+      if (!dt.mozUserCancelled && dt.dropEffect == "none" && !this._isCustomizing) {
++        !dt.mozUserCancelled &&
++        dt.dropEffect == "none" &&
++        !this._tabbrowserTabs._isCustomizing
++      ) {
 +        const moved = gZenViewSplitter.moveTabToSplitView(event, draggedTab);
 +        if (moved) {
 +          delete draggedTab._dragData;
@@ -154,12 +157,14 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
 +        }
 +      } else if (dt.mozUserCancelled) {
 +        gZenViewSplitter.onBrowserDragEndToSplit(event, true);
-+        if (gZenViewSplitter._lastOpenedTab) gZenViewSplitter._lastOpenedTab._visuallySelected = false;
++        if (gZenViewSplitter._lastOpenedTab) {
++          gZenViewSplitter._lastOpenedTab._visuallySelected = false;
++        }
 +      }
+ 
        if (
          dt.mozUserCancelled ||
-         dt.dropEffect != "none" ||
+@@ -1074,11 +1101,10 @@
-@@ -927,11 +947,10 @@
          return this.#getHorizontalScrollboxDragTarget(event, ignoreSides);
        }
        while (target) {
@@ -175,7 +180,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
            break;
          }
          target = target.parentNode;
-@@ -961,6 +980,9 @@
+@@ -1108,6 +1134,9 @@
            return null;
          }
        }
@@ -185,17 +190,36 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
        return target;
      }
  
-@@ -1014,7 +1036,8 @@
+@@ -1170,14 +1199,20 @@
-         isTabGroupLabel(draggedTab) &&
+       let releaseReservedSpace = () =>
-         draggedTab._dragData?.expandGroupOnDrop
+         this.#releaseSpaceInScrolledContent(periphery);
-       ) {
+       if (group.collapsed) {
--        draggedTab.group.collapsed = false;
+-        // The group's tabs animate back to their full size, so hold on to the
-+        draggedTab.group.collapsed = draggedTab.group.hasAttribute("has-active");
+-        // space reserved for them until they get there.
-+        gZenFolders.animateGroupMove(draggedTab.group, true);
+-        group.addEventListener(
+-          "TabGroupAnimationComplete",
+-          releaseReservedSpace,
+-          { once: true }
+-        );
+-        group.collapsed = false;
++        const expand = !group.hasAttribute("has-active");
++        if (expand) {
++          // The group's tabs animate back to their full size, so hold on to the
++          // space reserved for them until they get there.
++          group.addEventListener(
++            "TabGroupAnimationComplete",
++            releaseReservedSpace,
++            { once: true }
++          );
++        } else {
++          releaseReservedSpace();
++        }
++        group.collapsed = !expand;
++        gZenFolders.animateGroupMove(group, true);
+       } else {
+         releaseReservedSpace();
        }
-     }
+@@ -1362,7 +1397,6 @@
- 
-@@ -1206,7 +1229,6 @@
          // using updateDragImage. On Linux, we can use a panel.
          if (platform == "win" || platform == "macosx") {
            captureListener = function () {
@@ -203,7 +227,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
            };
          } else {
            // Create a panel to use it in setDragImage
-@@ -1244,7 +1266,6 @@
+@@ -1400,7 +1434,6 @@
          );
          dragImageOffset = dragImageOffset * scale;
        }
@@ -211,7 +235,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
  
        // _dragData.offsetX/Y give the coordinates that the mouse should be
        // positioned relative to the corner of the new window created upon
-@@ -1263,7 +1284,7 @@
+@@ -1419,7 +1452,7 @@
        let dropEffect = this.getDropEffectForTabDrag(event);
        let isMovingInTabStrip = !fromTabList && dropEffect == "move";
        let collapseTabGroupDuringDrag =
@@ -220,7 +244,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
  
        tab._dragData = {
          offsetX: this._tabbrowserTabs.verticalMode
-@@ -1273,7 +1294,7 @@
+@@ -1429,7 +1462,7 @@
            ? event.screenY - window.screenY - tabOffset
            : event.screenY - window.screenY,
          scrollPos:
@@ -229,7 +253,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
              ? this._tabbrowserTabs.pinnedTabsContainer.scrollPosition
              : this._tabbrowserTabs.arrowScrollbox.scrollPosition,
          screenX: event.screenX,
-@@ -1320,6 +1341,7 @@
+@@ -1522,6 +1555,7 @@
        if (tabStripItemElement.hasAttribute("dragtarget")) {
          return;
        }
@@ -237,7 +261,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
        let isPinned = tab.pinned;
        let dragAndDropElements = this._tabbrowserTabs.dragAndDropElements;
        let isGrid = this._tabbrowserTabs.isContainerVerticalPinnedGrid(tab);
-@@ -1686,23 +1708,6 @@
+@@ -1895,23 +1929,6 @@
  
        // Slide the relevant tabs to their new position.
        // non-moving tabs adjust for RTL
@@ -261,7 +285,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
        // moving tabs don't adjust for RTL
        for (let item of selectedElements) {
          if (
-@@ -1751,7 +1756,6 @@
+@@ -1960,7 +1977,6 @@
        for (let item of this._tabbrowserTabs.dragAndDropElements) {
          delete item._moveTogetherSelectedTabsData;
          item = elementToMove(item);
@@ -269,7 +293,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
          item.removeAttribute("multiselected-move-together");
        }
      }
-@@ -2598,7 +2602,6 @@
+@@ -2812,7 +2828,6 @@
          tab.style.top = "";
          tab.style.maxWidth = "";
          tab.style.pointerEvents = "";
@@ -277,7 +301,7 @@ index 8bb1219962a1368f50b53c61041f135c68e35f31..8e72441d26883cbef7a352b00c0fe2b1
          tab.removeAttribute("small-stack");
          tab.removeAttribute("big-stack");
        }
-@@ -2607,11 +2610,9 @@
+@@ -2821,11 +2836,9 @@
        )) {
          label.style.width = "";
          label.style.maxWidth = "";

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 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da5504f9d8 100644
+index 43180487a2fac15b7a65fac94f233eeed9094990..ae1288974cae29da929f27b78ff8db542566eba2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -513,6 +513,7 @@
+@@ -514,6 +514,7 @@
       * @type {MozBrowser[]}
       */
      get splitViewBrowsers() {
@@ -10,7 +10,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        const browsers = [];
        if (this.#activeSplitView) {
          for (const tab of this.#activeSplitView.tabs) {
-@@ -611,15 +612,66 @@
+@@ -612,15 +613,66 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -79,7 +79,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
      setSelectedTab(val, metricsContext = null) {
        if (this.selectedTab === val) {
          return;
-@@ -632,6 +684,9 @@
+@@ -633,6 +685,9 @@
        ) {
          return;
        }
@@ -89,7 +89,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // Update the tab
        this.tabbox.selectedTab = val;
  
-@@ -708,6 +763,10 @@
+@@ -709,6 +764,10 @@
          userContextId = parseInt(tabArgument.getAttribute("usercontextid"), 10);
        }
  
@@ -100,7 +100,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        if (openWindowInfo) {
          userContextId = openWindowInfo.originAttributes.userContextId;
        }
-@@ -809,6 +868,8 @@
+@@ -810,6 +869,8 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -109,7 +109,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -1178,18 +1239,24 @@
+@@ -1179,18 +1240,24 @@
       *   The context for the operation for telemetry purposes, defaults to an unknown context.
       */
      pinTab(aTab, { metricsContext = this.TabMetrics.UNKNOWN_CONTEXT } = {}) {
@@ -135,7 +135,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -1206,16 +1273,25 @@
+@@ -1207,16 +1274,25 @@
       *   The context for the operation for telemetry purposes, defaults to an unknown context.
       */
      unpinTab(aTab, { metricsContext = this.TabMetrics.UNKNOWN_CONTEXT } = {}) {
@@ -162,7 +162,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1430,6 +1506,9 @@
+@@ -1432,6 +1508,9 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -172,7 +172,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        if (
          aIconURL &&
          !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1439,6 +1518,9 @@
+@@ -1441,6 +1520,9 @@
          );
          return;
        }
@@ -182,7 +182,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1761,7 +1843,6 @@
+@@ -1763,7 +1845,6 @@
  
        // Preview mode should not reset the owner
        if (!this.#previewMode && !oldTab.selected) {
@@ -190,7 +190,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        }
  
        let lastRelatedTab = this.#lastRelatedTabMap.get(oldTab);
-@@ -1852,6 +1933,7 @@
+@@ -1854,6 +1935,7 @@
        if (!this.#previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -198,7 +198,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.documentGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -2066,6 +2148,9 @@
+@@ -2068,6 +2150,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -208,7 +208,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -2104,7 +2189,7 @@
+@@ -2106,7 +2191,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.
@@ -217,7 +217,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          let selectURL = () => {
            if (this._asyncTabSwitching) {
              // Set _awaitingSetURI flag to suppress popup notification
-@@ -2392,7 +2477,12 @@
+@@ -2394,7 +2479,12 @@
        return this._setTabLabel(aTab, aLabel);
      }
  
@@ -231,7 +231,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        if (!aLabel || (isURL && /^about:reader\?url=/.test(aLabel))) {
          return false;
        }
-@@ -2518,7 +2608,7 @@
+@@ -2520,7 +2610,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -240,7 +240,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2793,6 +2883,7 @@
+@@ -2795,6 +2885,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -248,7 +248,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2866,8 +2957,7 @@
+@@ -2868,8 +2959,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -258,7 +258,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          b.setAttribute("transparent", "true");
        }
  
-@@ -3022,7 +3112,7 @@
+@@ -3024,7 +3114,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -267,7 +267,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -3082,8 +3172,8 @@
+@@ -3084,8 +3174,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) {
@@ -278,7 +278,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -3268,7 +3358,6 @@
+@@ -3270,7 +3360,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -286,7 +286,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -3378,6 +3467,10 @@
+@@ -3380,6 +3469,10 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -297,7 +297,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -3388,10 +3481,25 @@
+@@ -3390,10 +3483,25 @@
          );
        }
  
@@ -323,7 +323,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // If we're opening a foreground tab, set the owner by default.
        ownerTab ??= inBackground ? null : this.selectedTab;
  
-@@ -3399,6 +3507,7 @@
+@@ -3401,6 +3509,7 @@
        if (this.selectedTab.owner) {
          this.selectedTab.owner = null;
        }
@@ -331,7 +331,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        // Find the tab that opened this one, if any. This is used for
        // determining positioning, and inherited attributes such as the
-@@ -3451,6 +3560,22 @@
+@@ -3453,6 +3562,22 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -354,7 +354,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -3459,6 +3584,7 @@
+@@ -3461,6 +3586,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -362,7 +362,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -3477,6 +3603,7 @@
+@@ -3479,6 +3605,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -370,7 +370,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          }));
  
          if (focusUrlBar) {
-@@ -3601,6 +3728,12 @@
+@@ -3603,6 +3730,12 @@
          }
        }
  
@@ -383,7 +383,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3611,6 +3744,15 @@
+@@ -3613,6 +3746,15 @@
        if (!inBackground) {
          this.selectedTab = t;
        }
@@ -399,7 +399,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        return t;
      }
  
-@@ -3834,6 +3976,7 @@
+@@ -3836,6 +3978,7 @@
          insertBefore = null,
          isAdoptingGroup = false,
          metricsContext = this.TabMetrics.UNKNOWN_CONTEXT,
@@ -407,7 +407,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        } = {}
      ) {
        if (
-@@ -3844,9 +3987,6 @@
+@@ -3846,9 +3989,6 @@
              !this.isSplitViewWrapper(tabOrSplitView)
          )
        ) {
@@ -417,7 +417,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        }
  
        if (!color) {
-@@ -3867,9 +4007,14 @@
+@@ -3869,9 +4009,14 @@
          label,
          isAdoptingGroup
        );
@@ -434,7 +434,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        );
        group.addTabs(tabsAndSplitViews, metricsContext);
  
-@@ -3973,7 +4118,7 @@
+@@ -3975,7 +4120,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -443,7 +443,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        );
      }
  
-@@ -4059,6 +4204,7 @@
+@@ -4061,6 +4206,7 @@
          color: group.color,
          insertBefore: newTabs[0],
          isAdoptingGroup: true,
@@ -451,7 +451,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        });
      }
  
-@@ -4269,6 +4415,7 @@
+@@ -4271,6 +4417,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -459,7 +459,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -4329,6 +4476,7 @@
+@@ -4331,6 +4478,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -467,7 +467,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          });
        }
  
-@@ -4542,9 +4690,9 @@
+@@ -4544,9 +4692,9 @@
          }
  
          // Add a new tab if needed.
@@ -479,7 +479,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -4577,8 +4725,10 @@
+@@ -4579,8 +4727,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -491,7 +491,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
            if (select) {
              tabToSelect = tab;
            }
-@@ -4600,7 +4750,8 @@
+@@ -4602,7 +4752,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -501,7 +501,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -4620,7 +4771,10 @@
+@@ -4622,7 +4773,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -513,7 +513,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4675,9 +4829,21 @@
+@@ -4677,9 +4831,21 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -535,7 +535,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4882,11 +5048,17 @@
+@@ -4884,11 +5050,17 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -554,7 +554,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4898,7 +5070,7 @@
+@@ -4900,7 +5072,7 @@
            let lastRelatedTab =
              openerTab && this.#lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -563,7 +563,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
              tabGroup = previousTab.group;
            }
            if (
-@@ -4914,7 +5086,7 @@
+@@ -4916,7 +5088,7 @@
                  previousTab.splitview
                ) + 1;
            } else if (previousTab.visible) {
@@ -572,7 +572,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4942,14 +5114,14 @@
+@@ -4944,14 +5116,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -591,7 +591,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4966,7 +5138,7 @@
+@@ -4968,7 +5140,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -600,7 +600,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          if (
            (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
            this.isSplitViewWrapper(itemAfter)
-@@ -4997,7 +5169,11 @@
+@@ -4999,7 +5171,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -612,7 +612,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        }
  
        if (tab.group?.collapsed) {
-@@ -5012,6 +5188,7 @@
+@@ -5014,6 +5190,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -620,7 +620,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        TabBarVisibility.update();
      }
-@@ -5568,6 +5745,7 @@
+@@ -5577,6 +5754,7 @@
          metricsContext,
        } = {}
      ) {
@@ -628,7 +628,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -5678,6 +5856,7 @@
+@@ -5687,6 +5865,7 @@
              closedTabCount -= 1;
            }
          }
@@ -636,7 +636,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
          if (closedTabCount > 0) {
            this.recordTabMetrics(
-@@ -5730,6 +5909,14 @@
+@@ -5761,6 +5940,14 @@
          return;
        }
  
@@ -651,7 +651,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        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
-@@ -5737,6 +5924,9 @@
+@@ -5768,6 +5955,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -661,7 +661,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5747,13 +5937,14 @@
+@@ -5778,13 +5968,14 @@
            metricsContext,
          })
        ) {
@@ -677,7 +677,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -5784,7 +5975,13 @@
+@@ -5815,7 +6006,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -692,7 +692,18 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          return;
        }
  
-@@ -5827,7 +6024,7 @@
+@@ -5855,7 +6052,9 @@
+     get #shouldCloseWindowWithLastTab() {
+       return (
+         !window.toolbar.visible ||
+-        Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab")
++        (Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab") &&
++          !gZenWorkspaces._isClosingWindow &&
++          !gZenWorkspaces._removedByStartupPage)
+       );
+     }
+ 
+@@ -5871,7 +6070,7 @@
       */
      #isLastTabInWindow(tab) {
        for (const otherTab of this.tabs) {
@@ -701,16 +712,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
            return false;
          }
        }
-@@ -5917,7 +6114,7 @@
+@@ -5982,6 +6181,7 @@
-           closeWindowWithLastTab != null
-             ? closeWindowWithLastTab
-             : !window.toolbar.visible ||
--              Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab");
-+              Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab") && !gZenWorkspaces._isClosingWindow && !gZenWorkspaces._removedByStartupPage;
- 
-         if (closeWindow) {
-           // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5941,6 +6138,7 @@
  
          newTab = true;
        }
@@ -718,8 +720,8 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5982,13 +6180,7 @@
+@@ -6029,13 +6229,7 @@
-       aTab._mouseleave();
+       }
  
        if (newTab) {
 -        this.addTrustedTab(BROWSER_NEW_TAB_URL, {
@@ -733,7 +735,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        } else {
          TabBarVisibility.update();
        }
-@@ -6128,6 +6320,7 @@
+@@ -6192,6 +6386,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -741,7 +743,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        if (!this.#windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -6313,6 +6506,7 @@
+@@ -6377,6 +6572,7 @@
          memory_after: await getTotalMemoryUsage(),
          time_to_unload_in_ms: timeElapsed,
        });
@@ -749,7 +751,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
      }
  
      /**
-@@ -6358,6 +6552,7 @@
+@@ -6422,6 +6618,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -757,7 +759,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -6370,13 +6565,13 @@
+@@ -6434,13 +6631,13 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -773,7 +775,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        );
  
        if (Services.prefs.getBoolPref("browser.tabs.selectMRUOnClose", false)) {
-@@ -6392,6 +6587,13 @@
+@@ -6456,6 +6653,13 @@
          }
        }
  
@@ -787,7 +789,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        let tab = this.tabContainer.findNextTab(aTab, {
          direction: 1,
          filter: _tab => remainingTabs.includes(_tab),
-@@ -6405,7 +6607,7 @@
+@@ -6469,7 +6673,7 @@
        }
  
        if (tab) {
@@ -796,7 +798,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -6426,7 +6628,7 @@
+@@ -6490,7 +6694,7 @@
          });
        }
  
@@ -805,7 +807,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
      }
  
      _blurTab(aTab) {
-@@ -6437,7 +6639,7 @@
+@@ -6501,7 +6705,7 @@
       * @returns {boolean}
       *   False if swapping isn't permitted, true otherwise.
       */
@@ -814,7 +816,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // Do not allow transfering a private tab to a non-private window
        // and vice versa.
        if (
-@@ -6491,6 +6693,7 @@
+@@ -6555,6 +6759,7 @@
        // fire the beforeunload event in the process.  Close the other
        // window if this was its last tab.
        if (
@@ -822,7 +824,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          !remoteBrowser._beginRemoveTab(aOtherTab, {
            adoptedByTab: aOurTab,
            closeWindowWithLastTab: true,
-@@ -6502,7 +6705,7 @@
+@@ -6566,7 +6771,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.
@@ -831,7 +833,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        if (closeWindow) {
          let win = aOtherTab.documentGlobal;
          win.windowUtils.suppressAnimation(true);
-@@ -6636,11 +6839,13 @@
+@@ -6700,11 +6905,13 @@
        }
  
        // Finish tearing down the tab that's going away.
@@ -845,7 +847,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        this.setTabTitle(aOurTab);
  
-@@ -6860,10 +7065,10 @@
+@@ -6928,10 +7135,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -858,7 +860,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6923,7 +7128,8 @@
+@@ -6991,7 +7198,8 @@
       * @param {object} [aOptions={}]
       *   Key-value pairs that will be serialized into the features string.
       */
@@ -868,7 +870,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6940,7 +7146,7 @@
+@@ -7008,7 +7216,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);
@@ -877,7 +879,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          private: PrivateBrowsingUtils.isWindowPrivate(window),
          features: Object.entries(aOptions)
            .map(([key, value]) => `${key}=${value}`)
-@@ -6948,6 +7154,8 @@
+@@ -7016,6 +7224,8 @@
          openerWindow: window,
          args,
        });
@@ -886,7 +888,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
      }
  
      /**
-@@ -7074,7 +7282,7 @@
+@@ -7142,7 +7352,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -895,7 +897,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
      }
  
      /**
-@@ -7146,8 +7354,8 @@
+@@ -7214,8 +7424,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -906,7 +908,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -7193,8 +7401,8 @@
+@@ -7261,8 +7471,8 @@
        this.#handleTabMove(
          element,
          () => {
@@ -917,7 +919,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
              neighbor = neighbor.group;
            }
            if (neighbor?.splitview) {
-@@ -7205,6 +7413,12 @@
+@@ -7273,6 +7483,12 @@
                return;
              }
            }
@@ -930,7 +932,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
            if (movingForwards && neighbor) {
              neighbor.after(element);
-@@ -7278,23 +7492,31 @@
+@@ -7346,23 +7562,31 @@
      ) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -968,7 +970,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        } 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
-@@ -7307,12 +7529,35 @@
+@@ -7375,12 +7599,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.
@@ -1005,7 +1007,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        // 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.
-@@ -7321,6 +7566,7 @@
+@@ -7389,6 +7636,7 @@
        }
  
        let getContainer = () =>
@@ -1013,7 +1015,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -7329,11 +7575,15 @@
+@@ -7397,11 +7645,15 @@
          element,
          () => {
            if (moveBefore) {
@@ -1030,7 +1032,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
            }
          },
          { metricsContext }
-@@ -7411,11 +7661,15 @@
+@@ -7479,11 +7731,15 @@
       *   The context for the operation for telemetry purposes.
       */
      moveTabToExistingGroup(aTab, aGroup, { metricsContext } = {}) {
@@ -1049,7 +1051,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
          return;
-@@ -7489,6 +7743,7 @@
+@@ -7557,6 +7813,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -1057,7 +1059,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -7527,7 +7782,7 @@
+@@ -7595,7 +7852,7 @@
        let changedSplitView =
          previousTabState.splitViewId != currentTabState.splitViewId;
  
@@ -1066,7 +1068,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -7579,6 +7834,10 @@
+@@ -7647,6 +7904,10 @@
  
        moveActionCallback();
  
@@ -1077,7 +1079,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7626,7 +7885,22 @@
+@@ -7694,7 +7955,22 @@
       * @returns {object}
       *    The new tab in the current window, null if the tab couldn't be adopted.
       */
@@ -1101,7 +1103,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        // 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
-@@ -7669,6 +7943,8 @@
+@@ -7737,6 +8013,8 @@
        }
        params.skipLoad = true;
        let newTab = this.addWebTab("about:blank", params);
@@ -1110,7 +1112,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
        aTab.container.tabDragAndDrop.finishAnimateTabMove();
  
-@@ -8448,7 +8724,7 @@
+@@ -8516,7 +8794,7 @@
          // preventDefault(). It will still raise the window if appropriate.
          return;
        }
@@ -1119,7 +1121,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        window.focus();
        aEvent.preventDefault();
      }
-@@ -8465,7 +8741,6 @@
+@@ -8533,7 +8811,6 @@
  
      on_TabGroupCollapse(aEvent) {
        aEvent.target.tabs.forEach(tab => {
@@ -1127,7 +1129,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
        });
      }
  
-@@ -8819,7 +9094,9 @@
+@@ -8887,7 +9164,9 @@
  
          let filter = this.#tabFilters.get(tab);
          if (filter) {
@@ -1137,7 +1139,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
  
            let listener = this.#tabListeners.get(tab);
            if (listener) {
-@@ -9604,6 +9881,7 @@
+@@ -9676,6 +9955,7 @@
              aWebProgress.isTopLevel
            ) {
              this._tab.setAttribute("busy", "true");
@@ -1145,7 +1147,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
              gBrowser._tabAttrModified(this._tab, ["busy"]);
              this._tab._notselectedsinceload = !this._tab.selected;
            }
-@@ -9684,6 +9962,7 @@
+@@ -9756,6 +10036,7 @@
          // known defaults. Note we use the original URL since about:newtab
          // redirects to a prerendered page.
          const shouldRemoveFavicon =
@@ -1153,7 +1155,7 @@ index 39b5babee5942427a82a7a64ad69e1b16efebcc1..32beac13dd4215a16de3a783db6c32da
            !this._browser.mIconURL &&
            !ignoreBlank &&
            !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9858,13 +10137,6 @@
+@@ -9930,13 +10211,6 @@
              this._browser.originalURI = aRequest.originalURI;
            }
  

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 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e356c9f8c6f 100644
+index 237950fb2c449ce088c204d33a70b1d95dae549b..635f9dbc5c79b6bb869b4ab4ec2d4b4e226b4672 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -14,11 +14,11 @@
@@ -101,7 +101,7 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
  
      resetDefaultGroupName = () => {
        this.#defaultGroupName = "";
-@@ -175,10 +198,15 @@
+@@ -175,10 +198,18 @@
        if (!this.#tabChangeObserver) {
          this.#tabChangeObserver = new window.MutationObserver(mutations => {
            if (!this.tabs.length) {
@@ -112,12 +112,15 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
                new CustomEvent("TabGroupRemoved", { bubbles: true })
              );
 +          gZenVerticalTabsManager.animateItemClose(this).then(() => {
++            this.dispatchEvent(
++              new CustomEvent("TabGroupRemovedFromDOM", { bubbles: true })
++            );
              this.remove();
 +          });
              Services.obs.notifyObservers(
                this,
                "browser-tabgroup-removed-from-dom"
-@@ -223,7 +251,10 @@
+@@ -223,7 +254,10 @@
            }
          });
        }
@@ -129,7 +132,7 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
      }
  
      get color() {
-@@ -330,6 +361,9 @@
+@@ -330,6 +364,9 @@
      }
  
      set collapsed(val) {
@@ -139,7 +142,7 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
        if (!!val == this.collapsed) {
          return;
        }
-@@ -416,7 +450,6 @@
+@@ -416,7 +453,6 @@
            tabGroupName,
          })
          .then(result => {
@@ -147,7 +150,7 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
          });
      }
  
-@@ -491,13 +524,68 @@
+@@ -491,13 +527,68 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
@@ -162,9 +165,8 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
 +        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"));
 +    }
 +
@@ -208,8 +210,9 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
 +        currentGroup = currentGroup?.group;
 +        if (currentGroup.collapsed) {
 +          return false;
-+        }
+         }
-+      }
+       }
+-      return childrenArray.filter(node => node.matches("tab"));
 +      if (this.pinned && gZenWorkspaces.activeWorkspaceElement?.hasCollapsedPinnedTabs) {
 +        return false;
 +      }
@@ -221,7 +224,7 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
      }
  
      /**
-@@ -617,9 +705,6 @@
+@@ -617,9 +708,6 @@
            });
          } else {
            if (tabOrSplitView.pinned) {
@@ -231,7 +234,7 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
            }
            let tabToMove =
              this.documentGlobal === tabOrSplitView.documentGlobal
-@@ -682,7 +767,7 @@
+@@ -682,7 +770,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -240,7 +243,7 @@ index 237950fb2c449ce088c204d33a70b1d95dae549b..af200a043dcd2e24393fcefe32493e35
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -761,5 +846,6 @@
+@@ -761,5 +849,6 @@
      }
    }
  

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-index 89f0d44d462de3d7d0f581d6371606f475443822..0d45ce5f6455e9c7276c54f504906bade5b3d286 100644
+index e48f0295d803ba9eac5ab9d01ebb3b3dacbc9d4b..cb78b74230f63a47479404767b5ab5883278dfba 100644
 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
 +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
-@@ -163,6 +163,9 @@ const PREF_URLBAR_DEFAULTS = /** @type {PreferenceDefinition[]} */ ([
+@@ -161,6 +161,9 @@ const PREF_URLBAR_DEFAULTS = /** @type {PreferenceDefinition[]} */ ([
    // Feature gate pref for flight status suggestions in the urlbar.
    ["flightStatus.featureGate", false],
  
@@ -12,7 +12,7 @@ index 89f0d44d462de3d7d0f581d6371606f475443822..0d45ce5f6455e9c7276c54f504906bad
    // The minimum prefix length of a flight status keyword the user must type to
    // trigger the suggestion. 0 means the min length should be taken from Nimbus
    // or remote settings.
-@@ -482,6 +485,7 @@ const PREF_URLBAR_DEFAULTS = /** @type {PreferenceDefinition[]} */ ([
+@@ -486,6 +489,7 @@ const PREF_URLBAR_DEFAULTS = /** @type {PreferenceDefinition[]} */ ([
    ["shortcuts.tabs", true],
    ["shortcuts.history", true],
    ["shortcuts.actions", true],
@@ -20,12 +20,12 @@ index 89f0d44d462de3d7d0f581d6371606f475443822..0d45ce5f6455e9c7276c54f504906bad
  
    // Boolean to determine if the providers defined in `exposureResults`
    // should be displayed in search results. This can be set by a
-@@ -840,6 +844,8 @@ function makeDefaultResultGroups({
+@@ -854,6 +858,8 @@ function makeDefaultResultGroups({
     */
    let rootGroup = {
      children: [
-+      { children: [{ group: lazy.UrlbarUtils.RESULT_GROUP.ZEN_ACTION }] },
++      { children: [{ group: lazy.UrlbarShared.RESULT_GROUP.ZEN_ACTION }] },
-+      { children: [{ group: lazy.UrlbarUtils.RESULT_GROUP.ZEN_WORKSPACE }] },
++      { children: [{ group: lazy.UrlbarShared.RESULT_GROUP.ZEN_WORKSPACE }] },
        // heuristic
        {
          maxResultCount: 1,

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs b/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs
-index f611d8e44af518aa1adc7505c5021235f55b49de..0eca20cb869626dfa6ace02acc00cad84462d54f 100644
+index cfc232f038cd491db32e0c0ca35622360dd9dec5..4806a725ddefa9d0709020d537eae5464249a294 100644
 --- a/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs
-@@ -78,22 +78,26 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider {
+@@ -77,22 +77,26 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider {
          // Since we can't tell if this is a real URL and whether the user wants
          // to visit or search for it, we provide an alternative searchengine
          // match if the string looks like an alphanumeric origin or an e-mail.
@@ -17,7 +17,7 @@ index f611d8e44af518aa1adc7505c5021235f55b49de..0eca20cb869626dfa6ace02acc00cad8
 -              lazy.UrlUtils.REGEXP_COMMON_EMAIL.test(str))
 -          ) {
 +        let trimmedSearchString = queryContext.trimmedSearchString;
-+        let [searchCandidate] = UrlbarUtils.stripPrefixAndTrim(
++        let [searchCandidate] = lazy.UrlbarShared.stripPrefixAndTrim(
 +          trimmedSearchString,
 +          {
 +            trimSlash: true,

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

@@ -1,41 +1,16 @@
 diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs
-index 78c76bde00b6b581184cee1cd0e1756e5f2da6a4..94c713470b1240729ef2350d090b0449f3801af4 100644
+index 178cd5e84fda74a28b2de59b671b3399cc28fac4..b03c6e06de4ee9a95dcb4d33d7ac9f0b053be4e1 100644
 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs
 +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
-@@ -126,6 +126,8 @@ export var UrlbarUtils = {
+@@ -214,6 +214,11 @@ export var UrlbarUtils = {
-     SEMANTIC_HISTORY: "semanticHistory",
+           return UrlbarShared.RESULT_GROUP.HEURISTIC_FALLBACK;
-     SUGGESTED_INDEX: "suggestedIndex",
-     TAIL_SUGGESTION: "tailSuggestion",
-+    ZEN_ACTION: "zenAction",
-+    ZEN_WORKSPACE: "zenWorkspace",
-   }),
- 
-   // Defines provider types.
-@@ -274,6 +276,14 @@ export var UrlbarUtils = {
-         telemetryLabel: "actions",
-         uiLabel: "urlbar-searchmode-actions3",
-       },
-+      {
-+        source: UrlbarShared.RESULT_SOURCE.WORKSPACES,
-+        restrict: UrlbarShared.RESTRICT_TOKENS.WORKSPACE,
-+        icon: "chrome://browser/skin/zen-icons/selectable/layers.svg",
-+        pref: "shortcuts.workspaces",
-+        telemetryLabel: "workspaces",
-+        uiLabel: "urlbar-search-mode-workspaces",
-+      },
-     ]);
-   },
- 
-@@ -566,6 +576,12 @@ export var UrlbarUtils = {
-           return this.RESULT_GROUP.HEURISTIC_FALLBACK;
          case "UrlbarProviderHistoryUrlHeuristic":
-           return this.RESULT_GROUP.HEURISTIC_HISTORY_URL;
+           return UrlbarShared.RESULT_GROUP.HEURISTIC_HISTORY_URL;
 +        case "ZenUrlbarProviderGlobalActions":
 +          if (result.source == UrlbarShared.RESULT_SOURCE.WORKSPACES) {
-+            return this.RESULT_GROUP.ZEN_WORKSPACE;
++            return UrlbarShared.RESULT_GROUP.ZEN_WORKSPACE;
-+          } else {
-+            return this.RESULT_GROUP.ZEN_ACTION;
 +          }
++          return UrlbarShared.RESULT_GROUP.ZEN_ACTION;
          case "UrlbarProviderOmnibox":
-           return this.RESULT_GROUP.HEURISTIC_OMNIBOX;
+           return UrlbarShared.RESULT_GROUP.HEURISTIC_OMNIBOX;
          case "UrlbarProviderRestrictKeywordsAutofill":

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/content/UrlbarChildController.mjs b/browser/components/urlbar/content/UrlbarChildController.mjs
-index a8e9d3093d046612650a17970330a8279f55833f..063a3e8adf009d6c0ddc60430bc0e7485e812b8a 100644
+index a17a4de079b69d2818388b33a2c1746cc6148c73..4fee63a22919972af08716db2d2de1c7549ff100 100644
 --- a/browser/components/urlbar/content/UrlbarChildController.mjs
 +++ b/browser/components/urlbar/content/UrlbarChildController.mjs
-@@ -258,7 +258,6 @@ export class UrlbarChildController {
+@@ -438,7 +438,6 @@ export class UrlbarChildController {
      const isMac = AppConstants.platform == "macosx";
      // Handle readline/emacs-style navigation bindings on Mac.
      if (
@@ -10,7 +10,7 @@ index a8e9d3093d046612650a17970330a8279f55833f..063a3e8adf009d6c0ddc60430bc0e748
        this.view.isOpen &&
        event.ctrlKey &&
        (event.key == "n" || event.key == "p")
-@@ -450,6 +449,8 @@ export class UrlbarChildController {
+@@ -630,6 +629,8 @@ export class UrlbarChildController {
              });
            }
            event.preventDefault();
@@ -19,3 +19,25 @@ index a8e9d3093d046612650a17970330a8279f55833f..063a3e8adf009d6c0ddc60430bc0e748
          }
          break;
        }
+@@ -934,6 +935,10 @@ export class UrlbarChildController {
+       }
+       reuseEmpty = true;
+     }
++    if (this.#input.hasAttribute?.("zen-newtab")) {
++      where = "tab";
++      reuseEmpty = true;
++    }
+     // The browser window exists only in chrome; a content-process input has no
+     // tab to reuse, so `gBrowser` is absent and the reuse is skipped.
+     if (
+@@ -943,6 +948,10 @@ export class UrlbarChildController {
+     ) {
+       where = "current";
+     }
++    if (this.window.gBrowser?.selectedTab.hasAttribute("zen-empty-tab")) {
++      // Always open in a new tab if the current tab is our empty tab.
++      return "tab";
++    }
+     return where;
+   }
+ 

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 e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c396406a247e9 100644
+index 319fb6870ec18d87b9f1263bd960edaa39b0447c..554cc90fb2307450ddc68033968cefd1a95e28b8 100644
 --- a/browser/components/urlbar/content/UrlbarInput.mjs
 +++ b/browser/components/urlbar/content/UrlbarInput.mjs
-@@ -101,6 +101,13 @@ const lazy = XPCOMUtils.declareLazy({
+@@ -88,6 +88,13 @@ const lazy = XPCOMUtils.declareLazy({
    logger: () => UrlbarShared.getLogger({ prefix: "Input" }),
  });
  
@@ -16,7 +16,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
  const UNLIMITED_MAX_RESULTS = 99;
  
  let getBoundsWithoutFlushing = element =>
-@@ -769,7 +776,16 @@ ${
+@@ -771,7 +778,16 @@ ${
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
@@ -33,7 +33,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      this._suppressPrimaryAdjustment = false;
    }
  
-@@ -843,6 +859,10 @@ ${
+@@ -846,6 +862,10 @@ ${
      hideSearchTerms = false,
      isSameDocument = false,
    } = {}) {
@@ -44,7 +44,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      if (!this.#isAddressbar) {
        throw new Error(
          "Cannot set URI for UrlbarInput that is not an address bar"
-@@ -1137,7 +1157,16 @@ ${
+@@ -1143,7 +1163,16 @@ ${
        this.searchModeSwitcher?.updateSearchIcon();
      }
  
@@ -61,7 +61,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
    }
  
    /**
-@@ -1626,7 +1655,11 @@ ${
+@@ -1726,7 +1755,11 @@ ${
      openParams.avoidBrowserFocus = keepViewOpen;
  
      if (!this.#providesSearchMode(result) && !keepViewOpen) {
@@ -74,7 +74,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      }
  
      if (isCanonized) {
-@@ -2974,6 +3007,42 @@ ${
+@@ -3016,6 +3049,42 @@ ${
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -117,7 +117,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2988,6 +3057,13 @@ ${
+@@ -3030,6 +3099,13 @@ ${
      this.toggleAttribute("breakout-extend", true);
      this.#updateTextboxPosition();
  
@@ -131,7 +131,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      // 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")) {
-@@ -3011,6 +3087,29 @@ ${
+@@ -3053,6 +3129,29 @@ ${
        return;
      }
  
@@ -161,7 +161,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      this.toggleAttribute("breakout-extend", false);
      this.#updateTextboxPosition();
    }
-@@ -3049,7 +3148,7 @@ ${
+@@ -3091,7 +3190,7 @@ ${
      forceUnifiedSearchButtonAvailable = false
    ) {
      let prevState = this.getAttribute("pageproxystate");
@@ -170,7 +170,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      this.setAttribute("pageproxystate", state);
      this._inputContainer.setAttribute("pageproxystate", state);
      this._identityBox?.setAttribute("pageproxystate", state);
-@@ -3332,10 +3431,12 @@ ${
+@@ -3355,10 +3454,12 @@ ${
      }
  
      this.style.top = px(
@@ -183,7 +183,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      );
    }
  
-@@ -3394,9 +3495,10 @@ ${
+@@ -3417,9 +3518,10 @@ ${
            return;
          }
  
@@ -193,9 +193,9 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
 -          px(getBoundsWithoutFlushing(this.parentNode).height)
 +          px(getBoundsWithoutFlushing(this.parentNode).height + 8)
          );
-         this.style.setProperty(
+ 
-           "--urlbar-height",
+         if (this.#breakoutBlockerCount) {
-@@ -3902,6 +4004,7 @@ ${
+@@ -3929,6 +4031,7 @@ ${
    }
  
    _toggleActionOverride(event) {
@@ -203,47 +203,33 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -4014,8 +4117,8 @@ ${
+@@ -4027,9 +4130,10 @@ ${
      if (!this.#isAddressbar) {
        return val;
      }
--    let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
+-    let trimmedValue = UrlbarPrefs.get("trimURLs")
 -      ? lazy.BrowserUIUtils.trimURL(val)
-+    let trimmedValue = lazy.UrlbarPrefs.get("trimURLs") && this._zenTrimURL
+-      : val;
-+      ? this._zenTrimURL(val)
++    let trimmedValue =
-       : val;
++      UrlbarPrefs.get("trimURLs") && this._zenTrimURL
++        ? this._zenTrimURL(val)
++        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -4317,6 +4420,7 @@ ${
+     return this.controller.isTextDirectionRTL(trimmedValue) ||
-     browser = this.window.gBrowser.selectedBrowser,
+@@ -4235,6 +4339,11 @@ ${
-     keepViewOpen = false
+     keepViewOpen = false,
-   ) {
+     browserId = null,
-+    openUILinkWhere = this.window.gZenUIManager.getOpenUILinkWhere(url, browser, openUILinkWhere);
+   }) {
-     if (this.#isAddressbar) {
++    where = this.window.gZenUIManager.getOpenUILinkWhere(
-       this.#prepareAddressbarLoad(
++      url,
-         url,
++      this.window.gBrowser.selectedBrowser,
-@@ -4430,6 +4534,10 @@ ${
++      where
-       }
++    );
-       reuseEmpty = true;
+     let userTypedValue;
-     }
+     if (this.#isAddressbar && where == "current") {
-+    if (this.hasAttribute("zen-newtab")) {
+       // Make sure URL is formatted properly (don't show punycode).
-+      where = "tab";
+@@ -4576,6 +4685,7 @@ ${
-+      reuseEmpty = true;
-+    }
-     if (
-       where == "tab" &&
-       reuseEmpty &&
-@@ -4437,6 +4545,9 @@ ${
-     ) {
-       where = "current";
-     }
-+    if (this.window.gBrowser.selectedTab.hasAttribute("zen-empty-tab")) {
-+      return "tab"; // Always open in a new tab if the current tab is "our empty tab".
-+    }
-     return where;
-   }
- 
-@@ -4691,6 +4802,7 @@ ${
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -251,7 +237,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
  
        this._suppressStartQuery = false;
      });
-@@ -4698,7 +4810,6 @@ ${
+@@ -4583,7 +4693,6 @@ ${
      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.
@@ -259,7 +245,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4979,7 +5090,11 @@ ${
+@@ -4850,7 +4959,11 @@ ${
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -272,7 +258,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -5297,6 +5412,7 @@ ${
+@@ -5149,6 +5262,7 @@ ${
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -280,20 +266,20 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
        l10nId,
        l10nId == "urlbar-placeholder-with-name"
          ? { name: engineName }
-@@ -5347,6 +5463,12 @@ ${
+@@ -5199,6 +5313,12 @@ ${
      }
  
      lazy.logger.debug("Blur Event");
 +    if (
 +      this.document.commandDispatcher.focusedElement == this.inputField &&
-+      !lazy.UrlbarPrefs.get("closeOnWindowBlur")
++      !UrlbarPrefs.get("closeOnWindowBlur")
 +    ) {
 +      return;
 +    }
      // We cannot count every blur events after a missed engagement as abandoment
      // because the user may have clicked on some view element that executes
      // a command causing a focus change. For example opening preferences from
-@@ -5424,6 +5546,11 @@ ${
+@@ -5276,6 +5396,11 @@ ${
    }
  
    _on_click(event) {
@@ -305,7 +291,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
      switch (event.target) {
        case this.inputField:
        case this._inputContainer:
-@@ -5513,10 +5640,11 @@ ${
+@@ -5371,10 +5496,11 @@ ${
        }
        if (untrim) {
          this.setValue(this._untrimmedValue);
@@ -318,7 +304,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -5556,9 +5684,16 @@ ${
+@@ -5414,9 +5540,16 @@ ${
    }
  
    _on_mousedown(event) {
@@ -336,7 +322,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
          if (
            event.composedTarget != this.inputField &&
            event.composedTarget != this._inputContainer
-@@ -5568,6 +5703,10 @@ ${
+@@ -5426,6 +5559,10 @@ ${
  
          this.focusedViaMousedown = !this.focused;
          this.#preventClickSelectsAll = this.focused;
@@ -347,7 +333,7 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -5605,7 +5744,7 @@ ${
+@@ -5463,7 +5600,7 @@ ${
          // view open on tab switch, and the TabSelect event arrived earlier.
          // Also ignore mousedown on the urlbarView context menu: opening/closing the
          // view is already handled by the result opening flow.
@@ -356,12 +342,12 @@ index e7e9495e56076cd112beafb8297dece4ae4cea58..95e4333866a5f0d41fbdbe23910c3964
            break;
          }
  
-@@ -5894,7 +6033,7 @@ ${
+@@ -5754,7 +5891,7 @@ ${
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =
 -      this.searchMode?.source != UrlbarShared.RESULT_SOURCE.ACTIONS
 +      this.searchMode?.source != UrlbarShared.RESULT_SOURCE.ZEN_ACTIONS
-         ? lazy.UrlbarPrefs.get("maxRichResults")
+         ? UrlbarPrefs.get("maxRichResults")
          : UNLIMITED_MAX_RESULTS;
      let options = {

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/content/UrlbarShared.mjs b/browser/components/urlbar/content/UrlbarShared.mjs
-index 5b45afb747bfcdbd06782186737669aa2c4c634d..f68bd009f70415b5fb513abdfe19b4427ceefbfc 100644
+index 4e67dad66ae006842abc6eed547e4a244320d57a..393b61b4d2543c73e60afd334a353f36119ae73e 100644
 --- a/browser/components/urlbar/content/UrlbarShared.mjs
 +++ b/browser/components/urlbar/content/UrlbarShared.mjs
-@@ -47,6 +47,7 @@ export const UrlbarShared = {
+@@ -100,6 +100,7 @@ export const UrlbarShared = {
      // `looksLikeOrigin()` returned `LOOKS_LIKE_ORIGIN.OTHER` for this token.
      // It may or may not be an origin.
      POSSIBLE_ORIGIN_BUT_SEARCH_ALLOWED: 12,
@@ -10,7 +10,7 @@ index 5b45afb747bfcdbd06782186737669aa2c4c634d..f68bd009f70415b5fb513abdfe19b442
    }),
  
    /**
-@@ -67,6 +68,7 @@ export const UrlbarShared = {
+@@ -120,6 +121,7 @@ export const UrlbarShared = {
      TITLE: "#",
      URL: "$",
      ACTION: ">",
@@ -18,7 +18,7 @@ index 5b45afb747bfcdbd06782186737669aa2c4c634d..f68bd009f70415b5fb513abdfe19b442
    }),
  
    // Defines UrlbarResult types.
-@@ -112,6 +114,8 @@ export const UrlbarShared = {
+@@ -165,6 +167,8 @@ export const UrlbarShared = {
      OTHER_NETWORK: 6,
      ADDON: 7,
      ACTIONS: 8,
@@ -26,9 +26,33 @@ index 5b45afb747bfcdbd06782186737669aa2c4c634d..f68bd009f70415b5fb513abdfe19b442
 +    WORKSPACES: 10,
    }),
  
-   /**
+   // Results are categorized into groups to help the muxer compose them.  See
-@@ -128,6 +132,7 @@ export const UrlbarShared = {
+@@ -200,6 +204,8 @@ export const UrlbarShared = {
-     if (lazy.UrlbarPrefs.get("scotchBonnet.enableOverride")) {
+     SEMANTIC_HISTORY: "semanticHistory",
+     SUGGESTED_INDEX: "suggestedIndex",
+     TAIL_SUGGESTION: "tailSuggestion",
++    ZEN_ACTION: "zenAction",
++    ZEN_WORKSPACE: "zenWorkspace",
+   }),
+ 
+   // Defines provider types.
+@@ -385,6 +391,14 @@ export const UrlbarShared = {
+         telemetryLabel: "actions",
+         uiLabel: "urlbar-searchmode-actions3",
+       },
++      {
++        source: this.RESULT_SOURCE.WORKSPACES,
++        restrict: this.RESTRICT_TOKENS.WORKSPACE,
++        icon: "chrome://browser/skin/zen-icons/selectable/layers.svg",
++        pref: "shortcuts.workspaces",
++        telemetryLabel: "workspaces",
++        uiLabel: "urlbar-search-mode-workspaces",
++      },
+     ]);
+   },
+ 
+@@ -402,6 +416,7 @@ export const UrlbarShared = {
+     if (UrlbarPrefs.get("scotchBonnet.enableOverride")) {
        keys.push(this.RESTRICT_TOKENS.ACTION);
      }
 +    keys.push(this.RESTRICT_TOKENS.WORKSPACE);

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/content/UrlbarView.mjs b/browser/components/urlbar/content/UrlbarView.mjs
-index e465806c4ae4fc372d9aa2b71aa7f0e74c65d026..c0b3781901298bedee2736819a93edbf545507a7 100644
+index 9a2c787cfa4d70bd587d49e017075f905c90f626..1c3b341e5d520ec9541c4021aaedce98751b6993 100644
 --- a/browser/components/urlbar/content/UrlbarView.mjs
 +++ b/browser/components/urlbar/content/UrlbarView.mjs
-@@ -803,7 +803,7 @@ export class UrlbarView {
+@@ -822,7 +822,7 @@ export class UrlbarView {
        !this.input.value ||
        this.input.getAttribute("pageproxystate") == "valid"
      ) {
@@ -11,7 +11,7 @@ index e465806c4ae4fc372d9aa2b71aa7f0e74c65d026..c0b3781901298bedee2736819a93edbf
          // Try to reuse the cached top-sites context. If it's not cached, then
          // there will be a gap of time between when the input is focused and
          // when the view opens that can be perceived as flicker.
-@@ -941,10 +941,6 @@ export class UrlbarView {
+@@ -963,10 +963,6 @@ export class UrlbarView {
      }
  
      // If search mode isn't active, close the view.
@@ -22,7 +22,7 @@ index e465806c4ae4fc372d9aa2b71aa7f0e74c65d026..c0b3781901298bedee2736819a93edbf
  
      // Search mode is active.  If the one-offs should be shown, make sure they
      // are enabled and show the view.
-@@ -3203,6 +3199,8 @@ export class UrlbarView {
+@@ -3306,6 +3302,8 @@ export class UrlbarView {
        if (row?.hasAttribute("row-selectable")) {
          row?.toggleAttribute("selected", true);
        }
@@ -31,7 +31,7 @@ index e465806c4ae4fc372d9aa2b71aa7f0e74c65d026..c0b3781901298bedee2736819a93edbf
        if (element != row) {
          row?.toggleAttribute("descendant-selected", true);
        }
-@@ -3715,7 +3713,7 @@ export class UrlbarView {
+@@ -3972,7 +3970,7 @@ export class UrlbarView {
    }
  
    #enableOrDisableRowWrap() {
@@ -40,13 +40,13 @@ index e465806c4ae4fc372d9aa2b71aa7f0e74c65d026..c0b3781901298bedee2736819a93edbf
      this.#rows.toggleAttribute("wrap", wrap);
      this.oneOffSearchButtons?.container.toggleAttribute("wrap", wrap);
    }
-@@ -4144,6 +4142,12 @@ export class UrlbarView {
+@@ -4387,6 +4385,12 @@ export class UrlbarView {
    }
  
    on_blur() {
 +    if (
 +      this.document.commandDispatcher.focusedElement == this.input.inputField &&
-+      !lazy.UrlbarPrefs.get("closeOnWindowBlur")
++      !UrlbarPrefs.get("closeOnWindowBlur")
 +    ) {
 +      return;
 +    }

src/browser/installer/windows/nsis/shared-nsh.patch

@@ -0,0 +1,124 @@
+diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
+index b81c7ef59be0d25f67668215028008a451860df2..fa0ab8947e011289d25158cab17ff9388b5cab0d 100755
+--- a/browser/installer/windows/nsis/shared.nsh
++++ b/browser/installer/windows/nsis/shared.nsh
+@@ -873,50 +873,87 @@ FunctionEnd
+ !ifdef MOZ_MAINTENANCE_SERVICE
+ ; Adds maintenance service certificate keys for the install dir.
+ ; For the cert to work, it must also be signed by a trusted cert for the user.
++; Writes this application's allowed certificate values into _KEY, which must be
++; a maintenance service registry path such as the one returned by
++; ServicesHelper::PathToUniqueRegistryPath.
++!macro AddMaintCertKeyValues _KEY
++  ; PrefetchProcessName was originally used to experiment with deleting
++  ; Windows prefetch as a speed optimization.  It is no longer used though.
++  DeleteRegValue HKLM "${_KEY}" "prefetchProcessName"
++
++  ; Setting the Attempted value will ensure that a new Maintenance Service
++  ; install will never be attempted again after this from updates.  The value
++  ; is used only to see if updates should attempt new service installs.
++  WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
++
++  ; More than one certificate can be specified in a different subfolder
++  ; for example: ${_KEY}\1, but each individual binary can be signed
++  ; with at most one certificate.  A fallback certificate can only be used
++  ; if the binary is replaced with a different certificate.
++  WriteRegStr HKLM "${_KEY}\0" "name" "${CERTIFICATE_NAME}"
++  WriteRegStr HKLM "${_KEY}\0" "issuer" "${CERTIFICATE_ISSUER}"
++  ; These values associate the allowed certificates for the previous
++  ;  installation, so that we can update from it cleanly using the
++  ;  old updater.exe (which will still have this signature).
++  WriteRegStr HKLM "${_KEY}\1" "name" "${CERTIFICATE_NAME_PREVIOUS}"
++  WriteRegStr HKLM "${_KEY}\1" "issuer" "${CERTIFICATE_ISSUER_PREVIOUS}"
++  ClearErrors
++!macroend
++
+ !macro AddMaintCertKeys
+   Push $R0
+   ; Allow main Mozilla cert information for updates
+   ; This call will push the needed key on the stack
+   ServicesHelper::PathToUniqueRegistryPath "$INSTDIR"
+   Pop $R0
++  Push $R1
++  Push $R2
++  Push $R3
++  ; We always use the 64bit registry for certs.
++  ${If} ${RunningX64}
++  ${OrIf} ${IsNativeARM64}
++    SetRegView 64
++  ${EndIf}
++
+   ${If} $R0 != ""
+-    ; More than one certificate can be specified in a different subfolder
+-    ; for example: $R0\1, but each individual binary can be signed
+-    ; with at most one certificate.  A fallback certificate can only be used
+-    ; if the binary is replaced with a different certificate.
+-    ; We always use the 64bit registry for certs.
+-    ${If} ${RunningX64}
+-    ${OrIf} ${IsNativeARM64}
+-      SetRegView 64
+-    ${EndIf}
++    !insertmacro AddMaintCertKeyValues "$R0"
++  ${Else}
++    ; ServicesHelper could not be loaded.  This happens when PostUpdate is run
++    ; by the updater, which launches it with an environment too minimal for
++    ; NSIS to load its plugins, leaving the unique registry path uncomputable.
++    ; Fall back to refreshing every key that already records one of our own
++    ; certificate names, so that any installation of this application is kept
++    ; current rather than only the first one found.  Keys belonging to other
++    ; applications record a different name and are left alone.
++    StrCpy $R1 0
++    ${Do}
++      EnumRegKey $R2 HKLM "Software\Mozilla\MaintenanceService" $R1
++      ${If} $R2 == ""
++        ${ExitDo}
++      ${EndIf}
++      ReadRegStr $R3 HKLM "Software\Mozilla\MaintenanceService\$R2\0" "name"
++      ${If} $R3 == "${CERTIFICATE_NAME}"
++      ${OrIf} $R3 == "${CERTIFICATE_NAME_PREVIOUS}"
++        StrCpy $R0 "Software\Mozilla\MaintenanceService\$R2"
++        !insertmacro AddMaintCertKeyValues "$R0"
++      ${EndIf}
++      IntOp $R1 $R1 + 1
++    ${Loop}
++    StrCpy $R0 ""
++  ${EndIf}
+ 
+-    ; PrefetchProcessName was originally used to experiment with deleting
+-    ; Windows prefetch as a speed optimization.  It is no longer used though.
+-    DeleteRegValue HKLM "$R0" "prefetchProcessName"
+-
+-    ; Setting the Attempted value will ensure that a new Maintenance Service
+-    ; install will never be attempted again after this from updates.  The value
+-    ; is used only to see if updates should attempt new service installs.
+-    WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
+-
+-    ; These values associate the allowed certificates for the current
+-    ; installation.
+-    WriteRegStr HKLM "$R0\0" "name" "${CERTIFICATE_NAME}"
+-    WriteRegStr HKLM "$R0\0" "issuer" "${CERTIFICATE_ISSUER}"
+-    ; These values associate the allowed certificates for the previous
+-    ;  installation, so that we can update from it cleanly using the
+-    ;  old updater.exe (which will still have this signature).
+-    WriteRegStr HKLM "$R0\1" "name" "${CERTIFICATE_NAME_PREVIOUS}"
+-    WriteRegStr HKLM "$R0\1" "issuer" "${CERTIFICATE_ISSUER_PREVIOUS}"
+-    ${If} ${RunningX64}
+-    ${OrIf} ${IsNativeARM64}
+-      SetRegView lastused
+-    ${EndIf}
+-    ClearErrors
++  ${If} ${RunningX64}
++  ${OrIf} ${IsNativeARM64}
++    SetRegView lastused
+   ${EndIf}
++
++  Pop $R3
++  Pop $R2
++  Pop $R1
+   ; Restore the previously used value back
+   Pop $R0
+ !macroend
++
+ !define AddMaintCertKeys "!insertmacro AddMaintCertKeys"
+ !endif
+ 

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

@@ -1,9 +1,18 @@
 diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
 old mode 100755
 new mode 100644
-index becbb0f70c84eb7f2d9bff5a3aedcbb7a78a61cf..05835d2088ab631316a25a9f0728898bd7998d8d
+index becbb0f70c84eb7f2d9bff5a3aedcbb7a78a61cf..a23a8a1b160932368377fc841b501df9355918db
 --- a/browser/installer/windows/nsis/uninstaller.nsi
 +++ b/browser/installer/windows/nsis/uninstaller.nsi
+@@ -150,7 +150,7 @@ OutFile "helper.exe"
+ !endif
+ ShowUnInstDetails nevershow
+ 
+-!define URLUninstallSurvey "https://qsurvey.mozilla.com/s3/FF-Desktop-Post-Uninstall?channel=${UpdateChannel}&version=${AppVersion}&osversion="
++!define URLUninstallSurvey "https://links.zen-browser.app/uninstall-feedback?osversion="
+ 
+ ; Support for the profile refresh feature
+ !define URLProfileRefreshHelp "https://support.mozilla.org/kb/refresh-firefox-reset-add-ons-and-settings"
 @@ -516,6 +516,7 @@ Section "Uninstall"
    ${un.RegCleanFileHandler}  ".svg"   "FirefoxHTML-$AppUserModelID"
    ${un.RegCleanFileHandler}  ".webp"  "FirefoxHTML-$AppUserModelID"

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

@@ -1,11 +1,11 @@
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index e735ec80b56e1a2da4bc5bec29136ce60353277b..330ea62d220d9acd96a95a605888839388e97452 100644
+index f276db1d456703493ee713370691352985021708..619ee6724eec1e6a25adcb257af0d02eb7a29d34 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) and (not -moz-pref("browser.nova.enabled")) {
+       @media (prefers-color-scheme: light) {
 -        --urlbar-box-background-color: #fafafa;
        }
      }

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

@@ -40,7 +40,7 @@ html|dialog {
 }
 
 groupbox button {
-  border-radius: 5px !important;
+  border-radius: calc(5px * var(--zen-squircle-value)) !important;
 }
 
 groupbox button,

src/browser/themes/shared/tabbrowser/content-area-css.patch

@@ -1,16 +1,16 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index 3acdec2b8e043fe27919cfa54e73f4d3c491bfc8..267a1087134464a8193a824a2d7f8ac15ff8ad60 100644
+index 2374ed38bd9361d6c7e1886117099c6761e403b8..72f1f52a13096f19ca4009037ad0cdc880775ff7 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
-@@ -157,7 +157,6 @@
+@@ -239,7 +239,6 @@
-   min-height: 0;
+   min-width: 0;
  
    /* We want to be able to show the frame color behind the clipped radiused corner */
 -  background: var(--tabpanel-background-color);
  
-   @media -moz-pref("sidebar.revamp") {
+   display: grid;
-     outline: 0.01px solid var(--chrome-content-separator-color);
+   /**
-@@ -216,7 +215,6 @@
+@@ -425,7 +424,6 @@
    }
  
    browser:is([blank], [pendingpaint]) {
@@ -18,7 +18,7 @@ index 3acdec2b8e043fe27919cfa54e73f4d3c491bfc8..267a1087134464a8193a824a2d7f8ac1
    }
  
    /* Exclude browsers with smartwindow-content attribute which inherit
-@@ -553,7 +551,7 @@ split-view-footer {
+@@ -865,7 +863,7 @@ split-view-footer {
  
  .dialogStack {
    z-index: var(--browser-stack-z-index-dialog-stack);
@@ -27,12 +27,12 @@ index 3acdec2b8e043fe27919cfa54e73f4d3c491bfc8..267a1087134464a8193a824a2d7f8ac1
    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 */
-@@ -718,7 +716,7 @@ split-view-footer {
+@@ -1034,7 +1032,7 @@ split-view-footer {
  
  .dialogOverlay[topmost="true"],
  #window-modal-dialog::backdrop {
 -  background-color: var(--background-color-overlay);
 +  background-color: light-dark(rgba(255, 255, 255, .3), rgba(0, 0, 0, .3));
- }
+   border-radius: var(--chrome-block-radius);
  
- .dialogOverlay[hideContent="true"][topmost="true"] {
+   .browserSidebarContainer.responsive-mode & {

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

@@ -1,17 +1,17 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f253804576e 100644
+index 61c0b8382c78f63ad9113af55a6236c4a29bc45b..0ab463c768d4fb3f45d22e753f408c46b61c0480 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,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-collapsed-split-pill-offset: 0px;
    --tab-pinned-min-width-expanded: calc(var(--tab-pinned-expanded-background-width) + 2 * var(--tab-pinned-margin-inline-expanded));
-   --tab-note-icon-end-margin: var(--dimension-4);
+@@ -308,7 +308,6 @@ tab-split-view-wrapper[dragtarget] {
-@@ -295,7 +295,6 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -19,7 +19,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    }
  
    &:is([selected], [multiselected]) {
-@@ -309,6 +308,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -322,6 +321,7 @@ tab-split-view-wrapper[dragtarget] {
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -27,7 +27,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
  
      &::before {
        position: absolute;
-@@ -506,10 +506,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -519,10 +519,6 @@ tab-split-view-wrapper[dragtarget] {
  
    @media -moz-pref("browser.tabs.fadeOutUnloadedTabs") {
      &[pending] {
@@ -38,7 +38,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -525,10 +521,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -538,10 +534,6 @@ tab-split-view-wrapper[dragtarget] {
  
    @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
      &[pending][discarded] {
@@ -49,7 +49,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -602,7 +594,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -615,7 +607,7 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    #tabbrowser-tabs[orient="vertical"] & {
@@ -58,7 +58,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    }
  
    &[crashed] {
-@@ -610,7 +602,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -623,7 +615,7 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -67,7 +67,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -664,7 +656,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -677,7 +669,7 @@ tab-split-view-wrapper[dragtarget] {
      }
    }
  
@@ -76,7 +76,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    &[crashed] {
      display: revert;
    }
-@@ -824,7 +816,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -837,7 +829,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 +85,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1044,7 +1036,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -1151,7 +1143,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,7 +93,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    background-position: center bottom 6.5px;
    background-size: 4px 4px;
    background-repeat: no-repeat;
-@@ -1797,7 +1788,7 @@ tab-group {
+@@ -1904,7 +1895,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
@@ -102,7 +102,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -2351,7 +2342,7 @@ tab-group {
+@@ -2504,7 +2495,7 @@ tab-group {
    }
  }
  
@@ -111,8 +111,8 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -2362,7 +2353,7 @@ tab-group {
+@@ -2524,7 +2515,7 @@ tab-group {
-   margin-inline: var(--tab-inner-inline-margin);
+   }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
 -    display: none;
@@ -120,7 +120,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    }
  
    &:hover {
-@@ -2386,7 +2377,7 @@ tab-group {
+@@ -2548,7 +2539,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 +129,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    margin-block: var(--tab-margin-block);
  }
  
-@@ -2576,7 +2567,6 @@ tab-group {
+@@ -2740,7 +2731,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -137,7 +137,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
      }
  
      .tab-background {
-@@ -2615,8 +2605,8 @@ tab-group {
+@@ -2779,8 +2769,8 @@ tab-group {
        display: block;
        position: absolute;
        inset: auto;
@@ -148,7 +148,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
  
        &:-moz-window-inactive {
          background-image:
-@@ -2714,9 +2704,6 @@ tab-group {
+@@ -2878,9 +2868,6 @@ tab-group {
    ~ #tabbrowser-tabs[orient="horizontal"]::before {
      display: flex;
      content: "";
@@ -158,7 +158,7 @@ index 0820fa040642ee05c2a24f5d2cfa58da5c926647..2d93abcce1729744e5963f1c6ad47f25
    }
  }
  
-@@ -2749,7 +2736,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2913,7 +2900,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

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

@@ -1,19 +1,19 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index 22d624d718a289dd7b84ffc2f04dd35893dfbe95..4f57f7853f3043e3ad01d893aa928b9d2e6f3c16 100644
+index 149f123e26cd79e89432dfeb504ca7218ee04810..7e0e6d981d6c2aa53bc2a76d82d2078419659065 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
 @@ -19,8 +19,8 @@
  
    @media not -moz-pref("browser.nova.enabled") {
-     --urlbar-basic-component-size: calc(var(--urlbar-min-height) - 2 * (var(--urlbar-input-container-border-width) + var(--urlbar-input-container-padding)));
+     --urlbar-basic-component-size: calc(var(--urlbar-height) - 2 * (var(--urlbar-input-container-border-width) + var(--urlbar-input-container-padding)));
--    --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
+-    --urlbar-icon-padding: calc((var(--urlbar-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
 -    --urlbar-input-container-padding: round(up, 1px, env(hairline));
-+    --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 14px /* icon */) / 2);
++    --urlbar-icon-padding: calc((var(--urlbar-height) - 2px /* border */ - 14px /* icon */) / 2);
 +    --urlbar-input-container-padding: 2px;
    }
    @media (max-width: 770px) {
      --urlbar-container-min-width: 240px;
-@@ -126,7 +126,7 @@ toolbar[inactive="true"] .urlbar,
+@@ -127,7 +127,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 {
@@ -22,7 +22,7 @@ index 22d624d718a289dd7b84ffc2f04dd35893dfbe95..4f57f7853f3043e3ad01d893aa928b9d
  }
  
  /* Document Picture-in-Picture API window */
-@@ -403,6 +403,10 @@ toolbar[inactive="true"] .urlbar,
+@@ -405,6 +405,10 @@ toolbar[inactive="true"] .urlbar,
    .urlbar:not([focused])[textoverflow="left"][domaindir="rtl"] > .urlbar-input-container > .urlbar-input-box > & {
      mask-image: linear-gradient(to right, transparent var(--urlbar-scheme-size), black calc(var(--urlbar-scheme-size) + 3ch));
    }
@@ -33,16 +33,18 @@ index 22d624d718a289dd7b84ffc2f04dd35893dfbe95..4f57f7853f3043e3ad01d893aa928b9d
  }
  
  #urlbar-scheme {
-@@ -492,10 +496,14 @@ toolbar[inactive="true"] .urlbar,
+@@ -476,10 +480,15 @@ toolbar[inactive="true"] .urlbar,
+   }
  
    .urlbar[breakout][breakout-extend] {
-     height: auto;
+-    margin-left: calc(-1 * var(--urlbar-margin-inline));
 +    align-items: center;
-+    :root:not([zen-single-toolbar='true']) & {
-     margin-left: calc(-1 * var(--urlbar-margin-inline));
-+    }
      width: calc(var(--urlbar-width) + 2 * var(--urlbar-margin-inline));
  
++    :root:not([zen-single-toolbar="true"]) & {
++      margin-left: calc(-1 * var(--urlbar-margin-inline));
++    }
++
      > .urlbar-input-container {
 +      align-items: center;
        height: var(--urlbar-container-height);

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

@@ -435,10 +435,6 @@
   list-style-image: url("arrow-left.svg") !important;
 }
 
-#appmenu-moreTools-button {
-  list-style-image: url("customize.svg") !important;
-}
-
 #zen-copy-current-url-button,
 #share-tab-button,
 #zen-site-data-header-share {
@@ -812,7 +808,8 @@
 
 #toolbar-context-toggle-vertical-tabs,
 #toolbar-context-customize-sidebar,
-#sidebarRevampSeparator {
+#sidebarRevampSeparator,
+.fxa-menu-sign-in-promo-image {
   display: none !important;
 }
 
@@ -879,7 +876,7 @@
   border-radius: var(--tab-border-radius);
 
   &:hover {
-    background: var(--toolbarbutton-hover-background);
+    background: var(--toolbarbutton-background-color-hover);
   }
 
   & image {

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

@@ -14,8 +14,8 @@
 *  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/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.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) 
@@ -104,26 +104,27 @@
 *  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-small.svg                      (../shared/zen-icons/nucleo/private-window-small.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) 
@@ -164,8 +165,8 @@
 *  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/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.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) 
@@ -254,26 +255,27 @@
 *  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-small.svg                      (../shared/zen-icons/nucleo/private-window-small.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) 
@@ -314,8 +316,8 @@
 *  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/blocked-element.svg                      (../shared/zen-icons/nucleo/blocked-element.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) 
@@ -404,26 +406,27 @@
 *  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-small.svg                      (../shared/zen-icons/nucleo/private-window-small.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) 
@@ -459,8 +462,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) 
@@ -522,8 +525,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/private-window-small.svg

@@ -0,0 +1,5 @@
+#filter dumbComments emptyLines substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 -1 20 20"><path d="M12.75 10.5a3.25 3.25 0 1 1-3.19 2.632 1.25 1.25 0 0 0-1.119 0q.059.3.059.618a3.25 3.25 0 1 1-3.25-3.25 3.24 3.24 0 0 1 2.571 1.268 2.74 2.74 0 0 1 2.357 0A3.24 3.24 0 0 1 12.75 10.5M5.25 12a1.75 1.75 0 1 0 0 3.5 1.75 1.75 0 0 0 0-3.5m7.5 0a1.75 1.75 0 1 0 0 3.5 1.75 1.75 0 0 0 0-3.5m-.867-11c.87 0 1.61.64 1.732 1.503l.34 2.393L16.78 7.72A.75.75 0 0 1 16.25 9H1.75a.751.751 0 0 1-.53-1.28l2.823-2.824.342-2.393A1.75 1.75 0 0 1 6.117 1zM3.56 7.5h10.88L12.94 6H5.06zm2.557-5a.25.25 0 0 0-.237.17l-.011.045L5.614 4.5h6.772l-.255-1.785a.25.25 0 0 0-.248-.215z"/></svg>

src/external-patches/firefox/allow_backdrop_to_work_on_transparency.patch

@@ -31,12 +31,13 @@ diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src
  
      // Ensure the WR profiler callbacks are hooked up to the Gecko profiler.
      set_profiler_hooks(Some(&PROFILER_HOOKS));
-@@ -2164,10 +2165,11 @@
+@@ -2164,11 +2165,12 @@
          texture_cache_config,
          reject_software_rasterizer,
          low_quality_pinch_zoom,
          max_shared_surface_size,
          enable_dithering,
+         enable_shared_instance_buffer,
 +        opaque_backdrop_fallback,
          ..Default::default()
      };
@@ -73,8 +74,9 @@ diff --git a/gfx/wr/webrender/src/renderer/init.rs b/gfx/wr/webrender/src/render
 +    /// See explanation of `gfx.webrender.opaque-backdrop-fallback`.
 +    pub opaque_backdrop_fallback: bool,
  }
-@@ -277,9 +279,10 @@
+@@ -277,10 +279,11 @@
              enable_instancing: true,
+             enable_shared_instance_buffer: false,
              reject_software_rasterizer: false,
              low_quality_pinch_zoom: false,
              max_shared_surface_size: 2048,
@@ -84,12 +86,13 @@ diff --git a/gfx/wr/webrender/src/renderer/init.rs b/gfx/wr/webrender/src/render
      }
  }
  
-@@ -802,10 +805,11 @@
+@@ -802,11 +805,12 @@
          allocated_native_surfaces: FastHashSet::default(),
          debug_overlay_state: DebugOverlayState::new(),
          buffer_damage_tracker: BufferDamageTracker::default(),
          max_primitive_instance_count,
          enable_instancing: options.enable_instancing,
+         use_shared_instance_buffer,
 +        opaque_backdrop_fallback: options.opaque_backdrop_fallback,
          consecutive_oom_frames: 0,
          target_frame_publish_id: None,
@@ -99,11 +102,14 @@ diff --git a/gfx/wr/webrender/src/renderer/init.rs b/gfx/wr/webrender/src/render
 diff --git a/gfx/wr/webrender/src/renderer/mod.rs b/gfx/wr/webrender/src/renderer/mod.rs
 --- a/gfx/wr/webrender/src/renderer/mod.rs
 +++ b/gfx/wr/webrender/src/renderer/mod.rs
-@@ -867,10 +867,12 @@
+@@ -867,13 +867,15 @@
      buffer_damage_tracker: BufferDamageTracker,
  
      max_primitive_instance_count: usize,
      enable_instancing: bool,
+     /// If true, stream instance data into large buffers shared by multiple
+     /// draws, rather than allocating a new instance buffer for each draw.
+     use_shared_instance_buffer: bool,
  
 +    opaque_backdrop_fallback: bool,
 +

src/external-patches/firefox/bug_2011236.patch

@@ -137,7 +137,7 @@ diff --git a/docshell/shistory/SessionHistoryEntry.cpp b/docshell/shistory/Sessi
      : mURI(aLoadState->URI()),
        mOriginalURI(aLoadState->OriginalURI()),
        mResultPrincipalURI(aLoadState->ResultPrincipalURI()),
-@@ -59,9 +67,10 @@
+@@ -59,11 +67,12 @@
        mLoadReplace(aLoadState->LoadReplace()),
        mHasUserActivation(aLoadState->HasValidUserGestureActivation()),
        mSharedState(SharedState::Create(
@@ -148,6 +148,8 @@ diff --git a/docshell/shistory/SessionHistoryEntry.cpp b/docshell/shistory/Sessi
 +                                 aLoadState->PolicyContainer()),
            /* FIXME Is this correct? */
            aLoadState->TypeHint())) {
+   MOZ_DIAGNOSTIC_ASSERT(!mURI->SchemeIs("javascript"));
+ 
    // Pull the upload stream off of the channel instead of the load state, as
 @@ -124,11 +133,12 @@
    loadInfo->GetPrincipalToInherit(

src/external-patches/firefox/issue_14710.patch

@@ -1,7 +1,24 @@
 diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
 --- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
 +++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
-@@ -119,10 +119,19 @@
+@@ -39,10 +39,16 @@
+ const TOGGLE_POSITION_PREF =
+   "media.videocontrols.picture-in-picture.video-toggle.position";
+ const TOGGLE_POSITION_RIGHT = "right";
+ const TOGGLE_POSITION_LEFT = "left";
+ const RESIZE_MARGIN_PX = 16;
++// Close reasons that should suppress auto-toggle when the originating tab is backgrounded
++const DELIBERATE_CLOSE_REASONS = [
++  "CloseButton",
++  "ClosePlayerShortcut",
++  "Shortcut",
++];
+ 
+ XPCOMUtils.defineLazyPreferenceGetter(
+   lazy,
+   "PIP_ENABLED",
+   "media.videocontrols.picture-in-picture.enabled",
+@@ -119,10 +125,19 @@
        }
        case "PictureInPicture:VideoTabHidden": {
          if (!lazy.PIP_ENABLED || !lazy.PIP_WHEN_SWITCHING_TABS) {
@@ -21,12 +38,13 @@ diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/tool
            break;
          }
          let actor = browsingContext.currentWindowGlobal.getActor(
-@@ -261,10 +270,12 @@
+@@ -261,10 +276,13 @@
    maxConcurrentPlayerCount: 0,
  
    // Maps auto pip browser to PictureInPictureParent actor
    weakAutoPipBrowserToParent: new WeakMap(),
  
++  // Browsers with deliberately closed PiP windows; suppresses auto-toggle.
 +  weakAutoPipBrowserClosedDeliberately: new WeakSet(),
 +
    /**
@@ -34,7 +52,28 @@ diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/tool
     *
     * @param {PictureInPictureParent} pipActorRef
     *   Reference to the calling PictureInPictureParent actor
-@@ -899,10 +910,17 @@
+@@ -441,10 +459,20 @@
+   },
+ 
+   onPipSwappedBrowsers(event) {
+     let otherTab = event.detail;
+     if (otherTab) {
++      if (
++        this.weakAutoPipBrowserClosedDeliberately.has(
++          event.target.linkedBrowser
++        )
++      ) {
++        this.weakAutoPipBrowserClosedDeliberately.add(otherTab.linkedBrowser);
++        this.weakAutoPipBrowserClosedDeliberately.delete(
++          event.target.linkedBrowser
++        );
++      }
+       for (let win of Services.wm.getEnumerator(WINDOW_TYPE)) {
+         if (this.weakWinToBrowser.get(win) === event.target.linkedBrowser) {
+           this.weakWinToBrowser.set(win, otherTab.linkedBrowser);
+           this.removePiPBrowserFromWeakMap(event.target.linkedBrowser);
+           this.removeOriginatingWinFromWeakMap(event.target.linkedBrowser);
+@@ -899,10 +927,20 @@
      const { reason, actorRef } = closeData;
      const win = this.getWeakPipPlayer(actorRef);
      if (!win) {
@@ -43,8 +82,11 @@ diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/tool
 +
 +    const browser = this.weakWinToBrowser.get(win);
 +
-+    if (reason === "CloseButton") {
++    if (browser && DELIBERATE_CLOSE_REASONS.includes(reason)) {
-+      PictureInPicture.weakAutoPipBrowserClosedDeliberately.add(browser);
++      const tabbrowser = browser.getTabBrowser();
++      if (tabbrowser && tabbrowser.selectedBrowser != browser) {
++        PictureInPicture.weakAutoPipBrowserClosedDeliberately.add(browser);
++      }
 +    }
 +
      this.removePiPBrowserFromWeakMap(this.weakWinToBrowser.get(win));
@@ -52,4 +94,69 @@ diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/tool
  
      Glean.pictureinpicture["closedMethod" + reason].record();
      await this.closePipWindow(win);
+diff --git a/toolkit/components/pictureinpicture/tests/browser_autotoggle.js b/toolkit/components/pictureinpicture/tests/browser_autotoggle.js
+--- a/toolkit/components/pictureinpicture/tests/browser_autotoggle.js
++++ b/toolkit/components/pictureinpicture/tests/browser_autotoggle.js
+@@ -297,5 +297,61 @@
+       await new Promise(resolve => setTimeout(resolve, 2000));
+       assertNoPiPWindowsOpen();
+     }
+   );
+ });
++
++/**
++ * Tests that closing a PiP window deliberately (via Shift+ESC) while the tab is backgrounded
++ * suppresses auto-toggle, but auto-toggle works normally on the next background.
++ */
++add_task(async function autopip_suppress_on_deliberate_close() {
++  await SpecialPowers.pushPrefEnv({
++    set: [[ALWAYS_SHOW_PREF, true]],
++  });
++
++  // Open a new window and save a handle for the first tab
++  let win1 = await BrowserTestUtils.openNewBrowserWindow();
++  let firstTab = win1.gBrowser.selectedTab;
++
++  // Open a new tab containing a video
++  let pipTab = await BrowserTestUtils.openNewForegroundTab(
++    win1.gBrowser,
++    TEST_PAGE
++  );
++  let browser = pipTab.linkedBrowser;
++
++  // Ensure the video is playing
++  let videoID = "with-controls";
++  await ensureVideosReady(browser);
++  await SpecialPowers.spawn(browser, [videoID], async videoID => {
++    await content.document.getElementById(videoID).play();
++  });
++
++  // Switch from the video tab to the first tab and check if the PiP window opened
++  let domWindowOpened = BrowserTestUtils.domWindowOpenedAndLoaded(null);
++  await BrowserTestUtils.switchTab(win1.gBrowser, firstTab);
++  let pipWin = await domWindowOpened;
++  ok(pipWin, "PiP window automatically opened.");
++
++  // Close the PiP window deliberately while the tab is backgrounded and check that it doesn't reopen
++  domWindowOpened = BrowserTestUtils.domWindowOpenedAndLoaded(null);
++  // A short delay is needed to make the test more robust
++  // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
++  await new Promise(resolve => setTimeout(resolve, 2000));
++  EventUtils.synthesizeKey("KEY_Escape", { shiftKey: true }, pipWin);
++  let reopened = await Promise.race([
++    domWindowOpened.then(() => true),
++    // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
++    new Promise(resolve => setTimeout(() => resolve(false), 2000)),
++  ]);
++  ok(!reopened, "PiP window should not reopen after deliberate close");
++
++  // Switch to the video tab and back to the first tab, which should automatically open the PiP window
++  domWindowOpened = BrowserTestUtils.domWindowOpenedAndLoaded(null);
++  await BrowserTestUtils.switchTab(win1.gBrowser, pipTab);
++  await BrowserTestUtils.switchTab(win1.gBrowser, firstTab);
++  pipWin = await domWindowOpened;
++  ok(pipWin, "PiP window automatically opened.");
++
++  await BrowserTestUtils.closeWindow(win1);
++});
 

src/external-patches/manifest.json

@@ -44,13 +44,7 @@
   {
     "type": "phabricator",
     "id": "D320897",
-    "name": "Bug 2011236",
+    "name": "Bug 2011236"
-    "replaces": {
-      // The upstream patch context includes a MOZ_DIAGNOSTIC_ASSERT that
-      // doesn't exist yet in our Firefox version.
-      "@@ -59,11 +67,12 @@": "@@ -59,9 +67,10 @@",
-      "aLoadState->TypeHint())) {\n   MOZ_DIAGNOSTIC_ASSERT(!mURI->SchemeIs(\"javascript\"));\n \n   // Pull": "aLoadState->TypeHint())) {\n   // Pull"
-    }
   },
   {
     "type": "phabricator",
@@ -59,16 +53,6 @@
   },
   {
     "type": "local",
-    // CSS corner-shape rendering stack from bug 2047627 (borders),
-    // bug 2048908 (box shadows) and bug 2058091 (inset), squashed into a
-    // single patch: surfer's revert-then-apply on re-import only works for
-    // independently revertible patches, so a stack of separate files fails.
-    // Combined revisions, in stack order: D313684, D314332-D314337,
-    // D316301-D316304, D317056-D317058. The earlier revisions of these
-    // bugs (D306773-D306779, D308243, D311523) already landed in the
-    // current Firefox version and are omitted. D314332, D314336, D316301,
-    // D316303, D316304, D317057 and D317058 are hand-rebased onto
-    // Firefox 154 (the upstream diffs target a newer mozilla-central).
     "path": "firefox/css_corner_shape_rendering.patch"
   }
 ]

src/layout/style/StyleColor-cpp.patch

@@ -1,16 +1,16 @@
 diff --git a/layout/style/StyleColor.cpp b/layout/style/StyleColor.cpp
-index bbee32af30f35525730a10d0b242c0e8a8fe4695..a590fff105b30bc96fa7a0d8a8d3b1d5aa997e08 100644
+index f922f7fdacc7e1a14beb8da77b48aef3f6ae0b2b..47d19242baaf2a1f25ee07c6e210c839cc7b5089 100644
 --- a/layout/style/StyleColor.cpp
 +++ b/layout/style/StyleColor.cpp
-@@ -9,6 +9,7 @@
+@@ -8,6 +8,7 @@
- #include "mozilla/dom/BindingDeclarations.h"
+ #include "mozilla/StyleColorInlines.h"
  #include "nsIFrame.h"
  #include "nsStyleStruct.h"
 +#include "mozilla/nsZenBoostsBackend.h"
+ #include "nsStyleUtil.h"
  
  namespace mozilla {
- 
+@@ -98,23 +99,24 @@ StyleAbsoluteColor StyleColor::ResolveColor(
-@@ -96,23 +97,24 @@ StyleAbsoluteColor StyleColor::ResolveColor(
  
  template <>
  nscolor StyleColor::CalcColor(nscolor aColor) const {
@@ -40,7 +40,7 @@ index bbee32af30f35525730a10d0b242c0e8a8fe4695..a590fff105b30bc96fa7a0d8a8d3b1d5
  }
  
  StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
-@@ -120,7 +122,7 @@ StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
+@@ -122,7 +124,7 @@ StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
    return Servo_ConvertColorSpace(this, aColorSpace);
  }
  
@@ -49,7 +49,7 @@ index bbee32af30f35525730a10d0b242c0e8a8fe4695..a590fff105b30bc96fa7a0d8a8d3b1d5
    constexpr StyleColorSpace DEST_COLOR_SPACE = StyleColorSpace::Srgb;
  
    constexpr float MIN = 0.0f;
-@@ -162,11 +164,13 @@ nscolor StyleAbsoluteColor::ToColor() const {
+@@ -164,11 +166,13 @@ nscolor StyleAbsoluteColor::ToColor() const {
      }
    }
  

src/layout/svg/SVGImageContext-h.patch

@@ -1,5 +1,5 @@
 diff --git a/layout/svg/SVGImageContext.h b/layout/svg/SVGImageContext.h
-index b1f811989697966e30859610f4fc07579d0385ab..f6f4cd5a45fc49b416111d980fab4e612788903e 100644
+index ad833c7c2ee6a4c4984efdb0d59e3576c2d1bc19..36864a34badc0cbfe44d6295798622fd6178f9e3 100644
 --- a/layout/svg/SVGImageContext.h
 +++ b/layout/svg/SVGImageContext.h
 @@ -6,6 +6,7 @@
@@ -44,7 +44,7 @@ index b1f811989697966e30859610f4fc07579d0385ab..f6f4cd5a45fc49b416111d980fab4e61
    const Maybe<SVGPreserveAspectRatio>& GetPreserveAspectRatio() const {
      return mPreserveAspectRatio;
    }
-@@ -116,7 +137,11 @@ class SVGImageContext {
+@@ -110,7 +131,11 @@ class SVGImageContext {
      return contextPaintIsEqual && mViewportSize == aOther.mViewportSize &&
             mPreserveAspectRatio == aOther.mPreserveAspectRatio &&
             mColorScheme == aOther.mColorScheme &&
@@ -57,17 +57,17 @@ index b1f811989697966e30859610f4fc07579d0385ab..f6f4cd5a45fc49b416111d980fab4e61
    }
  
    bool operator!=(const SVGImageContext&) const = default;
-@@ -129,7 +154,8 @@ class SVGImageContext {
+@@ -123,7 +148,8 @@ class SVGImageContext {
-     return HashGeneric(hash, mViewportSize.map(HashSize).valueOr(0),
+     return AddToHash(hash, mViewportSize.map(HashSize).valueOr(0),
-                        mPreserveAspectRatio.map(HashPAR).valueOr(0),
+                      mPreserveAspectRatio.map(HashPAR).valueOr(0),
-                        mColorScheme.map(HashColorScheme).valueOr(0),
+                      mColorScheme.map(HashColorScheme).valueOr(0),
--                       HashLinkParameters(mLinkParameters));
+-                     HashLinkParameters(mLinkParameters));
-+                       HashLinkParameters(mLinkParameters), mZenBoostsAccent,
++                     HashLinkParameters(mLinkParameters), mZenBoostsAccent,
-+                       mZenBoostsComplementaryRotation, mZenBoostsInverted);
++                     mZenBoostsComplementaryRotation, mZenBoostsInverted);
    }
  
   private:
-@@ -167,6 +193,9 @@ class SVGImageContext {
+@@ -156,6 +182,9 @@ class SVGImageContext {
    Maybe<SVGPreserveAspectRatio> mPreserveAspectRatio;
    Maybe<ColorScheme> mColorScheme;
    StyleLinkParameters mLinkParameters;

src/toolkit/content/widgets/moz-toggle/moz-toggle-tokens-css.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/moz-toggle/moz-toggle.tokens.css b/toolkit/content/widgets/moz-toggle/moz-toggle.tokens.css
-index 6247d7a3923a6fedd4ec9911aba309ce565cd498..744e670eccc936dde664aa07df3e87bdcafd5e48 100644
+index c0976c54418a28046802443931042bd285aefbde..2adb18d25edbb8aac4e396fcfc64a4a664607836 100644
 --- a/toolkit/content/widgets/moz-toggle/moz-toggle.tokens.css
 +++ b/toolkit/content/widgets/moz-toggle/moz-toggle.tokens.css
 @@ -13,8 +13,8 @@
@@ -11,5 +11,5 @@ index 6247d7a3923a6fedd4ec9911aba309ce565cd498..744e670eccc936dde664aa07df3e87bd
 +    --toggle-background-color-pressed: var(--zen-primary-color);
 +    --toggle-background-color-pressed-hover: var(--zen-colors-hover-bg);
      --toggle-background-color-pressed-active: var(--color-accent-primary-active);
-     --toggle-border-color: var(--border-color-interactive);
+     --toggle-border-color: light-dark(var(--color-gray-70), var(--border-color-interactive));
      --toggle-border-color-hover: var(--toggle-border-color);

src/toolkit/themes/shared/design-system/dist/tokens-shared-css.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/design-system/dist/tokens-shared.css b/toolkit/themes/shared/design-system/dist/tokens-shared.css
-index 15c0d98a18b4f19e7f2e03d2b78066b0353f416a..b32f6244c7a07e93894bab422691a605456034a1 100644
+index 63c641f560d4c0ce06b40a652ca99d1c48cd6941..39c81e773a442870763396e68fb57bd336e3625a 100644
 --- a/toolkit/themes/shared/design-system/dist/tokens-shared.css
 +++ b/toolkit/themes/shared/design-system/dist/tokens-shared.css
 @@ -7,6 +7,8 @@
@@ -11,7 +11,22 @@ index 15c0d98a18b4f19e7f2e03d2b78066b0353f416a..b32f6244c7a07e93894bab422691a605
  @layer tokens-foundation {
    :root,
    :host(.anonymous-content-host) {
-@@ -424,8 +426,8 @@
+@@ -28,10 +30,10 @@
+     --border-color-selected: var(--color-accent-primary);
+     --border-color-transparent: transparent;
+     --border-radius-circle: 9999px;
+-    --border-radius-xsmall: 2px;
+-    --border-radius-small: 4px;
+-    --border-radius-medium: 8px;
+-    --border-radius-large: 16px;
++    --border-radius-xsmall: calc(2px * var(--zen-squircle-value));
++    --border-radius-small: calc(4px * var(--zen-squircle-value));
++    --border-radius-medium: calc(8px * var(--zen-squircle-value));
++    --border-radius-large: calc(16px * var(--zen-squircle-value));
+     --border-width: 1px;
+ 
+     /** box-shadow **/
+@@ -477,8 +479,8 @@
      --panel-background-color-dimmed-further: var(--background-color-dimmed-further);
      --panel-border-color: light-dark(rgb(240, 240, 244), rgb(82, 82, 94));
      --panel-border-radius: var(--border-radius-medium);

src/widget/cocoa/nsCocoaWindow-h.patch

@@ -1,8 +1,8 @@
 diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
-index 312011c1c2ac41e78affecbdef25d72766a7c882..e5865c7d6259f0a3df48edf7a26b1b75a23cdb3a 100644
+index 22a2a7ef3a5e9257c8bb00ba6a55e8d39d2abbd9..6d8353fd11921585f7101f5717bdb3dd8f2a5eae 100644
 --- a/widget/cocoa/nsCocoaWindow.h
 +++ b/widget/cocoa/nsCocoaWindow.h
-@@ -462,6 +462,10 @@ class nsCocoaWindow final : public nsIWidget {
+@@ -461,6 +461,10 @@ class nsCocoaWindow final : public nsIWidget {
    void SetHideTitlebarSeparator(bool) override;
    bool IsMacTitlebarDirectionRTL() override;
    void SetCustomTitlebar(bool) override;
@@ -13,9 +13,9 @@ index 312011c1c2ac41e78affecbdef25d72766a7c882..e5865c7d6259f0a3df48edf7a26b1b75
    void UpdateThemeGeometries(
        const nsTArray<ThemeGeometry>& aThemeGeometries) override;
    void LockAspectRatio(bool aShouldLock) override;
-@@ -672,6 +676,7 @@ class nsCocoaWindow final : public nsIWidget {
+@@ -674,6 +678,7 @@ class nsCocoaWindow final : public nsIWidget {
-   bool mAspectRatioLocked = false;
+   // show (e.g. a window created by detaching a tab from a fullscreen window).
-   bool mIsAlert = false;  // True if this is an non-native alert window.
+   bool mIsInitialFullscreenSuppressed = false;
    bool mWasShown = false;
 +  bool mIsBrowserWindow = false;
  

src/widget/gtk/nsDragSessionSource-cpp.patch

@@ -1,16 +1,16 @@
-diff --git a/widget/gtk/nsDragService.cpp b/widget/gtk/nsDragService.cpp
+diff --git a/widget/gtk/nsDragSessionSource.cpp b/widget/gtk/nsDragSessionSource.cpp
-index f760a6bb887b321376761431886c771f14fd03af..d52110ba52a95ef7c7bfb915e120b8dd636c9448 100644
+index a5f67d700f8c80d513f08cc25405b57cf28a2a9a..58186470bcbb7b1eda34ee20a19e29d540ab052a 100644
---- a/widget/gtk/nsDragService.cpp
+--- a/widget/gtk/nsDragSessionSource.cpp
-+++ b/widget/gtk/nsDragService.cpp
++++ b/widget/gtk/nsDragSessionSource.cpp
-@@ -23,6 +23,7 @@
+@@ -13,6 +13,7 @@
+ #include "mozilla/Services.h"
  #include "mozilla/StaticPrefs_widget.h"
- #include "mozilla/WidgetUtils.h"
  #include "mozilla/WidgetUtilsGtk.h"
 +#include "mozilla/nsZenDragAndDrop.h"
  #include "nsAppShell.h"
  #include "nsArrayUtils.h"
  #include "nsCRT.h"
-@@ -2304,11 +2305,15 @@ bool nsDragSession::SetAlphaPixmap(SourceSurface* aSurface,
+@@ -1196,11 +1197,15 @@ bool nsDragSessionSource::SetAlphaPixmap(SourceSurface* aSurface,
        cairo_image_surface_get_stride(surf), SurfaceFormat::B8G8R8A8);
    if (!dt) return false;
  

src/zen/common/modules/ZenUIManager.mjs

@@ -543,6 +543,10 @@ window.gZenUIManager = {
       return false;
     }
 
+    if (document.documentElement.hasAttribute("zen-welcome-stage")) {
+      return false;
+    }
+
     const shouldOpenURLBar =
       overridePreferance ||
       (gZenVerticalTabsManager._canReplaceNewTab &&
@@ -864,7 +868,6 @@ window.gZenUIManager = {
   },
 
   panelUIPosition(panel, anchor) {
-    void panel;
     // The alignment position of the panel is determined during the "popuppositioned" event
     // when the panel opens. The alignment positions help us determine in which orientation
     // the panel is anchored to the screen space.

src/zen/common/styles/zen-buttons.css

@@ -27,7 +27,7 @@ dialog::part(dialog-button) {
 
   position: relative;
   border: none;
-  border-radius: 10px;
+  border-radius: calc(10px * var(--zen-squircle-value));
 }
 
 @media (-moz-platform: macos) {

src/zen/common/styles/zen-omnibox.css

@@ -18,11 +18,11 @@
 
 .urlbar {
   --urlbarview-separator-color: light-dark(hsl(0, 0%, 80%), hsl(0, 0%, 20%));
-  --urlbarview-background-color-hover: var(--toolbarbutton-hover-background);
+  --urlbarview-background-color-hover: var(--toolbarbutton-background-color-hover);
   border-radius: calc(var(--toolbarbutton-border-radius) - 2px);
-  height: var(--urlbar-height);
   --urlbarView-results-padding: 10px !important;
   --urlbar-container-height: 48px !important;
+  --urlbar-input-container-border: none;
 
   --urlbar-margin-inline: 5px;
   --urlbar-container-padding: 4px;
@@ -60,6 +60,9 @@
 .urlbar-background {
   background: var(--zen-toolbar-element-bg) !important;
   border-radius: var(--border-radius-medium);
+  :root:not([zen-single-toolbar="true"]) & {
+    border-radius: calc(var(--border-radius-medium) * var(--zen-squircle-value));
+  }
   outline: none !important;
 
   #urlbar:not([breakout-extend]) & {
@@ -136,8 +139,13 @@
 
   & #identity-box {
     margin-inline-end: 0 !important;
+
+    :root[zen-has-empty-tab="true"] &[pageproxystate="invalid"]:not(.chromeUI) {
+      margin-inline-end: -4px !important;
+    }
+
     &.chromeUI:not([pageproxystate="invalid"]) #identity-icon-box {
-      border-radius: 10px !important;
+      border-radius: calc(10px * var(--zen-squircle-value)) !important;
     }
   }
 
@@ -166,13 +174,9 @@
 }
 
 :root:not([zen-single-toolbar="true"]):not([zen-has-empty-tab="true"]) #urlbar:not([breakout-extend]) .urlbar-input-container {
-  padding: 2px 3px;
+  padding: 2px 5px;
   gap: 2px;
 
-  & .urlbar-page-action {
-    height: 100%;
-  }
-
   & #zen-copy-url-button {
     order: -1;
   }
@@ -326,6 +330,7 @@
     order: 2;
   }
 
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
   #notification-popup-box:not([open]):not(:has(> [showing="true"])) {
     margin-inline-start: calc(-10px - 2 * var(--urlbar-icon-padding));
     opacity: 0;
@@ -346,7 +351,7 @@
       padding: 4px !important;
 
       &:hover {
-        background: var(--toolbarbutton-hover-background);
+        background: var(--toolbarbutton-background-color-hover);
         border-radius: var(--toolbarbutton-border-radius);
         overflow: visible;
       }
@@ -405,7 +410,7 @@
 }
 
 #notification-popup-box {
-  border-radius: 10px !important;
+  border-radius: calc(10px * var(--zen-squircle-value)) !important;
 }
 
 /* Border radius on hover */
@@ -487,9 +492,10 @@
   translate: -50% 0%;
   left: 50% !important;
 
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
   #urlbar-container:has(&) {
     border-radius: var(--border-radius-medium);
-    background: var(--toolbarbutton-hover-background);
+    background: var(--toolbarbutton-background-color-hover);
     height: var(--urlbar-height) !important;
     margin-inline: 0.15rem !important;
     :root:not([zen-single-toolbar="true"]) & {
@@ -633,6 +639,7 @@
 
 #urlbar-label-box,
 #urlbar-search-mode-indicator {
+  --urlbar-basic-component-size: auto;
   background-color: color-mix(in srgb, var(--zen-primary-color) 50%, light-dark(rgba(0, 0, 0, 0.5), rgba(255, 255, 255, 0.2)) 50%) !important;
   color: white;
   padding: 4px 8px;
@@ -698,7 +705,7 @@
 
 :root:not([zen-single-toolbar="true"]) #urlbar[breakout-extend]:not([zen-floating-urlbar="true"]) {
   & .urlbar-background {
-    border-radius: 10px !important;
+    border-radius: calc(10px * var(--zen-squircle-value)) !important;
   }
 
   #urlbar-results {

src/zen/common/styles/zen-panel-ui.css

@@ -26,6 +26,7 @@ panel[type="arrow"]:not(#feature-callout) {
        * way to properly animate the popup without having the mica
        * backdrop staying still while the popup animates */
       animation: none !important;
+      border-radius: 0;
     }
   }
 

src/zen/common/styles/zen-panels/dialog.css

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 .dialogBox {
-  border-radius: 12px !important;
+  border-radius: calc(12px * var(--zen-squircle-value)) !important;
   border: 0.5px solid light-dark(rgba(0, 0, 0, 0.4), var(--zen-dialog-background)) !important;
   outline: 1px solid light-dark(transparent, rgba(168, 168, 169, 0.50)) !important;
   box-shadow: 0 10px 8px rgba(0, 0 , 0, 0.15) !important;

src/zen/common/styles/zen-single-components.css

@@ -291,7 +291,7 @@
   --panel-width: 234px;
   --menu-panel-width-wide: calc(var(--panel-width) - var(--panel-padding) * 2);
   --uei-icon-size: 16px;
-  --arrowpanel-menuitem-border-radius: 10px;
+  --arrowpanel-menuitem-border-radius: calc(10px * var(--zen-squircle-value));
 }
 
 #unified-extensions-empty-state,
@@ -500,13 +500,16 @@
     transition:
       transform 0.12s ease-in-out,
       opacity 0.12s ease-in-out;
+    will-change: transform;
   }
 
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
   .permission-popup-permission-item:hover &::before,
   .permission-popup-boost-item:hover:not(:has(.zen-permission-popup-boost-editor-button:hover)) &::before {
     transform: scale(1.05);
   }
 
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
   .permission-popup-permission-item:active:hover &::before,
   .permission-popup-boost-item:active:hover:not(:has(.zen-permission-popup-boost-editor-button:hover)) &::before {
     transform: scale(0.95);
@@ -601,6 +604,7 @@
       position: absolute;
       width: 100%;
       height: 100%;
+      will-change: transform;
 
       @media (-moz-platform: macos) {
         background: linear-gradient(to bottom, light-dark(rgb(255, 255, 255), rgb(34, 34, 34)), light-dark(rgb(246, 246, 246), rgb(21, 21, 21)));

src/zen/common/styles/zen-theme.css

@@ -3,10 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-/* Here, we contain all the theme related variables, for example theme
- * colors, border radius, etc.
- * We have `--zen-border-radius` and `--zen-primary-color` as variables.
- */
 
 :host(:is(.anonymous-content-host, notification-message)),
 :root {
@@ -168,7 +164,11 @@
     --zen-toolbar-height-with-bookmarks: calc(var(--zen-toolbar-height) + 30px);
   }
 
-  --toolbarbutton-hover-background: var(--zen-toolbar-element-bg-hover) !important;
+  --toolbarbutton-background-color-hover: color-mix(
+    in srgb,
+    var(--zen-branding-bg-reverse) 7%,
+    transparent
+  ) !important;
   --zen-toolbar-button-size: 16px;
   @media (-moz-platform: macos) {
     --zen-toolbar-button-size: 17px;
@@ -181,19 +181,19 @@
     * background on the native theme. */
   --toolbar-background-color: light-dark(rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0.15));
 
-  --toolbarbutton-active-background: color-mix(
+  --toolbarbutton-background-color-active: color-mix(
     in srgb,
-    var(--zen-branding-bg-reverse) 7%,
+    var(--zen-branding-bg-reverse) 10%,
-    transparent 93%
+    transparent
   ) !important;
 
   --toolbar-color: var(--toolbox-textcolor) !important;
   --toolbox-textcolor-inactive: var(--toolbox-textcolor) !important;
 
   /* Other colors */
-  --urlbar-box-active-bgcolor: var(--toolbarbutton-hover-background) !important;
+  --urlbar-box-active-bgcolor: var(--toolbarbutton-background-color-hover) !important;
   --zen-input-border-color: light-dark(rgb(204, 204, 204), rgb(66, 65, 77));
-  --urlbar-box-hover-bgcolor: var(--toolbarbutton-hover-background) !important;
+  --urlbar-box-hover-bgcolor: var(--toolbarbutton-background-color-hover) !important;
   --input-text-background-color: light-dark(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2)) !important;
   --toolbar-field-focus-background-color: light-dark(
     rgba(255, 255, 255, 0.25),
@@ -223,10 +223,6 @@
     --zen-squircle-value: 2.1;
   }
 
-  @media (-moz-platform: linux) {
-    --zen-squircle-value: 1.2;
-  }
-
   --tab-icon-overlay-stroke: light-dark(white, black) !important;
   --tab-close-button-padding: 4px !important;
 
@@ -267,7 +263,7 @@
   --zen-active-tab-scale: 0.985;
 
   /* Define tab hover background color */
-  --tab-background-color-hover: var(--toolbarbutton-hover-background);
+  --tab-background-color-hover: var(--toolbarbutton-background-color-hover);
 
   /* Sidebar Notifications */
   --zen-sidebar-notification-bg: color-mix(
@@ -286,7 +282,7 @@
        * 1. If the native radius - the separation is less than 4px, use 4px.
        * 2. Otherwise, use the the calculated value (inner radius = outer radius - separation).
      */
-      max(5px, calc(var(--zen-border-radius) - var(--zen-element-separation) / 2))
+      max(5px, calc((var(--zen-border-radius) - var(--zen-element-separation) / 2) * var(--zen-squircle-value)))
   );
 
   /** Other theme-related styles */

src/zen/common/zenThemeModifier.js

@@ -109,7 +109,7 @@
         if (AppConstants.platform == "macosx") {
           const targetRadius = window.matchMedia("(-moz-mac-tahoe-theme)")
             .matches
-            ? 14
+            ? 12
             : 10;
           document.documentElement.style.setProperty(
             "--zen-border-radius",

src/zen/compact-mode/sidebar.inc.css

@@ -58,7 +58,7 @@
     :root[zen-no-padding='true'] & {
       --zen-compact-float: 10px;
       --zen-compact-top-toolbar-hidden-fix: var(--zen-compact-float);
-      --zen-compact-mode-no-padding-radius-fix: 2px;
+      --zen-compact-mode-no-padding-radius-fix: 6px;
     }
 
     /* Initial padding for when we are animating */

src/zen/folders/ZenFolders.mjs

@@ -44,6 +44,7 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
   #popup = null;
   #popupTimer = null;
   #mouseTimer = null;
+  #collapsedRelayoutQueue = new Set();
   #lastHighlightedGroup = null;
 
   #lastFolderContextMenu = null;
@@ -339,13 +340,29 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
       group.setAttribute("had-zen-pinned-changed", true);
     }
 
-    if (group.collapsed && !this._sessionRestoring && !group.isLiveFolder) {
+    if (this._sessionRestoring) {
+      // The margins hiding collapsed content are computed at collapse time;
+      // content materializing quietly under a collapsed folder must refresh
+      // them.
+      const owner = group.isZenFolder ? group : group.group;
+      const collapsedRoot = owner?.rootMostCollapsedFolder;
+      if (collapsedRoot) {
+        this.#queueCollapsedRelayout(collapsedRoot);
+      }
+    } else if (group.collapsed && !group.isLiveFolder) {
       group.collapsed = group.hasAttribute("has-active");
     }
   }
 
   on_FolderGrouped(event) {
     if (this._sessionRestoring) {
+      const parentFolder = event.target;
+      if (!groupIsCollapsiblePins(parentFolder)) {
+        const collapsedRoot = parentFolder?.rootMostCollapsedFolder;
+        if (collapsedRoot) {
+          this.#queueCollapsedRelayout(collapsedRoot);
+        }
+      }
       return;
     }
     const folder = event.detail;
@@ -473,6 +490,47 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
     await this.animateCollapse(group);
   }
 
+  #queueCollapsedRelayout(group) {
+    if (this.#collapsedRelayoutQueue.size === 0) {
+      requestAnimationFrame(() => this.#flushCollapsedRelayout());
+    }
+    this.#collapsedRelayoutQueue.add(group);
+  }
+
+  #flushCollapsedRelayout() {
+    if (this.#animationCount) {
+      // A collapse/expand animation is mid-flight and writes margins when it
+      // settles, retry once it is done.
+      requestAnimationFrame(() => this.#flushCollapsedRelayout());
+      return;
+    }
+    const groups = [...this.#collapsedRelayoutQueue];
+    this.#collapsedRelayoutQueue.clear();
+    for (const group of groups) {
+      if (
+        !group.isConnected ||
+        !group.isZenFolder ||
+        !group.collapsed ||
+        group.hasAttribute("has-active")
+      ) {
+        continue;
+      }
+      const container = group.groupContainer;
+      const groupStart = group.groupStartElement;
+      const wasHidden = container.hasAttribute("hidden");
+      container.removeAttribute("hidden");
+      groupStart.style.marginTop = "0px";
+      let height = container.getBoundingClientRect().height;
+      if (container.separatorElement) {
+        height -= container.separatorElement.getBoundingClientRect().height;
+      }
+      groupStart.style.marginTop = `${-(height + 4)}px`;
+      if (wasHidden) {
+        container.setAttribute("hidden", true);
+      }
+    }
+  }
+
   async on_TabGroupExpand(event) {
     const group = event.target;
     if (!group.isZenFolder) {

src/zen/images/favicons/tuta.svg

@@ -3,8 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="192" height="192" viewBox="0 0 192 192">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="192" height="192">
 <path d="M0 0 C46.53 0 93.06 0 141 0 C140.31337286 6.17964422 139.55249061 11.27288504 137.70605469 17.05029297 C137.47297387 17.80257864 137.23989305 18.55486431 136.99974918 19.32994652 C136.23144234 21.80315256 135.45168558 24.27258703 134.671875 26.7421875 C134.12437759 28.49738282 133.57765617 30.25282037 133.03166199 32.00848389 C131.87637142 35.71831589 130.71622139 39.42657597 129.55197144 43.13360596 C127.74764855 48.8788063 125.95370897 54.62720979 124.16235352 60.37646484 C123.86778165 61.32180147 123.57320978 62.2671381 123.26971149 63.24112129 C122.67820023 65.13942545 122.08671887 67.03773892 121.49526787 68.93606186 C120.61596105 71.75702774 119.73559404 74.57766091 118.85499573 77.39822388 C113.93371601 93.16794093 109.12231506 108.96839561 104.39160156 124.79638672 C104.15798416 125.57612854 103.92436676 126.35587036 103.68367004 127.15924072 C103.08515835 129.15844483 102.48956633 131.15852242 101.89428711 133.15869141 C101 136 101 136 100 138 C53.47 138 6.94 138 -41 138 C-40.30154873 133.1108411 -39.57595592 129.15411541 -38.15258789 124.53222656 C-37.57916405 122.65642914 -37.57916405 122.65642914 -36.99415588 120.74273682 C-36.57039663 119.37534329 -36.14656076 118.0079735 -35.72265625 116.640625 C-35.27348999 115.1778587 -34.82480765 113.71494372 -34.37657166 112.25189209 C-33.18301778 108.36047716 -31.98331296 104.47098593 -30.78216553 100.58190918 C-29.63602455 96.86810525 -28.49491032 93.15276556 -27.35351562 89.4375 C-24.23585848 79.29161092 -21.11791678 69.14580929 -18 59 C-12.06 39.53 -6.12 20.06 0 0 Z " fill="#C00002" transform="translate(51,54)"/>
 <path d="M0 0 C18.3328319 -0.77792059 36.66127963 -1.35606988 55.00715542 -1.70980167 C63.53040721 -1.87858134 72.04320263 -2.10845198 80.55981445 -2.48950195 C142.46067644 -5.20608208 142.46067644 -5.20608208 159.53827381 9.52021503 C166.76889916 16.3955246 173.28323862 24.18336817 178 33 C178 34.32 178 35.64 178 37 C159.57187597 37.07007601 141.14378652 37.12298126 122.71555805 37.15543652 C114.15904092 37.17090649 105.60260658 37.19199848 97.04614258 37.22631836 C89.58846853 37.25621675 82.13085443 37.27557406 74.67312211 37.28226548 C70.72416302 37.28617701 66.77537545 37.29537225 62.82647133 37.31719017 C59.10909816 37.33756234 55.39196707 37.34383237 51.67454338 37.33932304 C49.66086617 37.34054104 47.64721527 37.35667936 45.63360596 37.3732605 C44.43192276 37.36913651 43.23023956 37.36501251 41.99214172 37.36076355 C40.42831993 37.36491162 40.42831993 37.36491162 38.83290577 37.36914349 C32.93264951 36.60030705 29.62184448 32.77709579 25.875 28.5 C19.58131594 21.47164064 12.89888852 14.86095567 6.14794922 8.2734375 C5.35146973 7.48839844 4.55499023 6.70335937 3.734375 5.89453125 C3.01475586 5.19175049 2.29513672 4.48896973 1.55371094 3.76489258 C0 2 0 2 0 0 Z " fill="#C00002" transform="translate(14,0)"/>
 <path d="M0 0 C3.791582 0.9478955 4.61038031 1.2276371 7.22387695 3.72460938 C7.82742508 4.29610718 8.43097321 4.86760498 9.05281067 5.4564209 C9.69151596 6.0792395 10.33022125 6.70205811 10.98828125 7.34375 C11.65087448 7.98687134 12.31346771 8.62999268 12.99613953 9.29260254 C14.39307302 10.6568359 15.78562095 12.02557232 17.17407227 13.3984375 C19.30020941 15.4879213 21.45839054 17.54016287 23.61914062 19.59375 C24.97349069 20.92491308 26.32577572 22.25818109 27.67578125 23.59375 C28.64902092 24.50368713 28.64902092 24.50368713 29.641922 25.43200684 C32.90021798 28.73979232 33.96335392 30.20963715 34.18457031 34.98071289 C32.79621492 42.01530122 30.50352034 48.87563397 28.37109375 55.71484375 C27.89774106 57.25373642 27.42510459 58.79284955 26.95314026 60.33216858 C25.70895014 64.38330864 24.4551733 68.43141814 23.19927979 72.47894287 C21.95200374 76.50438366 20.71357304 80.53254149 19.47460938 84.56054688 C18.02569311 89.27038853 16.5746843 93.97953307 15.11288452 98.68539429 C12.90227206 105.80473144 10.71371664 112.92808223 8.60595703 120.07861328 C8.0605703 121.91064049 8.0605703 121.91064049 7.50416565 123.77967834 C6.83459768 126.03485094 6.17462453 128.29290282 5.52598572 130.55418396 C5.23389725 131.5321846 4.94180878 132.51018524 4.64086914 133.51782227 C4.39422012 134.36594986 4.14757111 135.21407745 3.89344788 136.08790588 C3.59861008 136.71889694 3.30377228 137.349888 3 138 C2.01 138.33 1.02 138.66 0 139 C0 93.13 0 47.26 0 0 Z " fill="#C00002" transform="translate(0,15)"/>

src/zen/live-folders/providers/GithubLiveFolder.sys.mjs

@@ -26,7 +26,8 @@ export class nsGithubLiveFolderProvider extends nsZenLiveFolderProvider {
       const hasAnyFilterEnabled =
         (this.state.options.authorMe ?? false) ||
         (this.state.options.assignedMe ?? true) ||
-        (this.state.options.reviewRequested ?? false);
+        (this.state.options.reviewRequested ?? false) ||
+        (this.state.options.includeDrafts ?? true);
 
       if (!hasAnyFilterEnabled) {
         return "zen-live-folder-github-no-filter";

src/zen/spaces/ZenGradientGenerator.mjs

@@ -353,7 +353,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
     // Add elements in a circular pattern, where the center is the center of the wrapper
     for (let i = 0; i < 16; i++) {
       const dot = document.createElement("div");
-      dot.classList.add("zen-theme-picker-texture-dot");
+      dot.classList.add("zen-theme-picker-texture-dot", "no-squircles");
       const position = (i / 16) * Math.PI * 2 + wrapperWidth;
       dot.style.left = `${Math.cos(position) * 50 + 50}%`;
       dot.style.top = `${Math.sin(position) * 50 + 50}%`;
@@ -361,6 +361,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
     }
     this._textureHandler = document.createElement("div");
     this._textureHandler.id = "PanelUI-zen-gradient-generator-texture-handler";
+    this._textureHandler.classList.add("no-squircles");
     this._textureHandler.addEventListener(
       "mousedown",
       this.onTextureHandlerMouseDown.bind(this)
@@ -598,7 +599,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
         color.position || this.calculateInitialPosition([r, g, b]);
       const dotPad = this.panel.querySelector(".zen-theme-picker-gradient");
 
-      dot.classList.add("zen-theme-picker-dot");
+      dot.classList.add("zen-theme-picker-dot", "no-squircles");
 
       dot.style.left = `${x}px`;
       dot.style.top = `${y}px`;
@@ -720,7 +721,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
     };
 
     const dot = document.createElement("div");
-    dot.classList.add("zen-theme-picker-dot");
+    dot.classList.add("zen-theme-picker-dot", "no-squircles");
 
     dot.style.left = `${dotData.x}px`;
     dot.style.top = `${dotData.y}px`;
@@ -1475,14 +1476,19 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
    * @returns {string} The primary color in hex format.
    */
   getAccentColorForUI(accentColor, isDarkMode) {
-    const [h, s, l] = this.rgbToHsl(...accentColor);
+    let [r, g, b] = accentColor;
     if (isDarkMode) {
-      return `rgb(${accentColor[0]}, ${accentColor[1]}, ${accentColor[2]})`;
+      return `rgb(${r}, ${g}, ${b})`;
     }
+    // gh-15142: Special case for grayscale colors
+    if (r == g && g == b) {
+      return `rgb(${r}, ${g}, ${b})`;
+    }
+    const [h, s, l] = this.rgbToHsl(...accentColor);
     const saturation = Math.min(1, s + 0.3);
     const targetLightness = this.isDarkMode ? 0.62 : 0.42;
     const lightness = l * 0.4 + targetLightness * 0.6;
-    const [r, g, b] = this.hslToRgb(h / 360, saturation, lightness);
+    [r, g, b] = this.hslToRgb(h / 360, saturation, lightness);
     return `rgb(${r}, ${g}, ${b})`;
   }
 
@@ -1503,7 +1509,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
       baseColor = this.blendColors(
         accentColor,
         baseColor.slice(0, 3),
-        this.canBeTransparent ? 15 : 5
+        this.canBeTransparent ? 25 : 5
       ).concat(opacity);
     }
     return baseColor;

src/zen/spaces/ZenSpace.mjs

@@ -287,6 +287,12 @@ export class nsZenWorkspace extends MozXULElement {
 
     this.addEventListener("TabPinned", tabPinCallback);
     this.addEventListener("TabUnpinned", tabPinCallback);
+    this.addEventListener("TabGroupRemovedFromDOM", () => {
+      // Wait for the group to be removed from the DOM.
+      setTimeout(() => {
+        tabPinCallback();
+      });
+    });
     this.addEventListener("TabClose", event => {
       if (event.target.pinned) {
         tabPinCallback();

src/zen/spaces/ZenSpaceCreation.mjs

@@ -10,6 +10,7 @@ ChromeUtils.defineLazyGetter(lazy, "l10n", () => {
 
 class nsZenWorkspaceCreation extends MozXULElement {
   #wasInCollapsedMode = false;
+  #urlbarDimmed = false;
 
   promiseInitialized = new Promise(resolve => {
     this.resolveInitialized = resolve;
@@ -40,7 +41,7 @@ class nsZenWorkspaceCreation extends MozXULElement {
             </vbox>
             <vbox class="zen-workspace-creation-form">
               <hbox class="zen-workspace-creation-name-wrapper">
-                <toolbarbutton class="zen-workspace-creation-icon-label" />
+                <toolbarbutton class="zen-workspace-creation-icon-label zen-squircle-before" />
                 <html:input
                   class="zen-workspace-creation-name"
                   type="text"
@@ -89,6 +90,58 @@ class nsZenWorkspaceCreation extends MozXULElement {
     ];
   }
 
+  get #spaceSwitchDuration() {
+    return (
+      Services.prefs.getIntPref("zen.workspaces.switch-animation-duration") /
+      1000
+    );
+  }
+
+  #dimUrlbar() {
+    if (this.#urlbarDimmed || !gZenVerticalTabsManager._hasSetSingleToolbar) {
+      return;
+    }
+    this.#urlbarDimmed = true;
+    const animation = gZenUIManager.motion.animate(
+      gURLBar,
+      {
+        opacity: [1, 0],
+      },
+      {
+        duration: this.#spaceSwitchDuration,
+        type: "spring",
+        bounce: 0,
+      }
+    );
+    if (gReduceMotion) {
+      animation.complete();
+    }
+  }
+
+  #restoreUrlbar() {
+    if (!this.#urlbarDimmed) {
+      return;
+    }
+    this.#urlbarDimmed = false;
+    const animation = gZenUIManager.motion.animate(
+      gURLBar,
+      {
+        opacity: [0, 1],
+      },
+      {
+        duration: this.#spaceSwitchDuration,
+        type: "spring",
+        bounce: 0,
+      }
+    );
+    if (gReduceMotion) {
+      animation.complete();
+    }
+    animation.then(() => {
+      gURLBar.style.removeProperty("opacity");
+    });
+  }
+
   connectedCallback() {
     if (this.delayConnectedCallback()) {
       // If we are not ready yet, or if we have already connected, we
@@ -109,10 +162,6 @@ class nsZenWorkspaceCreation extends MozXULElement {
       ".zen-workspace-creation-cancel-button"
     );
 
-    for (const element of this.elementsToAnimate) {
-      element.style.opacity = 0;
-    }
-
     this.#wasInCollapsedMode =
       document.documentElement.getAttribute("zen-sidebar-expanded") !== "true";
 
@@ -124,11 +173,15 @@ class nsZenWorkspaceCreation extends MozXULElement {
       .getInterface(Ci.nsIAppWindow)
       .rollupAllPopups();
 
+    gURLBar.view.close();
+    gURLBar.handleRevert();
+    gURLBar.blur();
+
     this.handleZenWorkspacesChangeBind =
       this.handleZenWorkspacesChange.bind(this);
 
     for (const element of this.parentElement.children) {
-      if (element !== this) {
+      if (element !== this && !element.hidden) {
         element.hidden = true;
         this.#hiddenElements.push(element);
       }
@@ -207,48 +260,15 @@ class nsZenWorkspaceCreation extends MozXULElement {
     document.getElementById("zen-sidebar-splitter").style.pointerEvents =
       "none";
 
-    gZenUIManager.motion
+    gZenCompactModeManager.getAndApplySidebarWidth({});
-      .animate(
+    this.#dimUrlbar();
-        [gBrowser.tabContainer, gURLBar],
+    this.resolveInitialized();
-        {
+  }
-          opacity: [1, 0],
+
-        },
+  disconnectedCallback() {
-        {
+    if (gZenWorkspaces.creatingWorkspaceId === this.workspaceId) {
-          duration: 0.3,
+      gZenWorkspaces.creatingWorkspaceId = null;
-          type: "spring",
+    }
-          bounce: 0,
-        }
-      )
-      .then(() => {
-        gBrowser.tabContainer.style.visibility = "collapse";
-        if (gZenVerticalTabsManager._hasSetSingleToolbar) {
-          document.getElementById("nav-bar").style.visibility = "collapse";
-        }
-        this.style.visibility = "visible";
-        gZenCompactModeManager.getAndApplySidebarWidth({});
-        this.resolveInitialized();
-        let animation = gZenUIManager.motion.animate(
-          this.elementsToAnimate,
-          {
-            y: [20, 0],
-            opacity: [0, 1],
-            filter: ["blur(2px)", "blur(0)"],
-          },
-          {
-            duration: 0.6,
-            type: "spring",
-            bounce: 0,
-            delay: gZenUIManager.motion.stagger(0.05, { startDelay: 0.2 }),
-          }
-        );
-        if (gReduceMotion) {
-          animation.complete();
-        }
-        animation.then(() => {
-          this.inputName.focus();
-          gZenWorkspaces.workspaceElement(this.workspaceId).hidden = false;
-        });
-      });
   }
 
   async onCreateButtonCommand() {
@@ -268,6 +288,7 @@ class nsZenWorkspaceCreation extends MozXULElement {
 
   async onCancelButtonCommand() {
     document.documentElement.removeAttribute("zen-creating-workspace");
+    this.#restoreUrlbar();
     await gZenWorkspaces.changeWorkspaceWithID(this.previousWorkspaceId);
   }
 
@@ -332,18 +353,21 @@ class nsZenWorkspaceCreation extends MozXULElement {
   }
 
   finishSetup() {
+    this.inputName.focus();
     gZenWorkspaces.addChangeListeners(this.handleZenWorkspacesChangeBind, {
       once: true,
     });
   }
 
   async handleZenWorkspacesChange() {
+    // The space we were living in has already slid away, no need to animate
+    // ourselves out of it.
+    await this.#cleanup({ animateOut: false });
     await gZenWorkspaces.removeWorkspace(this.workspaceId);
-    await this.#cleanup();
   }
 
-  async #cleanup() {
+  async #cleanup({ animateOut = true } = {}) {
-    if (!gReduceMotion) {
+    if (animateOut && !gReduceMotion && this.isConnected) {
       await gZenUIManager.motion.animate(
         this.elementsToAnimate.reverse(),
         {
@@ -352,10 +376,10 @@ class nsZenWorkspaceCreation extends MozXULElement {
           filter: ["blur(0)", "blur(2px)"],
         },
         {
-          duration: 0.4,
+          duration: 0.3,
           type: "spring",
           bounce: 0,
-          delay: gZenUIManager.motion.stagger(0.05),
+          delay: gZenUIManager.motion.stagger(0.03),
         }
       );
     }
@@ -377,41 +401,49 @@ class nsZenWorkspaceCreation extends MozXULElement {
 
     document.documentElement.removeAttribute("zen-creating-workspace");
 
-    gBrowser.tabContainer.style.visibility = "";
-    gBrowser.tabContainer.style.opacity = 0;
-    if (gZenVerticalTabsManager._hasSetSingleToolbar) {
-      document.getElementById("nav-bar").style.visibility = "";
-      gURLBar.style.opacity = 0;
-    }
-
     this.remove();
+    this.#restoreUrlbar();
 
-    const workspace = gZenWorkspaces.getActiveWorkspace();
+    // Give the space back its own contents.
-    gZenWorkspaces._organizeWorkspaceStripLocations(workspace);
+    const revealedElements = this.#hiddenElements;
-    gZenWorkspaces.updateTabsContainers();
+    this.#hiddenElements = [];
-
+    for (const element of revealedElements) {
-    await gZenUIManager.motion.animate(
-      [gBrowser.tabContainer, gURLBar],
-      {
-        opacity: [0, 1],
-      },
-      {
-        duration: 0.3,
-        type: "spring",
-        bounce: 0,
-      }
-    );
-
-    gBrowser.tabContainer.style.opacity = "";
-    if (gZenVerticalTabsManager._hasSetSingleToolbar) {
-      gURLBar.style.opacity = "";
-    }
-
-    for (const element of this.#hiddenElements) {
       element.hidden = false;
     }
 
-    this.#hiddenElements = [];
+    // Now that the form is gone the space owns its essentials again, so let
+    // it lay itself out before we fade everything back in.
+    const workspace = gZenWorkspaces.getActiveWorkspace();
+    gZenWorkspaces._organizeWorkspaceStripLocations(workspace);
+    gZenWorkspaces.updateTabsContainers();
+    // The essentials were parked off screen while we were up, put them back.
+    gZenWorkspaces.resetEssentialsPosition();
+
+    if (animateOut && !gReduceMotion) {
+      const elementsToReveal = revealedElements.filter(
+        element => element?.isConnected
+      );
+      if (elementsToReveal.length) {
+        gZenUIManager.motion
+          .animate(
+            elementsToReveal,
+            {
+              opacity: [0, 1],
+            },
+            {
+              duration: 0.3,
+              type: "spring",
+              bounce: 0,
+            }
+          )
+          .then(() => {
+            for (const element of elementsToReveal) {
+              element.style.removeProperty("opacity");
+            }
+          });
+      }
+    }
+
     gZenUIManager.updateTabsToolbar();
   }
 }

src/zen/spaces/ZenSpaceManager.mjs

@@ -40,6 +40,13 @@ class nsZenWorkspaces {
   #inChangingWorkspace = false;
   draggedElement = null;
 
+  /**
+   * The space currently showing the creation form, if any. It shows the form
+   * instead of tabs and essentials, so it never owns an essentials section.
+   * Cleared by the form element once it is removed from the DOM.
+   */
+  creatingWorkspaceId = null;
+
   #hasInitialized = false;
 
   #canDebug = Services.prefs.getBoolPref("zen.workspaces.debug", false);
@@ -156,11 +163,28 @@ class nsZenWorkspaces {
         this._invalidateBookmarkContainers();
       };
       Services.obs.addObserver(observerFunction, "workspace-bookmarks-updated");
+      const onContainerDeleted = subject => {
+        const userContextId = subject?.wrappedJSObject?.userContextId;
+        for (const workspace of this.getWorkspaces()) {
+          if (workspace.containerTabId === userContextId) {
+            workspace.containerTabId = 0;
+            this.saveWorkspace(workspace);
+          }
+        }
+      };
+      Services.obs.addObserver(
+        onContainerDeleted,
+        "contextual-identity-deleted"
+      );
       window.addEventListener("unload", () => {
         Services.obs.removeObserver(
           observerFunction,
           "workspace-bookmarks-updated"
         );
+        Services.obs.removeObserver(
+          onContainerDeleted,
+          "contextual-identity-deleted"
+        );
       });
     }
   }
@@ -328,10 +352,7 @@ class nsZenWorkspaces {
   }
 
   get shouldAnimateEssentials() {
-    return (
+    return this.containerSpecificEssentials || !!this.creatingWorkspaceId;
-      this.containerSpecificEssentials ||
-      document.documentElement.hasAttribute("zen-creating-workspace")
-    );
   }
 
   get activeWorkspaceElement() {
@@ -441,9 +462,6 @@ class nsZenWorkspaces {
       workspaceWrapper.active = true;
     }
 
-    if (document.documentElement.hasAttribute("zen-creating-workspace")) {
-      workspaceWrapper.hidden = true; // Hide workspace while creating it
-    }
     container.appendChild(workspaceWrapper);
     this.#organizeTabsToWorkspaceSections(workspace, workspaceWrapper, tabs);
     workspaceWrapper.checkPinsExistence();
@@ -894,6 +912,9 @@ class nsZenWorkspaces {
     // Wait for the next event loop to ensure that the startup focus logic by
     // firefox has finished doing it's thing.
     setTimeout(() => {
+      if (document.documentElement.hasAttribute("zen-welcome-stage")) {
+        return;
+      }
       if (gZenVerticalTabsManager._canReplaceNewTab && shownEmptyTab) {
         BrowserCommands.openTab();
       } else if (shownEmptyTab || initialTabWasEmpty) {
@@ -1219,7 +1240,7 @@ class nsZenWorkspaces {
     }
   }
 
-  saveWorkspace(workspaceData) {
+  saveWorkspace(workspaceData, { insertAfterId = null } = {}) {
     if (this.privateWindowOrDisabled) {
       return;
     }
@@ -1227,8 +1248,13 @@ class nsZenWorkspaces {
     const index = workspacesData.findIndex(
       ws => ws.uuid === workspaceData.uuid
     );
+    const insertAfterIndex = insertAfterId
+      ? workspacesData.findIndex(ws => ws.uuid === insertAfterId)
+      : -1;
     if (index !== -1) {
       workspacesData[index] = workspaceData;
+    } else if (insertAfterIndex !== -1) {
+      workspacesData.splice(insertAfterIndex + 1, 0, workspaceData);
     } else {
       workspacesData.push(workspaceData);
     }
@@ -1409,6 +1435,7 @@ class nsZenWorkspaces {
     const previousWorkspace = this.getActiveWorkspace();
     document.documentElement.setAttribute("zen-creating-workspace", "true");
     await this.createAndSaveWorkspace("Space", undefined, false, 0, {
+      insertAfterId: previousWorkspace?.uuid,
       beforeChangeCallback: async workspace => {
         createForm = document.createXULElement("zen-workspace-creation");
         createForm.setAttribute("workspace-id", workspace.uuid);
@@ -1416,7 +1443,18 @@ class nsZenWorkspaces {
           "previous-workspace-id",
           previousWorkspace?.uuid || ""
         );
-        gBrowser.tabContainer.after(createForm);
+        this.creatingWorkspaceId = workspace.uuid;
+        const spaceElement = this.workspaceElement(workspace.uuid);
+        // No essentials sit above the form, so there's no room to reserve for
+        // them. The switch animation needs a value to
+        // animate the padding from.
+        spaceElement.style.paddingTop = "0px";
+        spaceElement.appendChild(createForm);
+        // Keep the strip sitting on the previous space so that the new one,
+        // together with its creation form, slides in like any other space.
+        if (previousWorkspace) {
+          this._organizeWorkspaceStripLocations(previousWorkspace, true);
+        }
         await createForm.promiseInitialized;
       },
     });
@@ -1786,10 +1824,6 @@ class nsZenWorkspaces {
     justMove = false,
     offsetPixels = 0
   ) {
-    if (document.documentElement.hasAttribute("zen-creating-workspace")) {
-      // If we are creating a workspace, we don't want to animate the strip
-      return;
-    }
     this._organizingWorkspaceStrip = true;
     const workspaces = this.getWorkspaces();
     let workspaceIndex = workspaces.findIndex(w => w.uuid === workspace.uuid);
@@ -1810,6 +1844,7 @@ class nsZenWorkspaces {
     }
     const workspaceContextId = workspace.containerTabId;
     const nextWorkspaceContextId = workspaces[nextSpaceIdx]?.containerTabId;
+    const isCreatingWorkspace = workspace.uuid === this.creatingWorkspaceId;
     for (const otherWorkspace of workspaces) {
       const element = this.workspaceElement(otherWorkspace.uuid);
       let diff = workspaces.indexOf(otherWorkspace) - workspaceIndex;
@@ -1826,8 +1861,9 @@ class nsZenWorkspaces {
       // Get the next workspace contextId, if it's the same, dont apply offsetPixels
       // if it's not we do apply it
       if (
-        container.getAttribute("container") != workspace.containerTabId &&
+        isCreatingWorkspace ||
-        this.shouldAnimateEssentials
+        (container.getAttribute("container") != workspace.containerTabId &&
+          this.shouldAnimateEssentials)
       ) {
         container.setAttribute("hidden", "true");
       } else {
@@ -1902,6 +1938,17 @@ class nsZenWorkspaces {
     delete this._organizingWorkspaceStrip;
   }
 
+  /**
+   * Drop the offset a creation form parked the essentials at.
+   */
+  resetEssentialsPosition() {
+    for (const container of document.querySelectorAll(
+      "#zen-essentials .zen-essentials-container"
+    )) {
+      container.style.removeProperty("transform");
+    }
+  }
+
   updateWorkspaceIndicator(currentWorkspace, workspaceIndicator) {
     if (!workspaceIndicator) {
       return;
@@ -1975,17 +2022,21 @@ class nsZenWorkspaces {
     const isGoingLeft = diff < 0;
     const essentialsAnimData = [];
     if (shouldAnimate && this.shouldAnimateEssentials && previousWorkspace) {
-      const containerIds = new Map();
+      const creatingWorkspaceId = this.creatingWorkspaceId;
+      const essentialsElements = new Map();
       for (const workspace of workspaces) {
-        const containerId = workspace.containerTabId;
+        if (workspace.uuid === creatingWorkspaceId) {
-        if (!containerIds.has(containerId)) {
+          continue;
-          containerIds.set(containerId, []);
         }
-        containerIds.get(containerId).push(workspace);
+        const element = this.getEssentialsSection(workspace.containerTabId);
+        if (!essentialsElements.has(element)) {
+          essentialsElements.set(element, []);
+        }
+        essentialsElements.get(element).push(workspace);
       }
-      for (const [containerId, spaces] of containerIds) {
+      for (const [element, spaces] of essentialsElements) {
         essentialsAnimData.push({
-          element: this.getEssentialsSection(containerId),
+          element,
           workspaces: spaces,
         });
       }
@@ -2126,6 +2177,7 @@ class nsZenWorkspaces {
           existingOffset = currentTransform || (isGoingLeft ? -100 : 100);
           newOffset = 0;
         }
+        data.finalOffset = newOffset;
         const newTransform = `translateX(${newOffset}%)`;
         let existingTransform = `translateX(${existingOffset}%)`;
         if (shouldAnimate) {
@@ -2164,6 +2216,12 @@ class nsZenWorkspaces {
     document.documentElement.removeAttribute("animating-background");
     if (shouldAnimate) {
       for (const data of essentialsAnimData) {
+        if (this.creatingWorkspaceId && data.finalOffset) {
+          // The space being created has no essentials of its own, leave the
+          // ones we just slid away parked off screen instead of snapping them
+          // back under the creation form.
+          continue;
+        }
         data.element.style.removeProperty("transform");
       }
       this._alwaysAnimatePaddingTop = true;
@@ -2492,7 +2550,7 @@ class nsZenWorkspaces {
         "Default";
       name = this.isPrivateWindow ? "Incognito" : label;
       if (this.isPrivateWindow) {
-        icon = gZenEmojiPicker.getSVGURL("eye.svg");
+        icon = "chrome://browser/skin/zen-icons/private-window-small.svg";
       }
     }
     let workspace = {
@@ -2510,7 +2568,9 @@ class nsZenWorkspaces {
     icon = undefined,
     dontChange = false,
     containerTabId = 0,
-    { beforeChangeCallback } = { beforeChangeCallback: null } // Callback to run before changing workspace
+    // beforeChangeCallback runs before changing workspace, insertAfterId places
+    // the new space right after an existing one instead of at the end.
+    { beforeChangeCallback = null, insertAfterId = null } = {}
   ) {
     if (!this.workspaceEnabled) {
       return null;
@@ -2531,7 +2591,7 @@ class nsZenWorkspaces {
       this.#createWorkspaceTabsSection(workspaceData, extraTabs);
       this._organizeWorkspaceStripLocations(workspaceData);
     }
-    this.saveWorkspace(workspaceData);
+    this.saveWorkspace(workspaceData, { insertAfterId });
     if (!dontChange) {
       if (beforeChangeCallback) {
         try {
@@ -2653,6 +2713,11 @@ class nsZenWorkspaces {
         workspacesIds.push(originalWorkspaceId);
       }
       for (const workspaceId of workspacesIds) {
+        if (workspaceId === this.creatingWorkspaceId) {
+          // The space being created shows the creation form instead of its
+          // essentials, so it doesn't reserve any room for them.
+          continue;
+        }
         const workspaceElement = this.workspaceElement(workspaceId);
         const workspaceObject = this.getWorkspaceFromId(workspaceId);
         if (!workspaceElement || !workspaceObject) {

src/zen/spaces/create-workspace-form.css

@@ -6,9 +6,10 @@
 
 zen-workspace-creation {
   flex: 1;
-  max-width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding));
+  flex-direction: column;
-  padding: 3px;
+  min-height: 0;
-  visibility: collapse;
+  width: 100%;
+  padding: 3px var(--zen-toolbox-padding);
 
   & .zen-workspace-creation {
     justify-content: center;
@@ -51,7 +52,7 @@ zen-workspace-creation {
 
       & .zen-workspace-creation-name-wrapper {
         padding: 9px 6px;
-        border-radius: 8px !important;
+        border-radius: calc(8px * var(--zen-squircle-value)) !important;
         margin: 0;
         background-color: var(--input-text-background-color);
         gap: 8px;
@@ -95,7 +96,7 @@ zen-workspace-creation {
 
           &::before {
             border: 1px dashed light-dark(rgba(0, 0, 0, 0.5), rgba(255, 255, 255, 0.5));
-            border-radius: 4px;
+            border-radius: 6px;
             width: calc(100% + 2px);
             height: calc(100% + 2px);
             content: "";
@@ -118,7 +119,7 @@ zen-workspace-creation {
 
       & .zen-workspace-creation-profile-wrapper {
         padding: 4px;
-        border-radius: 8px !important;
+        border-radius: calc(8px * var(--zen-squircle-value)) !important;
         margin: 0;
         background-color: var(--input-text-background-color);
         gap: 4px;
@@ -147,7 +148,7 @@ zen-workspace-creation {
       }
 
       & .zen-workspace-creation-edit-theme-button {
-        border-radius: 8px !important;
+        border-radius: calc(8px * var(--zen-squircle-value)) !important;
         margin: 0;
         background-color: var(--input-text-background-color);
         justify-content: center;

src/zen/spaces/zen-workspaces.css

@@ -324,7 +324,10 @@ zen-workspace {
   overflow: hidden;
   color: var(--toolbox-textcolor);
 
-  --tab-background-color-selected: color-mix(in srgb, light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.18)) 95%, var(--zen-primary-color)) !important;
+  --tab-background-color-selected: light-dark(
+    color-mix(in srgb, rgba(255, 255, 255, 0.8) 98%, var(--zen-primary-color)),
+    color-mix(in srgb, rgba(255, 255, 255, 0.18) 95%, var(--zen-primary-color))
+  ) !important;
   --tab-box-shadow-selected: 0 0.8px 1.5px 0px light-dark(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.05)) !important;
   --tab-selected-textcolor: color-mix(in srgb, var(--toolbox-textcolor) 95%, var(--zen-primary-color)) !important;
 

src/zen/split-view/ZenViewSplitter.mjs

@@ -160,7 +160,9 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
     if (groupIndex < 0) {
       return;
     }
-    this.removeTabFromGroup(tab, groupIndex, { forUnsplit: true });
+    this.removeTabFromGroup(tab, groupIndex, {
+      forUnsplit: true,
+    });
   }
 
   /**
@@ -203,16 +205,21 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
    * @param {object} [options={}] - Additional options.
    * @param {boolean} [options.forUnsplit=false] - Whether the removal is for unsplitting.
    * @param {boolean} [options.dontRebuildGrid=false] - Whether to skip rebuilding the grid layout.
-   * @param {boolean} [options.changeTab=true] - Whether to change the selected tab.
+   * @param {boolean} [options.changeTab=undefined] - Whether to change the selected tab. If left unspecified,
+   * change the selected tab only if the current view is the group the removed tab was in.
    */
   removeTabFromGroup(
     tab,
     groupIndex = undefined,
-    { forUnsplit = false, dontRebuildGrid = false, changeTab = true } = {}
+    { forUnsplit = false, dontRebuildGrid = false, changeTab = undefined } = {}
   ) {
     if (typeof groupIndex === "undefined") {
       groupIndex = this._data.findIndex(group => group.tabs.includes(tab));
     }
+
+    if (typeof changeTab === "undefined") {
+      changeTab = groupIndex === this.currentView;
+    }
     // If groupIndex === -1, so `this._data.findIndex` couldn't find the split group
     if (groupIndex < 0) {
       return;

src/zen/sync/ZenSpacesSync.sys.mjs

@@ -139,7 +139,7 @@ export class ZenSpacesSyncEngine extends SyncEngine {
   }
 
   get version() {
-    return 1;
+    return 3;
   }
 
   get syncPriority() {

src/zen/sync/ZenSpacesSyncApplier.sys.mjs

@@ -143,16 +143,23 @@ class nsZenSpacesSyncApplier {
     } else {
       await win.gZenWorkspaces.promiseInitialized;
       this.#maybePlayFirstSyncAnimation(win);
-      const removals = this.#routeTombstones(win, deletions);
+      // A sync apply is a materialization just like session restore,
-      this.#deleteTabs(win, removals.tabs, fail);
+      // so it must stay visually silent (gh-15089).
-      this.#deleteSplits(win, removals.splits, fail);
+      win.gZenFolders._sessionRestoring = true;
-      await this.#applySpaces(win, incoming.spaces, fail);
+      try {
-      await this.#applyFolders(win, incoming.folders, fail);
+        const removals = this.#routeTombstones(win, deletions);
-      this.#applyTabs(win, incoming.tabs, fail);
+        this.#deleteTabs(win, removals.tabs, fail);
-      this.#applySplits(win, incoming.splits, fail);
+        this.#deleteSplits(win, removals.splits, fail);
-      await this.#deleteFolders(win, removals.folders, fail);
+        await this.#applySpaces(win, incoming.spaces, fail);
-      await this.#deleteSpaces(win, removals.spaces, fail);
+        await this.#applyFolders(win, incoming.folders, fail);
-      this.#applyOrdering(win, incoming, fail);
+        this.#applyTabs(win, incoming.tabs, fail);
+        this.#applySplits(win, incoming.splits, fail);
+        await this.#deleteFolders(win, removals.folders, fail);
+        await this.#deleteSpaces(win, removals.spaces, fail);
+        this.#applyOrdering(win, incoming, fail);
+      } finally {
+        delete win.gZenFolders._sessionRestoring;
+      }
       // Collect the session soon so the stored sidebar (and with it the
       // sync projections) reflects the applied state instead of re-uploading
       // the pre-apply one.
@@ -401,9 +408,12 @@ class nsZenSpacesSyncApplier {
     // Parents before children so nesting targets exist.
     const depths = new Map(folders.map(f => [f.key, f.data.parentFolderId]));
     const depthOf = key => {
+      // The seen set only guards against a corrupt parentId cycle.
+      const seen = new Set([key]);
       let depth = 0;
       let parent = depths.get(key);
-      while (parent && depths.has(parent) && depth < 10) {
+      while (parent && depths.has(parent) && !seen.has(parent)) {
+        seen.add(parent);
         depth++;
         parent = depths.get(parent);
       }
@@ -423,6 +433,7 @@ class nsZenSpacesSyncApplier {
             workspaceId:
               data.workspaceUuid || win.gZenWorkspaces.activeWorkspace,
             isLiveFolder: !!data.live,
+            collapsed: true,
           });
         } else if (data.name && folder.label !== data.name) {
           folder.label = data.name;
@@ -543,6 +554,7 @@ class nsZenSpacesSyncApplier {
       skipBackgroundNotify: true,
       lazyTabTitle: data.title || undefined,
       userContextId,
+      skipRoute: true,
     });
     // Setting the sync id before the queued TabOpen handler runs makes
     // window sync treat this tab as already replicated.

src/zen/sync/ZenSpacesSyncModel.sys.mjs

@@ -181,10 +181,18 @@ class nsZenSpacesSyncModel {
     if (!Number.isSafeInteger(id) || id <= 0) {
       return null;
     }
+    const data = this.#data();
+    if (!lazy.ContextualIdentityService.getPublicIdentityFromId(id)) {
+      // A space or tab still pointing at a container that was deleted.
+      if (id in data.containers) {
+        delete data.containers[id];
+        this.#file.saveSoon();
+      }
+      return null;
+    }
     if (id <= BUILTIN_CONTAINER_MAX) {
       return `${BUILTIN_GUID_PREFIX}${id}`;
     }
-    const data = this.#data();
     const existing = data.containers[id];
     if (existing) {
       return existing;
@@ -202,17 +210,27 @@ class nsZenSpacesSyncModel {
     if (typeof guid !== "string" || !guid) {
       return null;
     }
+    const data = this.#data();
+    for (const [id, mapped] of Object.entries(data.containers)) {
+      if (mapped === guid) {
+        const contextId = Number(id);
+        if (lazy.ContextualIdentityService.getPublicIdentityFromId(contextId)) {
+          return contextId;
+        }
+        delete data.containers[id];
+        this.#file.saveSoon();
+        return null;
+      }
+    }
     if (guid.startsWith(BUILTIN_GUID_PREFIX)) {
       const id = Number(guid.slice(BUILTIN_GUID_PREFIX.length));
-      return Number.isSafeInteger(id) && id > 0 && id <= BUILTIN_CONTAINER_MAX
+      return Number.isSafeInteger(id) &&
+        id > 0 &&
+        id <= BUILTIN_CONTAINER_MAX &&
+        lazy.ContextualIdentityService.getPublicIdentityFromId(id)
         ? id
         : null;
     }
-    for (const [id, mapped] of Object.entries(this.#data().containers)) {
-      if (mapped === guid) {
-        return Number(id);
-      }
-    }
     return null;
   }
 
@@ -223,9 +241,6 @@ class nsZenSpacesSyncModel {
    * @param {number} userContextId
    */
   registerContainerGuid(guid, userContextId) {
-    if (guid.startsWith(BUILTIN_GUID_PREFIX)) {
-      return;
-    }
     this.#data().containers[userContextId] = guid;
     this.#file.saveSoon();
   }
@@ -285,66 +300,95 @@ class nsZenSpacesSyncModel {
 
   /**
    * Builds the ordered child id list for one parent (a space's pinned
-   * section or a folder). Tabs and splits are ordered by their position in
+   * section or a folder) from the collected tab list, which is in strip
-   * the collected tab list; folders are spliced in next to their recorded
+   * order.
-   * previous sibling.
    *
-   * @param {object} root0
+   * @param {object} ctx - The projection context.
-   * @param {Array<object>} root0.tabs
+   * @param {{space?: string, folder?: string}} scope
-   * @param {Array<object>} root0.folders
-   * @param {Set<string>} root0.splitIds
-   * @param {Map<string, ?string>} root0.splitParents
-   * @param {Map<string, ?string>} root0.splitWs
-   * @param {object} root0.scope
    */
-  #childSequence({ tabs, folders, splitIds, splitParents, splitWs, scope }) {
+  #childSequence(ctx, scope) {
     const seq = [];
-    const seenSplits = new Set();
+    const seen = new Set();
-    for (const tab of tabs) {
+    const push = id => {
+      if (!seen.has(id)) {
+        seen.add(id);
+        seq.push(id);
+      }
+    };
+    for (const tab of ctx.allTabs) {
       const groupId = tab.groupId || null;
-      if (groupId && splitIds.has(groupId)) {
+      if (!groupId) {
         if (
-          !seenSplits.has(groupId) &&
+          scope.space &&
-          scope.matchSplit(
+          !tab.zenEssential &&
-            splitParents.get(groupId) ?? null,
+          (tab.zenWorkspace || null) === scope.space &&
-            splitWs.get(groupId) ?? null
+          ctx.syncableTabIds.has(tab.zenSyncId)
-          )
         ) {
-          seenSplits.add(groupId);
+          push(tab.zenSyncId);
-          seq.push(groupId);
         }
         continue;
       }
-      if (scope.matchTab(tab, groupId)) {
+      if (scope.folder && groupId === scope.folder) {
-        seq.push(tab.zenSyncId);
+        if (ctx.syncableTabIds.has(tab.zenSyncId)) {
-      }
+          push(tab.zenSyncId);
-    }
+        }
-    for (const folder of folders) {
-      if (!scope.matchFolder(folder)) {
         continue;
       }
-      let index = seq.length;
+      if (ctx.splitIds.has(groupId) || ctx.splitParents.has(groupId)) {
-      const prev = folder.prevSiblingInfo;
+        const parent = ctx.splitParents.get(groupId) ?? null;
-      if (!prev || prev.type === "start") {
+        const isDirect = scope.folder ? parent === scope.folder : !parent;
-        // No stored sibling means the folder is the first child of its
+        if (isDirect) {
-        // container (the section rebuild on startup places content before
+          if (
-        // the fake start element, so the first item has no sibling at all).
+            ctx.splitIds.has(groupId) &&
-        index = 0;
+            (!scope.space || (ctx.splitWs.get(groupId) ?? null) === scope.space)
-      } else if (prev.id) {
+          ) {
-        const at = seq.indexOf(prev.id);
+            push(groupId);
-        if (at !== -1) {
+          }
-          index = at + 1;
+        } else if (parent) {
-        } else if (prev.type === "tab") {
+          const child = this.#scopeChildFolder(ctx, scope, parent);
-          // An unsynced tab sibling (empty placeholders, live folder items)
+          if (child) {
-          // always sits at the start of its container.
+            push(child);
-          index = 0;
+          }
+        }
+        continue;
+      }
+      if (ctx.folderById.has(groupId)) {
+        const child = this.#scopeChildFolder(ctx, scope, groupId);
+        if (child) {
+          push(child);
         }
       }
-      seq.splice(index, 0, folder.id);
     }
     return seq;
   }
 
+  /**
+   * Walks a folder's parent chain up to the direct child of the given
+   * scope, or null when the chain leads somewhere else.
+   *
+   * @param {object} ctx - The projection context.
+   * @param {{space?: string, folder?: string}} scope
+   * @param {string} folderId
+   * @returns {?string}
+   */
+  #scopeChildFolder(ctx, scope, folderId) {
+    // The seen set only guards against a corrupt parentId cycle.
+    const seen = new Set();
+    let current = ctx.folderById.get(folderId);
+    while (current && !seen.has(current.id)) {
+      seen.add(current.id);
+      const parentId = current.parentId || null;
+      if (scope.folder ? parentId === scope.folder : !parentId) {
+        if (scope.space && (current.workspaceId || null) !== scope.space) {
+          return null;
+        }
+        return current.id;
+      }
+      current = parentId ? ctx.folderById.get(parentId) : null;
+    }
+    return null;
+  }
+
   /**
    * Derives the shared projection context from one sidebar collection.
    * Syncable tabs, folders, the syncable splits and their parents and
@@ -353,11 +397,13 @@ class nsZenSpacesSyncModel {
    * @param {object} sidebar
    */
   #projectionContext(sidebar) {
-    const tabs = (sidebar.tabs || []).filter(t => this.#isSyncableTab(t));
+    const allTabs = sidebar.tabs || [];
+    const tabs = allTabs.filter(t => this.#isSyncableTab(t));
     const folders = (sidebar.folders || []).filter(
       f => f?.id && !f.splitViewGroup
     );
     const folderIds = new Set(folders.map(f => f.id));
+    const folderById = new Map(folders.map(f => [f.id, f]));
     const allSplits = (sidebar.splitViewData || []).filter(g => g?.groupId);
     const splitParents = new Map();
     for (const entry of sidebar.folders || []) {
@@ -391,7 +437,18 @@ class nsZenSpacesSyncModel {
       }
       return folderIds.has(groupId) ? groupId : null;
     };
-    return { tabs, folders, splits, splitIds, splitParents, splitWs, folderOf };
+    return {
+      allTabs,
+      tabs,
+      folders,
+      folderById,
+      syncableTabIds,
+      splits,
+      splitIds,
+      splitParents,
+      splitWs,
+      folderOf,
+    };
   }
 
   /**
@@ -437,7 +494,7 @@ class nsZenSpacesSyncModel {
     const map = new Map();
     const pending = new Set();
     const ctx = this.#projectionContext(sidebar);
-    const { tabs, folders, splits, splitIds, splitParents, splitWs } = ctx;
+    const { tabs, folders, splits, splitParents, splitWs } = ctx;
 
     for (const identity of lazy.ContextualIdentityService.getPublicIdentities()) {
       if (!identity.name) {
@@ -476,21 +533,7 @@ class nsZenSpacesSyncModel {
           containerGuid: this.guidForContextId(space.containerTabId, {
             create: true,
           }),
-          children: this.#childSequence({
+          children: this.#childSequence(ctx, { space: uuid }),
-            tabs,
-            folders,
-            splitIds,
-            splitParents,
-            splitWs,
-            scope: {
-              matchTab: (t, groupId) =>
-                !groupId &&
-                !t.zenEssential &&
-                (t.zenWorkspace || null) === uuid,
-              matchSplit: (parent, ws) => !parent && ws === uuid,
-              matchFolder: f => !f.parentId && (f.workspaceId || null) === uuid,
-            },
-          }),
         },
       });
     }
@@ -518,18 +561,7 @@ class nsZenSpacesSyncModel {
           workspaceUuid: folder.workspaceId || null,
           parentFolderId: folder.parentId || null,
           live,
-          children: this.#childSequence({
+          children: this.#childSequence(ctx, { folder: fid }),
-            tabs,
-            folders,
-            splitIds,
-            splitParents,
-            splitWs,
-            scope: {
-              matchTab: (t, groupId) => groupId === fid,
-              matchSplit: parent => parent === fid,
-              matchFolder: f => f.parentId === fid,
-            },
-          }),
         },
       });
     }

src/zen/tabs/zen-tabs/vertical-tabs-topbuttons-fix.css

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
 &:not([zen-compact-animating])
   #zen-sidebar-top-buttons:not(:has(#zen-sidebar-top-buttons-customization-target > *:not(#zen-sidebar-top-buttons-separator), .titlebar-buttonbox-container)) {
   max-height: 0 !important;

src/zen/tabs/zen-tabs/vertical-tabs.css

@@ -100,9 +100,10 @@
     width: -moz-available !important;
   }
 
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
   & #urlbar-container[breakout="true"]:has(#urlbar[zen-floating-urlbar="true"]) {
     --urlbar-container-height: 36px !important;
-    --urlbar-height: 38px !important;
+    --urlbar-height: 36px !important;
   }
 
   & #nav-bar {
@@ -113,6 +114,11 @@
 
   & #zen-sidebar-top-buttons {
     margin: calc(var(--zen-toolbox-padding) / 2) 0;
+
+    &[overflowing] .toolbarbutton-1 {
+      --toolbarbutton-padding-outer: 0px;
+    }
+
     :root[zen-right-side="true"]:not([zen-window-buttons-reversed="true"]) & {
       margin-top: 0;
     }
@@ -283,8 +289,12 @@
 
   --focus-outline-color: transparent;
 
+  @media (-moz-platform: windows) {
+    font-size: 14px;
+  }
+
   @media (-moz-platform: macos) {
-    font-size: 1.25rem; /* Slightly larger font on macOS */
+    font-size: 1.25rem;
   }
 
   --tab-inner-inline-margin: 0;
@@ -319,6 +329,7 @@
       display: none;
     }
 
+    /* stylelint-disable-next-line stylelint-plugin-mozilla/no-has-selector */
     :root:not([zen-renaming-tab="true"])
     #tabbrowser-tabs:not([movingtab])
     &:active:not(:has(.tab-content > image:active)) {
@@ -556,7 +567,7 @@
   }
 
   & #zen-essentials {
-    --tab-min-height: 44px;
+    --tab-min-height: 46px;
   }
 
   &[zen-right-side="true"] {
@@ -592,7 +603,7 @@
       }
 
       &:is([open], [checked]) {
-        background: var(--toolbarbutton-active-background) !important;
+        background: var(--toolbarbutton-background-color-hover) !important;
         & image,
         label {
           background: transparent !important;
@@ -600,7 +611,7 @@
       }
 
       &:hover {
-        background: var(--toolbarbutton-hover-background);
+        background: var(--toolbarbutton-background-color-hover);
         & image,
         label {
           background: transparent !important;
@@ -1147,8 +1158,7 @@
   }
 }
 
-.tabbrowser-tab[zen-essential="true"],
+.tabbrowser-tab[zen-essential="true"] {
-#zen-welcome-initial-essentials-browser-sidebar-essentials .tabbrowser-tab {
   --toolbarbutton-padding-inner: 0;
   max-width: unset;
   width: 100% !important;

src/zen/tests/mochitests/backforward/browser_history_menu.js

@@ -44,7 +44,7 @@ async function openHistoryMenu(useContextMenu) {
 async function testBackForwardMenu(useContextMenu) {
   let tab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
-    // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+    // eslint-disable-next-line sdl/no-insecure-url
     "http://example.com"
   );
 
@@ -90,7 +90,7 @@ async function testBackForwardMenu(useContextMenu) {
     );
 
     let node = popupEvent.target.lastElementChild;
-    // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+    // eslint-disable-next-line sdl/no-insecure-url
     is(node.getAttribute("uri"), "http://example.com/", "'1' item uri");
     is(node.getAttribute("index"), "0", "'1' item index");
     is(
@@ -100,7 +100,7 @@ async function testBackForwardMenu(useContextMenu) {
     );
 
     node = node.previousElementSibling;
-    // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+    // eslint-disable-next-line sdl/no-insecure-url
     is(node.getAttribute("uri"), "http://example.com/2.html", "'2' item uri");
     is(node.getAttribute("index"), "1", "'2' item index");
     is(
@@ -111,7 +111,7 @@ async function testBackForwardMenu(useContextMenu) {
 
     if (iter >= 3) {
       node = node.previousElementSibling;
-      // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+      // eslint-disable-next-line sdl/no-insecure-url
       is(node.getAttribute("uri"), "http://example.com/3.html", "'3' item uri");
       is(node.getAttribute("index"), "2", "'3' item index");
       is(
@@ -133,7 +133,7 @@ async function testBackForwardMenu(useContextMenu) {
     } else {
       let newTabPromise = BrowserTestUtils.waitForNewTab(
         gBrowser,
-        // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+        // eslint-disable-next-line sdl/no-insecure-url
         url => url == "http://example.com/"
       );
 

src/zen/tests/mochitests/caps/browser_principalSerialization_json.js

@@ -88,32 +88,32 @@ add_task(async function test_contentPrincipal() {
   */
   let tests = [
     {
-      // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+      // eslint-disable-next-line sdl/no-insecure-url
       input: { uri: "http://example.com/", OA: {} },
       expected: `{"${contentId}":{"${content}":"http://example.com/"}}`,
     },
     {
-      // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+      // eslint-disable-next-line sdl/no-insecure-url
       input: { uri: "http://mozilla1.com/", OA: {} },
       expected: `{"${contentId}":{"${content}":"http://mozilla1.com/"}}`,
     },
     {
-      // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+      // eslint-disable-next-line sdl/no-insecure-url
       input: { uri: "http://mozilla2.com/", OA: { userContextId: 0 } },
       expected: `{"${contentId}":{"${content}":"http://mozilla2.com/"}}`,
     },
     {
-      // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+      // eslint-disable-next-line sdl/no-insecure-url
       input: { uri: "http://mozilla3.com/", OA: { userContextId: 2 } },
       expected: `{"${contentId}":{"${content}":"http://mozilla3.com/","${suffix}":"^userContextId=2"}}`,
     },
     {
-      // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+      // eslint-disable-next-line sdl/no-insecure-url
       input: { uri: "http://mozilla4.com/", OA: { privateBrowsingId: 1 } },
       expected: `{"${contentId}":{"${content}":"http://mozilla4.com/","${suffix}":"^privateBrowsingId=1"}}`,
     },
     {
-      // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+      // eslint-disable-next-line sdl/no-insecure-url
       input: { uri: "http://mozilla5.com/", OA: { privateBrowsingId: 0 } },
       expected: `{"${contentId}":{"${content}":"http://mozilla5.com/"}}`,
     },

src/zen/tests/mochitests/readermode/browser_bug1780350_readerModeSaveScroll.js

@@ -1,4 +1,4 @@
-/* eslint-disable @microsoft/sdl/no-insecure-url */
+/* eslint-disable sdl/no-insecure-url */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";

src/zen/tests/mochitests/sessionstore/browser.toml

@@ -355,6 +355,7 @@ skip-if = [
 
 ["browser_sizemodeBeforeMinimized.js"]
 skip-if = [
+  "os == 'linux' && os_version == '22.04' && arch == 'x86_64' && opt && nova", # Bug 2057856
   "os == 'win' && os_version == '11.26200' && asan", # Bug 2019745
 ]
 
@@ -436,6 +437,7 @@ disabled="Disabled by import_external_tests.py"
 skip-if = [
   "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 2023967
 ]
+
 ["browser_tab_label_during_restore.js"]
 disabled="Disabled by import_external_tests.py"
 https_first_disabled = true

src/zen/tests/mochitests/sessionstore/browser_bfcache_telemetry.js

@@ -1,44 +1,26 @@
 const URL1 = "data:text/html;charset=utf-8,<body><p>Hello1</p></body>";
 const URL2 = "data:text/html;charset=utf-8,<body><p>Hello2</p></body>";
 
-async function getBFCacheComboTelemetry(probeInParent) {
+async function getBFCacheComboValue(label) {
-  let bfcacheCombo;
+  await Services.fog.testFlushAllChildren();
-  await TestUtils.waitForCondition(() => {
+  return Glean.bfcache.combo[label].testGetValue();
-    let histograms;
-    if (probeInParent) {
-      histograms = Services.telemetry.getSnapshotForHistograms(
-        "main",
-        false /* clear */
-      ).parent;
-    } else {
-      histograms = Services.telemetry.getSnapshotForHistograms(
-        "main",
-        false /* clear */
-      ).content;
-    }
-    bfcacheCombo = histograms.BFCACHE_COMBO;
-    return bfcacheCombo;
-  });
-  return bfcacheCombo;
 }
 
-async function test_bfcache_telemetry(probeInParent) {
+add_task(async () => {
-  Services.telemetry.getHistogramById("BFCACHE_COMBO").clear();
+  await Services.fog.testFlushAllChildren();
+  Services.fog.testResetFOG();
 
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL1);
 
   BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, URL2);
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
-  let bfcacheCombo = await getBFCacheComboTelemetry(probeInParent);
+  await TestUtils.waitForCondition(
+    async () => (await getBFCacheComboValue("BFCache_Success")) !== null,
+    "Waiting for bfcache.combo 'BFCache_Success' to be recorded"
+  );
 
-  is(bfcacheCombo.values[0], 1, "1 bfcache success");
+  is(await getBFCacheComboValue("BFCache_Success"), 1, "1 bfcache success");
 
   gBrowser.removeTab(tab);
-}
-
-add_task(async () => {
-  await test_bfcache_telemetry(
-    Services.prefs.getBoolPref("fission.bfcacheInParent")
-  );
 });

src/zen/tests/mochitests/sessionstore/browser_oldformat.toml

@@ -153,6 +153,7 @@ skip-if = [
 
 ["browser_477657.js"]
 skip-if = [
+  "os == 'linux' && os_version == '22.04' && arch == 'x86_64' && opt && nova", # Bug 2057857
   "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11'", # Bug 1610668
 ]
 
@@ -182,6 +183,9 @@ skip-if = [
 ]
 
 ["browser_524745.js"]
+skip-if = [
+  "os == 'linux' && os_version == '22.04' && arch == 'x86_64' && debug && nova", # Bug 2057858
+]
 
 ["browser_528776.js"]
 

src/zen/tests/mochitests/sessionstore/browser_restored_window_features.js

@@ -8,7 +8,6 @@ const BARPROP_NAMES = [
   "menubar",
   "personalbar",
   "scrollbars",
-  "statusbar",
   "toolbar",
 ];
 
@@ -45,7 +44,6 @@ add_task(async function testRestoredWindowFeatures() {
     menubar: true,
     personalbar: true,
     scrollbars: true,
-    statusbar: true,
     toolbar: true,
   };
   const TESTS = [

src/zen/tests/mochitests/sessionstore/browser_should_restore_tab.js

@@ -18,8 +18,14 @@ async function check_tab_close_notification(openedTab, expectNotification) {
   }
   Services.obs.addObserver(topicObserver, NOTIFY_CLOSED_OBJECTS_CHANGED);
 
+  // (Bug 2058570) Intermittently, the tab state wasn't fully up to date before closing the tab.
+  // This caused test_navigated_about_home to think there was no meaningful history beyond about:home.
+  // Try flushing the tab state and then waiting for a notification if one is expected.
+  let flushedPromise = TabStateFlusher.flush(openedTab.linkedBrowser);
+
   BrowserTestUtils.removeTab(openedTab);
   await tabClosed;
+  await flushedPromise;
   // SessionStore does a setTimeout(notify, 0) to notifyObservers when it handles TabClose
   // We need to wait long enough to be confident the observer would have been notified
   // if it was going to be.

src/zen/tests/mochitests/sessionstore/marionette/test_restore_aiwindow.py

@@ -385,3 +385,64 @@ class TestSmartWindowDefaultManualRestore(
             tab_count,
             msg="Tab count should be preserved after restore",
         )
+
+
+class TestSmartWindowDefaultManualRestoreOverwritesNewTab(
+    SmartWindowDefaultMixin, SessionStoreTestCase
+):
+    """With Smart Window as default (startup.page=1), the startup window opens
+    showing the Smart new tab. Restoring a previously Smart session via
+    "Restore previous session" reuses that startup window (the types match),
+    and the restored tabs must *overwrite* the Smart new tab rather than being
+    appended alongside it."""
+
+    def test_smart_session_restored_overwrites_smart_new_tab(self):
+        self.marionette.execute_script(
+            """
+            Services.prefs.setBoolPref("browser.sessionstore.persist_closed_tabs_between_sessions", true);
+            """
+        )
+
+        self.wait_for_windows(
+            self.all_windows, "Not all requested windows have been opened"
+        )
+
+        # Make the saved session a Smart Window with the 3 content tabs from
+        # setUp (Tab 1/2/3), which are real pages, not the Smart new tab.
+        self.toggle_ai_window(True)
+        self.assertTrue(
+            self.is_ai_window(), msg="Window should be Smart before the restart"
+        )
+        tab_count = self.get_tab_count()
+        self.assertEqual(tab_count, 3, msg="Saved session should have 3 tabs")
+
+        self.marionette.quit()
+        self.marionette.start_session()
+        self.marionette.set_context("chrome")
+
+        # The new startup window opens Smart (Smart Window is the default) and
+        # shows a single Smart new tab.
+        self.assertTrue(
+            self.is_ai_window(),
+            msg="Startup window should open Smart when Smart Window is the default",
+        )
+
+        self.restore_last_session()
+
+        self.assertEqual(
+            len(self.marionette.chrome_window_handles),
+            1,
+            msg="Smart session should restore into the existing startup window",
+        )
+        self.assertTrue(
+            self.is_ai_window(),
+            msg="Restored window should stay Smart",
+        )
+
+        # Asserts if Smart new tab was overwritten, not appended to.
+        self.assertEqual(
+            self.get_tab_count(),
+            tab_count,
+            msg="Restored tabs should overwrite the Smart new tab, not be "
+            "appended alongside it",
+        )

src/zen/tests/mochitests/shell/unit/test_isOneClickSetDefaultEnabled.js

@@ -0,0 +1,174 @@
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+ChromeUtils.defineESModuleGetters(this, {
+  ShellService: "moz-src:///browser/components/shell/ShellService.sys.mjs",
+  sinon: "resource://testing-common/Sinon.sys.mjs",
+});
+
+const USER_CHOICE_PREF = "browser.shell.setDefaultBrowserUserChoice";
+const REG_RENAME_PREF = "browser.shell.setDefaultBrowserUserChoice.regRename";
+
+function mockNativeShellService(overrides) {
+  const mock = {
+    QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowsShellService]),
+    checkAllProgIDsExist: () => true,
+    checkBrowserUserChoiceHashes: () => true,
+    isDefaultBrowser: () => false,
+    isUserChoiceProtectionDriverRunning: () => false,
+    canRenameUserChoiceAssociationKey: sinon.stub().returns(false),
+    ...overrides,
+  };
+  sinon.stub(ShellService, "shellService").value(mock);
+  return mock;
+}
+
+registerCleanupFunction(() => {
+  sinon.restore();
+  Services.prefs.clearUserPref(USER_CHOICE_PREF);
+  Services.prefs.clearUserPref(REG_RENAME_PREF);
+});
+
+add_task(function test_pref_disabled() {
+  Services.prefs.setBoolPref(USER_CHOICE_PREF, false);
+  const native = mockNativeShellService({
+    checkAllProgIDsExist: () => {
+      Assert.ok(
+        false,
+        "Should not check capability when the user choice pref is off"
+      );
+      return true;
+    },
+  });
+
+  Assert.strictEqual(
+    ShellService.isOneClickSetDefaultEnabled(),
+    false,
+    "Should be false when the user choice pref is disabled, regardless of capability"
+  );
+  Assert.ok(
+    native.canRenameUserChoiceAssociationKey.notCalled,
+    "Should not probe the registry when the user choice pref is off"
+  );
+
+  sinon.restore();
+});
+
+add_task(function test_user_choice_impossible() {
+  Services.prefs.setBoolPref(USER_CHOICE_PREF, true);
+  const native = mockNativeShellService({
+    checkBrowserUserChoiceHashes: () => false,
+  });
+
+  Assert.strictEqual(
+    ShellService.isOneClickSetDefaultEnabled(),
+    false,
+    "Should be false when the existing UserChoice hashes can't be reproduced"
+  );
+  Assert.ok(
+    native.canRenameUserChoiceAssociationKey.notCalled,
+    "Should not probe the registry when a UserChoice write can't succeed anyway"
+  );
+
+  sinon.restore();
+});
+
+add_task(function test_ucpd_not_running() {
+  Services.prefs.setBoolPref(USER_CHOICE_PREF, true);
+  const native = mockNativeShellService({
+    isUserChoiceProtectionDriverRunning: () => false,
+  });
+
+  Assert.strictEqual(
+    ShellService.isOneClickSetDefaultEnabled(),
+    true,
+    "Should be true when UCPD isn't running to lock the UserChoice keys"
+  );
+  Assert.ok(
+    native.canRenameUserChoiceAssociationKey.notCalled,
+    "Should not probe the registry when UCPD isn't running"
+  );
+
+  sinon.restore();
+});
+
+add_task(function test_already_default_skips_probe() {
+  Services.prefs.setBoolPref(USER_CHOICE_PREF, true);
+  const native = mockNativeShellService({
+    isUserChoiceProtectionDriverRunning: () => true,
+    isDefaultBrowser: () => true,
+  });
+
+  Assert.strictEqual(
+    ShellService.isOneClickSetDefaultEnabled(),
+    true,
+    "Should be true without probing when Firefox is already the default"
+  );
+  Assert.ok(
+    native.canRenameUserChoiceAssociationKey.notCalled,
+    "Should not probe the registry when Firefox is already the default"
+  );
+
+  sinon.restore();
+});
+
+add_task(function test_ucpd_running_rename_blocked() {
+  Services.prefs.setBoolPref(USER_CHOICE_PREF, true);
+  const native = mockNativeShellService({
+    isUserChoiceProtectionDriverRunning: () => true,
+    canRenameUserChoiceAssociationKey: sinon.stub().returns(false),
+  });
+
+  Assert.strictEqual(
+    ShellService.isOneClickSetDefaultEnabled(),
+    false,
+    "Should be false when UCPD is running and blocks the registry rename"
+  );
+  Assert.ok(
+    native.canRenameUserChoiceAssociationKey.calledOnceWith("http"),
+    "Should probe the http association"
+  );
+
+  sinon.restore();
+});
+
+add_task(function test_ucpd_running_rename_permitted() {
+  Services.prefs.setBoolPref(USER_CHOICE_PREF, true);
+  mockNativeShellService({
+    isUserChoiceProtectionDriverRunning: () => true,
+    canRenameUserChoiceAssociationKey: sinon.stub().returns(true),
+  });
+
+  Assert.strictEqual(
+    ShellService.isOneClickSetDefaultEnabled(),
+    true,
+    "Should be true when UCPD is running but permits the registry rename"
+  );
+
+  sinon.restore();
+});
+
+add_task(function test_reg_rename_disabled() {
+  Services.prefs.setBoolPref(USER_CHOICE_PREF, true);
+  Services.prefs.setBoolPref(REG_RENAME_PREF, false);
+  const native = mockNativeShellService({
+    isUserChoiceProtectionDriverRunning: () => true,
+    canRenameUserChoiceAssociationKey: sinon.stub().returns(true),
+  });
+
+  Assert.strictEqual(
+    ShellService.isOneClickSetDefaultEnabled(),
+    false,
+    "Should be false when the rename pref is false, as renaming is the only " +
+      "way to reach a locked UserChoice key"
+  );
+  Assert.ok(
+    native.canRenameUserChoiceAssociationKey.notCalled,
+    "Should not probe the registry when a successful rename wouldn't be used"
+  );
+
+  sinon.restore();
+  Services.prefs.clearUserPref(REG_RENAME_PREF);
+});

src/zen/tests/mochitests/shell/unit/test_taskbarPinningPolicy.js

@@ -0,0 +1,166 @@
+/* Any copyright is dedicated to the Public Domain.
+ * https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const { MockRegistry } = ChromeUtils.importESModule(
+  "resource://testing-common/MockRegistry.sys.mjs"
+);
+
+const EXPLORER_POLICY_KEY = String.raw`Software\Policies\Microsoft\Windows\Explorer`;
+const POLICY_LOG_PREFIX = "Pinning disabled by policy";
+
+const HIVES = {
+  HKCU: Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
+  HKLM: Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
+};
+const POLICIES = ["NoPinningToTaskbar", "TaskbarNoPinnedList"];
+
+const shellService = Cc["@mozilla.org/browser/shell-service;1"].getService(
+  Ci.nsIWindowsShellService
+);
+
+let gRegistry;
+let gLogFile;
+
+add_setup(async function () {
+  // The pinning policy diagnostic only reaches MOZ_LOG, never the console
+  // service, so route the module to a file and read it back.
+  // logging.config.sync flushes each line, so the message is on disk by the
+  // time canPinToTaskbar() returns.
+  const logBase = PathUtils.join(
+    do_get_profile().path,
+    "taskbar_policy_test.log"
+  );
+  gLogFile = `${logBase}-main.${Services.appinfo.processID}.moz_log`;
+
+  Services.prefs.setBoolPref("logging.config.sync", true);
+  Services.prefs.setCharPref("logging.config.LOG_FILE", logBase);
+  Services.prefs.setIntPref("logging.shell_windows::taskbar", 3);
+
+  gRegistry = new MockRegistry();
+
+  registerCleanupFunction(async () => {
+    gRegistry.shutdown();
+    Services.prefs.clearUserPref("logging.shell_windows::taskbar");
+    Services.prefs.clearUserPref("logging.config.LOG_FILE");
+    Services.prefs.clearUserPref("logging.config.sync");
+    await IOUtils.remove(gLogFile, { ignoreAbsent: true });
+  });
+});
+
+async function readLog() {
+  if (!(await IOUtils.exists(gLogFile))) {
+    return "";
+  }
+  return IOUtils.readUTF8(gLogFile);
+}
+
+function clearPolicies() {
+  for (const root of Object.values(HIVES)) {
+    for (const policy of POLICIES) {
+      gRegistry.setValue(root, EXPLORER_POLICY_KEY, policy, null);
+    }
+  }
+}
+
+function setPolicy(hive, policy, value) {
+  clearPolicies();
+  gRegistry.setValue(
+    HIVES[hive],
+    EXPLORER_POLICY_KEY,
+    policy,
+    value,
+    Ci.nsIWindowsRegKey.TYPE_INT
+  );
+}
+
+// Calls canPinToTaskbar and returns what it threw (if anything) along with the
+// log output it produced. The log file accumulates across tasks, so only the
+// appended portion is returned.
+async function callCanPinToTaskbar() {
+  const offset = (await readLog()).length;
+
+  let error = null;
+  try {
+    shellService.canPinToTaskbar();
+  } catch (e) {
+    error = e;
+  }
+
+  let log = (await readLog()).slice(offset);
+
+  return { error, log };
+}
+
+// Set of hive/group policy combinations known to block pinning.
+const BLOCKING_POLICIES = [
+  ["HKCU", "NoPinningToTaskbar"],
+  ["HKCU", "TaskbarNoPinnedList"],
+  ["HKLM", "TaskbarNoPinnedList"],
+];
+
+add_task(async function test_policiesBlockPinning() {
+  for (const [hive, policy] of BLOCKING_POLICIES) {
+    info(`Testing ${policy} in ${hive}`);
+    setPolicy(hive, policy, 1);
+
+    const { error, log } = await callCanPinToTaskbar();
+
+    Assert.equal(
+      error?.result,
+      Cr.NS_ERROR_NOT_AVAILABLE,
+      `canPinToTaskbar threw NS_ERROR_NOT_AVAILABLE for ${policy} in ${hive}`
+    );
+    Assert.stringContains(
+      log,
+      `${POLICY_LOG_PREFIX} ${policy} in hive ${hive}.`,
+      `The blocking policy ${policy} in ${hive} was logged`
+    );
+  }
+});
+
+// Policies that apply in other hives, but not the ones paired here.
+const INVALID_HIVE_FOR_POLICY = [["HKLM", "NoPinningToTaskbar"]];
+
+add_task(async function test_invalidPoliciesDoNotBlockPinning() {
+  for (const [hive, policy] of INVALID_HIVE_FOR_POLICY) {
+    info(`Testing ${policy} in ${hive}`);
+    setPolicy(hive, policy, 1);
+
+    // Whether pinning is actually available depends on the host machine, so only
+    // the absence of the policy diagnostic is asserted here.
+    const { log } = await callCanPinToTaskbar();
+
+    Assert.ok(
+      !log.includes(POLICY_LOG_PREFIX),
+      `The policy ${policy} in ${hive} is invalid and should not block pinning`
+    );
+  }
+});
+
+add_task(async function test_policySetToZeroDoesNotBlockPinning() {
+  setPolicy("HKCU", "NoPinningToTaskbar", 0);
+
+  // Whether pinning is actually available depends on the host machine, so only
+  // the absence of the policy diagnostic is asserted here.
+  const { log } = await callCanPinToTaskbar();
+
+  Assert.ok(
+    !log.includes(POLICY_LOG_PREFIX),
+    "A policy present but set to zero does not block pinning"
+  );
+});
+
+add_task(async function test_noPoliciesSet() {
+  clearPolicies();
+
+  // Whether pinning is actually available depends on the host machine, so only
+  // the absence of the policy diagnostic is asserted here.
+  const { log } = await callCanPinToTaskbar();
+
+  Assert.ok(
+    !log.includes(POLICY_LOG_PREFIX),
+    "No policy is reported when none are set"
+  );
+});

src/zen/tests/mochitests/shell/unit/xpcshell.toml

@@ -30,6 +30,11 @@ support-files = [
 ]
 tags = ["portal"]
 
+["test_isOneClickSetDefaultEnabled.js"]
+run-if = [
+  "os == 'win'",
+]
+
 ["test_linuxDesktopEntry.js"]
 run-if = [
   "os == 'linux'",
@@ -45,6 +50,11 @@ run-if = [
   "os == 'win'"
 ]
 
+["test_taskbarPinningPolicy.js"]
+run-if = [
+  "os == 'win'",
+]
+
 ["test_writeShortcutIcon.js"]
 run-if = [
   "os == 'win'",

src/zen/tests/mochitests/sync/head_helpers.js

@@ -97,7 +97,10 @@ function loadWebExtensionTestFunctions() {
   const path = webExtensionsTestPath("/head_sync.js");
   let file = do_get_file(path);
   let uri = Services.io.newFileURI(file);
-  Services.scriptloader.loadSubScript(uri.spec, gGlobalScope);
+  Services.scriptloader.loadSubScriptWithOptions(uri.spec, {
+    target: gGlobalScope,
+    allowUnsafeURL: true,
+  });
 }
 
 /**

src/zen/tests/mochitests/sync/test_resource.js

@@ -47,10 +47,10 @@ function server_404(metadata, response) {
   response.bodyOutputStream.write(body, body.length);
 }
 
-var pacFetched = false;
+var pacFetched;
 function server_pac(metadata, response) {
   _("Invoked PAC handler.");
-  pacFetched = true;
+  pacFetched.resolve();
   let body = 'function FindProxyForURL(url, host) { return "DIRECT"; }';
   response.setStatusLine(metadata.httpVersion, 200, "OK");
   response.setHeader(
@@ -189,12 +189,13 @@ add_task(async function test_proxy_auth_redirect() {
 
   PACSystemSettings.PACURI = server.baseURI + "/pac2";
   installFakePAC();
+  pacFetched = Promise.withResolvers();
   let res = new Resource(server.baseURI + "/open");
   let result = await res.get();
-  Assert.ok(pacFetched);
+  await pacFetched.promise;
   Assert.ok(fetched);
   Assert.equal("This path exists", result.data);
-  pacFetched = fetched = false;
+  fetched = false;
   uninstallFakePAC();
   await promiseStopServer(server);
 });

src/zen/tests/mochitests/tabMediaIndicator/browser.toml

@@ -45,6 +45,8 @@ https_first_disabled = true
 
 ["browser_sound_indicator_silent_video.js"]
 
+["browser_sound_indicator_tab_move.js"]
+
 ["browser_webAudio_hideSoundPlayingIcon.js"]
 
 ["browser_webAudio_silentData.js"]

src/zen/tests/mochitests/tabMediaIndicator/browser_mediaplayback_audibility_change.js

@@ -179,31 +179,6 @@ add_task(async function testSoundIndicatorWhenChangingMediaVolume() {
 /**
  * Following are helper functions
  */
-function initMediaPlaybackDocument(
-  tab,
-  fileName,
-  { preload, createVideo, muted = false, volume = 1.0 } = {}
-) {
-  return SpecialPowers.spawn(
-    tab.linkedBrowser,
-    [fileName, preload, createVideo, muted, volume],
-    // eslint-disable-next-line no-shadow
-    async (fileName, preload, createVideo, muted, volume) => {
-      if (createVideo) {
-        content.media = content.document.createElement("video");
-      } else {
-        content.media = content.document.createElement("audio");
-      }
-      if (preload) {
-        content.media.preload = preload;
-      }
-      content.media.muted = muted;
-      content.media.volume = volume;
-      content.media.src = fileName;
-    }
-  );
-}
-
 function initMediaStreamPlaybackDocument(tab) {
   return SpecialPowers.spawn(tab.linkedBrowser, [], async _ => {
     content.media = content.document.createElement("audio");
@@ -212,26 +187,6 @@ function initMediaStreamPlaybackDocument(tab) {
   });
 }
 
-function playMedia(tab, { resolveOnTimeupdate } = {}) {
-  return SpecialPowers.spawn(
-    tab.linkedBrowser,
-    [resolveOnTimeupdate],
-    // eslint-disable-next-line no-shadow
-    async resolveOnTimeupdate => {
-      await content.media.play();
-      if (resolveOnTimeupdate) {
-        await new Promise(r => (content.media.ontimeupdate = r));
-      }
-    }
-  );
-}
-
-function pauseMedia(tab) {
-  return SpecialPowers.spawn(tab.linkedBrowser, [], async _ => {
-    content.media.pause();
-  });
-}
-
 function assignNewSourceForAudio(tab, fileName) {
   // eslint-disable-next-line no-shadow
   return SpecialPowers.spawn(tab.linkedBrowser, [fileName], async fileName => {