feat: Change default shortcut for unsynced windows, b=no-bug, c=windows, kbs

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

@@ -20,7 +20,6 @@ finish-args:
   - --socket=cups
   - --persist=.zen
   - --env=DICPATH=/usr/share/hunspell
-  - --filesystem=xdg-config/gtk-3.0:ro
   - --filesystem=xdg-download:rw
   - --filesystem=/run/.heim_org.h5l.kcm-socket
   - --filesystem=xdg-run/speech-dispatcher:ro

build/windows/sign.ps1

@@ -148,7 +148,7 @@ function SignAndPackage($name) {
         $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
     }
 
-    $env:MAR="..\\build\\winsign\\mar.exe"
+    $env:MAR="..\\build\\windows\\mar.exe"
     if ($name -eq "arm64") {
         $env:SURFER_COMPAT="aarch64"
     } else {

prefs/zen/session-store.yaml

@@ -10,3 +10,6 @@
 
 - name: zen.session-store.restore-unsynced-windows
   value: true
+
+- name: browser.sessionstore.max_windows_undo
+  value: 2

prefs/zen/workspaces.yaml

@@ -33,7 +33,7 @@
   value: true
 
 - name: zen.workspaces.dnd-switch-padding
-  value: 4
+  value: 5
 
 - name: zen.workspaces.debug
   value: "@cond"

prefs/zen/zen.yaml

@@ -30,7 +30,7 @@
   value: 20 # Percentage of folder height to trigger dragover
 
 - name: zen.tabs.dnd-switch-space-delay
-  value: 1000 # milliseconds
+  value: 800 # milliseconds
 
 - name: zen.ctrlTab.show-pending-tabs
   value: false

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 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2e8fe19ff 100644
+index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96faedf6f0b 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -127,6 +127,9 @@ const TAB_EVENTS = [
@@ -54,6 +54,15 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
      let tabbrowser = aWindow.gBrowser;
  
      // add tab change listeners to all already existing tabs
+@@ -2076,7 +2085,7 @@ var SessionStoreInternal = {
+     let isTaskbarTab = this._windows[aWindow.__SSi].isTaskbarTab;
+     // A regular window is not a private window, taskbar tab window, or popup window
+     let isRegularWindow =
+-      !isPrivateWindow && !isTaskbarTab && aWindow.toolbar.visible;
++      !isPrivateWindow && !isTaskbarTab && aWindow.toolbar.visible && !this._windows[aWindow.__SSi].isZenUnsynced;
+ 
+     // perform additional initialization when the first window is loading
+     if (lazy.RunState.isStopped) {
 @@ -2131,6 +2140,7 @@ var SessionStoreInternal = {
            null,
            "sessionstore-one-or-no-tab-restored"
@@ -95,36 +104,56 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
  
      TAB_EVENTS.forEach(function (aEvent) {
        tabbrowser.tabContainer.removeEventListener(aEvent, this, true);
-@@ -2491,7 +2509,7 @@ var SessionStoreInternal = {
+@@ -2434,7 +2452,7 @@ var SessionStoreInternal = {
+ 
+       let isLastRegularWindow =
+         Object.values(this._windows).filter(
+-          wData => !wData.isPrivate && !wData.isTaskbarTab
++          wData => !wData.isPrivate && !wData.isTaskbarTab && !wData.isZenUnsynced
+         ).length == 1;
+       this._log.debug(
+         `onClose, closing window isLastRegularWindow? ${isLastRegularWindow}`
+@@ -2491,8 +2509,8 @@ var SessionStoreInternal = {
        // 2) Flush the window.
        // 3) When the flush is complete, revisit our decision to store the window
        //    in _closedWindows, and add/remove as necessary.
 -      if (!winData.isPrivate && !winData.isTaskbarTab) {
+-        this.maybeSaveClosedWindow(winData, isLastWindow);
 +      if (!winData.isPrivate && !winData.isTaskbarTab && !winData.isZenUnsynced) {
-         this.maybeSaveClosedWindow(winData, isLastWindow);
++        this.maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow);
        }
  
-@@ -2512,7 +2530,8 @@ var SessionStoreInternal = {
+       completionPromise = lazy.TabStateFlusher.flushWindow(aWindow).then(() => {
+@@ -2512,8 +2530,9 @@ var SessionStoreInternal = {
  
          // Save non-private windows if they have at
          // least one saveable tab or are the last window.
 -        if (!winData.isPrivate && !winData.isTaskbarTab) {
+-          this.maybeSaveClosedWindow(winData, isLastWindow);
 +        lazy.ZenWindowSync.on_WindowCloseAndBrowserFlushed(browsers);
 +        if (!winData.isPrivate && !winData.isTaskbarTab && !winData.isZenUnsynced) {
-           this.maybeSaveClosedWindow(winData, isLastWindow);
++          this.maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow);
  
            if (!isLastWindow && winData.closedId > -1) {
-@@ -2608,6 +2627,9 @@ var SessionStoreInternal = {
+             this._addClosedAction(
+@@ -2589,7 +2608,7 @@ var SessionStoreInternal = {
+    *        to call this method again asynchronously (for example, after
+    *        a window flush).
+    */
+-  maybeSaveClosedWindow(winData, isLastWindow) {
++  maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow = false) {
+     // Make sure SessionStore is still running, and make sure that we
+     // haven't chosen to forget this window.
+     if (
+@@ -2606,6 +2625,7 @@ var SessionStoreInternal = {
+       // _closedWindows from a previous call to this function.
+       let winIndex = this._closedWindows.indexOf(winData);
        let alreadyStored = winIndex != -1;
++      lazy.ZenSessionStore.maybeSaveClosedWindow(winData, isLastRegularWindow);
        // If sidebar command is truthy, i.e. sidebar is open, store sidebar settings
        let shouldStore = hasSaveableTabs || isLastWindow;
-+      lazy.ZenSessionStore.maybeSaveClosedWindow(winData, isLastWindow);
-+      // TODO: Do we want to store closed Zen windows? All of them are synced anyways
-+      shouldStore = false;
  
-       if (shouldStore && !alreadyStored) {
-         let index = this._closedWindows.findIndex(win => {
-@@ -3408,7 +3430,7 @@ var SessionStoreInternal = {
+@@ -3408,7 +3428,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -133,7 +162,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
        return;
      }
  
-@@ -4129,6 +4151,12 @@ var SessionStoreInternal = {
+@@ -4129,6 +4149,12 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -146,7 +175,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4565,6 +4593,8 @@ var SessionStoreInternal = {
+@@ -4565,6 +4591,8 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -155,7 +184,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5414,7 +5444,7 @@ var SessionStoreInternal = {
+@@ -5414,7 +5442,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -164,7 +193,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
          removableTabs.push(tab);
        }
      }
-@@ -5525,7 +5555,7 @@ var SessionStoreInternal = {
+@@ -5525,7 +5553,7 @@ var SessionStoreInternal = {
  
      // collect the data for all windows
      for (ix in this._windows) {
@@ -173,7 +202,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
          // window data is still in _statesToRestore
          continue;
        }
-@@ -5668,11 +5698,12 @@ var SessionStoreInternal = {
+@@ -5668,11 +5696,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -187,7 +216,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5683,6 +5714,9 @@ var SessionStoreInternal = {
+@@ -5683,6 +5712,9 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -197,7 +226,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5695,7 +5729,7 @@ var SessionStoreInternal = {
+@@ -5695,7 +5727,7 @@ var SessionStoreInternal = {
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
      if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -206,7 +235,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5810,8 +5844,8 @@ var SessionStoreInternal = {
+@@ -5810,8 +5842,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -217,7 +246,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5833,6 +5867,7 @@ var SessionStoreInternal = {
+@@ -5833,6 +5865,7 @@ var SessionStoreInternal = {
      if (overwriteTabs) {
        for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) {
          if (!tabbrowser.tabs[i].selected) {
@@ -225,7 +254,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
            tabbrowser.removeTab(tabbrowser.tabs[i]);
          }
        }
-@@ -5866,6 +5901,12 @@ var SessionStoreInternal = {
+@@ -5866,6 +5899,12 @@ var SessionStoreInternal = {
          savedTabGroup => !openTabGroupIdsInWindow.has(savedTabGroup.id)
        );
      }
@@ -238,7 +267,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
  
      // Move the originally open tabs to the end.
      if (initialTabs) {
-@@ -6419,6 +6460,25 @@ var SessionStoreInternal = {
+@@ -6419,6 +6458,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -264,7 +293,17 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -7343,7 +7403,7 @@ var SessionStoreInternal = {
+@@ -6567,6 +6625,9 @@ var SessionStoreInternal = {
+         aWindow.gURLBar.readOnly = false;
+       }
+     }
++    if (aWinData.isZenUnsynced) {
++      this._windows[aWindow.__SSi].isZenUnsynced = true;
++    }
+ 
+     let promiseParts = Promise.withResolvers();
+     aWindow.setTimeout(() => {
+@@ -7343,7 +7404,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -273,7 +312,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2
            // Adjust window.selected
            if (tIndex + 1 < window.selected) {
              window.selected -= 1;
-@@ -7358,7 +7418,7 @@ var SessionStoreInternal = {
+@@ -7358,7 +7419,7 @@ var SessionStoreInternal = {
            );
            // We don't want to increment tIndex here.
            continue;

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

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index b00139d7af878326ff303c08d5ddd47501b8c7db..52bad3e978004f3322f3d504cbd663e7b620b69f 100644
+index b00139d7af878326ff303c08d5ddd47501b8c7db..7361a5e98d6ea372f6fdc583d90044d276cfb81b 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
 @@ -90,7 +90,6 @@
@@ -32,7 +32,7 @@ index b00139d7af878326ff303c08d5ddd47501b8c7db..52bad3e978004f3322f3d504cbd663e7
  .dialogOverlay[topmost="true"],
  #window-modal-dialog::backdrop {
 -  background-color: var(--dialog-backdrop-color);
-+  background-color: light-dark(rgba(255, 255, 255, .2), rgba(0, 0, 0, .2));
++  background-color: light-dark(rgba(255, 255, 255, .3), rgba(0, 0, 0, .3));
  }
  
  .dialogOverlay[hideContent="true"][topmost="true"] {

src/zen/common/modules/ZenMenubar.mjs

@@ -24,6 +24,7 @@ export class nsZenMenuBar {
     this.#initViewMenu();
     this.#initSpacesMenu();
     this.#initAppMenu();
+    this.#hideWindowRestoreMenus();
   }
 
   #initViewMenu() {
@@ -121,4 +122,12 @@ export class nsZenMenuBar {
                 command="cmd_zenNewNavigatorUnsynced"/>`)
     );
   }
+
+  #hideWindowRestoreMenus() {
+    const itemsToHide = ["appMenuRecentlyClosedWindows", "historyUndoWindowMenu"];
+    for (const id of itemsToHide) {
+      const element = PanelMultiView.getViewNode(document, id);
+      element.setAttribute("hidden", "true");
+    }
+  }
 }

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

@@ -142,7 +142,7 @@
 
   --zen-toolbar-element-bg: light-dark(
     color-mix(in oklch, var(--toolbox-textcolor) 10%, transparent),
-    color-mix(in oklch, var(--toolbox-textcolor) 12.5%, transparent)
+    color-mix(in oklch, var(--toolbox-textcolor) 15%, transparent)
   );
 
   --zen-toolbar-element-bg-hover: light-dark(

src/zen/drag-and-drop/ZenDragAndDrop.js

@@ -39,6 +39,7 @@
       !element ||
       element.closest(".zen-current-workspace-indicator") ||
       element.hasAttribute("split-view-group") ||
+      element.classList.contains("zen-drop-target") ||
       isEssentialsPromo(element)
     ) {
       return element;
@@ -52,6 +53,9 @@
     if (isTabGroupLabel(element)) {
       return element.closest(".tab-group-label-container");
     }
+    if (gBrowser.isTabGroup(element)) {
+      return element.labelContainerElement;
+    }
     throw new Error(`Element "${element.tagName}" is not expected to move`);
   };
 
@@ -111,7 +115,7 @@
       const { offsetX, offsetY } = this.#getDragImageOffset(event, tab, draggingTabs);
       const dragImage = this.#createDragImageForTabs(draggingTabs);
       this.originalDragImageArgs = [dragImage, offsetX, offsetY];
-      dt.updateDragImage(...this.originalDragImageArgs);
+      dt.setDragImage(...this.originalDragImageArgs);
       if (tab.hasAttribute("zen-essential")) {
         setTimeout(() => {
           tab.style.visibility = "hidden";
@@ -125,18 +129,28 @@
       );
       const tabRect = window.windowUtils.getBoundsWithoutFlushing(movingTabs[0]);
       const wrapper = document.createElement("div");
+      let movingTabsCount = Math.min(movingTabs.length, 3);
       wrapper.style.width = tabRect.width + "px";
-      wrapper.style.height = tabRect.height * movingTabs.length + "px";
+      wrapper.style.height = tabRect.height * movingTabsCount + "px";
       wrapper.style.position = "fixed";
       wrapper.style.top = "-9999px";
       periphery.appendChild(wrapper);
-      for (let i = 0; i < movingTabs.length; i++) {
+      for (let i = 0; i < movingTabsCount; i++) {
         const tab = movingTabs[i];
         const tabClone = tab.cloneNode(true);
         if (tab.hasAttribute("zen-essential")) {
           const rect = tab.getBoundingClientRect();
           tabClone.style.minWidth = tabClone.style.maxWidth = `${rect.width}px`;
           tabClone.style.minHeight = tabClone.style.maxHeight = `${rect.height}px`;
+          if (tabClone.hasAttribute("visuallyselected")) {
+            tabClone.style.transform = "translate(-50%, -50%)";
+          }
+        } else if (AppConstants.platform !== "macosx") {
+          // On windows and linux, we still don't add some extra opaqueness
+          // for the tab to be more visible. This is a hacky workaround.
+          // TODO: Make windows and linux DnD use nsZenDragAndDrop::mDragImageOpacity
+          tabClone.style.colorScheme = "light";
+          tabClone.style.color = "black";
         }
         if (i > 0) {
           tabClone.style.transform = `translate(${i * 4}px, -${i * (tabRect.height - 4)}px)`;
@@ -150,6 +164,13 @@
           const label = tabClone.textLabel;
           const tabLabelParentWidth = label.parentElement.getBoundingClientRect().width;
           label.textContent = label.textContent.slice(0, Math.floor(tabLabelParentWidth / 6));
+        } else if (gBrowser.isTabGroup(tabClone) && tabClone.hasAttribute("split-view-group")) {
+          let tabs = tab.tabs;
+          for (let j = 0; j < tabs.length; j++) {
+            const tabInGroup = tabs[j];
+            const tabInGroupClone = tabInGroup.cloneNode(true);
+            tabClone.appendChild(tabInGroupClone);
+          }
         }
       }
       this.#maybeCreateDragImageDot(movingTabs, wrapper);
@@ -197,12 +218,7 @@
         ? dragData.screenY
         : dragData.screenX;
       let allTabs = this._tabbrowserTabs.ariaFocusableItems;
-      let numEssentials = gBrowser._numZenEssentials;
-      let isEssential = draggedTab.hasAttribute("zen-essential");
-      let tabs = allTabs.slice(
-        isEssential ? 0 : numEssentials,
-        isEssential ? numEssentials : undefined
-      );
+      let tabs = allTabs;
       if (!tabs.length) {
         tabs = [...movingTabs];
       }
@@ -235,7 +251,9 @@
       dragData.translateY = translateY;
 
       // Move the dragged tab based on the mouse position.
-      let periphery = document.getElementById("tabbrowser-arrowscrollbox-periphery");
+      let periphery = gZenWorkspaces.activeWorkspaceElement.querySelector(
+        "#tabbrowser-arrowscrollbox-periphery"
+      );
       let lastMovingTab = movingTabs.at(-1);
       let firstMovingTab = movingTabs[0];
       let endEdge = (ele) => ele[screenAxis] + bounds(ele)[size];
@@ -452,9 +470,7 @@
         // 4) we just started dragging and the `oldDropElementIndex` has its default
         //    valuë of `movingTabs[0].elementIndex`. In this case, the drop element
         //    shouldn't be a moving tab, so keep it `undefined`.
-        let lastPossibleDropElement = this._rtlMode
-          ? tabs.find((t) => t != draggedTab)
-          : tabs.findLast((t) => t != draggedTab);
+        let lastPossibleDropElement = this._rtlMode ? tabs.find((t) => t != draggedTab) : undefined;
         let maxElementIndexForDropElement = lastPossibleDropElement?.elementIndex;
         if (Number.isInteger(maxElementIndexForDropElement)) {
           let index = Math.min(oldDropElementIndex, maxElementIndexForDropElement);
@@ -521,7 +537,7 @@
 
       [dropBefore, dropElement] = this.#applyDragoverIndicator(
         event,
-        tabs,
+        dropElement,
         movingTabs,
         draggedTab
       ) ?? [dropBefore, dropElement];
@@ -608,12 +624,30 @@
         if (!this.#changeSpaceTimer) {
           this.#changeSpaceTimer = setTimeout(() => {
             this.clearDragOverVisuals();
-            dt.updateDragImage(...this.originalDragImageArgs);
-            gZenWorkspaces.changeWorkspaceShortcut(
-              isNearLeftEdge ? -1 : 1,
-              false,
-              /* Disable wrapping */ true
-            );
+            gZenWorkspaces
+              .changeWorkspaceShortcut(isNearLeftEdge ? -1 : 1, false, /* Disable wrapping */ true)
+              .then((spaceChanged) => {
+                if (AppConstants.platform !== "macosx") {
+                  // See the hack in #createDragImageForTabs for more details which
+                  // explains why we need to do this on non-macOS platforms.
+                  return;
+                }
+                let tabs = this.originalDragImageArgs[0].children;
+                const { isDarkMode, isExplicitMode } =
+                  gZenThemePicker.getGradientForWorkspace(spaceChanged);
+                for (let tab of tabs) {
+                  if (isExplicitMode) {
+                    tab.style.colorScheme = isDarkMode ? "dark" : "light";
+                  } else {
+                    tab.style.colorScheme = "";
+                  }
+                }
+                requestAnimationFrame(() => {
+                  requestAnimationFrame(() => {
+                    dt.updateDragImage(...this.originalDragImageArgs);
+                  });
+                });
+              });
             this.#changeSpaceTimer = null;
           }, this._dndSwitchSpaceDelay);
         }
@@ -678,6 +712,7 @@
 
     handle_drop(event) {
       this.clearSpaceSwitchTimer();
+      gZenFolders.highlightGroupOnDragOver(null);
       super.handle_drop(event);
       this.#maybeClearVerticalPinnedGridDragOver();
       const dt = event.dataTransfer;
@@ -705,7 +740,10 @@
       if (isTabGroupLabel(dropElement)) {
         dropElement = dropElement.group;
       }
-      if (isTabGroupLabel(draggedTab)) {
+      if (
+        isTabGroupLabel(draggedTab) ||
+        (isTab(draggedTab) && draggedTab.group?.hasAttribute("split-view-group"))
+      ) {
         draggedTab = draggedTab.group;
       }
       for (let item of this._tabbrowserTabs.ariaFocusableItems) {
@@ -817,6 +855,9 @@
       if (currentEssenialContainer?.essentialsPromo) {
         currentEssenialContainer.essentialsPromo.remove();
       }
+      // We also call it here to ensure we clear any highlight if the drop happened
+      // outside of a valid drop target.
+      gZenFolders.highlightGroupOnDragOver(null);
       this.ZenDragAndDropService.onDragEnd();
       super.handle_dragend(event);
       this.#removeDragOverBackground();
@@ -872,35 +913,26 @@
     }
 
     // eslint-disable-next-line complexity
-    #applyDragoverIndicator(event, tabs, movingTabs, draggedTab) {
+    #applyDragoverIndicator(event, dropElement, movingTabs, draggedTab) {
       const separation = 4;
-      const dropZoneSelector =
-        ":is(.tabbrowser-tab, .zen-drop-target, .tab-group-label, tab-group[split-view-group])";
+      const dropZoneSelector = ":is(.zen-drop-target)";
       let shouldPlayHapticFeedback = false;
       let showIndicatorUnderNewTabButton = false;
       let dropBefore = false;
-      let dropElement = event.target.closest(dropZoneSelector);
-      if (!dropElement) {
-        if (event.target.classList.contains("zen-workspace-empty-space")) {
-          dropElement = this._tabbrowserTabs.ariaFocusableItems.at(-1);
+      let dropElementFromEvent = event.target.closest(dropZoneSelector);
+      dropElement = dropElementFromEvent || dropElement;
+      if (!dropElementFromEvent) {
+        let hoveringPeriphery = !!event.target.closest("#tabbrowser-arrowscrollbox-periphery");
+        if (event.target.classList.contains("zen-workspace-empty-space") || hoveringPeriphery) {
+          let lastTab = gBrowser.tabs.at(-1);
+          dropElement =
+            (hoveringPeriphery
+              ? this._tabbrowserTabs.ariaFocusableItems.at(
+                  gBrowser._numVisiblePinTabsWithoutCollapsed
+                )
+              : this._tabbrowserTabs.ariaFocusableItems.at(-1)) || lastTab;
           // Only if there are no normal tabs to drop after
-          showIndicatorUnderNewTabButton =
-            gBrowser.tabs[gBrowser.tabs.length - 1].hasAttribute("zen-empty-tab");
-        } else {
-          const numEssentials = gBrowser._numZenEssentials;
-          const numPinned = gBrowser.pinnedTabCount - numEssentials;
-          const tabToUse =
-            event.target.closest(dropZoneSelector) || draggedTab._dragData?.dropElement;
-          if (!tabToUse) {
-            return null;
-          }
-          const isPinned = tabToUse.pinned;
-          const relativeTabs = tabs.slice(
-            isPinned ? 0 : numPinned,
-            isPinned ? numPinned : undefined
-          );
-          const draggedTabRect = elementToMove(tabToUse).getBoundingClientRect();
-          dropElement = event.clientY > draggedTabRect.top ? relativeTabs.at(-1) : relativeTabs[0];
+          showIndicatorUnderNewTabButton = lastTab.hasAttribute("zen-empty-tab");
         }
       }
       dropElement = elementToMove(dropElement);
@@ -909,24 +941,47 @@
         shouldPlayHapticFeedback = this.#lastDropTarget !== null;
         this.#removeDragOverBackground();
       }
-      let isZenFolder = dropElement.parentElement?.isZenFolder;
+      if (!dropElement) {
+        let dragData = draggedTab._dragData;
+        dropElement = dragData.dropElement;
+        dropBefore = dragData.dropBefore;
+      }
+      if (!dropElement) {
+        this.clearDragOverVisuals();
+        return null;
+      }
+      if (dropElement.hasAttribute("zen-empty-tab") && dropElement.group) {
+        let secondTab = dropElement.group.tabs[1];
+        dropElement = secondTab || dropElement.group.labelContainerElement;
+        if (secondTab) {
+          dropBefore = true;
+        }
+      }
+      let possibleFolderElement = dropElement.parentElement;
+      let isZenFolder = possibleFolderElement?.isZenFolder;
       let canHightlightGroup =
-        gZenFolders.highlightGroupOnDragOver(dropElement.parentElement, movingTabs) || !isZenFolder;
+        gZenFolders.highlightGroupOnDragOver(possibleFolderElement, movingTabs) || !isZenFolder;
       let rect = window.windowUtils.getBoundsWithoutFlushing(dropElement);
       const overlapPercent = (event.clientY - rect.top) / rect.height;
       // We wan't to leave a small threshold (20% for example) so we can drag tabs below and above
       // a folder label without dragging into the folder.
       let threshold = Services.prefs.getIntPref("zen.tabs.folder-dragover-threshold-percent") / 100;
       let dropIntoFolder =
-        isZenFolder && (overlapPercent < threshold || overlapPercent > 1 - threshold);
+        isZenFolder &&
+        (overlapPercent < threshold ||
+          (overlapPercent > 1 - threshold &&
+            (possibleFolderElement.collapsed ||
+              possibleFolderElement.childGroupsAndTabs.length < 2)));
       if (
-        isTabGroupLabel(draggedTab) &&
-        draggedTab.group?.isZenFolder &&
-        (isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
-        (!dropElement.pinned || dropElement.hasAttribute("zen-essential"))
+        (isTabGroupLabel(draggedTab) &&
+          draggedTab.group?.isZenFolder &&
+          (isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
+          (!dropElement.pinned || dropElement.hasAttribute("zen-essential"))) ||
+        showIndicatorUnderNewTabButton
       ) {
+        dropElement = null;
         this.clearDragOverVisuals();
-        return null;
+        return [dropElement, dropBefore];
       }
       if (
         isTab(dropElement) ||
@@ -941,7 +996,7 @@
         let top = 0;
         threshold =
           Services.prefs.getIntPref("browser.tabs.dragDrop.moveOverThresholdPercent") / 100;
-        if (overlapPercent > threshold) {
+        if (overlapPercent > threshold || showIndicatorUnderNewTabButton) {
           top = Math.round(rect.top + rect.height) + "px";
           dropBefore = false;
         } else {

src/zen/folders/ZenFolders.mjs

@@ -1134,11 +1134,10 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
    * @param {MozTabbrowserTabGroup|undefined|null} folder The folder to highlight, or null to clear highlight.
    * @param {Array<MozTabbrowserTab>|null} movingTabs The tabs being moved.
    */
-  highlightGroupOnDragOver(folder, movingTabs) {
+  highlightGroupOnDragOver(folder, movingTabs = null) {
     if (folder === this.#lastHighlightedGroup) {
       return true;
     }
-    const tab = movingTabs ? movingTabs[0] : null;
     if (this.#lastHighlightedGroup && this.#lastHighlightedGroup !== folder) {
       if (this.#lastHighlightedGroup.collapsed) {
         this.updateFolderIcon(this.#lastHighlightedGroup, "close");
@@ -1148,7 +1147,6 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
     if (
       folder?.isZenFolder &&
       (!folder.hasAttribute("split-view-group") || !folder.hasAttribute("selected")) &&
-      folder !== tab?.group &&
       !(
         folder.level >= this.#ZEN_MAX_SUBFOLDERS &&
         movingTabs?.some((t) => gBrowser.isTabGroupLabel(t))

src/zen/folders/zen-folders.css

@@ -123,11 +123,11 @@ zen-folder {
         }
 
         &[state="open"] .back {
-          transform: skewX(16deg) translate(-2px, 3.4px) scale(0.85);
+          transform: skewX(16deg) translate(-4px, 2px) scale(0.85);
         }
 
         &[state="open"] :is(.front, .dots, .icon) {
-          transform: skewX(-16deg) translate(11.1px, 3.4px) scale(0.85);
+          transform: skewX(-16deg) translate(8px, 2px) scale(0.85);
         }
 
         & .icon {

src/zen/kbs/ZenKeyboardShortcuts.mjs

@@ -506,6 +506,10 @@ class KeyShortcut {
     return this.#disabled;
   }
 
+  setDisabled(value) {
+    this.#disabled = value;
+  }
+
   isReserved() {
     return this.#reserved;
   }
@@ -1112,19 +1116,27 @@ class nsZenKeyboardShortcutsVersioner {
           "N",
           "",
           ZEN_OTHER_SHORTCUTS_GROUP,
-          AppConstants.platform === "win"
-            ? nsKeyShortcutModifiers.fromObject({ alt: true })
-            : nsKeyShortcutModifiers.fromObject({ accel: true, alt: true }),
+          nsKeyShortcutModifiers.fromObject({ accel: true, shift: true }),
           "cmd_zenNewNavigatorUnsynced",
           "zen-new-unsynced-window-shortcut"
         )
       );
       // Also, change the default for new empty split from + to * on mac
+      // and disable the "Restore closed window" shortcut by default due to conflicts
+      let emptySplitFound = false,
+        undoCloseWindowFound = false;
       for (let shortcut of data) {
         if (shortcut.getID() == "zen-new-empty-split-view" && AppConstants.platform == "macosx") {
           if (shortcut.getKeyName() == "+") {
             shortcut.setNewBinding("*");
           }
+          emptySplitFound = true;
+        } else if (shortcut.getID() == "key_undoCloseWindow") {
+          shortcut.shouldBeEmpty = true;
+          shortcut.setDisabled(true);
+          undoCloseWindowFound = true;
+        }
+        if (emptySplitFound && undoCloseWindowFound) {
           break;
         }
       }

src/zen/sessionstore/ZenSessionManager.sys.mjs

@@ -205,7 +205,7 @@ export class nsZenSessionManager {
     // object will always be empty after migration because we haven't
     // gotten the opportunity to save the session yet.
     if (this._shouldRunMigration) {
-      this.#runStateMigration(initialState);
+      initialState = this.#runStateMigration(initialState);
     }
     // If there are no windows, we create an empty one. By default,
     // firefox would create simply a new empty window, but we want
@@ -215,7 +215,11 @@ export class nsZenSessionManager {
     if (!initialState?.windows?.length) {
       this.log("No windows found in initial state, creating an empty one");
       initialState ||= {};
-      initialState.windows = this._shouldRunMigration ? [] : [{}];
+      initialState.windows = [
+        {
+          tabs: [],
+        },
+      ];
     }
     // When we don't have browser.startup.page set to resume session,
     // we only want to restore the pinned tabs into the new windows.
@@ -295,6 +299,14 @@ export class nsZenSessionManager {
         this.log("Restoring tabs from last closed normal window");
       }
     }
+    if (!initialState?.windows?.length) {
+      initialState ||= {};
+      initialState.windows = [
+        {
+          tabs: [],
+        },
+      ];
+    }
     for (const winData of initialState?.windows || []) {
       winData.spaces = this._migrationData?.spaces || [];
       if (winData.tabs) {
@@ -312,6 +324,17 @@ export class nsZenSessionManager {
     // Save the state to the sidebar object so that it gets written
     // to the session file.
     delete this._migrationData;
+    return initialState;
+  }
+
+  /**
+   * Determines if a given window data object is saveable.
+   *
+   * @param {object} aWinData - The window data object to check.
+   * @returns {boolean} True if the window is saveable, false otherwise.
+   */
+  #isWindowSaveable(aWinData) {
+    return !aWinData.isPopup && !aWinData.isTaskbarTab && !aWinData.isZenUnsynced;
   }
 
   /**
@@ -321,7 +344,7 @@ export class nsZenSessionManager {
    */
   saveState(state) {
     let windows = state?.windows || [];
-    windows = windows.filter((win) => !win.isPopup && !win.isTaskbarTab && !win.isZenUnsynced);
+    windows = windows.filter((win) => this.#isWindowSaveable(win));
     if (!windows.length || !lazy.gWindowSyncEnabled) {
       // Don't save (or even collect) anything in permanent private
       // browsing mode. We also don't want to save if there are no windows.

src/zen/sessionstore/ZenWindowSync.sys.mjs

@@ -10,17 +10,17 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
-  SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
   TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
   // eslint-disable-next-line mozilla/valid-lazy
   ZenSessionStore: "resource:///modules/zen/ZenSessionManager.sys.mjs",
   TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs",
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 
 XPCOMUtils.defineLazyPreferenceGetter(lazy, "gWindowSyncEnabled", "zen.window-sync.enabled");
 XPCOMUtils.defineLazyPreferenceGetter(lazy, "gShouldLog", "zen.window-sync.log", true);
 
-const OBSERVING = ["browser-window-before-show"];
+const OBSERVING = ["browser-window-before-show", "sessionstore-windows-restored"];
 const INSTANT_EVENTS = ["SSWindowClosing"];
 const UNSYNCED_WINDOW_EVENTS = ["TabOpen"];
 const EVENTS = [
@@ -147,9 +147,6 @@ class nsZenWindowSync {
     for (let topic of OBSERVING) {
       Services.obs.addObserver(this, topic);
     }
-    lazy.SessionStore.promiseAllWindowsRestored.then(() => {
-      this.#onSessionStoreInitialized();
-    });
   }
 
   uninit() {
@@ -176,6 +173,13 @@ class nsZenWindowSync {
    * @param {Window} aWindow - The browser window that is about to be shown.
    */
   #onWindowBeforeShow(aWindow) {
+    if (
+      aWindow.gZenWindowSync ||
+      aWindow.document.documentElement.hasAttribute("zen-unsynced-window")
+    ) {
+      return;
+    }
+    this.log("Setting up window sync for window", aWindow);
     // There are 2 possibilities to know if we are trying to open
     // a new *unsynced* window:
     // 1. We are passing `zen-unsynced` in the window arguments.
@@ -221,6 +225,7 @@ class nsZenWindowSync {
     // that didn't have this feature.
     await this.#runOnAllWindowsAsync(null, async (aWindow) => {
       const { gZenWorkspaces } = aWindow;
+      this.#onWindowBeforeShow(aWindow);
       await gZenWorkspaces.promiseInitialized;
       for (let tab of gZenWorkspaces.allStoredTabs) {
         if (!tab.id) {
@@ -288,6 +293,10 @@ class nsZenWindowSync {
         this.#onWindowBeforeShow(aSubject);
         break;
       }
+      case "sessionstore-windows-restored": {
+        this.#onSessionStoreInitialized();
+        break;
+      }
     }
   }
 
@@ -577,7 +586,17 @@ class nsZenWindowSync {
    * @param {object} aOtherTab - The tab in the other window.
    */
   async #swapBrowserDocShellsAsync(aOurTab, aOtherTab) {
-    let promise = this.#maybeFlushTabState(aOurTab);
+    if (!this.#canSwapBrowsers(aOurTab, aOtherTab)) {
+      this.log(
+        `Cannot swap browsers between tabs ${aOurTab.id} and ${aOtherTab.id} due to process mismatch`
+      );
+      return;
+    }
+    if (aOtherTab.closing) {
+      this.log(`Cannot swap browsers, other tab ${aOtherTab.id} is closing`);
+      return;
+    }
+    let promise = this.#maybeFlushTabState(aOtherTab);
     await this.#styleSwapedBrowsers(
       aOurTab,
       aOtherTab,
@@ -626,6 +645,27 @@ class nsZenWindowSync {
     }
   }
 
+  /**
+   * Checks if two tabs can have their browsers swapped.
+   *
+   * @param {object} aOurTab - The tab in the current window.
+   * @param {object} aOtherTab - The tab in the other window.
+   * @returns {boolean} True if the tabs can be swapped, false otherwise.
+   */
+  #canSwapBrowsers(aOurTab, aOtherTab) {
+    // In this case, the other tab is most likely discarded or pending.
+    // We *shouldn't* care about this scenario since the remoteness should be
+    // the same anyways.
+    if (!aOurTab.linkedBrowser || !aOtherTab.linkedBrowser) {
+      return true;
+    }
+    // Can't swap between chrome and content processes.
+    if (aOurTab.linkedBrowser.isRemoteBrowser != aOtherTab.linkedBrowser.isRemoteBrowser) {
+      return false;
+    }
+    return true;
+  }
+
   /**
    * Swaps the browser docshells between two tabs.
    *
@@ -638,19 +678,32 @@ class nsZenWindowSync {
    */
   #swapBrowserDocShellsInner(aOurTab, aOtherTab, { focus = true, onClose = false } = {}) {
     // Can't swap between chrome and content processes.
-    if (aOurTab.linkedBrowser.isRemoteBrowser != aOtherTab.linkedBrowser.isRemoteBrowser) {
+    if (!this.#canSwapBrowsers(aOurTab, aOtherTab)) {
+      this.log(
+        `Cannot swap browsers between tabs ${aOurTab.id} and ${aOtherTab.id} due to process mismatch`
+      );
       return null;
     }
     // See https://github.com/zen-browser/desktop/issues/11851, swapping the browsers
     // don't seem to update the state's cache properly, leading to issues when restoring
     // the session later on.
-    let tabStateEntries = this.#getTabEntriesFromCache(aOurTab);
+    let tabStateEntries = this.#getTabEntriesFromCache(aOtherTab);
+    const setStateToTab = () => {
+      if (!tabStateEntries?.entries.length) {
+        this.log(`Error: No tab state entries found for tab ${aOurTab.id} during swap`);
+        return;
+      }
+      lazy.TabStateCache.update(aOurTab.linkedBrowser.permanentKey, {
+        history: tabStateEntries,
+      });
+    };
     // Running `swapBrowsersAndCloseOther` doesn't expect us to use the tab after
     // the operation, so it doesn't really care about cleaning up the other tab.
     // We need to make a new tab progress listener for the other tab after the swap.
     this.#withRestoreTabProgressListener(
       aOtherTab,
       () => {
+        setStateToTab();
         this.log(`Swapping docshells between windows for tab ${aOurTab.id}`);
         aOurTab.ownerGlobal.gBrowser.swapBrowsersAndCloseOther(aOurTab, aOtherTab, false);
         // Since we are moving progress listeners around, there's a chance that we
@@ -701,13 +754,7 @@ class nsZenWindowSync {
     // we would start receiving invalid history changes from the the incorrect
     // browser view that was just swapped out.
     return this.#maybeFlushTabState(aOurTab).finally(() => {
-      if (!tabStateEntries?.entries.length) {
-        this.log(`Error: No tab state entries found for tab ${aOtherTab.id} during swap`);
-        return;
-      }
-      lazy.TabStateCache.update(aOurTab.linkedBrowser.permanentKey, {
-        history: tabStateEntries,
-      });
+      setStateToTab();
     });
   }
 
@@ -905,7 +952,7 @@ class nsZenWindowSync {
     if (aTab.linkedBrowser) {
       cachedState = lazy.TabStateCache.get(aTab.linkedBrowser.permanentKey);
     }
-    return cachedState?.history?.entries ? cachedState.history : { entries: [] };
+    return cachedState?.history?.entries ? Cu.cloneInto(cachedState.history, {}) : { entries: [] };
   }
 
   /**
@@ -1007,13 +1054,30 @@ class nsZenWindowSync {
     moveAllTabsToWindow(true);
   }
 
+  /**
+   * Updates the initial pinned tab image for all windows if not already set.
+   *
+   * @param {object} aTab - The tab to update the image for.
+   */
+  #maybeEditAllTabsEntryImage(aTab) {
+    if (!aTab?._zenPinnedInitialState || aTab._zenPinnedInitialState.image) {
+      return;
+    }
+    let image = aTab.getAttribute("image") || aTab.ownerGlobal.gBrowser.getIcon(aTab);
+    this.#runOnAllWindows(null, (win) => {
+      const targetTab = this.getItemFromWindow(win, aTab.id);
+      if (targetTab) {
+        targetTab._zenPinnedInitialState.image = image;
+      }
+    });
+  }
+
   /* Mark: Event Handlers */
 
   on_TabOpen(aEvent) {
     const tab = aEvent.target;
     const window = tab.ownerGlobal;
     const isUnsyncedWindow = window.gZenWorkspaces.privateWindowOrDisabled;
-
     if (tab.id) {
       // This tab was opened as part of a sync operation.
       return;
@@ -1045,6 +1109,7 @@ class nsZenWindowSync {
       // No need to sync icon changes for tabs that aren't active in this window.
       return;
     }
+    this.#maybeEditAllTabsEntryImage(aEvent.target);
     return this.#delegateGenericSyncEvent(aEvent, SYNC_FLAG_ICON);
   }
 
@@ -1258,7 +1323,11 @@ class nsZenWindowSync {
       }
     });
 
-    return this.#onTabSwitchOrWindowFocus(window, null, /* ignoreSameTab = */ true);
+    return new Promise((resolve) => {
+      lazy.setTimeout(() => {
+        this.#onTabSwitchOrWindowFocus(window, null, /* ignoreSameTab = */ true).finally(resolve);
+      }, 0);
+    });
   }
 }
 

src/zen/split-view/ZenViewSplitter.mjs

@@ -1354,10 +1354,15 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
       }
     });
 
+    // Apply grid to tabs first to set zen-split attribute on containers
+    // before setting zen-split-view on parents. This prevents the black flash
+    // caused by CSS rules that hide containers without zen-split attribute
+    // when the parent has zen-split-view attribute.
+    this.applyGridToTabs(splitData.tabs);
+
     this.tabBrowserPanel.setAttribute("zen-split-view", "true");
     document.getElementById("tabbrowser-tabbox").setAttribute("zen-split-view", "true");
 
-    this.applyGridToTabs(splitData.tabs);
     this.applyGridLayout(splitData.layoutTree);
     this.setTabsDocShellState(splitData.tabs, true);
     this.toggleWrapperDisplay(true);
@@ -1403,6 +1408,10 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
       tab.setAttribute("split-view", "true");
       const container = tab.linkedBrowser?.closest(".browserSidebarContainer");
       container.setAttribute("is-zen-split", "true");
+      // Set zen-split early to prevent visibility flash when switching workspaces.
+      // The CSS rule for [is-zen-split]:not([zen-split]) sets visibility:hidden,
+      // so we must set zen-split before the parent zen-split-view attribute is applied.
+      container.setAttribute("zen-split", "true");
       if (!container?.querySelector(".zen-tab-rearrange-button")) {
         // insert a header into the container
         const header = this._createHeader(container);

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -560,6 +560,16 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
       );
       const essentialTabsTarget = event.target.closest(".zen-essentials-container");
       const tabsTarget = !pinnedTabsTarget;
+      let currentEssenialContainer = gZenWorkspaces.getCurrentEssentialsContainer();
+      if (currentEssenialContainer?.essentialsPromo) {
+        currentEssenialContainer.essentialsPromo.remove();
+      }
+
+      movingTabs = movingTabs.filter((tab) =>
+        gBrowser.isTabGroupLabel(tab)
+          ? tab.group?.isZenFolder && !tabsTarget && !essentialTabsTarget
+          : true
+      );
 
       // TODO: Solve the issue of adding a tab between two groups
       // Remove group labels from the moving tabs and replace it
@@ -651,7 +661,6 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
           }
         }
       }
-
       return moved;
     } catch (ex) {
       console.error("Error moving tabs:", ex);

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

@@ -296,7 +296,7 @@
   border-bottom: 0px solid transparent !important;
 
   --tab-block-margin: 2px;
-  --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.12));
+  --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.18));
   --tab-selected-shadow: 0 1px 1px 1px light-dark(rgba(0, 0, 0, 0.09), rgba(0, 0, 0, 0.05)) !important;
   grid-gap: 0 !important;
 
@@ -496,6 +496,11 @@
     padding-left: 0 !important;
   }
 
+  #tabbrowser-tabs {
+    --toolbarbutton-inner-padding: 10px !important;
+    --tab-icon-end-margin: var(--toolbarbutton-inner-padding) !important;
+  }
+
   & .tab-audio-button {
     margin-inline-start: -4px;
     margin-inline-end: 2px;
@@ -665,7 +670,7 @@
       .tab-sharing-icon-overlay,
       .tab-icon-overlay {
         margin-inline-end: var(--toolbarbutton-inner-padding) !important;
-        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 4) !important;
+        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 3) !important;
       }
     }
   }
@@ -929,7 +934,7 @@
   height: calc(100% - var(--tab-block-margin) * 2);
   margin-left: calc(-1 * var(--tab-inline-padding) + var(--tab-block-margin));
   margin-right: 8px;
-  padding: 0 calc(var(--toolbarbutton-inner-padding) - 2px) 0 calc(var(--toolbarbutton-inner-padding) / 4 + var(--tab-inline-padding) - 2px);
+  padding: 0 calc(var(--toolbarbutton-inner-padding) - 2px) 0 calc(var(--toolbarbutton-inner-padding) / 3 + var(--tab-inline-padding) - 2px);
   border-radius: 0;
   border-top-left-radius: var(--border-radius-medium);
   width: unset;

src/zen/workspaces/ZenWorkspaces.mjs

@@ -2739,6 +2739,7 @@ class nsZenWorkspaces {
 
     let nextWorkspace = workspaces[targetIndex];
     await this.changeWorkspace(nextWorkspace, { whileScrolling });
+    return nextWorkspace;
   }
 
   #initializeWorkspaceTabContextMenus() {

src/zen/workspaces/zen-workspaces.css

@@ -155,7 +155,7 @@
 
 /* Mark workspaces indicator */
 .zen-current-workspace-indicator {
-  --indicator-gap: 10px;
+  --indicator-gap: calc(var(--toolbarbutton-inner-padding) - 1px);
   padding: calc(2px + var(--tab-inline-padding) + var(--zen-toolbox-padding));
   font-weight: 500;
   position: relative;
@@ -208,8 +208,14 @@
     align-items: center;
     fill-opacity: 0.6;
     -moz-context-properties: fill-opacity, fill;
-    fill: currentColor;
-    font-size: 14px;
+    fill: var(--toolbox-textcolor);
+    font-size: 16px;
+    padding-top: 2px;
+    color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
+
+    & img {
+      transform: translateY(-1px);
+    }
 
     &[zen-emoji-open='true']::before {
       border: 1px dashed light-dark(rgba(0, 0, 0, .5), rgba(255, 255, 255, .5));
@@ -225,19 +231,19 @@
 
     @media (-moz-platform: windows) {
       & img {
-        margin-bottom: -4px;
+        margin-bottom: -2px;
       }
     }
   }
 
   .zen-current-workspace-indicator-name {
-    display: flex;
+    display: block;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     cursor: auto;
+    white-space: nowrap;
     font-weight: 600;
-    align-items: center;
     margin: 0;
 
     :root[zen-unsynced-window] & {

surfer.json

@@ -20,7 +20,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.18b",
+        "displayVersion": "1.18.1b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -40,7 +40,7 @@
       "brandShortName": "Twilight",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.18t",
+        "displayVersion": "1.19t",
         "github": {
           "repo": "zen-browser/desktop"
         }