fix(sign.ps1): add verbose and debug output to artifact unzipping process

fix(download-language-packs.sh): remove carriage returns from supported languages file

.github/workflows/build.yml

@@ -645,7 +645,7 @@ jobs:
           pwd
           ls .
           ls ..
-          mv releases.xml ./build/flatpak/app.zen_browser.zen.metainfo.xml
+          mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml
           # output the version to the file
           echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
 
@@ -707,7 +707,7 @@ jobs:
             --linux-archive zen.linux-x86_64.tar.xz \
             --linux-aarch64-archive zen.linux-aarch64.tar.xz \
             --output app.zen_browser.zen.yml \
-            --template-root ./zen-browser/flatpak
+            --template-root ./zen-browser/build/flatpak
 
       - name: Commit changes
         run: |

.github/workflows/twilight-release-schedule.yml

@@ -14,7 +14,7 @@ on:
         description: 'Use sccache'
         required: false
         type: boolean
-        default: true
+        default: false
 
 jobs:
   twilight-release-schedule:

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

@@ -65,7 +65,7 @@ jobs:
       - name: Setup
         run: |
           (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
-          C:\MozillaBuildSetup-Latest.exe /S
+          C:\MozillaBuildSetup-Latest.exe /S | out-null
 
       - name: Download Firefox and dependencies
         if: ${{ matrix.arch == 'x86_64' }}
@@ -82,15 +82,16 @@ jobs:
       - name: Generate
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
+          ls
           $Env:USE_MINTTY = "0"
           $workspace_dir_current = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\", "/"
           $workspace_dir = $workspace_dir_current + "/engine"
+          echo $workspace_dir
           echo "cd $workspace_dir" '' >> mozilla-build-run.sh
           echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
           echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
           echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
-          echo 'Running Profile Build:'
-          C:\mozilla-build\start-shell.bat mozilla-build-run.sh
+          C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
 
       - name: Move profile data
         if: ${{ matrix.arch == 'x86_64' }}

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

@@ -280,21 +280,24 @@ jobs:
         if: ${{ !inputs.generate-gpo }}
         run: |
           set -x
-          if test "${{ matrix.arch }}" = "aarch64"; then
-            find engine/obj-aarch64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
-            find engine/obj-aarch64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
-          else
-            find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
-            find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
-          fi
+          mkdir obj-${{ matrix.arch }}-pc-windows-msvc/
+
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/_tests
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/config/autoconf.mk
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/config.statusd/substs/
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/dist/install
+
+          find engine/obj-${{ matrix.arch }}-pc-windows-msvc/dist -maxdepth 1 -type f -name "*.zip" -delete
+
+          cp -r --no-dereference engine/obj-${{ matrix.arch }}-pc-windows-msvc/* obj-${{ matrix.arch }}-pc-windows-msvc/ || true
 
       - name: Upload dist object
         if: ${{ !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          retention-days: 5
+          retention-days: 2
           name: windows-x64-obj-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
-          path: engine/obj-${{ matrix.arch == 'aarch64' && 'aarch64' || 'x86_64' }}-pc-windows-msvc/
+          path: obj-${{ matrix.arch }}-pc-windows-msvc
 
       - name: Upload artifact (if Twilight branch, binary)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}

README.md

@@ -28,9 +28,9 @@
 
 ## 🖥️ Compatibility
 
-Zen is currently built using Firefox version `136.0.2`! 🚀
+Zen is currently built using Firefox version `137.0.1`! 🚀
 
-- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 136.0`!
+- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `137.0.1`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
 - Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
 

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

@@ -1 +1 @@
-e834aca3620253ea774e85826e43dd55e0c4f8b2
+01c20afaa6fe914ff4f083689b8d234c1ba76961

build/flatpak/app.zen_browser.zen.yml.template

@@ -49,6 +49,12 @@ modules:
         strip-components: 0
         only-arches:
           - x86_64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-x86_64.tar.xz") | .browser_download_url
+          is-main-source: true
 
       - type: archive
         url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-aarch64.tar.xz
@@ -56,6 +62,12 @@ modules:
         strip-components: 0
         only-arches:
           - aarch64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-aarch64.tar.xz") | .browser_download_url
+          is-main-source: true
 
       - type: archive
         url: https://github.com/zen-browser/flatpak/releases/download/{version}/archive.tar

build/winsign/bootstrap.ps1

@@ -0,0 +1,7 @@
+(New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
+C:\MozillaBuildSetup-Latest.exe /S | out-null
+
+rustup target add aarch64-pc-windows-msvc
+rustup target add x86_64-pc-windows-msvc
+
+cp -r tests engine/browser/base/zen-components/

build/winsign/sign.ps1

@@ -6,7 +6,7 @@ param(
 $ErrorActionPreference = "Stop"
 
 echo "Preparing environment"
-git pull --recurse-submodules
+git pull --recurse
 mkdir windsign-temp -ErrorAction SilentlyContinue
 
 # Download in parallel
@@ -19,40 +19,140 @@ mkdir windsign-temp -ErrorAction SilentlyContinue
 #    echo "Downloaded git objects repo to"
 #} -Verbose -ArgumentList $PWD -Debug
 
-gh run download $GithubRunId --name windows-x64-obj-arm64 -D windsign-temp\windows-x64-obj-arm64
-echo "Downloaded arm64 artifacts"
-gh run download $GithubRunId --name windows-x64-obj-x86_64 -D windsign-temp\windows-x64-obj-x86_64
-echo "Downloaded x86_64 artifacts"
+Start-Job -Name "DownloadGitl10n" -ScriptBlock {
+    param($PWD)
+    cd $PWD
+    $env:ZEN_L10N_CURR_DIR=[regex]::replace($PWD, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\", "/"
+    C:\mozilla-build\start-shell.bat $PWD\scripts\download-language-packs.sh
+    echo "Fetched l10n and firefox's one"
+} -Verbose -ArgumentList $PWD -Debug
 
+Start-Job -Name "SurferInit" -ScriptBlock {
+    param($PWD)
+    cd $PWD
+    surfer -- ci --brand release
+    npm run import -- --verbose
+} -Verbose -ArgumentList $PWD -Debug
 
-#Wait-Job -Name "DownloadGitObjectsRepo"
+echo "Downloading artifacts info"
+$artifactsInfo=gh api repos/zen-browser/desktop/actions/runs/$GithubRunId/artifacts
+$token = gh auth token
+
+function New-TemporaryDirectory {
+    $tmp = [System.IO.Path]::GetTempPath() # Not $env:TEMP, see https://stackoverflow.com/a/946017
+    $name = (New-Guid).ToString("N")
+    New-Item -ItemType Directory -Path (Join-Path $tmp $name)
+}
+
+function DownloadFile($url, $targetFile) {
+   $uri = New-Object "System.Uri" "$url"
+   $request = [System.Net.HttpWebRequest]::Create($uri)
+   $request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"
+   $request.Headers.Add("Authorization", "Bearer $token")
+   $request.set_Timeout(15000) #15 second timeout
+   $response = $request.GetResponse()
+   $totalLength = [System.Math]::Floor($response.get_ContentLength()/1024)
+   $responseStream = $response.GetResponseStream()
+   $targetStream = New-Object -TypeName System.IO.FileStream -ArgumentList $targetFile, Create
+   $buffer = new-object byte[] 10KB
+   $count = $responseStream.Read($buffer,0,$buffer.length)
+   $downloadedBytes = $count
+
+    while ($count -gt 0) {
+        $targetStream.Write($buffer, 0, $count)
+        $count = $responseStream.Read($buffer,0,$buffer.length)
+        $downloadedBytes = $downloadedBytes + $count
+        Write-Progress -activity "Downloading file '$($url.split('/') | Select -Last 1)'" -status "Downloaded ($([System.Math]::Floor($downloadedBytes/1024))K of $($totalLength)K): " -PercentComplete ((([System.Math]::Floor($downloadedBytes/1024)) / $totalLength)  * 100)
+    }
+
+   Write-Progress -activity "Finished downloading file '$($url.split('/') | Select -Last 1)'"
+
+   $targetStream.Flush()
+   $targetStream.Close()
+   $targetStream.Dispose()
+   $responseStream.Dispose()
+}
+
+function DownloadArtifacts($name) {
+    echo "Downloading artifacts for $name"
+    $artifactUrl=$($artifactsInfo | jq -r --arg NAME "windows-x64-obj-$name" '.artifacts[] | select(.name == $NAME) | .archive_download_url')
+    echo "Artifact URL: $artifactUrl"
+
+    # download the artifact
+    $outputPath="$PWD\windsign-temp\windows-x64-obj-$name"
+    $tempDir = New-TemporaryDirectory
+    $tempFile = Join-Path $tempDir "artifact-$($name).zip"
+
+    echo "Downloading artifact to $tempFile"
+    DownloadFile $artifactUrl $tempFile
+    
+    Start-Job -Name "UnzipArtifact$name" -ScriptBlock {
+        param($tempFile, $outputPath)
+        echo "Unzipping artifact to $outputPath"
+        Expand-Archive -Path $tempFile -DestinationPath $outputPath -Force
+        echo "Unzipped artifact to $outputPath"
+    } -ArgumentList $tempFile, $outputPath -Verbose -Debug
+}
+
+DownloadArtifacts arm64
+DownloadArtifacts x86_64
+
+# Wait for the jobs to finish
+Wait-Job -Name "UnzipArtifactarm64"
+Wait-Job -Name "UnzipArtifactx86_64"
 
 mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
 
-npm run surfer -- ci --brand release
+# Collect all .exe and .dll files into a list
+$files = Get-ChildItem windsign-temp\windows-x64-obj-x86_64\ -Recurse -Include *.exe
+$files += Get-ChildItem windsign-temp\windows-x64-obj-x86_64\ -Recurse -Include *.dll
+
+$files += Get-ChildItem windsign-temp\windows-x64-obj-arm64\ -Recurse -Include *.exe
+$files += Get-ChildItem windsign-temp\windows-x64-obj-arm64\ -Recurse -Include *.dll
+
+signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
+
+$env:ZEN_RELEASE="true"
+$env:SURFER_SIGNING_MODE="true"
+Wait-Job -Name "SurferInit"
+Wait-Job -Name "DownloadGitl10n"
 
 function SignAndPackage($name) {
     echo "Executing on $name"
     rmdir .\dist -Recurse -ErrorAction SilentlyContinue
-    rmdir engine\obj-x86_64-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
-    cp windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\ -Recurse
-    echo "Signing $name"
+    rmdir engine\obj-$name-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+    $objName=$name
+    # instead of arm, use aarch64
+    if ($name -eq "arm64") {
+        $objName="aarch64"
+    }
 
-    # Collect all .exe and .dll files into a list
-    $files = Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.exe
-    $files += Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.dll
+    echo "Removing old obj dir"
+    rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+    
+    echo "Creating new obj dir"
+    cp windsign-temp\windows-x64-obj-$name engine\obj-$objName-pc-windows-msvc\ -Recurse
 
-    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
-    echo "Packaging $name"
-    $env:SURFER_SIGNING_MODE="sign"
-    $env:MAR="$PWD\\build\\winsign\\mar.exe"
+    echo "Copying setup.exe into obj dir"
+    $env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe"
+
+    $env:MAR="..\\build\\winsign\\mar.exe"
     if ($name -eq "arm64") {
         $env:SURFER_COMPAT="aarch64"
     } else {
         $env:SURFER_COMPAT="x86_64"
     }
-
     echo "Compat Mode? $env:SURFER_COMPAT"
+
+    # Configure each time since we are cloning from a linux environment into
+    # a windows environment, and the build system is not smart enough to detect that
+    # we are on a different platform.
+    cd .\engine
+    echo "Configuring for $name"
+    .\mach configure
+    cd ..
+
+    echo "Packaging $name"
     npm run package -- --verbose
 
     # In the release script, we do the following:
@@ -62,7 +162,6 @@ function SignAndPackage($name) {
     #  - update_manifest/*
     #  - windows.mar
     #  - zen.installer.exe
-    #  - zen.win-x86_64.zip
     echo "Creating tar for $name"
     rm .\windsign-temp\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
     mkdir windsign-temp\windows-x64-signed-$name
@@ -83,30 +182,13 @@ function SignAndPackage($name) {
         mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer.exe
     }
 
-    # Move the zip
-    echo "Moving zip for $name"
-    if ($name -eq "arm64") {
-        mv (Get-Item .\dist\*.en-US.win64-aarch64.zip) windsign-temp\windows-x64-signed-$name\zen.win-arm64.zip
-    } else {
-        mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
-    }
-
-    # Extract the zip, sign everything inside, and repackage it
-    Expand-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name.zip -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name
-    rm windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
-    $files = Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.exe
-    $files += Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.dll
-    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
-    Compress-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
-    rmdir windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -ErrorAction SilentlyContinue
-
     # Move the manifest
     mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest
 
-    echo "Invoking tar for $name"
     # note: We need to sign it into a parent folder, called windows-x64-signed-$name
     rmdir .\windsign-temp\windows-binaries\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
     mv windsign-temp\windows-x64-signed-$name .\windsign-temp\windows-binaries -Force
+    rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
 
     echo "Finished $name"
 }
@@ -114,6 +196,9 @@ function SignAndPackage($name) {
 SignAndPackage arm64
 SignAndPackage x86_64
 
+$files = Get-ChildItem .\windsign-temp\windows-binaries -Recurse -Include *.exe
+signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
+
 echo "All artifacts signed and packaged, ready for release!"
 echo "Commiting the changes to the repository"
 cd windsign-temp\windows-binaries

package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MPL-2.0",
       "dependencies": {
-        "@zen-browser/surfer": "^1.11.6"
+        "@zen-browser/surfer": "^1.11.7"
       },
       "devDependencies": {
         "husky": "^9.1.7",
@@ -288,9 +288,10 @@
       "license": "MIT"
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.6.tgz",
-      "integrity": "sha512-oKYjpNTPZV3vRxDf7r7pkvYlyNwL8cpsVbVzlb57xCwn7lamXsUioh1mLCSounJ+8cl8bWXhezrnXKXbVjyGww==",
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.7.tgz",
+      "integrity": "sha512-ltIjDwPiSKmnKYjlTtD307t5h9+igi7YZu3pNlFl0SgvmTGRv9Ayit6CPllN5HGaMoI9jftOSeAaeFX2uRG4Yg==",
+      "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
         "async-icns": "^1.0.2",

package.json

@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/zen-browser/desktop#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.11.6"
+    "@zen-browser/surfer": "^1.11.7"
   },
   "devDependencies": {
     "husky": "^9.1.7",

scripts/download-language-packs.sh

@@ -1,4 +1,12 @@
-set -ex
+set -x
+
+if ! [ -z "$ZEN_L10N_CURR_DIR" ]; then
+  cd $ZEN_L10N_CURR_DIR
+fi
+
+# remove "\r" from ./l10n/supported-languages
+# note: it's fine if it fails
+sed -i 's/\r$//' ./l10n/supported-languages
 
 CURRENT_DIR=$(pwd)
 
@@ -17,6 +25,16 @@ cd firefox-l10n
 git checkout $LAST_FIREFOX_L10N_COMMIT
 cd $CURRENT_DIR
 
+rsyncExists=$(command -v rsync)
+
+if [ -z "$rsyncExists" ]; then
+  echo "rsync not found, using cp instead"
+else
+  echo "rsync found!"
+fi
+
+set -e
+
 update_language() {
   langId=$1
   cd ./l10n
@@ -24,7 +42,13 @@ update_language() {
 
   echo "Updating $langId"
   # move the contents from ../firefox-l10n/$langId to ./l10n/$langId
-  rsync -av --progress ../firefox-l10n/$langId/ . --exclude .git
+  # if rsync exists, use it
+  # if not, use cp
+  if [ -z "$rsyncExists" ]; then
+    cp -r $CURRENT_DIR/l10n/firefox-l10n/$langId/* .
+  else
+    rsync -av --progress ../firefox-l10n/$langId/ . --exclude .git
+  fi
 
   cd $CURRENT_DIR
 }

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

@@ -0,0 +1,12 @@
+diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
+index be66de4a1ef044341c2e1d6953806550897df45a..ff6ef3511076b25e00ca4d0189f666ec7aa94fe8 100644
+--- a/browser/actors/WebRTCParent.sys.mjs
++++ b/browser/actors/WebRTCParent.sys.mjs
+@@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {
+ 
+     let tabbrowser = browser.ownerGlobal.gBrowser;
+     if (tabbrowser) {
++      browser.ownerGlobal.gZenMediaController.updateMediaSharing(state);
+       tabbrowser.updateBrowserSharing(browser, {
+         webRTC: state,
+       });

src/browser/app/profile/zen-browser.js

@@ -380,6 +380,11 @@ pref('widget.macos.titlebar-blend-mode.behind-window', true);
 pref('zen.widget.macos.window-material', 3);
 #endif
 
+// Enable transparent background for linux
+#ifdef MOZ_WIDGET_GTK
+pref('zen.widget.linux.transparency', false);
+#endif
+
 // Urlbar and autocomplete
 pref("browser.urlbar.maxRichResults", 6);
 pref("browser.urlbar.trimHttps", true);

src/browser/base/content/ZenStartup.mjs

@@ -30,7 +30,6 @@
 
         this._initSidebarScrolling();
 
-        gZenCompactModeManager.init();
         ZenWorkspaces.init();
         gZenVerticalTabsManager.init();
         gZenUIManager.init();
@@ -41,7 +40,34 @@
       } catch (e) {
         console.error('ZenThemeModifier: Error initializing browser layout', e);
       }
-      ZenWorkspaces.promiseInitialized.then(() => {
+      if (gBrowserInit.delayedStartupFinished) {
+        this.delayedStartupFinished();
+      } else {
+        Services.obs.addObserver(this, 'browser-delayed-startup-finished');
+      }
+    },
+
+    observe(aSubject, aTopic) {
+      // This nsIObserver method allows us to defer initialization until after
+      // this window has finished painting and starting up.
+      if (aTopic == 'browser-delayed-startup-finished' && aSubject == window) {
+        Services.obs.removeObserver(this, 'browser-delayed-startup-finished');
+        this.delayedStartupFinished();
+      }
+    },
+
+    delayedStartupFinished() {
+      ZenWorkspaces.promiseInitialized.then(async () => {
+        await delayedStartupPromise;
+        await SessionStore.promiseAllWindowsRestored;
+        setTimeout(() => {
+          gZenCompactModeManager.init();
+          setTimeout(() => {
+            // A bit of a hack to make sure the tabs toolbar is updated.
+            // Just in case we didn't get the right size.
+            gZenUIManager.updateTabsToolbar();
+          }, 100);
+        }, 0);
         this.closeWatermark();
       });
     },
@@ -83,8 +109,6 @@
 
     _changeSidebarLocation() {
       const kElementsToAppend = ['sidebar-splitter', 'sidebar-box'];
-      const appWrapepr = document.getElementById('zen-sidebar-box-container');
-      appWrapepr.setAttribute('hidden', 'true');
 
       const browser = document.getElementById('browser');
       const toolbox = document.getElementById('navigator-toolbox');

src/browser/base/content/ZenUIManager.mjs

@@ -464,6 +464,19 @@ var gZenVerticalTabsManager = {
     }
   },
 
+  recalculateURLBarHeight() {
+    document.getElementById('urlbar').removeAttribute('--urlbar-height');
+    if (!this._hasSetSingleToolbar) {
+      document.getElementById('urlbar').style.setProperty('--urlbar-height', '32px');
+    } else {
+      try {
+        gURLBar.zenUpdateLayoutBreakout();
+      } catch (e) {
+        console.error(e);
+      }
+    }
+  },
+
   _updateEvent({ forCustomizableMode = false, dontRebuildAreas = false } = {}) {
     if (this._isUpdating) {
       return;
@@ -544,7 +557,7 @@ var gZenVerticalTabsManager = {
         );
         elements = Array.from(elements).reverse();
         // Add separator if it doesn't exist
-        if (!buttonsTarget.contains(this._topButtonsSeparatorElement)) {
+        if (!this._hasSetSingleToolbar) {
           buttonsTarget.append(this._topButtonsSeparatorElement);
         }
         for (const button of elements) {
@@ -642,25 +655,18 @@ var gZenVerticalTabsManager = {
       }
 
       gZenCompactModeManager.updateCompactModeContext(isSingleToolbar);
-      document.getElementById('urlbar').removeAttribute('--urlbar-height');
-      if (!isSingleToolbar) {
-        document.getElementById('urlbar').style.setProperty('--urlbar-height', '32px');
-      } else {
-        try {
-          gURLBar.zenUpdateLayoutBreakout();
-        } catch (e) {
-          console.error(e);
-        }
-      }
+      this.recalculateURLBarHeight();
 
       // Always move the splitter next to the sidebar
       this.navigatorToolbox.after(document.getElementById('zen-sidebar-splitter'));
       window.dispatchEvent(new Event('resize'));
-      gZenCompactModeManager.getAndApplySidebarWidth();
+      if (!isCompactMode) {
+        gZenCompactModeManager.getAndApplySidebarWidth();
+      }
+      gZenUIManager.updateTabsToolbar();
     } catch (e) {
       console.error(e);
     }
-    gZenUIManager.updateTabsToolbar();
     this._isUpdating = false;
   },
 

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 0d0a559a6473149b50f4bf18d059e86907c4acd3..a5a48ba1d50b3bf74dec3f3d371a76228e246a9e 100644
+index 0d0a559a6473149b50f4bf18d059e86907c4acd3..25ad798eb26f04262d069fdaf1f3fb00adec9807 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -26,6 +26,7 @@
@@ -27,7 +27,7 @@ index 0d0a559a6473149b50f4bf18d059e86907c4acd3..a5a48ba1d50b3bf74dec3f3d371a7622
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -169,9 +173,13 @@
+@@ -169,9 +173,11 @@
      </vbox>
    </html:template>
  
@@ -37,8 +37,6 @@ index 0d0a559a6473149b50f4bf18d059e86907c4acd3..a5a48ba1d50b3bf74dec3f3d371a7622
 +  <hbox id="zen-main-app-wrapper" flex="1" persist="zen-compact-mode">
 +    <vbox id="zen-toast-container"></vbox>
 +    #include navigator-toolbox.inc.xhtml
-+    <html:span id="zen-sidebar-box-container">
-+    </html:span>
 +    #include browser-box.inc.xhtml
 +  </hbox>
  

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

@@ -19,7 +19,6 @@
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-decks.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-folders.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-glance.css" />
-<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-sidebar-panels.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-popup.css" />
 
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-compact-mode.css" />

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

@@ -45,7 +45,6 @@
         content/browser/zen-styles/zen-workspaces.css           (content/zen-styles/zen-workspaces.css)
         content/browser/zen-styles/zen-urlbar.css               (content/zen-styles/zen-urlbar.css)
         content/browser/zen-styles/zen-popup.css                (content/zen-styles/zen-popup.css)
-        content/browser/zen-styles/zen-sidebar-panels.css       (content/zen-styles/zen-sidebar-panels.css)
         content/browser/zen-styles/zen-gradient-generator.css   (content/zen-styles/zen-gradient-generator.css)
         content/browser/zen-styles/zen-rices.css                (content/zen-styles/zen-rices.css)
         content/browser/zen-styles/zen-branding.css             (content/zen-styles/zen-branding.css)

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

@@ -25,7 +25,7 @@
   <command id="cmd_zenWorkspaceSwitch10" />
 
   <command id="cmd_zenOpenZenThemePicker" />
-  <command id="cmd_zenChangeWorkspaceTabColor" />
+  <command id="cmd_zenChangeWorkspaceTab" />
   <command id="cmd_zenToggleTabsOnRight" />
 
   <command id="cmd_zenReplacePinnedUrlWithCurrent" />

src/browser/base/content/zen-media-controls.inc.xhtml

@@ -36,6 +36,12 @@
           class="toolbarbutton-1" />
         <toolbarbutton id="zen-media-mute-button"
           class="toolbarbutton-1" />
+        <hbox id="media-device-buttons">
+          <toolbarbutton id="zen-media-mute-mic-button"
+            class="toolbarbutton-1" />
+          <toolbarbutton id="zen-media-mute-camera-button"
+            class="toolbarbutton-1" />
+        </hbox>
       </hbox>
     </vbox>
   </toolbaritem>

src/browser/base/content/zen-sets.js

@@ -53,7 +53,7 @@ document.addEventListener(
             gZenThemePicker.openThemePicker(event);
             break;
           case 'cmd_zenChangeWorkspaceTab':
-            ZenWorkspaces.changeTabWorkspace(event.target.getAttribute('zen-workspace-id'));
+            ZenWorkspaces.changeTabWorkspace(event.sourceEvent.target.getAttribute('zen-workspace-id'));
             break;
           case 'cmd_zenToggleTabsOnRight':
             gZenVerticalTabsManager.toggleTabsOnRight();

src/browser/base/content/zen-sidebar-icons.inc.xhtml

@@ -1,4 +1,4 @@
-#include zen-media-player.inc.xhtml
+#include zen-media-controls.inc.xhtml
 <toolbar brighttext="true"
   id="zen-sidebar-bottom-buttons"
   fullscreentoolbar="true"

src/browser/base/content/zen-styles/zen-browser-container.css

@@ -21,9 +21,11 @@
 
   @media -moz-pref('zen.view.experimental-rounded-view') {
     #tabbrowser-tabpanels {
-      mix-blend-mode: multiply;
-      -moz-osx-font-smoothing: grayscale;
-      isolation: isolate;
+      :root:not([zen-no-padding='true']) & {
+        mix-blend-mode: multiply;
+        -moz-osx-font-smoothing: grayscale;
+        isolation: isolate;
+      }
     }
   }
 }

src/browser/base/content/zen-styles/zen-browser-ui.css

@@ -187,3 +187,46 @@
     }
   }
 }
+
+:root[zen-window-buttons-reversed='true'][zen-right-side='true'] .titlebar-buttonbox-container {
+  margin-inline-start: calc(var(--zen-element-separation) - 3px);
+}
+
+.zen-split-view-splitter[orient='vertical'],
+#zen-sidebar-splitter {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: var(--zen-element-separation);
+  background: transparent;
+  border: none;
+  cursor: ew-resize;
+  z-index: 3;
+
+  &:is(.zen-split-view-splitter[orient='vertical']) {
+    /* Bit of a hacky solution, but it works */
+    width: var(--zen-split-row-gap);
+    margin-left: calc(var(--zen-element-separation) * -1 - 1px);
+    height: unset;
+    cursor: ew-resize;
+  }
+
+  &::before {
+    height: 50px;
+    width: 2px;
+    background: var(--button-primary-bgcolor);
+    border-radius: 2px;
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    opacity: 0;
+    transition: opacity 0.1s ease-in-out;
+    pointer-events: none;
+  }
+
+  &:hover::before {
+    opacity: 1;
+  }
+}

src/browser/base/content/zen-styles/zen-compact-mode.css

@@ -7,286 +7,279 @@
 
 :root[zen-compact-mode='true']:not([customizing]):not([inDOMFullscreen='true']) {
 %include zen-tabs/vertical-tabs-topbuttons-fix.css
-
   @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
-    #zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel[pinned='true']) {
-      margin-left: var(--zen-sidebar-web-panel-spacing) !important;
-    }
-
-    #zen-tabbox-wrapper {
-      /* Remove extra 1px of margine we have to add to the tabbox */
-      margin-left: var(--zen-element-separation) !important;
-      margin-right: var(--zen-element-separation) !important;
-    }
-
-    #zen-appcontent-wrapper {
-      & #tabbrowser-tabbox {
-        margin-left: 0 !important;
+    &:not([zen-compact-animating]) {
+      & #zen-sidebar-splitter {
+        display: none !important;
       }
-    }
 
-    #zen-sidebar-top-buttons-customization-target {
-      padding-inline-start: calc(var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)) !important;
-    }
+      #zen-tabbox-wrapper {
+        /* Remove extra 1px of margine we have to add to the tabbox */
+        margin-left: var(--zen-element-separation) !important;
+        margin-right: var(--zen-element-separation) !important;
+      }
 
-    #zen-sidebar-splitter {
-      display: none !important;
-    }
-
-    &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-container #nav-bar {
-      margin-left: var(--zen-element-separation) !important;
-    }
-
-    &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-container #nav-bar {
-      margin-right: var(--zen-element-separation) !important;
-    }
-
-    #navigator-toolbox {
-      --zen-toolbox-max-width: 64px !important;
-      --zen-compact-float: var(--zen-element-separation);
-
-      /* Initial padding for when we are animating */
-      padding: 0 0 0 var(--zen-toolbox-padding) !important;
-
-      &:not([animate='true']) {
-        position: absolute;
-        z-index: 10;
-        transition:
-          left 0.15s ease,
-          right 0.15s ease,
-          opacity 1.5s ease;
-        top: 0;
-        bottom: var(--zen-element-separation);
-        padding: 0 var(--zen-compact-float) !important;
-        opacity: 0;
-
-        :root[zen-single-toolbar='true'] & {
-          top: calc(var(--zen-element-separation) / 2);
-          height: calc(100% - var(--zen-element-separation));
-        }
-
-        & #zen-sidebar-top-buttons {
-          margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
+      #zen-appcontent-wrapper {
+        & #tabbrowser-tabbox {
+          margin-left: 0 !important;
         }
       }
 
-      &:not([zen-right-side='true']) #nav-bar {
-        margin-left: 0 !important;
+      #zen-sidebar-splitter {
+        display: none !important;
       }
-    }
 
-    &:not([zen-right-side='true']) #navigator-toolbox {
-      left: calc(-1 * var(--actual-zen-sidebar-width) + 1px);
-    }
-
-    /* When we have multiple toolbars and the top-toolbar is NOT being hidden,
-        * we need to adjust the top-padding of the toolbox to account for the
-        * extra toolbar height. */
-    @media not -moz-pref('zen.view.compact.hide-toolbar') {
-      &:not([zen-single-toolbar='true']) {
-        #navigator-toolbox:not([animate='true']) {
-          margin-top: var(--zen-toolbar-height) !important;
-        }
+      #zen-sidebar-top-buttons-customization-target {
+        padding-inline-start: calc(var(--zen-toolbox-padding) - var(--toolbarbutton-outer-padding)) !important;
       }
-    }
 
-    &[zen-right-side='true'] {
-      & #navigator-toolbox {
-        --zen-compact-float: calc(var(--zen-element-separation) + 1px);
+      &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-container #nav-bar {
+        margin-left: var(--zen-element-separation) !important;
+      }
+
+      &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-container #nav-bar {
+        margin-right: var(--zen-element-separation) !important;
+        margin-left: calc(var(--zen-element-separation) - 3px) !important;
+      }
+
+      #navigator-toolbox {
+        --zen-toolbox-max-width: 64px !important;
+        --zen-compact-float: var(--zen-element-separation);
+
+        /* Initial padding for when we are animating */
+        padding: 0 0 0 var(--zen-toolbox-padding) !important;
 
         &:not([animate='true']) {
-          right: calc(-1 * var(--actual-zen-sidebar-width) + 1px);
+          position: fixed;
+          z-index: 10;
+          transition:
+            left 0.15s ease,
+            right 0.15s ease,
+            opacity 1.5s ease;
+          top: 0;
+          bottom: var(--zen-element-separation);
+          padding: 0 var(--zen-compact-float) !important;
+          opacity: 0;
+
+          :root[zen-single-toolbar='true'] & {
+            top: calc(var(--zen-element-separation) / 2);
+            height: calc(100% - var(--zen-element-separation));
+          }
+
+          & #zen-sidebar-top-buttons {
+            margin: 0 0 calc(var(--zen-toolbox-padding) / 2) 0;
+          }
+        }
+
+        &:not([zen-right-side='true']) #nav-bar {
+          margin-left: 0 !important;
         }
       }
 
-      & .browserSidebarContainer {
-        margin-left: 0 !important;
-        margin-right: 0 !important;
+      &:not([zen-right-side='true']) #navigator-toolbox {
+        left: calc(-1 * var(--actual-zen-sidebar-width) + 1px);
       }
-    }
 
-    #navigator-toolbox:not([animate='true']) #titlebar {
-      box-shadow: var(--zen-big-shadow);
-      border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4);
-      padding: var(--zen-toolbox-padding) !important;
-      position: relative;
-      background: var(--zen-dialog-background);
-      outline: 1px solid var(--zen-colors-border-contrast);
-      outline-offset: -1px;
-      /* times 4 because we have the inner padding and the outter padding to consider */
-      :root[zen-sidebar-expanded='true'] & {
-        &[has-animated-padding='true'] {
+      /* When we have multiple toolbars and the top-toolbar is NOT being hidden,
+          * we need to adjust the top-padding of the toolbox to account for the
+          * extra toolbar height. */
+      @media not -moz-pref('zen.view.compact.hide-toolbar') {
+        &:not([zen-single-toolbar='true']) {
+          #navigator-toolbox:not([animate='true']) {
+            margin-top: var(--zen-toolbar-height) !important;
+          }
+        }
+      }
+
+      &[zen-right-side='true'] {
+        & #navigator-toolbox {
+          --zen-compact-float: calc(var(--zen-element-separation) + 1px);
+
+          &:not([animate='true']) {
+            right: calc(-1 * var(--actual-zen-sidebar-width) + 1px);
+          }
+        }
+
+        & .browserSidebarContainer {
+          margin-left: 0 !important;
+          margin-right: 0 !important;
+        }
+      }
+
+      #navigator-toolbox:not([animate='true']) #titlebar {
+        box-shadow: var(--zen-big-shadow);
+        border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4);
+        padding: var(--zen-toolbox-padding) !important;
+        position: relative;
+        background: var(--zen-dialog-background);
+        outline: 1px solid var(--zen-colors-border-contrast);
+        outline-offset: -1px;
+        min-width: var(--zen-toolbox-min-width);
+
+        :root[zen-sidebar-expanded='true'] & {
           width: calc(var(--zen-sidebar-width) + var(--zen-toolbox-padding));
         }
 
-        &:not([has-animated-padding='true']) {
-          width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding));
+        :root[zen-single-toolbar='true'] {
+          padding-top: 0 !important;
+          margin-left: 0 !important;
+        }
+
+        @media -moz-pref('zen.view.compact.color-sidebar') {
+          background: var(--zen-main-browser-background-toolbar) !important;
+          background-attachment: fixed !important;
+          background-size: 2000px !important; /* Dont ask me why */
+          /* NOTE: We MUST not add a backdrop-filter if we want the URL
+          * bar to be floating correctly:
+          * https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_display/Containing_block#identifying_the_containing_block */
+        }
+
+        & #urlbar[open][zen-floating-urlbar='true'] {
+          transition: left 0.05s ease;
+          visibility: visible;
+        }
+
+        &::before {
+          content: '';
+          position: absolute;
+          top: 0;
+          left: 0;
+          right: 0;
+          bottom: 0;
+          background-image: url(chrome://browser/content/zen-images/grain-bg.png);
+          pointer-events: none;
+          z-index: 0;
+          opacity: var(--zen-grainy-background-opacity, 0);
+          mix-blend-mode: overlay;
         }
       }
 
-      :root[zen-single-toolbar='true'] {
-        padding-top: 0 !important;
-        margin-left: 0 !important;
-      }
+      #navigator-toolbox[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
+      #navigator-toolbox[zen-user-show],
+      #navigator-toolbox[zen-has-empty-tab],
+      #navigator-toolbox[flash-popup],
+      #navigator-toolbox[has-popup-menu],
+      #navigator-toolbox[movingtab],
+      #navigator-toolbox:has(.tabbrowser-tab:active),
+      &[zen-renaming-tab='true'] #navigator-toolbox,
+      #navigator-toolbox:has(
+          *:is([panelopen='true'], [open='true'], #urlbar:focus-within):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)
+        ) {
+        &:not([animate='true']) {
+          --zen-compact-mode-func: linear(
+            0 0%,
+            0.002748 1%,
+            0.010544 2%,
+            0.022757 3%,
+            0.038804 4%,
+            0.058151 5%,
+            0.080308 6%,
+            0.104828 7.000000000000001%,
+            0.131301 8%,
+            0.159358 9%,
+            0.188662 10%,
+            0.21891 11%,
+            0.249828 12%,
+            0.281172 13%,
+            0.312724 14.000000000000002%,
+            0.344288 15%,
+            0.375693 16%,
+            0.40679 17%,
+            0.437447 18%,
+            0.467549 19%,
+            0.497 20%,
+            0.525718 21%,
+            0.553633 22%,
+            0.580688 23%,
+            0.60684 24%,
+            0.632052 25%,
+            0.656298 26%,
+            0.679562 27%,
+            0.701831 28.000000000000004%,
+            0.723104 28.999999999999996%,
+            0.743381 30%,
+            0.76267 31%,
+            0.780983 32%,
+            0.798335 33%,
+            0.814744 34%,
+            0.830233 35%,
+            0.844826 36%,
+            0.858549 37%,
+            0.87143 38%,
+            0.883498 39%,
+            0.894782 40%,
+            0.905314 41%,
+            0.915125 42%,
+            0.924247 43%,
+            0.93271 44%,
+            0.940547 45%,
+            0.947787 46%,
+            0.954463 47%,
+            0.960603 48%,
+            0.966239 49%,
+            0.971397 50%,
+            0.976106 51%,
+            0.980394 52%,
+            0.984286 53%,
+            0.987808 54%,
+            0.990984 55.00000000000001%,
+            0.993837 56.00000000000001%,
+            0.99639 56.99999999999999%,
+            0.998664 57.99999999999999%,
+            1.000679 59%,
+            1.002456 60%,
+            1.004011 61%,
+            1.005363 62%,
+            1.006528 63%,
+            1.007522 64%,
+            1.008359 65%,
+            1.009054 66%,
+            1.009618 67%,
+            1.010065 68%,
+            1.010405 69%,
+            1.010649 70%,
+            1.010808 71%,
+            1.01089 72%,
+            1.010904 73%,
+            1.010857 74%,
+            1.010757 75%,
+            1.010611 76%,
+            1.010425 77%,
+            1.010205 78%,
+            1.009955 79%,
+            1.009681 80%,
+            1.009387 81%,
+            1.009077 82%,
+            1.008754 83%,
+            1.008422 84%,
+            1.008083 85%,
+            1.00774 86%,
+            1.007396 87%,
+            1.007052 88%,
+            1.00671 89%,
+            1.006372 90%,
+            1.00604 91%,
+            1.005713 92%,
+            1.005394 93%,
+            1.005083 94%,
+            1.004782 95%,
+            1.004489 96%,
+            1.004207 97%,
+            1.003935 98%,
+            1.003674 99%,
+            1.003423 100%
+          );
+          transition:
+            left 0.25s var(--zen-compact-mode-func),
+            right 0.25s var(--zen-compact-mode-func);
 
-      @media -moz-pref('zen.view.compact.color-sidebar') {
-        background: var(--zen-main-browser-background-toolbar) !important;
-        background-attachment: fixed !important;
-        background-size: 2000px !important; /* Dont ask me why */
-        /* NOTE: We MUST not add a backdrop-filter if we want the URL
-         * bar to be floating correctly:
-         * https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_display/Containing_block#identifying_the_containing_block */
-      }
-
-      & #urlbar[open][zen-floating-urlbar='true'] {
-        transition: left 0.05s ease;
-        visibility: visible;
-
-        #navigator-toolbox:has(&) {
-          opacity: 1;
-        }
-      }
-
-      &::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background-image: url(chrome://browser/content/zen-images/grain-bg.png);
-        pointer-events: none;
-        z-index: 0;
-        opacity: var(--zen-grainy-background-opacity, 0);
-        mix-blend-mode: overlay;
-      }
-    }
-
-    #navigator-toolbox[zen-has-hover]:not(:has(#urlbar[zen-floating-urlbar='true']:hover)),
-    #navigator-toolbox[zen-user-show],
-    #navigator-toolbox[zen-has-empty-tab],
-    #navigator-toolbox[flash-popup],
-    #navigator-toolbox[has-popup-menu],
-    #navigator-toolbox[movingtab],
-    #navigator-toolbox:has(.tabbrowser-tab:active),
-    &[zen-renaming-tab='true'] #navigator-toolbox,
-    #navigator-toolbox:has(
-        *:is([panelopen='true'], [open='true'], #urlbar:focus-within):not(#urlbar[zen-floating-urlbar='true']):not(tab):not(.zen-compact-mode-ignore)
-      ) {
-      &:not([animate='true']) {
-        --zen-compact-mode-func: linear(
-          0 0%,
-          0.002748 1%,
-          0.010544 2%,
-          0.022757 3%,
-          0.038804 4%,
-          0.058151 5%,
-          0.080308 6%,
-          0.104828 7.000000000000001%,
-          0.131301 8%,
-          0.159358 9%,
-          0.188662 10%,
-          0.21891 11%,
-          0.249828 12%,
-          0.281172 13%,
-          0.312724 14.000000000000002%,
-          0.344288 15%,
-          0.375693 16%,
-          0.40679 17%,
-          0.437447 18%,
-          0.467549 19%,
-          0.497 20%,
-          0.525718 21%,
-          0.553633 22%,
-          0.580688 23%,
-          0.60684 24%,
-          0.632052 25%,
-          0.656298 26%,
-          0.679562 27%,
-          0.701831 28.000000000000004%,
-          0.723104 28.999999999999996%,
-          0.743381 30%,
-          0.76267 31%,
-          0.780983 32%,
-          0.798335 33%,
-          0.814744 34%,
-          0.830233 35%,
-          0.844826 36%,
-          0.858549 37%,
-          0.87143 38%,
-          0.883498 39%,
-          0.894782 40%,
-          0.905314 41%,
-          0.915125 42%,
-          0.924247 43%,
-          0.93271 44%,
-          0.940547 45%,
-          0.947787 46%,
-          0.954463 47%,
-          0.960603 48%,
-          0.966239 49%,
-          0.971397 50%,
-          0.976106 51%,
-          0.980394 52%,
-          0.984286 53%,
-          0.987808 54%,
-          0.990984 55.00000000000001%,
-          0.993837 56.00000000000001%,
-          0.99639 56.99999999999999%,
-          0.998664 57.99999999999999%,
-          1.000679 59%,
-          1.002456 60%,
-          1.004011 61%,
-          1.005363 62%,
-          1.006528 63%,
-          1.007522 64%,
-          1.008359 65%,
-          1.009054 66%,
-          1.009618 67%,
-          1.010065 68%,
-          1.010405 69%,
-          1.010649 70%,
-          1.010808 71%,
-          1.01089 72%,
-          1.010904 73%,
-          1.010857 74%,
-          1.010757 75%,
-          1.010611 76%,
-          1.010425 77%,
-          1.010205 78%,
-          1.009955 79%,
-          1.009681 80%,
-          1.009387 81%,
-          1.009077 82%,
-          1.008754 83%,
-          1.008422 84%,
-          1.008083 85%,
-          1.00774 86%,
-          1.007396 87%,
-          1.007052 88%,
-          1.00671 89%,
-          1.006372 90%,
-          1.00604 91%,
-          1.005713 92%,
-          1.005394 93%,
-          1.005083 94%,
-          1.004782 95%,
-          1.004489 96%,
-          1.004207 97%,
-          1.003935 98%,
-          1.003674 99%,
-          1.003423 100%
-        );
-        transition:
-          left 0.25s var(--zen-compact-mode-func),
-          right 0.25s var(--zen-compact-mode-func);
-        opacity: 1;
-
-        &:not([supress-primary-adjustment='true']) {
-          left: calc(var(--zen-element-separation) / -2);
-          :root[zen-right-side='true'] & {
-            right: calc(var(--zen-element-separation) / -2);
-            left: auto;
+          &:not([supress-primary-adjustment='true']) {
+            opacity: 1;
+            left: calc(var(--zen-element-separation) / -2);
+            :root[zen-right-side='true'] & {
+              right: calc(var(--zen-element-separation) / -2);
+              left: auto;
+            }
           }
         }
       }
@@ -342,7 +335,7 @@
         }
 
         & #urlbar {
-          opacity: 0;
+          opacity: 0 !important;
         }
 
         @media -moz-pref('zen.view.compact.color-toolbar') {
@@ -354,6 +347,7 @@
       }
 
       & #zen-appcontent-navbar-container[zen-has-hover],
+      & #zen-appcontent-navbar-container:hover,
       & #zen-appcontent-navbar-container:focus-within,
       & #zen-appcontent-navbar-container[zen-user-show],
       & #zen-appcontent-navbar-container[has-popup-menu],
@@ -380,7 +374,7 @@
         }
 
         & #urlbar {
-          opacity: 1;
+          opacity: 1 !important;
         }
 
         & #urlbar[breakout-extend='true']:not([zen-floating-urlbar='true']) {

src/browser/base/content/zen-styles/zen-decks.css

@@ -55,6 +55,10 @@
 }
 
 #tabbrowser-tabbox:has(#tabbrowser-tabpanels[zen-split-view='true']) {
+  :root[zen-no-padding='true'] & {
+    --zen-element-separation: 8px;
+  }
+
   --zen-split-row-gap: var(--zen-element-separation);
   --zen-split-column-gap: calc(var(--zen-element-separation) + 1px);
   margin-right: calc(-1 * var(--zen-split-column-gap));

src/browser/base/content/zen-styles/zen-glance.css

@@ -4,11 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-.browserSidebarContainer:has([zen-glance-selected]),
-.browserSidebarContainer.zen-glance-overlay {
-  visibility: inherit;
-}
-
 #zen-glance-sidebar-container {
   position: absolute;
   display: flex;
@@ -88,18 +83,32 @@
   }
 }
 
+:root[zen-no-padding='true'] .browserSidebarContainer.zen-glance-background {
+  --zen-native-inner-radius: 6px;
+  --zen-element-separation: 6px;
+}
+
+.browserSidebarContainer.zen-glance-background,
+.browserSidebarContainer.zen-glance-overlay .browserContainer {
+  border-radius: var(--zen-native-inner-radius);
+  box-shadow: var(--zen-big-shadow);
+}
+
 .browserSidebarContainer.zen-glance-overlay {
   box-shadow: none !important;
+  visibility: inherit;
+
+  :root[zen-no-padding='true'] & {
+    --zen-native-inner-radius: 0px;
+  }
 
   & .browserContainer {
     background: var(--zen-dialog-background);
     position: fixed;
-    border-radius: var(--zen-native-inner-radius);
     opacity: 0;
     top: 0;
     left: 0;
     flex: unset !important;
-    box-shadow: var(--zen-big-shadow);
 
     &[has-finished-animation='true'] {
       position: relative !important;

src/browser/base/content/zen-styles/zen-gradient-generator.css

@@ -133,7 +133,7 @@
     padding: 5px;
     position: relative;
 
-    & .zen-theme-picker-dot-custom {
+    & .zen-theme-picker-dot.custom {
       background: var(--zen-theme-picker-dot-color);
       border: 1px solid var(--zen-colors-border);
       border-radius: 5px;

src/browser/base/content/zen-styles/zen-media-controls.css

@@ -19,6 +19,24 @@
     --toolbarbutton-outer-padding: 2px;
   }
 
+  &:not([media-sharing]) {
+    #media-device-buttons {
+      display: none;
+    }
+  }
+
+  #media-device-buttons {
+    gap: 2px;
+  }
+
+  &[media-sharing] #zen-media-controls-hbox > toolbarbutton:not(:first-child) {
+    display: none;
+
+    #media-device-buttons {
+      display: flex;
+    }
+  }
+
   &:not([can-pip]) {
     #zen-media-info-vbox {
       width: calc(100% - 26px);
@@ -206,7 +224,7 @@
 }
 
 #zen-media-info-vbox {
-  #zen-media-controls-toolbar:not([media-position-hidden='true']) & {
+  #zen-media-controls-toolbar:not([media-position-hidden]) & {
     transition-delay: 0.01s !important;
   }
   overflow-x: hidden;
@@ -251,7 +269,7 @@
   align-items: center;
   padding-top: 0px !important;
 
-  #zen-media-controls-toolbar[media-position-hidden='true'] & {
+  #zen-media-controls-toolbar[media-position-hidden] & {
     display: none;
   }
 }

src/browser/base/content/zen-styles/zen-panel-ui.css

@@ -6,6 +6,19 @@
 panel[type='arrow'][animate='open'] {
   @media (-moz-platform: macos) {
     animation: zen-jello-animation-macos 0.4s ease-out;
+    &[side='bottom'] {
+      /* Animate from the bottom */
+      -zen-window-transform-origin: 0 100%;
+    }
+    :root[zen-right-side='true'] & {
+      /* Animate from the right */
+      -zen-window-transform-origin: 100% 0;
+
+      &[side='bottom'] {
+        /* Animate from the bottom right */
+        -zen-window-transform-origin: 100% 100%;
+      }
+    }
   }
   @media (-moz-platform: linux) or ((-moz-platform: windows) and (not (-moz-windows-mica-popups))) {
     /* Mica popups have a weird background while the animation is running */
@@ -20,7 +33,7 @@ panel[type='arrow'][animate]:not([animate='open']) {
 }
 
 menupopup,
-panel {
+panel[type='arrow'] {
   @media (-moz-windows-mica-popups) {
     appearance: auto !important;
     -moz-default-appearance: menupopup;
@@ -30,8 +43,24 @@ panel {
     --panel-border-color: transparent !important;
     --panel-shadow-margin: 0px !important;
 
+    transition-duration: 0s !important;
+
     &::part(content) {
       animation: none !important;
     }
   }
+
+  @media (-moz-platform: macos) {
+    appearance: auto !important;
+    -moz-default-appearance: menupopup;
+    /* We set the default background here, rather than on ::part(content),
+     * because otherwise it'd interfere with the native look. Non-native-looking
+     * popups should get their background via --panel-background */
+    background-color: Menu;
+    --panel-shadow-margin: 0px !important;
+    --panel-background: transparent !important;
+    --panel-border-color: transparent;
+    /* This should be kept in sync with GetMenuMaskImage() */
+    --panel-border-radius: 6px;
+  }
 }

src/browser/base/content/zen-styles/zen-sidebar-panels.css

@@ -1,306 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#zen-sidebar-panels-wrapper {
-  /*min-height: 500px;*/
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  align-content: center;
-}
-
-#zen-sidebar-panels-sites {
-  background: transparent;
-  max-width: 1px;
-  display: flex;
-}
-
-#zen-sidebar-add-panel-button:not(:hover) image,
-.zen-sidebar-panel-button:not([selected='true'], #zen-sidebar-add-panel-button) image {
-  background: transparent !important;
-}
-
-.zen-sidebar-panel-button {
-  width: var(--zen-sidebar-action-button-width);
-  height: var(--zen-sidebar-action-button-width);
-  max-height: var(--zen-sidebar-action-button-width);
-  padding: 0 3px !important;
-  margin: 0;
-  justify-content: center;
-  align-items: center;
-  cursor: pointer;
-}
-
-.zen-sidebar-panel-button image {
-  border-radius: 10px !important;
-  border: 2px solid transparent;
-}
-
-.zen-sidebar-panel-button:hover image {
-  background: color-mix(in srgb, var(--toolbarbutton-hover-background) 12%, transparent);
-}
-
-.zen-sidebar-panel-button[selected='true'] image {
-  border-color: var(--zen-primary-color);
-}
-
-/** Sidebar view */
-
-#zen-sidebar-web-panel-wrapper {
-  --zen-default-sidebar-width: 300px;
-  --zen-sidebar-web-panel-spacing: var(--zen-element-separation);
-  position: relative;
-  margin-right: 0;
-  display: flex;
-  pointer-events: none;
-  transition: width 0.3s ease-in-out;
-}
-
-#zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel[hidden='true']) {
-  max-width: 0;
-  padding: 0;
-  margin: 0;
-  display: none;
-}
-
-#zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel[pinned='true']) {
-  position: absolute;
-  z-index: 1;
-  width: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3);
-  margin: var(--zen-sidebar-web-panel-spacing);
-  /* Why times 3?
-   *  + 1 for the top margin, making the element overflow the view.
-   *  + 1 for the margin we want to add at the bottom
-   *  + 1 so that the panel can be correctly spaced from the border of the webview
-   */
-  height: calc(100% - var(--zen-sidebar-web-panel-spacing) * 4);
-}
-
-#zen-sidebar-web-panel {
-  border-radius: var(--zen-native-inner-radius);
-  z-index: 2;
-  box-shadow: var(--zen-big-shadow);
-  background: var(--zen-colors-tertiary);
-  opacity: 0;
-  animation-delay: 0.1s;
-  flex-direction: column;
-  min-width: var(--zen-default-sidebar-width);
-  max-width: 720px;
-  min-height: var(--zen-default-sidebar-width);
-  width: calc(var(--zen-default-sidebar-width) + 200px);
-  pointer-events: all;
-  height: calc(100% - 20px);
-}
-
-#zen-sidebar-web-panel:not([pinned='true']) {
-  /* We need to always override the height */
-  height: unset !important;
-}
-
-.zen-sidebar-web-panel-splitter,
-.zen-split-view-splitter[orient='vertical'],
-#zen-sidebar-splitter {
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: var(--zen-element-separation);
-  background: transparent;
-  border: none;
-  cursor: ew-resize;
-  z-index: 3;
-
-  &:is(.zen-split-view-splitter[orient='vertical']) {
-    /* Bit of a hacky solution, but it works */
-    width: var(--zen-split-row-gap);
-    margin-left: calc(var(--zen-element-separation) * -1 - 1px);
-    height: unset;
-    cursor: ew-resize;
-  }
-
-  &::before {
-    height: 50px;
-    width: 2px;
-    background: var(--button-primary-bgcolor);
-    border-radius: 2px;
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    opacity: 0;
-    transition: opacity 0.1s ease-in-out;
-    pointer-events: none;
-  }
-
-  &:hover::before {
-    opacity: 1;
-  }
-}
-
-.zen-sidebar-web-panel-splitter[side='right'] {
-  left: 100%;
-}
-
-.zen-sidebar-web-panel-splitter[side='left'] {
-  right: 100%;
-}
-
-.zen-sidebar-web-panel-splitter[orient='horizontal'] {
-  width: 100%;
-  height: 7px;
-  cursor: ns-resize;
-
-  &::before {
-    display: none;
-  }
-}
-
-.zen-sidebar-web-panel-splitter[side='bottom'] {
-  top: initial;
-  bottom: -2px;
-}
-
-#zen-sidebar-web-panel[hidden='true'] .zen-sidebar-web-panel-splitter,
-#zen-sidebar-web-panel-wrapper[hidden='true'] + .zen-sidebar-web-panel-splitter,
-#zen-sidebar-web-panel:not([pinned='true']) .zen-sidebar-web-panel-splitter[orient='horizontal'],
-#zen-sidebar-web-panel:not([pinned='true']) .zen-sidebar-web-panel-splitter[side='left'] {
-  display: none;
-  margin: 0;
-}
-
-#main-window[customizing='true'] #zen-sidebar-web-panel-wrapper {
-  display: none !important;
-}
-
-#zen-sidebar-web-panel:not([hidden='true']) {
-  display: flex;
-}
-
-#zen-sidebar-web-panel[pinned='true'] {
-  position: absolute;
-  z-index: 1;
-  max-height: 100%;
-}
-
-#zen-sidebar-web-panel[hidden='true'][pinned='true'] {
-  display: flex;
-  pointer-events: none;
-}
-
-#zen-sidebar-web-header,
-#zen-sidebar-panels-wrapper {
-  width: 100%;
-  min-height: var(--zen-toolbar-height) !important;
-  display: flex;
-  align-items: center;
-  padding: 0 5px;
-  border: var(--zen-appcontent-border);
-  border-width: 0 !important;
-  border-bottom-width: 1px !important;
-  background: transparent;
-  position: relative;
-  color-scheme: var(--toolbar-color-scheme);
-  -moz-window-dragging: no-drag;
-
-  --toolbarbutton-inner-padding: var(--zen-toolbar-button-inner-padding) !important;
-}
-
-#zen-sidebar-web-header {
-  justify-content: space-between;
-}
-
-#zen-sidebar-web-header toolbarbutton {
-  fill: color-mix(in srgb, var(--toolbarbutton-icon-fill) 70%, transparent);
-}
-
-#zen-sidebar-panels-wrapper {
-  border-top-width: 1px !important;
-  border-bottom-width: 0px !important;
-}
-
-#zen-sidebar-web-panel-browser-containers {
-  height: 100%;
-  position: relative;
-}
-
-#zen-sidebar-introduction-panel {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  margin: 0 auto;
-  width: 70%;
-}
-
-#zen-sidebar-introduction-panel[hidden='true'] {
-  display: none;
-}
-
-#zen-sidebar-introduction-panel h1 {
-  font-size: 1.5em;
-  font-weight: 600;
-  margin: 0;
-  margin-bottom: 2px;
-}
-
-#zen-sidebar-introduction-panel p {
-  opacity: 0.7;
-  text-align: center;
-}
-
-#zen-sidebar-web-panel browser[zen-sidebar-id] {
-  height: 100%;
-}
-
-#zen-sidebar-web-panel-title {
-  font-size: 0.9em;
-  font-weight: 600;
-  margin: 0 10px;
-  padding: 0;
-  color: var(--text-color-deemphasized);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  width: -moz-available;
-  text-align: center;
-  display: block;
-}
-
-#zen-sidebar-web-panel[pinned] {
-  transform-origin: 50% 20%;
-}
-
-#zen-sidebar-web-panel[pinned]:not([hidden]) {
-  animation: better-sidebar-pinned-show 0.15s ease-in-out forwards !important;
-}
-
-#zen-sidebar-web-panel[pinned][hidden] {
-  animation: better-sidebar-pinned-hide 0.15s ease-in-out forwards !important;
-}
-
-/** UNPINNED **/
-#zen-sidebar-web-panel {
-  /* Sets perspective */
-  transform-origin: 50% 20%;
-}
-
-#zen-sidebar-web-panel:not([hidden]) #zen-sidebar-introduction-panel * {
-  opacity: 0;
-  animation: better-sidebar-intro-show 0.5s 0.4s ease-out forwards !important;
-}
-
-#zen-sidebar-web-panel:not([hidden]) #zen-sidebar-introduction-panel p {
-  animation: better-sidebar-intro-show 0.5s 0.8s ease-out forwards !important;
-}
-
-#zen-sidebar-web-panel:not([hidden]) {
-  animation: better-sidebar-show 0.15s ease-in-out forwards !important;
-}
-
-#zen-sidebar-web-panel[hidden] {
-  animation: better-sidebar-hide 0.15s ease-in-out forwards !important;
-}

src/browser/base/content/zen-styles/zen-sidebar.css

@@ -49,7 +49,12 @@
     border-radius: var(--zen-native-inner-radius);
     box-shadow: var(--zen-big-shadow);
     overflow: hidden;
-
+    &[positionend=''] {
+      order: 6;
+      & ~ #sidebar-splitter {
+        order: 5;
+      }
+    }
     :root:not([zen-right-side='true']) &[positionend='true'] {
       margin-right: var(--zen-element-separation);
     }

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -965,7 +965,7 @@
       padding-inline-start: var(--toolbarbutton-outer-padding);
     }
 
-    :root[zen-right-side='true'] & {
+    :root[zen-right-side='true']:not([zen-window-buttons-reversed='true']) {
       padding-inline-end: var(--zen-toolbox-padding);
     }
 

src/browser/base/content/zen-styles/zen-theme.css

@@ -118,6 +118,7 @@
   --toolbar-field-focus-background-color: var(--urlbar-box-bgcolor) !important;
   --zen-input-border-color: light-dark(rgb(204, 204, 204), rgb(66, 65, 77));
   --urlbar-box-hover-bgcolor: var(--toolbarbutton-hover-background) !important;
+  --input-bgcolor: light-dark(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2)) !important;
 
   /* XUL */
   --zen-main-browser-background: light-dark(rgb(235, 235, 235), #1b1b1b);
@@ -167,6 +168,11 @@
     }
   }
 
+  @media (-moz-platform: linux) and -moz-pref('zen.widget.linux.transparency') {
+    background: transparent;
+    --zen-themed-toolbar-bg-transparent: transparent;
+  }
+
   --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
   --arrowpanel-background: var(--zen-dialog-background) !important;
 

src/browser/base/content/zen-styles/zen-toolbar.css

@@ -9,5 +9,5 @@
 }
 
 :root[inDOMFullscreen='true'] #zen-appcontent-navbar-container {
-  display: none;
+  visibility: collapse;
 }

src/browser/base/content/zen-styles/zen-urlbar.css

@@ -365,10 +365,6 @@ button.popup-notification-dropmarker {
 }
 
 :root:not([zen-single-toolbar='true']) {
-  & #nav-bar {
-    margin-bottom: -1px;
-  }
-
   &[zen-right-side='true']:not([zen-window-buttons-reversed='true']) #nav-bar {
     margin-inline-start: var(--zen-element-separation);
   }

src/browser/base/content/zenThemeModifier.js

@@ -11,6 +11,7 @@
  */
 
 const kZenThemePrefsList = ['zen.theme.accent-color', 'zen.theme.border-radius', 'zen.theme.content-element-separation'];
+const kZenMaxElementSeparation = 12;
 
 /**
  * ZenThemeModifier controls the application of theme data to the browser,
@@ -68,7 +69,7 @@ var ZenThemeModifier = {
   },
 
   updateElementSeparation() {
-    const separation = Services.prefs.getIntPref('zen.theme.content-element-separation');
+    let separation = this.elementSeparation;
     document.documentElement.style.setProperty('--zen-element-separation', separation + 'px');
     if (separation == 0) {
       document.documentElement.setAttribute('zen-no-padding', true);
@@ -77,6 +78,10 @@ var ZenThemeModifier = {
     }
   },
 
+  get elementSeparation() {
+    return Math.min(Services.prefs.getIntPref('zen.theme.content-element-separation'), kZenMaxElementSeparation);
+  },
+
   /**
    * Update the accent color.
    */

src/browser/base/zen-components/ZenCompactMode.mjs

@@ -27,7 +27,17 @@ var gZenCompactModeManager = {
   _flashTimeouts: {},
   _evenListeners: [],
   _removeHoverFrames: {},
-  _animating: false,
+
+  preInit() {
+    // Remove it before initializing so we can properly calculate the width
+    // of the sidebar at startup and avoid overflowing items not being hidden
+    const isCompactMode = lazyCompactMode.mainAppWrapper.getAttribute('zen-compact-mode') === 'true';
+    lazyCompactMode.mainAppWrapper.removeAttribute('zen-compact-mode');
+    this._wasInCompactMode = isCompactMode;
+
+    this.addMouseActions();
+    this.addContextMenu();
+  },
 
   init() {
     Services.prefs.addObserver('zen.tabs.vertical.right-side', this._updateSidebarIsOnRight.bind(this));
@@ -35,9 +45,6 @@ var gZenCompactModeManager = {
     gZenUIManager.addPopupTrackingAttribute(this.sidebar);
     gZenUIManager.addPopupTrackingAttribute(document.getElementById('zen-appcontent-navbar-container'));
 
-    this.addMouseActions();
-    this.addContextMenu();
-
     // Clear hover states when window state changes (minimize, maximize, etc.)
     window.addEventListener('sizemodechange', () => this._clearAllHoverStates());
 
@@ -48,26 +55,19 @@ var gZenCompactModeManager = {
         buttons.removeAttribute('zen-has-hover');
       });
     }
+    this.preference = this._wasInCompactMode;
   },
 
   get preference() {
-    if (!document.documentElement.hasAttribute('zen-compact-mode')) {
-      window.addEventListener(
-        'MozAfterPaint',
-        () => {
-          document.documentElement.setAttribute(
-            'zen-compact-mode',
-            lazyCompactMode.mainAppWrapper.getAttribute('zen-compact-mode')
-          );
-        },
-        { once: true }
-      );
-    }
     return lazyCompactMode.mainAppWrapper.getAttribute('zen-compact-mode') === 'true';
   },
 
   set preference(value) {
-    if (this.preference === value || this._animating) {
+    if (this.preference === value || document.documentElement.hasAttribute('zen-compact-animating')) {
+      if (typeof this._wasInCompactMode !== 'undefined') {
+        // We wont do anything with it anyway, so we remove it
+        delete this._wasInCompactMode;
+      }
       // We dont want the user to be able to spam the button
       return value;
     }
@@ -95,6 +95,11 @@ var gZenCompactModeManager = {
   },
 
   flashSidebarIfNecessary(aInstant = false) {
+    // This function is called after exiting DOM fullscreen mode,
+    // so we do a bit of a hack to re-calculate the URL height
+    if (aInstant) {
+      gZenVerticalTabsManager.recalculateURLBarHeight();
+    }
     if (!aInstant && this.preference && lazyCompactMode.COMPACT_MODE_FLASH_ENABLED && !gZenGlanceManager._animating) {
       this.flashSidebar();
     }
@@ -146,20 +151,33 @@ var gZenCompactModeManager = {
     this._evenListeners.push(callback);
   },
 
-  _updateEvent() {
-    this._evenListeners.forEach((callback) => callback());
+  async _updateEvent() {
+    // IF we are animating IN, call the callbacks first so we can calculate the width
+    // once the window buttons are shown
     this.updateContextMenu();
-    this.animateCompactMode();
+    if (!this.preference) {
+      this._evenListeners.forEach((callback) => callback());
+      await this.animateCompactMode();
+    } else {
+      await this.animateCompactMode();
+      this._evenListeners.forEach((callback) => callback());
+    }
+    gZenUIManager.updateTabsToolbar();
   },
 
   // NOTE: Dont actually use event, it's just so we make sure
   // the caller is from the ResizeObserver
   getAndApplySidebarWidth(event = undefined) {
+    if (this._ignoreNextResize) {
+      this._ignoreNextResize = false;
+      return;
+    }
     let sidebarWidth = this.sidebar.getBoundingClientRect().width;
     if (sidebarWidth > 1) {
       gZenUIManager.restoreScrollbarState();
       // Second variable to get the genuine width of the sidebar
       this.sidebar.style.setProperty('--actual-zen-sidebar-width', `${sidebarWidth}px`);
+      window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
       if (event && this.preference) {
         return;
       }
@@ -169,104 +187,124 @@ var gZenCompactModeManager = {
   },
 
   animateCompactMode() {
-    this._animating = true;
-    const isCompactMode = this.preference;
-    const canHideSidebar =
-      Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') || gZenVerticalTabsManager._hasSetSingleToolbar;
-    const canAnimate =
-      lazyCompactMode.COMPACT_MODE_CAN_ANIMATE_SIDEBAR &&
-      !this.sidebar.hasAttribute('zen-user-show') &&
-      !this.sidebar.hasAttribute('zen-has-empty-tab') &&
-      !this.sidebar.hasAttribute('zen-has-hover');
-    // Do this so we can get the correct width ONCE compact mode styled have been applied
-    const titlebar = this.sidebar.querySelector('#titlebar');
-    if (canAnimate) {
-      this.sidebar.setAttribute('animate', 'true');
-      titlebar.setAttribute('has-animated-padding', 'true');
-    } else {
-      titlebar.removeAttribute('has-animated-padding');
-    }
-    this.sidebar.style.removeProperty('margin-right');
-    this.sidebar.style.removeProperty('margin-left');
-    this.sidebar.style.removeProperty('transform');
-    window.requestAnimationFrame(() => {
-      let sidebarWidth = this.getAndApplySidebarWidth();
-      if (!canAnimate) {
-        this.sidebar.removeAttribute('animate');
-        this._animating = false;
-        return;
+    return new Promise((resolve) => {
+      // Get the splitter width before hiding it (we need to hide it before animating on right)
+      document.documentElement.setAttribute('zen-compact-animating', 'true');
+      // We need to set the splitter width before hiding it
+      let splitterWidth = document.getElementById('zen-sidebar-splitter').getBoundingClientRect().width;
+      const isCompactMode = this.preference;
+      const canHideSidebar =
+        Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') || gZenVerticalTabsManager._hasSetSingleToolbar;
+      let canAnimate =
+        lazyCompactMode.COMPACT_MODE_CAN_ANIMATE_SIDEBAR &&
+        !this.sidebar.hasAttribute('zen-user-show') &&
+        !this.sidebar.hasAttribute('zen-has-empty-tab') &&
+        !this.sidebar.hasAttribute('zen-has-hover');
+      if (typeof this._wasInCompactMode !== 'undefined') {
+        canAnimate = false;
+        delete this._wasInCompactMode;
       }
-      if (canHideSidebar && isCompactMode) {
-        gZenUIManager.motion
-          .animate(
-            this.sidebar,
-            this.sidebarIsOnRight
-              ? {
-                  marginRight: `-${sidebarWidth}px`,
-                }
-              : { marginLeft: `-${sidebarWidth}px` },
-            {
-              ease: 'easeIn',
-              type: 'spring',
-              bounce: 0,
-              duration: 0.2,
+      // Do this so we can get the correct width ONCE compact mode styled have been applied
+      if (canAnimate) {
+        this.sidebar.setAttribute('animate', 'true');
+      }
+      this.sidebar.style.removeProperty('margin-right');
+      this.sidebar.style.removeProperty('margin-left');
+      this.sidebar.style.removeProperty('transform');
+      window.requestAnimationFrame(() => {
+        let sidebarWidth = this.getAndApplySidebarWidth();
+        if (!canAnimate) {
+          this.sidebar.removeAttribute('animate');
+          document.documentElement.removeAttribute('zen-compact-animating');
+
+          this.getAndApplySidebarWidth({});
+          this._ignoreNextResize = true;
+
+          resolve();
+          return;
+        }
+        if (canHideSidebar && isCompactMode) {
+          const elementSeparation = ZenThemeModifier.elementSeparation;
+          if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
+            sidebarWidth -= 0.5 * splitterWidth;
+            if (elementSeparation < splitterWidth) {
+              // Subtract from the splitter width to end up with the correct element separation
+              sidebarWidth += 1.5 * splitterWidth - elementSeparation;
             }
-          )
-          .then(() => {
-            window.requestAnimationFrame(() => {
+          }
+          gZenUIManager.motion
+            .animate(
+              this.sidebar,
+              {
+                marginRight: this.sidebarIsOnRight ? `-${sidebarWidth}px` : 0,
+                marginLeft: this.sidebarIsOnRight ? 0 : `-${sidebarWidth}px`,
+              },
+              {
+                ease: 'easeIn',
+                type: 'spring',
+                bounce: 0,
+                duration: 0.2,
+              }
+            )
+            .then(() => {
               this.sidebar.style.transition = 'none';
+              this.sidebar.style.opacity = 0;
+              setTimeout(() => {
+                this.sidebar.removeAttribute('animate');
+                document.documentElement.removeAttribute('zen-compact-animating');
+
+                this.getAndApplySidebarWidth({});
+                this._ignoreNextResize = true;
+
+                this.sidebar.style.removeProperty('margin-right');
+                this.sidebar.style.removeProperty('margin-left');
+                this.sidebar.style.removeProperty('opacity');
+                this.sidebar.style.removeProperty('transition');
+
+                resolve();
+              }, 0);
+            });
+        } else if (canHideSidebar && !isCompactMode) {
+          document.getElementById('browser').style.overflow = 'clip';
+          if (this.sidebarIsOnRight) {
+            this.sidebar.style.marginRight = `-${sidebarWidth}px`;
+          } else {
+            this.sidebar.style.marginLeft = `-${sidebarWidth}px`;
+          }
+          gZenUIManager.motion
+            .animate(
+              this.sidebar,
+              this.sidebarIsOnRight
+                ? {
+                    marginRight: [`-${sidebarWidth}px`, 0],
+                    transform: ['translateX(100%)', 'translateX(0)'],
+                  }
+                : { marginLeft: 0 },
+              {
+                ease: 'easeOut',
+                type: 'spring',
+                bounce: 0,
+                duration: 0.2,
+              }
+            )
+            .then(() => {
               this.sidebar.removeAttribute('animate');
-              this.sidebar.style.visibility = 'hidden';
+              document.getElementById('browser').style.removeProperty('overflow');
+              this.sidebar.style.transition = 'none';
               this.sidebar.style.removeProperty('margin-right');
               this.sidebar.style.removeProperty('margin-left');
               this.sidebar.style.removeProperty('transform');
+              document.documentElement.removeAttribute('zen-compact-animating');
               setTimeout(() => {
-                this._animating = false;
-                this.sidebar.style.removeProperty('visibility');
                 this.sidebar.style.removeProperty('transition');
-                this.sidebar.style.removeProperty('opacity');
-              }, 300);
+                resolve();
+              });
             });
-          });
-      } else if (canHideSidebar && !isCompactMode) {
-        document.getElementById('browser').style.overflow = 'clip';
-        if (this.sidebarIsOnRight) {
-          this.sidebar.style.marginRight = `-${sidebarWidth}px`;
         } else {
-          this.sidebar.style.marginLeft = `-${sidebarWidth}px`;
+          this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
+          document.documentElement.removeAttribute('zen-compact-animating');
         }
-        gZenUIManager.motion
-          .animate(
-            this.sidebar,
-            this.sidebarIsOnRight
-              ? {
-                  marginRight: [`-${sidebarWidth}px`, 0],
-                  transform: ['translateX(100%)', 'translateX(0)'],
-                }
-              : { marginLeft: 0 },
-            {
-              ease: 'easeOut',
-              type: 'spring',
-              bounce: 0,
-              duration: 0.2,
-            }
-          )
-          .then(() => {
-            this.sidebar.removeAttribute('animate');
-            document.getElementById('browser').style.removeProperty('overflow');
-            this.sidebar.style.transition = 'none';
-            this.sidebar.style.removeProperty('margin-right');
-            this.sidebar.style.removeProperty('margin-left');
-            this.sidebar.style.removeProperty('transform');
-            this._animating = false;
-            setTimeout(() => {
-              this.sidebar.style.removeProperty('transition');
-            });
-          });
-      } else {
-        this.sidebar.removeAttribute('animate'); // remove the attribute if we are not animating
-        this._animating = false;
-      }
+      });
     });
   },
 
@@ -392,13 +430,6 @@ var gZenCompactModeManager = {
           }
         }
 
-        // When moving the cursor between the url bar and bookmarks, or in-between bookmarks in the bookmark bar, the
-        // mouseLeave event is triggered without a relatedTarget.
-        // TODO: Experiment with this for some time, see if people still have issues with the hover state
-        //if (event.relatedTarget == null) {
-        //  return;
-        //}
-
         // If it's a child element but not the target, ignore the event
         if (target.contains(event.explicitOriginalTarget) && event.explicitOriginalTarget !== target) {
           return;
@@ -476,3 +507,11 @@ var gZenCompactModeManager = {
     }
   },
 };
+
+document.addEventListener(
+  'MozBeforeInitialXULLayout',
+  () => {
+    gZenCompactModeManager.preInit();
+  },
+  { once: true }
+);

src/browser/base/zen-components/ZenGlanceManager.mjs

@@ -228,20 +228,27 @@
 
     _clearContainerStyles(container) {
       const inset = container.style.inset;
-      window.requestAnimationFrame(() => {
-        container.removeAttribute('style');
-        container.style.inset = inset;
-      });
+      container.removeAttribute('style');
+      container.style.inset = inset;
     }
 
-    closeGlance({ noAnimation = false, onTabClose = false, setNewID = null, isDifferent = false, hasFocused = false } = {}) {
+    closeGlance({
+      noAnimation = false,
+      onTabClose = false,
+      setNewID = null,
+      isDifferent = false,
+      hasFocused = false,
+      skipPermitUnload = false,
+    } = {}) {
       if (this._animating || !this.#currentBrowser || this.animatingOpen || this._duringOpening) {
         return;
       }
 
-      let { permitUnload } = this.#currentBrowser.permitUnload();
-      if (!permitUnload) {
-        return;
+      if (!skipPermitUnload) {
+        let { permitUnload } = this.#currentBrowser.permitUnload();
+        if (!permitUnload) {
+          return;
+        }
       }
 
       if (onTabClose && hasFocused && !this.#confirmationTimeout) {
@@ -457,8 +464,12 @@
       this.#currentGlanceID = tab.getAttribute('glance-id');
       if (gBrowser.selectedTab === this.#currentParentTab && this.#currentBrowser) {
         const curTab = this.#currentTab;
+        const prevTab = event.detail.previousTab;
         setTimeout(() => {
           gBrowser.selectedTab = curTab;
+          if (prevTab?.linkedBrowser) {
+            prevTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('deck-selected');
+          }
         }, 0);
       } else if (gBrowser.selectedTab === this.#currentTab) {
         setTimeout(this.onLocationChangeOpenGlance.bind(this), 0);
@@ -545,20 +556,22 @@
       this.overlay.classList.remove('zen-glance-overlay');
       this._clearContainerStyles(this.browserWrapper);
       this.animatingFullOpen = false;
-      this.closeGlance({ noAnimation: true });
+      this.closeGlance({ noAnimation: true, skipPermitUnload: true });
       this.#glances.delete(this.#currentGlanceID);
     }
 
     async fullyOpenGlance({ forSplit = false } = {}) {
       this.animatingFullOpen = true;
+      this.#currentTab.setAttribute('zen-dont-split-glance', true);
+
       gBrowser._insertTabAtIndex(this.#currentTab, {
         index: this.getTabPosition(this.#currentTab),
       });
 
+      this.#currentTab.removeAttribute('zen-glance-tab');
       this._clearContainerStyles(this.browserWrapper);
       this.browserWrapper.removeAttribute('has-finished-animation');
       this.browserWrapper.setAttribute('animate-full', true);
-      this.#currentTab.removeAttribute('zen-glance-tab');
       this.#currentTab.removeAttribute('glance-id');
       this.#currentParentTab.removeAttribute('glance-id');
       gBrowser.selectedTab = this.#currentTab;

src/browser/base/zen-components/ZenGradientGenerator.mjs

@@ -366,13 +366,13 @@
     addColorToCustomList(color) {
       const listItems = window.MozXULElement.parseXULToFragment(`
         <hbox class="zen-theme-picker-custom-list-item">
-          <html:div class="zen-theme-picker-dot-custom"></html:div>
+          <html:div class="zen-theme-picker-dot custom"></html:div>
           <label class="zen-theme-picker-custom-list-item-label"></label>
           <toolbarbutton class="zen-theme-picker-custom-list-item-remove toolbarbutton-1" oncommand="gZenThemePicker.removeCustomColor(event);"></toolbarbutton>
         </hbox>
       `);
       listItems.querySelector('.zen-theme-picker-custom-list-item').setAttribute('data-color', color);
-      listItems.querySelector('.zen-theme-picker-dot-custom').style.setProperty('--zen-theme-picker-dot-color', color);
+      listItems.querySelector('.zen-theme-picker-dot').style.setProperty('--zen-theme-picker-dot-color', color);
       listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color;
 
       this.customColorList.appendChild(listItems);

src/browser/base/zen-components/ZenPinnedTabManager.mjs

@@ -386,8 +386,8 @@
       await this._resetTabToStoredState(tab);
     }
 
-    async replacePinnedUrlWithCurrent() {
-      const tab = TabContextMenu.contextTab;
+    async replacePinnedUrlWithCurrent(tab = undefined) {
+      tab ??= TabContextMenu.contextTab;
       if (!tab || !tab.pinned || !tab.getAttribute('zen-pin-id')) {
         return;
       }
@@ -806,8 +806,11 @@
       if (!pin) {
         return;
       }
+      // Remove # and ? from the url
+      const pinUrl = pin.url.split('#')[0].split('?')[0];
+      const currentUrl = browser.currentURI.spec.split('#')[0].split('?')[0];
       // Add an indicator that the pin has been changed
-      if (pin.url === browser.currentURI.spec) {
+      if (pinUrl === currentUrl) {
         this.resetPinChangedUrl(tab);
         return;
       }
@@ -967,6 +970,20 @@
         indicator.style.removeProperty('top');
       }
     }
+
+    async onTabLabelChanged(tab) {
+      if (!this._pinsCache) {
+        return;
+      }
+      // If our current pin in the cache point to about:blank, we need to update the entry
+      const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
+      if (!pin) {
+        return;
+      }
+      if (pin.url === 'about:blank') {
+        await this.replacePinnedUrlWithCurrent(tab);
+      }
+    }
   }
 
   window.gZenPinnedTabManager = new ZenPinnedTabManager();

src/browser/base/zen-components/ZenTabUnloader.mjs

@@ -63,48 +63,12 @@
     static INTERVAL = 1000 * 60; // 1 minute
 
     interval = null;
+    /** @type {ZenTabUnloader} */
     unloader = null;
 
-    #excludedUrls = [];
-    #compiledExcludedUrls = [];
-
     constructor(unloader) {
       this.unloader = unloader;
       this.interval = setInterval(this.intervalListener.bind(this), ZenTabsIntervalUnloader.INTERVAL);
-      this.#excludedUrls = this.lazyExcludeUrls;
-    }
-
-    get lazyExcludeUrls() {
-      return [
-        ...ZEN_TAB_UNLOADER_DEFAULT_EXCLUDED_URLS,
-        ...lazy.zenTabUnloaderExcludedUrls.split(',').map((url) => url.trim()),
-      ];
-    }
-
-    arraysEqual(a, b) {
-      if (a === b) return true;
-      if (a == null || b == null) return false;
-      if (a.length !== b.length) return false;
-
-      // If you don't care about the order of the elements inside
-      // the array, you should sort both arrays here.
-      // Please note that calling sort on an array will modify that array.
-      // you might want to clone your array first.
-
-      for (var i = 0; i < a.length; ++i) {
-        if (a[i] !== b[i]) return false;
-      }
-      return true;
-    }
-
-    get excludedUrls() {
-      // Check if excludedrls is the same as the pref value
-      const excludedUrls = this.lazyExcludeUrls;
-      if (!this.arraysEqual(this.#excludedUrls, excludedUrls) || !this.#compiledExcludedUrls.length) {
-        this.#excludedUrls = excludedUrls;
-        this.#compiledExcludedUrls = excludedUrls.map((url) => new RegExp(url));
-      }
-      return this.#compiledExcludedUrls;
     }
 
     intervalListener() {
@@ -112,11 +76,10 @@
         return;
       }
       const currentTimestamp = Date.now();
-      const excludedUrls = this.excludedUrls;
       const tabs = ZenWorkspaces.allStoredTabs;
       for (let i = 0; i < tabs.length; i++) {
         const tab = tabs[i];
-        if (this.unloader.canUnloadTab(tab, currentTimestamp, excludedUrls)) {
+        if (this.unloader.canUnloadTab(tab, currentTimestamp)) {
           this.unloader.unload(tab);
         }
       }
@@ -126,8 +89,14 @@
   class ZenTabUnloader extends ZenDOMOperatedFeature {
     static ACTIVITY_MODIFIERS = ['muted', 'soundplaying', 'label', 'attention'];
 
+    #excludedUrls = [];
+    #compiledExcludedUrls = [];
+    #lastCheckedUrlTimestamp = 0;
+
     constructor() {
       super();
+
+      this.#excludedUrls = this.lazyExcludeUrls;
       if (!lazy.zenTabUnloaderEnabled) {
         return;
       }
@@ -217,6 +186,45 @@
       document.getElementById('context_closeDuplicateTabs').parentNode.appendChild(element);
     }
 
+    get lazyExcludeUrls() {
+      return [
+        ...ZEN_TAB_UNLOADER_DEFAULT_EXCLUDED_URLS,
+        ...lazy.zenTabUnloaderExcludedUrls.split(',').map((url) => url.trim()),
+      ];
+    }
+
+    arraysEqual(a, b) {
+      if (a === b) return true;
+      if (a == null || b == null) return false;
+      if (a.length !== b.length) return false;
+
+      const currentTimestamp = Date.now();
+      if (currentTimestamp - this.#lastCheckedUrlTimestamp < 5 * 1000) {
+        return true;
+      }
+
+      this.#lastCheckedUrlTimestamp = currentTimestamp;
+      // If you don't care about the order of the elements inside
+      // the array, you should sort both arrays here.
+      // Please note that calling sort on an array will modify that array.
+      // you might want to clone your array first.
+
+      for (let i = 0; i < a.length; ++i) {
+        if (a[i] !== b[i]) return false;
+      }
+      return true;
+    }
+
+    get excludedUrls() {
+      // Check if excludedrls is the same as the pref value
+      const excludedUrls = this.lazyExcludeUrls;
+      if (!this.arraysEqual(this.#excludedUrls, excludedUrls) || !this.#compiledExcludedUrls.length) {
+        this.#excludedUrls = excludedUrls;
+        this.#compiledExcludedUrls = excludedUrls.map((url) => new RegExp(url));
+      }
+      return this.#compiledExcludedUrls;
+    }
+
     unload(tab, skipPermitUnload = false) {
       gBrowser.explicitUnloadTabs([tab], skipPermitUnload);
       tab.removeAttribute('linkedpanel');
@@ -229,7 +237,7 @@
 
     explicitUnloadTabs(tabs, extraArgs = {}) {
       for (let i = 0; i < tabs.length; i++) {
-        if (this.canUnloadTab(tabs[i], Date.now(), this.intervalUnloader.excludedUrls, true, extraArgs)) {
+        if (this.canUnloadTab(tabs[i], Date.now(), true, extraArgs)) {
           this.unload(tabs[i], true);
         }
       }
@@ -251,7 +259,7 @@
       }
     }
 
-    canUnloadTab(tab, currentTimestamp, excludedUrls, ignoreTimestamp = false, extraArgs = {}) {
+    canUnloadTab(tab, currentTimestamp, ignoreTimestamp = false, extraArgs = {}) {
       if (
         (tab.pinned && !ignoreTimestamp) ||
         tab.selected ||
@@ -266,7 +274,7 @@
         (tab.pictureinpicture && !ignoreTimestamp) ||
         (tab.soundPlaying && !ignoreTimestamp) ||
         (tab.zenIgnoreUnload && !ignoreTimestamp) ||
-        (excludedUrls.some((url) => url.test(tab.linkedBrowser?.currentURI.spec)) &&
+        (this.excludedUrls.some((url) => url.test(tab.linkedBrowser?.currentURI.spec)) &&
           tab.linkedBrowser?.currentURI.spec !== 'about:blank')
       ) {
         return false;

src/browser/base/zen-components/ZenViewSplitter.mjs

@@ -188,8 +188,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       this.fakeBrowser ||
       !this._lastOpenedTab ||
       (this._lastOpenedTab &&
-        (this._lastOpenedTab.getAttribute('zen-workspace-id') !== draggedTab.getAttribute('zen-workspace-id') ||
-          this._lastOpenedTab.hasAttribute('zen-essential')))
+        this._lastOpenedTab.getAttribute('zen-workspace-id') !== draggedTab.getAttribute('zen-workspace-id') &&
+        !this._lastOpenedTab.hasAttribute('zen-essential')) ||
+      draggedTab === this._lastOpenedTab
     ) {
       return;
     }
@@ -242,7 +243,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       }
       this.fakeBrowser = document.createXULElement('vbox');
       window.addEventListener('dragend', this.onBrowserDragEndToSplit, { once: true });
-      const padding = Services.prefs.getIntPref('zen.theme.content-element-separation', 0);
+      const padding = ZenThemeModifier.elementSeparation;
       this.fakeBrowser.setAttribute('flex', '1');
       this.fakeBrowser.id = 'zen-split-view-fake-browser';
       if (oldTab.splitView) {
@@ -317,7 +318,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     }
     const panelsWidth = panelsRect.width;
     const halfWidth = panelsWidth / 2;
-    const padding = Services.prefs.getIntPref('zen.theme.content-element-separation', 0);
+    const padding = ZenThemeModifier.elementSeparation;
     if (!this.fakeBrowser) {
       return;
     }
@@ -887,7 +888,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       return false;
     }
     for (const tab of window.gBrowser.selectedTabs) {
-      if (tab.splitView || tab.hasAttribute('zen-empty-tab') || tab.hasAttribute('zen-essential')) {
+      if (tab.splitView || tab.hasAttribute('zen-empty-tab')) {
         return false;
       }
     }
@@ -902,7 +903,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
   async onLocationChange(browser) {
     this.disableTabRearrangeView();
     let tab = window.gBrowser.getTabForBrowser(browser);
-    if (tab.hasAttribute('zen-glance-tab')) {
+    const ignoreSplit = tab.hasAttribute('zen-dont-split-glance');
+    tab.removeAttribute('zen-dont-split-glance');
+    if (tab.hasAttribute('zen-glance-tab') && !ignoreSplit) {
       // Extract from parent node so we are not selecting the wrong (current) tab
       tab = tab.parentNode.closest('.tabbrowser-tab');
       console.assert(tab, 'Tab not found for zen-glance-tab');
@@ -943,14 +946,14 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
    */
   splitTabs(tabs, gridType, initialIndex = 0) {
     // TODO: Add support for splitting essential tabs
-    tabs = tabs.filter((t) => !t.hidden && !t.hasAttribute('zen-empty-tab') && !t.hasAttribute('zen-essential'));
+    tabs = tabs.filter((t) => !t.hidden && !t.hasAttribute('zen-empty-tab'));
     if (tabs.length < 2 || tabs.length > this.MAX_TABS) {
       return;
     }
-    this._moveTabsToContainer(tabs, tabs[initialIndex]);
 
     const existingSplitTab = tabs.find((tab) => tab.splitView);
     if (existingSplitTab) {
+      this._moveTabsToContainer(tabs, tabs[initialIndex]);
       const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab));
       const group = this._data[groupIndex];
       const gridTypeChange = gridType && group.gridType !== gridType;
@@ -976,6 +979,23 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       this.activateSplitView(group, true);
       return;
     }
+
+    // We are here if none of the tabs have been previously split
+    // If there's ANY pinned tab on the list, we clone the pinned tab
+    // state to all the tabs
+    const allArePinned = tabs.every((tab) => tab.pinned);
+    const thereIsOnePinned = tabs.some((tab) => tab.pinned);
+    const thereIsOneEssential = tabs.some((tab) => tab.hasAttribute('zen-essential'));
+
+    if (thereIsOneEssential || (thereIsOnePinned && !allArePinned)) {
+      for (let i = 0; i < tabs.length; i++) {
+        const tab = tabs[i];
+        if (tab.pinned) {
+          tabs[i] = gBrowser.duplicateTab(tab, true);
+        }
+      }
+    }
+
     gridType ??= 'grid';
 
     const splitData = {
@@ -1505,7 +1525,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
 
     const dropSide = this.fakeBrowser?.getAttribute('side');
     const containerRect = this.fakeBrowser.getBoundingClientRect();
-    const padding = Services.prefs.getIntPref('zen.theme.content-element-separation', 0);
+    const padding = ZenThemeModifier.elementSeparation;
     const dropTarget = document.elementFromPoint(
       dropSide === 'left' ? containerRect.left + containerRect.width + padding + 5 : containerRect.left - padding - 5,
       event.clientY

src/browser/base/zen-components/ZenWorkspaces.mjs

@@ -1898,6 +1898,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const menuItem = document.createXULElement('menuitem');
       menuItem.setAttribute('label', workspace.name);
       menuItem.setAttribute('zen-workspace-id', workspace.uuid);
+      menuItem.setAttribute('command', 'cmd_zenChangeWorkspaceTab');
 
       if (workspace.uuid === activeWorkspace.uuid) {
         menuItem.setAttribute('disabled', 'true');
@@ -2208,7 +2209,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     const menuPopup = document.createXULElement('menupopup');
     menuPopup.setAttribute('id', 'context-zen-change-workspace-tab-menu-popup');
-    menuPopup.setAttribute('command', 'cmd_zenChangeWorkspaceTab');
 
     menu.appendChild(menuPopup);
 
@@ -2307,16 +2307,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   // Session restore functions
   get allStoredTabs() {
-    if (!this._hasInitializedTabsStrip) {
-      const children = this.tabboxChildren;
-      children.pop(); // Remove the last child which is the new tab button
-      return [
-        ...document.querySelectorAll('#zen-essentials-container tab'),
-        ...document.querySelectorAll('#vertical-pinned-tabs-container tab'),
-        ...children,
-      ];
-    }
-
     if (this._allStoredTabs) {
       return this._allStoredTabs;
     }
@@ -2324,8 +2314,12 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const tabs = [];
     // we need to go through each tab in each container
     const essentialsContainer = document.getElementById('zen-essentials-container');
-    const pinnedContainers = document.querySelectorAll('#vertical-pinned-tabs-container .zen-workspace-tabs-section');
-    const normalContainers = document.querySelectorAll('#tabbrowser-arrowscrollbox .zen-workspace-tabs-section');
+    let pinnedContainers = document.querySelectorAll('#vertical-pinned-tabs-container .zen-workspace-tabs-section');
+    let normalContainers = document.querySelectorAll('#tabbrowser-arrowscrollbox .zen-workspace-tabs-section');
+    if (!this._hasInitializedTabsStrip) {
+      pinnedContainers = [document.getElementById('vertical-pinned-tabs-container')];
+      normalContainers = [this.activeWorkspaceStrip];
+    }
     const containers = [essentialsContainer, ...pinnedContainers, ...normalContainers];
     for (const container of containers) {
       for (const tab of container.children) {

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

@@ -1,13 +1,15 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index af22f766a052372a68faca139161cccbf0d768f0..ceff0576321f880c71ce301e537f4d03ccca8a73 100644
+index af22f766a052372a68faca139161cccbf0d768f0..199591ca0609e8902e84a87baf50acc29f84ee3a 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-@@ -241,7 +241,7 @@ export var ToolbarContextMenu = {
+@@ -240,8 +240,8 @@ export var ToolbarContextMenu = {
+     // Show/hide sidebar and vertical tabs menu items
      let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
      let showSidebarActions =
-       ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
+-      ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
 -      toolbarItem?.localName == "toolbarspring";
-+      toolbarItem?.localName == "toolbarspring" && false;
++      (["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
++      toolbarItem?.localName == "toolbarspring") && false;
      let toggleVerticalTabsItem = document.getElementById(
        "toolbar-context-toggle-vertical-tabs"
      );

src/browser/components/sessionstore/SessionStore-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 6e2973abf428b110bfc553522723f327ee84c028..668cc147a1bf158bc42a7baf2a5549049d060899 100644
+index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047669c8c94 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -3186,7 +3186,7 @@ var SessionStoreInternal = {
@@ -11,15 +11,16 @@ index 6e2973abf428b110bfc553522723f327ee84c028..668cc147a1bf158bc42a7baf2a554904
        return;
      }
  
-@@ -3895,6 +3895,7 @@ var SessionStoreInternal = {
+@@ -3895,6 +3895,8 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
-+      tabState.zenEssential = undefined;
++      tabState.zenEssential = false;
++      tabState.zenPinnedId = null;
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -5399,14 +5400,15 @@ var SessionStoreInternal = {
+@@ -5399,14 +5401,15 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -37,7 +38,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..668cc147a1bf158bc42a7baf2a554904
          continue;
        }
        let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
-@@ -5425,7 +5427,7 @@ var SessionStoreInternal = {
+@@ -5425,7 +5428,7 @@ var SessionStoreInternal = {
      // We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
@@ -46,7 +47,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..668cc147a1bf158bc42a7baf2a554904
        selectedIndex = 1;
        winData.title = tabbrowser.tabs[0].label;
      }
-@@ -5582,6 +5584,7 @@ var SessionStoreInternal = {
+@@ -5582,6 +5585,7 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
@@ -54,7 +55,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..668cc147a1bf158bc42a7baf2a554904
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6130,8 +6133,23 @@ var SessionStoreInternal = {
+@@ -6130,8 +6134,23 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344b86e2a7c 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..cdffd1cb1b7744aecc56a8ce57b115e218b527ed 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -424,11 +424,67 @@
@@ -151,16 +151,17 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -1762,7 +1833,7 @@
+@@ -1762,7 +1833,8 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
 -      if (!aLabel || aLabel.includes("about:reader?")) {
++      gZenPinnedTabManager.onTabLabelChanged(aTab);
 +      if (!aLabel || aLabel.includes("about:reader?") || aTab.hasAttribute("zen-has-static-label")) {
          return false;
        }
  
-@@ -1865,7 +1936,7 @@
+@@ -1865,7 +1937,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
@@ -169,7 +170,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          let browser;
          if (targetTab) {
            browser = this.getBrowserForTab(targetTab);
-@@ -2122,6 +2193,7 @@
+@@ -2122,6 +2194,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -177,7 +178,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2195,8 +2267,7 @@
+@@ -2195,8 +2268,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -187,7 +188,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          b.setAttribute("transparent", "true");
        }
  
-@@ -2373,7 +2444,7 @@
+@@ -2373,7 +2445,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -196,7 +197,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2432,8 +2503,8 @@
+@@ -2432,8 +2504,8 @@
        // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
@@ -207,7 +208,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2655,6 +2726,7 @@
+@@ -2655,6 +2727,7 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -215,7 +216,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -2665,6 +2737,12 @@
+@@ -2665,6 +2738,12 @@
          );
        }
  
@@ -228,7 +229,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2728,6 +2806,16 @@
+@@ -2728,6 +2807,16 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -245,7 +246,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2752,6 +2840,7 @@
+@@ -2752,6 +2841,7 @@
            initialBrowsingContextGroupId,
            openWindowInfo,
            skipLoad,
@@ -253,7 +254,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          }));
  
          if (focusUrlBar) {
-@@ -2871,6 +2960,9 @@
+@@ -2871,6 +2961,9 @@
          }
        }
  
@@ -263,7 +264,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -2891,12 +2983,15 @@
+@@ -2891,12 +2984,15 @@
       * @param {string} [label=]
       * @returns {MozTabbrowserTabGroup}
       */
@@ -280,7 +281,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        return group;
      }
  
-@@ -2937,6 +3032,7 @@
+@@ -2937,6 +3033,7 @@
          insertBefore = null,
          isUserCreated = false,
          telemetryUserCreateSource = "unknown",
@@ -288,7 +289,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        } = {}
      ) {
        if (!tabs?.length) {
-@@ -2951,7 +3047,12 @@
+@@ -2951,7 +3048,12 @@
          id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
        }
        let group = this._createTabGroup(id, color, false, label);
@@ -302,7 +303,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          group,
          insertBefore?.group ?? insertBefore
        );
-@@ -3268,6 +3369,7 @@
+@@ -3268,6 +3370,7 @@
          initialBrowsingContextGroupId,
          openWindowInfo,
          skipLoad,
@@ -310,7 +311,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        }
      ) {
        // If we don't have a preferred remote type, and we have a remote
-@@ -3331,6 +3433,7 @@
+@@ -3331,6 +3434,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -318,7 +319,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          });
        }
  
-@@ -3509,6 +3612,27 @@
+@@ -3509,6 +3613,27 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -346,7 +347,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3522,6 +3646,7 @@
+@@ -3522,6 +3647,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -354,7 +355,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3557,7 +3682,27 @@
+@@ -3557,7 +3683,27 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -383,7 +384,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
            if (select) {
              tabToSelect = tab;
            }
-@@ -3570,8 +3715,8 @@
+@@ -3570,8 +3716,8 @@
            // inserted in the DOM. If the tab is not yet in the DOM,
            // just insert it in the right place from the start.
            if (!tab.parentNode) {
@@ -394,7 +395,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
              tab.toggleAttribute("pinned", true);
              this.tabContainer._invalidateCachedTabs();
              // Then ensure all the tab open/pinning information is sent.
-@@ -3581,7 +3726,8 @@
+@@ -3581,7 +3727,8 @@
              // needs calling:
              shouldUpdateForPinnedTabs = true;
            }
@@ -404,7 +405,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -3595,7 +3741,10 @@
+@@ -3595,7 +3742,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -416,7 +417,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -3646,6 +3795,9 @@
+@@ -3646,6 +3796,9 @@
          this.selectedTab = tabToSelect;
          this.removeTab(leftoverTab);
        }
@@ -426,7 +427,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -3830,7 +3982,7 @@
+@@ -3830,7 +3983,7 @@
        // Ensure we have an index if one was not provided.
        if (typeof index != "number") {
          // Move the new tab after another tab if needed, to the end otherwise.
@@ -435,7 +436,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3876,18 +4028,18 @@
+@@ -3876,18 +4029,18 @@
  
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -458,7 +459,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          if (tabAfter && tabAfter.group == tabGroup) {
            // Place at the front of, or between tabs in, the same tab group
            this.tabContainer.insertBefore(tab, tabAfter);
-@@ -4199,6 +4351,9 @@
+@@ -4199,6 +4352,9 @@
          return;
        }
  
@@ -468,7 +469,15 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        this.removeTabs(selectedTabs);
      }
  
-@@ -4556,6 +4711,7 @@
+@@ -4450,6 +4606,7 @@
+         skipGroupCheck = false,
+       } = {}
+     ) {
++      tabs = tabs.filter(tab => !tab.hasAttribute("zen-empty-tab"));
+       // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
+       // can be considered equivalent to closing the window.
+       if (
+@@ -4556,6 +4713,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -476,7 +485,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4572,6 +4728,12 @@
+@@ -4572,6 +4730,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -489,7 +498,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4586,7 +4748,9 @@
+@@ -4586,7 +4750,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -500,7 +509,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4600,7 +4764,6 @@
+@@ -4600,7 +4766,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -508,7 +517,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4739,14 +4902,14 @@
+@@ -4739,14 +4904,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -525,7 +534,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4770,6 +4933,7 @@
+@@ -4770,6 +4935,7 @@
  
          newTab = true;
        }
@@ -533,7 +542,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4810,9 +4974,7 @@
+@@ -4810,9 +4976,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -544,7 +553,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        } else {
          TabBarVisibility.update();
        }
-@@ -4941,6 +5103,8 @@
+@@ -4941,6 +5105,8 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -553,7 +562,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        if (!this._windowIsClosing) {
          if (wasPinned) {
            this.tabContainer._positionPinnedTabs();
-@@ -5064,8 +5228,8 @@
+@@ -5064,8 +5230,8 @@
        return closedCount;
      }
  
@@ -564,7 +573,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        if (unloadBlocked) {
          return;
        }
-@@ -5159,7 +5323,7 @@
+@@ -5159,7 +5325,7 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -573,7 +582,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        }
  
        // Try to find a remaining tab that comes after the given tab
-@@ -5181,7 +5345,7 @@
+@@ -5181,7 +5347,7 @@
        }
  
        if (tab) {
@@ -582,7 +591,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5599,10 +5763,10 @@
+@@ -5599,10 +5765,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -595,7 +604,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5838,7 +6002,7 @@
+@@ -5838,7 +6004,7 @@
      moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
        // Don't allow mixing pinned and unpinned tabs.
        if (aTab.pinned) {
@@ -604,7 +613,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        } else {
          aIndex = Math.max(aIndex, this.pinnedTabCount);
        }
-@@ -5848,10 +6012,17 @@
+@@ -5848,10 +6014,17 @@
  
        this.#handleTabMove(aTab, () => {
          let neighbor = this.tabs[aIndex];
@@ -624,7 +633,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
            neighbor.after(aTab);
          } else {
            this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5901,13 +6072,22 @@
+@@ -5901,13 +6074,22 @@
         * Bug 1955388 - prevent pinned tabs from commingling with non-pinned tabs
         * when there are hidden tabs present
         */
@@ -648,7 +657,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          if (tab.pinned && this.tabContainer.verticalMode) {
            return this.tabContainer.verticalPinnedTabsContainer;
          }
-@@ -5937,7 +6117,7 @@
+@@ -5937,7 +6119,7 @@
      }
  
      moveTabToGroup(aTab, aGroup) {
@@ -657,7 +666,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5961,6 +6141,10 @@
+@@ -5961,6 +6143,10 @@
  
        moveActionCallback();
  
@@ -668,7 +677,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -6015,7 +6199,7 @@
+@@ -6015,7 +6201,7 @@
          createLazyBrowser,
        };
  
@@ -677,7 +686,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
        if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
          params.pinned = true;
        }
-@@ -6765,7 +6949,7 @@
+@@ -6765,7 +6951,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -686,7 +695,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7671,6 +7855,7 @@
+@@ -7671,6 +7857,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -694,7 +703,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -8640,7 +8825,7 @@ var TabContextMenu = {
+@@ -8640,7 +8827,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;
@@ -703,7 +712,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8674,7 +8859,7 @@ var TabContextMenu = {
+@@ -8674,7 +8861,7 @@ var TabContextMenu = {
      let isFirstTab =
        !this.contextTabs[0].group &&
        (this.contextTabs[0] == visibleTabs[0] ||
@@ -712,7 +721,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8904,6 +9089,7 @@ var TabContextMenu = {
+@@ -8904,6 +9091,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e1db08a7c 100644
+index 6de4c2ac873b1424abee118a143ac377f26beb80..423e3aab4fd4fff9960caf8b8375d7bfcb90c733 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -52,18 +52,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
    }
  
    /**
-@@ -937,6 +955,10 @@ export class UrlbarInput {
-     // Nullify search mode before setURI so it won't try to restore it.
-     this.searchMode = null;
-     this.setURI(null, true, false, true);
-+    if (this.hasAttribute("zen-floating-urlbar")) {
-+      this.window.gBrowser.selectedBrowser.focus();
-+      return;
-+    }
-     if (this.value && this.focused) {
-       this.select();
-     }
-@@ -1092,7 +1114,11 @@ export class UrlbarInput {
+@@ -1092,7 +1110,11 @@ export class UrlbarInput {
      }
  
      if (!this.#providesSearchMode(result)) {
@@ -76,7 +65,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
      }
  
      this.controller.recordSelectedResult(event, result);
-@@ -2124,6 +2150,10 @@ export class UrlbarInput {
+@@ -2124,6 +2146,10 @@ export class UrlbarInput {
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -87,7 +76,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2146,6 +2176,11 @@ export class UrlbarInput {
+@@ -2146,6 +2172,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -99,19 +88,27 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
      // 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")) {
-@@ -2165,6 +2200,11 @@ export class UrlbarInput {
+@@ -2165,6 +2196,19 @@ export class UrlbarInput {
        return;
      }
  
 +    if (this._zenHandleUrlbarClose) {
 +      this._zenHandleUrlbarClose();
 +    }
++    
++    // Arc like URLbar: Blur the input on exit
++    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", !this.document.getElementById("navigator-toolbox").hasAttribute("zen-has-hover"));
++    this.window.gBrowser.selectedBrowser.focus();
++    this.window.setTimeout(() => {
++      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
++    }, 100);
++    
 +    this.removeAttribute("zen-floating-urlbar");
 +
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -2997,7 +3037,7 @@ export class UrlbarInput {
+@@ -2997,7 +3041,7 @@ export class UrlbarInput {
     */
    _trimValue(val) {
      let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -120,16 +117,18 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -3359,7 +3399,7 @@ export class UrlbarInput {
-     } else {
-       where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
+@@ -3367,6 +3411,10 @@ export class UrlbarInput {
+       }
+       reuseEmpty = true;
      }
--    if (lazy.UrlbarPrefs.get("openintab")) {
-+    if (lazy.UrlbarPrefs.get("openintab") || this.hasAttribute("zen-newtab")) {
-       if (where == "current") {
-         where = "tab";
-       } else if (where == "tab") {
-@@ -3374,6 +3414,9 @@ export class UrlbarInput {
++    if (this.hasAttribute("zen-newtab")) {
++      where = "tab";
++      reuseEmpty = true;
++    }
+     if (
+       where == "tab" &&
+       reuseEmpty &&
+@@ -3374,6 +3422,9 @@ export class UrlbarInput {
      ) {
        where = "current";
      }
@@ -139,7 +138,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
      return where;
    }
  
-@@ -4048,6 +4091,11 @@ export class UrlbarInput {
+@@ -4048,6 +4099,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -151,7 +150,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -4119,7 +4167,7 @@ export class UrlbarInput {
+@@ -4119,7 +4175,7 @@ export class UrlbarInput {
        }
      }
  
@@ -160,7 +159,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -4159,9 +4207,12 @@ export class UrlbarInput {
+@@ -4159,9 +4215,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -174,7 +173,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e
  
          if (
            event.target != this.inputField &&
-@@ -4171,8 +4222,8 @@ export class UrlbarInput {
+@@ -4171,8 +4230,8 @@ export class UrlbarInput {
            break;
          }
  

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

@@ -0,0 +1,12 @@
+diff --git a/browser/themes/shared/tabbrowser/ctrlTab.css b/browser/themes/shared/tabbrowser/ctrlTab.css
+index 645467864db4a73b7addf3a57fa892beaf9a9614..46907c1ac8a10e8aba8ad82530269b660add550d 100644
+--- a/browser/themes/shared/tabbrowser/ctrlTab.css
++++ b/browser/themes/shared/tabbrowser/ctrlTab.css
+@@ -12,6 +12,7 @@
+   --panel-color: white;
+   --panel-border-color: transparent;
+   --panel-padding: 20px 10px 10px;
++  --panel-shadow-margin: 0;
+ }
+ 
+ @media (-moz-platform: macos) {

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

@@ -1181,6 +1181,24 @@ menupopup > menuitem:is([type='checkbox']) .menu-iconic-left {
   list-style-image: url('close.svg') !important;
 }
 
+#zen-media-mute-mic-button {
+  list-style-image: url('microphone-fill.svg') !important;
+}
+
+#zen-media-controls-toolbar[mic-muted] #zen-media-mute-mic-button {
+  list-style-image: url('microphone-blocked-fill.svg') !important;
+  fill: rgb(224, 41, 29);
+}
+
+#zen-media-mute-camera-button {
+  list-style-image: url('video-fill.svg') !important;
+}
+
+#zen-media-controls-toolbar[camera-muted] #zen-media-mute-camera-button {
+  list-style-image: url('video-blocked-fill.svg') !important;
+  fill: rgb(224, 41, 29);
+}
+
 #zen-media-pip-button {
   list-style-image: url('chrome://global/skin/media/picture-in-picture-open.svg') !important;
 }

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

@@ -75,7 +75,9 @@
   skin/classic/browser/zen-icons/media-unmute.svg                      (../shared/zen-icons/lin/media-unmute.svg) 
   skin/classic/browser/zen-icons/menu-bar.svg                      (../shared/zen-icons/lin/menu-bar.svg) 
   skin/classic/browser/zen-icons/menu.svg                      (../shared/zen-icons/lin/menu.svg) 
+  skin/classic/browser/zen-icons/microphone-blocked-fill.svg                      (../shared/zen-icons/lin/microphone-blocked-fill.svg) 
   skin/classic/browser/zen-icons/microphone-blocked.svg                      (../shared/zen-icons/lin/microphone-blocked.svg) 
+  skin/classic/browser/zen-icons/microphone-fill.svg                      (../shared/zen-icons/lin/microphone-fill.svg) 
   skin/classic/browser/zen-icons/microphone.svg                      (../shared/zen-icons/lin/microphone.svg) 
   skin/classic/browser/zen-icons/midi.svg                      (../shared/zen-icons/lin/midi.svg) 
   skin/classic/browser/zen-icons/move-tab.svg                      (../shared/zen-icons/lin/move-tab.svg) 
@@ -125,8 +127,10 @@
   skin/classic/browser/zen-icons/tracking-protection.svg                      (../shared/zen-icons/lin/tracking-protection.svg) 
   skin/classic/browser/zen-icons/translations.svg                      (../shared/zen-icons/lin/translations.svg) 
   skin/classic/browser/zen-icons/unpin.svg                      (../shared/zen-icons/lin/unpin.svg) 
+  skin/classic/browser/zen-icons/video-blocked-fill.svg                      (../shared/zen-icons/lin/video-blocked-fill.svg) 
   skin/classic/browser/zen-icons/video-open.svg                      (../shared/zen-icons/lin/video-open.svg) 
   skin/classic/browser/zen-icons/video-save.svg                      (../shared/zen-icons/lin/video-save.svg) 
+  skin/classic/browser/zen-icons/video-fill.svg                      (../shared/zen-icons/lin/video-fill.svg) 
   skin/classic/browser/zen-icons/window.svg                      (../shared/zen-icons/lin/window.svg) 
   skin/classic/browser/zen-icons/xr-blocked.svg                      (../shared/zen-icons/lin/xr-blocked.svg) 
   skin/classic/browser/zen-icons/xr.svg                      (../shared/zen-icons/lin/xr.svg) 
@@ -209,7 +213,9 @@
   skin/classic/browser/zen-icons/media-unmute.svg                      (../shared/zen-icons/lin/media-unmute.svg) 
   skin/classic/browser/zen-icons/menu-bar.svg                      (../shared/zen-icons/lin/menu-bar.svg) 
   skin/classic/browser/zen-icons/menu.svg                      (../shared/zen-icons/lin/menu.svg) 
+  skin/classic/browser/zen-icons/microphone-blocked-fill.svg                      (../shared/zen-icons/lin/microphone-blocked-fill.svg) 
   skin/classic/browser/zen-icons/microphone-blocked.svg                      (../shared/zen-icons/lin/microphone-blocked.svg) 
+  skin/classic/browser/zen-icons/microphone-fill.svg                      (../shared/zen-icons/lin/microphone-fill.svg) 
   skin/classic/browser/zen-icons/microphone.svg                      (../shared/zen-icons/lin/microphone.svg) 
   skin/classic/browser/zen-icons/midi.svg                      (../shared/zen-icons/lin/midi.svg) 
   skin/classic/browser/zen-icons/move-tab.svg                      (../shared/zen-icons/lin/move-tab.svg) 
@@ -259,8 +265,10 @@
   skin/classic/browser/zen-icons/tracking-protection.svg                      (../shared/zen-icons/lin/tracking-protection.svg) 
   skin/classic/browser/zen-icons/translations.svg                      (../shared/zen-icons/lin/translations.svg) 
   skin/classic/browser/zen-icons/unpin.svg                      (../shared/zen-icons/lin/unpin.svg) 
+  skin/classic/browser/zen-icons/video-blocked-fill.svg                      (../shared/zen-icons/lin/video-blocked-fill.svg) 
   skin/classic/browser/zen-icons/video-open.svg                      (../shared/zen-icons/lin/video-open.svg) 
   skin/classic/browser/zen-icons/video-save.svg                      (../shared/zen-icons/lin/video-save.svg) 
+  skin/classic/browser/zen-icons/video-fill.svg                      (../shared/zen-icons/lin/video-fill.svg) 
   skin/classic/browser/zen-icons/window.svg                      (../shared/zen-icons/lin/window.svg) 
   skin/classic/browser/zen-icons/xr-blocked.svg                      (../shared/zen-icons/lin/xr-blocked.svg) 
   skin/classic/browser/zen-icons/xr.svg                      (../shared/zen-icons/lin/xr.svg) 
@@ -343,7 +351,9 @@
   skin/classic/browser/zen-icons/media-unmute.svg                      (../shared/zen-icons/lin/media-unmute.svg) 
   skin/classic/browser/zen-icons/menu-bar.svg                      (../shared/zen-icons/lin/menu-bar.svg) 
   skin/classic/browser/zen-icons/menu.svg                      (../shared/zen-icons/lin/menu.svg) 
+  skin/classic/browser/zen-icons/microphone-blocked-fill.svg                      (../shared/zen-icons/lin/microphone-blocked-fill.svg) 
   skin/classic/browser/zen-icons/microphone-blocked.svg                      (../shared/zen-icons/lin/microphone-blocked.svg) 
+  skin/classic/browser/zen-icons/microphone-fill.svg                      (../shared/zen-icons/lin/microphone-fill.svg) 
   skin/classic/browser/zen-icons/microphone.svg                      (../shared/zen-icons/lin/microphone.svg) 
   skin/classic/browser/zen-icons/midi.svg                      (../shared/zen-icons/lin/midi.svg) 
   skin/classic/browser/zen-icons/move-tab.svg                      (../shared/zen-icons/lin/move-tab.svg) 
@@ -393,8 +403,10 @@
   skin/classic/browser/zen-icons/tracking-protection.svg                      (../shared/zen-icons/lin/tracking-protection.svg) 
   skin/classic/browser/zen-icons/translations.svg                      (../shared/zen-icons/lin/translations.svg) 
   skin/classic/browser/zen-icons/unpin.svg                      (../shared/zen-icons/lin/unpin.svg) 
+  skin/classic/browser/zen-icons/video-blocked-fill.svg                      (../shared/zen-icons/lin/video-blocked-fill.svg) 
   skin/classic/browser/zen-icons/video-open.svg                      (../shared/zen-icons/lin/video-open.svg) 
   skin/classic/browser/zen-icons/video-save.svg                      (../shared/zen-icons/lin/video-save.svg) 
+  skin/classic/browser/zen-icons/video-fill.svg                      (../shared/zen-icons/lin/video-fill.svg) 
   skin/classic/browser/zen-icons/window.svg                      (../shared/zen-icons/lin/window.svg) 
   skin/classic/browser/zen-icons/xr-blocked.svg                      (../shared/zen-icons/lin/xr-blocked.svg) 
   skin/classic/browser/zen-icons/xr.svg                      (../shared/zen-icons/lin/xr.svg) 

src/browser/themes/shared/zen-icons/lin/microphone-blocked-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M6.721,11.279l6.279-6.279c0-2.206-1.794-4-4-4s-4,1.794-4,4v3c0,1.358,.683,2.556,1.721,3.279Z" fill="context-fill" stroke-opacity="context-fill-opacity"></path><path d="M9.202,11.979c2.042-.104,3.673-1.736,3.777-3.777l-3.777,3.777Z" fill="context-fill" stroke-opacity="context-fill-opacity"></path><path d="M4.583,13.417l1.066-1.066c-1.304-1.006-2.149-2.58-2.149-4.351,0-.414-.336-.75-.75-.75s-.75,.336-.75,.75c0,2.185,1.01,4.133,2.583,5.417Z" fill="context-fill" stroke-opacity="context-fill-opacity" data-color="color-2"></path><path d="M15.25,7.25c-.414,0-.75,.336-.75,.75,0,3.033-2.467,5.5-5.5,5.5-.408,0-.804-.048-1.186-.132l-1.203,1.203c.521,.19,1.069,.327,1.639,.388v1.292c0,.414,.336,.75,.75,.75s.75-.336,.75-.75v-1.292c3.508-.376,6.25-3.352,6.25-6.958,0-.414-.336-.75-.75-.75Z" fill="context-fill" stroke-opacity="context-fill-opacity" data-color="color-2"></path><path d="M2,16.75c-.192,0-.384-.073-.53-.22-.293-.293-.293-.768,0-1.061L15.47,1.47c.293-.293,.768-.293,1.061,0s.293,.768,0,1.061L2.53,16.53c-.146,.146-.338,.22-.53,.22Z" fill="context-fill" stroke-opacity="context-fill-opacity" data-color="color-2"></path></svg>

src/browser/themes/shared/zen-icons/lin/microphone-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M9,12c2.206,0,4-1.794,4-4v-3c0-2.206-1.794-4-4-4s-4,1.794-4,4v3c0,2.206,1.794,4,4,4Z" fill="context-fill" stroke-opacity="context-fill-opacity"></path><path d="M15.25,7.25c-.414,0-.75,.336-.75,.75,0,3.033-2.467,5.5-5.5,5.5s-5.5-2.467-5.5-5.5c0-.414-.336-.75-.75-.75s-.75,.336-.75,.75c0,3.606,2.742,6.583,6.25,6.958v1.292c0,.414,.336,.75,.75,.75s.75-.336,.75-.75v-1.292c3.508-.376,6.25-3.352,6.25-6.958,0-.414-.336-.75-.75-.75Z" fill="context-fill" stroke-opacity="context-fill-opacity" data-color="color-2"></path></svg>

src/browser/themes/shared/zen-icons/lin/video-blocked-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M6.182,15h3.568c1.517,0,2.75-1.233,2.75-2.75v-3.568l-6.318,6.318Z" fill="context-fill" stroke-opacity="context-fill-opacity"></path><path d="M3.089,14.911L12.477,5.523c-.118-1.409-1.288-2.523-2.727-2.523H3.75c-1.517,0-2.75,1.233-2.75,2.75v6.5c0,1.288,.893,2.363,2.089,2.661Zm1.911-8.911c.552,0,1,.448,1,1s-.448,1-1,1-1-.448-1-1,.448-1,1-1Z" fill="context-fill" stroke-opacity="context-fill-opacity"></path><path d="M17.386,5.019c-.368-.217-.805-.227-1.183-.04l-2.203,2.203v4.637l2.147,1.181c.19,.105,.397,.157,.604,.157,.219,0,.438-.059,.635-.175,.385-.228,.614-.63,.614-1.077V6.096c0-.447-.229-.849-.614-1.077Z" fill="context-fill" stroke-opacity="context-fill-opacity"></path><path d="M2,16.75c-.192,0-.384-.073-.53-.22-.293-.293-.293-.768,0-1.061L15.47,1.47c.293-.293,.768-.293,1.061,0s.293,.768,0,1.061L2.53,16.53c-.146,.146-.338,.22-.53,.22Z" fill="context-fill" stroke-opacity="context-fill-opacity" data-color="color-2"></path></svg>

src/browser/themes/shared/zen-icons/lin/video-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px" viewBox="0 0 18 18"><path d="M17.386,5.019c-.385-.227-.848-.234-1.238-.019l-2.148,1.181v5.637l2.147,1.181c.19,.105,.397,.157,.604,.157,.219,0,.438-.059,.635-.175,.385-.228,.614-.63,.614-1.077V6.096c0-.447-.229-.849-.614-1.077Z" fill="context-fill" stroke-opacity="context-fill-opacity" data-color="color-2"></path><path d="M9.75,3H3.75c-1.517,0-2.75,1.233-2.75,2.75v6.5c0,1.517,1.233,2.75,2.75,2.75h6c1.517,0,2.75-1.233,2.75-2.75V5.75c0-1.517-1.233-2.75-2.75-2.75Zm-4.75,5c-.552,0-1-.448-1-1s.448-1,1-1,1,.448,1,1-.448,1-1,1Z" fill="context-fill" stroke-opacity="context-fill-opacity"></path></svg>

src/devtools/server/actors/animation-type-longhand-js.patch

@@ -0,0 +1,12 @@
+diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
+index a7faa2a2f17144198338aa80207ccf33b631cf32..7c15f8d8d533721b661866643cf10b37c99cb051 100644
+--- a/devtools/server/actors/animation-type-longhand.js
++++ b/devtools/server/actors/animation-type-longhand.js
+@@ -341,6 +341,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
+       "transform-origin",
+       "translate",
+       "-moz-window-transform",
++      "-zen-window-transform-origin",
+       "-webkit-line-clamp",
+     ]),
+   ],

src/dom/base/use_counter_metrics-yaml.patch

@@ -0,0 +1,50 @@
+diff --git a/dom/base/use_counter_metrics.yaml b/dom/base/use_counter_metrics.yaml
+index ffdb908e5760eea8643f3c3f85979cb5f7ff36ae..8ab16b5283f8c15f20b0d630a9b5fc82ec803af5 100644
+--- a/dom/base/use_counter_metrics.yaml
++++ b/dom/base/use_counter_metrics.yaml
+@@ -21289,6 +21289,22 @@ use.counter.css.page:
+     send_in_pings:
+       - use-counters
+ 
++  css_zen_window_transform_origin:
++    type: counter
++    description: >
++      Whether a page used the CSS property -zen-window-transform-origin.
++      Compare against `use.counter.top_level_content_documents_destroyed`
++      to calculate the rate.
++    bugs:
++      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098
++    data_reviews:
++      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098
++    notification_emails:
++      - dom-core@mozilla.com
++    expires: never
++    send_in_pings:
++      - use-counters
++
+   css_transform_origin:
+     type: counter
+     description: >
+@@ -33259,6 +33275,22 @@ use.counter.css.doc:
+     send_in_pings:
+       - use-counters
+ 
++  css_zen_window_transform_origin:
++    type: counter
++    description: >
++      Whether a document used the CSS property -zen-window-transform-origin.
++      Compare against `use.counter.content_documents_destroyed`
++      to calculate the rate.
++    bugs:
++      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098
++    data_reviews:
++      - https://bugzilla.mozilla.org/show_bug.cgi?id=1852098
++    notification_emails:
++      - dom-core@mozilla.com
++    expires: never
++    send_in_pings:
++      - use-counters
++
+   css_transform_origin:
+     type: counter
+     description: >

src/layout/generic/nsIFrame-cpp.patch

@@ -0,0 +1,16 @@
+diff --git a/layout/generic/nsIFrame.cpp b/layout/generic/nsIFrame.cpp
+index 01f724b0c42999107c4622323f849ddd2a6fe5c9..9dafa755c711c43c11835dfe9f7ba1b70b52b9a3 100644
+--- a/layout/generic/nsIFrame.cpp
++++ b/layout/generic/nsIFrame.cpp
+@@ -11694,6 +11694,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const {
+   gfx::Matrix4x4 matrix = nsStyleTransformMatrix::ReadTransforms(
+       uiReset->mMozWindowTransform, refBox, float(appUnitsPerDevPixel));
+ 
++  const StyleTransformOrigin& origin = uiReset->mWindowTransformOrigin;
++  Point transformOrigin = nsStyleTransformMatrix::Convert2DPosition(
++      origin.horizontal, origin.vertical, refBox, appUnitsPerDevPixel);
++  matrix.ChangeBasis(Point3D(transformOrigin.x, transformOrigin.y, 0));
++
+   gfx::Matrix result2d;
+   if (!matrix.CanDraw2D(&result2d)) {
+     // FIXME: It would be preferable to reject non-2D transforms at parse time.

src/layout/style/nsStyleStruct-cpp.patch

@@ -0,0 +1,22 @@
+diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
+index f89bade8099183baa55b38ccc3c77c7ba9f1a290..8ada58a7965e7f2c9375d8b9bf64a5c78d80bf3f 100644
+--- a/layout/style/nsStyleStruct.cpp
++++ b/layout/style/nsStyleStruct.cpp
+@@ -3204,6 +3204,9 @@ nsStyleUIReset::nsStyleUIReset()
+       mWindowShadow(StyleWindowShadow::Auto),
+       mWindowOpacity(1.0),
+       mMozWindowInputRegionMargin(StyleLength::Zero()),
++      mWindowTransformOrigin{LengthPercentage::FromPercentage(0.5),
++                                   LengthPercentage::FromPercentage(0.5),
++                                   {0.}},
+       mTransitions(
+           nsStyleAutoArray<StyleTransition>::WITH_SINGLE_INITIAL_ELEMENT),
+       mTransitionTimingFunctionCount(1),
+@@ -3247,6 +3250,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
+       mWindowOpacity(aSource.mWindowOpacity),
+       mMozWindowInputRegionMargin(aSource.mMozWindowInputRegionMargin),
+       mMozWindowTransform(aSource.mMozWindowTransform),
++      mWindowTransformOrigin(aSource.mWindowTransformOrigin),
+       mTransitions(aSource.mTransitions.Clone()),
+       mTransitionTimingFunctionCount(aSource.mTransitionTimingFunctionCount),
+       mTransitionDurationCount(aSource.mTransitionDurationCount),

src/layout/style/nsStyleStruct-h.patch

@@ -0,0 +1,12 @@
+diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
+index 97eed3431394e21eb7b8890fd87aea8240e23f2b..898d5876c03f822e9e0f2ec892ee86e0d17daf73 100644
+--- a/layout/style/nsStyleStruct.h
++++ b/layout/style/nsStyleStruct.h
+@@ -1875,6 +1875,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset {
+   // The margin of the window region that should be transparent to events.
+   mozilla::StyleLength mMozWindowInputRegionMargin;
+   mozilla::StyleTransform mMozWindowTransform;
++  mozilla::StyleTransformOrigin mWindowTransformOrigin;
+ 
+   nsStyleAutoArray<mozilla::StyleTransition> mTransitions;
+   // The number of elements in mTransitions that are not from repeating

src/layout/style/test/ListCSSProperties-cpp.patch

@@ -0,0 +1,12 @@
+diff --git a/layout/style/test/ListCSSProperties.cpp b/layout/style/test/ListCSSProperties.cpp
+index b6a881b037a3720991f8097903e859dfc72012c1..8917a8cc23b97e37b4accaaf0d6c2876b36594af 100644
+--- a/layout/style/test/ListCSSProperties.cpp
++++ b/layout/style/test/ListCSSProperties.cpp
+@@ -108,6 +108,7 @@ const char* gInaccessibleProperties[] = {
+     "-moz-window-opacity",                // chrome-only internal properties
+     "-moz-window-transform",              // chrome-only internal properties
+     "-moz-window-shadow",                 // chrome-only internal properties
++    "-zen-window-transform-origin",       // chrome-only internal properties
+ };
+ 
+ inline int is_inaccessible(const char* aPropName) {

src/makensis-mk.patch

@@ -0,0 +1,16 @@
+diff --git a/toolkit/mozapps/installer/windows/nsis/makensis.mk b/toolkit/mozapps/installer/windows/nsis/makensis.mk
+index b4425034fb198fd5303af513d81a3db6b4d14e36..8c44945b4448eb1c69a73894b3e13fc8d2ef3ade 100644
+--- a/toolkit/mozapps/installer/windows/nsis/makensis.mk
++++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk
+@@ -64,6 +64,11 @@ endif
+ ifdef ZIP_IN
+ installer:: $(CONFIG_DIR)/setup.exe $(ZIP_IN)
+ 	@echo 'Packaging $(WIN32_INSTALLER_OUT).'
++ifneq ("$(ZEN_SETUP_EXE_PATH)","")
++	@echo 'setup-zen.exe exists, moving it to setup.exe ($(ZEN_SETUP_EXE_PATH))'
++	rm $(CONFIG_DIR)/setup.exe
++	cp $(ZEN_SETUP_EXE_PATH) $(CONFIG_DIR)/setup.exe
++endif
+ 	$(NSINSTALL) -D '$(ABS_DIST)/$(PKG_INST_PATH)'
+ 	$(PYTHON3) $(MOZILLA_DIR)/mach repackage installer \
+ 	  -o '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe' \

src/servo/components/style/properties/longhands/ui-mako-rs.patch

@@ -0,0 +1,23 @@
+diff --git a/servo/components/style/properties/longhands/ui.mako.rs b/servo/components/style/properties/longhands/ui.mako.rs
+index b7d24fe7bb54b1c143876e3bc9da59c64324ffa5..c36f7edcf076e31209e847af0b59361033d3b4da 100644
+--- a/servo/components/style/properties/longhands/ui.mako.rs
++++ b/servo/components/style/properties/longhands/ui.mako.rs
+@@ -286,6 +286,18 @@ ${helpers.predefined_type(
+     affects="",
+ )}
+ 
++${helpers.predefined_type(
++    "-zen-window-transform-origin",
++    "TransformOrigin",
++    "computed::TransformOrigin::initial_value()",
++    engines="gecko",
++    gecko_ffi_name="mWindowTransformOrigin",
++    boxed=True,
++    spec="None (Nonstandard internal property)",
++    enabled_in="chrome",
++    affects="overflow",
++)}
++
+ ${helpers.predefined_type(
+     "animation-fill-mode",
+     "AnimationFillMode",

src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
-index 5da0404b2672ba8cce7bcf808bf2373474776654..1405c53a927a64ecda8255d78d9aa5ddf8806685 100644
+index 5da0404b2672ba8cce7bcf808bf2373474776654..3b93217b38f25f54d7ef44d151e314bc1c5e5ce3 100644
 --- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
 +++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
 @@ -494,7 +494,7 @@ export var PictureInPicture = {
@@ -11,11 +11,3 @@ index 5da0404b2672ba8cce7bcf808bf2373474776654..1405c53a927a64ecda8255d78d9aa5dd
      await this.closeSinglePipWindow({ reason: "Unpip", actorRef: pipActor });
    },
  
-@@ -623,6 +623,7 @@ export var PictureInPicture = {
-       pipToggle.hidden = true;
-     }
- 
-+    win.gZenMediaController.updatePipEligibility(browser, !pipToggle.hidden);
-     let browserHasPip = !!this.browserWeakMap.get(browser);
-     if (browserHasPip) {
-       this.setUrlbarPipIconActive(browser.ownerGlobal);

src/toolkit/modules/ShortcutUtils-sys-mjs.patch

@@ -0,0 +1,19 @@
+diff --git a/toolkit/modules/ShortcutUtils.sys.mjs b/toolkit/modules/ShortcutUtils.sys.mjs
+index 360a7dbeeae3899af01945e35d5fe3aa0cb3c562..895d39fe5887ffae9cdbce9576df8b00d4cc8442 100644
+--- a/toolkit/modules/ShortcutUtils.sys.mjs
++++ b/toolkit/modules/ShortcutUtils.sys.mjs
+@@ -382,12 +382,12 @@ export var ShortcutUtils = {
+           return ShortcutUtils.MOVE_TAB_FORWARD;
+         }
+         break;
+-      case event.DOM_VK_LEFT:
++      case event.DOM_VK_UP: // For macOS, make sure if this patch needs to be updated
+         if (accelMetaKey && event.altKey && !event.shiftKey && !event.ctrlKey) {
+           return ShortcutUtils.PREVIOUS_TAB;
+         }
+         break;
+-      case event.DOM_VK_RIGHT:
++      case event.DOM_VK_DOWN: // For macOS, make sure if this patch needs to be updated
+         if (accelMetaKey && event.altKey && !event.shiftKey && !event.ctrlKey) {
+           return ShortcutUtils.NEXT_TAB;
+         }

src/toolkit/themes/shared/popup-css.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..ebb312830670564175cc98f11af1b29b80711ceb 100644
+index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..ce49d7f6900a1184c9aed00c26bd7b42916482aa 100644
 --- a/toolkit/themes/shared/popup.css
 +++ b/toolkit/themes/shared/popup.css
 @@ -21,8 +21,8 @@ panel {
@@ -8,7 +8,7 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..ebb312830670564175cc98f11af1b29b
  
 -  --panel-shadow-margin: 0px;
 -  --panel-shadow: 0 0 var(--panel-shadow-margin) hsla(0,0%,0%,.2);
-+  --panel-shadow-margin: 10px !important;
++  --panel-shadow-margin: 10px;
 +  --panel-shadow: var(--zen-big-shadow);
    -moz-window-input-region-margin: var(--panel-shadow-margin);
    margin: calc(-1 * var(--panel-shadow-margin));
@@ -22,24 +22,7 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..ebb312830670564175cc98f11af1b29b
  
      @media (prefers-contrast) {
        --panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
-@@ -60,13 +58,14 @@ panel {
-   }
- 
-   @media (-moz-platform: macos) {
--    appearance: auto;
-+    appearance: auto !important;
-     -moz-default-appearance: menupopup;
-     /* We set the default background here, rather than on ::part(content),
-      * because otherwise it'd interfere with the native look. Non-native-looking
-      * popups should get their background via --panel-background */
-     background-color: Menu;
--    --panel-background: none;
-+    --panel-shadow-margin: 0px !important;
-+    --panel-background: transparent !important;
-     --panel-border-color: transparent;
-     /* This should be kept in sync with GetMenuMaskImage() */
-     --panel-border-radius: 6px;
-@@ -208,7 +207,6 @@ panel:where([type="arrow"]) {
+@@ -208,7 +206,6 @@ panel:where([type="arrow"]) {
      }
  
      &[animating] {

surfer.json

@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "137.0",
-    "candidate": "137.0"
+    "version": "137.0.1",
+    "candidate": "137.0.1"
   },
   "buildOptions": {
     "generateBranding": true
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.11b",
+        "displayVersion": "1.11.3b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -39,7 +39,7 @@
       "brandShortName": "Twilight",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.11t",
+        "displayVersion": "1.11.3t",
         "github": {
           "repo": "zen-browser/desktop"
         }
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}