From a408449e2c442ad1d3c07facef9158f2c6527f91 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 28 Jan 2025 16:27:56 +0100
Subject: [PATCH 001/191] Updated to firefox RC 135.0

---
 README.md                                     |   2 +-
 .../base/content/browser-sets-js.patch        |  10 +-
 src/browser/base/content/browser-xhtml.patch  |  10 +-
 .../content/main-popupset-inc-xhtml.patch     |  12 +-
 .../zen-styles/zen-tabs/vertical-tabs.css     |   6 +-
 .../CustomizableUI-sys-mjs.patch              |  34 ++--
 .../content/editBookmarkPanel-inc-xhtml.patch |  72 ++++---
 .../sidebar/browser-sidebar-js.patch          |  36 ----
 .../tabbrowser/content/tabbrowser-js.patch    |  52 +++---
 .../tabbrowser/content/tabs-js.patch          |  62 +++---
 .../customizableui/panelUI-shared-css.patch   |   8 +-
 src/browser/themes/windows/browser-css.patch  |  20 +-
 src/widget/windows/nsWindow-cpp.patch         | 176 ------------------
 surfer.json                                   |   4 +-
 14 files changed, 135 insertions(+), 369 deletions(-)
 delete mode 100644 src/browser/components/sidebar/browser-sidebar-js.patch
 delete mode 100644 src/widget/windows/nsWindow-cpp.patch

diff --git a/README.md b/README.md
index 036ad3d8f..a82bb05f4 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
 
 Zen is currently built using firefox version `134.0.2`! 🚀
 
-- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using firefox version `RC 134.0.2`!
+- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using firefox version `RC 135.0`!
 - 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!
 
diff --git a/src/browser/base/content/browser-sets-js.patch b/src/browser/base/content/browser-sets-js.patch
index be4f74496..78d0fb929 100644
--- a/src/browser/base/content/browser-sets-js.patch
+++ b/src/browser/base/content/browser-sets-js.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
-index 3031278749317d153624c6ccfbcc9d47aaf4089f..e67a8c3b56c01334627350c494b0139638ebf19a 100644
+index 61aef2d420a78fb1910f556b71f6db75a16180ed..a3a1e70bedb760c165c338c28de6f2ee924df8de 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -245,7 +245,7 @@ document.addEventListener(
+@@ -250,7 +250,7 @@ document.addEventListener(
          }
        });
  
 -    document.getElementById("mainKeyset").addEventListener("command", event => {
 +    document.getElementById("zenKeyset").addEventListener("command", event => {
-       switch (event.target.id) {
-         case "goHome":
-           BrowserCommands.home();
+       const SIDEBAR_REVAMP_PREF = "sidebar.revamp";
+       const SIDEBAR_REVAMP_ENABLED = Services.prefs.getBoolPref(
+         SIDEBAR_REVAMP_PREF,
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index de5a5be77..f55a99295 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index ca8953f3604f4f70de76576964af5f3c733f17a0..a2731ef6d4392301217cd05f6583e4814f1118e2 100644
+index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b09d63ac5 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -101,6 +101,8 @@
+@@ -99,6 +99,8 @@
  
-   <title data-l10n-id="browser-main-window-title"></title>
+   <title data-l10n-id="browser-main-window-default-title"></title>
  
 +#include zen-preloaded.inc.xhtml
 +
  # All JS files which are needed by browser.xhtml and other top level windows to
  # support MacOS specific features *must* go into the global-scripts.inc file so
  # that they can be shared with macWindow.inc.xhtml.
-@@ -145,6 +147,7 @@
+@@ -143,6 +145,7 @@
    window.addEventListener("DOMContentLoaded",
      gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
  </script>
@@ -19,7 +19,7 @@ index ca8953f3604f4f70de76576964af5f3c733f17a0..a2731ef6d4392301217cd05f6583e481
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -166,9 +169,12 @@
+@@ -164,9 +167,12 @@
      </vbox>
    </html:template>
  
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index b1423139c..1ebbd1437 100644
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 1fb595272a184f9a40f56f87d86232e3324f7750..8dd0f0ff856be524a5fa27fb8c6180c1fe058134 100644
+index e5f3424eaeeec0ba552537f167dd99e912216d94..4bdfcdb23fe9c44ad3d4de273c64f4cc31cb4034 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -144,6 +144,10 @@
+@@ -181,6 +181,10 @@
             hidden="true"
             tabspecific="true"
             aria-labelledby="editBookmarkPanelTitle">
@@ -13,17 +13,17 @@ index 1fb595272a184f9a40f56f87d86232e3324f7750..8dd0f0ff856be524a5fa27fb8c6180c1
        <box class="panel-header">
          <html:h1>
            <html:span id="editBookmarkPanelTitle"/>
-@@ -169,6 +173,7 @@
+@@ -206,6 +210,7 @@
                    class="footer-button"/>
          </html:moz-button-group>
        </vbox>
-+      </vbox>
++    </vbox>
      </panel>
    </html:template>
  
-@@ -454,6 +459,8 @@
+@@ -535,6 +540,8 @@
  
- #include popup-notifications.inc
+ #include popup-notifications.inc.xhtml
  
 +#include zen-popupset.inc.xhtml
 +
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index f4fc23bc2..de8f2e81d 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -20,8 +20,10 @@
   }
 
   @media (-moz-platform: macos) and (not (-moz-bool-pref: 'zen.view.mac.show-three-dot-menu')) {
-    &:not([customizing]) #PanelUI-button {
-      display: none;
+    &:not([customizing]) #PanelUI-button:not([open]):not([panelopen]) {
+      position: absolute;
+      opacity: 0;
+      pointer-events: none;
     }
   }
 
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index c3b97085e..007ff5efc 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729be3bead4a 100644
+index e6b9b7dcfab179e7552c146eb1551b45ad042266..d9d838a7a51f67b52b69f419024cc3174ae5260b 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -19,8 +19,8 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
  
  const kSpecialWidgetPfx = "customizableui-special-";
  
-@@ -307,13 +308,11 @@ var CustomizableUIInternal = {
-       "spring",
+@@ -317,13 +318,11 @@ var CustomizableUIInternal = {
+       "vertical-spacer",
        "urlbar-container",
        "spring",
 -      "save-to-pocket-button",
@@ -35,7 +35,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
      this.registerArea(
        CustomizableUI.AREA_NAVBAR,
        {
-@@ -321,7 +320,6 @@ var CustomizableUIInternal = {
+@@ -331,7 +330,6 @@ var CustomizableUIInternal = {
          overflowable: true,
          defaultPlacements: navbarPlacements,
          verticalTabsDefaultPlacements: [
@@ -43,7 +43,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
            "alltabs-button",
          ],
          defaultCollapsed: false,
-@@ -346,10 +344,7 @@ var CustomizableUIInternal = {
+@@ -356,10 +354,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -54,7 +54,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -412,6 +407,7 @@ var CustomizableUIInternal = {
+@@ -422,6 +417,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -62,7 +62,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1127,6 +1123,9 @@ var CustomizableUIInternal = {
+@@ -1151,6 +1147,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -72,7 +72,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1540,7 +1539,7 @@ var CustomizableUIInternal = {
+@@ -1564,7 +1563,7 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -81,7 +81,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1550,7 +1549,7 @@ var CustomizableUIInternal = {
+@@ -1574,7 +1573,7 @@ var CustomizableUIInternal = {
          // We also need to remove the panel context menu if it's there:
          this.ensureButtonContextMenu(widgetNode);
          if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
@@ -90,7 +90,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -2654,7 +2653,6 @@ var CustomizableUIInternal = {
+@@ -2678,7 +2677,6 @@ var CustomizableUIInternal = {
      if (!this.isWidgetRemovable(aWidgetId)) {
        return;
      }
@@ -98,7 +98,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
      let placements = gPlacements.get(oldPlacement.area);
      let position = placements.indexOf(aWidgetId);
      if (position != -1) {
-@@ -3609,7 +3607,7 @@ var CustomizableUIInternal = {
+@@ -3669,7 +3667,7 @@ var CustomizableUIInternal = {
      }
    },
  
@@ -107,7 +107,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -3620,7 +3618,7 @@ var CustomizableUIInternal = {
+@@ -3680,7 +3678,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -116,7 +116,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -4583,6 +4581,7 @@ export var CustomizableUI = {
+@@ -4658,6 +4656,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -124,7 +124,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -6408,11 +6407,11 @@ class OverflowableToolbar {
+@@ -6483,11 +6482,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -138,7 +138,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
      });
  
      lazy.log.debug(
-@@ -6422,7 +6421,8 @@ class OverflowableToolbar {
+@@ -6497,7 +6496,8 @@ class OverflowableToolbar {
      // If the target has min-width: 0, their children might actually overflow
      // it, so check for both cases explicitly.
      let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
@@ -148,7 +148,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -6516,7 +6516,7 @@ class OverflowableToolbar {
+@@ -6591,7 +6591,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -157,7 +157,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..410aabf3a58d8d8df68098cbfb45729b
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -6678,6 +6678,9 @@ class OverflowableToolbar {
+@@ -6753,6 +6753,9 @@ class OverflowableToolbar {
     * @param {MouseEvent} aEvent the click event.
     */
    #onClickDefaultListButton(aEvent) {
diff --git a/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch b/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch
index fd1ec981e..87cd3f11f 100644
--- a/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch
+++ b/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch
@@ -1,58 +1,50 @@
 diff --git a/browser/components/places/content/editBookmarkPanel.inc.xhtml b/browser/components/places/content/editBookmarkPanel.inc.xhtml
-index 3ec3f094831c2143a818b43d1761a571f0ffa63d..98704f399089f2a33776c6ae9565b8ff9b8ddd34 100644
+index 40366677b60123c66bf0739d1b2374b423d3061c..3e722dce6b21ab62535369f20afe5f0acd43838f 100644
 --- a/browser/components/places/content/editBookmarkPanel.inc.xhtml
 +++ b/browser/components/places/content/editBookmarkPanel.inc.xhtml
-@@ -5,7 +5,7 @@
- <div id="editBookmarkPanelContent">
-   <label id="editBMPanel_itemsCountText"
-          class="editBMPanel_selectionCount"/>
+@@ -12,14 +12,15 @@
+   <html:input id="editBMPanel_namePicker"
+               class="editBMPanel_nameRow hideable"
+               type="text"/>
 -
 +<hbox flex="1" class="zenEditBMPanel_fieldContainer">
-   <label data-l10n-id="bookmark-overlay-name-2"
-          class="editBMPanel_nameRow hideable"
-          control="editBMPanel_namePicker"/>
-@@ -13,7 +13,7 @@
-               class="editBMPanel_nameRow hideable"
-               type="text"
-               onchange="gEditItemOverlay.onNamePickerChange().catch(Cu.reportError);"/>
--
-+</hbox>
    <label data-l10n-id="bookmark-overlay-url"
           class="editBMPanel_locationRow hideable"
           control="editBMPanel_locationField"/>
-@@ -21,7 +21,7 @@
+   <html:input id="editBMPanel_locationField"
                class="editBMPanel_locationRow uri-element hideable"
-               type="text"
-               onchange="gEditItemOverlay.onLocationFieldChange();"/>
+               type="text"/>
 -
++</hbox>
 +<hbox flex="1" class="zenEditBMPanel_fieldContainer">
    <label data-l10n-id="bookmark-overlay-location-2"
           class="editBMPanel_folderRow hideable"
           control="editBMPanel_folderMenuList"/>
-@@ -51,6 +51,26 @@
-             data-l10n-id="bookmark-overlay-folders-expander2"
-             oncommand="gEditItemOverlay.toggleFolderTreeVisibility();"/>
+@@ -47,7 +48,26 @@
+             class="expander-down panel-button"
+             data-l10n-id="bookmark-overlay-folders-expander2"/>
    </hbox>
-+</hbox>
-+  <hbox flex="1" class="zenEditBMPanel_fieldContainer">
-+    <label data-l10n-id="zen-bookmark-edit-panel-workspace-selector"
-+           class="hideable"
-+           control="editBMPanel_workspacesSelectorExpander"/>
-+    <div id="editBMPanel_workspaceDropdown"
-+         class="editBMPanel_workspaceRow hideable workspace-dropdown">
-+      <div
-+              id="editBMPanel_workspaceSummary"
-+              class="workspace-trigger">-</div>
-+      <button id="editBMPanel_workspacesSelectorExpander"
-+              class="expander-down panel-button"
-+              data-l10n-id="bookmark-overlay-tags-expander2"
-+              oncommand="gEditItemOverlay.onWorkspaceDropdownToggle();"/>
-+
-+    </div>
+-
 +  </hbox>
-+
-+  <ul id="editBMPanel_workspaceList" class="workspace-list hideable" hidden="true">
-+  </ul>
- 
++    <hbox flex="1" class="zenEditBMPanel_fieldContainer">
++      <label data-l10n-id="zen-bookmark-edit-panel-workspace-selector"
++             class="hideable"
++             control="editBMPanel_workspacesSelectorExpander"/>
++      <div id="editBMPanel_workspaceDropdown"
++           class="editBMPanel_workspaceRow hideable workspace-dropdown">
++        <div
++                id="editBMPanel_workspaceSummary"
++                class="workspace-trigger">-</div>
++        <button id="editBMPanel_workspacesSelectorExpander"
++                class="expander-down panel-button"
++                data-l10n-id="bookmark-overlay-tags-expander2"
++                oncommand="gEditItemOverlay.onWorkspaceDropdownToggle();"/>
++  
++      </div>
++    </hbox>
++  
++    <ul id="editBMPanel_workspaceList" class="workspace-list hideable" hidden="true">
++    </ul>
    <vbox id="editBMPanel_folderTreeRow"
          class="hideable"
+         hidden="true">
diff --git a/src/browser/components/sidebar/browser-sidebar-js.patch b/src/browser/components/sidebar/browser-sidebar-js.patch
deleted file mode 100644
index c17d4f10e..000000000
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index 4a124003976684e014435854aef69ce29da541d2..61ce44751c36eea3e5ae2ddcc62e42c01459629b 100644
---- a/browser/components/sidebar/browser-sidebar.js
-+++ b/browser/components/sidebar/browser-sidebar.js
-@@ -578,7 +578,7 @@ var SidebarController = {
-    */
-   setPosition() {
-     // First reset all ordinals to match DOM ordering.
--    let browser = document.getElementById("browser");
-+    let browser = document.getElementById("tabbrowser-tabbox");
-     [...browser.children].forEach((node, i) => {
-       node.style.order = i + 1;
-     });
-@@ -592,9 +592,10 @@ var SidebarController = {
-       let boxOrdinal = this._box.style.order;
-       this._box.style.order = tabbox.style.order;
- 
--      tabbox.style.order = boxOrdinal;
-       // the launcher should be on the right of the sidebar-box
--      sidebarContainer.style.order = parseInt(this._box.style.order) + 1;
-+      this._box.style.order = browser.children.length + 2;
-+      this._splitter.style.order = browser.children.length + 1;
-+      this._splitter.style.marginRight = 0;
-       // Indicate we've switched ordering to the box
-       this._box.toggleAttribute("positionend", true);
-       sidebarMain.toggleAttribute("positionend", true);
-@@ -603,6 +604,9 @@ var SidebarController = {
-       this._box.toggleAttribute("positionend", false);
-       sidebarMain.toggleAttribute("positionend", false);
-       sidebarContainer.toggleAttribute("positionend", false);
-+      this._box.style.order = 1;
-+      this._splitter.style.order = 2;
-+      this._splitter.style.removeProperty("margin-right");
-       this.toolbarButton &&
-         this.toolbarButton.toggleAttribute("positionend", false);
-     }
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 5b5624733..a18dfcb1a 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,9 +1,9 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce8043469f4ff655 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c58f6765cc 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -409,11 +409,39 @@
-       return count;
+@@ -406,11 +406,39 @@
+       return this.tabContainer.visibleTabs;
      }
  
 +    get _numVisiblePinTabs() {
@@ -44,7 +44,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        }
        return i;
      }
-@@ -806,7 +834,7 @@
+@@ -807,7 +835,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -52,8 +52,8 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
 +          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab)
          );
        } else {
-         this.moveTabTo(aTab, this.pinnedTabCount);
-@@ -1052,6 +1080,8 @@
+         this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
+@@ -1055,6 +1083,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -62,7 +62,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1062,6 +1092,9 @@
+@@ -1065,6 +1095,9 @@
          );
          return;
        }
@@ -72,7 +72,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1291,6 +1324,7 @@
+@@ -1310,6 +1343,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -80,7 +80,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -2374,7 +2408,7 @@
+@@ -2387,7 +2421,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -89,7 +89,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2434,7 +2468,7 @@
+@@ -2447,7 +2481,7 @@
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
          this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
@@ -98,7 +98,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2666,6 +2700,12 @@
+@@ -2679,6 +2713,12 @@
          );
        }
  
@@ -111,7 +111,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2735,6 +2775,12 @@
+@@ -2742,6 +2782,12 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -124,7 +124,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2878,6 +2924,13 @@
+@@ -2885,6 +2931,13 @@
          }
        }
  
@@ -138,7 +138,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3389,6 +3442,23 @@
+@@ -3403,6 +3456,23 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -162,7 +162,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3402,6 +3472,9 @@
+@@ -3416,6 +3486,9 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -172,7 +172,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3438,6 +3511,21 @@
+@@ -3452,6 +3525,21 @@
              preferredRemoteType,
            });
  
@@ -194,7 +194,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
            if (select) {
              tabToSelect = tab;
            }
-@@ -3491,7 +3579,6 @@
+@@ -3505,7 +3593,6 @@
              this.tabContainer._invalidateCachedTabs();
            }
          }
@@ -202,7 +202,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
          tab.initialize();
        }
  
-@@ -4070,6 +4157,10 @@
+@@ -4095,6 +4182,10 @@
          return;
        }
  
@@ -213,7 +213,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        this.removeTabs(selectedTabs);
      }
  
-@@ -4389,6 +4480,13 @@
+@@ -4443,6 +4534,13 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -227,7 +227,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4417,7 +4515,10 @@
+@@ -4471,7 +4569,10 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -239,7 +239,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4556,14 +4657,14 @@
+@@ -4610,14 +4711,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -256,7 +256,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5411,10 +5512,10 @@
+@@ -5465,10 +5566,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -269,7 +269,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7384,6 +7485,7 @@
+@@ -7443,6 +7544,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -277,7 +277,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8344,7 +8446,7 @@ var TabContextMenu = {
+@@ -8411,7 +8513,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -286,7 +286,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8378,7 +8480,7 @@ var TabContextMenu = {
+@@ -8444,7 +8546,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -295,7 +295,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8607,6 +8709,7 @@ var TabContextMenu = {
+@@ -8677,6 +8779,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 5a0650259..5f5d2be2d 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c08b06e884 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..5d49a40b35b2bc4ea2c9b8423bde07508326eaca 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
-         return this.hasAttribute("positionpinnedtabs");
        };
-       this.arrowScrollbox._canScrollToElement = tab => {
--        return (!tab.pinned || !arePositioningPinnedTabs()) && tab.visible;
-+        return (!tab.hasAttribute("zen-essential") || !arePositioningPinnedTabs()) && tab.visible;
+       this.arrowScrollbox._canScrollToElement = element => {
+         if (isTab(element)) {
+-          return !element.pinned || !this.hasAttribute("positionpinnedtabs");
++          return !tab.hasAttribute("zen-essential") || !this.hasAttribute("positionpinnedtabs");
+         }
+         return true;
        };
- 
-       // Override for performance reasons. This is the size of a single element
-@@ -352,7 +352,7 @@
+@@ -362,7 +362,7 @@
        // and we're not hitting the scroll buttons.
        if (
          event.button != 0 ||
@@ -20,7 +20,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;
-@@ -649,7 +649,7 @@
+@@ -659,7 +659,7 @@
        if (this.#isContainerVerticalPinnedExpanded(tab)) {
          // In expanded vertical mode, the max number of pinned tabs per row is dynamic
          // Set this before adjusting dragged tab's position
@@ -29,7 +29,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          let tabsPerRow = 0;
          let position = 0;
          for (let pinnedTab of pinnedTabs) {
-@@ -997,7 +997,7 @@
+@@ -1010,7 +1010,7 @@
            }
          } else {
            let pinned = draggedTab.pinned;
@@ -38,7 +38,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
            let tabs = this.visibleTabs.slice(
              pinned ? 0 : numPinned,
              pinned ? numPinned : undefined
-@@ -1076,7 +1076,7 @@
+@@ -1090,7 +1090,7 @@
                let postTransitionCleanup = () => {
                  tab.removeAttribute("tabdrop-samewindow");
  
@@ -46,8 +46,8 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
 +              this._finishAnimateTabMove(true);
                  if (dropIndex !== false) {
                    gBrowser.moveTabTo(tab, dropIndex);
-                   if (incrementDropIndex) {
-@@ -1086,7 +1086,7 @@
+                   if (!directionForward) {
+@@ -1100,7 +1100,7 @@
  
                  gBrowser.syncThrobberAnimations(tab);
                };
@@ -56,7 +56,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -1238,7 +1238,8 @@
+@@ -1263,7 +1263,8 @@
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
@@ -66,7 +66,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1487,7 +1488,7 @@
+@@ -1512,7 +1513,7 @@
        }
  
        this.#allTabs = [
@@ -75,7 +75,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          ...children,
        ];
        return this.#allTabs;
-@@ -1556,6 +1557,7 @@
+@@ -1593,6 +1594,7 @@
        }
  
        this.#focusableItems = [
@@ -83,7 +83,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1579,8 +1581,8 @@
+@@ -1617,8 +1619,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -94,7 +94,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        );
      }
  
-@@ -1778,7 +1780,7 @@
+@@ -1816,7 +1818,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -103,7 +103,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1794,6 +1796,7 @@
+@@ -1832,6 +1834,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -111,7 +111,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1841,7 +1844,7 @@
+@@ -1879,7 +1882,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -120,7 +120,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1856,7 +1859,7 @@
+@@ -1894,7 +1897,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -129,7 +129,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1922,13 +1925,13 @@
+@@ -1963,13 +1966,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
@@ -146,7 +146,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          }
        }
  
-@@ -1952,7 +1955,7 @@
+@@ -1993,7 +1996,7 @@
  
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
@@ -155,7 +155,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2033,7 +2036,7 @@
+@@ -2074,7 +2077,7 @@
          return;
        }
  
@@ -164,7 +164,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2221,9 +2224,9 @@
+@@ -2257,9 +2260,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -176,7 +176,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          pinned ? numPinned : undefined
        );
  
-@@ -2456,8 +2459,8 @@
+@@ -2502,8 +2505,8 @@
        );
      }
  
@@ -187,7 +187,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          return;
        }
  
-@@ -2622,9 +2625,9 @@
+@@ -2668,9 +2671,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -199,7 +199,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        }
      }
  
-@@ -2708,7 +2711,7 @@
+@@ -2754,7 +2757,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -208,7 +208,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          return;
        }
  
-@@ -2726,12 +2729,14 @@
+@@ -2772,12 +2775,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -224,7 +224,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
                selectedTab,
              ];
            })
-@@ -2748,8 +2753,11 @@
+@@ -2794,8 +2799,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -238,7 +238,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
              ) {
                return;
              }
-@@ -2757,21 +2765,29 @@
+@@ -2803,21 +2811,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (
diff --git a/src/browser/themes/shared/customizableui/panelUI-shared-css.patch b/src/browser/themes/shared/customizableui/panelUI-shared-css.patch
index 36027abfb..9cc719a2d 100644
--- a/src/browser/themes/shared/customizableui/panelUI-shared-css.patch
+++ b/src/browser/themes/shared/customizableui/panelUI-shared-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css
-index e4409ac75f6ee794d400559b0b01ae30904d01bc..4c10051d6bbc77440195b08397743c03a11d1fb0 100644
+index bdbfd3521b4921f7d6d44623181019a8263b5825..d4c4bab98197b2e5948a34daa1e435b74880a700 100644
 --- a/browser/themes/shared/customizableui/panelUI-shared.css
 +++ b/browser/themes/shared/customizableui/panelUI-shared.css
-@@ -16,7 +16,7 @@
+@@ -18,7 +18,7 @@
    --menu-panel-width-wide: 29em;
  
    --arrowpanel-menuitem-margin-block: 0;
@@ -11,7 +11,7 @@ index e4409ac75f6ee794d400559b0b01ae30904d01bc..4c10051d6bbc77440195b08397743c03
    --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline);
    --arrowpanel-menuitem-padding-block: 8px;
    --arrowpanel-menuitem-padding-inline: 8px;
-@@ -720,15 +720,15 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
+@@ -819,15 +819,15 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
  /* Firefox Account Toolbar Panel */
  
  #fxa-avatar-image {
@@ -29,4 +29,4 @@ index e4409ac75f6ee794d400559b0b01ae30904d01bc..4c10051d6bbc77440195b08397743c03
 +    --avatar-image-url: var(--zen-avatar-image-url);
    }
  
-   &:not([fxatoolbarmenu]) #fxa-toolbar-menu-button {
+   /**
diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch
index 1bf29c49f..9c49c2201 100644
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,24 +1,8 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index 95b571aca107a6b3e0e5a7e5eb8672c66be9bf61..9ed448c2142b6a5dbb6132ffe5e65a1771a4a525 100644
+index f49604e53780763b9aa19897458c45f0be6cbc9b..aa9da99641ba4a3b7f67a27acbbf6c75c1346ced 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
-@@ -31,15 +31,6 @@
-       &:not([lwtheme]) {
-         background-color: transparent;
- 
--        /* Accent color in titlebar overrides Mica. */
--        @media not (-moz-windows-accent-color-in-titlebar) {
--          /* Hide the Firefox buttons since Windows draws their own.
--           * FIXME(emilio): Find a way of hiding the native buttons, or make them
--           * taller, this is very hacky. */
--          .titlebar-buttonbox {
--            opacity: 0;
--          }
--        }
-       }
-     }
- 
-@@ -57,7 +48,7 @@
+@@ -47,7 +47,7 @@
      }
  
      &[sizemode="normal"] #navigator-toolbox {
diff --git a/src/widget/windows/nsWindow-cpp.patch b/src/widget/windows/nsWindow-cpp.patch
deleted file mode 100644
index 2a51fb835..000000000
--- a/src/widget/windows/nsWindow-cpp.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index 00681c216c838efedbbcded9d6b843dbd8b5b0b6..f07e6e723596d84fb53a8a72b06e02cd4ace6bc1 100644
---- a/widget/windows/nsWindow.cpp
-+++ b/widget/windows/nsWindow.cpp
-@@ -2729,12 +2729,37 @@ nsresult nsWindow::SetNonClientMargins(const LayoutDeviceIntMargin& margins) {
-   mCustomNonClient = margins != LayoutDeviceIntMargin(-1, -1, -1, -1);
-   mNonClientMargins = margins;
- 
-+  const LONG_PTR style = GetWindowLongPtrW(mWnd, GWL_STYLE);
-   // Force a reflow of content based on the new client dimensions.
-   if (mCustomNonClient) {
--    UpdateNonClientMargins();
--  } else {
--    ResetLayout();
--  }
-+    if (style & WS_SYSMENU) {
-+      // Remove the WS_SYSMENU style, so that DWM doesn't draw the caption
-+      // buttons. Note that we still need WS_MAXIMIZEBOX at least to
-+      // support Snap Layouts / Aero Snap.
-+      //
-+      // This behavior is not documented: per MSDN, WS_MAXIMIZEBOX simply
-+      // requires WS_SYSMENU, and is not valid without it. However, omitting it
-+      // doesn't seem to have negative side-effects on any version of Windows
-+      // tested (other than losing the default system menu handling, which we
-+      // implement ourselves in DisplaySystemMenu()).
-+      //
-+      // Since the system menu is lazily initialized (see [1]), we have to call
-+      // GetSystemMenu() here in order to get it created before it is too late.
-+      // An alternative would be to play with window styles later to force it
-+      // to be created, but that seems a bit more finicky.
-+      //
-+      // [1]: https://devblogs.microsoft.com/oldnewthing/20100528-00/?p=13893
-+      ::GetSystemMenu(mWnd, FALSE);
-+      ::SetWindowLongPtrW(mWnd, GWL_STYLE, style & ~WS_SYSMENU);
-+    }
-+     UpdateNonClientMargins();
-+   } else {
-+    if (WindowStyle() & WS_SYSMENU) {
-+      // Restore the WS_SYSMENU style if appropriate.
-+      ::SetWindowLongPtrW(mWnd, GWL_STYLE, style | WS_SYSMENU);
-+    }
-+     ResetLayout();
-+   }
- 
-   return NS_OK;
- }
-@@ -4560,53 +4585,55 @@ void nsWindow::IPCWindowProcHandler(UINT& msg, WPARAM& wParam, LPARAM& lParam) {
- static bool DisplaySystemMenu(HWND hWnd, nsSizeMode sizeMode, bool isRtl,
-                               int32_t x, int32_t y) {
-   HMENU hMenu = GetSystemMenu(hWnd, FALSE);
--  if (hMenu) {
--    MENUITEMINFO mii;
--    mii.cbSize = sizeof(MENUITEMINFO);
--    mii.fMask = MIIM_STATE;
--    mii.fType = 0;
--
--    // update the options
--    mii.fState = MF_ENABLED;
--    SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
--
--    mii.fState = MF_GRAYED;
--    switch (sizeMode) {
--      case nsSizeMode_Fullscreen:
--        // intentional fall through
--      case nsSizeMode_Maximized:
--        SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
--        SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
--        SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
--        break;
--      case nsSizeMode_Minimized:
--        SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
--        break;
--      case nsSizeMode_Normal:
--        SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
--        break;
--      case nsSizeMode_Invalid:
--        NS_ASSERTION(false, "Did the argument come from invalid IPC?");
--        break;
--      default:
--        MOZ_ASSERT_UNREACHABLE("Unhnalded nsSizeMode value detected");
--        break;
--    }
--    LPARAM cmd = TrackPopupMenu(
--        hMenu,
--        (TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_TOPALIGN |
--         (isRtl ? TPM_RIGHTALIGN : TPM_LEFTALIGN)),
--        x, y, 0, hWnd, nullptr);
--    if (cmd) {
--      PostMessage(hWnd, WM_SYSCOMMAND, cmd, 0);
--      return true;
--    }
-+  if (NS_WARN_IF(!hMenu)) {
-+    return false;
-   }
--  return false;
-+
-+  MENUITEMINFO mii;
-+  mii.cbSize = sizeof(MENUITEMINFO);
-+  mii.fMask = MIIM_STATE;
-+  mii.fType = 0;
-+
-+  // update the options
-+  mii.fState = MF_ENABLED;
-+  SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
-+
-+  mii.fState = MF_GRAYED;
-+  switch (sizeMode) {
-+    case nsSizeMode_Fullscreen:
-+      // intentional fall through
-+    case nsSizeMode_Maximized:
-+      SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
-+      SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
-+      SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
-+      break;
-+    case nsSizeMode_Minimized:
-+      SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
-+      break;
-+    case nsSizeMode_Normal:
-+      SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
-+      break;
-+    case nsSizeMode_Invalid:
-+      NS_ASSERTION(false, "Did the argument come from invalid IPC?");
-+      break;
-+    default:
-+      MOZ_ASSERT_UNREACHABLE("Unhnalded nsSizeMode value detected");
-+      break;
-+  }
-+  LPARAM cmd = TrackPopupMenu(hMenu,
-+                              TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD |
-+                                  TPM_TOPALIGN |
-+                                  (isRtl ? TPM_RIGHTALIGN : TPM_LEFTALIGN),
-+                              x, y, 0, hWnd, nullptr);
-+  if (!cmd) {
-+    return false;
-+  }
-+  PostMessage(hWnd, WM_SYSCOMMAND, cmd, 0);
-+  return true;
- }
- 
- // The WndProc procedure for all nsWindows in this toolkit. This merely catches
-@@ -5768,13 +5795,20 @@ bool nsWindow::ProcessMessageInternal(UINT msg, WPARAM& wParam, LPARAM& lParam,
-         result = true;
-       }
- 
--      // Handle the system menu manually when we're in full screen mode
--      // so we can set the appropriate options.
--      if (filteredWParam == SC_KEYMENU && lParam == VK_SPACE &&
--          mFrameState->GetSizeMode() == nsSizeMode_Fullscreen) {
--        DisplaySystemMenu(mWnd, mFrameState->GetSizeMode(), mIsRTL,
--                          MOZ_SYSCONTEXT_X_POS, MOZ_SYSCONTEXT_Y_POS);
--        result = true;
-+      if (filteredWParam == SC_KEYMENU && lParam == VK_SPACE) {
-+        const auto sizeMode = mFrameState->GetSizeMode();
-+        // Handle the system menu manually when we're in full screen mode or
-+        // with custom titlebar so we can set the appropriate options.
-+        if (sizeMode == nsSizeMode_Fullscreen || mCustomNonClient) {
-+          // Historically on fullscreen windows we've used this offset from the
-+          // top left as our context menu position. Note that if the point we
-+          // supply is offscreen, Windows will still try to put our menu in the
-+          // right place.
-+          constexpr LayoutDeviceIntPoint offset(20, 20);
-+          auto pos = GetScreenBounds().TopLeft() + offset;
-+          DisplaySystemMenu(mWnd, sizeMode, mIsRTL, pos.x, pos.y);
-+          result = true;
-+        }
-       }
-     } break;
- 
diff --git a/surfer.json b/surfer.json
index 1cd560986..c26b66d6b 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "134.0.2",
-    "candidate": "134.0.2"
+    "candidate": "135.0"
   },
   "buildOptions": {
     "generateBranding": true
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file

From 02f1f52c2f1dc0477c4ec8efeb46640f57c2f61c Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 28 Jan 2025 17:00:58 +0100
Subject: [PATCH 002/191] Refactor active state styling for vertical tabs to
 simplify CSS rules

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

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index de8f2e81d..b165e443b 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -275,7 +275,7 @@
       }
     }
 
-    &:not([zen-essential='true']):active {
+    &:active {
       scale: 0.98;
     }
 

From 34c9d808f81fa7f4bb94ab18624381cc29d7b590 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 28 Jan 2025 17:02:02 +0100
Subject: [PATCH 003/191] Update background opacity for tab hover effects to
 enhance visibility

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

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index b165e443b..16a06c25c 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -992,7 +992,7 @@
       position: relative;
 
       &::before {
-        background: light-dark(rgba(255, 255, 255, 0.75), rgba(68, 64, 64, 0.75));
+        background: light-dark(rgba(255, 255, 255, 0.85), rgba(68, 64, 64, 0.85));
         margin: 2px;
         border-radius: calc(var(--border-radius-medium) - 2px);
         position: absolute;
@@ -1004,7 +1004,7 @@
     }
 
     &[selected]:hover .tab-background::before {
-      background: light-dark(rgba(255, 255, 255, 0.70), rgba(68, 64, 64, 0.70));
+      background: light-dark(rgba(255, 255, 255, 0.80), rgba(68, 64, 64, 0.80));
     }
   }
 }

From 2787546f8923a046f69fd983021ceb67f554d457 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 28 Jan 2025 17:10:06 +0100
Subject: [PATCH 004/191] Fix tab scrolling logic to correctly check for
 zen-essential attribute

---
 src/browser/components/tabbrowser/content/tabs-js.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 5f5d2be2d..512df10ff 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..5d49a40b35b2bc4ea2c9b8423bde07508326eaca 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0de37c4d15 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -7,7 +7,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..5d49a40b35b2bc4ea2c9b8423bde0750
        this.arrowScrollbox._canScrollToElement = element => {
          if (isTab(element)) {
 -          return !element.pinned || !this.hasAttribute("positionpinnedtabs");
-+          return !tab.hasAttribute("zen-essential") || !this.hasAttribute("positionpinnedtabs");
++          return !element.hasAttribute("zen-essential") || !this.hasAttribute("positionpinnedtabs");
          }
          return true;
        };

From 1e99b8cf362dfc8e357fa70181749e8df2a9d313 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 28 Jan 2025 20:26:59 +0100
Subject: [PATCH 005/191] Add !important to browser background style for
 overriding specificity

---
 src/browser/base/content/zen-styles/zen-browser-ui.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 13738aed2..255a9228f 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -28,7 +28,7 @@
 
 #browser {
   width: 100%;
-  background: var(--zen-main-browser-background);
+  background: var(--zen-main-browser-background) !important;
 
   will-change: background-color;
 

From 9dd58ce0a4e73379888f11951a3e31b5bed792e1 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 30 Jan 2025 22:57:33 +0100
Subject: [PATCH 006/191] Fixed critical bug and updated to `1.7.4b`

---
 src/browser/base/content/ZenUIManager.mjs           |  7 ++++++-
 .../content/zen-styles/zen-tabs/vertical-tabs.css   |  6 +++++-
 src/browser/themes/shared/browser-shared-css.patch  | 13 +++++++++++++
 surfer.json                                         |  4 ++--
 4 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 src/browser/themes/shared/browser-shared-css.patch

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 59757a8f6..3b0609378 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -1,6 +1,7 @@
 var gZenUIManager = {
   _popupTrackingElements: [],
   _hoverPausedForExpand: false,
+  _hasLoadedDOM: false,
 
   init() {
     document.addEventListener('popupshowing', this.onPopupShowing.bind(this));
@@ -23,6 +24,10 @@ var gZenUIManager = {
       )
     ).observe(document.getElementById('navigator-toolbox'));
 
+    window.addEventListener('DOMContentLoaded', () => {
+      this._hasLoadedDOM = true;
+    }, { once: true });
+
     window.addEventListener('TabClose', this.updateTabsToolbar.bind(this));
   },
 
@@ -213,7 +218,7 @@ var gZenVerticalTabsManager = {
   },
 
   animateTab(aTab) {
-    if (!gZenUIManager.motion) {
+    if (!gZenUIManager.motion || !aTab || !this._hasLoadedDOM) {
       return;
     }
     // get next visible tab
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 69882ca04..7b88356d4 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -72,7 +72,11 @@
 }
 
 #browser {
-  --zen-toolbox-padding: max(.4rem, calc(var(--zen-element-separation) / 1.5));
+  --zen-min-toolbox-padding: .4rem;
+  @media (-moz-platform: macos) {
+    --zen-min-toolbox-padding: .52rem;
+  }
+  --zen-toolbox-padding: max(var(--zen-min-toolbox-padding), calc(var(--zen-element-separation) / 1.5));
 }
 
 :root[zen-single-toolbar='true'] {
diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch
new file mode 100644
index 000000000..062b3f5d5
--- /dev/null
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
+index b4854731c08b2f463751bb907cb44130ee6b6d2a..18d96cb457f5e57ed00b4eec6d2702287bfc72c7 100644
+--- a/browser/themes/shared/browser-shared.css
++++ b/browser/themes/shared/browser-shared.css
+@@ -147,8 +147,6 @@ body {
+    */
+   &.fullscreen-with-menubar {
+     z-index: var(--browser-area-z-index-toolbox-while-animating);
+-    box-shadow: var(--content-area-shadow);
+-    border-bottom-color: var(--chrome-content-separator-color);
+   }
+ 
+   /* Themes define a set of toolbox foreground and background colors which we
diff --git a/surfer.json b/surfer.json
index e89df1571..989933104 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.7.3b",
+        "displayVersion": "1.7.4b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -39,7 +39,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.7.2t",
+        "displayVersion": "1.7.4t",
         "github": {
           "repo": "zen-browser/desktop"
         }

From 5259fa7cbd661f137c5a84d34e48882074a1a20e Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 30 Jan 2025 23:03:19 +0100
Subject: [PATCH 007/191] Fixed loading tab animations

---
 src/browser/base/content/ZenUIManager.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 3b0609378..ad366ac23 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -24,9 +24,9 @@ var gZenUIManager = {
       )
     ).observe(document.getElementById('navigator-toolbox'));
 
-    window.addEventListener('DOMContentLoaded', () => {
+    SessionStore.promiseAllWindowsRestored.then(() => {
       this._hasLoadedDOM = true;
-    }, { once: true });
+    });
 
     window.addEventListener('TabClose', this.updateTabsToolbar.bind(this));
   },
@@ -218,7 +218,7 @@ var gZenVerticalTabsManager = {
   },
 
   animateTab(aTab) {
-    if (!gZenUIManager.motion || !aTab || !this._hasLoadedDOM) {
+    if (!gZenUIManager.motion || !aTab || !gZenUIManager._hasLoadedDOM) {
       return;
     }
     // get next visible tab

From 89d1f7a7313fac2ecd85a1014d9fb4d14191497d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 17:26:15 +0100
Subject: [PATCH 008/191] Add vertical tab animations and implement stale issue
 management workflow

---
 .github/workflows/staler.yml                  | 15 ++++++
 .../tabbrowser/content/tabbrowser-js.patch    | 48 +++++++------------
 2 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/staler.yml

diff --git a/.github/workflows/staler.yml b/.github/workflows/staler.yml
new file mode 100644
index 000000000..5a4b7fc8d
--- /dev/null
+++ b/.github/workflows/staler.yml
@@ -0,0 +1,15 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          days-before-stale: 65
+          days-before-close: 10
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 038ea3dc4..2234dfb64 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c58f6765cc 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb749b23d289 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -124,22 +124,20 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2885,6 +2931,13 @@
+@@ -2885,6 +2931,9 @@
          }
        }
  
 +      if (typeof window.gZenVerticalTabsManager !== "undefined") {
 +        gZenVerticalTabsManager.animateTab(t);
 +      }
-+
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3456,23 @@
+@@ -3403,6 +3452,21 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
-+
 +          if (tabData.zenWorkspace) {
 +            tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
 +          }
@@ -155,24 +153,22 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
 +          }
-+
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3486,9 @@
+@@ -3416,6 +3480,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
-+
 +          gZenPinnedTabManager.resetPinnedTabData(tabData);
-+
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3452,6 +3525,21 @@
+@@ -3451,7 +3516,21 @@
+             skipLoad: true,
              preferredRemoteType,
            });
- 
+-
 +          if (tabData.zenWorkspace) {
 +            tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
 +          }
@@ -191,15 +187,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
            if (select) {
              tabToSelect = tab;
            }
-@@ -3505,7 +3593,6 @@
-             this.tabContainer._invalidateCachedTabs();
-           }
-         }
--
-         tab.initialize();
-       }
- 
-@@ -3715,7 +3799,7 @@
+@@ -3729,7 +3808,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.
@@ -208,18 +196,17 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4070,6 +4154,10 @@
+@@ -4095,6 +4174,9 @@
          return;
        }
  
 +      for (let tab of selectedTabs) {
 +        gZenPinnedTabManager._removePinnedAttributes(tab, true);
 +      }
-+
        this.removeTabs(selectedTabs);
      }
  
-@@ -4443,6 +4534,13 @@
+@@ -4443,6 +4525,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -229,11 +216,10 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
 +          this.selectedTab = newTab;
 +        }
 +      }
-+
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4471,7 +4569,10 @@
+@@ -4471,7 +4559,10 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -245,7 +231,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4711,14 @@
+@@ -4610,14 +4701,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -262,7 +248,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5566,10 @@
+@@ -5465,10 +5556,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -275,7 +261,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7443,6 +7544,7 @@
+@@ -7443,6 +7534,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -283,7 +269,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8513,7 @@ var TabContextMenu = {
+@@ -8411,7 +8503,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -292,7 +278,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8546,7 @@ var TabContextMenu = {
+@@ -8444,7 +8536,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -301,7 +287,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c5
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8779,7 @@ var TabContextMenu = {
+@@ -8677,6 +8769,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From d3a04d043bb37a525a949b4806beb01ddccc6dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Fri, 31 Jan 2025 17:49:59 +0100
Subject: [PATCH 009/191] Enhance Zen Tab Reordering: Add drag-and-drop between
 tab containers (normal tabs, pinned and essentials)

This commit enhances the drag-and-drop functionality in Zen, allowing users to seamlessly reorder tabs between the pinned tabs, essential tabs, and regular tab containers.  The changes include:

- Added `moveToAnotherTabContainerIfNecessary` and `applyDragoverClass` methods to `ZenPinnedTabManager` to handle tab movement and visual feedback during drag-and-drop.
- Updated `tabs.js` to integrate with the new methods, correctly handling tab pinning and unpinning, and essential tab toggling during reordering.
- Added CSS classes and styles to visually indicate the drop position (before or after) a target tab during the drag operation.  This improves user experience and clarity.
---
 .../zen-styles/zen-tabs/vertical-tabs.css     |  26 ++++
 .../zen-components/ZenPinnedTabManager.mjs    | 135 +++++++++++++++++-
 2 files changed, 157 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 7b88356d4..8e8c38a22 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1069,3 +1069,29 @@
 %include vertical-tabs-topbuttons-fix.css
   }
 }
+
+#vertical-pinned-tabs-container .tabbrowser-tab,
+#tabbrowser-arrowscrollbox .tabbrowser-tab,
+#zen-essentials-container .tabbrowser-tab {
+  transition: box-shadow 0.2s ease-in-out;
+}
+
+/* Vertical tabs reordering indicators */
+#vertical-pinned-tabs-container .tabbrowser-tab.drag-over-before,
+#tabbrowser-arrowscrollbox .tabbrowser-tab.drag-over-before {
+  box-shadow: 0 3px 6px -2px var(--toolbarbutton-active-background, rgba(0, 0, 255, 0.2));
+}
+
+#vertical-pinned-tabs-container .tabbrowser-tab.drag-over-after,
+#tabbrowser-arrowscrollbox .tabbrowser-tab.drag-over-after {
+  box-shadow: 0 -3px 6px -2px var(--toolbarbutton-active-background, rgba(0, 0, 255, 0.2));
+}
+
+/* Horizontal tabs reordering indicators */
+#zen-essentials-container .tabbrowser-tab.drag-over-before {
+  box-shadow: 3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
+}
+
+#zen-essentials-container .tabbrowser-tab.drag-over-after {
+  box-shadow: -3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
+}
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 056ad76ca..c98e25cdc 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -557,8 +557,8 @@
       }
     }
 
-    addToEssentials() {
-      const tabs = TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
+    addToEssentials(tab) {
+      const tabs = tab ? [tab] : TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
       for (let i = 0; i < tabs.length; i++) {
         const tab = tabs[i];
         tab.setAttribute('zen-essential', 'true');
@@ -575,8 +575,8 @@
       gZenUIManager.updateTabsToolbar();
     }
 
-    removeEssentials() {
-      const tabs = TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
+    removeEssentials(tab) {
+      const tabs = tab ? [tab] : TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
       for (let i = 0; i < tabs.length; i++) {
         const tab = tabs[i];
         tab.removeAttribute('zen-essential');
@@ -640,6 +640,133 @@
         document.getElementById('context_unpinSelectedTabs').hidden || contextTab.getAttribute('zen-essential');
       document.getElementById('context_zen-pinned-tab-separator').hidden = !isVisible;
     }
+
+    moveToAnotherTabContainerIfNecessary(event, draggedTab) {
+      const pinnedTabsTarget = event.target.closest("#vertical-pinned-tabs-container");
+      const essentialTabsTarget = event.target.closest("#zen-essentials-container");
+      const tabsTarget = event.target.closest("#tabbrowser-arrowscrollbox");
+
+      let moved = false;
+      let isVertical = true;
+
+      // Check for pinned tabs container
+      if (pinnedTabsTarget) {
+        if (!draggedTab.pinned) {
+          gBrowser.pinTab(draggedTab);
+          moved = true;
+        } else if (draggedTab.hasAttribute("zen-essential")) {
+          this.removeEssentials(draggedTab);
+          gBrowser.pinTab(draggedTab);
+          moved = true;
+        }
+      }
+      // Check for essentials container
+      else if (essentialTabsTarget) {
+        if (!draggedTab.hasAttribute("zen-essential")) {
+          this.addToEssentials(draggedTab);
+          moved = true;
+          isVertical = false;
+        }
+      }
+      // Check for normal tabs container
+      else if (tabsTarget) {
+        if (draggedTab.pinned && !draggedTab.hasAttribute("zen-essential")) {
+          gBrowser.unpinTab(draggedTab);
+          moved = true;
+        } else if (draggedTab.hasAttribute("zen-essential")) {
+          this.removeEssentials(draggedTab);
+          moved = true;
+        }
+      }
+
+      // If the tab was moved, adjust its position relative to the target tab
+      if (moved) {
+        const targetTab = event.target.closest(".tabbrowser-tab");
+        if (targetTab) {
+          const rect = targetTab.getBoundingClientRect();
+          let newIndex = targetTab._tPos;
+
+          if (isVertical) {
+            const middleY = targetTab.screenY + rect.height / 2;
+            if (event.screenY > middleY) {
+              newIndex++;
+            }
+          } else {
+            const middleX = targetTab.screenX + rect.width / 2;
+            if (event.screenX > middleX) {
+              newIndex++;
+            }
+          }
+          gBrowser.moveTabTo(draggedTab, newIndex);
+        }
+      }
+
+      return moved;
+    }
+
+    removeTabContainersDragoverClass() {
+      document
+        .querySelectorAll(".tabbrowser-tab.drag-over-before, .tabbrowser-tab.drag-over-after")
+        .forEach(tab => {
+          tab.classList.remove("drag-over-before", "drag-over-after");
+        });
+    }
+
+    applyDragoverClass(event, draggedTab) {
+      this.removeTabContainersDragoverClass();
+
+      const pinnedTabsTarget = event.target.closest("#vertical-pinned-tabs-container");
+      const essentialTabsTarget = event.target.closest("#zen-essentials-container");
+      const tabsTarget = event.target.closest("#tabbrowser-arrowscrollbox");
+      const targetTab = event.target.closest(".tabbrowser-tab");
+
+      // If there's no valid target tab, nothing to do
+      if (!targetTab) {
+        return;
+      }
+
+      let shouldAddDragOverElement = false;
+      let isVertical = true;
+
+      // Decide whether we should show a dragover class for the given target
+      if (pinnedTabsTarget) {
+        if (!draggedTab.pinned || draggedTab.hasAttribute("zen-essential")) {
+          shouldAddDragOverElement = true;
+        }
+      } else if (essentialTabsTarget) {
+        if (!draggedTab.hasAttribute("zen-essential")) {
+          shouldAddDragOverElement = true;
+          isVertical = false;
+        }
+      } else if (tabsTarget) {
+        if (draggedTab.pinned || draggedTab.hasAttribute("zen-essential")) {
+          shouldAddDragOverElement = true;
+        }
+      }
+
+      if (!shouldAddDragOverElement) {
+        return;
+      }
+
+      // Calculate middle to decide 'before' or 'after'
+      const rect = targetTab.getBoundingClientRect();
+
+      if (isVertical) {
+        const middleY = targetTab.screenY + rect.height / 2;
+        if (event.screenY > middleY) {
+          targetTab.classList.add("drag-over-before");
+        } else {
+          targetTab.classList.add("drag-over-after");
+        }
+      } else {
+        const middleX = targetTab.screenX + rect.width / 2;
+        if (event.screenX > middleX) {
+          targetTab.classList.add("drag-over-before");
+        } else {
+          targetTab.classList.add("drag-over-after");
+        }
+      }
+    }
   }
 
   window.gZenPinnedTabManager = new ZenPinnedTabManager();

From 4bca6a830628dd321cb693d4b98be7acdd8361fa Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 18:35:55 +0100
Subject: [PATCH 010/191] Fix double-click behavior to open new tab

---
 src/browser/base/content/ZenStartup.mjs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 67847f5f4..6549eb475 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -109,6 +109,9 @@
         });
       });
       observer.observe(tabsWrapper);
+      tabsWrapper.addEventListener('dblclick', (event) => {
+        // DO NOT REMOVE, THIS IS TO FIX "OPEN NEW TAB" ON DOUBLE CLICK
+      });
     },
 
     _initSearchBar() {

From 307becf086d3f382ece07fc1968e0b3c2b51adc8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 19:13:18 +0100
Subject: [PATCH 011/191] Fixed `Switch to workspace where container is set as
 default when opening container tabs` not working

---
 src/browser/base/content/ZenStartup.mjs           | 2 +-
 src/browser/base/zen-components/ZenWorkspaces.mjs | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 6549eb475..377addef1 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -111,7 +111,7 @@
       observer.observe(tabsWrapper);
       tabsWrapper.addEventListener('dblclick', (event) => {
         // DO NOT REMOVE, THIS IS TO FIX "OPEN NEW TAB" ON DOUBLE CLICK
-      });
+      }, true);
     },
 
     _initSearchBar() {
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index e4d4121e7..68b009203 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1306,10 +1306,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-  async _performWorkspaceChange(window, { onInit = false, explicitAnimationDirection = undefined } = {}) {
+  async _performWorkspaceChange(window, { onInit = false, alwaysChange = false, explicitAnimationDirection = undefined } = {}) {
     const previousWorkspace = await this.getActiveWorkspace();
+    alwaysChange = alwaysChange || onInit;
 
-    if (previousWorkspace && previousWorkspace.uuid === window.uuid && !onInit) {
+    if (previousWorkspace && previousWorkspace.uuid === window.uuid && !alwaysChange) {
       this._cancelSwipeAnimation();
       return;
     }
@@ -1814,7 +1815,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       if (matchingWorkspaces.length === 1) {
         const workspace = matchingWorkspaces[0];
         if (workspace.uuid !== this.getActiveWorkspaceFromCache().uuid) {
-          this.changeWorkspace(workspace);
+          window.addEventListener('TabSelected', (event) => {
+            this.changeWorkspace(workspace, { alwaysChange: true });
+          }, { once: true });
           return [userContextId, true, workspace.uuid];
         }
       }

From ab33aae127ed9ae8d43732661821da7e0a9e9cea Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 19:41:40 +0100
Subject: [PATCH 012/191] Remove unused double-click event listener and adjust
 tab event handling for improved functionality

---
 src/browser/base/content/ZenStartup.mjs                       | 3 ---
 .../base/content/zen-styles/zen-tabs/vertical-tabs.css        | 1 +
 src/browser/components/tabbrowser/content/tabs-js.patch       | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 377addef1..67847f5f4 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -109,9 +109,6 @@
         });
       });
       observer.observe(tabsWrapper);
-      tabsWrapper.addEventListener('dblclick', (event) => {
-        // DO NOT REMOVE, THIS IS TO FIX "OPEN NEW TAB" ON DOUBLE CLICK
-      }, true);
     },
 
     _initSearchBar() {
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 7b88356d4..afd553105 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -373,6 +373,7 @@
   min-height: fit-content;
   overflow-y: auto;
   overflow-x: hidden;
+  height: 100%;
 }
 
 #vertical-pinned-tabs-container {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 512df10ff..7058185b5 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0de37c4d15 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc790e25a5f1 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -16,7 +16,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
        if (
          event.button != 0 ||
 -        event.target != this.arrowScrollbox ||
-+        event.target != this ||
++        event.target != document.getElementById("zen-browser-tabs-wrapper") ||
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;

From 1ad8a9b7f10dbbb9f267ca38b93663548e2e6d97 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 20:11:45 +0100
Subject: [PATCH 013/191] Add thin scrollbar style to vertical tabs for
 improved aesthetics

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

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index afd553105..7116e79fe 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -374,6 +374,7 @@
   overflow-y: auto;
   overflow-x: hidden;
   height: 100%;
+  scrollbar-width: thin;
 }
 
 #vertical-pinned-tabs-container {

From 384e268516c0dc4a2c914ee77625fffea208518f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Fri, 31 Jan 2025 20:11:48 +0100
Subject: [PATCH 014/191] Fixes after rebase

---
 .../zen-components/ZenPinnedTabManager.mjs    | 13 +++-
 .../tabbrowser/content/tabs-js.patch          | 77 +++++++++++++------
 2 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index c98e25cdc..c67855f0d 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -327,6 +327,10 @@
       }
 
       const actualPin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
+
+      if(!actualPin) {
+        return;
+      }
       actualPin.position = tab.position;
       await ZenPinnedTabsStorage.savePin(actualPin);
     }
@@ -648,7 +652,7 @@
 
       let moved = false;
       let isVertical = true;
-
+      let isRegularTabs = false;
       // Check for pinned tabs container
       if (pinnedTabsTarget) {
         if (!draggedTab.pinned) {
@@ -673,9 +677,11 @@
         if (draggedTab.pinned && !draggedTab.hasAttribute("zen-essential")) {
           gBrowser.unpinTab(draggedTab);
           moved = true;
+          isRegularTabs = true;
         } else if (draggedTab.hasAttribute("zen-essential")) {
           this.removeEssentials(draggedTab);
           moved = true;
+          isRegularTabs = true;
         }
       }
 
@@ -688,9 +694,12 @@
 
           if (isVertical) {
             const middleY = targetTab.screenY + rect.height / 2;
-            if (event.screenY > middleY) {
+            if(!isRegularTabs && event.screenY > middleY) {
               newIndex++;
+            } else  if(isRegularTabs && event.screenY < middleY) {
+              newIndex--;
             }
+
           } else {
             const middleX = targetTab.screenX + rect.width / 2;
             if (event.screenX > middleX) {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 512df10ff..250c4d757 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0de37c4d15 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..49b01f6e645c07eece98c49e63ed17b5eb31daca 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -29,7 +29,40 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          let tabsPerRow = 0;
          let position = 0;
          for (let pinnedTab of pinnedTabs) {
-@@ -1010,7 +1010,7 @@
+@@ -859,6 +859,9 @@
+       }
+ 
+       let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
++      if (draggedTab && effects === "move") {
++        gZenPinnedTabManager.applyDragoverClass(event, draggedTab);
++      }
+       if (
+         (effects == "move" || effects == "copy") &&
+         this == draggedTab.container &&
+@@ -955,6 +958,7 @@
+ 
+     // eslint-disable-next-line complexity
+     on_drop(event) {
++      gZenPinnedTabManager.removeTabContainersDragoverClass();
+       var dt = event.dataTransfer;
+       var dropEffect = dt.dropEffect;
+       var draggedTab;
+@@ -972,6 +976,14 @@
+ 
+       this._tabDropIndicator.hidden = true;
+       event.stopPropagation();
++      if (draggedTab && dropEffect == "move") {
++        let moved = gZenPinnedTabManager.moveToAnotherTabContainerIfNecessary(event, draggedTab);
++
++        if (moved) {
++          this._finishMoveTogetherSelectedTabs(draggedTab);
++          return;
++        }
++      }
+       if (draggedTab && dropEffect == "copy") {
+         // copy the dropped tab (wherever it's from)
+         let newIndex = this._getDropIndex(event);
+@@ -1010,7 +1022,7 @@
            }
          } else {
            let pinned = draggedTab.pinned;
@@ -38,7 +71,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
            let tabs = this.visibleTabs.slice(
              pinned ? 0 : numPinned,
              pinned ? numPinned : undefined
-@@ -1090,7 +1090,7 @@
+@@ -1090,7 +1102,7 @@
                let postTransitionCleanup = () => {
                  tab.removeAttribute("tabdrop-samewindow");
  
@@ -47,7 +80,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
                  if (dropIndex !== false) {
                    gBrowser.moveTabTo(tab, dropIndex);
                    if (!directionForward) {
-@@ -1100,7 +1100,7 @@
+@@ -1100,7 +1112,7 @@
  
                  gBrowser.syncThrobberAnimations(tab);
                };
@@ -56,7 +89,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -1263,7 +1263,8 @@
+@@ -1263,7 +1275,8 @@
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
@@ -66,7 +99,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1512,7 +1513,7 @@
+@@ -1512,7 +1525,7 @@
        }
  
        this.#allTabs = [
@@ -75,7 +108,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          ...children,
        ];
        return this.#allTabs;
-@@ -1593,6 +1594,7 @@
+@@ -1593,6 +1606,7 @@
        }
  
        this.#focusableItems = [
@@ -83,7 +116,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1617,8 +1619,8 @@
+@@ -1617,8 +1631,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -94,7 +127,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
        );
      }
  
-@@ -1816,7 +1818,7 @@
+@@ -1816,7 +1830,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -103,7 +136,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1834,7 @@
+@@ -1832,6 +1846,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -111,7 +144,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1879,7 +1882,7 @@
+@@ -1879,7 +1894,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -120,7 +153,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1897,7 @@
+@@ -1894,7 +1909,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -129,7 +162,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1963,13 +1966,13 @@
+@@ -1963,13 +1978,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
@@ -146,7 +179,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          }
        }
  
-@@ -1993,7 +1996,7 @@
+@@ -1993,7 +2008,7 @@
  
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
@@ -155,7 +188,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2077,7 @@
+@@ -2074,7 +2089,7 @@
          return;
        }
  
@@ -164,7 +197,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2260,9 @@
+@@ -2257,9 +2272,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -176,7 +209,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2505,8 @@
+@@ -2502,8 +2517,8 @@
        );
      }
  
@@ -187,7 +220,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          return;
        }
  
-@@ -2668,9 +2671,9 @@
+@@ -2668,9 +2683,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -199,7 +232,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
        }
      }
  
-@@ -2754,7 +2757,7 @@
+@@ -2754,7 +2769,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -208,7 +241,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
          return;
        }
  
-@@ -2772,12 +2775,14 @@
+@@ -2772,12 +2787,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -224,7 +257,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
                selectedTab,
              ];
            })
-@@ -2794,8 +2799,11 @@
+@@ -2794,8 +2811,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -238,7 +271,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0d
              ) {
                return;
              }
-@@ -2803,21 +2811,29 @@
+@@ -2803,21 +2823,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (

From 7b41eb753da128d6d8260f8ab7b7eaa7cf492591 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 23:02:13 +0100
Subject: [PATCH 015/191] Refactor tab drag-and-drop functionality and enhance
 drag indicator styling

---
 .../zen-styles/zen-tabs/vertical-tabs.css     | 38 ++++++----
 .../zen-components/ZenPinnedTabManager.mjs    | 72 ++++++++++---------
 .../base/zen-components/ZenWorkspaces.mjs     | 10 ++-
 .../tabbrowser/content/tabs-js.patch          | 45 +++++-------
 4 files changed, 88 insertions(+), 77 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 835811170..c9a610edc 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -285,7 +285,6 @@
     padding: 0 !important;
 
     position: relative;
-    border-radius: var(--border-radius-medium);
 
     & .tab-background {
       overflow: hidden;
@@ -1072,21 +1071,32 @@
   }
 }
 
-#vertical-pinned-tabs-container .tabbrowser-tab,
-#tabbrowser-arrowscrollbox .tabbrowser-tab,
-#zen-essentials-container .tabbrowser-tab {
-  transition: box-shadow 0.2s ease-in-out;
-}
-
 /* Vertical tabs reordering indicators */
-#vertical-pinned-tabs-container .tabbrowser-tab.drag-over-before,
-#tabbrowser-arrowscrollbox .tabbrowser-tab.drag-over-before {
-  box-shadow: 0 3px 6px -2px var(--toolbarbutton-active-background, rgba(0, 0, 255, 0.2));
-}
+#zen-drag-indicator {
+  --zen-drag-indicator-height: 2px;
+  --zen-drag-indicator-bg: color-mix(in srgb, var(--zen-primary-color) 50%, light-dark(rgba(0, 0, 0, .85), rgba(255, 255, 255, .95)) 50%);
+  width: calc(var(--indicator-width) - 2 * var(--zen-drag-indicator-height) - 4px);
+  height: var(--zen-drag-indicator-height);
+  position: fixed;
+  z-index: 1000;
+  background: var(--zen-drag-indicator-bg);
+  transition: top 0.1s ease;
+  pointer-events: none;
+  left: calc(var(--indicator-left) + 2 * var(--zen-drag-indicator-height) + 4px);
+  border-radius: 5px;
 
-#vertical-pinned-tabs-container .tabbrowser-tab.drag-over-after,
-#tabbrowser-arrowscrollbox .tabbrowser-tab.drag-over-after {
-  box-shadow: 0 -3px 6px -2px var(--toolbarbutton-active-background, rgba(0, 0, 255, 0.2));
+  &::before {
+    content: "";
+    position: absolute;
+    left: calc(-2 * var(--zen-drag-indicator-height));
+    top: 50%;
+    height: calc(2 * var(--zen-drag-indicator-height));
+    width: calc(2 * var(--zen-drag-indicator-height));
+    border: var(--zen-drag-indicator-height) solid var(--zen-drag-indicator-bg);
+    border-radius: 50%;
+    transform: translate(calc(-1 * var(--zen-drag-indicator-height)), -50%);
+    background: transparent;
+  }
 }
 
 /* Horizontal tabs reordering indicators */
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index c67855f0d..78b995e42 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -328,7 +328,7 @@
 
       const actualPin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
 
-      if(!actualPin) {
+      if (!actualPin) {
         return;
       }
       actualPin.position = tab.position;
@@ -646,9 +646,9 @@
     }
 
     moveToAnotherTabContainerIfNecessary(event, draggedTab) {
-      const pinnedTabsTarget = event.target.closest("#vertical-pinned-tabs-container");
-      const essentialTabsTarget = event.target.closest("#zen-essentials-container");
-      const tabsTarget = event.target.closest("#tabbrowser-arrowscrollbox");
+      const pinnedTabsTarget = event.target.closest('#vertical-pinned-tabs-container');
+      const essentialTabsTarget = event.target.closest('#zen-essentials-container');
+      const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
 
       let moved = false;
       let isVertical = true;
@@ -658,7 +658,7 @@
         if (!draggedTab.pinned) {
           gBrowser.pinTab(draggedTab);
           moved = true;
-        } else if (draggedTab.hasAttribute("zen-essential")) {
+        } else if (draggedTab.hasAttribute('zen-essential')) {
           this.removeEssentials(draggedTab);
           gBrowser.pinTab(draggedTab);
           moved = true;
@@ -666,7 +666,7 @@
       }
       // Check for essentials container
       else if (essentialTabsTarget) {
-        if (!draggedTab.hasAttribute("zen-essential")) {
+        if (!draggedTab.hasAttribute('zen-essential')) {
           this.addToEssentials(draggedTab);
           moved = true;
           isVertical = false;
@@ -674,11 +674,11 @@
       }
       // Check for normal tabs container
       else if (tabsTarget) {
-        if (draggedTab.pinned && !draggedTab.hasAttribute("zen-essential")) {
+        if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
           gBrowser.unpinTab(draggedTab);
           moved = true;
           isRegularTabs = true;
-        } else if (draggedTab.hasAttribute("zen-essential")) {
+        } else if (draggedTab.hasAttribute('zen-essential')) {
           this.removeEssentials(draggedTab);
           moved = true;
           isRegularTabs = true;
@@ -687,19 +687,18 @@
 
       // If the tab was moved, adjust its position relative to the target tab
       if (moved) {
-        const targetTab = event.target.closest(".tabbrowser-tab");
+        const targetTab = event.target.closest('.tabbrowser-tab');
         if (targetTab) {
           const rect = targetTab.getBoundingClientRect();
           let newIndex = targetTab._tPos;
 
           if (isVertical) {
             const middleY = targetTab.screenY + rect.height / 2;
-            if(!isRegularTabs && event.screenY > middleY) {
+            if (!isRegularTabs && event.screenY > middleY) {
               newIndex++;
-            } else  if(isRegularTabs && event.screenY < middleY) {
+            } else if (isRegularTabs && event.screenY < middleY) {
               newIndex--;
             }
-
           } else {
             const middleX = targetTab.screenX + rect.width / 2;
             if (event.screenX > middleX) {
@@ -714,20 +713,24 @@
     }
 
     removeTabContainersDragoverClass() {
-      document
-        .querySelectorAll(".tabbrowser-tab.drag-over-before, .tabbrowser-tab.drag-over-after")
-        .forEach(tab => {
-          tab.classList.remove("drag-over-before", "drag-over-after");
-        });
+      this.dragIndicator.remove();
+      this._dragIndicator = null;
+    }
+
+    get dragIndicator() {
+      if (!this._dragIndicator) {
+        this._dragIndicator = document.createElement('div');
+        this._dragIndicator.id = 'zen-drag-indicator';
+        document.body.appendChild(this._dragIndicator);
+      }
+      return this._dragIndicator;
     }
 
     applyDragoverClass(event, draggedTab) {
-      this.removeTabContainersDragoverClass();
-
-      const pinnedTabsTarget = event.target.closest("#vertical-pinned-tabs-container");
-      const essentialTabsTarget = event.target.closest("#zen-essentials-container");
-      const tabsTarget = event.target.closest("#tabbrowser-arrowscrollbox");
-      const targetTab = event.target.closest(".tabbrowser-tab");
+      const pinnedTabsTarget = event.target.closest('#vertical-pinned-tabs-container');
+      const essentialTabsTarget = event.target.closest('#zen-essentials-container');
+      const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
+      const targetTab = event.target.closest('.tabbrowser-tab');
 
       // If there's no valid target tab, nothing to do
       if (!targetTab) {
@@ -739,16 +742,16 @@
 
       // Decide whether we should show a dragover class for the given target
       if (pinnedTabsTarget) {
-        if (!draggedTab.pinned || draggedTab.hasAttribute("zen-essential")) {
+        if (!draggedTab.pinned || draggedTab.hasAttribute('zen-essential')) {
           shouldAddDragOverElement = true;
         }
       } else if (essentialTabsTarget) {
-        if (!draggedTab.hasAttribute("zen-essential")) {
+        if (!draggedTab.hasAttribute('zen-essential')) {
           shouldAddDragOverElement = true;
           isVertical = false;
         }
       } else if (tabsTarget) {
-        if (draggedTab.pinned || draggedTab.hasAttribute("zen-essential")) {
+        if (draggedTab.pinned || draggedTab.hasAttribute('zen-essential')) {
           shouldAddDragOverElement = true;
         }
       }
@@ -761,19 +764,20 @@
       const rect = targetTab.getBoundingClientRect();
 
       if (isVertical) {
+        const separation = 8;
         const middleY = targetTab.screenY + rect.height / 2;
+        const indicator = this.dragIndicator;
+        let top=0;
         if (event.screenY > middleY) {
-          targetTab.classList.add("drag-over-before");
+          top = rect.top + rect.height + 'px';
         } else {
-          targetTab.classList.add("drag-over-after");
+          top = rect.top + 'px';
         }
+        indicator.style.setProperty('--indicator-left', rect.left + (separation/2) + 'px');
+        indicator.style.setProperty('--indicator-width', rect.width - separation + 'px');
+        indicator.style.top = top;
       } else {
-        const middleX = targetTab.screenX + rect.width / 2;
-        if (event.screenX > middleX) {
-          targetTab.classList.add("drag-over-before");
-        } else {
-          targetTab.classList.add("drag-over-after");
-        }
+        // SUPPORT FOR ESSENTIALS
       }
     }
   }
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 68b009203..e04915f99 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1815,9 +1815,13 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       if (matchingWorkspaces.length === 1) {
         const workspace = matchingWorkspaces[0];
         if (workspace.uuid !== this.getActiveWorkspaceFromCache().uuid) {
-          window.addEventListener('TabSelected', (event) => {
-            this.changeWorkspace(workspace, { alwaysChange: true });
-          }, { once: true });
+          window.addEventListener(
+            'TabSelected',
+            (event) => {
+              this.changeWorkspace(workspace, { alwaysChange: true });
+            },
+            { once: true }
+          );
           return [userContextId, true, workspace.uuid];
         }
       }
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 6fbe457f6..67cadfeb4 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc790e25a5f1 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96eccdd9bbbc4 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -39,15 +39,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
        if (
          (effects == "move" || effects == "copy") &&
          this == draggedTab.container &&
-@@ -955,6 +958,7 @@
- 
-     // eslint-disable-next-line complexity
-     on_drop(event) {
-+      gZenPinnedTabManager.removeTabContainersDragoverClass();
-       var dt = event.dataTransfer;
-       var dropEffect = dt.dropEffect;
-       var draggedTab;
-@@ -972,6 +976,14 @@
+@@ -972,6 +975,14 @@
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
@@ -62,7 +54,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
        if (draggedTab && dropEffect == "copy") {
          // copy the dropped tab (wherever it's from)
          let newIndex = this._getDropIndex(event);
-@@ -1010,7 +1022,7 @@
+@@ -1010,7 +1021,7 @@
            }
          } else {
            let pinned = draggedTab.pinned;
@@ -71,7 +63,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
            let tabs = this.visibleTabs.slice(
              pinned ? 0 : numPinned,
              pinned ? numPinned : undefined
-@@ -1090,7 +1102,7 @@
+@@ -1090,7 +1101,7 @@
                let postTransitionCleanup = () => {
                  tab.removeAttribute("tabdrop-samewindow");
  
@@ -80,7 +72,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
                  if (dropIndex !== false) {
                    gBrowser.moveTabTo(tab, dropIndex);
                    if (!directionForward) {
-@@ -1100,7 +1112,7 @@
+@@ -1100,7 +1111,7 @@
  
                  gBrowser.syncThrobberAnimations(tab);
                };
@@ -89,7 +81,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -1263,7 +1275,8 @@
+@@ -1263,7 +1274,8 @@
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
@@ -99,7 +91,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1512,7 +1525,7 @@
+@@ -1512,7 +1524,7 @@
        }
  
        this.#allTabs = [
@@ -108,7 +100,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
          ...children,
        ];
        return this.#allTabs;
-@@ -1593,6 +1606,7 @@
+@@ -1593,6 +1605,7 @@
        }
  
        this.#focusableItems = [
@@ -116,7 +108,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1617,8 +1631,8 @@
+@@ -1617,8 +1630,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -127,7 +119,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
        );
      }
  
-@@ -1816,7 +1830,7 @@
+@@ -1816,7 +1829,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -136,7 +128,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1846,7 @@
+@@ -1832,6 +1845,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -144,7 +136,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1879,7 +1894,7 @@
+@@ -1879,7 +1893,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -153,7 +145,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1909,7 @@
+@@ -1894,7 +1908,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -162,7 +154,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1963,13 +1978,13 @@
+@@ -1963,13 +1977,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
@@ -179,7 +171,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
          }
        }
  
-@@ -1993,7 +2008,7 @@
+@@ -1993,7 +2007,7 @@
  
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
@@ -188,7 +180,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2089,7 @@
+@@ -2074,7 +2088,7 @@
          return;
        }
  
@@ -197,7 +189,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2272,9 @@
+@@ -2257,9 +2271,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -209,13 +201,14 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..aa672d49e5d3e8e0ce4747187becbc79
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2517,8 @@
+@@ -2502,8 +2516,9 @@
        );
      }
  
 -    _finishAnimateTabMove() {
 -      if (!this.hasAttribute("movingtab")) {
 +    _finishAnimateTabMove(always = false) {
++      gZenPinnedTabManager.removeTabContainersDragoverClass();
 +      if (!this.hasAttribute("movingtab") && !always) {
          return;
        }

From 20ede93eb1ed7dbd2daf56e9920dac4a76fd21e0 Mon Sep 17 00:00:00 2001
From: EmilyxFox <48589793+EmilyxFox@users.noreply.github.com>
Date: Fri, 31 Jan 2025 23:27:23 +0100
Subject: [PATCH 016/191] Add feature: copy current URL as markdown

---
 l10n                                           |  2 +-
 .../base/zen-components/ZenCommonUtils.mjs     | 15 +++++++++++++++
 .../zen-components/ZenKeyboardShortcuts.mjs    | 18 +++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/l10n b/l10n
index cb32b48cb..98c54b87d 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit cb32b48cb58a807012e082a41190108463d25683
+Subproject commit 98c54b87df6b7ef1fe1747ca317ed0e4d4037fbc
diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index 0ecabfac8..16adcee0d 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -72,6 +72,21 @@ var gZenCommonActions = {
       ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
     }
   },
+  CopyCurrentURLAsMarkdownToClipboard() {
+    const currentUrl = gBrowser.currentURI.spec;
+    const tabTitle = gBrowser.selectedTab.label;
+    if (currentUrl && tabTitle) {
+        const markdownLink = `[${tabTitle}](${currentUrl})`
+        let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
+        str.data = markdownLink;
+        let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
+        transferable.init(getLoadContext());
+        transferable.addDataFlavor('text/plain');
+        transferable.setTransferData('text/plain', str);
+        Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
+        ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+    }
+  },
 
   throttle(f, delay) {
     let timer = 0;
diff --git a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
index dee74be78..c41273e88 100644
--- a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
+++ b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
@@ -80,6 +80,7 @@ const defaultKeyboardGroups = {
     'zen-search-find-again-shortcut-prev',
   ],
   pageOperations: [
+    'zen-text-action-copy-url-markdown-shortcut',
     'zen-text-action-copy-url-shortcut',
     'zen-location-open-shortcut',
     'zen-location-open-shortcut-alt',
@@ -755,7 +756,7 @@ class ZenKeyboardShortcutsLoader {
 }
 
 class ZenKeyboardShortcutsVersioner {
-  static LATEST_KBS_VERSION = 7;
+  static LATEST_KBS_VERSION = 8;
 
   constructor() {}
 
@@ -907,6 +908,21 @@ class ZenKeyboardShortcutsVersioner {
       gZenKeyboardShortcutsManager._hasToLoadDefaultDevtools = true;
       window.addEventListener('zen-devtools-keyset-added', listener);
     }
+    if (version < 8) {
+        // Migrate from 7 to 8
+        // In this new version, we add the "Copy URL as Markdown" shortcut to the default shortcuts
+        data.push(
+            new KeyShortcut(
+                'zen-copy-url-markdown',
+                'C',
+                '',
+                ZEN_OTHER_SHORTCUTS_GROUP,
+                KeyShortcutModifiers.fromObject({ accel: true, shift: true, alt: true }),
+                'code:gZenCommonActions.CopyCurrentURLAsMarkdownToClipboard()',
+                'zen-text-action-copy-url-markdown-shortcut'
+              )
+        )
+    }
     return data;
   }
 }

From d81745eef23dd5fa92d9ec284333043cb5fa8c76 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 23:35:45 +0100
Subject: [PATCH 017/191] Refactor tab close handling and maintain scrollbar
 state

---
 src/browser/base/content/ZenUIManager.mjs     | 22 ++++++-
 .../zen-styles/zen-tabs/vertical-tabs.css     |  2 +-
 .../tabbrowser/content/tabs-js.patch          | 58 +++++++++++--------
 3 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index ad366ac23..082d98206 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -28,7 +28,7 @@ var gZenUIManager = {
       this._hasLoadedDOM = true;
     });
 
-    window.addEventListener('TabClose', this.updateTabsToolbar.bind(this));
+    window.addEventListener('TabClose', this.onTabClose.bind(this));
   },
 
   updateTabsToolbar() {
@@ -56,6 +56,24 @@ var gZenUIManager = {
     tabs.style.maxHeight = height + 'px';
   },
 
+  get tabsWrapper() {
+    if (this._tabsWrapper) {
+      return this._tabsWrapper;
+    }
+    this._tabsWrapper = document.getElementById('zen-browser-tabs-wrapper');
+    return this._tabsWrapper;
+  },
+
+  saveScrollbarState() {
+    this._scrollbarState = this.tabsWrapper.scrollTop;
+  },
+
+  onTabClose(event) {
+    this.updateTabsToolbar();
+    this.tabsWrapper.scrollTop = this._scrollbarState;
+    this._scrollbarState = 0;
+  },
+
   openAndChangeToTab(url, options) {
     if (window.ownerGlobal.parent) {
       const tab = window.ownerGlobal.parent.gBrowser.addTrustedTab(url, options);
@@ -248,7 +266,7 @@ var gZenVerticalTabsManager = {
         aTab.style.removeProperty('opacity');
       });
     gZenUIManager.motion
-      .animate(aTab.querySelector('.tab-stack'), {
+      .animate(aTab.querySelector('.tab-content'), {
         filter: ['blur(1px)', 'blur(0px)'],
       })
       .then(() => {
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index c9a610edc..e77bba60c 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1080,7 +1080,7 @@
   position: fixed;
   z-index: 1000;
   background: var(--zen-drag-indicator-bg);
-  transition: top 0.1s ease;
+  transition: top 0.1s ease-out;
   pointer-events: none;
   left: calc(var(--indicator-left) + 2 * var(--zen-drag-indicator-height) + 4px);
   border-radius: 5px;
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 67cadfeb4..77a31a206 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96eccdd9bbbc4 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..a6fae3e317afc9b681f818506c7f34a325e43df4 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -20,7 +20,15 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;
-@@ -659,7 +659,7 @@
+@@ -411,6 +411,7 @@
+             // Reset the "ignored click" flag
+             target._ignoredCloseButtonClicks = false;
+           }
++          gZenUIManager.saveScrollbarState();
+         }
+ 
+         /* Protects from close-tab-button errant doubleclick:
+@@ -659,7 +660,7 @@
        if (this.#isContainerVerticalPinnedExpanded(tab)) {
          // In expanded vertical mode, the max number of pinned tabs per row is dynamic
          // Set this before adjusting dragged tab's position
@@ -29,7 +37,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          let tabsPerRow = 0;
          let position = 0;
          for (let pinnedTab of pinnedTabs) {
-@@ -859,6 +859,9 @@
+@@ -859,6 +860,9 @@
        }
  
        let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -39,7 +47,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
        if (
          (effects == "move" || effects == "copy") &&
          this == draggedTab.container &&
-@@ -972,6 +975,14 @@
+@@ -972,6 +976,14 @@
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
@@ -54,7 +62,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
        if (draggedTab && dropEffect == "copy") {
          // copy the dropped tab (wherever it's from)
          let newIndex = this._getDropIndex(event);
-@@ -1010,7 +1021,7 @@
+@@ -1010,7 +1022,7 @@
            }
          } else {
            let pinned = draggedTab.pinned;
@@ -63,7 +71,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
            let tabs = this.visibleTabs.slice(
              pinned ? 0 : numPinned,
              pinned ? numPinned : undefined
-@@ -1090,7 +1101,7 @@
+@@ -1090,7 +1102,7 @@
                let postTransitionCleanup = () => {
                  tab.removeAttribute("tabdrop-samewindow");
  
@@ -72,7 +80,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
                  if (dropIndex !== false) {
                    gBrowser.moveTabTo(tab, dropIndex);
                    if (!directionForward) {
-@@ -1100,7 +1111,7 @@
+@@ -1100,7 +1112,7 @@
  
                  gBrowser.syncThrobberAnimations(tab);
                };
@@ -81,7 +89,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -1263,7 +1274,8 @@
+@@ -1263,7 +1275,8 @@
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
@@ -91,7 +99,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1512,7 +1524,7 @@
+@@ -1512,7 +1525,7 @@
        }
  
        this.#allTabs = [
@@ -100,7 +108,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          ...children,
        ];
        return this.#allTabs;
-@@ -1593,6 +1605,7 @@
+@@ -1593,6 +1606,7 @@
        }
  
        this.#focusableItems = [
@@ -108,7 +116,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1617,8 +1630,8 @@
+@@ -1617,8 +1631,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -119,7 +127,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
        );
      }
  
-@@ -1816,7 +1829,7 @@
+@@ -1816,7 +1830,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -128,7 +136,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1845,7 @@
+@@ -1832,6 +1846,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -136,7 +144,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1879,7 +1893,7 @@
+@@ -1879,7 +1894,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -145,7 +153,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1908,7 @@
+@@ -1894,7 +1909,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -154,7 +162,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1963,13 +1977,13 @@
+@@ -1963,13 +1978,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
@@ -171,7 +179,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          }
        }
  
-@@ -1993,7 +2007,7 @@
+@@ -1993,7 +2008,7 @@
  
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
@@ -180,7 +188,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2088,7 @@
+@@ -2074,7 +2089,7 @@
          return;
        }
  
@@ -189,7 +197,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2271,9 @@
+@@ -2257,9 +2272,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -201,7 +209,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2516,9 @@
+@@ -2502,8 +2517,9 @@
        );
      }
  
@@ -213,7 +221,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          return;
        }
  
-@@ -2668,9 +2683,9 @@
+@@ -2668,9 +2684,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -225,7 +233,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
        }
      }
  
-@@ -2754,7 +2769,7 @@
+@@ -2754,7 +2770,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -234,7 +242,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
          return;
        }
  
-@@ -2772,12 +2787,14 @@
+@@ -2772,12 +2788,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -250,7 +258,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
                selectedTab,
              ];
            })
-@@ -2794,8 +2811,11 @@
+@@ -2794,8 +2812,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -264,7 +272,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..35f5562d60d70ac4e117c7f098d96ecc
              ) {
                return;
              }
-@@ -2803,21 +2823,29 @@
+@@ -2803,21 +2824,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (

From 4975ff6fdc8a6bc4aee408f454ccc2ebaeaa5b57 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 31 Jan 2025 23:54:26 +0100
Subject: [PATCH 018/191] Add Linux-specific padding for toolbox and clean up
 drag indicator calculations

---
 .../base/content/zen-styles/zen-tabs/vertical-tabs.css        | 3 +++
 src/browser/base/zen-components/ZenPinnedTabManager.mjs       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index e77bba60c..288b7d524 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -76,6 +76,9 @@
   @media (-moz-platform: macos) {
     --zen-min-toolbox-padding: .52rem;
   }
+  @media (-moz-platform: linux) {
+    --zen-min-toolbox-padding: .35rem;
+  }
   --zen-toolbox-padding: max(var(--zen-min-toolbox-padding), calc(var(--zen-element-separation) / 1.5));
 }
 
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 78b995e42..4834aead4 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -767,13 +767,13 @@
         const separation = 8;
         const middleY = targetTab.screenY + rect.height / 2;
         const indicator = this.dragIndicator;
-        let top=0;
+        let top = 0;
         if (event.screenY > middleY) {
           top = rect.top + rect.height + 'px';
         } else {
           top = rect.top + 'px';
         }
-        indicator.style.setProperty('--indicator-left', rect.left + (separation/2) + 'px');
+        indicator.style.setProperty('--indicator-left', rect.left + separation / 2 + 'px');
         indicator.style.setProperty('--indicator-width', rect.width - separation + 'px');
         indicator.style.top = top;
       } else {

From e7175149d029ce16b4c5db7a6b9fa160b243b84d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 1 Feb 2025 00:24:02 +0100
Subject: [PATCH 019/191] Refactor sidebar CSS to use variable for margin
 calculation and remove unnecessary border

---
 src/browser/base/content/zen-styles/zen-sidebar.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-sidebar.css b/src/browser/base/content/zen-styles/zen-sidebar.css
index 1cb4b970d..01b170d82 100644
--- a/src/browser/base/content/zen-styles/zen-sidebar.css
+++ b/src/browser/base/content/zen-styles/zen-sidebar.css
@@ -42,14 +42,13 @@
 #zen-tabbox-wrapper {
   & #sidebar-splitter {
     opacity: 0;
-    margin-inline-end: -4px;
+    margin: 0 calc(-1 * var(--zen-element-separation));
   }
 
   & #sidebar-box {
     border-radius: var(--zen-native-inner-radius);
     box-shadow: var(--zen-big-shadow);
     overflow: hidden;
-    border: 1px solid var(--zen-colors-border);
 
     :root:not([zen-right-side='true']) &[positionend='true'] {
       margin-right: var(--zen-element-separation);

From 031043f2f2693075a6802f272ed159f2bc30b9c8 Mon Sep 17 00:00:00 2001
From: mr-cheff <91018726+mr-cheff@users.noreply.github.com>
Date: Sat, 1 Feb 2025 02:31:05 +0000
Subject: [PATCH 020/191] Update monthly issue metrics

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

diff --git a/docs/issue-metrics/2025_2025-01-01..2025-01-31.md b/docs/issue-metrics/2025_2025-01-01..2025-01-31.md
new file mode 100644
index 000000000..0eed99eba
--- /dev/null
+++ b/docs/issue-metrics/2025_2025-01-01..2025-01-31.md
@@ -0,0 +1,522 @@
+# Issue Metrics
+
+| Metric | Average | Median | 90th percentile |
+| --- | --- | --- | ---: |
+| Time to first response | 1 day, 2:25:19 | 4:38:40 | 2 days, 20:40:51 |
+| Time to close | 1 day, 21:15:55 | 8:22:21 | 5 days, 17:16:45 |
+
+| Metric | Count |
+| --- | ---: |
+| Number of items that remain open | 274 |
+| Number of items closed | 230 |
+| Total number of items created | 504 |
+
+| Title | URL | Time to first response | Time to close |
+| --- | --- | --- | --- |
+| Screen Sharing Issues when using Google Meet in Zen Browser | https://github.com/zen-browser/desktop/issues/4798 | 0:20:41 | 0:20:40 |
+| All tabs are gone after I close Zen | https://github.com/zen-browser/desktop/issues/4797 | 1:59:48 | None |
+| Setting the "Zen URL Bar" behavior to "Always floating" works the same as "Floating only when typing". | https://github.com/zen-browser/desktop/issues/4796 | None | None |
+| Toggle Compact Mode Not Responsive | https://github.com/zen-browser/desktop/issues/4795 | 1:25:51 | 1:25:51 |
+| Closing the last tab doesn't close the browser (again) | https://github.com/zen-browser/desktop/issues/4794 | 3:26:40 | None |
+| flickering images | https://github.com/zen-browser/desktop/issues/4791 | None | None |
+| Zen incorrectly assumes background color to be dark on some websites, making text unreadable | https://github.com/zen-browser/desktop/issues/4789 | 0:09:17 | 0:09:17 |
+| Ctrl-tab should not cycle through essential tabs | https://github.com/zen-browser/desktop/issues/4787 | 4:08:36 | None |
+| Erroneous conflicting shortcut (and maybe missing shortcut options) | https://github.com/zen-browser/desktop/issues/4785 | None | None |
+| Touchpad space switching issue | https://github.com/zen-browser/desktop/issues/4783 | None | 0:02:16 |
+| Closing 'new tab' or last opened tab opens last pinned tab or pinned essential if there is no pinned tab | https://github.com/zen-browser/desktop/issues/4779 | 0:41:29 | 1:03:21 |
+| Scrolling bar UI issue: ugly white background | https://github.com/zen-browser/desktop/issues/4778 | 1:05:49 | 4:13:36 |
+| Extensions become "big" after switching mode | https://github.com/zen-browser/desktop/issues/4777 | 1:36:21 | 1:36:21 |
+| Missing "New Tab" option at the bottom of tab column | https://github.com/zen-browser/desktop/issues/4776 | 1:27:47 | 1:27:47 |
+| PDF tab becomes unusable after unloading with unsaved edits | https://github.com/zen-browser/desktop/issues/4772 | None | 2:02:14 |
+| Cloudflare ZeroTrust (Warp) VPN unable to connect if Zen is default browser | https://github.com/zen-browser/desktop/issues/4771 | None | None |
+| Default Wayland Icon shows up in some places in KDE when installing from AppImage | https://github.com/zen-browser/desktop/issues/4770 | 2:51:55 | 2:54:44 |
+| If i close a tab in the sidebar it reloads the entire window and also goes to the starting tabs again which i dont need | https://github.com/zen-browser/desktop/issues/4769 | 1:30:05 | 4:24:03 |
+| Font doesnt load properly !! | https://github.com/zen-browser/desktop/issues/4767 | 1:27:56 | 3:58:48 |
+| Tab Creation | https://github.com/zen-browser/desktop/issues/4766 | None | 0:01:11 |
+| Open application menu button missing in Single toolbar mode | https://github.com/zen-browser/desktop/issues/4765 | 4:28:00 | 4:28:00 |
+| moving through workspaces by trackpad swipe tracks the movement but not the direction | https://github.com/zen-browser/desktop/issues/4764 | None | None |
+| Netflix does not work in zen | https://github.com/zen-browser/desktop/issues/4762 | 0:07:51 | 1:51:17 |
+| Unable to remove duplicate workspaces buttons. | https://github.com/zen-browser/desktop/issues/4761 | 5:03:40 | 5:03:40 |
+| Zen Identifies as Firefox in Powertoys run search plugin | https://github.com/zen-browser/desktop/issues/4759 | None | None |
+| Close Window Keyboard Shortcut does nothing | https://github.com/zen-browser/desktop/issues/4758 | None | None |
+| Scrolling on the tabs on a touch screen does nothing | https://github.com/zen-browser/desktop/issues/4757 | None | None |
+| Glance stops working after closing with an unfinished form | https://github.com/zen-browser/desktop/issues/4756 | None | None |
+| Dragging tabs scrollbar grabs window | https://github.com/zen-browser/desktop/issues/4755 | 7:07:32 | 7:07:31 |
+| Pinned Tabs - URL does not reset when tab is closed, only when returning to the tab | https://github.com/zen-browser/desktop/issues/4754 | None | None |
+| "empty space ontop of the vertical tabs" NOT fixed | https://github.com/zen-browser/desktop/issues/4753 | None | None |
+| Passkeys using mac touchID is not working | https://github.com/zen-browser/desktop/issues/4752 | None | 8:03:39 |
+| Out of order or hidden extensions on launch. Single Toolbar Mode | https://github.com/zen-browser/desktop/issues/4747 | None | None |
+| Show in compact view not working | https://github.com/zen-browser/desktop/issues/4745 | 12:20:42 | 12:20:42 |
+| Closing tab at the bottom of the tabs list puts you back on the top even if the tab isn't selected. | https://github.com/zen-browser/desktop/issues/4744 | 4:59:52 | 12:43:27 |
+| Customizing toolbar spits the app | https://github.com/zen-browser/desktop/issues/4737 | 17:20:17 | 1 day, 0:31:32 |
+| Zen URL bar settings doesn't work properly | https://github.com/zen-browser/desktop/issues/4736 | 12:52:11 | None |
+| BUG: Bookmarks toolbar items shows 'Show more' arrow even though there are no more bookmarked items | https://github.com/zen-browser/desktop/issues/4735 | None | None |
+| Scrolling after closing tab | https://github.com/zen-browser/desktop/issues/4733 | 15:39:10 | 1 day, 1:22:37 |
+| BUG: Whole browser broken on Windows | https://github.com/zen-browser/desktop/issues/4732 | 0:08:04 | None |
+| BUG: CTRL+SHIFT+B causes UI glitch by trying to show Bookmarks Toolbar in Single Toolbar Mode | https://github.com/zen-browser/desktop/issues/4731 | None | None |
+| BUG：Abnormal printing of web articles | https://github.com/zen-browser/desktop/issues/4730 | 20:28:04 | 20:28:04 |
+| JS close() calls constantly close the entire browser when a website calling it is the only tab left | https://github.com/zen-browser/desktop/issues/4729 | None | None |
+| Dragging empty space on sidebar tabs undocks and moves the program | https://github.com/zen-browser/desktop/issues/4728 | 21:01:43 | 21:01:43 |
+| The tab bar and top bar overlap and make it annoying to close the browser. | https://github.com/zen-browser/desktop/issues/4726 | None | None |
+| Tab switching to recent tab (Ctrl-Tab) doesn't work across workspaces | https://github.com/zen-browser/desktop/issues/4725 | None | None |
+| Top and side bars do not disappear in fullscreen mode | https://github.com/zen-browser/desktop/issues/4723 | 13:46:56 | 22:02:10 |
+| Toggling "Display workspaces as an icon strip" twice doesn't return to correctly rendered strip | https://github.com/zen-browser/desktop/issues/4722 | None | None |
+| Separate window cannot be closed | https://github.com/zen-browser/desktop/issues/4719 | 1 day, 1:32:05 | None |
+| Customize the toolbar without the toggle sidebar icon | https://github.com/zen-browser/desktop/issues/4717 | 1 day, 1:07:42 | None |
+| No option to translate to Vietnamese | https://github.com/zen-browser/desktop/issues/4716 | None | None |
+| When opening a site with prompt credentials form, the site cannot be opened | https://github.com/zen-browser/desktop/issues/4715 | None | None |
+| Links that are not from same domain are opened in Glance when clicked within essential tab, even when Glance is disabled and browser restarted. | https://github.com/zen-browser/desktop/issues/4714 | None | None |
+| Selected audio output device (speaker) is not being used | https://github.com/zen-browser/desktop/issues/4713 | None | None |
+| ZEN BROWSER crash when open "more tools" menu twice | https://github.com/zen-browser/desktop/issues/4712 | 0:02:34 | None |
+| Infinity loading | https://github.com/zen-browser/desktop/issues/4711 | None | 6:24:50 |
+| Duplicate entry in Settings > Keyboard Shortcuts | https://github.com/zen-browser/desktop/issues/4709 | None | None |
+| [BUG] Extension icons becomes huge after folding tabbar | https://github.com/zen-browser/desktop/issues/4707 | 9:14:59 | None |
+| Duplicate entries in settings page | https://github.com/zen-browser/desktop/issues/4706 | None | None |
+| Jitter / Stutter on macbook pro with apple silicon | https://github.com/zen-browser/desktop/issues/4705 | 0:21:08 | None |
+| Wallpaper settings subsections don't take full width | https://github.com/zen-browser/desktop/issues/4704 | None | None |
+| Zen Rice sharing is broken | https://github.com/zen-browser/desktop/issues/4701 | 2:38:42 | 11:21:17 |
+| Preedit text misplacement in search box under Wayland with Fcitx5 input method | https://github.com/zen-browser/desktop/issues/4699 | None | None |
+| permanently disable browser.tabs.allow_transparent_browser | https://github.com/zen-browser/desktop/issues/4698 | 1 day, 15:39:09 | None |
+| Bookmarks Duplicated & Out of Sync | https://github.com/zen-browser/desktop/issues/4697 | None | None |
+| Twitch freeze when alt-tabbing | https://github.com/zen-browser/desktop/issues/4696 | 2 days, 3:55:36 | None |
+| Popup for TST extension that should occur once, occurs every time Zen is launched (Windows build issue, not Mac) | https://github.com/zen-browser/desktop/issues/4695 | 0:17:58 | None |
+| overflow menu. | https://github.com/zen-browser/desktop/issues/4694 | None | None |
+| Close tab X button hitbox is different between hover hitbox and click hitbox | https://github.com/zen-browser/desktop/issues/4692 | None | None |
+| Menu Alignment Issues | https://github.com/zen-browser/desktop/issues/4691 | None | None |
+| Zen freezes several times a day | https://github.com/zen-browser/desktop/issues/4690 | 2 days, 1:37:06 | 2 days, 5:28:59 |
+| Scroll issue | https://github.com/zen-browser/desktop/issues/4689 | None | None |
+| Issue with Zen Browser Getting Uninstalled Automatically | https://github.com/zen-browser/desktop/issues/4688 | None | None |
+| Glance and Keyboard Focus | https://github.com/zen-browser/desktop/issues/4687 | 15:14:37 | None |
+| Opening a new Tab when currently in an Essential tab, opens the news tab in Glance Mode | https://github.com/zen-browser/desktop/issues/4686 | 2 days, 4:20:37 | None |
+| Empty Space on Tab bar above Workspace when aligned to right | https://github.com/zen-browser/desktop/issues/4683 | 1 day, 23:36:21 | None |
+| [BUG] Native sidebar and Zen sidepanel splitters are positioned too close to each other | https://github.com/zen-browser/desktop/issues/4680 | None | None |
+| Terminology (and icons) for Sidebars and Side Web Panels too similar and ambiguous | https://github.com/zen-browser/desktop/issues/4679 | 0:11:52 | 2 days, 15:30:38 |
+| Customize toolbar in single toolbar mode looks like multiple toolbars | https://github.com/zen-browser/desktop/issues/4678 | None | None |
+| Elements in top toolbar overlap when it is resized too small | https://github.com/zen-browser/desktop/issues/4676 | None | None |
+| Empty space on the top of compact mode small sidebar | https://github.com/zen-browser/desktop/issues/4674 | 0:14:45 | 0:14:45 |
+| Headset is not recognized in google meet | https://github.com/zen-browser/desktop/issues/4671 | None | None |
+| Popup is cut in compact mode | https://github.com/zen-browser/desktop/issues/4670 | None | None |
+| Combining windows causes tabs in other workspaces to become inaccessible | https://github.com/zen-browser/desktop/issues/4668 | None | None |
+| Adjust search text and icon size when searching on a new tab. | https://github.com/zen-browser/desktop/issues/4667 | None | None |
+| Tabs freezes while my RAM/VRAM utlizing | https://github.com/zen-browser/desktop/issues/4666 | None | None |
+| Workspace Icons are overlayed with the theme color | https://github.com/zen-browser/desktop/issues/4665 | 15:18:13 | 15:18:13 |
+| Unable to assign Cmd+Z for undo | https://github.com/zen-browser/desktop/issues/4664 | None | None |
+| Black Screen on Windows after opening the Zen Browser | https://github.com/zen-browser/desktop/issues/4663 | None | None |
+| Forward button icon slightly offcenter | https://github.com/zen-browser/desktop/issues/4662 | None | None |
+| Everything opens in Glance | https://github.com/zen-browser/desktop/issues/4661 | 13:00:08 | 13:00:08 |
+| Wrong location of title bar buttons when opening external links from VS Code | https://github.com/zen-browser/desktop/issues/4660 | None | None |
+| Web Page print would not render preview | https://github.com/zen-browser/desktop/issues/4659 | 0:18:04 | 0:18:04 |
+| Issue with Youtube playback in 4K quality | https://github.com/zen-browser/desktop/issues/4652 | None | None |
+| when searching on the address bar, a new tab open instead of the origion tab | https://github.com/zen-browser/desktop/issues/4651 | None | None |
+| Compact mode won't disable after changing which toolbars are hidden | https://github.com/zen-browser/desktop/issues/4649 | 16:26:34 | None |
+| Problem with tab bar and top bar | https://github.com/zen-browser/desktop/issues/4648 | 7:28:57 | None |
+| Excessive margin between bookmark sidebar and center pane | https://github.com/zen-browser/desktop/issues/4647 | 7:37:12 | None |
+| I am not able to save my bookmarks of zen with the autoExportHTML flag, this works fine on firefox though. | https://github.com/zen-browser/desktop/issues/4646 | None | None |
+| Dropdown input is not selected | https://github.com/zen-browser/desktop/issues/4645 | None | None |
+| Toolbar becomes big after customizing the bookmarks placement | https://github.com/zen-browser/desktop/issues/4641 | None | None |
+| Zen Mods are not properly installing | https://github.com/zen-browser/desktop/issues/4640 | None | None |
+| HDR video plays in SDR | https://github.com/zen-browser/desktop/issues/4639 | None | 3 days, 3:56:44 |
+| The rounded corner to the bottom right of the web viewport needs a bigger border radius on linux GTK | https://github.com/zen-browser/desktop/issues/4638 | 3:57:05 | 3:57:05 |
+| Tab bar title not aligned properly | https://github.com/zen-browser/desktop/issues/4636 | None | None |
+| Window Control Buttons Missing on Linux | https://github.com/zen-browser/desktop/issues/4635 | None | None |
+| System freezes while using zen browser | https://github.com/zen-browser/desktop/issues/4634 | 4 days, 17:38:33 | None |
+| keymaps issue | https://github.com/zen-browser/desktop/issues/4631 | 0:42:05 | None |
+| tool bar stucked | https://github.com/zen-browser/desktop/issues/4630 | 7:29:01 | 1 day, 2:03:18 |
+| side bar bug | https://github.com/zen-browser/desktop/issues/4628 | None | None |
+| System Crashes (Blue Screen) While Using Zen Browser | https://github.com/zen-browser/desktop/issues/4627 | 10:07:14 | None |
+| Macos fullscreen url bar overlaps with bookmark | https://github.com/zen-browser/desktop/issues/4625 | None | None |
+| pdf will not load to print | https://github.com/zen-browser/desktop/issues/4623 | 1:48:06 | 1 day, 21:47:12 |
+| The sidebar loses it's colour when in compact mode and revealed using the mouse cursor | https://github.com/zen-browser/desktop/issues/4621 | None | None |
+| Printer Menu Perpetually Loads; cannot print anything from the browser | https://github.com/zen-browser/desktop/issues/4620 | 0:17:13 | 0:17:13 |
+| Extension install dialog is over the tab-bar | https://github.com/zen-browser/desktop/issues/4617 | None | None |
+| Light and Dark Mode from Firefox UI Bug | https://github.com/zen-browser/desktop/issues/4616 | None | None |
+| Starting 1.7.1b, colourful dark theme doesn't work on browser frame | https://github.com/zen-browser/desktop/issues/4615 | None | None |
+| Installing mods overwrites all currently installed ones | https://github.com/zen-browser/desktop/issues/4614 | None | None |
+| text pops out of the buttons in Russian | https://github.com/zen-browser/desktop/issues/4613 | None | None |
+| Can't do sidebar smaller | https://github.com/zen-browser/desktop/issues/4612 | 0:54:29 | 1 day, 14:32:22 |
+| Customized toolbar icons aren't showing | https://github.com/zen-browser/desktop/issues/4610 | 5 days, 0:37:36 | None |
+| Web view rounded corners disappear when `backdrop-filter` is used in the page | https://github.com/zen-browser/desktop/issues/4609 | None | None |
+| Links don't open in browser | https://github.com/zen-browser/desktop/issues/4608 | None | 6 days, 11:27:06 |
+| Issues with tab bar padding and workspaces | https://github.com/zen-browser/desktop/issues/4607 | None | 6 days, 11:37:23 |
+| New Windows do not focus the address bar automatically | https://github.com/zen-browser/desktop/issues/4606 | None | None |
+| Keybinding Conflict in Zen Browser | https://github.com/zen-browser/desktop/issues/4605 | 2 days, 17:44:23 | None |
+| Zen browser URL bar flickering | https://github.com/zen-browser/desktop/issues/4604 | 23:56:25 | None |
+| Workspace icon does not get set on creation | https://github.com/zen-browser/desktop/issues/4603 | None | None |
+| Browser crashed when clicking expand toolbar button | https://github.com/zen-browser/desktop/issues/4600 | None | None |
+| Close Pinned tabs in right click menu ignores "close tab shortcut behaviour" in prefs | https://github.com/zen-browser/desktop/issues/4599 | None | None |
+| Weird color highlight (again) & thin border on right side | https://github.com/zen-browser/desktop/issues/4598 | None | None |
+| Window control buttons disappear on MacOS | https://github.com/zen-browser/desktop/issues/4597 | None | None |
+| Zen is not showing up in the default web browser selection on Elementary OS 8 settings | https://github.com/zen-browser/desktop/issues/4594 | 3:27:41 | 23:09:00 |
+| My accounts keep signing out after a while. (Google, Github) | https://github.com/zen-browser/desktop/issues/4593 | 6 days, 0:59:05 | None |
+| Arrows are Backwards | https://github.com/zen-browser/desktop/issues/4592 | 7:58:01 | 19:33:43 |
+| Bookmarks Toolbar automatically hides in "Single toolbar" layout even though "Alway Show" is enabled | https://github.com/zen-browser/desktop/issues/4591 | None | None |
+| Zen couldn’t find any programs that contain bookmark, history or password data. | https://github.com/zen-browser/desktop/issues/4589 | 0:12:09 | 0:12:09 |
+| Cannot remove Workspace switch from side bar/toolbar | https://github.com/zen-browser/desktop/issues/4588 | 0:10:50 | 0:18:19 |
+| Window size of [Shows tabs from other devices] | https://github.com/zen-browser/desktop/issues/4586 | None | None |
+| Bug, tabs getting "stuck" randomly, unclickable | https://github.com/zen-browser/desktop/issues/4583 | 11:25:21 | None |
+| Sort Mods Store by popularity | https://github.com/zen-browser/desktop/issues/4582 | 6:36:38 | 6:36:38 |
+| Significant FPS drop when playing 4k/1440p youtube video | https://github.com/zen-browser/desktop/issues/4580 | 0:12:21 | None |
+| Adressbar only showing on hover if sidebar width is collabsed | https://github.com/zen-browser/desktop/issues/4579 | 0:07:48 | 0:13:21 |
+| Can't find on github search | https://github.com/zen-browser/desktop/issues/4576 | 4:34:29 | 4:34:29 |
+| URL is shifted to the right when a permission is granted to a website | https://github.com/zen-browser/desktop/issues/4574 | 4:46:44 | 15:13:36 |
+| can't change font for different languages | https://github.com/zen-browser/desktop/issues/4573 | 13:11:54 | 2 days, 19:07:15 |
+| Extention storage full or | https://github.com/zen-browser/desktop/issues/4572 | None | None |
+| Sidebar layout issues | https://github.com/zen-browser/desktop/issues/4570 | None | None |
+| codeiq.vex.com unsupported since 1.7.2b | https://github.com/zen-browser/desktop/issues/4569 | 0:56:16 | 17:32:41 |
+| Zen not showing any webpage when out of compact mode | https://github.com/zen-browser/desktop/issues/4566 | None | None |
+| Discord Web App Forces Links to Open in Glance Window, Overriding User Preferences | https://github.com/zen-browser/desktop/issues/4564 | 2:42:18 | 3:30:19 |
+| Some Firefox settings wiped after signing into sync | https://github.com/zen-browser/desktop/issues/4562 | 0:39:56 | None |
+| Empty space on top of sidebar in compact mode | https://github.com/zen-browser/desktop/issues/4561 | 0:05:34 | 0:05:34 |
+| Cannot Click to Place Cursor in Address-Bar on Linux and Windows | https://github.com/zen-browser/desktop/issues/4560 | 4 days, 18:49:29 | None |
+| Prezo.ai : site broken, not loading properly on Zen Browser. | https://github.com/zen-browser/desktop/issues/4557 | 1 day, 20:29:16 | None |
+| Printing preview loads indefinitely | https://github.com/zen-browser/desktop/issues/4555 | 2:59:17 | 2 days, 9:39:10 |
+| Neither swipe gestures nor mouse forward/backward buttons work to switch workspaces | https://github.com/zen-browser/desktop/issues/4554 | 1:04:38 | None |
+| Expand Sidebar Icon missing when sidebar is folded | https://github.com/zen-browser/desktop/issues/4553 | 5:31:28 | None |
+| Windows' button shadows, bleed into the website space | https://github.com/zen-browser/desktop/issues/4551 | None | None |
+| MacOS pointer not hiding when entering fullscreen | https://github.com/zen-browser/desktop/issues/4550 | None | None |
+| Private browsing Profile Icon is missing | https://github.com/zen-browser/desktop/issues/4549 | None | None |
+| When customizing toolbar allows the browser window to be dragged but not maximized. | https://github.com/zen-browser/desktop/issues/4548 | None | None |
+| Workspace icons moved from top to side bar | https://github.com/zen-browser/desktop/issues/4547 | 3:50:50 | 3:50:50 |
+| macOS: 'All Desktops' option in dock icon context menu not functioning | https://github.com/zen-browser/desktop/issues/4546 | None | None |
+| OPTIONS preflight request uses HTTPS while GET request is HTTP in Angular | https://github.com/zen-browser/desktop/issues/4545 | None | None |
+| Cannot adjust horizontal split width when zen web panels are pinned | https://github.com/zen-browser/desktop/issues/4544 | None | None |
+| Searchbar widget doesn't iconify in collapsed mode Sidebar | https://github.com/zen-browser/desktop/issues/4543 | None | None |
+| Rightmost icon in multiple toolbars disappears on launch | https://github.com/zen-browser/desktop/issues/4542 | None | None |
+| Essentials disappear when switching container with PiP playing | https://github.com/zen-browser/desktop/issues/4541 | None | None |
+| Workspace switchers over vertical tabs misplaced after 1.7.2b | https://github.com/zen-browser/desktop/issues/4540 | 9:53:46 | 11:31:54 |
+| Compact mode works once per window | https://github.com/zen-browser/desktop/issues/4539 | 0:15:28 | 18:44:40 |
+| 1Password integrations | https://github.com/zen-browser/desktop/issues/4538 | 12:10:26 | 15:09:30 |
+| Extra white space at the top of the sidebar | https://github.com/zen-browser/desktop/issues/4537 | 4:37:10 | 3 days, 6:44:37 |
+| Windows - Can't hide any Bars | https://github.com/zen-browser/desktop/issues/4536 | 12:20:24 | 12:20:24 |
+| Typo | https://github.com/zen-browser/desktop/issues/4534 | 13:55:02 | 13:55:02 |
+| Viewport rounded corners flicker & sharpness | https://github.com/zen-browser/desktop/issues/4533 | None | 0:05:25 |
+| Reloading Unloaded PDF tabs creates duplicates | https://github.com/zen-browser/desktop/issues/4532 | 9:22:02 | None |
+| Browser shows extra animation every time user switches to a split | https://github.com/zen-browser/desktop/issues/4531 | 16:36:14 | None |
+| Screenshot icon disappeads from toolbar after each time my MAC is shutdown | https://github.com/zen-browser/desktop/issues/4530 | None | 1 day, 8:23:32 |
+| I want to close my WINDOW with Ctrl + W | https://github.com/zen-browser/desktop/issues/4529 | 0:21:41 | 1 day, 2:07:59 |
+| Browser Closes when All Tabs in Default Workspace are Closed Even with Other Tabs | https://github.com/zen-browser/desktop/issues/4528 | None | None |
+| IDN address show punny code in URL | https://github.com/zen-browser/desktop/issues/4527 | None | None |
+| Text is garbled in google docs | https://github.com/zen-browser/desktop/issues/4522 | 1 day, 2:06:08 | 2 days, 6:20:50 |
+| Sidebar issues | https://github.com/zen-browser/desktop/issues/4520 | None | None |
+| Sidebar wallpaper blur Macos | https://github.com/zen-browser/desktop/issues/4519 | None | None |
+| Zen crashes on macOS when expanding and collapsing tab bar | https://github.com/zen-browser/desktop/issues/4518 | 8:01:33 | 8:05:17 |
+| Hide and unhide sidebar impacts the Extensions icons size | https://github.com/zen-browser/desktop/issues/4517 | 4 days, 11:55:27 | None |
+| Overflow menu gone in single toolbar mode | https://github.com/zen-browser/desktop/issues/4516 | None | None |
+| light theme page container looks like outset | https://github.com/zen-browser/desktop/issues/4515 | 6:33:55 | 6:33:55 |
+| marvinpinto/action-automatic-releases should be updated to Node20 | https://github.com/zen-browser/desktop/issues/4514 | None | None |
+| Searching using the new tab search box  shows the name of the engine in the address bar | https://github.com/zen-browser/desktop/issues/4512 | None | None |
+| Icons in collapsible top bar don't line up with other single toolbar icons | https://github.com/zen-browser/desktop/issues/4511 | None | None |
+| Top button wrap feature hides buttons when there is space | https://github.com/zen-browser/desktop/issues/4510 | None | None |
+| Hide bars doesn't work after last update | https://github.com/zen-browser/desktop/issues/4509 | 0:53:56 | 4:12:00 |
+| artifacts/lines across screen on some websites. | https://github.com/zen-browser/desktop/issues/4508 | None | None |
+| Browser freezes and CPU usage spikes after opening/closing "More tools" twice | https://github.com/zen-browser/desktop/issues/4507 | 1:22:50 | None |
+| flood to Google by fast open/close broser. request support base64 favicon | https://github.com/zen-browser/desktop/issues/4506 | None | None |
+| "Pin Tab" missing in keyboard shortcut settings | https://github.com/zen-browser/desktop/issues/4504 | None | None |
+| Container tab opens the old signed in page | https://github.com/zen-browser/desktop/issues/4503 | None | None |
+| Container Indicator Still Showing With New Window | https://github.com/zen-browser/desktop/issues/4502 | 8:13:52 | 8:13:52 |
+| Text on PDFs/Powerpoints is completely unreadable | https://github.com/zen-browser/desktop/issues/4501 | 0:09:15 | 0:09:18 |
+| Bookmarks in toolbar and ability to add bookmarks dissapppeared with release 1.7.1b | https://github.com/zen-browser/desktop/issues/4499 | 4 days, 3:23:33 | 3 days, 7:20:47 |
+| Theme Selection Issue After Browser Update  version 1.7.1b Windows | https://github.com/zen-browser/desktop/issues/4498 | 0:28:37 | 0:28:37 |
+| Browser Freeze on image copy | https://github.com/zen-browser/desktop/issues/4497 | None | None |
+| Fcitx5 doesn't load skins / themes / settings on KDE 6 wayland | https://github.com/zen-browser/desktop/issues/4495 | 1:42:18 | None |
+| When starting zen browser it takes a long time starting up | https://github.com/zen-browser/desktop/issues/4494 | None | None |
+| Scrolling between the workspaces is very slow.. | https://github.com/zen-browser/desktop/issues/4493 | None | 9 days, 9:07:24 |
+| Theme colour interfering with webpage | https://github.com/zen-browser/desktop/issues/4492 | 1:24:45 | 1:24:45 |
+| Essentials turning into pinned tab in new window | https://github.com/zen-browser/desktop/issues/4491 | None | None |
+| All add-ons have been disabled by safe mode on version 1.7.1b Windows | https://github.com/zen-browser/desktop/issues/4490 | None | 23:06:20 |
+| Opening the overflow menu twice freezes the browser window on MacOs | https://github.com/zen-browser/desktop/issues/4489 | 1 day, 10:02:01 | 5 days, 8:07:24 |
+| After updating to 1.7.1 Zen "broke" | https://github.com/zen-browser/desktop/issues/4488 | 0:28:58 | 3:10:29 |
+| After highlighting search toolbar the background blur breaks out. | https://github.com/zen-browser/desktop/issues/4487 | 3:22:32 | None |
+| Compact Mode No Longer Hides Sidebar and Top Toolbar | https://github.com/zen-browser/desktop/issues/4486 | 0:13:16 | 0:20:02 |
+| mailto dialog breaks when compact mode is enabled | https://github.com/zen-browser/desktop/issues/4485 | None | None |
+| Toolbar is not hiding after hide both top bar and tab bar | https://github.com/zen-browser/desktop/issues/4484 | 0:46:49 | 0:54:21 |
+| After last update, ZEN browser just disappered! | https://github.com/zen-browser/desktop/issues/4482 | 2:13:47 | 1 day, 19:31:19 |
+| browser.tabs.closeWindowWithLastTab does not work when there are essentials or pinned tabs | https://github.com/zen-browser/desktop/issues/4481 | None | None |
+| Address Bar Slides Down Unexpectedly When Hovering for Toolbar in Full-Screen Mode | https://github.com/zen-browser/desktop/issues/4480 | None | None |
+| Web panel icon in the sidebar is missing | https://github.com/zen-browser/desktop/issues/4479 | 4:50:13 | None |
+| Broken scrollbar on the sidebar | https://github.com/zen-browser/desktop/issues/4478 | 4:38:40 | 4:38:40 |
+| Tab Toolbar No Longer Collapsing | https://github.com/zen-browser/desktop/issues/4477 | 2:05:12 | 4:17:18 |
+| Tab group collapsing seems to not work | https://github.com/zen-browser/desktop/issues/4476 | 0:13:43 | 9:07:00 |
+| No button to enable compact mode in settings page | https://github.com/zen-browser/desktop/issues/4473 | 5:51:29 | 6:25:51 |
+| Can't click out of submenus or right-click context menu. | https://github.com/zen-browser/desktop/issues/4471 | None | 0:14:04 |
+| "Some of Zen's security features may offer less protection on your current operating system" | https://github.com/zen-browser/desktop/issues/4470 | 0:42:44 | 0:42:47 |
+| Dragging out the last tab from the tab list opens up another window | https://github.com/zen-browser/desktop/issues/4469 | 1:50:02 | None |
+| Wrong location of input content directly after creating a new tab page | https://github.com/zen-browser/desktop/issues/4468 | 14:53:17 | 14:53:17 |
+| active Essentials tab - url changed is opening in the active Essentials tab instead of new tab | https://github.com/zen-browser/desktop/issues/4467 | 0:04:56 | 0:04:56 |
+| The Current Workspace Indicator is no longer clickable. | https://github.com/zen-browser/desktop/issues/4466 | 0:41:38 | None |
+| My browser addons do not show up or have any effect in the Web panel tabs? | https://github.com/zen-browser/desktop/issues/4465 | None | None |
+| Profile switcher not showing in collapsed sidebar | https://github.com/zen-browser/desktop/issues/4464 | None | None |
+| Facebook does not work | https://github.com/zen-browser/desktop/issues/4463 | None | 0:08:40 |
+| Latest Twilight Release breaks UI on MacOS | https://github.com/zen-browser/desktop/issues/4462 | 0:38:30 | 19:02:04 |
+| Zen Compact mode doesn't work at all | https://github.com/zen-browser/desktop/issues/4461 | 0:33:07 | 1:45:21 |
+| Extension permissions window shifted | https://github.com/zen-browser/desktop/issues/4460 | 1:45:17 | None |
+| Browser Extensions Display Incorrectly When Changing Sidebar Width in Single Toolbar Mode | https://github.com/zen-browser/desktop/issues/4459 | None | None |
+| Missing "Change theme colors" | https://github.com/zen-browser/desktop/issues/4458 | 3:34:32 | None |
+| Zen getting closed immediately when I open it after screen is locked for some time | https://github.com/zen-browser/desktop/issues/4457 | 1 day, 3:23:38 | 6 days, 4:08:52 |
+| Tab sidebar does not sliding properly with touchpad (IT FIXED WHEN UPDATE 1.7B) | https://github.com/zen-browser/desktop/issues/4456 | 4:03:13 | 4:04:23 |
+| Massive Visual Glitch | https://github.com/zen-browser/desktop/issues/4455 | 4:28:14 | 4:38:13 |
+| Tab and top bars not collapsing when upgrading from 1.7b to 1.7.1b | https://github.com/zen-browser/desktop/issues/4454 | 1:36:02 | 5:22:48 |
+| Workspace Emoji not updating choice | https://github.com/zen-browser/desktop/issues/4453 | None | None |
+| Synchronizing Duplicates Default Workspace | https://github.com/zen-browser/desktop/issues/4452 | 1 day, 7:42:33 | None |
+| Tabs freeze when opening new ones | https://github.com/zen-browser/desktop/issues/4451 | 8:44:35 | None |
+| Severe memory leak | https://github.com/zen-browser/desktop/issues/4450 | 3:35:43 | None |
+| Tab Retitle Not Working For All Workspaces | https://github.com/zen-browser/desktop/issues/4448 | None | None |
+| Scrolling horizontally on the sidebar animates even when current workspace is the only workspace | https://github.com/zen-browser/desktop/issues/4447 | None | None |
+| Essentials Loading In Wrong Workspace When Using Firefox Multi-Acccount Containers | https://github.com/zen-browser/desktop/issues/4446 | 1 day, 13:29:49 | 1 day, 22:44:12 |
+| Link to Firefox app in about:protections | https://github.com/zen-browser/desktop/issues/4445 | 17:52:50 | None |
+| The name of the application displayed in the notification | https://github.com/zen-browser/desktop/issues/4444 | None | None |
+| Bookmarks duplicate on new window (sometimes) | https://github.com/zen-browser/desktop/issues/4443 | None | 9 days, 4:00:20 |
+| "Undo Close Window" action does not work correctly | https://github.com/zen-browser/desktop/issues/4442 | None | None |
+| Zen Browser very slow to load all websites | https://github.com/zen-browser/desktop/issues/4441 | None | 8:28:11 |
+| Close Browser issue | https://github.com/zen-browser/desktop/issues/4440 | None | None |
+| 1password-extension connection failure on ZEN browser | https://github.com/zen-browser/desktop/issues/4438 | 0:13:02 | None |
+| Container indicators always show on tabs dragged out of window, even if they are opened in their containers' default workspaces | https://github.com/zen-browser/desktop/issues/4437 | None | None |
+| Essentials in new windows open in container of last used workspace instead of their actual containers | https://github.com/zen-browser/desktop/issues/4436 | None | None |
+| Forced compact mode on multiple toolbars view, right of screen cut off | https://github.com/zen-browser/desktop/issues/4434 | 2:00:41 | 10:00:34 |
+| Forced compact mode on multiple toolbars view, right of screen cut off | https://github.com/zen-browser/desktop/issues/4433 | 10:03:04 | 10:03:04 |
+| problem moving icons | https://github.com/zen-browser/desktop/issues/4432 | None | 1 day, 22:26:39 |
+| (Regression?) Tab moving is buggy after switching workspaces | https://github.com/zen-browser/desktop/issues/4431 | None | 13 days, 3:51:45 |
+| Changing theme to light does not work | https://github.com/zen-browser/desktop/issues/4430 | None | 1:26:30 |
+| Bottom Corners are not Rounded | https://github.com/zen-browser/desktop/issues/4428 | 0:09:07 | 0:09:07 |
+| Moving bookmark items to sidebar makes it stuck | https://github.com/zen-browser/desktop/issues/4427 | None | None |
+| Actual Window Width of Zen Twilight 1.7t (2025-01-18 at 00:37:45) | https://github.com/zen-browser/desktop/issues/4426 | 4:16:49 | None |
+| Text in modals are blank | https://github.com/zen-browser/desktop/issues/4425 | None | None |
+| Problem customizing the toolbar | https://github.com/zen-browser/desktop/issues/4424 | None | None |
+| REGRESSION: Non-workspace users are seeing an useless button. | https://github.com/zen-browser/desktop/issues/4423 | 1:27:08 | 1:27:08 |
+| Homepage and new tabs are clashing/reseting between two extensions after restarting the browser | https://github.com/zen-browser/desktop/issues/4420 | 9:59:30 | None |
+| Zen browser (flatpak Linux) too slow to load the first website on first start | https://github.com/zen-browser/desktop/issues/4418 | None | None |
+| Buggy Youtube entering and exiting full screen mode | https://github.com/zen-browser/desktop/issues/4417 | 1:28:01 | None |
+| Unexpected UI for essential's active tabs | https://github.com/zen-browser/desktop/issues/4416 | None | None |
+| old tab is not opening again. | https://github.com/zen-browser/desktop/issues/4412 | 13:38:37 | 13:57:44 |
+| All gone on update | https://github.com/zen-browser/desktop/issues/4411 | 0:16:47 | 0:18:50 |
+| https://discord.com requires login every refresh and is irresponsive when using Ctrl+Shift+I | https://github.com/zen-browser/desktop/issues/4408 | None | None |
+| Required to double-click non tab elements in vertical tab bar | https://github.com/zen-browser/desktop/issues/4406 | None | 15 days, 1:43:06 |
+| New tab opened with link click does not scroll into view, or have any indication that a new tab is been created | https://github.com/zen-browser/desktop/issues/4405 | None | None |
+| Uneven padding in the window border | https://github.com/zen-browser/desktop/issues/4404 | None | None |
+| editing problem in the url bar | https://github.com/zen-browser/desktop/issues/4403 | None | None |
+| CMD+W closes the browser. | https://github.com/zen-browser/desktop/issues/4402 | 0:13:23 | 0:13:23 |
+| Toolbar blinks when in compact mode and while hovering over it with a mouse | https://github.com/zen-browser/desktop/issues/4401 | 0:36:52 | 0:36:52 |
+| When two windows of Zen are opened, they have slightly different color scheme | https://github.com/zen-browser/desktop/issues/4400 | 1 day, 4:29:58 | 2 days, 2:33:55 |
+| Browser freezes after abruptly closing essential before loading them | https://github.com/zen-browser/desktop/issues/4399 | None | None |
+| Collapsible Sidebar Not Functioning Correctly | https://github.com/zen-browser/desktop/issues/4398 | 2:47:32 | 2:47:32 |
+| Failed to find update in twilight | https://github.com/zen-browser/desktop/issues/4397 | 2:49:14 | 3:02:05 |
+| keepassxc addon not working on garuda linux | https://github.com/zen-browser/desktop/issues/4396 | None | 0:01:02 |
+| (MacOS) Audio on browser not app-adjustable in utilities that allow individual app volume control. | https://github.com/zen-browser/desktop/issues/4395 | None | None |
+| When enabling and disabling compact mode, depending on the web page you are viewing, the page jitters | https://github.com/zen-browser/desktop/issues/4394 | 3:26:06 | 3:26:06 |
+| No dialog to give an "escape full screen" button when in full screen video, i.e on YouTube | https://github.com/zen-browser/desktop/issues/4392 | 4:01:26 | 4:01:26 |
+| Pinned tabs are looking like regular tabs with a separator | https://github.com/zen-browser/desktop/issues/4391 | 0:48:28 | 21:14:22 |
+| Added a new container and workspace, changed the icon and color, which caused in the search bar indicator to disappear. | https://github.com/zen-browser/desktop/issues/4390 | None | None |
+| toolbar doesnt pop up when opening tabs with middle mouse click | https://github.com/zen-browser/desktop/issues/4389 | None | None |
+| tabs are unloaded too quickly | https://github.com/zen-browser/desktop/issues/4388 | 0:27:37 | None |
+| 1.7b When browser closes when the last tab is closed, it creates a new tab, and then quits | https://github.com/zen-browser/desktop/issues/4387 | None | None |
+| 1.7b Active Tab Design | https://github.com/zen-browser/desktop/issues/4386 | 1:19:07 | None |
+| Visual glitches with fonts on some websites | https://github.com/zen-browser/desktop/issues/4385 | 1:13:45 | 1:13:45 |
+| 1.7b laggy in general compared to 1.6b | https://github.com/zen-browser/desktop/issues/4384 | 2:20:31 | 6 days, 23:13:36 |
+| Tab unloader does not work; does not reduce resource consumption | https://github.com/zen-browser/desktop/issues/4383 | 6:47:30 | None |
+| ZIP download button does nothing | https://github.com/zen-browser/desktop/issues/4382 | 0:26:46 | 0:26:46 |
+| The history button is broken on the side bar | https://github.com/zen-browser/desktop/issues/4381 | 1:36:08 | None |
+| Pixelated Text | https://github.com/zen-browser/desktop/issues/4380 | 1:34:11 | 1:34:11 |
+| Allow workspaces have their own pinned tabs not working  1.7b | https://github.com/zen-browser/desktop/issues/4379 | 5:21:45 | 5:21:45 |
+| Full LTO causes crash with flatpak | https://github.com/zen-browser/desktop/issues/4378 | 7:38:51 | None |
+| Lost all pins and essentials on update 1.7b | https://github.com/zen-browser/desktop/issues/4377 | 6:01:05 | None |
+| 1.7b tab bar choppy animation and interaction issue | https://github.com/zen-browser/desktop/issues/4376 | 22:56:24 | None |
+| Workspace switching by touchpad swipe doesn't work with too many tabs open. | https://github.com/zen-browser/desktop/issues/4375 | 0:05:39 | None |
+| Synced tabs pop-up layout messed up | https://github.com/zen-browser/desktop/issues/4371 | None | None |
+| Keyboard shortcuts keep being reset | https://github.com/zen-browser/desktop/issues/4370 | 17:21:42 | 2 days, 1:32:20 |
+| Zen doesn't respond quickly (~2 min) to discord attempting to download .deb file for update | https://github.com/zen-browser/desktop/issues/4369 | 0:32:40 | None |
+| Compact tab bar isn't going to hide at last Twilight build (1.7t (2025-01-15)) | https://github.com/zen-browser/desktop/issues/4368 | 0:33:05 | 0:33:05 |
+| Sidebar does't change width properly. | https://github.com/zen-browser/desktop/issues/4367 | 1:29:43 | 1:29:43 |
+| Dialog box appearing in wrong direction | https://github.com/zen-browser/desktop/issues/4366 | 1:59:09 | 4:33:28 |
+| 1Password says there's a Firefox update available | https://github.com/zen-browser/desktop/issues/4365 | 5:09:12 | None |
+| Sometimes tabs stuck and not clickable | https://github.com/zen-browser/desktop/issues/4362 | 0:19:25 | None |
+| Side Web Panel icon shows after start when deactivated | https://github.com/zen-browser/desktop/issues/4361 | 19:20:10 | None |
+| Tab bar scrolls slow and buggy | https://github.com/zen-browser/desktop/issues/4359 | 0:09:28 | 0:23:50 |
+| Zen Browser opens zen-beta? | https://github.com/zen-browser/desktop/issues/4358 | 11:38:19 | 1 day, 0:36:24 |
+| Tab bar is blue | https://github.com/zen-browser/desktop/issues/4357 | 1:27:20 | 1:28:24 |
+| Require Device Sign-in to fill passwords does not work | https://github.com/zen-browser/desktop/issues/4356 | 1 day, 13:54:07 | None |
+| Quicktime browser plugin not displaying | https://github.com/zen-browser/desktop/issues/4355 | 0:02:21 | 1 day, 3:43:36 |
+| Html Date (Month) Input is not working. | https://github.com/zen-browser/desktop/issues/4354 | 1 day, 4:02:04 | None |
+| Proxies cannot be used to access google, YouTube, and more | https://github.com/zen-browser/desktop/issues/4352 | 1:35:57 | 1 day, 0:46:50 |
+| Round edging not functional on some sites | https://github.com/zen-browser/desktop/issues/4351 | 2:37:01 | 1 day, 5:36:14 |
+| Sign pop up windows not using container assigned to workspace. | https://github.com/zen-browser/desktop/issues/4350 | None | None |
+| Browser bug , not work correctly | https://github.com/zen-browser/desktop/issues/4348 | 2:26:52 | 17 days, 7:42:31 |
+| Opening settings causes sidebar to go ultra wide | https://github.com/zen-browser/desktop/issues/4347 | None | None |
+| Notification for 'new tab' does not work | https://github.com/zen-browser/desktop/issues/4346 | 3:25:57 | 21:01:52 |
+| New  tab created with link click OR ctrl+T is obscured by empty/unused toolbar space | https://github.com/zen-browser/desktop/issues/4345 | None | None |
+| Jittering in tab groups | https://github.com/zen-browser/desktop/issues/4343 | 3:11:54 | 3:32:43 |
+| Sidebar Jittering While In compact mode | https://github.com/zen-browser/desktop/issues/4342 | None | None |
+| [Windows] Videos crash in the second view | https://github.com/zen-browser/desktop/issues/4341 | 6:12:02 | None |
+| Page refresh | https://github.com/zen-browser/desktop/issues/4338 | 11:57:25 | None |
+| Expand Side's bar changes position of forward and backward buttons | https://github.com/zen-browser/desktop/issues/4336 | 12:19:39 | None |
+| breaks after using rectify11 and mica for everyone | https://github.com/zen-browser/desktop/issues/4335 | None | 3:03:08 |
+| Link "Zen support site" redirects to firefox support site | https://github.com/zen-browser/desktop/issues/4333 | 16:39:30 | 16:39:30 |
+| Opening discord keeps crashing the tab | https://github.com/zen-browser/desktop/issues/4332 | 0:24:48 | 0:24:48 |
+| space between essentials/tabs and the workspace title is different for default vs others | https://github.com/zen-browser/desktop/issues/4329 | None | 1 day, 0:42:55 |
+| Essential disappears, but it's still there | https://github.com/zen-browser/desktop/issues/4328 | 17:21:42 | 2 days, 3:52:35 |
+| Text in PDF is (still) distorted | https://github.com/zen-browser/desktop/issues/4327 | 1 day, 0:20:39 | 1 day, 0:20:39 |
+| Waiting since very long for Hold click to preview link | https://github.com/zen-browser/desktop/issues/4326 | 1 day, 1:18:24 | 1 day, 1:18:24 |
+| Can't close window by closing the last tab | https://github.com/zen-browser/desktop/issues/4325 | 0:50:23 | 1 day, 3:13:18 |
+| Zen Browser on MacOS is not restoring tabs after closing window | https://github.com/zen-browser/desktop/issues/4324 | 1 day, 3:29:13 | None |
+| Some videos can't play in Zen Browser | https://github.com/zen-browser/desktop/issues/4323 | 2 days, 14:26:03 | None |
+| Web panel pin button has wrong icon when clicking for the first time | https://github.com/zen-browser/desktop/issues/4322 | None | None |
+| Slow scrolling speed on the vertical tab bar in 1.6b | https://github.com/zen-browser/desktop/issues/4321 | 1:18:21 | 1 day, 5:19:47 |
+| browser.urlbar.suggest.topsites set to false make url cannot be edited | https://github.com/zen-browser/desktop/issues/4319 | 1 day, 3:38:03 | 2 days, 9:54:46 |
+| Tab volume icon not showing in collapsed toolbar unless tab is active | https://github.com/zen-browser/desktop/issues/4316 | None | 0:08:41 |
+| Profile avatar picture flashes and is overridden by firefox account avatar | https://github.com/zen-browser/desktop/issues/4315 | 8:16:31 | 8:16:31 |
+| Zen Browser Turn Light At Lost Focus | https://github.com/zen-browser/desktop/issues/4314 | 2 days, 4:11:22 | 5 days, 16:04:18 |
+| "Log-in to this network" modal & button not interactible | https://github.com/zen-browser/desktop/issues/4313 | None | None |
+| Sudden Crashes on Arch Linux with Multiple Tabs Opened | https://github.com/zen-browser/desktop/issues/4309 | 2:56:11 | None |
+| Since 1.6b, tab bar scrolls slowly and unpredictably when using a touchpad | https://github.com/zen-browser/desktop/issues/4307 | 2:14:54 | 13:01:41 |
+| Breaking Keyboard Shortcuts | https://github.com/zen-browser/desktop/issues/4306 | 2:00:54 | 4 days, 2:12:32 |
+| [TWILIGHT] New update has some bugs I've found so far | https://github.com/zen-browser/desktop/issues/4304 | 4:56:10 | 19 days, 5:12:42 |
+| blurry fonts on 32:9 aspect ratio | https://github.com/zen-browser/desktop/issues/4303 | 6:21:35 | None |
+| Checked Radio button UI issue | https://github.com/zen-browser/desktop/issues/4302 | 0:51:38 | None |
+| Firefox Home shortcut is turned off. | https://github.com/zen-browser/desktop/issues/4300 | 10:54:39 | None |
+| Unable to edit URL in address bar | https://github.com/zen-browser/desktop/issues/4299 | 9:46:51 | 23:24:13 |
+| Private Window New Tab is not showing blank page. | https://github.com/zen-browser/desktop/issues/4297 | None | None |
+| Essential Tabs URLs Disappear After Brew Update and Browser Restart | https://github.com/zen-browser/desktop/issues/4296 | 2 days, 12:54:19 | None |
+| Floating URL bar misplaced after opening Customize Toolbar | https://github.com/zen-browser/desktop/issues/4295 | 17:27:44 | None |
+| Unfocusing the browser with "widget.gtk.rounded-bottom-corners.enabled" causes the bottom corners to stop being rounded | https://github.com/zen-browser/desktop/issues/4294 | None | 12:46:25 |
+| Pin to toolbar text out of place on Mac | https://github.com/zen-browser/desktop/issues/4293 | None | None |
+| the slider on the home screen looks just like a dot when turned on | https://github.com/zen-browser/desktop/issues/4291 | None | None |
+| Closing the last tab in the only workspace should close the browser | https://github.com/zen-browser/desktop/issues/4289 | 2:29:09 | 19:14:35 |
+| Scrolling on touchpad broken | https://github.com/zen-browser/desktop/issues/4288 | None | 0:07:44 |
+| Sidebar behaving weird when compact mode is in "hide toolbar only" mode | https://github.com/zen-browser/desktop/issues/4287 | 1 day, 5:36:16 | 1 day, 23:15:29 |
+| Zen Beta (any version) is completely broken for me | https://github.com/zen-browser/desktop/issues/4286 | 0:28:01 | 21:07:29 |
+| Previous and Next page buttons switched | https://github.com/zen-browser/desktop/issues/4285 | 0:34:35 | 0:34:35 |
+| Random crash after using the browser for some time. | https://github.com/zen-browser/desktop/issues/4284 | None | None |
+| Even if you have recent activity turned on in the settings, it will be turned off the next time you start Zen Browser. | https://github.com/zen-browser/desktop/issues/4283 | 0:04:23 | None |
+| [windows only] wired orange-ish background in new version | https://github.com/zen-browser/desktop/issues/4281 | 0:01:44 | 0:01:44 |
+| Blurred fonts on Webpages | https://github.com/zen-browser/desktop/issues/4280 | 0:55:49 | 0:55:49 |
+| Customize Toolbar breaks the browser layout | https://github.com/zen-browser/desktop/issues/4279 | 1:37:10 | None |
+| When second window is opened, Essential tabs are not visible for this window | https://github.com/zen-browser/desktop/issues/4278 | None | None |
+| Frame color is grey instead of light or dark themed | https://github.com/zen-browser/desktop/issues/4277 | 13:26:52 | 9 days, 19:55:41 |
+| Tab styling bug | https://github.com/zen-browser/desktop/issues/4276 | None | 4:32:10 |
+| Vertical Toolbar Resizing | https://github.com/zen-browser/desktop/issues/4275 | 1:10:26 | 5:40:14 |
+| Scoll Bar has lower scroll factor. | https://github.com/zen-browser/desktop/issues/4274 | 8:35:00 | 8:35:00 |
+| Closing last tab does not close browser | https://github.com/zen-browser/desktop/issues/4273 | 9:04:24 | 12:10:08 |
+| I can't disable workspaces anymore | https://github.com/zen-browser/desktop/issues/4272 | 0:10:05 | 13:14:51 |
+| Why there is strange styling / background color on some of the pages? | https://github.com/zen-browser/desktop/issues/4271 | None | 0:12:17 |
+| Customize Toolbar not saving changes upon relaunch. | https://github.com/zen-browser/desktop/issues/4270 | 2 days, 0:05:19 | None |
+| White line at the bottom | https://github.com/zen-browser/desktop/issues/4269 | None | None |
+| History / recently visited pages list contains only icons, no names or adresses | https://github.com/zen-browser/desktop/issues/4265 | 2 days, 21:24:58 | None |
+| Weird color highlight when window is in focus | https://github.com/zen-browser/desktop/issues/4264 | 1 day, 4:13:23 | 1 day, 20:39:36 |
+| Workspaces | https://github.com/zen-browser/desktop/issues/4263 | None | 2:26:35 |
+| Audio indicator not showing for sites playing audio when not chosen | https://github.com/zen-browser/desktop/issues/4262 | None | None |
+| Theme color | https://github.com/zen-browser/desktop/issues/4261 | 0:11:52 | 3 days, 0:13:33 |
+| Performance lag/FPS drops on HP Spectre laptop only | https://github.com/zen-browser/desktop/issues/4260 | None | None |
+| Browser window colors change when window is inactive/unfocused | https://github.com/zen-browser/desktop/issues/4258 | 1 day, 7:13:53 | 0:08:23 |
+| Each update requires the binary to be re-downloaded. | https://github.com/zen-browser/desktop/issues/4257 | None | None |
+| Workspaces button (above tabs) does not hide even tho I have only one workspace. | https://github.com/zen-browser/desktop/issues/4256 | 0:39:33 | 2 days, 0:19:16 |
+| Keyboard Shortcuts reset everytime I open the browser | https://github.com/zen-browser/desktop/issues/4255 | 8:48:29 | 2 days, 3:25:34 |
+| When opening a new window, inned tabs are also reopen in the new window (tho some become "New Tab"). | https://github.com/zen-browser/desktop/issues/4254 | None | None |
+| Back and Forward buttons moved to the right and flipped | https://github.com/zen-browser/desktop/issues/4253 | 12:03:43 | 0:11:45 |
+| Web Developer Tools missing labels in collapsed toolbar. | https://github.com/zen-browser/desktop/issues/4252 | None | None |
+| Can't change location in the weather widget | https://github.com/zen-browser/desktop/issues/4250 | 3 days, 18:40:41 | None |
+| Tabs crashing randomlly | https://github.com/zen-browser/desktop/issues/4249 | 3 days, 11:21:20 | None |
+| Freesync broken in fullscreen | https://github.com/zen-browser/desktop/issues/4248 | None | None |
+| Floating URL touchpad switch workspace | https://github.com/zen-browser/desktop/issues/4246 | None | None |
+| Page open. No  Tab in tab bar. | https://github.com/zen-browser/desktop/issues/4244 | None | 12 days, 20:38:18 |
+| Sidebar not working properly. | https://github.com/zen-browser/desktop/issues/4242 | 10:58:19 | 1 day, 6:06:30 |
+| Why are the tabs on the right? | https://github.com/zen-browser/desktop/issues/4241 | 3:53:16 | 9 days, 21:54:56 |
+| Shortcuts for cycling workspaces are not working on non-English keyboard layout | https://github.com/zen-browser/desktop/issues/4240 | 14:14:25 | None |
+| Unsetting some keyboard shortcuts causes the application to get stuck in the splash screen. | https://github.com/zen-browser/desktop/issues/4238 | 4 days, 17:04:39 | 4 days, 17:04:38 |
+| Google's access speed is very slow, other browsers open at the same time, no problem! | https://github.com/zen-browser/desktop/issues/4237 | None | None |
+| Bookmark cannot deleted/edit when the the name starts with "?..." | https://github.com/zen-browser/desktop/issues/4236 | None | None |
+| I set the startup page to be a blank page; browser never responds. | https://github.com/zen-browser/desktop/issues/4235 | 19 days, 4:19:18 | None |
+| bug: In `compact mode` the `user account` icon in top bar is broken after first click - 1.0.2-b.5 (Firefox 133.0.3) | https://github.com/zen-browser/desktop/issues/4232 | 1 day, 11:10:39 | 2 days, 6:06:01 |
+| screencast is not working underwayland | https://github.com/zen-browser/desktop/issues/4231 | 16 days, 20:54:10 | None |
+| gradient theme color disappears | https://github.com/zen-browser/desktop/issues/4230 | 4 days, 12:17:20 | None |
+| Autofilling not working in some webpages | https://github.com/zen-browser/desktop/issues/4229 | None | 2 days, 14:08:32 |
+| Not possible to use CTRL + F on a web panel | https://github.com/zen-browser/desktop/issues/4228 | None | None |
+| Switch workspace animation without workspaces | https://github.com/zen-browser/desktop/issues/4227 | None | None |
+| Command Option L always opens inspector despite keyboard shortcut setting | https://github.com/zen-browser/desktop/issues/4224 | 2 days, 13:08:20 | 4 days, 12:27:38 |
+| Webgl applications not working. | https://github.com/zen-browser/desktop/issues/4223 | 1:45:58 | None |
+| Pins syncing across windows | https://github.com/zen-browser/desktop/issues/4222 | 2 days, 23:53:53 | 15 days, 21:21:10 |
+| URL/Title bar can be scrolled up on Windows | https://github.com/zen-browser/desktop/issues/4220 | 5 days, 1:26:35 | None |
+| [Linux][tarball] Twilight - Can't update/wrong notification | https://github.com/zen-browser/desktop/issues/4219 | 0:15:28 | 0:15:28 |
+| [Linux][Flatpak] Light/Dark Theme settings not respected | https://github.com/zen-browser/desktop/issues/4217 | 0:49:02 | 1:47:37 |
+| cant close side menu and back and forward buttons swapped. | https://github.com/zen-browser/desktop/issues/4216 | 12:38:36 | None |
+| MacOS CMD+Shift+L opens Dev Tools | https://github.com/zen-browser/desktop/issues/4215 | 1:48:05 | 1:48:05 |
+| Dark mode problem | https://github.com/zen-browser/desktop/issues/4214 | 2:02:31 | 2:02:35 |
+| Unwanted separation in zen | https://github.com/zen-browser/desktop/issues/4213 | 2:48:23 | 2:48:23 |
+| ctrl+shift+c not working | https://github.com/zen-browser/desktop/issues/4212 | 1:02:17 | 2:59:00 |
+| Black screen on launch | https://github.com/zen-browser/desktop/issues/4211 | 2:12:26 | 5:25:52 |
+| When adding 2500 Tabs to the essentials section the browser becomes unresponsive | https://github.com/zen-browser/desktop/issues/4210 | 3:34:59 | None |
+| [Bug] Minimize & Maximize buttons are not visible in Title bar | https://github.com/zen-browser/desktop/issues/4209 | 22:13:45 | None |
+| Vertical tab bar isn't working as expected | https://github.com/zen-browser/desktop/issues/4208 | 7:06:10 | None |
+| thinks that there is an update available / failed | https://github.com/zen-browser/desktop/issues/4207 | 0:12:57 | 0:12:57 |
+| Compact Bar Doesn't Fully Close | https://github.com/zen-browser/desktop/issues/4205 | 3:18:39 | 3:18:39 |
+| twilight: release note link does not go to the right page | https://github.com/zen-browser/desktop/issues/4203 | 13:07:36 | 13:07:36 |
+| Update pop up failed on twilight | https://github.com/zen-browser/desktop/issues/4202 | 0:12:04 | 0:25:02 |
+| Auto-filling passwords is broken for any website on MacOS | https://github.com/zen-browser/desktop/issues/4201 | 1 day, 10:59:13 | 0:13:22 |
+| Test | https://github.com/zen-browser/desktop/issues/4199 | None | 0:00:13 |
+| If site opens tab using JS, and you switch workspace, it opens in wrong workspace | https://github.com/zen-browser/desktop/issues/4197 | None | None |
+| Resetting keyboard shortcuts not reflected in the UI | https://github.com/zen-browser/desktop/issues/4194 | None | None |
+| Fetch requests not showing in the Network panel | https://github.com/zen-browser/desktop/issues/4192 | 4 days, 12:19:17 | None |
+| Search bar overlapping essentials area bug | https://github.com/zen-browser/desktop/issues/4191 | 20:07:09 | 20:07:09 |
+| url bar is sized wrong when not in compact mode | https://github.com/zen-browser/desktop/issues/4190 | 10:45:50 | 10:45:50 |
+| Compact mode sidebar trigger area is too wide (macOS) | https://github.com/zen-browser/desktop/issues/4189 | 15:13:53 | 15:13:53 |
+| Install Add-on From File... | https://github.com/zen-browser/desktop/issues/4186 | None | None |
+| Arrangement of back & forward arrows changes after toggling the sidebar's width | https://github.com/zen-browser/desktop/issues/4185 | None | None |
+| Workspaces bar problems on toolbar | https://github.com/zen-browser/desktop/issues/4183 | 10 days, 6:32:09 | None |
+| "Breakpoint A breakpoint has been reached." | https://github.com/zen-browser/desktop/issues/4181 | 3 days, 2:30:20 | None |
+| (Detailed Report) Using Ctrl+Tab to switch from splitted tabs to other tabs only works for tabs adjacent to the last split if "change tabs on hover" is turned on | https://github.com/zen-browser/desktop/issues/4180 | None | None |
+| unloaded tabs with unsaved changes cannot be opened | https://github.com/zen-browser/desktop/issues/4179 | 15 days, 8:16:21 | None |
+| broken page background on some sites | https://github.com/zen-browser/desktop/issues/4178 | 1 day, 0:42:21 | 7 days, 5:35:11 |
+| Deleting certain keyboard shortcuts crashes the file on restart | https://github.com/zen-browser/desktop/issues/4177 | 3 days, 13:52:28 | 7 days, 12:06:28 |
+| Disabeling forward/backward mouse buttons for switching workspaces und trigger back/forward of current website. | https://github.com/zen-browser/desktop/issues/4176 | 10 days, 2:11:24 | None |
+| A Silly White Line Appears At The Top Of The Browser Window In Windows | https://github.com/zen-browser/desktop/issues/4175 | 1 day, 23:59:40 | 1 day, 23:59:40 |
+| Zooming in PDF viewer is not working when using scrollwheel click to scroll throught PDF | https://github.com/zen-browser/desktop/issues/4173 | 3 days, 2:26:50 | None |
+| compact mode tabs flickers when cursor is on window border | https://github.com/zen-browser/desktop/issues/4172 | None | None |
+| Since the app is no longer in beta, the app shouldn't use strings with 'beta' in it and replace those with a normal string such as "Zen Browser". | https://github.com/zen-browser/desktop/issues/4171 | 0:12:14 | 0:19:44 |
+| Linux version doesn't use the system proxy | https://github.com/zen-browser/desktop/issues/4170 | 10 days, 23:13:16 | None |
+| Reordering Essentials is weird | https://github.com/zen-browser/desktop/issues/4169 | 3 days, 8:53:15 | 8 days, 3:19:28 |
+| Duplicate preferences for "Use themed...." | https://github.com/zen-browser/desktop/issues/4166 | None | 0:02:33 |
+| Entering compact mode on one window engages compact mode on all windows | https://github.com/zen-browser/desktop/issues/4165 | 17 days, 6:17:00 | 17 days, 6:17:00 |
+| Bug: Unable to perform a search, tab stuck on loading | https://github.com/zen-browser/desktop/issues/4160 | None | 1:30:36 |
+| Windows 11 - Compact Mode - Hide Tab Bar - Doesn't hide if using touch | https://github.com/zen-browser/desktop/issues/4157 | None | None |
+| just goes blank when i decide to open new tab | https://github.com/zen-browser/desktop/issues/4156 | None | None |
+| decoding problem "i think" | https://github.com/zen-browser/desktop/issues/4155 | None | None |
+| Performance And Black Squares Issue | https://github.com/zen-browser/desktop/issues/4154 | None | None |
+| the design of the "new tab" button does not allow it to be distinguished properly | https://github.com/zen-browser/desktop/issues/4153 | 0:20:19 | None |
+| Pinned tabs do not Refresh Automatically after browser restart | https://github.com/zen-browser/desktop/issues/4152 | 3 days, 4:53:05 | None |
+| Startup load broken | https://github.com/zen-browser/desktop/issues/4151 | None | 0:06:12 |
+| An intuitive problem with the automatic theme (light/dark) | https://github.com/zen-browser/desktop/issues/4150 | None | None |
+| Zen keeps resetting Home page every so often | https://github.com/zen-browser/desktop/issues/4148 | 12 days, 1:40:29 | None |
+| Bookmarks toolbar blank on single toolbar layout | https://github.com/zen-browser/desktop/issues/4146 | 1:28:06 | 1 day, 20:15:55 |
+| UI Bug: Wrong aspect ratio in tab switcher on ultra wide screens (32:9) | https://github.com/zen-browser/desktop/issues/4144 | None | None |
+| pdf.js jumps across pages when activating annonation tools | https://github.com/zen-browser/desktop/issues/4143 | None | None |
+| A black bar appeared at the top of the browser. | https://github.com/zen-browser/desktop/issues/4137 | 1:08:53 | 1:08:53 |
+| --zen-primary-color affecting Zen about pages | https://github.com/zen-browser/desktop/issues/4135 | 0:34:32 | 0:34:32 |
+| Essentials load in wrong container when opening new window with different workspace | https://github.com/zen-browser/desktop/issues/4134 | 1 day, 4:39:10 | 9 days, 21:24:46 |
+| Container Indicator Issue | https://github.com/zen-browser/desktop/issues/4132 | 0:15:50 | 1:36:18 |
+| Bookmarks Separator Issue | https://github.com/zen-browser/desktop/issues/4131 | 6:20:17 | None |
+| Bookmarks Modal Issue | https://github.com/zen-browser/desktop/issues/4130 | 0:19:20 | 1:37:35 |
+| Bookmarks Random Appearing Issue | https://github.com/zen-browser/desktop/issues/4129 | 6:25:12 | 28 days, 23:29:22 |
+| Bookmarks FOUC Type Issue | https://github.com/zen-browser/desktop/issues/4128 | 6:28:48 | None |
+| Shortcuts Issue When Second Window Is Used: | https://github.com/zen-browser/desktop/issues/4127 | 4 days, 0:15:45 | 4 days, 0:15:45 |
+| Essentials & Pinned Disappear With Second Window | https://github.com/zen-browser/desktop/issues/4126 | 3:18:35 | None |
+| Can't install themes with nightly | https://github.com/zen-browser/desktop/issues/4124 | 9 days, 23:09:45 | 9 days, 23:11:39 |
+| pid changes on boot | https://github.com/zen-browser/desktop/issues/4122 | 0:50:20 | 0:50:20 |
+| Download fails if you delete a random file while downloading | https://github.com/zen-browser/desktop/issues/4120 | 7:44:40 | 7:59:19 |
+| Zen asks to be the default browser every time after recent update. | https://github.com/zen-browser/desktop/issues/4118 | 7:20:20 | 2 days, 14:22:58 |
+| Popups partially hidden when on sidebar | https://github.com/zen-browser/desktop/issues/4117 | 12:56:59 | 12:56:59 |
+| [Twilight] Not seeing search for emojis for workspaces like mentioned in release notes | https://github.com/zen-browser/desktop/issues/4114 | 8:04:36 | 8:04:35 |
+| Themes installed from Firefox store don't do anything | https://github.com/zen-browser/desktop/issues/4113 | 5 days, 19:00:45 | None |
+| Misplaced Footer on Websites | https://github.com/zen-browser/desktop/issues/4112 | 0:01:36 | 0:34:51 |
+| A weird bar appears randomly stopping the user from switching tabs | https://github.com/zen-browser/desktop/issues/4111 | 0:07:57 | None |
+| Sidebar tries to handle event when trying to dismiss toast message | https://github.com/zen-browser/desktop/issues/4110 | 4:08:06 | None |
+| pages are not saving | https://github.com/zen-browser/desktop/issues/4109 | 14:28:07 | 14:28:07 |
+| Issue with Toolbar Pinning/Unpinning Affecting Sidebar Width in Zen Browser | https://github.com/zen-browser/desktop/issues/4108 | 19 days, 11:38:38 | 19 days, 11:38:38 |
+| Doesn't download video after "save video as" button | https://github.com/zen-browser/desktop/issues/4106 | 0:24:18 | 1 day, 8:44:52 |
+| Random bar when moving mouse to the top | https://github.com/zen-browser/desktop/issues/4105 | 0:28:07 | 19 days, 14:14:16 |
+| Overflow menu is permanently shown with only Customize Toolbar | https://github.com/zen-browser/desktop/issues/4104 | None | 0:02:52 |
+| Opens a weird tab after closing all tabs | https://github.com/zen-browser/desktop/issues/4103 | 1 day, 0:01:43 | 1 day, 0:01:43 |
+| Horizontal tab layout when supposed to be vertical | https://github.com/zen-browser/desktop/issues/4102 | None | 0:09:22 |
+| Unable to click on back button due to overlapping of the tab sidebar under `Multiple Toolbars` layout | https://github.com/zen-browser/desktop/issues/4100 | 4:11:09 | None |
+| Toolbar rendering issue while browser is in Foreground | https://github.com/zen-browser/desktop/issues/4099 | 1:56:07 | 1:56:07 |
+| Video playback stops when toggling mono audio | https://github.com/zen-browser/desktop/issues/4098 | None | None |
+
+_This report was generated with the [Issue Metrics Action](https://github.com/github/issue-metrics)_
+Search query used to find these items: `repo:zen-browser/desktop is:issue created:2025-01-01..2025-01-31`

From faff428afbb185faa3f54686c87112ccc64537fa Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 1 Feb 2025 10:32:53 +0100
Subject: [PATCH 021/191] Update Linux build artifacts to use .tar.xz format

---
 .github/workflows/build.yml               | 20 ++++++++++----------
 .github/workflows/linux-release-build.yml |  6 +++---
 flatpak/app.zen_browser.zen.yml.template  |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 554e2ba13..2e87ae48f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -407,7 +407,7 @@ jobs:
       - name: Download Linux build
         uses: actions/download-artifact@v4
         with:
-          name: zen.linux-${{ matrix.arch }}.tar.bz2
+          name: zen.linux-${{ matrix.arch }}.tar.xz
 
       - name: Execute AppImage build
         run: |
@@ -547,8 +547,8 @@ jobs:
         with:
           files: |
             zen.source.tar.zst
-            zen.linux-x86_64.tar.bz2
-            zen.linux-aarch64.tar.bz2
+            zen.linux-x86_64.tar.xz
+            zen.linux-aarch64.tar.xz
             zen-x86_64.AppImage
             zen-x86_64.AppImage.zsync
             zen-aarch64.AppImage
@@ -581,8 +581,8 @@ jobs:
           title: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
             zen.source.tar.zst
-            zen.linux-x86_64.tar.bz2
-            zen.linux-aarch64.tar.bz2
+            zen.linux-x86_64.tar.xz
+            zen.linux-aarch64.tar.xz
             zen-x86_64.AppImage
             zen-x86_64.AppImage.zsync
             zen-aarch64.AppImage
@@ -674,12 +674,12 @@ jobs:
       - name: Download Linux x86_64 build
         uses: actions/download-artifact@v4
         with:
-          name: zen.linux-x86_64.tar.bz2
+          name: zen.linux-x86_64.tar.xz
 
       - name: Download Linux aarch64 build
         uses: actions/download-artifact@v4
         with:
-          name: zen.linux-aarch64.tar.bz2
+          name: zen.linux-aarch64.tar.xz
 
       - name: Update repository
         uses: actions/checkout@v4
@@ -701,8 +701,8 @@ jobs:
           python3 ./zen-browser/scripts/prepare-flatpak-release.py \
             --flatpak-archive archive.tar \
             --version ${{ needs.build-data.outputs.version }} \
-            --linux-archive zen.linux-x86_64.tar.bz2 \
-            --linux-aarch64-archive zen.linux-aarch64.tar.bz2 \
+            --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
 
@@ -715,7 +715,7 @@ jobs:
         run: |
           rm -rf zen-browser
           rm -rf archive.tar
-          rm -rf zen.linux-x86_64.tar.bz2
+          rm -rf zen.linux-x86_64.tar.xz
 
       - name: Upload Flatpak manifest
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index db4aa4667..ab28b19b8 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -150,15 +150,15 @@ jobs:
 
       - name: Rename artifacts
         run: |
-          mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.arch }}.tar.bz2"
+          mv dist/zen-*.tar.xz "zen.linux-${{ matrix.arch }}.tar.xz"
           mv dist/output.mar linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
 
       - name: Upload build artifact (binary)
         uses: actions/upload-artifact@v4
         with:
           retention-days: 5
-          name: zen.linux-${{ matrix.arch }}.tar.bz2
-          path: ./zen.linux-${{ matrix.arch }}.tar.bz2
+          name: zen.linux-${{ matrix.arch }}.tar.xz
+          path: ./zen.linux-${{ matrix.arch }}.tar.xz
 
       - name: Upload build artifact (.mar)
         uses: actions/upload-artifact@v4
diff --git a/flatpak/app.zen_browser.zen.yml.template b/flatpak/app.zen_browser.zen.yml.template
index 8c76a831c..a8f5adeac 100644
--- a/flatpak/app.zen_browser.zen.yml.template
+++ b/flatpak/app.zen_browser.zen.yml.template
@@ -44,14 +44,14 @@ modules:
 
     sources:
       - type: archive
-        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-x86_64.tar.bz2
+        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-x86_64.tar.xz
         sha256: {linux_sha256}
         strip-components: 0
         only-arches:
           - x86_64
 
       - type: archive
-        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-aarch64.tar.bz2
+        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-aarch64.tar.xz
         sha256: {linux_aarch64_sha256}
         strip-components: 0
         only-arches:

From c47c140489fe77e9683b716965248edacff282d7 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 1 Feb 2025 11:32:32 +0100
Subject: [PATCH 022/191] Refactor zen-glance animation and improve tab context
 handling

---
 .../base/content/zen-styles/zen-glance.css    |  4 +--
 .../base/zen-components/ZenGlanceManager.mjs  | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index d920af515..20b0f0e24 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -108,9 +108,7 @@
     }
 
     &[animate-full='true'] {
-      opacity: 1;
-      animation: zen-glance-buttons-animation-full 0.2s ease-in-out forwards !important;
-
+      transform: translate(-50%, -50%);
       & #zen-glance-sidebar-container {
         opacity: 0 !important;
       }
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 1e703078d..e03b3da00 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -67,7 +67,9 @@
       };
       this.currentParentTab = currentTab;
       const newTab = existingTab ?? gBrowser.addTrustedTab(Services.io.newURI(url).spec, newTabOptions);
-
+      if (currentTab.hasAttribute('zenDefaultUserContextId')) {
+        newTab.setAttribute('zenDefaultUserContextId', true);
+      }
       gBrowser.selectedTab = newTab;
       currentTab.querySelector('.tab-content').appendChild(newTab);
       newTab.setAttribute('zen-glance-tab', true);
@@ -89,7 +91,6 @@
       this.browserWrapper?.removeAttribute('animate');
       this.browserWrapper?.removeAttribute('animate-end');
       this.browserWrapper?.removeAttribute('animate-full');
-      this.browserWrapper?.removeAttribute('animate-full-end');
       this.browserWrapper?.removeAttribute('has-finished-animation');
       this.overlay?.removeAttribute('post-fade-out');
 
@@ -363,16 +364,19 @@
       this.#currentTab.removeAttribute('zen-glance-tab');
       gBrowser.selectedTab = this.#currentTab;
       this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
-      setTimeout(() => {
-        window.requestAnimationFrame(() => {
-          this.browserWrapper.setAttribute('animate-full-end', true);
-          this.overlay.classList.remove('zen-glance-overlay');
-          setTimeout(() => {
-            this.animatingFullOpen = false;
-            this.closeGlance({ noAnimation: true });
-          }, 600);
-        });
-      }, 300);
+      gZenUIManager.motion.animate(this.browserWrapper, {
+        width: ['85%', '100%'],
+        height: ['100%', '100%'],
+      }, {
+        duration: 0.4,
+        type: 'spring',
+      }).then(() => {
+        this.browserWrapper.removeAttribute('animate-full');
+        this.overlay.classList.remove('zen-glance-overlay');
+        this.browserWrapper.removeAttribute('style');
+        this.animatingFullOpen = false;
+        this.closeGlance({ noAnimation: true });
+      });
     }
 
     openGlanceForBookmark(event) {

From 3e89b1dae62f28a5db5aceddd20ec396b8d6173c Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 1 Feb 2025 17:29:32 +0100
Subject: [PATCH 023/191] Disable tab hover preview and clean up animation code
 in ZenGlanceManager

---
 src/browser/app/profile/zen-browser.js        |  4 +--
 .../base/zen-components/ZenGlanceManager.mjs  | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 0fe55448f..9f74b51a5 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -8,9 +8,7 @@
   #endif
 #endif
 
-pref("browser.tabs.cardPreview.enabled", true);
-pref("browser.tabs.hoverPreview.enabled", true);
-pref("browser.tabs.cardPreview.delayMs", 100);
+pref("browser.tabs.hoverPreview.enabled", false);
 
 #ifdef MOZ_UPDATE_CHANNEL
 pref("devtools.debugger.prompt-connection", true);
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index e03b3da00..38fc44495 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -364,19 +364,25 @@
       this.#currentTab.removeAttribute('zen-glance-tab');
       gBrowser.selectedTab = this.#currentTab;
       this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
-      gZenUIManager.motion.animate(this.browserWrapper, {
-        width: ['85%', '100%'],
-        height: ['100%', '100%'],
-      }, {
-        duration: 0.4,
-        type: 'spring',
-      }).then(() => {
-        this.browserWrapper.removeAttribute('animate-full');
-        this.overlay.classList.remove('zen-glance-overlay');
-        this.browserWrapper.removeAttribute('style');
-        this.animatingFullOpen = false;
-        this.closeGlance({ noAnimation: true });
-      });
+      gZenUIManager.motion
+        .animate(
+          this.browserWrapper,
+          {
+            width: ['85%', '100%'],
+            height: ['100%', '100%'],
+          },
+          {
+            duration: 0.4,
+            type: 'spring',
+          }
+        )
+        .then(() => {
+          this.browserWrapper.removeAttribute('animate-full');
+          this.overlay.classList.remove('zen-glance-overlay');
+          this.browserWrapper.removeAttribute('style');
+          this.animatingFullOpen = false;
+          this.closeGlance({ noAnimation: true });
+        });
     }
 
     openGlanceForBookmark(event) {

From e39419af25693b32d64dceebd639e63b3d5fa396 Mon Sep 17 00:00:00 2001
From: EmilyxFox <48589793+EmilyxFox@users.noreply.github.com>
Date: Sat, 1 Feb 2025 22:42:01 +0100
Subject: [PATCH 024/191] fix indentation woops

---
 .../base/zen-components/ZenCommonUtils.mjs    | 24 +++++++++----------
 .../zen-components/ZenKeyboardShortcuts.mjs   | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index 16adcee0d..ad4fc1805 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -73,18 +73,18 @@ var gZenCommonActions = {
     }
   },
   CopyCurrentURLAsMarkdownToClipboard() {
-    const currentUrl = gBrowser.currentURI.spec;
-    const tabTitle = gBrowser.selectedTab.label;
-    if (currentUrl && tabTitle) {
-        const markdownLink = `[${tabTitle}](${currentUrl})`
-        let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-        str.data = markdownLink;
-        let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
-        transferable.init(getLoadContext());
-        transferable.addDataFlavor('text/plain');
-        transferable.setTransferData('text/plain', str);
-        Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-        ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+    const currentTabs = gZenViewSplitter.getTabsInCurrentView()
+    if (currentTabs) {
+      const stringArray = currentTabs.map(t => `[${t.label}](${t.linkedBrowser.currentURI.spec})`)
+      const markdownString = stringArray.join("\n")
+      let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
+      str.data = markdownString;
+      let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
+      transferable.init(getLoadContext());
+      transferable.addDataFlavor('text/plain');
+      transferable.setTransferData('text/plain', str);
+      Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
+      ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
     }
   },
 
diff --git a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
index c41273e88..8cd251b42 100644
--- a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
+++ b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
@@ -909,19 +909,19 @@ class ZenKeyboardShortcutsVersioner {
       window.addEventListener('zen-devtools-keyset-added', listener);
     }
     if (version < 8) {
-        // Migrate from 7 to 8
-        // In this new version, we add the "Copy URL as Markdown" shortcut to the default shortcuts
-        data.push(
-            new KeyShortcut(
-                'zen-copy-url-markdown',
-                'C',
-                '',
-                ZEN_OTHER_SHORTCUTS_GROUP,
-                KeyShortcutModifiers.fromObject({ accel: true, shift: true, alt: true }),
-                'code:gZenCommonActions.CopyCurrentURLAsMarkdownToClipboard()',
-                'zen-text-action-copy-url-markdown-shortcut'
-              )
+      // Migrate from 7 to 8
+      // In this new version, we add the "Copy URL as Markdown" shortcut to the default shortcuts
+      data.push(
+        new KeyShortcut(
+          'zen-copy-url-markdown',
+          'C',
+          '',
+          ZEN_OTHER_SHORTCUTS_GROUP,
+          KeyShortcutModifiers.fromObject({ accel: true, shift: true, alt: true }),
+          'code:gZenCommonActions.CopyCurrentURLAsMarkdownToClipboard()',
+          'zen-text-action-copy-url-markdown-shortcut'
         )
+      )
     }
     return data;
   }

From b8aa560d527718eb1c11157cd14f543be47380c1 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 1 Feb 2025 22:53:21 +0100
Subject: [PATCH 025/191] Glance can now be on multiple tabs and improved
 animations

---
 src/browser/base/content/ZenUIManager.mjs     |   4 +-
 src/browser/base/content/zen-glance.inc.xhtml |   6 +-
 .../content/zen-styles/zen-animations.css     |  70 -----
 .../base/content/zen-styles/zen-glance.css    |  93 ++----
 .../zen-styles/zen-tabs/vertical-tabs.css     |  15 +-
 .../base/zen-components/ZenGlanceManager.mjs  | 295 ++++++++++++------
 .../actors/ZenGlanceChild.sys.mjs             |   2 +-
 .../tabbrowser/content/tabbrowser-js.patch    |  31 +-
 .../tabbrowser/content/tabs-js.patch          |   4 +-
 9 files changed, 263 insertions(+), 257 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 082d98206..009c70fb0 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -86,9 +86,7 @@ var gZenUIManager = {
   },
 
   generateUuidv4() {
-    return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, (c) =>
-      (+c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (+c / 4)))).toString(16)
-    );
+    return Services.uuid.generateUUID().toString();
   },
 
   toogleBookmarksSidebar() {
diff --git a/src/browser/base/content/zen-glance.inc.xhtml b/src/browser/base/content/zen-glance.inc.xhtml
index 61c7bf385..64d5a0703 100644
--- a/src/browser/base/content/zen-glance.inc.xhtml
+++ b/src/browser/base/content/zen-glance.inc.xhtml
@@ -1,4 +1,4 @@
-<vbox id="zen-glance-sidebar-container">
-  <toolbarbutton id="zen-glance-sidebar-close" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance()"/>
+<vbox id="zen-glance-sidebar-container" hidden="true">
+  <toolbarbutton id="zen-glance-sidebar-close" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance({ onTabClose: true })"/>
   <toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1" oncommand="gZenGlanceManager.fullyOpenGlance()"/>
-</vbox>
\ No newline at end of file
+</vbox>
diff --git a/src/browser/base/content/zen-styles/zen-animations.css b/src/browser/base/content/zen-styles/zen-animations.css
index 01c231662..067582958 100644
--- a/src/browser/base/content/zen-styles/zen-animations.css
+++ b/src/browser/base/content/zen-styles/zen-animations.css
@@ -227,76 +227,6 @@
   }
 }
 
-@keyframes zen-glance-content-animation-out {
-  0% {
-    /* make the box shrink to final width/height and x/y coordinates */
-    transform: translate(-50%, -50%) translateZ(0);
-    width: 85%;
-    height: 100%;
-    top: 50%;
-    left: 50%;
-    opacity: 1;
-  }
-
-  100% {
-    /* make the box appear from initial width/height and x/y coordinates */
-    transform: translate(-50%, -50%) translateZ(0);
-    opacity: 0;
-    width: 47%;
-    height: 53%;
-    top: 50%;
-    left: 50%;
-    opacity: 0;
-  }
-}
-
-@keyframes zen-glance-buttons-animation-full {
-  from {
-    width: 85%;
-    height: 85%;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  to {
-    width: 100%;
-    height: 100%;
-    top: 50%;
-    left: 50%;
-    opacity: 1;
-    transform: translate(-50%, -50%);
-  }
-}
-
-@keyframes zen-glance-loading-animation {
-  0% {
-    opacity: 1;
-    width: 80%;
-  }
-
-  90% {
-    width: 100%;
-  }
-
-  100% {
-    opacity: 0;
-  }
-}
-
-@keyframes zen-glance-buttons-animation {
-  from {
-    right: 0;
-    opacity: 0;
-    width: fit-content;
-  }
-
-  to {
-    opacity: 1;
-    transform: translateX(-100%) translateY(-50%);
-  }
-}
-
 @keyframes zen-rice-form-out {
   0% {
     transform: translateX(0);
diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index 20b0f0e24..9256ef1f2 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -23,27 +23,38 @@
   }
 }
 
-.browserSidebarContainer.zen-glance-overlay {
-  box-shadow: none !important;
+#zen-glance-sidebar-container {
+  position: absolute;
+  display: flex;
+  z-index: 999;
 
-  &[fade-out='true'] {
-    background: transparent;
-    opacity: 1;
+  &[hidden='true'] {
+    display: none;
+  }
 
-    & .browserContainer {
-      opacity: 1;
-      animation: zen-glance-content-animation-out 0.3s ease-in-out forwards !important;
+  top: 10%;
+  transform: translateY(-50%);
 
-      & browser {
-        opacity: 1 !important;
-      }
+  padding: 5px;
+  gap: 12px;
+  right: 1%;
 
-      & #zen-glance-sidebar-container {
-        opacity: 0;
-        transition: opacity 0.1s ease-in-out;
-      }
+  & toolbarbutton {
+    width: 32px;
+    height: 32px;
+    background: var(--zen-dialog-background);
+    border-radius: 999px;
+    appearance: none;
+    box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.07);
+
+    & label {
+      display: none;
     }
   }
+}
+
+.browserSidebarContainer.zen-glance-overlay {
+  box-shadow: none !important;
 
   & .browserContainer {
     background: var(--zen-dialog-background);
@@ -69,37 +80,6 @@
       overflow: hidden;
     }
 
-    & #zen-glance-sidebar-container {
-      position: absolute;
-      display: flex;
-      top: 10%;
-      left: 0;
-      transform: translateY(-50%);
-      opacity: 0;
-      background: var(--zen-dialog-background);
-
-      border: 1px solid var(--zen-colors-border);
-      border-right: none;
-
-      border-top-left-radius: var(--zen-native-inner-radius);
-      border-bottom-left-radius: var(--zen-native-inner-radius);
-
-      padding: 5px;
-      gap: 6px;
-
-      animation: zen-glance-buttons-animation 0.2s ease-in-out forwards;
-      animation-delay: 0.3s;
-
-      & toolbarbutton {
-        width: 32px;
-        height: 32px;
-
-        & label {
-          display: none;
-        }
-      }
-    }
-
     & browser {
       width: 100%;
       height: 100%;
@@ -116,22 +96,13 @@
 
     &[animate='true'] {
       position: absolute;
-      transform: translate(-50%, -50%);
+    }
+  }
 
-      &:not([animate-end='true']) {
-        pointer-events: none;
-
-        & browser {
-          opacity: 0;
-          visibility: hidden;
-        }
-
-        & #zen-glance-sidebar-container {
-          opacity: 0;
-          animation: none;
-          pointer-events: none;
-        }
-      }
+  &[fade-out='true'] {
+    & browser {
+      transition: opacity 0.1s ease;
+      opacity: 0;
     }
   }
 }
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 288b7d524..e17e45800 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -311,14 +311,23 @@
     /* We have a tab inside a tab, this means, it's a glance tab */
     & .tabbrowser-tab {
       pointer-events: none;
-      margin: 0;
+      margin: 0 0 0 4px;
       --toolbarbutton-inner-padding: 0;
       --border-radius-medium: 8px;
+      width: 24px;
+      height: 24px;
+      --tab-min-height: 24px;
+      --tab-min-width: 24px;
 
       & .tab-background {
-        background: transparent;
+        background: var(--zen-toolbar-element-bg) !important;
+        margin-block: 0 !important;
+        margin-inline: 0 !important;
         box-shadow: none !important;
       }
+      & .tab-content {
+        padding: 0 5px;
+      }
       & label { display: none !important; }
       & .tab-close-button,
       & .tab-reset-button {
@@ -327,6 +336,8 @@
 
       & .tab-icon-image {
         --toolbarbutton-inner-padding: 0 !important;
+        width: 14px;
+        height: 14px;
       }
     }
 
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 38fc44495..ed2c93caa 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -1,11 +1,11 @@
 {
   class ZenGlanceManager extends ZenDOMOperatedFeature {
-    #currentBrowser = null;
-    #currentTab = null;
-
     _animating = false;
     _lazyPref = {};
 
+    #glances = new Map();
+    #currentGlanceID = null;
+
     init() {
       window.addEventListener('keydown', this.onKeyDown.bind(this));
       window.addEventListener('TabClose', this.onTabClose.bind(this));
@@ -24,17 +24,29 @@
       Services.obs.addObserver(this, 'quit-application-requested');
     }
 
+    get #currentBrowser() {
+      return this.#glances.get(this.#currentGlanceID)?.browser;
+    }
+
+    get #currentTab() {
+      return this.#glances.get(this.#currentGlanceID)?.tab;
+    }
+
+    get #currentParentTab() {
+      return this.#glances.get(this.#currentGlanceID)?.parentTab;
+    }
+
     onKeyDown(event) {
-      if (event.key === 'Escape' && this.#currentBrowser) {
+      if (event.key === 'Escape' && this.#currentGlanceID) {
         event.preventDefault();
         event.stopPropagation();
-        this.closeGlance();
+        this.closeGlance({ onTabClose: true });
       }
     }
 
     onOverlayClick(event) {
       if (event.target === this.overlay && event.originalTarget !== this.contentWrapper) {
-        this.closeGlance();
+        this.closeGlance({ onTabClose: true });
       }
     }
 
@@ -48,8 +60,8 @@
 
     onUnload() {
       // clear everything
-      if (this.#currentBrowser) {
-        gBrowser.removeTab(this.#currentTab);
+      for (let [id, glance] of this.#glances) {
+        gBrowser.removeTab(glance.tab, { animate: false });
       }
     }
 
@@ -65,19 +77,49 @@
         skipLoad: false,
         index: this.getTabPosition(currentTab),
       };
-      this.currentParentTab = currentTab;
+      currentTab._selected = true;
+      const newUUID = gZenUIManager.generateUuidv4();
       const newTab = existingTab ?? gBrowser.addTrustedTab(Services.io.newURI(url).spec, newTabOptions);
       if (currentTab.hasAttribute('zenDefaultUserContextId')) {
         newTab.setAttribute('zenDefaultUserContextId', true);
       }
-      gBrowser.selectedTab = newTab;
       currentTab.querySelector('.tab-content').appendChild(newTab);
       newTab.setAttribute('zen-glance-tab', true);
-      this.#currentBrowser = newTab.linkedBrowser;
-      this.#currentTab = newTab;
+      newTab.setAttribute('glance-id', newUUID);
+      currentTab.setAttribute('glance-id', newUUID);
+      this.#glances.set(newUUID, {
+        tab: newTab,
+        parentTab: currentTab,
+        browser: newTab.linkedBrowser,
+      });
+      this.#currentGlanceID = newUUID;
+      setTimeout(() => {
+        gBrowser.tabContainer._invalidateCachedTabs(); // remove tiny tab from the tabstrip
+      }, 0);
       return this.#currentBrowser;
     }
 
+    fillOverlay(browser) {
+      this.overlay = browser.closest('.browserSidebarContainer');
+      this.browserWrapper = browser.closest('.browserContainer');
+      this.contentWrapper = browser.closest('.browserStack');
+    }
+
+    showSidebarButtons() {
+      if (this.sidebarButtons.hasAttribute('hidden')) {
+        gZenUIManager.motion.animate(
+          this.sidebarButtons.querySelectorAll('toolbarbutton'),
+          { x: [-50, 0], opacity: [0, 1] },
+          { delay: gZenUIManager.motion.stagger(0.2) }
+        );
+      }
+      this.sidebarButtons.removeAttribute('hidden');
+    }
+
+    hideSidebarButtons() {
+      this.sidebarButtons.setAttribute('hidden', true);
+    }
+
     openGlance(data, existingTab = null, ownerTab = null) {
       if (this.#currentBrowser) {
         return;
@@ -101,11 +143,8 @@
 
       const browserElement = this.createBrowserElement(data.url, currentTab, existingTab);
 
-      this.overlay = browserElement.closest('.browserSidebarContainer');
-      this.browserWrapper = browserElement.closest('.browserContainer');
-      this.contentWrapper = browserElement.closest('.browserStack');
-
-      this.browserWrapper.prepend(this.sidebarButtons);
+      this.fillOverlay(browserElement);
+      this.showSidebarButtons();
 
       this.overlay.classList.add('zen-glance-overlay');
 
@@ -115,11 +154,20 @@
 
         this.overlay.removeAttribute('fade-out');
         this.browserWrapper.setAttribute('animate', true);
-        this.browserWrapper.style.top = `${initialY + initialHeight / 2}px`;
-        this.browserWrapper.style.left = `${initialX + initialWidth / 2}px`;
+        const top = initialY + initialHeight / 2;
+        const left = initialX + initialWidth / 2;
+        this.browserWrapper.style.top = `${top}px`;
+        this.browserWrapper.style.left = `${left}px`;
         this.browserWrapper.style.width = `${initialWidth}px`;
         this.browserWrapper.style.height = `${initialHeight}px`;
         this.browserWrapper.style.opacity = 0.8;
+        this.#glances.get(this.#currentGlanceID).originalPosition = {
+          top: this.browserWrapper.style.top,
+          left: this.browserWrapper.style.left,
+          width: this.browserWrapper.style.width,
+          height: this.browserWrapper.style.height,
+        };
+        this.browserWrapper.style.transform = 'translate(-50%, -50%)';
         this.overlay.style.overflow = 'visible';
         gZenUIManager.motion
           .animate(
@@ -156,83 +204,88 @@
       this.browserWrapper.removeAttribute('has-finished-animation');
       if (noAnimation) {
         this.quickCloseGlance({ closeCurrentTab: false });
-        this.#currentBrowser = null;
-        this.#currentTab = null;
         return;
       }
 
       this._animating = true;
 
       gBrowser._insertTabAtIndex(this.#currentTab, {
-        index: this.getTabPosition(this.currentParentTab),
+        index: this.getTabPosition(this.#currentParentTab),
       });
 
       let quikcCloseZen = false;
       if (onTabClose) {
         // Create new tab if no more ex
         if (gBrowser.tabs.length === 1) {
-          gBrowser.selectedTab = gZenUIManager.openAndChangeToTab(Services.prefs.getStringPref('browser.startup.homepage'));
+          BrowserCommands.openTab();
           return;
-        } else if (gBrowser.selectedTab === this.#currentTab) {
-          this._duringOpening = true;
-          gBrowser.tabContainer.advanceSelectedTab(1, true); // to skip the current tab
-          this._duringOpening = false;
-          quikcCloseZen = true;
         }
       }
 
       // do NOT touch here, I don't know what it does, but it works...
-      window.requestAnimationFrame(() => {
-        this.#currentTab.style.display = 'none';
-        this.browserWrapper.removeAttribute('animate');
-        this.browserWrapper.removeAttribute('animate-end');
-        this.overlay.setAttribute('fade-out', true);
-        window.requestAnimationFrame(() => {
-          this.quickCloseGlance({ justAnimateParent: true });
-          this.browserWrapper.setAttribute('animate', true);
+      this.#currentTab.style.display = 'none';
+      this.overlay.setAttribute('fade-out', true);
+      this.overlay.style.pointerEvents = 'none';
+      this.quickCloseGlance({ justAnimateParent: true, clearID: false });
+      const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
+      gZenUIManager.motion
+        .animate(
+          this.browserWrapper,
+          {
+            ...originalPosition,
+            opacity: 0,
+          },
+          { type: 'spring', bounce: 0, duration: 0.5 }
+        )
+        .then(() => {
+          this.browserWrapper.removeAttribute('animate');
+          this.browserWrapper.removeAttribute('animate-end');
+          if (!this.#currentParentTab) {
+            return;
+          }
+
+          if (!onTabClose || quikcCloseZen) {
+            this.quickCloseGlance({ clearID: false });
+          }
+          this.overlay.removeAttribute('fade-out');
+          this.browserWrapper.removeAttribute('animate');
+
+          this.lastCurrentTab = this.#currentTab;
+
+          this.overlay.classList.remove('zen-glance-overlay');
+          gBrowser._getSwitcher().setTabStateNoAction(this.lastCurrentTab, gBrowser.AsyncTabSwitcher.STATE_UNLOADED);
+
+          if (!onTabClose) {
+            this.#currentParentTab._visuallySelected = false;
+          }
+
+          // reset everything
+          const prevOverlay = this.overlay;
+          this.browserWrapper = null;
+          this.overlay = null;
+          this.contentWrapper = null;
+
+          this.lastCurrentTab.removeAttribute('zen-glance-tab');
+          this.lastCurrentTab._closingGlance = true;
+
+          gBrowser.tabContainer._invalidateCachedTabs();
+          gBrowser.removeTab(this.lastCurrentTab, { animate: false });
+          this.#currentBrowser.remove();
+
           setTimeout(() => {
-            if (!this.currentParentTab) {
-              return;
-            }
+            prevOverlay.remove(); // Just to be sure
+          }, 0);
 
-            if (!onTabClose || quikcCloseZen) {
-              this.quickCloseGlance();
-            }
-            this.overlay.removeAttribute('fade-out');
-            this.browserWrapper.removeAttribute('animate');
+          this.#currentParentTab.removeAttribute('glance-id');
 
-            this.lastCurrentTab = this.#currentTab;
+          this.#glances.delete(this.#currentGlanceID);
+          this.#currentGlanceID = null;
 
-            this.overlay.classList.remove('zen-glance-overlay');
-            gBrowser._getSwitcher().setTabStateNoAction(this.lastCurrentTab, gBrowser.AsyncTabSwitcher.STATE_UNLOADED);
+          this.lastCurrentTab = null;
+          this._duringOpening = false;
 
-            if (!onTabClose && gBrowser.selectedTab === this.lastCurrentTab) {
-              this._duringOpening = true;
-              gBrowser.selectedTab = this.currentParentTab;
-            }
-
-            // reset everything
-            this.currentParentTab = null;
-            this.browserWrapper = null;
-            this.overlay = null;
-            this.contentWrapper = null;
-
-            this.lastCurrentTab.removeAttribute('zen-glance-tab');
-            this.lastCurrentTab._closingGlance = true;
-
-            gBrowser.tabContainer._invalidateCachedTabs();
-            gBrowser.removeTab(this.lastCurrentTab, { animate: true });
-
-            this.#currentTab = null;
-            this.#currentBrowser = null;
-
-            this.lastCurrentTab = null;
-            this._duringOpening = false;
-
-            this._animating = false;
-          }, 400);
+          this._animating = false;
         });
-      });
     }
 
     quickOpenGlance() {
@@ -240,74 +293,106 @@
         return;
       }
       this._duringOpening = true;
-      try {
-        gBrowser.selectedTab = this.#currentTab;
-      } catch (e) {}
+      this.showSidebarButtons();
 
-      this.currentParentTab.linkedBrowser
-        .closest('.browserSidebarContainer')
-        .classList.add('deck-selected', 'zen-glance-background');
-      this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-overlay');
-      this.currentParentTab.linkedBrowser.zenModeActive = true;
+      const parentBrowserContainer = this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer');
+      parentBrowserContainer.classList.add('deck-selected');
+      parentBrowserContainer.classList.add('zen-glance-background');
+      parentBrowserContainer.classList.remove('zen-glance-overlay');
+      this.#currentParentTab.linkedBrowser.zenModeActive = true;
+      this.#currentParentTab.linkedBrowser.docShellIsActive = true;
       this.#currentBrowser.zenModeActive = true;
-      this.currentParentTab.linkedBrowser.docShellIsActive = true;
       this.#currentBrowser.docShellIsActive = true;
       this.#currentBrowser.setAttribute('zen-glance-selected', true);
+      this.fillOverlay(this.#currentBrowser);
 
-      this.currentParentTab._visuallySelected = true;
+      this.#currentParentTab._visuallySelected = true;
       this.overlay.classList.add('deck-selected');
+      this.overlay.classList.add('zen-glance-overlay');
 
       this._duringOpening = false;
     }
 
-    quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false } = {}) {
-      const parentHasBrowser = !!this.currentParentTab.linkedBrowser;
+    quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false, clearID = true } = {}) {
+      const parentHasBrowser = !!this.#currentParentTab.linkedBrowser;
+      this.hideSidebarButtons();
       if (!justAnimateParent) {
         if (parentHasBrowser) {
           if (closeParentTab) {
-            this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('deck-selected');
+            this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('deck-selected');
           }
-          this.currentParentTab.linkedBrowser.zenModeActive = false;
+          this.#currentParentTab.linkedBrowser.zenModeActive = false;
         }
         this.#currentBrowser.zenModeActive = false;
         if (closeParentTab && parentHasBrowser) {
-          this.currentParentTab.linkedBrowser.docShellIsActive = false;
+          this.#currentParentTab.linkedBrowser.docShellIsActive = false;
         }
         if (closeCurrentTab) {
           this.#currentBrowser.docShellIsActive = false;
           this.overlay.classList.remove('deck-selected');
+          this.#currentTab._selected = false;
         }
-        if (!this.currentParentTab._visuallySelected && closeParentTab) {
-          this.currentParentTab._visuallySelected = false;
+        if (!this.#currentParentTab._visuallySelected && closeParentTab) {
+          this.#currentParentTab._visuallySelected = false;
         }
         this.#currentBrowser.removeAttribute('zen-glance-selected');
+        this.overlay.classList.remove('zen-glance-overlay');
       }
       if (parentHasBrowser) {
-        this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
+        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
+      }
+      if (clearID) {
+        this.#currentGlanceID = null;
       }
     }
 
-    onLocationChange(_) {
-      if (this._duringOpening) {
+    onLocationChange(browser) {
+      const tab = gBrowser.getTabForBrowser(browser);
+      if (this.animatingFullOpen) {
         return;
       }
-      if (gBrowser.selectedTab === this.#currentTab && !this.animatingOpen && !this._duringOpening && this.#currentBrowser) {
-        this.quickOpenGlance();
+      if (this._duringOpening || !tab.hasAttribute('glance-id')) {
+        if (this.#currentGlanceID && !this._duringOpening) {
+          this.quickCloseGlance();
+        }
         return;
       }
-      if (gBrowser.selectedTab === this.currentParentTab && this.#currentBrowser) {
-        this.quickOpenGlance();
-      } else if ((!this.animatingFullOpen || this.animatingOpen) && this.#currentBrowser) {
-        this.closeGlance();
+      if (this.#currentGlanceID && this.#currentGlanceID !== tab.getAttribute('glance-id')) {
+        this.quickCloseGlance();
+      }
+      this.#currentGlanceID = tab.getAttribute('glance-id');
+      if (gBrowser.selectedTab === this.#currentParentTab && this.#currentBrowser) {
+        setTimeout(this.quickOpenGlance.bind(this), 0);
       }
     }
 
     onTabClose(event) {
-      if (event.target === this.currentParentTab) {
+      if (event.target === this.#currentParentTab) {
         this.closeGlance({ onTabClose: true });
       }
     }
 
+    manageTabClose(tab) {
+      if (tab.hasAttribute('glance-id')) {
+        const oldGlanceID = this.#currentGlanceID;
+        const newGlanceID = tab.getAttribute('glance-id');
+        this.#currentGlanceID = newGlanceID;
+        const isDifferent = newGlanceID !== oldGlanceID;
+        if (this._ignoreClose) {
+          this._ignoreClose = false;
+          return false;
+        }
+        this._ignoreClose = true;
+        this.closeGlance({ noAnimation: isDifferent, onTabClose: true });
+        if (isDifferent) {
+          this.#currentGlanceID = oldGlanceID;
+        }
+        // only keep continueing tab close if we are not on the currently selected tab
+        return !isDifferent;
+      }
+      return false;
+    }
+
     tabDomainsDiffer(tab1, url2) {
       try {
         if (!tab1) {
@@ -351,19 +436,22 @@
     }
 
     fullyOpenGlance() {
+      this.animatingFullOpen = true;
       gBrowser._insertTabAtIndex(this.#currentTab, {
         index: this.getTabPosition(this.#currentTab),
       });
 
-      this.animatingFullOpen = true;
-      this.currentParentTab._visuallySelected = false;
+      this.#currentParentTab._visuallySelected = false;
 
       this.browserWrapper.removeAttribute('style');
       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;
-      this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
+      this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
+      this.hideSidebarButtons();
       gZenUIManager.motion
         .animate(
           this.browserWrapper,
@@ -382,6 +470,7 @@
           this.browserWrapper.removeAttribute('style');
           this.animatingFullOpen = false;
           this.closeGlance({ noAnimation: true });
+          this.#glances.delete(this.#currentGlanceID);
         });
     }
 
diff --git a/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs b/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs
index 6a328f870..c43451375 100644
--- a/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs
+++ b/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs
@@ -96,7 +96,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
   }
 
   handleClick(event) {
-    if (this.ensureOnlyKeyModifiers(event)) {
+    if (this.ensureOnlyKeyModifiers(event) || event.button !== 0 || event.defaultPrevented) {
       return;
     }
     const activationMethod = this._activationMethod;
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 2234dfb64..2b45af37c 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb749b23d289 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..9aaa4b0cd8a8bb76c59415f2322d739cbe00302e 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -219,19 +219,26 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb74
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4471,7 +4559,10 @@
+@@ -4457,7 +4545,9 @@
+       // frame created for it (for example, by updating the visually selected
+       // state).
+       let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
+-
++      if (gZenGlanceManager.manageTabClose(aTab)) {
++        return;
++      }
+       if (
+         !this._beginRemoveTab(aTab, {
+           closeWindowFastpath: true,
+@@ -4471,7 +4561,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
 -
-+      if (aTab.hasAttribute("zen-glance-tab")) {
-+        gZenGlanceManager.closeGlance();
-+        return;
-+      }
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4701,14 @@
+@@ -4610,14 +4699,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -248,7 +255,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb74
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5556,10 @@
+@@ -5465,10 +5554,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -261,7 +268,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb74
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7443,6 +7534,7 @@
+@@ -7443,6 +7532,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -269,7 +276,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb74
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8503,7 @@ var TabContextMenu = {
+@@ -8411,7 +8501,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -278,7 +285,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb74
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8536,7 @@ var TabContextMenu = {
+@@ -8444,7 +8534,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -287,7 +294,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..6362493d8ec06aa90cc3425498c0fb74
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8769,7 @@ var TabContextMenu = {
+@@ -8677,6 +8767,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 77a31a206..b6181fead 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..a6fae3e317afc9b681f818506c7f34a325e43df4 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c45dd02404 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -104,7 +104,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a6fae3e317afc9b681f818506c7f34a3
  
        this.#allTabs = [
 -        ...this.verticalPinnedTabsContainer.children,
-+      ...document.getElementById("zen-essentials-container").children, ...this.verticalPinnedTabsContainer.children,
++        ...document.getElementById("zen-essentials-container").children, ...this.verticalPinnedTabsContainer.children,
          ...children,
        ];
        return this.#allTabs;

From 9bad51b94e356ba949cf131fb856e5f55ccf1880 Mon Sep 17 00:00:00 2001
From: EmilyxFox <48589793+EmilyxFox@users.noreply.github.com>
Date: Sat, 1 Feb 2025 23:24:21 +0100
Subject: [PATCH 026/191] copy all urls in split view

---
 src/browser/base/zen-components/ZenCommonUtils.mjs  | 8 +++++---
 src/browser/base/zen-components/ZenViewSplitter.mjs | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index ad4fc1805..280625adb 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -60,10 +60,12 @@ class ZenPreloadedFeature {
 
 var gZenCommonActions = {
   copyCurrentURLToClipboard() {
-    const currentUrl = gBrowser.currentURI.spec;
-    if (currentUrl) {
+    const currentTabs = gZenViewSplitter.getTabsInCurrentView()
+    if (currentTabs) {
+      const stringArray = currentTabs.map(t => `${t.linkedBrowser.currentURI.spec}`)
+      const markdownString = stringArray.join("\n")
       let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-      str.data = currentUrl;
+      str.data = markdownString;
       let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
       transferable.init(getLoadContext());
       transferable.addDataFlavor('text/plain');
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index fb715e2a5..ef3e75a2f 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -1136,6 +1136,15 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       : [gBrowser.selectedTab, tabs[nextTabIndex]];
     this.splitTabs(selected_tabs, gridType);
   }
+
+  /**
+   * Gets all the tabs in the current view.
+   * @returns {Tab[]} The tabs in the current view.
+   */
+  getTabsInCurrentView() {
+    if (this.currentView < 0) return [gBrowser.selectedTab];
+    return this._data[this.currentView].tabs;
+  }
 }
 
 window.gZenViewSplitter = new ZenViewSplitter();

From 07b70efd19fb040521058ec21c1eefd478429c28 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 1 Feb 2025 23:46:35 +0100
Subject: [PATCH 027/191] Refactor zen-glance styles and improve tab handling
 in ZenGlanceManager

---
 .../base/content/zen-styles/zen-glance.css    |  6 ---
 .../base/zen-components/ZenGlanceManager.mjs  | 32 +++++++++++--
 .../tabbrowser/content/tabs-js.patch          | 47 ++++++++++++-------
 src/toolkit/content/widgets/tabbox-js.patch   | 22 +++++++++
 4 files changed, 80 insertions(+), 27 deletions(-)
 create mode 100644 src/toolkit/content/widgets/tabbox-js.patch

diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index 9256ef1f2..c4628f2d2 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -9,12 +9,6 @@
   visibility: inherit;
 }
 
-.zen-glance-background {
-  transform: scale(0.98);
-  backdrop-filter: blur(5px);
-  opacity: 0.6;
-}
-
 #zen-glance-sidebar-container {
   display: none;
 
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index ed2c93caa..c2ed773fe 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -93,9 +93,6 @@
         browser: newTab.linkedBrowser,
       });
       this.#currentGlanceID = newUUID;
-      setTimeout(() => {
-        gBrowser.tabContainer._invalidateCachedTabs(); // remove tiny tab from the tabstrip
-      }, 0);
       return this.#currentBrowser;
     }
 
@@ -152,6 +149,21 @@
       window.requestAnimationFrame(() => {
         this.quickOpenGlance();
 
+        gZenUIManager.motion
+          .animate(
+            this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
+            {
+              scale: 0.98,
+              backdropFilter: 'blur(5px)',
+              opacity: 0.6,
+            },
+            {
+              duration: 0.4,
+              type: 'spring',
+              bounce: 0.2,
+            }
+          );
+
         this.overlay.removeAttribute('fade-out');
         this.browserWrapper.setAttribute('animate', true);
         const top = initialY + initialHeight / 2;
@@ -203,6 +215,7 @@
 
       this.browserWrapper.removeAttribute('has-finished-animation');
       if (noAnimation) {
+        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
         this.quickCloseGlance({ closeCurrentTab: false });
         return;
       }
@@ -228,6 +241,7 @@
       this.overlay.style.pointerEvents = 'none';
       this.quickCloseGlance({ justAnimateParent: true, clearID: false });
       const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
+      this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
       gZenUIManager.motion
         .animate(
           this.browserWrapper,
@@ -269,6 +283,7 @@
           this.lastCurrentTab._closingGlance = true;
 
           gBrowser.tabContainer._invalidateCachedTabs();
+          gBrowser.selectedTab = this.#currentParentTab;
           gBrowser.removeTab(this.lastCurrentTab, { animate: false });
           this.#currentBrowser.remove();
 
@@ -295,6 +310,8 @@
       this._duringOpening = true;
       this.showSidebarButtons();
 
+      gBrowser.selectedTab = this.#currentTab;
+
       const parentBrowserContainer = this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer');
       parentBrowserContainer.classList.add('deck-selected');
       parentBrowserContainer.classList.add('zen-glance-background');
@@ -362,6 +379,11 @@
       }
       this.#currentGlanceID = tab.getAttribute('glance-id');
       if (gBrowser.selectedTab === this.#currentParentTab && this.#currentBrowser) {
+        const curTab = this.#currentTab;
+        setTimeout(() => {
+          gBrowser.selectedTab = curTab;
+        }, 0);
+      } else if (gBrowser.selectedTab === this.#currentTab && this.#currentParentTab) {
         setTimeout(this.quickOpenGlance.bind(this), 0);
       }
     }
@@ -505,6 +527,10 @@
 
       return false;
     }
+
+    getFocusedTab(aDir) {
+      return aDir< 0 ? this.#currentParentTab : this.#currentTab;
+    }
   }
 
   window.gZenGlanceManager = new ZenGlanceManager();
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index b6181fead..11d61e777 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c45dd02404 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..e07019130c199401702889c6765434de0bd708a2 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -99,7 +99,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1512,7 +1525,7 @@
+@@ -1512,9 +1525,18 @@
        }
  
        this.#allTabs = [
@@ -107,8 +107,19 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
 +        ...document.getElementById("zen-essentials-container").children, ...this.verticalPinnedTabsContainer.children,
          ...children,
        ];
++      for (let i = 0; i < this.#allTabs.length; i++) {
++        // add glance tabs (tabs inside tabs) to the list
++        const glanceTab = this.#allTabs[i].querySelector("tab[zen-glance-tab]");
++        if (glanceTab) {
++          // insert right after the parent tab
++          this.#allTabs.splice(i + 1, 0, glanceTab);
++          i++;
++        }
++      }
        return this.#allTabs;
-@@ -1593,6 +1606,7 @@
+     }
+ 
+@@ -1593,6 +1615,7 @@
        }
  
        this.#focusableItems = [
@@ -116,7 +127,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1617,8 +1631,8 @@
+@@ -1617,8 +1640,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -127,7 +138,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
        );
      }
  
-@@ -1816,7 +1830,7 @@
+@@ -1816,7 +1839,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -136,7 +147,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1846,7 @@
+@@ -1832,6 +1855,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -144,7 +155,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1879,7 +1894,7 @@
+@@ -1879,7 +1903,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -153,7 +164,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1909,7 @@
+@@ -1894,7 +1918,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -162,7 +173,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1963,13 +1978,13 @@
+@@ -1963,13 +1987,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
@@ -179,7 +190,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
          }
        }
  
-@@ -1993,7 +2008,7 @@
+@@ -1993,7 +2017,7 @@
  
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
@@ -188,7 +199,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2089,7 @@
+@@ -2074,7 +2098,7 @@
          return;
        }
  
@@ -197,7 +208,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2272,9 @@
+@@ -2257,9 +2281,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -209,7 +220,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2517,9 @@
+@@ -2502,8 +2526,9 @@
        );
      }
  
@@ -221,7 +232,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
          return;
        }
  
-@@ -2668,9 +2684,9 @@
+@@ -2668,9 +2693,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -233,7 +244,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
        }
      }
  
-@@ -2754,7 +2770,7 @@
+@@ -2754,7 +2779,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -242,7 +253,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
          return;
        }
  
-@@ -2772,12 +2788,14 @@
+@@ -2772,12 +2797,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -258,7 +269,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
                selectedTab,
              ];
            })
-@@ -2794,8 +2812,11 @@
+@@ -2794,8 +2821,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -272,7 +283,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..a36fc2cb5761323fd40d367fd04234c4
              ) {
                return;
              }
-@@ -2803,21 +2824,29 @@
+@@ -2803,21 +2833,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (
diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch
new file mode 100644
index 000000000..b7294a61f
--- /dev/null
+++ b/src/toolkit/content/widgets/tabbox-js.patch
@@ -0,0 +1,22 @@
+diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
+index 033582a3badb65d50f58a11f8a259e28eaa04ef3..a2f655f2444bcf638434f39278e1a3de725de4d6 100644
+--- a/toolkit/content/widgets/tabbox.js
++++ b/toolkit/content/widgets/tabbox.js
+@@ -820,7 +820,7 @@
+         if (tab == startTab) {
+           return null;
+         }
+-        if (filter(tab)) {
++        if (filter(tab) && !tab.hasAttribute("zen-glance-tab")) {
+           return tab;
+         }
+       }
+@@ -883,7 +883,7 @@
+       let { ariaFocusedItem } = this;
+       let startTab = ariaFocusedItem;
+       if (!ariaFocusedItem || !this.allTabs.includes(ariaFocusedItem)) {
+-        startTab = this.selectedItem;
++        startTab = gZenGlanceManager.getFocusedTab(aDir) || this.selectedItem;
+       }
+       let newTab = null;
+ 

From d5cea8bb0e4be0f4980769840325a0a1ec532383 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 00:06:19 +0100
Subject: [PATCH 028/191] Refactor zen-glance styles and improve sidebar button
 animation handling

---
 .../zen-styles/zen-browser-container.css       |  5 -----
 .../base/zen-components/ZenGlanceManager.mjs   | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-browser-container.css b/src/browser/base/content/zen-styles/zen-browser-container.css
index 8627090b0..e6cb6cd3f 100644
--- a/src/browser/base/content/zen-styles/zen-browser-container.css
+++ b/src/browser/base/content/zen-styles/zen-browser-container.css
@@ -9,11 +9,6 @@
     border-radius: var(--zen-native-inner-radius);
     position: relative;
 
-    /* For glance */
-    transition:
-      transform 0.1s ease-in-out,
-      opacity 0.1s ease-in-out;
-
     overflow: hidden;
 
     :root:not([zen-no-padding='true']) & {
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index c2ed773fe..f9970faee 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -102,8 +102,8 @@
       this.contentWrapper = browser.closest('.browserStack');
     }
 
-    showSidebarButtons() {
-      if (this.sidebarButtons.hasAttribute('hidden')) {
+    showSidebarButtons(animate = false) {
+      if (this.sidebarButtons.hasAttribute('hidden') && animate) {
         gZenUIManager.motion.animate(
           this.sidebarButtons.querySelectorAll('toolbarbutton'),
           { x: [-50, 0], opacity: [0, 1] },
@@ -141,7 +141,7 @@
       const browserElement = this.createBrowserElement(data.url, currentTab, existingTab);
 
       this.fillOverlay(browserElement);
-      this.showSidebarButtons();
+      this.showSidebarButtons(true);
 
       this.overlay.classList.add('zen-glance-overlay');
 
@@ -249,7 +249,7 @@
             ...originalPosition,
             opacity: 0,
           },
-          { type: 'spring', bounce: 0, duration: 0.5 }
+          { type: 'spring', bounce: 0, duration: 0.7 }
         )
         .then(() => {
           this.browserWrapper.removeAttribute('animate');
@@ -313,17 +313,22 @@
       gBrowser.selectedTab = this.#currentTab;
 
       const parentBrowserContainer = this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer');
-      parentBrowserContainer.classList.add('deck-selected');
       parentBrowserContainer.classList.add('zen-glance-background');
       parentBrowserContainer.classList.remove('zen-glance-overlay');
+      parentBrowserContainer.classList.add('deck-selected');
       this.#currentParentTab.linkedBrowser.zenModeActive = true;
       this.#currentParentTab.linkedBrowser.docShellIsActive = true;
       this.#currentBrowser.zenModeActive = true;
       this.#currentBrowser.docShellIsActive = true;
       this.#currentBrowser.setAttribute('zen-glance-selected', true);
       this.fillOverlay(this.#currentBrowser);
-
       this.#currentParentTab._visuallySelected = true;
+      setTimeout(() => {
+        // just to make sure
+        parentBrowserContainer.classList.add('deck-selected');
+        this.#currentParentTab._visuallySelected = true;
+      }, 0);
+
       this.overlay.classList.add('deck-selected');
       this.overlay.classList.add('zen-glance-overlay');
 
@@ -363,6 +368,7 @@
       }
     }
 
+    // note: must be async to avoid timing issues
     onLocationChange(browser) {
       const tab = gBrowser.getTabForBrowser(browser);
       if (this.animatingFullOpen) {

From da1a032c96d9b1f41bb4593cd39344bcfff0f11d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 00:11:15 +0100
Subject: [PATCH 029/191] Refactor animation code in ZenGlanceManager for
 improved readability

---
 .../base/zen-components/ZenGlanceManager.mjs  | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index f9970faee..ecf1ff0d9 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -149,20 +149,19 @@
       window.requestAnimationFrame(() => {
         this.quickOpenGlance();
 
-        gZenUIManager.motion
-          .animate(
-            this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
-            {
-              scale: 0.98,
-              backdropFilter: 'blur(5px)',
-              opacity: 0.6,
-            },
-            {
-              duration: 0.4,
-              type: 'spring',
-              bounce: 0.2,
-            }
-          );
+        gZenUIManager.motion.animate(
+          this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
+          {
+            scale: 0.98,
+            backdropFilter: 'blur(5px)',
+            opacity: 0.6,
+          },
+          {
+            duration: 0.4,
+            type: 'spring',
+            bounce: 0.2,
+          }
+        );
 
         this.overlay.removeAttribute('fade-out');
         this.browserWrapper.setAttribute('animate', true);
@@ -535,7 +534,7 @@
     }
 
     getFocusedTab(aDir) {
-      return aDir< 0 ? this.#currentParentTab : this.#currentTab;
+      return aDir < 0 ? this.#currentParentTab : this.#currentTab;
     }
   }
 

From 275f8d153103579b941a9f1496f2717c8dd9251f Mon Sep 17 00:00:00 2001
From: Different55 <burritosaur@protonmail.com>
Date: Sun, 2 Feb 2025 03:49:28 -0600
Subject: [PATCH 030/191] Preserve new lines in installed theme stylesheets

Signed-off-by: Different55 <burritosaur@protonmail.com>
---
 .../zen-components/actors/ZenThemeMarketplaceParent.sys.mjs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs b/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs
index e9c6d0622..ac5174e2c 100644
--- a/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs
+++ b/src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs
@@ -122,10 +122,10 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent {
   }
 
   getStyleSheetFullContent(style = '') {
-    let stylesheet = '@-moz-document url-prefix("chrome:") {';
+    let stylesheet = '@-moz-document url-prefix("chrome:") {\n';
 
     for (const line of style.split('\n')) {
-      stylesheet += `  ${line}`;
+      stylesheet += `  ${line}\n`;
     }
 
     stylesheet += '}';

From b55e0eb1d3b0e20e6963f6bd38c4fd74c442c501 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 13:08:59 +0100
Subject: [PATCH 031/191] Refactor zen-glance styles and improve tab handling
 with enhanced animations

---
 src/browser/base/content/browser-js.patch     |  13 +--
 .../base/content/zen-styles/zen-glance.css    |  16 ++-
 .../base/zen-components/ZenGlanceManager.mjs  | 107 ++++++++++++------
 .../tabbrowser/content/tabs-js.patch          |  11 +-
 4 files changed, 97 insertions(+), 50 deletions(-)

diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index 7ead783f1..db2f39965 100644
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 9a65dcc7ad41ab961907c95338e023b173d4f474..9477e0c115ed3c4a670f1ac63846b6de01bf8b8c 100644
+index 019b168c1aeae7e1c97a3ae58c99a48a27f54134..1f051e8a1e8a58e8bb721196deecfa36f4089dd6 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -32,6 +32,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,7 +10,7 @@ index 9a65dcc7ad41ab961907c95338e023b173d4f474..9477e0c115ed3c4a670f1ac63846b6de
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -630,6 +631,15 @@ XPCOMUtils.defineLazyPreferenceGetter(
+@@ -632,6 +633,15 @@ XPCOMUtils.defineLazyPreferenceGetter(
    false
  );
  
@@ -26,19 +26,18 @@ index 9a65dcc7ad41ab961907c95338e023b173d4f474..9477e0c115ed3c4a670f1ac63846b6de
  customElements.setElementCreationCallback("screenshots-buttons", () => {
    Services.scriptloader.loadSubScript(
      "chrome://browser/content/screenshots/screenshots-buttons.js",
-@@ -3440,6 +3450,11 @@ var XULBrowserWindow = {
+@@ -3440,6 +3450,10 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
 +    gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
 +    ZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
 +    gZenTabUnloader.onLocationChange(gBrowser.selectedBrowser);
-+    gZenGlanceManager.onLocationChange(gBrowser.selectedBrowser);
 +
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -4435,7 +4450,7 @@ nsBrowserAccess.prototype = {
+@@ -4435,7 +4449,7 @@ nsBrowserAccess.prototype = {
      // Passing a null-URI to only create the content window,
      // and pass true for aSkipLoad to prevent loading of
      // about:blank
@@ -47,7 +46,7 @@ index 9a65dcc7ad41ab961907c95338e023b173d4f474..9477e0c115ed3c4a670f1ac63846b6de
        null,
        aParams,
        aWhere,
-@@ -4443,6 +4458,10 @@ nsBrowserAccess.prototype = {
+@@ -4443,6 +4457,10 @@ nsBrowserAccess.prototype = {
        aName,
        true
      );
@@ -58,7 +57,7 @@ index 9a65dcc7ad41ab961907c95338e023b173d4f474..9477e0c115ed3c4a670f1ac63846b6de
    },
  
    openURIInFrame: function browser_openURIInFrame(
-@@ -7281,6 +7300,12 @@ var gDialogBox = {
+@@ -7285,6 +7303,12 @@ var gDialogBox = {
      parentElement.showModal();
      this._didOpenHTMLDialog = true;
  
diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index c4628f2d2..377b7a453 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -31,15 +31,22 @@
 
   padding: 5px;
   gap: 12px;
-  right: 1%;
+  left: 3%;
 
   & toolbarbutton {
     width: 32px;
     height: 32px;
-    background: var(--zen-dialog-background);
+    background: light-dark(rgba(0, 0, 0, 0.9), rgba(255, 255, 255, 0.9));
+    fill: light-dark(white, black);
+    transition: background 0.2s ease;
     border-radius: 999px;
     appearance: none;
     box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.07);
+    opacity: 0;
+
+    &:hover {
+      background: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
+    }
 
     & label {
       display: none;
@@ -99,4 +106,9 @@
       opacity: 0;
     }
   }
+
+  & browser[animate-glance-open='true'] {
+    transition: opacity 0.2s ease-in-out;
+    opacity: 0;
+  }
 }
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index ecf1ff0d9..653860e40 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -9,6 +9,7 @@
     init() {
       window.addEventListener('keydown', this.onKeyDown.bind(this));
       window.addEventListener('TabClose', this.onTabClose.bind(this));
+      window.addEventListener('TabSelect', this.onLocationChange.bind(this));
 
       XPCOMUtils.defineLazyPreferenceGetter(
         this._lazyPref,
@@ -106,8 +107,8 @@
       if (this.sidebarButtons.hasAttribute('hidden') && animate) {
         gZenUIManager.motion.animate(
           this.sidebarButtons.querySelectorAll('toolbarbutton'),
-          { x: [-50, 0], opacity: [0, 1] },
-          { delay: gZenUIManager.motion.stagger(0.2) }
+          { x: [50, 0], opacity: [0, 1] },
+          { delay: gZenUIManager.motion.stagger(0.1) }
         );
       }
       this.sidebarButtons.removeAttribute('hidden');
@@ -121,6 +122,12 @@
       if (this.#currentBrowser) {
         return;
       }
+      if (gBrowser.selectedTab === this.#currentParentTab) {
+        gBrowser.selectedTab = this.#currentTab;
+        return;
+      }
+      this.animatingOpen = true;
+      this._animating = true;
 
       const initialX = data.x;
       const initialY = data.y;
@@ -135,26 +142,23 @@
 
       const currentTab = ownerTab ?? gBrowser.selectedTab;
 
-      this.animatingOpen = true;
-      this._animating = true;
-
       const browserElement = this.createBrowserElement(data.url, currentTab, existingTab);
 
       this.fillOverlay(browserElement);
-      this.showSidebarButtons(true);
 
       this.overlay.classList.add('zen-glance-overlay');
 
       this.browserWrapper.removeAttribute('animate-end');
       window.requestAnimationFrame(() => {
-        this.quickOpenGlance();
+        this.quickOpenGlance({ dontOpenButtons: true });
+        this.showSidebarButtons(true);
 
         gZenUIManager.motion.animate(
           this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
           {
-            scale: 0.98,
-            backdropFilter: 'blur(5px)',
-            opacity: 0.6,
+            scale: [1, 0.98],
+            backdropFilter: ['blur(0px)', 'blur(5px)'],
+            opacity: [1, 0.5],
           },
           {
             duration: 0.4,
@@ -162,7 +166,7 @@
             bounce: 0.2,
           }
         );
-
+        this.#currentBrowser.setAttribute('animate-glance-open', true);
         this.overlay.removeAttribute('fade-out');
         this.browserWrapper.setAttribute('animate', true);
         const top = initialY + initialHeight / 2;
@@ -191,12 +195,13 @@
               opacity: 1,
             },
             {
-              duration: 0.4,
+              duration: 0.3,
               type: 'spring',
               bounce: 0.2,
             }
           )
           .then(() => {
+            this.#currentBrowser.removeAttribute('animate-glance-open');
             this.overlay.style.removeProperty('overflow');
             this.browserWrapper.removeAttribute('animate');
             this.browserWrapper.setAttribute('animate-end', true);
@@ -207,7 +212,7 @@
       });
     }
 
-    closeGlance({ noAnimation = false, onTabClose = false } = {}) {
+    closeGlance({ noAnimation = false, onTabClose = false, setNewID = null, isDifferent = false } = {}) {
       if (this._animating || !this.#currentBrowser || this.animatingOpen || this._duringOpening) {
         return;
       }
@@ -240,15 +245,29 @@
       this.overlay.style.pointerEvents = 'none';
       this.quickCloseGlance({ justAnimateParent: true, clearID: false });
       const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
-      this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
+      gZenUIManager.motion.animate(
+        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
+        {
+          scale: [0.98, 1],
+          backdropFilter: ['blur(5px)', 'blur(0px)'],
+          opacity: [0.5, 1],
+        },
+        {
+          duration: 0.4,
+          type: 'spring',
+          bounce: 0.2,
+        }
+      ).then(() => {
+        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
+      });
       gZenUIManager.motion
         .animate(
           this.browserWrapper,
           {
             ...originalPosition,
-            opacity: 0,
+            opacity: 0.3,
           },
-          { type: 'spring', bounce: 0, duration: 0.7 }
+          { type: 'spring', bounce: 0, duration: 0.4, easing: 'ease' }
         )
         .then(() => {
           this.browserWrapper.removeAttribute('animate');
@@ -282,8 +301,13 @@
           this.lastCurrentTab._closingGlance = true;
 
           gBrowser.tabContainer._invalidateCachedTabs();
-          gBrowser.selectedTab = this.#currentParentTab;
-          gBrowser.removeTab(this.lastCurrentTab, { animate: false });
+          const prevSelected = gBrowser.selectedTab;
+          if (!isDifferent) {
+            gBrowser.selectedTab = this.#currentParentTab;
+          }
+          if (!(onTabClose && prevSelected === this.lastCurrentTab)) {
+            gBrowser.removeTab(this.lastCurrentTab, { animate: true });
+          }
           this.#currentBrowser.remove();
 
           setTimeout(() => {
@@ -293,23 +317,27 @@
           this.#currentParentTab.removeAttribute('glance-id');
 
           this.#glances.delete(this.#currentGlanceID);
-          this.#currentGlanceID = null;
+          this.#currentGlanceID = setNewID;
 
           this.lastCurrentTab = null;
           this._duringOpening = false;
 
           this._animating = false;
+
+          if (this.#currentGlanceID) {
+            this.quickOpenGlance();
+          }
         });
     }
 
-    quickOpenGlance() {
+    quickOpenGlance({ dontOpenButtons = false } = {}) {
       if (!this.#currentBrowser || this._duringOpening) {
         return;
       }
       this._duringOpening = true;
-      this.showSidebarButtons();
-
-      gBrowser.selectedTab = this.#currentTab;
+      if (!dontOpenButtons) {
+        this.showSidebarButtons();
+      }
 
       const parentBrowserContainer = this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer');
       parentBrowserContainer.classList.add('zen-glance-background');
@@ -323,9 +351,11 @@
       this.fillOverlay(this.#currentBrowser);
       this.#currentParentTab._visuallySelected = true;
       setTimeout(() => {
-        // just to make sure
-        parentBrowserContainer.classList.add('deck-selected');
-        this.#currentParentTab._visuallySelected = true;
+        setTimeout(() => {
+          // just to make sure
+          parentBrowserContainer.classList.add('deck-selected');
+          this.#currentParentTab._visuallySelected = true;
+        }, 0);
       }, 0);
 
       this.overlay.classList.add('deck-selected');
@@ -337,7 +367,7 @@
     quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false, clearID = true } = {}) {
       const parentHasBrowser = !!this.#currentParentTab.linkedBrowser;
       this.hideSidebarButtons();
-      if (!justAnimateParent) {
+      if (!justAnimateParent && this.overlay) {
         if (parentHasBrowser) {
           if (closeParentTab) {
             this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('deck-selected');
@@ -367,9 +397,15 @@
       }
     }
 
+    onLocationChangeOpenGlance() {
+      if (!this.animatingOpen) {
+        this.quickOpenGlance();
+      }
+    }
+
     // note: must be async to avoid timing issues
-    onLocationChange(browser) {
-      const tab = gBrowser.getTabForBrowser(browser);
+    onLocationChange(event) {
+      const tab = event.target;
       if (this.animatingFullOpen) {
         return;
       }
@@ -388,8 +424,8 @@
         setTimeout(() => {
           gBrowser.selectedTab = curTab;
         }, 0);
-      } else if (gBrowser.selectedTab === this.#currentTab && this.#currentParentTab) {
-        setTimeout(this.quickOpenGlance.bind(this), 0);
+      } else if (gBrowser.selectedTab === this.#currentTab) {
+        setTimeout(this.onLocationChangeOpenGlance.bind(this), 0);
       }
     }
 
@@ -409,13 +445,10 @@
           this._ignoreClose = false;
           return false;
         }
-        this._ignoreClose = true;
-        this.closeGlance({ noAnimation: isDifferent, onTabClose: true });
-        if (isDifferent) {
-          this.#currentGlanceID = oldGlanceID;
-        }
+        this._ignoreClose = isDifferent;
+        this.closeGlance({ onTabClose: true, setNewID: isDifferent ? oldGlanceID : null, isDifferent });
         // only keep continueing tab close if we are not on the currently selected tab
-        return !isDifferent;
+        return true;
       }
       return false;
     }
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 11d61e777..4a4bcd470 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..e07019130c199401702889c6765434de0bd708a2 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..566fe3b925738589910598d0242931dd680a8d1e 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -204,11 +204,11 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..e07019130c199401702889c6765434de
        }
  
 -      let tabs = this.visibleTabs.slice(0, gBrowser.pinnedTabCount);
-+      let tabs = this.visibleTabs.slice(0, gBrowser._numVisiblePinTabs);
++      let tabs = this.visibleTabs.slice(0, gBrowser._numVisiblePinTabs).filter(tab => !tab.hasAttribute("zen-glance-tab"));
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2281,9 @@
+@@ -2257,11 +2281,11 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -218,8 +218,11 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..e07019130c199401702889c6765434de
 -        pinned ? 0 : numPinned,
 +        pinned ? gBrowser._numZenEssentials : numPinned,
          pinned ? numPinned : undefined
-       );
+-      );
++      ).filter(tab => !tab.hasAttribute("zen-glance-tab"));
  
+       if (this.#rtlMode) {
+         tabs.reverse();
 @@ -2502,8 +2526,9 @@
        );
      }

From 61190233fcca91294440fc60a659a392c2781e2d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 14:25:05 +0100
Subject: [PATCH 032/191] Enhance tab management by updating tab close handling
 and improving tab drag-and-drop functionality

---
 .../base/zen-components/ZenGlanceManager.mjs  | 13 ++----
 .../zen-components/ZenPinnedTabManager.mjs    |  2 +-
 .../base/zen-components/ZenTabUnloader.mjs    |  2 +-
 .../tabbrowser/content/tab-js.patch           | 17 ++++++--
 .../tabbrowser/content/tabbrowser-js.patch    | 20 +++++++---
 .../tabbrowser/content/tabs-js.patch          | 40 ++++++++++++-------
 src/toolkit/content/widgets/tabbox-js.patch   | 11 ++++-
 7 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 653860e40..5ac4d624d 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -350,13 +350,6 @@
       this.#currentBrowser.setAttribute('zen-glance-selected', true);
       this.fillOverlay(this.#currentBrowser);
       this.#currentParentTab._visuallySelected = true;
-      setTimeout(() => {
-        setTimeout(() => {
-          // just to make sure
-          parentBrowserContainer.classList.add('deck-selected');
-          this.#currentParentTab._visuallySelected = true;
-        }, 0);
-      }, 0);
 
       this.overlay.classList.add('deck-selected');
       this.overlay.classList.add('zen-glance-overlay');
@@ -367,6 +360,9 @@
     quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false, clearID = true } = {}) {
       const parentHasBrowser = !!this.#currentParentTab.linkedBrowser;
       this.hideSidebarButtons();
+      if (parentHasBrowser) {
+        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
+      }
       if (!justAnimateParent && this.overlay) {
         if (parentHasBrowser) {
           if (closeParentTab) {
@@ -389,9 +385,6 @@
         this.#currentBrowser.removeAttribute('zen-glance-selected');
         this.overlay.classList.remove('zen-glance-overlay');
       }
-      if (parentHasBrowser) {
-        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
-      }
       if (clearID) {
         this.#currentGlanceID = null;
       }
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 4834aead4..ddc222b7c 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -673,7 +673,7 @@
         }
       }
       // Check for normal tabs container
-      else if (tabsTarget) {
+      else if (tabsTarget || event.target.id === 'zen-browser-tabs-wrapper') {
         if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
           gBrowser.unpinTab(draggedTab);
           moved = true;
diff --git a/src/browser/base/zen-components/ZenTabUnloader.mjs b/src/browser/base/zen-components/ZenTabUnloader.mjs
index a9a29a16a..4f135842c 100644
--- a/src/browser/base/zen-components/ZenTabUnloader.mjs
+++ b/src/browser/base/zen-components/ZenTabUnloader.mjs
@@ -173,7 +173,7 @@
     }
 
     handleTabClose(tab) {
-      // Nothing yet
+      tab.lastActivity = null;
     }
 
     handleTabOpen(tab) {
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 1e48494ed..723f781b4 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index 60061540d79843281f3ee2ce905824b224da6f46..c01f8a7f18921588ecdc635c281cf01041ef627b 100644
+index d41c486c02a6f09dcff5741a59ad8b617294c481..855152a13afdf58433c228e3675e2e0eebe3892e 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
-@@ -39,6 +39,7 @@
+@@ -37,6 +37,7 @@
              </hbox>
            </vbox>
            <image class="tab-close-button close-icon" role="button" data-l10n-id="tabbrowser-close-tabs-button" data-l10n-args='{"tabCount": 1}' keyNav="false"/>
@@ -10,7 +10,16 @@ index 60061540d79843281f3ee2ce905824b224da6f46..c01f8a7f18921588ecdc635c281cf010
          </hbox>
        </stack>
        `;
-@@ -447,6 +448,7 @@
+@@ -168,7 +169,7 @@
+     }
+ 
+     set _visuallySelected(val) {
+-      if (val == this.hasAttribute("visuallyselected")) {
++      if (val == this.hasAttribute("visuallyselected") || (!val && this.linkedBrowser?.closest('.browserSidebarContainer').classList.contains('zen-glance-background'))) {
+         return;
+       }
+ 
+@@ -451,6 +452,7 @@
          this.style.MozUserFocus = "ignore";
        } else if (
          event.target.classList.contains("tab-close-button") ||
@@ -18,7 +27,7 @@ index 60061540d79843281f3ee2ce905824b224da6f46..c01f8a7f18921588ecdc635c281cf010
          event.target.classList.contains("tab-icon-overlay")
        ) {
          eventMaySelectTab = false;
-@@ -549,6 +551,11 @@
+@@ -553,6 +555,11 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 2b45af37c..968ad3e33 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..9aaa4b0cd8a8bb76c59415f2322d739cbe00302e 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8063e0149827bb3da06b25079efa2a5a6fdfbb3a 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -268,7 +268,17 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..9aaa4b0cd8a8bb76c59415f2322d739c
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7443,6 +7532,7 @@
+@@ -5727,6 +5816,9 @@
+           this.tabContainer.insertBefore(aTab, neighbor);
+         }
+       });
++      if (aTab.hasAttribute("glance-id")) {
++        this.moveTabTo(aTab.querySelector("tab[glance-id]"), aIndex, options);
++      }
+     }
+ 
+     moveTabToGroup(aTab, aGroup) {
+@@ -7443,6 +7535,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -276,7 +286,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..9aaa4b0cd8a8bb76c59415f2322d739c
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8501,7 @@ var TabContextMenu = {
+@@ -8411,7 +8504,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -285,7 +295,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..9aaa4b0cd8a8bb76c59415f2322d739c
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8534,7 @@ var TabContextMenu = {
+@@ -8444,7 +8537,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -294,7 +304,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..9aaa4b0cd8a8bb76c59415f2322d739c
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8767,7 @@ var TabContextMenu = {
+@@ -8677,6 +8770,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 4a4bcd470..ce90ef9aa 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..566fe3b925738589910598d0242931dd680a8d1e 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857a82ff94c 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -62,15 +62,17 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..566fe3b925738589910598d0242931dd
        if (draggedTab && dropEffect == "copy") {
          // copy the dropped tab (wherever it's from)
          let newIndex = this._getDropIndex(event);
-@@ -1010,7 +1022,7 @@
+@@ -1010,8 +1022,8 @@
            }
          } else {
            let pinned = draggedTab.pinned;
 -          let numPinned = gBrowser.pinnedTabCount;
+-          let tabs = this.visibleTabs.slice(
 +          let numPinned = gBrowser._numVisiblePinTabs;
-           let tabs = this.visibleTabs.slice(
++          let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
              pinned ? 0 : numPinned,
              pinned ? numPinned : undefined
+           );
 @@ -1090,7 +1102,7 @@
                let postTransitionCleanup = () => {
                  tab.removeAttribute("tabdrop-samewindow");
@@ -155,6 +157,15 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..566fe3b925738589910598d0242931dd
        selectedTab._notselectedsinceload = false;
      }
  
+@@ -1843,7 +1867,7 @@
+         return;
+       }
+ 
+-      let tabs = this.visibleTabs;
++      let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
+       if (!tabs.length) {
+         return;
+       }
 @@ -1879,7 +1903,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
@@ -181,8 +192,9 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..566fe3b925738589910598d0242931dd
 +      let numPinned = gBrowser._numVisiblePinTabs;
  
 -      if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
+-        let tabs = this.visibleTabs;
 +      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length + document.getElementById("zen-essentials-container").children.length)) {
-         let tabs = this.visibleTabs;
++        let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
          for (let i = 0; i < numPinned; i++) {
            tabs[i].style.marginInlineStart = "";
 -          verticalTabsContainer.appendChild(tabs[i]);
@@ -190,11 +202,13 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..566fe3b925738589910598d0242931dd
          }
        }
  
-@@ -1993,7 +2017,7 @@
+@@ -1992,8 +2016,8 @@
+     }
  
      _positionPinnedTabs() {
-       let tabs = this.visibleTabs;
+-      let tabs = this.visibleTabs;
 -      let numPinned = gBrowser.pinnedTabCount;
++      let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
 +      let numPinned = gBrowser._numVisiblePinTabs;
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
@@ -204,25 +218,23 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..566fe3b925738589910598d0242931dd
        }
  
 -      let tabs = this.visibleTabs.slice(0, gBrowser.pinnedTabCount);
-+      let tabs = this.visibleTabs.slice(0, gBrowser._numVisiblePinTabs).filter(tab => !tab.hasAttribute("zen-glance-tab"));
++      let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(0, gBrowser._numVisiblePinTabs);
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,11 +2281,11 @@
+@@ -2257,9 +2281,9 @@
        }
  
        let pinned = draggedTab.pinned;
 -      let numPinned = gBrowser.pinnedTabCount;
-+      let numPinned = gBrowser._numVisiblePinTabs;
-       let tabs = this.visibleTabs.slice(
+-      let tabs = this.visibleTabs.slice(
 -        pinned ? 0 : numPinned,
++      let numPinned = gBrowser._numVisiblePinTabs;
++      let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
 +        pinned ? gBrowser._numZenEssentials : numPinned,
          pinned ? numPinned : undefined
--      );
-+      ).filter(tab => !tab.hasAttribute("zen-glance-tab"));
+       );
  
-       if (this.#rtlMode) {
-         tabs.reverse();
 @@ -2502,8 +2526,9 @@
        );
      }
diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch
index b7294a61f..16babc2ad 100644
--- a/src/toolkit/content/widgets/tabbox-js.patch
+++ b/src/toolkit/content/widgets/tabbox-js.patch
@@ -1,7 +1,16 @@
 diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
-index 033582a3badb65d50f58a11f8a259e28eaa04ef3..a2f655f2444bcf638434f39278e1a3de725de4d6 100644
+index 033582a3badb65d50f58a11f8a259e28eaa04ef3..fc79b5fb64ad17c3446979aa017fffb7f8ac3467 100644
 --- a/toolkit/content/widgets/tabbox.js
 +++ b/toolkit/content/widgets/tabbox.js
+@@ -210,7 +210,7 @@
+     ) {
+       this._inAsyncOperation = false;
+       if (oldPanel != this._selectedPanel) {
+-        oldPanel?.classList.remove("deck-selected");
++        if (!oldPanel?.classList.contains("zen-glance-background")) oldPanel?.classList.remove("deck-selected");
+         this._selectedPanel?.classList.add("deck-selected");
+       }
+       this.setAttribute("selectedIndex", val);
 @@ -820,7 +820,7 @@
          if (tab == startTab) {
            return null;

From 093074a9fc8ceedabb98b80bf2648ac6350abedd Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 14:31:12 +0100
Subject: [PATCH 033/191] Refactor tab handling in ZenGlanceManager and update
 tab filtering logic for improved performance

---
 .../base/zen-components/ZenGlanceManager.mjs  | 32 ++++++++++---------
 .../tabbrowser/content/tabbrowser-js.patch    | 11 ++++++-
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 5ac4d624d..3a7438a82 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -245,21 +245,23 @@
       this.overlay.style.pointerEvents = 'none';
       this.quickCloseGlance({ justAnimateParent: true, clearID: false });
       const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
-      gZenUIManager.motion.animate(
-        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
-        {
-          scale: [0.98, 1],
-          backdropFilter: ['blur(5px)', 'blur(0px)'],
-          opacity: [0.5, 1],
-        },
-        {
-          duration: 0.4,
-          type: 'spring',
-          bounce: 0.2,
-        }
-      ).then(() => {
-        this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
-      });
+      gZenUIManager.motion
+        .animate(
+          this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
+          {
+            scale: [0.98, 1],
+            backdropFilter: ['blur(5px)', 'blur(0px)'],
+            opacity: [0.5, 1],
+          },
+          {
+            duration: 0.4,
+            type: 'spring',
+            bounce: 0.2,
+          }
+        )
+        .then(() => {
+          this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
+        });
       gZenUIManager.motion
         .animate(
           this.browserWrapper,
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 968ad3e33..4970ccd6b 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8063e0149827bb3da06b25079efa2a5a6fdfbb3a 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e9240ba35 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -196,6 +196,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8063e0149827bb3da06b25079efa2a5a
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
+@@ -3780,7 +3859,7 @@
+       }
+ 
+       /** @type {MozTabbrowserTab|undefined} */
+-      let tabAfter = this.tabs.at(index);
++      let tabAfter = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).at(index);
+       this.tabContainer._invalidateCachedTabs();
+ 
+       if (tabGroup) {
 @@ -4095,6 +4174,9 @@
          return;
        }

From 0cdc7351df45af94230e053489503b52b9a3c594 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 15:40:54 +0100
Subject: [PATCH 034/191] Update sidebar order in vertical-tabs.css for
 improved layout consistency

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

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index e17e45800..28ca0ebee 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -737,11 +737,11 @@
 /* Mark: Move sidebar to the right */
 :root[zen-right-side='true'] {
   & #navigator-toolbox {
-    order: 3 !important;
+    order: 9 !important;
   }
 
   & #zen-sidebar-splitter {
-    order: 2 !important;
+    order: 10 !important;
   }
 }
 

From 792c562a352b67a5f37bcd207d1eda1043520492 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 16:03:35 +0100
Subject: [PATCH 035/191] Refactor vertical-tabs and theme styles for improved
 layout and transition effects

---
 .../zen-styles/zen-tabs/vertical-tabs.css     |  8 +++----
 .../base/content/zen-styles/zen-theme.css     |  2 +-
 .../content/zen-styles/zen-workspaces.css     | 21 +++++++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 28ca0ebee..d663b70b6 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -737,11 +737,11 @@
 /* Mark: Move sidebar to the right */
 :root[zen-right-side='true'] {
   & #navigator-toolbox {
-    order: 9 !important;
+    order: 10 !important;
   }
 
   & #zen-sidebar-splitter {
-    order: 10 !important;
+    order: 9 !important;
   }
 }
 
@@ -960,7 +960,7 @@
 
   & .tab-background {
     border-radius: var(--border-radius-medium) !important;
-    transition: background 0.2s ease-in-out;
+    transition: background 0.1s ease-in-out;
   }
 
   --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.2));
@@ -1021,7 +1021,7 @@
         inset: 0;
         z-index: 0;
         content: "";
-        transition: background 0.2s ease-in-out;
+        transition: background 0.1s ease-in-out;
       }
     }
 
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index a4e15cb8a..e022c62c9 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -179,7 +179,7 @@
       * 1. If the native radius - the separation is less than 4px, use 4px.
       * 2. Otherwise, use the the calculated value (inner radius = outer radius - separation).
     */
-      max(5px, calc(var(--zen-native-content-radius) - var(--zen-element-separation)))
+      max(5px, calc(var(--zen-native-content-radius) - var(--zen-element-separation) / 2))
   );
 
   /** Other theme-related styles */
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 3fe0b2a71..963255594 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -460,6 +460,27 @@
   align-items: center;
   position: relative;
 
+  &::before {
+    border-radius: var(--border-radius-medium);
+    background: transparent;
+    transition: background 0.1s;
+    pointer-events: none;
+    content: '';
+    position: absolute;
+    top: 6px;
+    left: 2px;
+    z-index: -1;
+    width: calc(100% - 4px);
+    height: calc(100% - 12px);
+  }
+
+  &:hover,
+  &[open='true'] {
+    &::before {
+      background: var(--zen-toolbar-element-bg);
+    }
+  }
+
   & #zen-current-workspace-indicator-icon {
     font-size: 14px;
   }

From ba3eca56294a396eb6c882810fe7d7ce8a5c1c1a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 17:48:41 +0100
Subject: [PATCH 036/191] Refactor zen-theme styles and update icon SVGs for
 improved consistency and performance

---
 .../zen-styles/zen-tabs/vertical-tabs.css     |   7 +-
 .../base/content/zen-styles/zen-theme.css     |   2 +
 .../base/content/zen-styles/zen-urlbar.css    |  16 +-
 .../themes/shared/browser-shared-css.patch    |  13 +-
 .../themes/shared/zen-icons/accessibility.svg |   9 +-
 .../shared/zen-icons/add-to-dictionary.svg    |  10 +-
 .../themes/shared/zen-icons/arrow-down.svg    |   9 +-
 .../themes/shared/zen-icons/arrow-left.svg    |   9 +-
 .../themes/shared/zen-icons/arrow-right.svg   |   9 +-
 .../themes/shared/zen-icons/arrow-up.svg      |   9 +-
 .../themes/shared/zen-icons/audio-save.svg    |  10 +-
 .../zen-icons/autoplay-media-blocked.svg      |  11 +-
 .../shared/zen-icons/autoplay-media.svg       |   9 +-
 src/browser/themes/shared/zen-icons/back.svg  |  10 +-
 .../shared/zen-icons/bookmark-hollow.svg      |   9 +-
 .../zen-icons/bookmark-star-on-tray.svg       |  10 +-
 .../themes/shared/zen-icons/bookmark.svg      |   9 +-
 .../shared/zen-icons/camera-blocked.svg       |  11 +-
 .../themes/shared/zen-icons/camera.svg        |   9 +-
 .../shared/zen-icons/canvas-blocked.svg       |   2 +-
 .../themes/shared/zen-icons/canvas.svg        |   9 +-
 .../themes/shared/zen-icons/checkmark.svg     |   9 +-
 .../themes/shared/zen-icons/chevron.svg       |  10 +-
 .../themes/shared/zen-icons/close-all.svg     |   7 +-
 src/browser/themes/shared/zen-icons/close.svg |   9 +-
 .../themes/shared/zen-icons/container-tab.svg |   9 +-
 .../themes/shared/zen-icons/customize.svg     |   9 +-
 .../desktop-notification-blocked.svg          |  11 +-
 .../shared/zen-icons/desktop-notification.svg |   9 +-
 .../themes/shared/zen-icons/developer.svg     |   9 +-
 .../themes/shared/zen-icons/downloads.svg     |  10 +-
 .../shared/zen-icons/drag-indicator.svg       |   9 +-
 .../themes/shared/zen-icons/duplicate-tab.svg |   9 +-
 .../themes/shared/zen-icons/edit-copy.svg     |   9 +-
 .../themes/shared/zen-icons/edit-cut.svg      |   9 +-
 .../themes/shared/zen-icons/edit-delete.svg   |   9 +-
 .../themes/shared/zen-icons/edit-paste.svg    |   9 +-
 .../themes/shared/zen-icons/edit-redo.svg     |   9 +-
 .../shared/zen-icons/edit-select-all.svg      |   9 +-
 .../themes/shared/zen-icons/edit-theme.svg    |   1 +
 .../themes/shared/zen-icons/edit-undo.svg     |   9 +-
 src/browser/themes/shared/zen-icons/edit.svg  |   9 +-
 .../themes/shared/zen-icons/essential-add.svg |   7 +-
 .../shared/zen-icons/essential-remove.svg     |   7 +-
 .../themes/shared/zen-icons/ext-link.svg      |  10 +-
 .../shared/zen-icons/extension-blocked.svg    |  11 +-
 .../themes/shared/zen-icons/extension.svg     |   9 +-
 .../themes/shared/zen-icons/firefox-logo.svg  |   6 -
 .../themes/shared/zen-icons/firefox.svg       |   2 +-
 .../themes/shared/zen-icons/folder.svg        |   7 +-
 .../themes/shared/zen-icons/forget.svg        |   9 +-
 .../themes/shared/zen-icons/forward.svg       |   7 +-
 .../shared/zen-icons/fullscreen-exit.svg      |   9 +-
 .../themes/shared/zen-icons/fullscreen.svg    |   9 +-
 .../themes/shared/zen-icons/geo-blocked.svg   |  11 +-
 src/browser/themes/shared/zen-icons/geo.svg   |   9 +-
 src/browser/themes/shared/zen-icons/help.svg  |   9 +-
 .../themes/shared/zen-icons/history.svg       |  10 +-
 src/browser/themes/shared/zen-icons/home.svg  |   9 +-
 src/browser/themes/shared/zen-icons/icons.css |  10 +-
 .../themes/shared/zen-icons/image-copy.svg    |  11 +-
 .../themes/shared/zen-icons/image-open.svg    |  14 +-
 .../themes/shared/zen-icons/image-save.svg    |  10 +-
 src/browser/themes/shared/zen-icons/info.svg  |   9 +-
 .../themes/shared/zen-icons/inspect.svg       |   9 +-
 .../themes/shared/zen-icons/jar.inc.mn        |  11 +-
 .../themes/shared/zen-icons/library.svg       |   9 +-
 src/browser/themes/shared/zen-icons/link.svg  |   9 +-
 .../themes/shared/zen-icons/mac-close.svg     | 259 --------
 .../themes/shared/zen-icons/mac-maximize.svg  | 576 -----------------
 .../themes/shared/zen-icons/mac-minimize.svg  | 582 -----------------
 .../themes/shared/zen-icons/mac-restore.svg   | 588 ------------------
 src/browser/themes/shared/zen-icons/mail.svg  |   3 +-
 .../themes/shared/zen-icons/manage.svg        |   9 +-
 .../themes/shared/zen-icons/media-loop.svg    |   9 +-
 .../themes/shared/zen-icons/media-mute.svg    |   9 +-
 .../themes/shared/zen-icons/media-pause.svg   |   9 +-
 .../themes/shared/zen-icons/media-pip.svg     |   9 +-
 .../themes/shared/zen-icons/media-play.svg    |   9 +-
 .../themes/shared/zen-icons/media-speed.svg   |   9 +-
 .../themes/shared/zen-icons/media-unmute.svg  |   9 +-
 .../themes/shared/zen-icons/menu-bar.svg      |   7 +-
 src/browser/themes/shared/zen-icons/menu.svg  |  11 +-
 .../shared/zen-icons/microphone-blocked.svg   |  11 +-
 .../themes/shared/zen-icons/microphone.svg    |   9 +-
 src/browser/themes/shared/zen-icons/midi.svg  |   2 +-
 .../themes/shared/zen-icons/move-tab.svg      |   9 +-
 .../themes/shared/zen-icons/new-tab-image.svg |  12 +-
 .../zen-icons/nucleo-copyright-notice.html    |  16 +
 src/browser/themes/shared/zen-icons/open.svg  |   9 +-
 .../themes/shared/zen-icons/page-portrait.svg |   9 +-
 .../themes/shared/zen-icons/passwords.svg     |   9 +-
 .../themes/shared/zen-icons/paste-and-go.svg  |   9 +-
 .../themes/shared/zen-icons/permissions.svg   |   9 +-
 .../zen-icons/persistent-storage-blocked.svg  |  11 +-
 .../shared/zen-icons/persistent-storage.svg   |   9 +-
 src/browser/themes/shared/zen-icons/pin.svg   |   9 +-
 src/browser/themes/shared/zen-icons/plus.svg  |   9 +-
 .../shared/zen-icons/pocket-outline.svg       |   2 +-
 src/browser/themes/shared/zen-icons/popup.svg |  11 +-
 src/browser/themes/shared/zen-icons/print.svg |   9 +-
 .../shared/zen-icons/private-window.svg       |  10 +-
 .../shared/zen-icons/privateBrowsing.svg      |   9 +-
 .../themes/shared/zen-icons/reader-mode.svg   |  10 +-
 .../themes/shared/zen-icons/reload.svg        |   9 +-
 .../themes/shared/zen-icons/report.svg        |   9 +-
 src/browser/themes/shared/zen-icons/save.svg  |   9 +-
 .../shared/zen-icons/screen-blocked.svg       |  11 +-
 .../themes/shared/zen-icons/screen.svg        |   9 +-
 .../themes/shared/zen-icons/screenshot.svg    |   9 +-
 .../themes/shared/zen-icons/search-glass.svg  |   9 +-
 .../themes/shared/zen-icons/search-page.svg   |   9 +-
 .../shared/zen-icons/security-broken.svg      |   9 +-
 .../shared/zen-icons/security-warning.svg     |  10 +-
 .../themes/shared/zen-icons/security.svg      |   9 +-
 .../shared/zen-icons/send-to-device.svg       |   9 +-
 .../themes/shared/zen-icons/settings.svg      |   9 +-
 src/browser/themes/shared/zen-icons/share.svg |   9 +-
 .../shared/zen-icons/sidebars-right.svg       |   9 +-
 .../themes/shared/zen-icons/source-code.svg   |   9 +-
 .../themes/shared/zen-icons/spell-check.svg   |  11 +-
 src/browser/themes/shared/zen-icons/split.svg |  17 +-
 .../zen-icons/tab-audio-blocked-small.svg     |  10 +-
 .../zen-icons/tab-audio-muted-small.svg       |  10 +-
 .../zen-icons/tab-audio-playing-small.svg     |  10 +-
 src/browser/themes/shared/zen-icons/tab.svg   |   9 +-
 .../themes/shared/zen-icons/tool-profiler.svg |   9 +-
 .../shared/zen-icons/tracking-protection.svg  |   9 +-
 .../themes/shared/zen-icons/translations.svg  |   7 +-
 src/browser/themes/shared/zen-icons/unpin.svg |   7 +-
 .../themes/shared/zen-icons/video-open.svg    |  11 +-
 .../themes/shared/zen-icons/video-save.svg    |  11 +-
 .../shared/zen-icons/win11-close-dark.svg     |   8 -
 .../themes/shared/zen-icons/win11-close.svg   |   8 -
 .../shared/zen-icons/win11-maximize.svg       |   8 -
 .../shared/zen-icons/win11-minimize.svg       |   9 -
 .../themes/shared/zen-icons/win11-restore.svg |   8 -
 .../themes/shared/zen-icons/window.svg        |   9 +-
 .../themes/shared/zen-icons/xr-blocked.svg    |  11 +-
 src/browser/themes/shared/zen-icons/xr.svg    |   9 +-
 .../themes/shared/zen-icons/zoom-control.svg  |   9 +-
 .../themes/shared/zen-icons/zoom-out.svg      |   9 +-
 142 files changed, 179 insertions(+), 3076 deletions(-)
 create mode 100644 src/browser/themes/shared/zen-icons/edit-theme.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/firefox-logo.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/mac-close.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/mac-maximize.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/mac-minimize.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/mac-restore.svg
 create mode 100644 src/browser/themes/shared/zen-icons/nucleo-copyright-notice.html
 delete mode 100644 src/browser/themes/shared/zen-icons/win11-close-dark.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win11-close.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win11-maximize.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win11-minimize.svg
 delete mode 100644 src/browser/themes/shared/zen-icons/win11-restore.svg

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index d663b70b6..cdadceb55 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -748,11 +748,10 @@
 /* Mark: Override the default tab close button */
 #tabbrowser-tabs {
   & .tabbrowser-tab {
-    &[pinned] .tab-close-button {
+    &[pinned][visuallyselected] .tab-close-button {
       display: none !important;
     }
 
-    &[pinned]:not([zen-essential]):hover .tab-reset-button,
     &[pinned][visuallyselected]:not([zen-essential]) .tab-reset-button {
       display: block;
     }
@@ -761,7 +760,7 @@
       display: none;
     }
 
-    &:not([pinned]) .tab-reset-button {
+    &:not([pinned][visuallyselected]) .tab-reset-button {
       display: none;
     }
 
@@ -777,7 +776,7 @@
   border-radius: var(--tab-border-radius);
   color: inherit;
   fill: currentColor;
-  padding: 6px;
+  padding: var(--tab-close-button-padding);
   width: 24px;
   height: 24px;
   outline: var(--toolbarbutton-outline);
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index e022c62c9..fa51fa32f 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -146,6 +146,8 @@
   --fp-contextmenu-bgcolor: light-dark(Menu, rgb(43 42 51 / 0.95));
   --toolbar-bgcolor: transparent;
 
+  --tab-close-button-padding: 5px !important;
+
   --toolbarbutton-active-background: var(--zen-toolbar-element-bg);
 
   --input-bgcolor: var(--zen-colors-tertiary) !important;
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index eda3ebab3..8a6f61373 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -131,7 +131,7 @@
   #tracking-protection-icon-container {
     margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding)) !important;
     opacity: 0;
-    transition: all 0.2s;
+    transition: all 0.1s ease;
   }
 
   #identity-permission-box > *:not(#permissions-granted-icon) {
@@ -234,9 +234,23 @@ button.popup-notification-dropmarker {
 }
 
 @container urlbar-container (width < 350px) {
+  #userContext-icons {
+    transition: all 0.1s ease;
+  }
+
   #userContext-label {
     display: none;
   }
+
+  #userContext-indicator {
+    margin-inline-end: 2px;
+  }
+
+  #urlbar:hover:not([breakout-extend='true']) #userContext-icons {
+    margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding)) !important;
+    opacity: 0;
+    pointer-events: none;
+  }
 }
 
 @media (max-width: 550px) {
diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch
index 062b3f5d5..8b235373c 100644
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ b/src/browser/themes/shared/browser-shared-css.patch
@@ -1,8 +1,17 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index b4854731c08b2f463751bb907cb44130ee6b6d2a..18d96cb457f5e57ed00b4eec6d2702287bfc72c7 100644
+index 7fcb1d906c3aaec3e6b099ae731267c2b9d0b96a..ea8e0f510b09faaed0955e9974a2d9f285a52649 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -147,8 +147,6 @@ body {
+@@ -78,7 +78,7 @@ body {
+   --toolbarbutton-border-radius: 4px;
+   --identity-box-margin-inline: 4px;
+   --urlbar-min-height: max(32px, 1.4em);
+-  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
++  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 14px /* icon */) / 2);
+ 
+   /* This should be used for icons and chiclets inside the input field. It makes
+      the gap around them more uniform when they are close to the field edges */
+@@ -148,8 +148,6 @@ body {
     */
    &.fullscreen-with-menubar {
      z-index: var(--browser-area-z-index-toolbox-while-animating);
diff --git a/src/browser/themes/shared/zen-icons/accessibility.svg b/src/browser/themes/shared/zen-icons/accessibility.svg
index fccb13583..89d9baa0b 100644
--- a/src/browser/themes/shared/zen-icons/accessibility.svg
+++ b/src/browser/themes/shared/zen-icons/accessibility.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a2.5 2.5 0 0 0-2.396 3.213l-2.24-.847a1.746 1.746 0 0 0-1.245 3.26L5 6.736v2.398l-1.643 4.524a1.747 1.747 0 0 0 3.284 1.194L8 11.145l1.365 3.702a1.745 1.745 0 0 0 3.278-1.2L11 9.124V6.73l2.867-1.087a1.752 1.752 0 1 0-1.244-3.278l-2.227.843A2.5 2.5 0 0 0 8 0zm0 1a1.5 1.5 0 1 1 0 2.999 1.5 1.5 0 0 1 0-3zM2.729 3.252a.74.74 0 0 1 .28.05l4.104 1.551c.571.216 1.201.216 1.772 0l4.094-1.552a.754.754 0 1 1 .535 1.41l-3.192 1.208a.498.498 0 0 0-.322.467V9.21c0 .058.01.117.03.171l1.673 4.608a.745.745 0 0 1-1.4.511l-1.37-3.719c-.319-.867-1.547-.866-1.865.002L5.703 14.51a.747.747 0 1 1-1.404-.511l1.67-4.606A.497.497 0 0 0 6 9.222v-2.83a.5.5 0 0 0-.32-.467L2.479 4.693a.745.745 0 0 1 .25-1.44z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="2.25" r="1.5" data-color="color-2"></circle><line x1="7.25" y1="16.5" x2="7.25" y2="6.24"></line><line x1="10.75" y1="6.24" x2="10.75" y2="16.5"></line><path d="M2.75,5.75c1.751,.3,3.86,.531,6.25,.531,1.777,0,3.894-.128,6.25-.531"></path><line x1="7.25" y1="11.25" x2="10.75" y2="11.25"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/add-to-dictionary.svg b/src/browser/themes/shared/zen-icons/add-to-dictionary.svg
index a8f648706..6f6dfdabb 100644
--- a/src/browser/themes/shared/zen-icons/add-to-dictionary.svg
+++ b/src/browser/themes/shared/zen-icons/add-to-dictionary.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M4 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h4.35a5.769 5.769 0 0 1-1.076-1H4.001a1 1 0 0 1-1-1h3.605a5.376 5.376 0 0 1-.406-1H3V2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v4.199a5.2 5.2 0 0 1 1 .398V2a2 2 0 0 0-2-2H4zm1 2a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H5zm0 1h6v1H5V3z"/>
-  <path d="M16 11.5a4.5 4.5 0 1 1-9 0 4.5 4.5 0 0 1 9 0zm-4-2a.5.5 0 0 0-1 0V11H9.5a.5.5 0 0 0 0 1H11v1.5a.5.5 0 0 0 1 0V12h1.5a.5.5 0 0 0 0-1H12z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.181,3.257c-.221-.865-.998-1.507-1.931-1.507H5.75c-1.105,0-2,.896-2,2v12.5l5.25-3.5,5.25,3.5v-3"></path><line x1="14.25" y1="5.75" x2="14.25" y2="10.75" data-color="color-2"></line><line x1="16.75" y1="8.25" x2="11.75" y2="8.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-down.svg b/src/browser/themes/shared/zen-icons/arrow-down.svg
index 67e9236c0..1ef89c26f 100644
--- a/src/browser/themes/shared/zen-icons/arrow-down.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-down.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 11.5a.547.547 0 0 1-.389-.162L2.146 5.854a.5.5 0 1 1 .707-.705L8 10.313l5.146-5.164a.5.5 0 1 1 .71.705l-5.466 5.484A.55.55 0 0 1 8 11.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="15.25 6.5 9 12.75 2.75 6.5"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-left.svg b/src/browser/themes/shared/zen-icons/arrow-left.svg
index dd6151fec..21c2342a2 100644
--- a/src/browser/themes/shared/zen-icons/arrow-left.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-left.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path transform="scale(-1 1) translate(-16 0)" d="M5.5 2a.5.5 0 0 0-.354.853L10.313 8l-5.167 5.146a.5.5 0 0 0 .707.71l5.484-5.468a.548.548 0 0 0 0-.777L5.853 2.143A.496.496 0 0 0 5.5 2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="11.5 15.25 5.25 9 11.5 2.75"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-right.svg b/src/browser/themes/shared/zen-icons/arrow-right.svg
index 154f9da2c..eaf6fc7c0 100644
--- a/src/browser/themes/shared/zen-icons/arrow-right.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-right.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M5.5 2a.5.5 0 0 0-.354.853L10.313 8l-5.167 5.146a.5.5 0 0 0 .707.71l5.484-5.468a.548.548 0 0 0 0-.777L5.853 2.143A.496.496 0 0 0 5.5 2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="6.5 2.75 12.75 9 6.5 15.25"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-up.svg b/src/browser/themes/shared/zen-icons/arrow-up.svg
index 2f77795cd..7502b1f11 100644
--- a/src/browser/themes/shared/zen-icons/arrow-up.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-up.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 4.5a.547.547 0 0 0-.389.162l-5.465 5.484a.5.5 0 1 0 .707.705L8 5.687l5.146 5.164a.5.5 0 1 0 .71-.705L8.388 4.662A.55.55 0 0 0 8 4.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 11.5 9 5.25 15.25 11.5"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/audio-save.svg b/src/browser/themes/shared/zen-icons/audio-save.svg
index e017060dc..a5bc48b88 100644
--- a/src/browser/themes/shared/zen-icons/audio-save.svg
+++ b/src/browser/themes/shared/zen-icons/audio-save.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M14.13 7c-.478 0-.957.18-1.322.547l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.498a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.02-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7zm-.002 1.002c.427.002.671.224.8.537.13.314.116.643-.187.947l-4.826 4.826a1.204 1.204 0 0 1-.556.315l-1.316.332.33-1.32H8.37c.053-.21.163-.403.316-.557l4.828-4.83a.85.85 0 0 1 .614-.25zm-6.266 7 .002.002H7.86z"/>
-  <path d="M12.94.182c-.08.004-.162.02-.242.045l-7 2.188a.998.998 0 0 0-.701.953V11.5a2.5 2.5 0 1 0 1 2V6.368l7-2.188v2.055c.32-.137.66-.213 1-.229V1.18c0-.59-.5-1.032-1.057-.998zm.057.998v1.953l-7 2.188V3.368l7-2.188zM3.497 12a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="7.25" x2="5.75" y2="13.75"></line><line x1="14.75" y1="5.75" x2="14.75" y2="12.25"></line><path d="m8.6399,3.0186l4.9461-.8246c.61-.102,1.164.368,1.164.986v2.57l-9,1.5"></path><circle cx="3.75" cy="13.75" r="2"></circle><circle cx="12.75" cy="12.25" r="2"></circle><line x1="3.75" y1="1.25" x2="3.75" y2="6.25" data-color="color-2"></line><line x1="6.25" y1="3.75" x2="1.25" y2="3.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg b/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg
index 63a5c0f88..aeb9a98eb 100644
--- a/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M12.94.182c-.08.004-.162.017-.242.043l-7 2.188a1 1 0 0 0-.701.955V11.5a2.5 2.5 0 1 0 1 2V6.368l7-2.188V9.5a2.5 2.5 0 1 0 1 2V1.18c0-.59-.5-1.032-1.057-.998zm.057.998v1.953l-7 2.188V3.368l7-2.188zm-1.5 8.82a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3zm-8 2a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.25,8.75V1.75s1.303,2.048,3.427,3.573"></path><path d="M5.406,16.13c.268,.078,.551,.12,.844,.12,1.657,0,3-1.343,3-3,0-.293-.042-.577-.12-.844"></path><path d="M7.485,10.515c-.377-.17-.795-.265-1.235-.265-1.657,0-3,1.343-3,3,0,.44,.095,.858,.265,1.235"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/autoplay-media.svg b/src/browser/themes/shared/zen-icons/autoplay-media.svg
index f8e887385..20a6a2c81 100644
--- a/src/browser/themes/shared/zen-icons/autoplay-media.svg
+++ b/src/browser/themes/shared/zen-icons/autoplay-media.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M12.94.182c-.08.004-.162.017-.242.043l-7 2.188a1 1 0 0 0-.701.955V11.5a2.5 2.5 0 1 0 1 2V6.368l7-2.188V9.5a2.5 2.5 0 1 0 1 2V1.18c0-.59-.5-1.032-1.057-.998zm.057.998v1.953l-7 2.188V3.368l7-2.188zm-1.5 8.82a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3zm-8 2a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.75,13.25V1.75s1.75,2.75,4.5,4.25" data-color="color-2"></path><circle cx="6.75" cy="13.25" r="3"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/back.svg b/src/browser/themes/shared/zen-icons/back.svg
index b48dd7cd2..1678b6024 100644
--- a/src/browser/themes/shared/zen-icons/back.svg
+++ b/src/browser/themes/shared/zen-icons/back.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity"
-	 viewBox="0 0 16 16" xml:space="preserve">
-<path d="M9.7,13.9L3.8,8l5.9-5.9l0.7,0.7L5.1,8l5.3,5.3L9.7,13.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="2.75" y1="9" x2="15.25" y2="9" data-color="color-2"></line><polyline points="7 13.25 2.75 9 7 4.75"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/bookmark-hollow.svg b/src/browser/themes/shared/zen-icons/bookmark-hollow.svg
index 09adfebbe..0d1792366 100644
--- a/src/browser/themes/shared/zen-icons/bookmark-hollow.svg
+++ b/src/browser/themes/shared/zen-icons/bookmark-hollow.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.002.3a.99.99 0 0 0-.898.557L5.174 4.77l-4.316.627a1 1 0 0 0-.555 1.705l3.123 3.045-.736 4.3A1 1 0 0 0 4.14 15.5l3.862-2.029 3.859 2.03a1 1 0 0 0 1.45-1.056l-.736-4.299 3.123-3.045a1 1 0 0 0-.554-1.705l-4.316-.627L8.898.857A.987.987 0 0 0 8 .301zm0 1 1.93 3.91c.146.296.426.5.752.548l4.318.629-3.125 3.043c-.236.23-.343.562-.287.886l.738 4.3-3.86-2.03a1.002 1.002 0 0 0-.932 0l-3.86 2.03.737-4.3a1.003 1.003 0 0 0-.287-.886L1.003 6.387l4.316-.63a.998.998 0 0 0 .752-.546z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,16.25l-4.75-3.5-4.75,3.5V6.75c0-1.105,.895-2,2-2h5.5c1.105,0,2,.895,2,2v9.5Z"></path><path d="M6.781,2c.287-.159,.617-.25,.969-.25h5.5c1.105,0,2,.895,2,2V13.25" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg b/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg
index 51f2d4e83..0d1792366 100644
--- a/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg
+++ b/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-linecap="round" stroke-width="1.001">
-  <path d="m8 12.95-4.09 2.151a.501.501 0 0 1-.727-.528l.731-4.266a.561.562 0 0 0-.161-.498L.655 6.79a.501.501 0 0 1 .278-.855l4.28-.623a.561.562 0 0 0 .423-.307L7.55 1.123a.501.501 0 0 1 .9 0l2.031 4.115a.475.475 0 0 0 .426.264H15.5"/>
-  <path d="M15.5 8.5h-5M10.5 11.5h5"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,16.25l-4.75-3.5-4.75,3.5V6.75c0-1.105,.895-2,2-2h5.5c1.105,0,2,.895,2,2v9.5Z"></path><path d="M6.781,2c.287-.159,.617-.25,.969-.25h5.5c1.105,0,2,.895,2,2V13.25" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/bookmark.svg b/src/browser/themes/shared/zen-icons/bookmark.svg
index a725501d7..d4af6bbbf 100644
--- a/src/browser/themes/shared/zen-icons/bookmark.svg
+++ b/src/browser/themes/shared/zen-icons/bookmark.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.002.3a.99.99 0 0 0-.898.557L5.174 4.77l-4.316.627a1 1 0 0 0-.555 1.705l3.123 3.045-.736 4.3A1 1 0 0 0 4.14 15.5l3.862-2.029 3.859 2.03a1 1 0 0 0 1.45-1.056l-.736-4.299 3.123-3.045a1 1 0 0 0-.554-1.705l-4.316-.627L8.898.857A.987.987 0 0 0 8 .301z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,16.25l-5.25-3.5-5.25,3.5V3.75c0-1.105,.895-2,2-2h6.5c1.105,0,2,.895,2,2v12.5Z"></path><polyline points="6.497 8 8.106 9.5 11.503 5" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/camera-blocked.svg b/src/browser/themes/shared/zen-icons/camera-blocked.svg
index 216868d64..090a80b78 100644
--- a/src/browser/themes/shared/zen-icons/camera-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/camera-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M6.119 0a1.5 1.5 0 0 0-1.34.826L4.189 2H2.5A2.5 2.5 0 0 0 0 4.5v8A2.5 2.5 0 0 0 2.5 15h11a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 13.5 2h-1.689L11.225.83A1.501 1.501 0 0 0 9.883 0H6.12zm0 1h3.764a.5.5 0 0 1 .447.277l.725 1.445c.085.17.256.278.445.278h2A1.5 1.5 0 0 1 15 4.5v8a1.5 1.5 0 0 1-1.5 1.5h-11A1.5 1.5 0 0 1 1 12.5v-8A1.5 1.5 0 0 1 2.5 3h1.998a.5.5 0 0 0 .447-.276l.727-1.449A.5.5 0 0 1 6.12 1zm1.877 3a4 4 0 1 0 0 8 4 4 0 0 0 0-8zm0 1a3 3 0 1 1 0 6 3 3 0 0 1 0-6z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.285,14.25h6.965c1.105,0,2-.895,2-2V5.75c0-.138-.014-.273-.041-.403"></path><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2"></path><path d="M7.055,10.945c-.498-.498-.805-1.185-.805-1.945,0-1.519,1.231-2.75,2.75-2.75,.759,0,1.447,.308,1.945,.805" data-color="color-2"></path><circle cx="4.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/camera.svg b/src/browser/themes/shared/zen-icons/camera.svg
index 16857087e..eb7b8eb93 100644
--- a/src/browser/themes/shared/zen-icons/camera.svg
+++ b/src/browser/themes/shared/zen-icons/camera.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6.119 0a1.5 1.5 0 0 0-1.34.826L4.189 2H2.5A2.5 2.5 0 0 0 0 4.5v8A2.5 2.5 0 0 0 2.5 15h11a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 13.5 2h-1.689L11.225.83A1.501 1.501 0 0 0 9.883 0H6.12zm0 1h3.764a.5.5 0 0 1 .447.277l.725 1.445c.085.17.256.278.445.278h2A1.5 1.5 0 0 1 15 4.5v8a1.5 1.5 0 0 1-1.5 1.5h-11A1.5 1.5 0 0 1 1 12.5v-8A1.5 1.5 0 0 1 2.5 3h1.998a.5.5 0 0 0 .447-.276l.727-1.449A.5.5 0 0 1 6.12 1zm1.877 3a4 4 0 1 0 0 8 4 4 0 0 0 0-8zm0 1a3 3 0 1 1 0 6 3 3 0 0 1 0-6z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2H14.25c1.105,0,2-.895,2-2V5.75c0-1.105-.895-2-2-2Z"></path><circle cx="9" cy="9" r="2.75" data-color="color-2"></circle><circle cx="4.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/canvas-blocked.svg b/src/browser/themes/shared/zen-icons/canvas-blocked.svg
index 043707852..a7d8b10f0 100644
--- a/src/browser/themes/shared/zen-icons/canvas-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/canvas-blocked.svg
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
   <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
   <path clip-path="url(#a)" d="M4 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H4zm0 1h8a2 2 0 0 1 2 2v8c0 .373-.102.72-.28 1.02L9.05 8.432a1.5 1.5 0 0 0-2.101 0l-4.67 4.588a1.988 1.988 0 0 1-.28-1.02V4a2 2 0 0 1 2-2zm6.5 2a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm0 1a.5.5 0 1 1 0 1 .5.5 0 0 1 0-1zM8 9.002c.127 0 .252.047.35.143l4.662 4.582A1.99 1.99 0 0 1 12 14H4c-.37 0-.715-.099-1.012-.273L7.65 9.145A.496.496 0 0 1 8 9.002z"/>
   <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
diff --git a/src/browser/themes/shared/zen-icons/canvas.svg b/src/browser/themes/shared/zen-icons/canvas.svg
index 377b04b4f..56e2403dc 100644
--- a/src/browser/themes/shared/zen-icons/canvas.svg
+++ b/src/browser/themes/shared/zen-icons/canvas.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M4 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H4zm0 1h8a2 2 0 0 1 2 2v8c0 .373-.102.72-.28 1.02L9.05 8.432a1.5 1.5 0 0 0-2.101 0l-4.67 4.588a1.988 1.988 0 0 1-.28-1.02V4a2 2 0 0 1 2-2zm6.5 2a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm0 1a.5.5 0 1 1 0 1 .5.5 0 0 1 0-1zM8 9.002c.127 0 .252.047.35.143l4.662 4.582A1.99 1.99 0 0 1 12 14H4c-.37 0-.715-.099-1.012-.273L7.65 9.145A.496.496 0 0 1 8 9.002z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.762,14.989l6.074-6.075c.781-.781,2.047-.781,2.828,0l2.586,2.586" data-color="color-2"></path><rect x="2.75" y="2.75" width="12.5" height="12.5" rx="2" ry="2"></rect><circle cx="6.25" cy="7.25" r="1.25" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/checkmark.svg b/src/browser/themes/shared/zen-icons/checkmark.svg
index 0a240624b..2e009fdf1 100644
--- a/src/browser/themes/shared/zen-icons/checkmark.svg
+++ b/src/browser/themes/shared/zen-icons/checkmark.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M14.5 2a.5.5 0 0 0-.379.174l-9.129 10.57-4.12-4.578a.5.5 0 0 0-.706-.037.5.5 0 0 0-.037.705l4.5 5a.5.5 0 0 0 .75-.008l9.5-11a.5.5 0 0 0-.053-.705A.5.5 0 0 0 14.5 2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 9.5 6.5 13.25 15.25 4.5"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/chevron.svg b/src/browser/themes/shared/zen-icons/chevron.svg
index 2fb938401..c4294002c 100644
--- a/src/browser/themes/shared/zen-icons/chevron.svg
+++ b/src/browser/themes/shared/zen-icons/chevron.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2.5 2a.5.5 0 0 0-.353.146.5.5 0 0 0 0 .708L7.293 8l-5.146 5.145a.5.5 0 0 0 0 .707.5.5 0 0 0 .707 0l5.5-5.5a.5.5 0 0 0 0-.707l-5.5-5.5A.5.5 0 0 0 2.5 2z"/>
-  <path d="M8.146 2.146a.5.5 0 0 0 0 .707l5.146 5.146-5.146 5.146a.5.5 0 0 0 0 .707.5.5 0 0 0 .707 0l5.5-5.5a.5.5 0 0 0 0-.707l-5.5-5.5a.5.5 0 0 0-.707 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="9.75 4.75 14 9 9.75 13.25" data-color="color-2"></polyline><polyline points="5 4.75 9.25 9 5 13.25"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/close-all.svg b/src/browser/themes/shared/zen-icons/close-all.svg
index 44683be36..a27866f14 100644
--- a/src/browser/themes/shared/zen-icons/close-all.svg
+++ b/src/browser/themes/shared/zen-icons/close-all.svg
@@ -1,6 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13.5 13.5"  fill="context-fill" fill-opacity="context-fill-opacity" ><path d="M7.45,6.85l-.8-.8L5.06,7.64,3.47,6.05l-.79.8L4.27,8.44,2.68,10l.79.79L5.06,9.23l1.59,1.59.8-.79L5.86,8.44Z"/><path d="M3.38,1.12,4.5,0h7.88L13.5,1.12V9l-1.12,1.12H10.12v2.26L9,13.5H1.12L0,12.38V4.5L1.12,3.38H3.38ZM4.5,3.38H9L10.12,4.5V9h2.26V1.12H4.5ZM9,4.5H1.12v7.88H9Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,16.25v-.5c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v.5"></path><path d="M3.75,11.25c0-.828,.672-1.5,1.5-1.5h7.5c.828,0,1.5,.672,1.5,1.5"></path><polyline points="11.5 4.75 9 7.25 6.5 4.75" data-color="color-2"></polyline><line x1="9" y1="7" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/close.svg b/src/browser/themes/shared/zen-icons/close.svg
index 0360479ac..327a6c91f 100644
--- a/src/browser/themes/shared/zen-icons/close.svg
+++ b/src/browser/themes/shared/zen-icons/close.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2.5 2a.5.5 0 0 0-.353.146.5.5 0 0 0 0 .708L7.293 8l-5.146 5.145a.5.5 0 0 0 0 .707.5.5 0 0 0 .707 0L8 8.706l5.146 5.146a.5.5 0 0 0 .706 0 .5.5 0 0 0 0-.707L8.708 8l5.146-5.146a.5.5 0 0 0 0-.707.5.5 0 0 0-.707 0L8 7.292 2.854 2.146A.5.5 0 0 0 2.5 2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="14" y1="4" x2="4" y2="14" data-color="color-2"></line><line x1="4" y1="4" x2="14" y2="14"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/container-tab.svg b/src/browser/themes/shared/zen-icons/container-tab.svg
index 92626dfa1..5774a0f1d 100644
--- a/src/browser/themes/shared/zen-icons/container-tab.svg
+++ b/src/browser/themes/shared/zen-icons/container-tab.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2 0C.901 0 0 .901 0 2v1.5a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5V2c0-.558.442-1 1-1h1.5A.5.5 0 0 0 4 .5a.5.5 0 0 0-.5-.5H2zm10.5 0a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5H14c.558 0 1 .442 1 1v1.5a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5V2c0-1.099-.901-2-2-2h-1.5zm-8 2A2.508 2.508 0 0 0 2 4.5v7C2 12.875 3.125 14 4.5 14h7c1.375 0 2.5-1.125 2.5-2.5v-7C14 3.125 12.875 2 11.5 2h-7zm0 1H7v1.5C7 5.323 7.677 6 8.5 6H13v5.5c0 .834-.666 1.5-1.5 1.5h-7c-.834 0-1.5-.666-1.5-1.5v-7C3 3.666 3.666 3 4.5 3zM8 3h3.5c.834 0 1.5.666 1.5 1.5V5H8.5a.493.493 0 0 1-.5-.5V3zM.5 12a.5.5 0 0 0-.5.5V14c0 1.099.901 2 2 2h1.5a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5H2c-.558 0-1-.442-1-1v-1.5a.5.5 0 0 0-.5-.5zm15 0a.5.5 0 0 0-.5.5V14c0 .558-.442 1-1 1h-1.5a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5H14c1.099 0 2-.901 2-2v-1.5a.5.5 0 0 0-.5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,2.75h7c1.105,0,2,.895,2,2v1.5" data-color="color-2"></path><line x1="11.25" y1="2.75" x2="11.25" y2="6.25" data-color="color-2"></line><line x1="14.75" y1="11.75" x2="14.75" y2="16.75" data-color="color-2"></line><path d="M15.75,9.461v-3.211H6.75V2.75h-2.5c-1.105,0-2,.895-2,2V13.25c0,1.105,.895,2,2,2h5.711"></path><line x1="17.25" y1="14.25" x2="12.25" y2="14.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/customize.svg b/src/browser/themes/shared/zen-icons/customize.svg
index 3ef73c3cb..6ddec40ff 100644
--- a/src/browser/themes/shared/zen-icons/customize.svg
+++ b/src/browser/themes/shared/zen-icons/customize.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3.5 0a.5.5 0 0 0-.5.5v8.504a2 2 0 0 0 2 2h1.004v2.998a2 2 0 1 0 4 0v-2.998H11a2 2 0 0 0 2-2V.5a.5.5 0 0 0-.5-.5h-9zM4 1h4v1.5a.5.5 0 1 0 1 0V1h1v2.502a.5.5 0 0 0 1 0V1h1v6.004H4V1zm0 7.004h8v1a1 1 0 0 1-1 1H9.504a.5.5 0 0 0-.5.5v3.498a1 1 0 1 1-2 0v-3.498a.5.5 0 0 0-.5-.5H5a1 1 0 0 1-1-1v-1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="10.25 12.75 12.75 15.25 15.25 12.75" data-color="color-2"></polyline><polyline points="15.25 5.25 12.75 2.75 10.25 5.25" data-color="color-2"></polyline><line x1="12.75" y1="15" x2="12.75" y2="3" data-color="color-2"></line><rect x="2.75" y="10.25" width="5" height="5" rx="1" ry="1"></rect><rect x="2.75" y="2.75" width="5" height="5" rx="1" ry="1"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg b/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg
index 34a03f66b..4ab923e16 100644
--- a/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M8 0C4.692 0 2 2.692 2 6v3.4l-.928 2.229c-.265.636.225 1.371.914 1.371H5.5c0 1.375 1.125 2.5 2.5 2.5s2.5-1.125 2.5-2.5h3.514c.69 0 1.18-.735.914-1.371L14.001 9.4V6c0-3.308-2.692-6-6-6zm0 1c2.767 0 5 2.233 5 5v3.5a.5.5 0 0 0 .04.191l.96 2.31H2l.96-2.31A.5.5 0 0 0 3 9.5V6c0-2.767 2.233-5 5-5zM6.5 13h3c0 .834-.666 1.5-1.5 1.5s-1.5-.666-1.5-1.5z" style="-inkscape-stroke:none;color:#000;stroke-linecap:round;stroke-linejoin:round"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.368,4.632c-.726-1.694-2.408-2.882-4.368-2.882h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2h2.5"></path><path d="M8,13.25h7.75c-1.105,0-2-.895-2-2v-3.5"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/desktop-notification.svg b/src/browser/themes/shared/zen-icons/desktop-notification.svg
index e6f1c055c..866964cd8 100644
--- a/src/browser/themes/shared/zen-icons/desktop-notification.svg
+++ b/src/browser/themes/shared/zen-icons/desktop-notification.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0C4.692 0 2 2.692 2 6v3.4l-.928 2.229c-.265.636.225 1.371.914 1.371H5.5c0 1.375 1.125 2.5 2.5 2.5s2.5-1.125 2.5-2.5h3.514c.69 0 1.18-.735.914-1.371L14.001 9.4V6c0-3.308-2.692-6-6-6zm0 1c2.767 0 5 2.233 5 5v3.5a.5.5 0 0 0 .04.191l.96 2.31H2l.96-2.31A.5.5 0 0 0 3 9.5V6c0-2.767 2.233-5 5-5zM6.5 13h3c0 .834-.666 1.5-1.5 1.5s-1.5-.666-1.5-1.5z" style="-inkscape-stroke:none;color:#000;stroke-linecap:round;stroke-linejoin:round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.75,13.25c-1.105,0-2-.895-2-2V6.5c0-2.623-2.127-4.75-4.75-4.75h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2H15.75Z"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/developer.svg b/src/browser/themes/shared/zen-icons/developer.svg
index 5085f8724..b2bcbe3ae 100644
--- a/src/browser/themes/shared/zen-icons/developer.svg
+++ b/src/browser/themes/shared/zen-icons/developer.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M11.5 0a4.5 4.5 0 0 0-4.418 5.36L.656 12.016a2.358 2.358 0 0 0 3.375 3.294l6.365-6.447a4.5 4.5 0 0 0 5.207-6.215.503.503 0 0 0-.81-.149L12.5 4.793 11.207 3.5 13.5 1.207A.5.5 0 0 0 13.353.4 4.49 4.49 0 0 0 11.499 0zm0 1c.247 0 .487.026.719.074l-2.072 2.072a.5.5 0 0 0 0 .707l2 2a.5.5 0 0 0 .707 0l2.072-2.072a3.5 3.5 0 0 1-4.52 4.045.502.502 0 0 0-.514.123L3.32 14.61a1.358 1.358 0 0 1-1.943-1.896L7.99 5.859a.498.498 0 0 0 .123-.473A3.5 3.5 0 0 1 11.5.999z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="11.75" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.25" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><path d="M6.25,15.25h-1c-1.105,0-2-.895-2-2v-2.625c0-.897-.728-1.625-1.625-1.625,.897,0,1.625-.728,1.625-1.625v-2.625c0-1.105,.895-2,2-2h1"></path><path d="M11.75,15.25h1c1.105,0,2-.895,2-2v-2.625c0-.897,.728-1.625,1.625-1.625-.897,0-1.625-.728-1.625-1.625v-2.625c0-1.105-.895-2-2-2h-1"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/downloads.svg b/src/browser/themes/shared/zen-icons/downloads.svg
index c8c49dc5f..4c792fe0a 100644
--- a/src/browser/themes/shared/zen-icons/downloads.svg
+++ b/src/browser/themes/shared/zen-icons/downloads.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a.5.5 0 0 0-.5.5v10.79L3.854 7.644a.5.5 0 1 0-.707.707l4.5 4.5a.5.5 0 0 0 .707 0l4.5-4.5a.5.5 0 0 0-.707-.707L8.501 11.29V.5a.5.5 0 0 0-.5-.5z"/>
-  <path d="M1.5 12a.5.5 0 0 0-.5.5v1C1 14.875 2.125 16 3.5 16h9c1.375 0 2.5-1.125 2.5-2.5v-1a.5.5 0 0 0-1 0v1c0 .834-.666 1.5-1.5 1.5h-9c-.834 0-1.5-.666-1.5-1.5v-1a.5.5 0 0 0-.5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,6.75h1c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2H5.25c-1.105,0-2-.895-2-2v-5.5c0-1.105,.895-2,2-2h1"></path><polyline points="12 10.25 9 13.25 6 10.25" data-color="color-2"></polyline><line x1="9" y1="13.25" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/drag-indicator.svg b/src/browser/themes/shared/zen-icons/drag-indicator.svg
index 97a326ab2..97b4bb120 100644
--- a/src/browser/themes/shared/zen-icons/drag-indicator.svg
+++ b/src/browser/themes/shared/zen-icons/drag-indicator.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M6.5 6C7.32843 6 8 5.32843 8 4.5C8 3.67157 7.32843 3 6.5 3C5.67157 3 5 3.67157 5 4.5C5 5.32843 5.67157 6 6.5 6ZM6.5 11C7.32843 11 8 10.3284 8 9.5C8 8.67157 7.32843 8 6.5 8C5.67157 8 5 8.67157 5 9.5C5 10.3284 5.67157 11 6.5 11ZM8 14.5C8 15.3284 7.32843 16 6.5 16C5.67157 16 5 15.3284 5 14.5C5 13.6716 5.67157 13 6.5 13C7.32843 13 8 13.6716 8 14.5ZM13.5 6C14.3284 6 15 5.32843 15 4.5C15 3.67157 14.3284 3 13.5 3C12.6716 3 12 3.67157 12 4.5C12 5.32843 12.6716 6 13.5 6ZM15 9.5C15 10.3284 14.3284 11 13.5 11C12.6716 11 12 10.3284 12 9.5C12 8.67157 12.6716 8 13.5 8C14.3284 8 15 8.67157 15 9.5ZM13.5 16C14.3284 16 15 15.3284 15 14.5C15 13.6716 14.3284 13 13.5 13C12.6716 13 12 13.6716 12 14.5C12 15.3284 12.6716 16 13.5 16Z" fill="currentColor"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="6.75" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="6.75" cy="3.75" r=".5" fill="currentColor"></circle><circle cx="6.75" cy="14.25" r=".5" fill="currentColor"></circle><circle cx="11.25" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="11.25" cy="3.75" r=".5" fill="currentColor"></circle><circle cx="11.25" cy="14.25" r=".5" fill="currentColor"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/duplicate-tab.svg b/src/browser/themes/shared/zen-icons/duplicate-tab.svg
index 0e764146a..67e321267 100644
--- a/src/browser/themes/shared/zen-icons/duplicate-tab.svg
+++ b/src/browser/themes/shared/zen-icons/duplicate-tab.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M5.5 0A2.5 2.5 0 0 0 3 2.5v8A2.5 2.5 0 0 0 5.5 13h8a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 13.5 0h-8zm0 1H7v1.5A1.5 1.5 0 0 0 8.5 4H15v6.5a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 4 10.5v-8A1.5 1.5 0 0 1 5.5 1zM8 1h5.5A1.5 1.5 0 0 1 15 2.5V3H8.5a.5.5 0 0 1-.5-.5V1zM2 3.05A2.5 2.5 0 0 0 0 5.5V12a4 4 0 0 0 4 4h6.5a2.5 2.5 0 0 0 2.45-2h-1.036a1.5 1.5 0 0 1-1.414 1H4a3 3 0 0 1-3-3V5.5a1.5 1.5 0 0 1 1-1.414V3.05z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.25" y="5.25" width="11" height="11" rx="2" ry="2"></rect><path d="M2.801,11.998L1.772,5.074c-.162-1.093,.592-2.11,1.684-2.272l6.924-1.029c.933-.139,1.81,.39,2.148,1.228" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-copy.svg b/src/browser/themes/shared/zen-icons/edit-copy.svg
index d457212a6..0f4e4f2b5 100644
--- a/src/browser/themes/shared/zen-icons/edit-copy.svg
+++ b/src/browser/themes/shared/zen-icons/edit-copy.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H6zm0 1h6a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1zM3 2.268C2.402 2.614 2 3.26 2 4v8.5A3.5 3.5 0 0 0 5.5 16H10c.74 0 1.387-.402 1.732-1H5.5A2.5 2.5 0 0 1 3 12.5V2.27z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-cut.svg b/src/browser/themes/shared/zen-icons/edit-cut.svg
index d02717d8e..e461be2cd 100644
--- a/src/browser/themes/shared/zen-icons/edit-cut.svg
+++ b/src/browser/themes/shared/zen-icons/edit-cut.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3.508 0a.5.5 0 0 0-.428.771L7.404 7.43 5.48 10.39a3 3 0 1 0 .78.636L8 8.347l1.74 2.68a3 3 0 1 0 .78-.636L3.92.23a.503.503 0 0 0-.412-.228zm8.984 0a.503.503 0 0 0-.412.229L8.596 5.594l.598.918L12.92.772A.5.5 0 0 0 12.493 0zM4 11a2 2 0 1 1 0 4 2 2 0 0 1 0-4zm8 0a2 2 0 1 1 0 4 2 2 0 0 1 0-4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="12.75" y1="7.75" x2="16.25" y2="7.75" data-color="color-2"></line><line x1="4" y1="7.75" x2="9.25" y2="7.75" data-color="color-2"></line><circle cx="4" cy="5.5" r="2.25" data-color="color-2"></circle><line x1="5.409" y1="11.659" x2="14" y2="3"></line><circle cx="7" cy="13.25" r="2.25"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-delete.svg b/src/browser/themes/shared/zen-icons/edit-delete.svg
index b4d74dcd3..8bcfe2ad7 100644
--- a/src/browser/themes/shared/zen-icons/edit-delete.svg
+++ b/src/browser/themes/shared/zen-icons/edit-delete.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 .5A2.5 2.5 0 0 0 5.5 3H1a.5.5 0 0 0-.5.5l.008.09A.5.5 0 0 0 1 4h.553L2.85 14.229A2 2 0 0 0 4.836 16h6.328a2 2 0 0 0 1.986-1.771L14.445 4H15a.5.5 0 0 0 0-1h-4.5A2.5 2.5 0 0 0 8 .5zm0 1A1.5 1.5 0 0 1 9.5 3h-3A1.5 1.5 0 0 1 8 1.5zM2.56 4h10.877l-1.28 10.116a.998.998 0 0 1-.993.884H4.836a.998.998 0 0 1-.992-.884zM6.5 6.5c-.276 0-.5.196-.5.438v5.124l.008.078c.042.204.247.36.492.36.276 0 .5-.196.5-.438V6.938l-.008-.079C6.95 6.655 6.745 6.5 6.5 6.5zm3 0c-.276 0-.5.196-.5.438v5.124l.008.078c.042.204.247.36.492.36.276 0 .5-.196.5-.438V6.938l-.008-.079C9.95 6.655 9.745 6.5 9.5 6.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="m13.474,7.25l-.374,7.105c-.056,1.062-.934,1.895-1.997,1.895h-4.205c-1.064,0-1.941-.833-1.997-1.895l-.374-7.105"></path><line x1="2.75" y1="4.75" x2="15.25" y2="4.75" data-color="color-2"></line><path d="m6.75,4.75v-2c0-.552.448-1,1-1h2.5c.552,0,1,.448,1,1v2" data-color="color-2"></path><line x1="7.375" y1="8.75" x2="7.625" y2="13.25" data-color="color-2"></line><line x1="10.625" y1="8.75" x2="10.375" y2="13.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-paste.svg b/src/browser/themes/shared/zen-icons/edit-paste.svg
index b92aa0dad..ceb616c4a 100644
--- a/src/browser/themes/shared/zen-icons/edit-paste.svg
+++ b/src/browser/themes/shared/zen-icons/edit-paste.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6.5 0a1.5 1.5 0 0 0-1.414 1H3.5A1.5 1.5 0 0 0 2 2.5v12A1.5 1.5 0 0 0 3.5 16h3a.5.5 0 0 0 0-1h-3a.5.5 0 0 1-.5-.5v-12a.5.5 0 0 1 .5-.5h1.586A1.5 1.5 0 0 0 6.5 3h3a1.5 1.5 0 0 0 1.414-1H12.5a.5.5 0 0 1 .5.5v1a.5.5 0 0 0 1 0v-1A1.5 1.5 0 0 0 12.5 1h-1.586A1.5 1.5 0 0 0 9.5 0h-3zm0 1h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1 0-1zm3 4A1.5 1.5 0 0 0 8 6.5v8A1.5 1.5 0 0 0 9.5 16h5a1.5 1.5 0 0 0 1.5-1.5v-8A1.5 1.5 0 0 0 14.5 5h-5zm0 1h5a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5h-5a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.25,2.75h-1c-1.105,0-2,.895-2,2V14.25c0,1.105,.895,2,2,2h7.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1"></path><rect x="6.25" y="1.25" width="5.5" height="3" rx="1" ry="1" data-color="color-2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-redo.svg b/src/browser/themes/shared/zen-icons/edit-redo.svg
index e1e5b4ff6..39b73abb0 100644
--- a/src/browser/themes/shared/zen-icons/edit-redo.svg
+++ b/src/browser/themes/shared/zen-icons/edit-redo.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path transform="scale(-1 1) translate(-16 0)" d="M1.5 0a.5.5 0 0 0-.5.5v4.9a.6.6 0 0 0 .6.6h4.9a.5.5 0 0 0 0-1H2.906L6.38 1.98a4 4 0 1 1 5.248 6.04l-8.172 7.103a.5.5 0 1 0 .656.754l8.172-7.104a5.001 5.001 0 0 0-6.56-7.547L2 4.464V.5a.5.5 0 0 0-.5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15,10c-.528-.461-2.7-2.251-6-2.251s-5.472,1.79-6,2.251" data-color="color-2"></path><polyline points="13.375 5.598 15 10 10.47 11.222"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-select-all.svg b/src/browser/themes/shared/zen-icons/edit-select-all.svg
index f3ad372ed..d90d0e5ed 100644
--- a/src/browser/themes/shared/zen-icons/edit-select-all.svg
+++ b/src/browser/themes/shared/zen-icons/edit-select-all.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6 0a2 2 0 0 0-2 2v.5a.5.5 0 0 0 1 0V2a1 1 0 0 1 1-1h.5a.5.5 0 0 0 0-1H6zm2.5 0a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3zm5 0a.5.5 0 0 0 0 1h.5a1 1 0 0 1 1 1v.5a.5.5 0 0 0 1 0V2a2 2 0 0 0-2-2h-.5zM2 4a2 2 0 0 0-2 2v6.5A3.5 3.5 0 0 0 3.5 16H10a2 2 0 0 0 2-2v-1h-1v1a1 1 0 0 1-1 1H3.5A2.5 2.5 0 0 1 1 12.5V6a1 1 0 0 1 1-1h1V4H2zm2.5 0a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 1 0v-3a.5.5 0 0 0-.5-.5zm11 0a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 1 0v-3a.5.5 0 0 0-.5-.5zm-11 5a.5.5 0 0 0-.5.5v.5a2 2 0 0 0 2 2h.5a.5.5 0 0 0 0-1H6a1 1 0 0 1-1-1v-.5a.5.5 0 0 0-.5-.5zm11 0a.5.5 0 0 0-.5.5v.5a1 1 0 0 1-1 1h-.5a.5.5 0 0 0 0 1h.5a2 2 0 0 0 2-2v-.5a.5.5 0 0 0-.5-.5zm-7 2a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="14.75" y1=".75" x2="14.75" y2="5.75" data-color="color-2"></line><line x1="17.25" y1="3.25" x2="12.25" y2="3.25" data-color="color-2"></line><path d="M2.25,5.25c0-1.105,.895-2,2-2"></path><path d="M14.75,13.75c0,1.105-.895,2-2,2"></path><path d="M4.25,15.75c-1.105,0-2-.895-2-2"></path><line x1="7.25" y1="3.25" x2="9.25" y2="3.25"></line><line x1="7.25" y1="15.75" x2="9.75" y2="15.75"></line><line x1="14.75" y1="8.75" x2="14.75" y2="10.75"></line><line x1="2.25" y1="8.25" x2="2.25" y2="10.75"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-theme.svg b/src/browser/themes/shared/zen-icons/edit-theme.svg
new file mode 100644
index 000000000..f1a2a6a9e
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/edit-theme.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,9.247l5.086-5.083c.552-.552,.552-1.448,0-2-.552-.552-1.448-.552-2,0l-5.094,5.096" data-color="color-2"></path><path d="M5.75,11.815c2.162,.65,3.917,.704,5.351-.764,.865-.868,.865-2.276,0-3.145s-2.261-.881-3.133,0c-1.418,1.434-.18,2.795-2.218,3.909Z" data-color="color-2"></path><path d="M16.25,8.284v4.966c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h6.965"></path><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-undo.svg b/src/browser/themes/shared/zen-icons/edit-undo.svg
index 3f31983d0..4e469ac9f 100644
--- a/src/browser/themes/shared/zen-icons/edit-undo.svg
+++ b/src/browser/themes/shared/zen-icons/edit-undo.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M1.5 0a.5.5 0 0 0-.5.5v4.9a.6.6 0 0 0 .6.6h4.9a.5.5 0 0 0 0-1H2.906L6.38 1.98a4 4 0 1 1 5.248 6.04l-8.172 7.103a.5.5 0 1 0 .656.754l8.172-7.104a5.001 5.001 0 0 0-6.56-7.547L2 4.464V.5a.5.5 0 0 0-.5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3,10c.528-.461,2.7-2.251,6-2.251s5.472,1.79,6,2.251" data-color="color-2"></path><polyline points="4.625 5.598 3 10 7.53 11.222"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit.svg b/src/browser/themes/shared/zen-icons/edit.svg
index 3ecd452ba..e5317afc1 100644
--- a/src/browser/themes/shared/zen-icons/edit.svg
+++ b/src/browser/themes/shared/zen-icons/edit.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M11.25.815a2.783 2.783 0 0 1 4.066 3.796l-.13.14-9.606 9.605a2 2 0 0 1-.723.463l-.165.053-4.055 1.106a.5.5 0 0 1-.63-.535l.016-.08L1.13 11.31a2 2 0 0 1 .398-.76l.117-.128zm-.86 2.275-8.04 8.038a1 1 0 0 0-.215.321l-.042.123-.876 3.211 3.212-.876a1 1 0 0 0 .238-.1l.108-.071.098-.086 8.038-8.04zm4.089-1.568a1.784 1.784 0 0 0-2.402-.11l-.12.11-.86.86 2.52 2.522.861-.86a1.784 1.784 0 0 0 .11-2.402z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.75,15.25s3.599-.568,4.546-1.515c.947-.947,7.327-7.327,7.327-7.327,.837-.837,.837-2.194,0-3.03-.837-.837-2.194-.837-3.03,0,0,0-6.38,6.38-7.327,7.327s-1.515,4.546-1.515,4.546h0Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/essential-add.svg b/src/browser/themes/shared/zen-icons/essential-add.svg
index dae8567e1..f814e9540 100644
--- a/src/browser/themes/shared/zen-icons/essential-add.svg
+++ b/src/browser/themes/shared/zen-icons/essential-add.svg
@@ -1,6 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 122.88 109.57" fill="context-fill" fill-opacity="context-fill-opacity" xml:space="preserve"><g><path d="M65.46,19.57c-0.68,0.72-1.36,1.45-2.2,2.32l-2.31,2.41l-2.4-2.33c-0.71-0.69-1.43-1.4-2.13-2.09 c-7.42-7.3-13.01-12.8-24.52-12.95c-0.45-0.01-0.93,0-1.43,0.02c-6.44,0.23-12.38,2.6-16.72,6.65c-4.28,4-7.01,9.67-7.1,16.57 c-0.01,0.43,0,0.88,0.02,1.37c0.69,19.27,19.13,36.08,34.42,50.01c2.95,2.69,5.78,5.27,8.49,7.88l11.26,10.85l14.15-14.04 c2.28-2.26,4.86-4.73,7.62-7.37c4.69-4.5,9.91-9.49,14.77-14.52c3.49-3.61,6.8-7.24,9.61-10.73c2.76-3.42,5.02-6.67,6.47-9.57 c2.38-4.76,3.13-9.52,2.62-13.97c-0.5-4.39-2.23-8.49-4.82-11.99c-2.63-3.55-6.13-6.49-10.14-8.5C96.5,7.29,91.21,6.2,85.8,6.82 C76.47,7.9,71.5,13.17,65.46,19.57L65.46,19.57z M60.77,14.85C67.67,7.54,73.4,1.55,85.04,0.22c6.72-0.77,13.3,0.57,19.03,3.45 c4.95,2.48,9.27,6.1,12.51,10.47c3.27,4.42,5.46,9.61,6.1,15.19c0.65,5.66-0.29,11.69-3.3,17.69c-1.7,3.39-4.22,7.03-7.23,10.76 c-2.95,3.66-6.39,7.44-10,11.17C97.2,74.08,91.94,79.12,87.2,83.66c-2.77,2.65-5.36,5.13-7.54,7.29L63.2,107.28l-2.31,2.29 l-2.34-2.25l-13.6-13.1c-2.49-2.39-5.37-5.02-8.36-7.75C20.38,71.68,0.81,53.85,0.02,31.77C0,31.23,0,30.67,0,30.09 c0.12-8.86,3.66-16.18,9.21-21.36c5.5-5.13,12.97-8.13,21.01-8.42c0.55-0.02,1.13-0.03,1.74-0.02C46,0.48,52.42,6.63,60.77,14.85 L60.77,14.85z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M8.743,7.769l-.946-.315-.316-.947c-.102-.306-.609-.306-.711,0l-.316,.947-.946,.315c-.153,.051-.257,.194-.257,.356s.104,.305,.257,.356l.946,.315,.316,.947c.051,.153,.194,.256,.355,.256s.305-.104,.355-.256l.316-.947,.946-.315c.153-.051,.257-.194,.257-.356s-.104-.305-.257-.356Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><path d="M15.144,9.976c.52-.995,.856-2.117,.856-3.367,.008-2.12-1.704-3.846-3.826-3.859-1.277,.016-2.464,.66-3.174,1.72-.709-1.061-1.896-1.704-3.173-1.72-2.123,.013-3.834,1.739-3.826,3.859,0,4.826,4.959,7.794,6.529,8.613,.297,.155,.644,.155,.941,0,.114-.059,.249-.133,.395-.214"></path><path d="M15.658,12.99l-1.263-.421-.421-1.263c-.137-.408-.812-.408-.949,0l-.421,1.263-1.263,.421c-.204,.068-.342,.259-.342,.474s.138,.406,.342,.474l1.263,.421,.421,1.263c.068,.204,.26,.342,.475,.342s.406-.138,.475-.342l.421-1.263,1.263-.421c.204-.068,.342-.259,.342-.474s-.138-.406-.342-.474Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><circle cx="12.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/essential-remove.svg b/src/browser/themes/shared/zen-icons/essential-remove.svg
index 5806cd268..69ac1eb92 100644
--- a/src/browser/themes/shared/zen-icons/essential-remove.svg
+++ b/src/browser/themes/shared/zen-icons/essential-remove.svg
@@ -1,6 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.88 109.57" fill="context-fill" fill-opacity="context-fill-opacity"><defs><style>.cls-1{fill-rule:evenodd;}</style></defs><path class="cls-1" d="M94.26,44.46A26.88,26.88,0,1,1,67.38,71.34,26.88,26.88,0,0,1,94.26,44.46ZM65.45,19.57l-4.52,4.74-4.52-4.43C49,12.58,43.4,7.08,31.89,6.93L30.46,7A25.75,25.75,0,0,0,13.74,13.6,22.58,22.58,0,0,0,6.63,30.17l0,1.37c.69,19.27,19.13,36.08,34.42,50,3,2.69,5.78,5.27,8.49,7.88l11.27,10.85,5.91-5.87c.68.8,1.39,1.58,2.13,2.32l0,0c.82.83,1.69,1.61,2.59,2.36l-10.59,10.5L45,94.22c-2.49-2.39-5.37-5-8.37-7.75C20.37,71.68.81,53.85,0,31.77l0-1.68A29.12,29.12,0,0,1,9.21,8.73a32.42,32.42,0,0,1,21-8.42H32c14,.18,20.45,6.34,28.8,14.55C67.66,7.54,73.39,1.55,85,.21a33.88,33.88,0,0,1,19,3.45,35.14,35.14,0,0,1,12.51,10.48,31.53,31.53,0,0,1,6.1,15.18,31,31,0,0,1-2.86,16.81l-.17-.18a36.18,36.18,0,0,0-5.14-4.27,24.26,24.26,0,0,0,1.57-11.6,25,25,0,0,0-4.83-12,28.62,28.62,0,0,0-10.14-8.5A27.27,27.27,0,0,0,85.79,6.82C76.47,7.89,71.5,13.17,65.45,19.57ZM106.15,68a4,4,0,0,1,1.51.3,3.94,3.94,0,0,1,1.29.86,4,4,0,0,1,.85,1.28l0,.06a4,4,0,0,1,.28,1.38V72a3.82,3.82,0,0,1-.3,1.44,4,4,0,0,1-.86,1.29,3.88,3.88,0,0,1-1.27.85l-.07,0a4.23,4.23,0,0,1-1.43.28H82.37a3.85,3.85,0,0,1-1.51-.31l-.06,0a3.92,3.92,0,0,1-1.23-.83,3.87,3.87,0,0,1-.85-1.28l0-.07A4.23,4.23,0,0,1,78.41,72v0a3.8,3.8,0,0,1,.3-1.51A3.95,3.95,0,0,1,82.34,68Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="8.999 4.927 7.75 7 10.5 8.75 8.5 10.75" data-color="color-2"></polyline><path d="M15.2,9.222l-5.48,5.694c-.393,.409-1.048,.409-1.441,0L2.799,9.222c-1.452-1.528-1.389-3.944,.139-5.395,1.528-1.452,3.944-1.389,5.395,.139,.27,.284,.495,.609,.666,.962,1.074-2.212,4.002-2.92,6.007-1.162,.535,.469,.929,1.101,1.11,1.79,.363,1.383-.034,2.738-.916,3.666Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/ext-link.svg b/src/browser/themes/shared/zen-icons/ext-link.svg
index 64306a25d..089c65e22 100644
--- a/src/browser/themes/shared/zen-icons/ext-link.svg
+++ b/src/browser/themes/shared/zen-icons/ext-link.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" viewBox="0 0 512 512" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
-<path d="M96 32v384h384v-384h-384zM448 384h-320v-320h320v320zM64 448v-336l-32-32v400h400l-32-32h-336z"></path>
-<path d="M176 128l80 80-96 96 48 48 96-96 80 80v-208z"></path>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4.25,9.25V3.75c0-1.105,.895-2,2-2h6c1.105,0,2,.895,2,2V13.25c0,1.105-.895,2-2,2H7.25"></path><polyline points="7.24 6.75 11.25 6.75 11.25 10.76" data-color="color-2"></polyline><line x1="11.25" y1="6.75" x2="1.75" y2="16.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/extension-blocked.svg b/src/browser/themes/shared/zen-icons/extension-blocked.svg
index e2b514d51..66278262e 100644
--- a/src/browser/themes/shared/zen-icons/extension-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/extension-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="m8.25 0-.154.006a2.249 2.249 0 0 0-2.074 1.939L6.014 2H3.502l-.145.006A1.5 1.5 0 0 0 2.002 3.5v2.264l-.058.006A2.25 2.25 0 0 0 0 8.001l.006.155a2.249 2.249 0 0 0 1.939 2.074l.056.005v2.266l.006.145A1.5 1.5 0 0 0 3.502 14h2.014l.006.055a2.25 2.25 0 0 0 2.23 1.943l.154-.006a2.25 2.25 0 0 0 2.074-1.94L9.986 14h2.516a1.5 1.5 0 0 0 1.5-1.5L14 9.247l-1.75.002-.123-.006A1.246 1.246 0 0 1 11 8l.006-.123A1.246 1.246 0 0 1 12.25 6.75L14 6.747l.002-3.246-.008-.144a1.499 1.499 0 0 0-1.492-1.355h-2.018l-.004-.057A2.252 2.252 0 0 0 8.25 0zm0 1c.69 0 1.25.56 1.25 1.25V3l3.002.002.09.008a.5.5 0 0 1 .41.492v2.246l-.752.002a2.25 2.25 0 0 0-2.242 2.066L10 7.98c0 1.194.903 2.167 2.066 2.262l.164.008.772-.002v2.254a.5.5 0 0 1-.5.5L9 13l.002.752a1.25 1.25 0 0 1-2.5-.002L6.5 13l-2.998.002a.5.5 0 0 1-.5-.5L3 9.25l-.752.002a1.249 1.249 0 1 1 .002-2.5L3 6.75l.002-3.248a.5.5 0 0 1 .5-.5L7 3v-.75C7 1.56 7.56 1 8.25 1z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.266"></path><path d="M15.726,8.516c-.117-.993-.952-1.766-1.976-1.766H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h4.141"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/extension.svg b/src/browser/themes/shared/zen-icons/extension.svg
index 251379820..f462ae524 100644
--- a/src/browser/themes/shared/zen-icons/extension.svg
+++ b/src/browser/themes/shared/zen-icons/extension.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="m8.25 0-.154.006a2.249 2.249 0 0 0-2.074 1.939L6.014 2H3.502l-.145.006a1.5 1.5 0 0 0-1.355 1.494v2.264l-.058.006A2.25 2.25 0 0 0 0 8.001l.006.155a2.249 2.249 0 0 0 1.939 2.074l.056.005v2.266l.006.145A1.5 1.5 0 0 0 3.502 14h2.014l.006.055a2.25 2.25 0 0 0 2.23 1.943l.154-.006a2.25 2.25 0 0 0 2.074-1.94l.006-.052h2.516a1.5 1.5 0 0 0 1.5-1.5L14 9.247l-1.75.002-.123-.006A1.246 1.246 0 0 1 11 8l.006-.123A1.246 1.246 0 0 1 12.25 6.75L14 6.747l.002-3.246-.008-.144a1.499 1.499 0 0 0-1.492-1.355h-2.018l-.004-.057A2.252 2.252 0 0 0 8.25 0zm0 1c.69 0 1.25.56 1.25 1.25V3l3.002.002.09.008a.5.5 0 0 1 .41.492v2.246l-.752.002a2.25 2.25 0 0 0-2.242 2.066L10 7.98c0 1.194.903 2.167 2.066 2.262l.164.008.772-.002v2.254a.5.5 0 0 1-.5.5L9 13l.002.752a1.25 1.25 0 0 1-2.5-.002L6.5 13l-2.998.002a.5.5 0 0 1-.5-.5L3 9.25l-.752.002a1.249 1.249 0 1 1 .002-2.5L3 6.75l.002-3.248a.5.5 0 0 1 .5-.5L7 3v-.75C7 1.56 7.56 1 8.25 1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.75,8.25c.372,0,.716,.118,1,.317v-2.317c0-1.104-.895-2-2-2h-2.317c.198-.284,.317-.627,.317-1,0-.967-.784-1.75-1.75-1.75s-1.75,.783-1.75,1.75c0,.373,.118,.716,.317,1h-2.317c-1.105,0-2,.896-2,2v2.317c-.284-.198-.628-.317-1-.317-.966,0-1.75,.783-1.75,1.75s.784,1.75,1.75,1.75c.372,0,.716-.118,1-.317v2.317c0,1.104,.895,2,2,2h2.317c-.198-.284-.317-.627-.317-1,0-.967,.784-1.75,1.75-1.75s1.75,.783,1.75,1.75c0,.373-.118,.716-.317,1h2.317c1.105,0,2-.896,2-2v-2.317c-.284,.198-.628,.317-1,.317-.966,0-1.75-.783-1.75-1.75s.784-1.75,1.75-1.75Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/firefox-logo.svg b/src/browser/themes/shared/zen-icons/firefox-logo.svg
deleted file mode 100644
index 3b8237a4a..000000000
--- a/src/browser/themes/shared/zen-icons/firefox-logo.svg
+++ /dev/null
@@ -1,6 +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/.
-   -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 80.04 79.86"><defs><style>.cls-1{fill:url(#radial-gradient);}.cls-2,.cls-8,.cls-9{isolation:isolate;}.cls-2{opacity:0.67;fill:url(#radial-gradient-2);}.cls-3{fill:url(#radial-gradient-3);}.cls-4{fill:url(#radial-gradient-4);}.cls-5{fill:url(#radial-gradient-5);}.cls-6{fill:url(#radial-gradient-6);}.cls-7{fill:url(#radial-gradient-7);}.cls-8,.cls-9{opacity:0.53;}.cls-8{fill:url(#radial-gradient-8);}.cls-9{fill:url(#radial-gradient-9);}.cls-10{fill:url(#radial-gradient-10);}.cls-11{fill:url(#linear-gradient);}.cls-12{fill:url(#linear-gradient-2);}.cls-13{fill:url(#linear-gradient-3);}</style><radialGradient id="radial-gradient" cx="-1136.61" cy="-313.39" r="0.9" gradientTransform="translate(91030.51 25039.82) scale(80.02 79.86)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff36e"/><stop offset="0.5" stop-color="#fc4055"/><stop offset="1" stop-color="#e31587"/></radialGradient><radialGradient id="radial-gradient-2" cx="-1137.47" cy="-313.36" r="0.7" gradientTransform="translate(91030.51 25039.82) scale(80.02 79.86)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c60084"/><stop offset="1" stop-color="#fc4055" stop-opacity="0"/></radialGradient><radialGradient id="radial-gradient-3" cx="-1136.47" cy="-313.46" r="1.33" gradientTransform="translate(91030.51 25039.82) scale(80.02 79.86)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffde67" stop-opacity="0.6"/><stop offset="0.66" stop-color="#fc4055" stop-opacity="0"/></radialGradient><radialGradient id="radial-gradient-4" cx="-1137.13" cy="-313.03" r="1.75" gradientTransform="translate(91030.51 25039.82) scale(80.02 79.86)" gradientUnits="userSpaceOnUse"><stop offset="0.15" stop-color="#810220"/><stop offset="0.27" stop-color="#fc4055" stop-opacity="0"/></radialGradient><radialGradient id="radial-gradient-5" cx="-1137.04" cy="-312.99" r="1.6" gradientTransform="translate(91030.51 25039.82) scale(80.02 79.86)" gradientUnits="userSpaceOnUse"><stop offset="0.12" stop-color="#810220"/><stop offset="0.3" stop-color="#fc4055" stop-opacity="0"/></radialGradient><radialGradient id="radial-gradient-6" cx="-1134.98" cy="-312.47" r="1.11" gradientTransform="translate(81308.57 22427.9) scale(71.58 71.75)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9640"/><stop offset="0.8" stop-color="#fc4055"/></radialGradient><radialGradient id="radial-gradient-7" cx="-1134.97" cy="-312.4" r="1.13" gradientTransform="translate(81308.57 22427.9) scale(71.58 71.75)" gradientUnits="userSpaceOnUse"><stop offset="0.09" stop-color="#ffde67"/><stop offset="0.82" stop-color="#ff9640" stop-opacity="0"/></radialGradient><radialGradient id="radial-gradient-8" cx="-1135.25" cy="-312.09" r="0.54" gradientTransform="translate(81308.57 22427.9) scale(71.58 71.75)" gradientUnits="userSpaceOnUse"><stop offset="0.36" stop-color="#fc4055"/><stop offset="0.59" stop-color="#ff9640" stop-opacity="0"/></radialGradient><radialGradient id="radial-gradient-9" cx="-1135.35" cy="-312.06" r="0.54" gradientTransform="translate(81308.57 22427.9) scale(71.58 71.75)" gradientUnits="userSpaceOnUse"><stop offset="0.22" stop-color="#fc4055" stop-opacity="0.8"/><stop offset="0.47" stop-color="#ff9640" stop-opacity="0"/></radialGradient><radialGradient id="radial-gradient-10" cx="-1130.08" cy="-310.02" r="1.7" gradientTransform="translate(62665.27 17519.34) scale(55.38 56.5)" gradientUnits="userSpaceOnUse"><stop offset="0.05" stop-color="#fff36e"/><stop offset="0.55" stop-color="#ff9640"/><stop offset="0.7" stop-color="#ff9640"/></radialGradient><linearGradient id="linear-gradient" x1="-1130.5" y1="-308.51" x2="-1130.21" y2="-307.69" gradientTransform="translate(61830.19 15468.97) scale(54.66 50.14)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b833e1"/><stop offset="0.37" stop-color="#9059ff"/><stop offset="1" stop-color="#0090ed"/></linearGradient><linearGradient id="linear-gradient-2" x1="-1130.17" y1="-307.9" x2="-1130.7" y2="-308.51" gradientTransform="translate(61830.19 15468.97) scale(54.66 50.14)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#592acb" stop-opacity="0.5"/><stop offset="0.24" stop-color="#722291" stop-opacity="0"/></linearGradient><linearGradient id="linear-gradient-3" x1="-1136.85" y1="-312.43" x2="-1137.39" y2="-311.53" gradientTransform="translate(91030.19 22256.38) scale(80.02 71.19)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff36e" stop-opacity="0.8"/><stop offset="0.09" stop-color="#fff36e" stop-opacity="0.7"/><stop offset="0.75" stop-color="#fff36e" stop-opacity="0"/></linearGradient></defs><g id="Layer_2" data-name="Layer 2"><g id="katman_1" data-name="katman 1"><path class="cls-1" d="M72,15.7A39.45,39.45,0,0,0,41.61,0c-9.29-.19-15.7,2.6-19.33,4.85C27.14,2,34.17.44,40.32.52c15.83.2,32.83,11,35.36,30.41,2.9,22.31-12.64,40.92-34.49,41C17.14,72,2.52,50.68,6.34,31.56a20.18,20.18,0,0,1,.41-2.79,38,38,0,0,1,4.19-14c-2.77,1.43-6.29,6-8,10.16A41.37,41.37,0,0,0,.31,45.09c.06.52.11,1,.18,1.55A40.07,40.07,0,1,0,72,15.7Z"/><path class="cls-2" d="M72,15.7A39.45,39.45,0,0,0,41.61,0c-9.29-.19-15.7,2.6-19.33,4.85C27.14,2,34.17.44,40.32.52c15.83.2,32.83,11,35.36,30.41,2.9,22.31-12.64,40.92-34.49,41C17.14,72,2.52,50.68,6.34,31.56a20.18,20.18,0,0,1,.41-2.79,38,38,0,0,1,4.19-14c-2.77,1.43-6.29,6-8,10.16A41.37,41.37,0,0,0,.31,45.09c.06.52.11,1,.18,1.55A40.07,40.07,0,1,0,72,15.7Z"/><path class="cls-3" d="M72,15.7A39.45,39.45,0,0,0,41.61,0c-9.29-.19-15.7,2.6-19.33,4.85C27.14,2,34.17.44,40.32.52c15.83.2,32.83,11,35.36,30.41,2.9,22.31-12.64,40.92-34.49,41C17.14,72,2.52,50.68,6.34,31.56a20.18,20.18,0,0,1,.41-2.79,38,38,0,0,1,4.19-14c-2.77,1.43-6.29,6-8,10.16A41.37,41.37,0,0,0,.31,45.09c.06.52.11,1,.18,1.55A40.07,40.07,0,1,0,72,15.7Z"/><path class="cls-4" d="M72,15.7A39.45,39.45,0,0,0,41.61,0c-9.29-.19-15.7,2.6-19.33,4.85C27.14,2,34.17.44,40.32.52c15.83.2,32.83,11,35.36,30.41,2.9,22.31-12.64,40.92-34.49,41C17.14,72,2.52,50.68,6.34,31.56a20.18,20.18,0,0,1,.41-2.79,38,38,0,0,1,4.19-14c-2.77,1.43-6.29,6-8,10.16A41.37,41.37,0,0,0,.31,45.09c.06.52.11,1,.18,1.55A40.07,40.07,0,1,0,72,15.7Z"/><path class="cls-5" d="M72,15.7A39.45,39.45,0,0,0,41.61,0c-9.29-.19-15.7,2.6-19.33,4.85C27.14,2,34.17.44,40.32.52c15.83.2,32.83,11,35.36,30.41,2.9,22.31-12.64,40.92-34.49,41C17.14,72,2.52,50.68,6.34,31.56a20.18,20.18,0,0,1,.41-2.79,38,38,0,0,1,4.19-14c-2.77,1.43-6.29,6-8,10.16A41.37,41.37,0,0,0,.31,45.09c.06.52.11,1,.18,1.55A40.07,40.07,0,1,0,72,15.7Z"/><path class="cls-6" d="M76.66,29.83C74.41,9.52,56.3.39,40.33.53c-6.15,0-13.18,1.52-18,4.34a19.52,19.52,0,0,0-3.56,2.7c.13-.11.51-.42,1.15-.86l.06,0,.06,0a26.68,26.68,0,0,1,7.69-3.57A43.16,43.16,0,0,1,40.87,1.52a33.26,33.26,0,0,1,31.25,32c.37,13.21-10.44,23.74-22.9,24.35-9.06.44-17.6-3.94-21.77-12.71a21.35,21.35,0,0,1-2-6.33c-2-13.35,7-24.74,15.21-27.55C36.26,7.4,25.15,7.66,16.88,13.74c-6,4.38-9.82,11-11.1,19a33,33,0,0,0,2.34,18A35.29,35.29,0,0,0,38.21,72.18c1,.08,2,.11,3,.11C67.65,72.27,79.13,52.18,76.66,29.83Z"/><path class="cls-7" d="M76.66,29.83C74.41,9.52,56.3.39,40.33.53c-6.15,0-13.18,1.52-18,4.34a19.52,19.52,0,0,0-3.56,2.7c.13-.11.51-.42,1.15-.86l.06,0,.06,0a26.68,26.68,0,0,1,7.69-3.57A43.16,43.16,0,0,1,40.87,1.52a33.26,33.26,0,0,1,31.25,32c.37,13.21-10.44,23.74-22.9,24.35-9.06.44-17.6-3.94-21.77-12.71a21.35,21.35,0,0,1-2-6.33c-2-13.35,7-24.74,15.21-27.55C36.26,7.4,25.15,7.66,16.88,13.74c-6,4.38-9.82,11-11.1,19a33,33,0,0,0,2.34,18A35.29,35.29,0,0,0,38.21,72.18c1,.08,2,.11,3,.11C67.65,72.27,79.13,52.18,76.66,29.83Z"/><path class="cls-8" d="M76.66,29.83C74.41,9.52,56.3.39,40.33.53c-6.15,0-13.18,1.52-18,4.34a19.52,19.52,0,0,0-3.56,2.7c.13-.11.51-.42,1.15-.86l.06,0,.06,0a26.68,26.68,0,0,1,7.69-3.57A43.16,43.16,0,0,1,40.87,1.52a33.26,33.26,0,0,1,31.25,32c.37,13.21-10.44,23.74-22.9,24.35-9.06.44-17.6-3.94-21.77-12.71a21.35,21.35,0,0,1-2-6.33c-2-13.35,7-24.74,15.21-27.55C36.26,7.4,25.15,7.66,16.88,13.74c-6,4.38-9.82,11-11.1,19a33,33,0,0,0,2.34,18A35.29,35.29,0,0,0,38.21,72.18c1,.08,2,.11,3,.11C67.65,72.27,79.13,52.18,76.66,29.83Z"/><path class="cls-9" d="M76.66,29.83C74.41,9.52,56.3.39,40.33.53c-6.15,0-13.18,1.52-18,4.34a19.52,19.52,0,0,0-3.56,2.7c.13-.11.51-.42,1.15-.86l.06,0,.06,0a26.68,26.68,0,0,1,7.69-3.57A43.16,43.16,0,0,1,40.87,1.52a33.26,33.26,0,0,1,31.25,32c.37,13.21-10.44,23.74-22.9,24.35-9.06.44-17.6-3.94-21.77-12.71a21.35,21.35,0,0,1-2-6.33c-2-13.35,7-24.74,15.21-27.55C36.26,7.4,25.15,7.66,16.88,13.74c-6,4.38-9.82,11-11.1,19a33,33,0,0,0,2.34,18A35.29,35.29,0,0,0,38.21,72.18c1,.08,2,.11,3,.11C67.65,72.27,79.13,52.18,76.66,29.83Z"/><path class="cls-10" d="M49.22,57.84c17.1-1,24.42-15.2,24.88-25.24C74.82,16.91,65.5,0,40.87,1.5A43.44,43.44,0,0,0,27.69,3.05,29,29,0,0,0,20,6.62l-.06,0-.06,0c-.38.27-.76.55-1.12.84a33.47,33.47,0,0,1,21-3.94C53.88,5.46,66.81,16.46,66.81,31c0,11.17-8.63,19.7-18.74,19.09-15-.9-18.8-16.3-11-23-2.11-.45-6.06.43-8.82,4.56-2.47,3.7-2.33,9.41-.81,13.46A22.11,22.11,0,0,0,49.22,57.84Z"/><path class="cls-11" d="M72.05,18.73a22.42,22.42,0,0,0-4.88-8.14A30.29,30.29,0,0,0,58.08,4.1,40.67,40.67,0,0,0,49.14.93,39.88,39.88,0,0,0,32.57.83C26.89,2,21.89,4.49,18.73,7.56a32.23,32.23,0,0,1,8-3.2,33.57,33.57,0,0,1,31.17,8.1,27.2,27.2,0,0,1,4.33,5.3c4.9,8,4.43,18,.62,23.87C60.05,46,54,50.13,48.31,50.08A23.62,23.62,0,0,0,70,39.21C74,33,74.14,25.06,72.05,18.73Z"/><path class="cls-12" d="M72.05,18.73a22.42,22.42,0,0,0-4.88-8.14A30.29,30.29,0,0,0,58.08,4.1,40.67,40.67,0,0,0,49.14.93,39.88,39.88,0,0,0,32.57.83C26.89,2,21.89,4.49,18.73,7.56a32.23,32.23,0,0,1,8-3.2,33.57,33.57,0,0,1,31.17,8.1,27.2,27.2,0,0,1,4.33,5.3c4.9,8,4.43,18,.62,23.87C60.05,46,54,50.13,48.31,50.08A23.62,23.62,0,0,0,70,39.21C74,33,74.14,25.06,72.05,18.73Z"/><path class="cls-13" d="M72,15.7a39.82,39.82,0,0,0-3.48-4,31.54,31.54,0,0,0-3.18-2.93,24,24,0,0,1,1.85,1.79A22.5,22.5,0,0,1,72,18.72C74.13,25.05,74,33,70,39.19A23.54,23.54,0,0,1,49.14,50.08c-.36,0-.72,0-1.09,0-15-.9-18.8-16.3-11-22.95-2.11-.45-6.07.43-8.82,4.56-2.47,3.7-2.33,9.41-.81,13.46a21.35,21.35,0,0,1-2-6.33c-2-13.35,7-24.74,15.21-27.55-4.44-3.87-15.55-3.61-23.82,2.47A27.88,27.88,0,0,0,6.77,28.31a38.62,38.62,0,0,1,4.16-13.55c-2.77,1.43-6.29,6-8,10.16A41.36,41.36,0,0,0,.3,45.1c.06.52.11,1,.18,1.55A40.07,40.07,0,1,0,72,15.7Z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/firefox.svg b/src/browser/themes/shared/zen-icons/firefox.svg
index 5b19e4e2e..3e16f19a0 100644
--- a/src/browser/themes/shared/zen-icons/firefox.svg
+++ b/src/browser/themes/shared/zen-icons/firefox.svg
@@ -3,4 +3,4 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M14.7498,13.0913c-.0154.9253-.7896,1.6587-1.715,1.6587h-6.956c-.2705,0-.4541-.275-.3505-.5248l.0024-.0057c.4574-1.1044,1.1996-2.0362,2.1473-2.7161.1179-.0846.2601-.1284.4052-.1284h4.7793c.9416,0,1.703.7711,1.6873,1.7163Z"/><path d="M9.9212,1.25c.2705,0,.4541.275.3505.5248l-.0024.0057c-.4574,1.1044-1.1996,2.0362-2.1473,2.7161-.1179.0846-.2601.1284-.4052.1284H2.9653c-.9254,0-1.6996-.7334-1.715-1.6587-.0158-.9452.7457-1.7163,1.6873-1.7163h6.9837Z"/><path d="M2.9372,14.75c-.2152,0-.4339-.0414-.6451-.1289-.861-.3566-1.2699-1.3437-.9132-2.2047.5485-1.3241,1.3346-2.5112,2.3367-3.5283,1.0381-1.0537,2.2623-1.877,3.6387-2.4471,1.8919-.7837,3.3654-2.2571,4.149-4.149.3566-.861,1.3437-1.2698,2.2047-.9132.861.3566,1.2699,1.3437.9132,2.2047-.5485,1.3241-1.3346,2.5112-2.3367,3.5283-1.0381,1.0537-2.2623,1.877-3.6387,2.4471-1.8919.7837-3.3654,2.2571-4.149,4.149-.2691.6498-.8975,1.0421-1.5596,1.0421Z"/></svg>
\ No newline at end of file
+<svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="black" fill-opacity="context-fill-opacity"><path d="M14.7498,13.0913c-.0154.9253-.7896,1.6587-1.715,1.6587h-6.956c-.2705,0-.4541-.275-.3505-.5248l.0024-.0057c.4574-1.1044,1.1996-2.0362,2.1473-2.7161.1179-.0846.2601-.1284.4052-.1284h4.7793c.9416,0,1.703.7711,1.6873,1.7163Z"/><path d="M9.9212,1.25c.2705,0,.4541.275.3505.5248l-.0024.0057c-.4574,1.1044-1.1996,2.0362-2.1473,2.7161-.1179.0846-.2601.1284-.4052.1284H2.9653c-.9254,0-1.6996-.7334-1.715-1.6587-.0158-.9452.7457-1.7163,1.6873-1.7163h6.9837Z"/><path d="M2.9372,14.75c-.2152,0-.4339-.0414-.6451-.1289-.861-.3566-1.2699-1.3437-.9132-2.2047.5485-1.3241,1.3346-2.5112,2.3367-3.5283,1.0381-1.0537,2.2623-1.877,3.6387-2.4471,1.8919-.7837,3.3654-2.2571,4.149-4.149.3566-.861,1.3437-1.2698,2.2047-.9132.861.3566,1.2699,1.3437.9132,2.2047-.5485,1.3241-1.3346,2.5112-2.3367,3.5283-1.0381,1.0537-2.2623,1.877-3.6387,2.4471-1.8919.7837-3.3654,2.2571-4.149,4.149-.2691.6498-.8975,1.0421-1.5596,1.0421Z"/></svg>
diff --git a/src/browser/themes/shared/zen-icons/folder.svg b/src/browser/themes/shared/zen-icons/folder.svg
index cd530856e..410313bfe 100644
--- a/src/browser/themes/shared/zen-icons/folder.svg
+++ b/src/browser/themes/shared/zen-icons/folder.svg
@@ -1,6 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 22 18"><path stroke="#8f949b" stroke-width="2" d="M6.53,2.09H3.75a2,2,0,0,0-2,2v10a2,2,0,0,0,2,2h14a2,2,0,0,0,2-2V7a2,2,0,0,0-2-2H11.47a2,2,0,0,1-1.27-.45l-2.4-2A2,2,0,0,0,6.53,2.09Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.75,5.25c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.825c.587,0,1.144,.258,1.524,.705l1.524,1.795h4.626Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/forget.svg b/src/browser/themes/shared/zen-icons/forget.svg
index df1c15d55..d02a1961a 100644
--- a/src/browser/themes/shared/zen-icons/forget.svg
+++ b/src/browser/themes/shared/zen-icons/forget.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M1.5 0a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5H2.254a6.996 6.996 0 0 1 9.52-1.895l.72-.72A7.972 7.972 0 0 0 8.02 0 8.016 8.016 0 0 0 2 2.715V.5a.5.5 0 0 0-.5-.5zm13.87.018a.5.5 0 0 0-.225.128l-15 15a.5.5 0 0 0 0 .707.5.5 0 0 0 .707 0l1.857-1.857a7.953 7.953 0 0 0 3.78 1.86 8.006 8.006 0 0 0 9.12-5.39c.895-2.76.2-5.69-1.617-7.754l1.86-1.859a.5.5 0 0 0 0-.707.5.5 0 0 0-.483-.128zm-2.08 3.398a6.99 6.99 0 0 1 1.367 6.742 6.994 6.994 0 0 1-11.241 3.13L7.27 9.436a.5.5 0 0 0 .229.064h3a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5H8.204l5.085-5.084zM7.499 4a.5.5 0 0 0-.5.5v2.379l1-1v-1.38a.5.5 0 0 0-.5-.5zM.548 7.004a.5.5 0 0 0-.531.466 7.97 7.97 0 0 0 1.369 5.021l.717-.716a6.984 6.984 0 0 1-1.088-4.238.5.5 0 0 0-.467-.534z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="9 4.75 9 9 12.25 11.25" data-color="color-2"></polyline><path d="M1.75,9C1.75,4.996,4.996,1.75,9,1.75s7.25,3.246,7.25,7.25-3.246,7.25-7.25,7.25c-3.031,0-5.627-1.86-6.71-4.5"></path><polyline points="1.88 14.695 2.288 11.75 5.232 12.157"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/forward.svg b/src/browser/themes/shared/zen-icons/forward.svg
index 311b06183..da06af2c8 100644
--- a/src/browser/themes/shared/zen-icons/forward.svg
+++ b/src/browser/themes/shared/zen-icons/forward.svg
@@ -1,6 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 -960 960 960"><path d="m287.231-123.692-39.539-39.539L564.461-480 247.692-796.769l39.539-39.539L643.539-480 287.231-123.692Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="15.25" y1="9" x2="2.75" y2="9" data-color="color-2"></line><polyline points="11 4.75 15.25 9 11 13.25"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/fullscreen-exit.svg b/src/browser/themes/shared/zen-icons/fullscreen-exit.svg
index c77ccaea4..eb189574b 100644
--- a/src/browser/themes/shared/zen-icons/fullscreen-exit.svg
+++ b/src/browser/themes/shared/zen-icons/fullscreen-exit.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M15.5 0a.498.498 0 0 0-.353.146L10 5.292V1.5l-.007-.09A.5.5 0 0 0 9 1.5l.002 5.018v.008a.502.502 0 0 0 .01.08l.004.024.022.062.029.059.043.062.037.041.031.03.055.039.076.04.104.03L9.48 7h5.02l.09-.008A.5.5 0 0 0 15 6.5l-.008-.09a.5.5 0 0 0-.492-.41h-3.795L15.854.854l.059-.069A.501.501 0 0 0 15.5 0zM9.002 6.525v.018l.004.03zM1.5 9l-.09.008A.5.5 0 0 0 1 9.5l.008.09A.5.5 0 0 0 1.5 10h3.793L.147 15.146l-.059.068a.501.501 0 0 0 .766.64L6 10.704V14.5l.008.09A.5.5 0 0 0 7 14.5v-5l-.008-.09A.5.5 0 0 0 6.5 9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 7.25 7.25 7.25 7.25 2.75"></polyline><line x1="7.25" y1="7.25" x2="2.75" y2="2.75"></line><polyline points="10.75 15.25 10.75 10.75 15.25 10.75" data-color="color-2"></polyline><line x1="10.75" y1="10.75" x2="15.25" y2="15.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/fullscreen.svg b/src/browser/themes/shared/zen-icons/fullscreen.svg
index bf476d159..08ec0056e 100644
--- a/src/browser/themes/shared/zen-icons/fullscreen.svg
+++ b/src/browser/themes/shared/zen-icons/fullscreen.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.5 1a.5.5 0 0 0-.5.5l.008.09A.5.5 0 0 0 8.5 2h4.793L2.003 13.29V8.497l-.008-.09a.5.5 0 0 0-.992.09l.002 6.018v.008a.507.507 0 0 0 .01.08l.006.023.029.082.04.075.03.037.06.06.055.04.077.04.103.03.068.007h6.02l.09-.007a.5.5 0 0 0 .41-.493l-.007-.09a.5.5 0 0 0-.493-.41H2.708l11.29-11.29v4.795l.008.09a.5.5 0 0 0 .992-.09v-6l-.002-.044-.013-.084-.031-.083-.041-.074-.03-.037-.06-.06-.055-.04-.076-.04-.063-.02-.086-.016zM1.002 14.53v.018l.004.03z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="10.75 2.75 15.25 2.75 15.25 7.25"></polyline><line x1="15.25" y1="2.75" x2="10.75" y2="7.25"></line><polyline points="2.75 10.75 2.75 15.25 7.25 15.25" data-color="color-2"></polyline><line x1="2.75" y1="15.25" x2="7.25" y2="10.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/geo-blocked.svg b/src/browser/themes/shared/zen-icons/geo-blocked.svg
index ebe651cf3..52a9b5377 100644
--- a/src/browser/themes/shared/zen-icons/geo-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/geo-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M8 0a7.005 7.005 0 0 0-4.949 11.955l1.52 1.498 2.043 1.986.133.117c.775.628 1.91.59 2.64-.117l2.437-2.371 1.127-1.113A7.005 7.005 0 0 0 8 0zm0 .998a5.98 5.98 0 0 1 4.244 1.758 6.009 6.009 0 0 1 .176 8.311l-.176.184-1.32 1.305-2.23 2.168-.094.08a.995.995 0 0 1-1.199 0l-.094-.08-2.98-2.906-.57-.567-.176-.183a6.008 6.008 0 0 1 .176-8.311A5.979 5.979 0 0 1 8.001.999zM8 4a3 3 0 1 0 0 6 3 3 0 0 0 0-6zm0 1a2 2 0 1 1 0 4 2 2 0 0 1 0-4z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.526,12.474c-1.226-1.765-2.305-3.736-2.305-5.208C3.221,3.776,6.207,1.75,9,1.75c1.819,0,3.721,.86,4.826,2.424"></path><path d="M14.759,6.776c.013,.16,.02,.323,.02,.49,0,2.622-3.428,6.833-5.004,8.631-.413,.471-1.139,.471-1.551,0-.329-.375-.739-.856-1.181-1.405"></path><path d="M8.752,9.233c-.849-.12-1.502-.85-1.502-1.733,0-.966,.784-1.75,1.75-1.75,.887,0,1.62,.66,1.735,1.516"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/geo.svg b/src/browser/themes/shared/zen-icons/geo.svg
index cff852aed..bf395d4d4 100644
--- a/src/browser/themes/shared/zen-icons/geo.svg
+++ b/src/browser/themes/shared/zen-icons/geo.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a7.005 7.005 0 0 0-4.949 11.955l1.52 1.498 2.043 1.986.133.117c.775.628 1.91.59 2.64-.117l2.437-2.371 1.127-1.113A7.005 7.005 0 0 0 8 0zm0 .998a5.98 5.98 0 0 1 4.244 1.758 6.009 6.009 0 0 1 .176 8.311l-.176.184-1.32 1.305-2.23 2.168-.094.08a.995.995 0 0 1-1.199 0l-.094-.08-2.98-2.906-.57-.567-.176-.183a6.008 6.008 0 0 1 .176-8.311A5.979 5.979 0 0 1 8.001.999zM8 4a3 3 0 1 0 0 6 3 3 0 0 0 0-6zm0 1a2 2 0 1 1 0 4 2 2 0 0 1 0-4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.779,7.266c0,2.622-3.428,6.833-5.004,8.631-.413,.471-1.139,.471-1.551,0-1.576-1.797-5.004-6.008-5.004-8.631C3.221,3.776,6.207,1.75,9,1.75s5.779,2.026,5.779,5.516Z"></path><circle cx="9" cy="7.5" r="1.75" data-color="color-2"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/help.svg b/src/browser/themes/shared/zen-icons/help.svg
index 5575ab284..95db53598 100644
--- a/src/browser/themes/shared/zen-icons/help.svg
+++ b/src/browser/themes/shared/zen-icons/help.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0zm0 1a7 7 0 1 1 0 14A7 7 0 0 1 8 1zm0 2.5A2.5 2.5 0 0 0 5.5 6a.5.5 0 0 0 1 0 1.5 1.5 0 1 1 2.525 1.094l-.117.102-.248.183a3.094 3.094 0 0 0-.355.323C7.792 8.247 7.5 8.989 7.5 10a.5.5 0 0 0 1 0c0-.758.197-1.253.535-1.613.05-.053.1-.103.156-.15l.086-.071.22-.164.153-.125A2.5 2.5 0 0 0 8 3.5zm0 8A.75.75 0 1 0 8 13a.75.75 0 0 0 0-1.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r="7.25"></circle><path d="M6.925,6.619c.388-1.057,1.294-1.492,2.18-1.492,.895,0,1.818,.638,1.818,1.808,0,1.784-1.816,1.468-2.096,3.065" data-color="color-2"></path><path d="M8.791,13.567c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/history.svg b/src/browser/themes/shared/zen-icons/history.svg
index c6ce150e2..9d853baef 100644
--- a/src/browser/themes/shared/zen-icons/history.svg
+++ b/src/browser/themes/shared/zen-icons/history.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.02 0a7.97 7.97 0 0 1 3.365.752 8.008 8.008 0 0 1 4.227 9.715 8.006 8.006 0 0 1-9.12 5.389A8.005 8.005 0 0 1 .017 7.47a.5.5 0 0 1 .531-.467.5.5 0 0 1 .467.533 6.994 6.994 0 0 0 5.664 7.338 6.994 6.994 0 0 0 7.98-4.717 6.993 6.993 0 0 0-3.696-8.5A6.996 6.996 0 0 0 2.255 4h3.246a.5.5 0 0 1 .5.5.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5.5.5 0 0 1 .5.5v2.215A8.014 8.014 0 0 1 8.021 0z"/>
-  <path d="M7.5 4a.5.5 0 0 0-.5.5V9a.5.5 0 0 0 .5.5h3A.5.5 0 0 0 11 9a.5.5 0 0 0-.5-.5H8v-4a.5.5 0 0 0-.5-.5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,9c0,4.004,3.246,7.25,7.25,7.25s7.25-3.246,7.25-7.25S13.004,1.75,9,1.75c-3.031,0-5.627,1.86-6.71,4.5"></path><polyline points="1.88 3.305 2.288 6.25 5.232 5.843"></polyline><polyline points="9 4.75 9 9 12.25 11.25" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/home.svg b/src/browser/themes/shared/zen-icons/home.svg
index 2cb95adae..f4a3273d7 100644
--- a/src/browser/themes/shared/zen-icons/home.svg
+++ b/src/browser/themes/shared/zen-icons/home.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0c-.359 0-.717.129-1.002.385l-5.5 4.94A1.5 1.5 0 0 0 1 6.442v7.055a1.5 1.5 0 0 0 1.5 1.5H5a1.5 1.5 0 0 0 1.5-1.5v-3.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v3.5a1.5 1.5 0 0 0 1.5 1.5h2.5a1.5 1.5 0 0 0 1.5-1.5V6.44c0-.426-.181-.83-.498-1.115L9.002.385A1.496 1.496 0 0 0 8 0zm0 1a.5.5 0 0 1 .334.129l5.5 4.94c.105.096.166.23.166.372v7.055a.5.5 0 0 1-.5.5H11a.5.5 0 0 1-.5-.5v-3.5a1.5 1.5 0 0 0-1.5-1.5H7a1.5 1.5 0 0 0-1.5 1.5v3.5a.5.5 0 0 1-.5.5H2.5a.5.5 0 0 1-.5-.5V6.441c0-.142.06-.276.166-.371l5.5-4.941A.5.5 0 0 1 8 1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.145,6.2l5.25-3.99c.358-.272,.853-.272,1.21,0l5.25,3.99c.249,.189,.395,.484,.395,.796v7.254c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2V6.996c0-.313,.146-.607,.395-.796Z"></path><path d="M11.652,12.152c-1.464,1.464-3.839,1.464-5.303,0" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index bcd1f08a5..f2d8c8193 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -45,6 +45,10 @@
   list-style-image: url('reload.svg') !important;
 }
 
+.tab-reset-button {
+  list-style-image: url('unpin.svg') !important;
+}
+
 #sidebar-button {
   list-style-image: url('sidebars-right.svg') !important;
 }
@@ -100,10 +104,6 @@
   list-style-image: url('arrow-right.svg');
 }
 
-#PanelUI-menu-button > * {
-  padding: var(--zen-toolbar-button-inner-padding);
-}
-
 #PanelUI-menu-button,
 #appMenu-more-button2,
 #zen-workspace-actions-menu-icon {
@@ -164,7 +164,7 @@
 
 #context_zenEditWorkspace,
 #zenToolbarThemePicker {
-  --menu-image: url('edit.svg') !important;
+  --menu-image: url('edit-theme.svg') !important;
 }
 
 #add-ons-button,
diff --git a/src/browser/themes/shared/zen-icons/image-copy.svg b/src/browser/themes/shared/zen-icons/image-copy.svg
index 55070ef35..b8df4d044 100644
--- a/src/browser/themes/shared/zen-icons/image-copy.svg
+++ b/src/browser/themes/shared/zen-icons/image-copy.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6.498 5.497a.998.998 0 1 0 0-1.995.998.998 0 0 0 0 1.995z"/>
-  <path d="M3 4a3 3 0 0 1 3-3h6a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm3-2a2 2 0 0 0-2 2v6c0 .37.101.718.277 1.016L7.79 7.502a1.71 1.71 0 0 1 2.418 0l3.514 3.514c.176-.298.277-.645.277-1.016V4a2 2 0 0 0-2-2zm7.016 9.723L9.502 8.209a.71.71 0 0 0-1.004 0l-3.514 3.514c.298.176.645.277 1.016.277h6c.37 0 .718-.101 1.016-.277z"/>
-  <path d="M10 15c.888 0 1.687-.386 2.236-1H5.5A3.5 3.5 0 0 1 2 10.5V3.764C1.386 4.314 1 5.112 1 6v4.5A4.5 4.5 0 0 0 5.5 15z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.587,12.243l5.206-5.2c.391-.391,1.024-.391,1.414,0l3.043,3.043" data-color="color-2"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect><path d="M8,7c-.551,0-1-.449-1-1s.449-1,1-1,1,.449,1,1-.449,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/image-open.svg b/src/browser/themes/shared/zen-icons/image-open.svg
index 375bbcceb..677757e66 100644
--- a/src/browser/themes/shared/zen-icons/image-open.svg
+++ b/src/browser/themes/shared/zen-icons/image-open.svg
@@ -1,13 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3 1c-1.099 0-2 .9-2 2v3.174C1.313 6.064 1.648 6 2 6V3c0-.563.437-1 1-1h3v1.5C6 4.323 6.677 5 7.5 5H14v8c0 .563-.437 1-1 1h-3c0 .352-.064.687-.174 1H13c1.1 0 2-.9 2-2V3c0-1.099-.9-2-2-2H3zm4 1h6c.563 0 1 .437 1 1v1H7.5a.493.493 0 0 1-.5-.5V2z"/>
-  <g fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.001">
-  <rect x=".5" y="7.5" width="8" height="8" rx="1.5" ry="1.5"/>
-  <path d="m1 15 2.793-2.793a1 1 0 0 1 1.414 0L8 15"/>
-  </g>
-  <circle cx="6.25" cy="9.75" r=".75"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4,15.25l5.836-5.836c.781-.781,2.047-.781,2.828,0l3.086,3.086" data-color="color-2"></path><rect x="2.25" y="4.75" width="13.5" height="10.5" rx="2" ry="2"></rect><line x1="4.75" y1="1.75" x2="13.25" y2="1.75" data-color="color-2"></line><circle cx="5.75" cy="8.25" r="1.25" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/image-save.svg b/src/browser/themes/shared/zen-icons/image-save.svg
index be5e07551..3278cba0d 100644
--- a/src/browser/themes/shared/zen-icons/image-save.svg
+++ b/src/browser/themes/shared/zen-icons/image-save.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M4 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h2.006a1.8 1.8 0 0 1 .05-.348L6.22 14h-2.22c-.355 0-.704-.094-1.011-.273L7.65 9.145a.496.496 0 0 1 .7 0l.73.716.707-.707-.737-.722a1.5 1.5 0 0 0-2.102 0l-4.67 4.588A1.989 1.989 0 0 1 2 12V4a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v2.006c.044-.002.087-.006.13-.006h.003c.305 0 .596.051.867.139v-2.14a3 3 0 0 0-3-3zm6.5 3c-2 0-2 3 0 3s2-3 0-3zm0 1c.667 0 .667 1 0 1s-.667-1 0-1z"/>
-  <path d="M14.13 7c-.478 0-.957.18-1.322.547l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.498a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.02-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7zm-.002 1.002c.427.002.671.224.8.537.13.314.116.643-.187.947l-4.826 4.826a1.204 1.204 0 0 1-.556.315l-1.316.332.33-1.32H8.37c.053-.21.163-.403.316-.557l4.828-4.83a.85.85 0 0 1 .614-.25zm-6.266 7 .002.002H7.86l.002-.002z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="m3.762,14.989l6.074-6.075c.781-.781,2.047-.781,2.828,0l2.586,2.586"></path><circle cx="6.25" cy="7.25" r="1.25" stroke-width="0" fill="currentColor"></circle><line x1="14.25" y1="1.25" x2="14.25" y2="6.25" data-color="color-2"></line><path d="m9.461,2.75h-4.711c-1.1046,0-2,.8955-2,2v8.5c0,1.1045.8954,2,2,2h8.5c1.1046,0,2-.8955,2-2v-4.7109"></path><line x1="16.75" y1="3.75" x2="11.75" y2="3.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/info.svg b/src/browser/themes/shared/zen-icons/info.svg
index 7ab0b1f61..9db7c53f9 100644
--- a/src/browser/themes/shared/zen-icons/info.svg
+++ b/src/browser/themes/shared/zen-icons/info.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 11V16M12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21ZM12.0498 8V8.1L11.9502 8.1002V8H12.0498Z" stroke="context-fill" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r="7.25"></circle><line x1="9" y1="12.819" x2="9" y2="8.25" data-color="color-2"></line><path d="M9,6.75c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/inspect.svg b/src/browser/themes/shared/zen-icons/inspect.svg
index 8315e6070..cdab4a408 100644
--- a/src/browser/themes/shared/zen-icons/inspect.svg
+++ b/src/browser/themes/shared/zen-icons/inspect.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2 1a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h5v-1H2a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v7a1 1 0 0 1-.885.994l.446.445c.113.114.205.242.275.38A2.001 2.001 0 0 0 16 10V3a2 2 0 0 0-2-2H2zm6.598 6.01A.5.5 0 0 0 8 7.5v7a.5.5 0 0 0 .91.287l1.57-2.246 2.944.453a.499.499 0 0 0 .43-.848l-5-5a.499.499 0 0 0-.256-.136zM9 8.707l3.066 3.066-1.74-.267a.5.5 0 0 0-.486.207L9 12.914V8.707z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="14 6.25 16.25 4 14 1.75" data-color="color-2"></polyline><path d="M6.596,2.75h-1.846c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2H13.25c1.105,0,2-.896,2-2v-4.846"></path><polyline points="11 6.25 8.75 4 11 1.75" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index c6e75732b..a21b66ae7 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -34,6 +34,7 @@
   skin/classic/browser/zen-icons/edit-paste.svg                      (../shared/zen-icons/edit-paste.svg) 
   skin/classic/browser/zen-icons/edit-redo.svg                      (../shared/zen-icons/edit-redo.svg) 
   skin/classic/browser/zen-icons/edit-select-all.svg                      (../shared/zen-icons/edit-select-all.svg) 
+  skin/classic/browser/zen-icons/edit-theme.svg                      (../shared/zen-icons/edit-theme.svg) 
   skin/classic/browser/zen-icons/edit-undo.svg                      (../shared/zen-icons/edit-undo.svg) 
   skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/edit.svg) 
   skin/classic/browser/zen-icons/essential-add.svg                      (../shared/zen-icons/essential-add.svg) 
@@ -41,7 +42,6 @@
   skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/ext-link.svg) 
   skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/extension-blocked.svg) 
   skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/extension.svg) 
-  skin/classic/browser/zen-icons/firefox-logo.svg                      (../shared/zen-icons/firefox-logo.svg) 
   skin/classic/browser/zen-icons/firefox.svg                      (../shared/zen-icons/firefox.svg) 
   skin/classic/browser/zen-icons/folder.svg                      (../shared/zen-icons/folder.svg) 
   skin/classic/browser/zen-icons/forget.svg                      (../shared/zen-icons/forget.svg) 
@@ -62,10 +62,6 @@
   skin/classic/browser/zen-icons/jar.inc.mn                      (../shared/zen-icons/jar.inc.mn) 
   skin/classic/browser/zen-icons/library.svg                      (../shared/zen-icons/library.svg) 
   skin/classic/browser/zen-icons/link.svg                      (../shared/zen-icons/link.svg) 
-  skin/classic/browser/zen-icons/mac-close.svg                      (../shared/zen-icons/mac-close.svg) 
-  skin/classic/browser/zen-icons/mac-maximize.svg                      (../shared/zen-icons/mac-maximize.svg) 
-  skin/classic/browser/zen-icons/mac-minimize.svg                      (../shared/zen-icons/mac-minimize.svg) 
-  skin/classic/browser/zen-icons/mac-restore.svg                      (../shared/zen-icons/mac-restore.svg) 
   skin/classic/browser/zen-icons/mail.svg                      (../shared/zen-icons/mail.svg) 
   skin/classic/browser/zen-icons/manage.svg                      (../shared/zen-icons/manage.svg) 
   skin/classic/browser/zen-icons/media-loop.svg                      (../shared/zen-icons/media-loop.svg) 
@@ -128,11 +124,6 @@
   skin/classic/browser/zen-icons/update-resources.sh                      (../shared/zen-icons/update-resources.sh) 
   skin/classic/browser/zen-icons/video-open.svg                      (../shared/zen-icons/video-open.svg) 
   skin/classic/browser/zen-icons/video-save.svg                      (../shared/zen-icons/video-save.svg) 
-  skin/classic/browser/zen-icons/win11-close-dark.svg                      (../shared/zen-icons/win11-close-dark.svg) 
-  skin/classic/browser/zen-icons/win11-close.svg                      (../shared/zen-icons/win11-close.svg) 
-  skin/classic/browser/zen-icons/win11-maximize.svg                      (../shared/zen-icons/win11-maximize.svg) 
-  skin/classic/browser/zen-icons/win11-minimize.svg                      (../shared/zen-icons/win11-minimize.svg) 
-  skin/classic/browser/zen-icons/win11-restore.svg                      (../shared/zen-icons/win11-restore.svg) 
   skin/classic/browser/zen-icons/window.svg                      (../shared/zen-icons/window.svg) 
   skin/classic/browser/zen-icons/xr-blocked.svg                      (../shared/zen-icons/xr-blocked.svg) 
   skin/classic/browser/zen-icons/xr.svg                      (../shared/zen-icons/xr.svg) 
diff --git a/src/browser/themes/shared/zen-icons/library.svg b/src/browser/themes/shared/zen-icons/library.svg
index 0d2a624a3..b623e3383 100644
--- a/src/browser/themes/shared/zen-icons/library.svg
+++ b/src/browser/themes/shared/zen-icons/library.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M1.5 0A1.5 1.5 0 0 0 0 1.498v12.98c0 .827.672 1.496 1.5 1.496h1c.828 0 1.498-.669 1.498-1.496V1.498C3.998.671 3.328 0 2.5 0h-1zm4.998 0a1.5 1.5 0 0 0-1.5 1.498v12.98c0 .827.672 1.496 1.5 1.496h1c.828 0 1.498-.669 1.498-1.496V1.498C8.996.671 8.326 0 7.498 0h-1zM1.5.998h1c.276 0 .498.224.498.5v12.98a.497.497 0 0 1-.498.498h-1a.499.499 0 0 1-.5-.498V1.498a.5.5 0 0 1 .5-.5zm4.998 0h1a.5.5 0 0 1 .5.5v12.98a.499.499 0 0 1-.5.498h-1a.499.499 0 0 1-.5-.498V1.498a.5.5 0 0 1 .5-.5zm5.813 1.996a1.504 1.504 0 0 0-.463.057l-.744.21a1.497 1.497 0 0 0-1.061 1.74l2.004 9.8a1.499 1.499 0 0 0 1.838 1.152l.984-.25c.79-.201 1.274-.995 1.092-1.787l-2.242-9.76a1.5 1.5 0 0 0-1.408-1.162zm-.088 1a.502.502 0 0 1 .522.387l2.242 9.76c.06.264-.1.526-.364.593l-.984.252a.5.5 0 0 1-.613-.384l-2.004-9.8a.499.499 0 0 1 .353-.58l.746-.21a.488.488 0 0 1 .102-.018z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="2.75" width="4" height="12.5" rx="1" ry="1"></rect><rect x="2.75" y="4.75" width="3" height="10.5" rx="1" ry="1"></rect><rect x="11.235" y="4.719" width="3.5" height="10.5" rx="1" ry="1" transform="translate(-2.382 4.324) rotate(-17.344)"></rect><line x1="10.934" y1="9.272" x2="14.275" y2="8.228"></line><line x1="5.75" y1="7.25" x2="9.75" y2="7.25"></line><line x1="2.75" y1="8.75" x2="5.75" y2="8.75"></line><line x1="1" y1="15.25" x2="17" y2="15.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/link.svg b/src/browser/themes/shared/zen-icons/link.svg
index 9edeb4ce3..5f1c21e95 100644
--- a/src/browser/themes/shared/zen-icons/link.svg
+++ b/src/browser/themes/shared/zen-icons/link.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6 4a.5.5 0 0 1 .09.992L6 5H4a3 3 0 0 0-.197 5.994L4 11h2a.5.5 0 0 1 .09.992L6 12H4a4 4 0 0 1-.219-7.994L4.001 4zm6 0a4 4 0 0 1 .22 7.994L12 12h-2a.5.5 0 0 1-.09-.992L10 11h2a3 3 0 0 0 .198-5.994L12 5h-2a.5.5 0 0 1-.09-.992L10 4zM4 7.5h8a.5.5 0 0 1 .09.992L12 8.5H4a.5.5 0 0 1-.09-.992L4 7.5h8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M8.5,6.827c-.352,.168-.682,.398-.973,.69l-.01,.01c-1.381,1.381-1.381,3.619,0,5l2.175,2.175c1.381,1.381,3.619,1.381,5,0l.01-.01c1.381-1.381,1.381-3.619,0-5l-.931-.931" data-color="color-2"></path><path d="M9.5,11.173c.352-.168,.682-.398,.973-.69l.01-.01c1.381-1.381,1.381-3.619,0-5l-2.175-2.175c-1.381-1.381-3.619-1.381-5,0l-.01,.01c-1.381,1.381-1.381,3.619,0,5l.931,.931"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/mac-close.svg b/src/browser/themes/shared/zen-icons/mac-close.svg
deleted file mode 100644
index 0b1719ed5..000000000
--- a/src/browser/themes/shared/zen-icons/mac-close.svg
+++ /dev/null
@@ -1,259 +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/.
-   -->
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg4428"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="close.svg">
-  <defs
-     id="defs4430" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#eff0f1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.018566"
-     inkscape:cx="-12.086195"
-     inkscape:cy="33.94295"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="715"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4436"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingx="1.0666667"
-       spacingy="1.0666667" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4433">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1098.5197)">
-    <g
-       id="4"
-       inkscape:label="#g3842"
-       transform="translate(86.4,-3.2)" />
-    <g
-       transform="translate(-288.74253,1318.98)"
-       style="display:inline"
-       id="active-center"
-       inkscape:label="#active-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1569-36"
-         width="16"
-         height="16"
-         x="293"
-         y="-242.63782"
-         ry="1.6930764e-05" />
-      <g
-         inkscape:label="#g841"
-         transform="translate(294,-241.63782)"
-         id="titlebutton-close-1-7"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-53">
-          <path
-             style="fill:#cb4e43;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-56"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:#fe6254;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-288.74253,1318.98)"
-       style="display:inline"
-       id="inactive-center"
-       inkscape:label="#inactive-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-268.63782"
-         x="293"
-         height="16"
-         width="16"
-         id="rect1561-02"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         inkscape:label="#g965"
-         transform="translate(294,-267.63782)"
-         id="titlebutton-close-backdrop-1-3"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-97-7">
-          <path
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-361-5"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-2"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-288.74253,1318.98)"
-       style="display:inline"
-       id="pressed-center"
-       inkscape:label="#pressed-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1586-93"
-         width="16"
-         height="16"
-         x="293"
-         y="-190.63782"
-         ry="1.6930764e-05" />
-      <g
-         inkscape:label="#g853"
-         transform="translate(294,-189.63782)"
-         id="titlebutton-close-active-1-1"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-3-9">
-          <path
-             style="fill:#cb4e43;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-6-4"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
-             d="m 9.1715729,1037.5338 c -0.3917372,0.3917 -0.3917372,1.0224 0,1.4142 l 1.4142131,1.4142 -1.4142131,1.4142 c -0.3917372,0.3918 -0.3917372,1.0225 0,1.4142 0.3917371,0.3918 1.0224761,0.3918 1.4142131,0 L 12,1041.7764 l 1.414214,1.4142 c 0.391737,0.3918 1.022476,0.3918 1.414213,0 0.391737,-0.3917 0.391737,-1.0224 0,-1.4142 l -1.414213,-1.4142 1.414213,-1.4142 c 0.391737,-0.3918 0.391737,-1.0225 0,-1.4142 -0.391737,-0.3918 -1.022476,-0.3918 -1.414213,0 L 12,1038.948 l -1.414214,-1.4142 c -0.391737,-0.3918 -1.022476,-0.3918 -1.4142131,0 z"
-             id="path4-7-7"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-288.74253,1318.98)"
-       style="display:inline"
-       id="hover-center"
-       inkscape:label="#hover-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-216.63782"
-         x="293"
-         height="16"
-         width="16"
-         id="rect1577-8"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         inkscape:label="#g879"
-         transform="translate(294,-215.63782)"
-         id="titlebutton-close-hover-1-4"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g8-5">
-          <path
-             style="fill:#cb4e43;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-62-0"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:#fe6254;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-9"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
-             d="m 9.1715729,1037.5338 c -0.3917372,0.3917 -0.3917372,1.0224 0,1.4142 l 1.4142131,1.4142 -1.4142131,1.4142 c -0.3917372,0.3918 -0.3917372,1.0225 0,1.4142 0.3917371,0.3918 1.0224761,0.3918 1.4142131,0 L 12,1041.7764 l 1.414214,1.4142 c 0.391737,0.3918 1.022476,0.3918 1.414213,0 0.391737,-0.3917 0.391737,-1.0224 0,-1.4142 l -1.414213,-1.4142 1.414213,-1.4142 c 0.391737,-0.3918 0.391737,-1.0225 0,-1.4142 -0.391737,-0.3918 -1.022476,-0.3918 -1.414213,0 L 12,1038.948 l -1.414214,-1.4142 c -0.391737,-0.3918 -1.022476,-0.3918 -1.4142131,0 z"
-             id="path6-36"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       inkscape:label="#deactivated-center"
-       id="deactivated-center"
-       style="display:inline"
-       transform="translate(-260.91475,1318.98)">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect918"
-         width="16"
-         height="16"
-         x="293"
-         y="-268.63782"
-         ry="1.6930764e-05" />
-      <g
-         style="enable-background:new"
-         id="g926"
-         transform="translate(294,-267.63782)"
-         inkscape:label="#g965">
-        <g
-           id="g924"
-           transform="translate(-4.9999997,-1033.3622)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path920"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path922"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/mac-maximize.svg b/src/browser/themes/shared/zen-icons/mac-maximize.svg
deleted file mode 100644
index 052c24dd1..000000000
--- a/src/browser/themes/shared/zen-icons/mac-maximize.svg
+++ /dev/null
@@ -1,576 +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/.
-   -->
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg4428"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="maximize.svg">
-  <defs
-     id="defs4430">
-    <linearGradient
-       id="linearGradient3868">
-      <stop
-         style="stop-color:#5a5a5a;stop-opacity:1;"
-         offset="0"
-         id="stop3870" />
-      <stop
-         style="stop-color:#646464;stop-opacity:1;"
-         offset="1"
-         id="stop3872" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3813">
-      <stop
-         style="stop-color:#666666;stop-opacity:1;"
-         offset="0"
-         id="stop3815" />
-      <stop
-         style="stop-color:#636363;stop-opacity:1;"
-         offset="1"
-         id="stop3817" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3787">
-      <stop
-         style="stop-color:#e5e5df;stop-opacity:1;"
-         offset="0"
-         id="stop3789" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:1;"
-         offset="1"
-         id="stop3791" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3806-3-5-6">
-      <stop
-         style="stop-color:#303030;stop-opacity:1;"
-         offset="0"
-         id="stop3808-6-9-1" />
-      <stop
-         style="stop-color:#232323;stop-opacity:1;"
-         offset="1"
-         id="stop3810-4-6-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3793"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3828"
-       gradientUnits="userSpaceOnUse"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-6.5,-80.335554)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       id="linearGradient3787-8">
-      <stop
-         style="stop-color:#f5f5ee;stop-opacity:1;"
-         offset="0"
-         id="stop3789-2" />
-      <stop
-         style="stop-color:#e6e6df;stop-opacity:1;"
-         offset="1"
-         id="stop3791-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       id="linearGradient3787-7">
-      <stop
-         style="stop-color:#f5f5ee;stop-opacity:1;"
-         offset="0"
-         id="stop3789-3" />
-      <stop
-         style="stop-color:#e6e6e0;stop-opacity:1;"
-         offset="1"
-         id="stop3791-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3807"
-       x1="11"
-       y1="15.75"
-       x2="11"
-       y2="8.25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3813"
-       id="linearGradient3819"
-       x1="29.5"
-       y1="15.2"
-       x2="29.5"
-       y2="8.8000002"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231"
-       id="linearGradient3807-1"
-       x1="10"
-       y1="7.0000038"
-       x2="10"
-       y2="15.888954"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231">
-      <stop
-         id="stop4233"
-         offset="0"
-         style="stop-color:#e7e7e1;stop-opacity:1;" />
-      <stop
-         id="stop4239"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-1"
-       id="linearGradient3807-1-1"
-       x1="10"
-       y1="15.888976"
-       x2="10"
-       y2="7.0000262"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231-1">
-      <stop
-         id="stop4233-6"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-7"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363">
-      <stop
-         style="stop-color:#979791;stop-opacity:1;"
-         offset="0"
-         id="stop4365" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:0;"
-         offset="1"
-         id="stop4367" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363-7">
-      <stop
-         style="stop-color:#f5f5ef;stop-opacity:1;"
-         offset="0"
-         id="stop4365-9" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:0;"
-         offset="1"
-         id="stop4367-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient4361"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-41.25,0)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7">
-      <stop
-         id="stop4233-4"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-249.25,-54.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7-9"
-       id="linearGradient3159-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7-9">
-      <stop
-         id="stop4233-4-2"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8-9"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4231-5">
-      <stop
-         id="stop4233-41"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-73"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7-7"
-       id="linearGradient3159-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7-7">
-      <stop
-         id="stop4233-4-7"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8-2"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-73"
-       id="linearGradient3807-1-7"
-       x1="10"
-       y1="15.888976"
-       x2="10"
-       y2="7.0000262"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231-73">
-      <stop
-         id="stop4233-1"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-85"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#eff0f1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.0351563"
-     inkscape:cx="35.514532"
-     inkscape:cy="30.84609"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="715"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4436"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingx="1.0666667"
-       spacingy="1.0666667" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4433">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1098.5197)">
-    <g
-       id="4"
-       inkscape:label="#g3842"
-       transform="translate(86.4,-3.2)" />
-    <g
-       transform="translate(-269.20729,1319.5894)"
-       style="display:inline"
-       id="inactive-center"
-       inkscape:label="#inactive-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1559-2"
-         width="16"
-         height="16"
-         x="273"
-         y="-268.63782"
-         ry="1.6930764e-05" />
-      <g
-         inkscape:label="#g865"
-         transform="translate(274,-267.63782)"
-         id="titlebutton-maximize-backdrop-1-9"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-5-1">
-          <path
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-3-2"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-5"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-269.20729,1319.5894)"
-       style="display:inline"
-       id="active-center"
-       inkscape:label="#active-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-242.63782"
-         x="273"
-         height="16"
-         width="16"
-         id="rect1567-7"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         inkscape:label="#g891"
-         transform="translate(274,-241.63782)"
-         id="titlebutton-maximize-1-0"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-1-9">
-          <path
-             style="fill:#20a932;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-2-3"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#28d33f;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-70"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-269.20729,1319.5894)"
-       style="display:inline"
-       id="pressed-center"
-       inkscape:label="#pressed-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-190.63782"
-         x="273"
-         height="16"
-         width="16"
-         id="rect1584-1"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         inkscape:label="#g903"
-         transform="translate(274,-189.63782)"
-         id="titlebutton-maximize-active-1-0"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-9-6">
-          <path
-             style="fill:#20a932;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-36-3"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 10.414063,1037.3622 15,1041.9481 v -3.5859 c 0,-0.4155 -0.5845,-1 -1,-1 z M 9,1038.7763 v 3.5859 c 0,0.4155 0.5845,1 1,1 h 3.585938 z"
-             id="path4-0-2"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-269.20729,1319.5894)"
-       style="display:inline"
-       id="hover-center"
-       inkscape:label="#hover-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1575-0"
-         width="16"
-         height="16"
-         x="273"
-         y="-216.63782"
-         ry="1.6930764e-05" />
-      <g
-         inkscape:label="#g929"
-         transform="translate(274,-215.63782)"
-         id="titlebutton-maximize-hover-1-6"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g8-8-1">
-          <path
-             style="fill:#20a932;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-7-5"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#28d33f;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-92"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 10.414063,1037.3622 15,1041.9481 v -3.5859 c 0,-0.4155 -0.5845,-1 -1,-1 z M 9,1038.7763 v 3.5859 c 0,0.4155 0.5845,1 1,1 h 3.585938 z"
-             id="path6-0-54"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       inkscape:label="#deactivated-center"
-       id="deactivated-center"
-       style="display:inline"
-       transform="translate(-229.89827,1319.5894)">
-      <rect
-         ry="1.6930764e-05"
-         y="-268.63782"
-         x="273"
-         height="16"
-         width="16"
-         id="rect963"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         style="enable-background:new"
-         id="g971"
-         transform="translate(274,-267.63782)"
-         inkscape:label="#g865">
-        <g
-           id="g969"
-           transform="translate(-4.9999997,-1033.3622)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path965"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path967"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/mac-minimize.svg b/src/browser/themes/shared/zen-icons/mac-minimize.svg
deleted file mode 100644
index a8b049ce4..000000000
--- a/src/browser/themes/shared/zen-icons/mac-minimize.svg
+++ /dev/null
@@ -1,582 +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/.
-   -->
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg4428"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="minimize.svg">
-  <defs
-     id="defs4430">
-    <linearGradient
-       id="linearGradient3868">
-      <stop
-         style="stop-color:#5a5a5a;stop-opacity:1;"
-         offset="0"
-         id="stop3870" />
-      <stop
-         style="stop-color:#646464;stop-opacity:1;"
-         offset="1"
-         id="stop3872" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3813">
-      <stop
-         style="stop-color:#666666;stop-opacity:1;"
-         offset="0"
-         id="stop3815" />
-      <stop
-         style="stop-color:#636363;stop-opacity:1;"
-         offset="1"
-         id="stop3817" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3787">
-      <stop
-         style="stop-color:#e5e5df;stop-opacity:1;"
-         offset="0"
-         id="stop3789" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:1;"
-         offset="1"
-         id="stop3791" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3806-3-5-6">
-      <stop
-         style="stop-color:#303030;stop-opacity:1;"
-         offset="0"
-         id="stop3808-6-9-1" />
-      <stop
-         style="stop-color:#232323;stop-opacity:1;"
-         offset="1"
-         id="stop3810-4-6-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3793"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3828"
-       gradientUnits="userSpaceOnUse"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-6.5,-80.335554)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       id="linearGradient3787-8">
-      <stop
-         style="stop-color:#f5f5ee;stop-opacity:1;"
-         offset="0"
-         id="stop3789-2" />
-      <stop
-         style="stop-color:#e6e6df;stop-opacity:1;"
-         offset="1"
-         id="stop3791-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       id="linearGradient3787-7">
-      <stop
-         style="stop-color:#f5f5ee;stop-opacity:1;"
-         offset="0"
-         id="stop3789-3" />
-      <stop
-         style="stop-color:#e6e6e0;stop-opacity:1;"
-         offset="1"
-         id="stop3791-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3807"
-       x1="11"
-       y1="15.75"
-       x2="11"
-       y2="8.25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3813"
-       id="linearGradient3819"
-       x1="29.5"
-       y1="15.2"
-       x2="29.5"
-       y2="8.8000002"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231"
-       id="linearGradient3807-1"
-       x1="10"
-       y1="7.0000038"
-       x2="10"
-       y2="15.888954"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231">
-      <stop
-         id="stop4233"
-         offset="0"
-         style="stop-color:#e7e7e1;stop-opacity:1;" />
-      <stop
-         id="stop4239"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-1"
-       id="linearGradient3807-1-1"
-       x1="10"
-       y1="15.888976"
-       x2="10"
-       y2="7.0000262"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231-1">
-      <stop
-         id="stop4233-6"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-7"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363">
-      <stop
-         style="stop-color:#979791;stop-opacity:1;"
-         offset="0"
-         id="stop4365" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:0;"
-         offset="1"
-         id="stop4367" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363-7">
-      <stop
-         style="stop-color:#f5f5ef;stop-opacity:1;"
-         offset="0"
-         id="stop4365-9" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:0;"
-         offset="1"
-         id="stop4367-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient4361"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-41.25,0)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7">
-      <stop
-         id="stop4233-4"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-249.25,-54.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7-9"
-       id="linearGradient3159-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7-9">
-      <stop
-         id="stop4233-4-2"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8-9"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4231-5">
-      <stop
-         id="stop4233-41"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-73"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7-7"
-       id="linearGradient3159-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7-7">
-      <stop
-         id="stop4233-4-7"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8-2"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-73"
-       id="linearGradient3807-1-7"
-       x1="10"
-       y1="15.888976"
-       x2="10"
-       y2="7.0000262"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231-73">
-      <stop
-         id="stop4233-1"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-85"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#eff0f1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4390728"
-     inkscape:cx="98.183628"
-     inkscape:cy="48.522401"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="715"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4436"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingx="1.0666667"
-       spacingy="1.0666667" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4433">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1098.5197)">
-    <g
-       id="4"
-       inkscape:label="#g3842"
-       transform="translate(86.4,-3.2)" />
-    <g
-       transform="translate(-248.71593,1319.5894)"
-       style="display:inline"
-       id="inactive-center"
-       inkscape:label="#inactive-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-268.63782"
-         x="253"
-         height="16"
-         width="16"
-         id="rect1557-60"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         inkscape:label="#g915"
-         transform="translate(254,-267.63782)"
-         id="titlebutton-minimize-backdrop-1-6"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-6-2">
-          <path
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-26-6"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-1"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-248.71593,1319.5894)"
-       style="display:inline"
-       id="active-center"
-       inkscape:label="#active-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1565-18"
-         width="16"
-         height="16"
-         x="253"
-         y="-242.63782"
-         ry="1.6930764e-05" />
-      <g
-         inkscape:label="#g941"
-         transform="translate(254,-241.63782)"
-         id="titlebutton-minimize-1-7"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-2-9">
-          <path
-             style="fill:#caa124;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-37-2"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#fdc92d;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-59"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-248.71593,1319.5894)"
-       style="display:inline"
-       id="pressed-center"
-       inkscape:label="#pressed-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1582-7"
-         width="16"
-         height="16"
-         x="253"
-         y="-190.63782"
-         ry="1.6930764e-05" />
-      <g
-         inkscape:label="#g953"
-         transform="translate(254,-189.63782)"
-         id="titlebutton-minimize-active-1-6"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g6-22-5">
-          <path
-             style="fill:#caa124;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-8-6"
-             inkscape:connector-curvature="0" />
-          <rect
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             width="8"
-             height="2"
-             x="8"
-             y="1039.36"
-             ry="1"
-             id="rect4-9" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-248.71593,1319.5894)"
-       style="display:inline"
-       id="hover-center"
-       inkscape:label="#hover-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-216.63782"
-         x="253"
-         height="16"
-         width="16"
-         id="rect1573-3"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         inkscape:label="#g979"
-         transform="translate(254,-215.63782)"
-         id="titlebutton-minimize-hover-1-7"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g8-9-45">
-          <path
-             style="fill:#caa124;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path2-31-2"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#fdc92d;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path4-94"
-             inkscape:connector-curvature="0" />
-          <rect
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             width="8"
-             height="2"
-             x="8"
-             y="1039.36"
-             ry="1"
-             id="rect6-5" />
-        </g>
-      </g>
-    </g>
-    <g
-       inkscape:label="#deactivated-center"
-       id="deactivated-center"
-       style="display:inline"
-       transform="translate(-215.70856,1319.5894)">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect963"
-         width="16"
-         height="16"
-         x="253"
-         y="-268.63782"
-         ry="1.6930764e-05" />
-      <g
-         style="enable-background:new"
-         id="g971"
-         transform="translate(254,-267.63782)"
-         inkscape:label="#g915">
-        <g
-           id="g969"
-           transform="translate(-4.9999997,-1033.3622)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path965"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path967"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/mac-restore.svg b/src/browser/themes/shared/zen-icons/mac-restore.svg
deleted file mode 100644
index 1782e0666..000000000
--- a/src/browser/themes/shared/zen-icons/mac-restore.svg
+++ /dev/null
@@ -1,588 +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/.
-   -->
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg4428"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="restore.svg">
-  <defs
-     id="defs4430">
-    <linearGradient
-       id="linearGradient3868">
-      <stop
-         style="stop-color:#5a5a5a;stop-opacity:1;"
-         offset="0"
-         id="stop3870" />
-      <stop
-         style="stop-color:#646464;stop-opacity:1;"
-         offset="1"
-         id="stop3872" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3813">
-      <stop
-         style="stop-color:#666666;stop-opacity:1;"
-         offset="0"
-         id="stop3815" />
-      <stop
-         style="stop-color:#636363;stop-opacity:1;"
-         offset="1"
-         id="stop3817" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3787">
-      <stop
-         style="stop-color:#e5e5df;stop-opacity:1;"
-         offset="0"
-         id="stop3789" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:1;"
-         offset="1"
-         id="stop3791" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3806-3-5-6">
-      <stop
-         style="stop-color:#303030;stop-opacity:1;"
-         offset="0"
-         id="stop3808-6-9-1" />
-      <stop
-         style="stop-color:#232323;stop-opacity:1;"
-         offset="1"
-         id="stop3810-4-6-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3793"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3828"
-       gradientUnits="userSpaceOnUse"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-6.5,-80.335554)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       id="linearGradient3787-8">
-      <stop
-         style="stop-color:#f5f5ee;stop-opacity:1;"
-         offset="0"
-         id="stop3789-2" />
-      <stop
-         style="stop-color:#e6e6df;stop-opacity:1;"
-         offset="1"
-         id="stop3791-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787-8"
-       id="linearGradient3835-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1666666,0,0,1.0769231,-35.5,-1105.6978)"
-       x1="40"
-       y1="1044.3622"
-       x2="40"
-       y2="1032.3622" />
-    <linearGradient
-       id="linearGradient3787-7">
-      <stop
-         style="stop-color:#f5f5ee;stop-opacity:1;"
-         offset="0"
-         id="stop3789-3" />
-      <stop
-         style="stop-color:#e6e6e0;stop-opacity:1;"
-         offset="1"
-         id="stop3791-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3807"
-       x1="11"
-       y1="15.75"
-       x2="11"
-       y2="8.25"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3813"
-       id="linearGradient3819"
-       x1="29.5"
-       y1="15.2"
-       x2="29.5"
-       y2="8.8000002"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231"
-       id="linearGradient3807-1"
-       x1="10"
-       y1="7.0000038"
-       x2="10"
-       y2="15.888954"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231">
-      <stop
-         id="stop4233"
-         offset="0"
-         style="stop-color:#e7e7e1;stop-opacity:1;" />
-      <stop
-         id="stop4239"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-1"
-       id="linearGradient3807-1-1"
-       x1="10"
-       y1="15.888976"
-       x2="10"
-       y2="7.0000262"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231-1">
-      <stop
-         id="stop4233-6"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-7"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363">
-      <stop
-         style="stop-color:#979791;stop-opacity:1;"
-         offset="0"
-         id="stop4365" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:0;"
-         offset="1"
-         id="stop4367" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4363-7">
-      <stop
-         style="stop-color:#f5f5ef;stop-opacity:1;"
-         offset="0"
-         id="stop4365-9" />
-      <stop
-         style="stop-color:#dadad4;stop-opacity:0;"
-         offset="1"
-         id="stop4367-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient4361"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-41.25,0)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7">
-      <stop
-         id="stop4233-4"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7"
-       id="linearGradient3159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-249.25,-54.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7-9"
-       id="linearGradient3159-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7-9">
-      <stop
-         id="stop4233-4-2"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8-9"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4231-5">
-      <stop
-         id="stop4233-41"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-73"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-7-7"
-       id="linearGradient3159-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1875,0,0,1,-262.25,-55.99998)"
-       x1="248.63158"
-       y1="79"
-       x2="248.63158"
-       y2="58" />
-    <linearGradient
-       id="linearGradient4231-7-7">
-      <stop
-         id="stop4233-4-7"
-         offset="0"
-         style="stop-color:#e6e6df;stop-opacity:1;" />
-      <stop
-         id="stop4239-8-2"
-         offset="1"
-         style="stop-color:#d1d1ca;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4231-73"
-       id="linearGradient3807-1-7"
-       x1="10"
-       y1="15.888976"
-       x2="10"
-       y2="7.0000262"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4231-73">
-      <stop
-         id="stop4233-1"
-         offset="0"
-         style="stop-color:#e5e5de;stop-opacity:1;" />
-      <stop
-         id="stop4239-85"
-         offset="1"
-         style="stop-color:#dadad3;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#eff0f1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4390728"
-     inkscape:cx="10.646126"
-     inkscape:cy="41.087583"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="715"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showborder="true"
-     inkscape:showpageshadow="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4436"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingx="1.0666667"
-       spacingy="1.0666667" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4433">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1098.5197)">
-    <g
-       id="4"
-       inkscape:label="#g3842"
-       transform="translate(86.4,-3.2)" />
-    <g
-       transform="translate(-308.9394,1319.319)"
-       style="display:inline"
-       id="inactive-center"
-       inkscape:label="#inactive-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1563-92"
-         width="16"
-         height="16"
-         x="313"
-         y="-268.63782"
-         ry="1.6930764e-05" />
-      <g
-         style="enable-background:new"
-         id="titlebutton-restore-backdrop-1-28"
-         transform="translate(314,-267.63782)"
-         inkscape:label="#g865">
-        <g
-           id="g985-9"
-           transform="translate(-4.9999997,-1033.3622)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path981-7"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path983"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-308.9394,1319.319)"
-       style="display:inline"
-       id="active-center"
-       inkscape:label="#active-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-242.63782"
-         x="313"
-         height="16"
-         width="16"
-         id="rect1571-3"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         style="enable-background:new"
-         id="titlebutton-restore-1-6"
-         transform="translate(314,-241.63782)"
-         inkscape:label="#g891">
-        <g
-           id="g993-1"
-           transform="translate(-4.9999997,-1033.3622)">
-          <path
-             inkscape:connector-curvature="0"
-             id="path989-2"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             style="fill:#20a932;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path991"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             style="opacity:1;fill:#28d33f;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-308.9394,1319.319)"
-       style="display:inline"
-       id="hover-center"
-       inkscape:label="#hover-center">
-      <rect
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
-         id="rect1579-4"
-         width="16"
-         height="16"
-         x="313"
-         y="-216.63782"
-         ry="1.6930764e-05" />
-      <g
-         transform="translate(-5.22207,8.7802826)"
-         inkscape:label="#g1870"
-         id="titlebutton-restore-hover-1-7">
-        <path
-           style="fill:#20a932;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 326.22213,-210.4181 c 3.86593,0 6.99994,-3.134 6.99994,-7 0,-3.866 -3.13401,-7 -6.99994,-7 -3.86604,0 -7.00006,3.134 -7.00006,7 0,3.866 3.13402,7 7.00006,7"
-           id="path1005-4"
-           inkscape:connector-curvature="0" />
-        <path
-           style="opacity:1;fill:#28d33f;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 326.22214,-210.918 c 3.58978,0 6.49993,-2.9103 6.49993,-6.5001 0,-3.5899 -2.91015,-6.5 -6.49993,-6.5 -3.58992,0 -6.50007,2.9101 -6.50007,6.5 0,3.5898 2.91015,6.5001 6.50007,6.5001"
-           id="path1007"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g1846-43"
-           transform="translate(0.00779,0.077375)">
-          <path
-             sodipodi:nodetypes="csscc"
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="m 326.21372,-222.08576 v 3.5859 c 0,0.4155 0.5845,1 1,1 h 3.58594 z"
-             id="path1031-0"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path1838-7"
-             d="m 326.21484,-212.90509 v -3.5859 c 0,-0.4155 -0.5845,-1 -1,-1 h -3.58594 z"
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="csscc" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(-308.9394,1319.319)"
-       style="display:inline"
-       id="pressed-center"
-       inkscape:label="#pressed-center">
-      <rect
-         ry="1.6930764e-05"
-         y="-190.63782"
-         x="313"
-         height="16"
-         width="16"
-         id="rect1588-8"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         transform="translate(-5.22207,8.7802826)"
-         inkscape:label="#g1863"
-         id="titlebutton-restore-active-1-6">
-        <path
-           style="fill:#20a932;fill-opacity:1;fill-rule:evenodd;stroke:none"
-           d="m 326.22213,-184.4181 c 3.86593,0 6.99994,-3.134 6.99994,-7 0,-3.866 -3.13401,-7 -6.99994,-7 -3.86604,0 -7.00006,3.134 -7.00006,7 0,3.866 3.13402,7 7.00006,7"
-           id="path997-8"
-           inkscape:connector-curvature="0" />
-        <g
-           transform="translate(0.00779,26.077325)"
-           id="g1857-84">
-          <path
-             inkscape:connector-curvature="0"
-             id="path1853-3"
-             d="m 326.21372,-222.08576 v 3.5859 c 0,0.4155 0.5845,1 1,1 h 3.58594 z"
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="csscc" />
-          <path
-             sodipodi:nodetypes="csscc"
-             style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="m 326.21484,-212.90509 v -3.5859 c 0,-0.4155 -0.5845,-1 -1,-1 h -3.58594 z"
-             id="path1855-1"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <g
-       inkscape:label="#deactivated-center"
-       id="deactivated-center"
-       style="display:inline"
-       transform="translate(-276.97437,1319.319)">
-      <rect
-         ry="1.6930764e-05"
-         y="-268.63782"
-         x="313"
-         height="16"
-         width="16"
-         id="rect972"
-         style="opacity:0;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47432083;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
-      <g
-         inkscape:label="#g865"
-         transform="translate(314,-267.63782)"
-         id="g980"
-         style="enable-background:new">
-        <g
-           transform="translate(-4.9999997,-1033.3622)"
-           id="g978">
-          <path
-             style="fill:#bababa;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7"
-             id="path974"
-             inkscape:connector-curvature="0" />
-          <path
-             style="opacity:1;fill:#cecece;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 12.000067,1046.8623 c 3.589781,0 6.499933,-2.9103 6.499933,-6.5001 0,-3.5899 -2.910152,-6.5 -6.499933,-6.5 -3.5899136,0 -6.5000676,2.9101 -6.5000676,6.5 0,3.5898 2.910154,6.5001 6.5000676,6.5001"
-             id="path976"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/mail.svg b/src/browser/themes/shared/zen-icons/mail.svg
index 86c3528af..f9e4ace67 100644
--- a/src/browser/themes/shared/zen-icons/mail.svg
+++ b/src/browser/themes/shared/zen-icons/mail.svg
@@ -3,6 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
   <path d="M2.5 1A2.5 2.5 0 0 0 0 3.5v8A2.5 2.5 0 0 0 2.5 14h11a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 13.5 1h-11zm0 1h11A1.5 1.5 0 0 1 15 3.5v.3L8 7.92 1 3.803V3.5A1.5 1.5 0 0 1 2.5 2zM15 4.961V11.5a1.5 1.5 0 0 1-1.5 1.5h-11A1.5 1.5 0 0 1 1 11.5V4.963l6.746 3.969.082.037a.5.5 0 0 0 .426-.037L15 4.961z"/>
 </svg>
+a<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,5.75l6.767,3.733c.301,.166,.665,.166,.966,0l6.767-3.733" data-color="color-2"></path><rect x="1.75" y="3.25" width="14.5" height="11.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/manage.svg b/src/browser/themes/shared/zen-icons/manage.svg
index 4cf0679cf..879093489 100644
--- a/src/browser/themes/shared/zen-icons/manage.svg
+++ b/src/browser/themes/shared/zen-icons/manage.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M7.004 4.5A4.5 4.5 0 0 1 13.356.398a.5.5 0 0 1 .147.809L11.21 3.5l1.293 1.293L14.796 2.5a.5.5 0 0 1 .81.148 4.5 4.5 0 0 1-5.207 6.215L4.032 15.31A2.357 2.357 0 0 1 .66 12.018l6.425-6.66a4.52 4.52 0 0 1-.082-.858zm4.5-3.5a3.5 3.5 0 0 0-3.387 4.386.5.5 0 0 1-.124.473L1.38 12.712a1.357 1.357 0 0 0 1.943 1.896l6.574-6.66a.5.5 0 0 1 .512-.123A3.5 3.5 0 0 0 14.93 3.78l-2.073 2.072a.5.5 0 0 1-.707 0l-2-2a.5.5 0 0 1 0-.707l2.073-2.073a3.516 3.516 0 0 0-.72-.074z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="4.25" y="3.25" width="9.5" height="11.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><line x1="1.25" y1="3.75" x2="1.25" y2="14.25" data-color="color-2"></line><line x1="16.75" y1="3.75" x2="16.75" y2="14.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-loop.svg b/src/browser/themes/shared/zen-icons/media-loop.svg
index 7124990be..347399d89 100644
--- a/src/browser/themes/shared/zen-icons/media-loop.svg
+++ b/src/browser/themes/shared/zen-icons/media-loop.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M9.957.502a.501.501 0 0 0-.37.783l.06.069 1.656 1.656c-.1-.006-.201-.01-.303-.01H5l-.217.004a5 5 0 0 0-3.69 8.119.5.5 0 1 0 .8-.602A4 4 0 0 1 5 4h6.002l.143.002.14.008-1.637 1.636-.058.069a.503.503 0 0 0 0 .57l.058.069.069.058c.17.118.4.118.57 0l.069-.058 2.5-2.5.058-.069a.503.503 0 0 0 0-.57l-.058-.069-2.5-2.5-.069-.058a.502.502 0 0 0-.328-.086zm4.543 4.17a.5.5 0 0 0-.39.812A4 4 0 0 1 11 12H5l-.143-.002-.14-.008 1.637-1.636.058-.069a.501.501 0 0 0-.766-.639l-2.5 2.5-.058.069a.501.501 0 0 0 .058.639l2.5 2.5.069.058a.501.501 0 0 0 .639-.058l.058-.069a.501.501 0 0 0-.058-.639L4.697 12.99c.1.006.201.01.303.01h6l.217-.004a5 5 0 0 0 3.676-8.135l-.018-.021-.066-.063a.498.498 0 0 0-.309-.105z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,13.75h-.75c-1.105,0-2-.895-2-2V6.25c0-1.105,.895-2,2-2H13.75c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2h-5.742" data-color="color-2"></path><polyline points="10.5 11.25 8.008 13.742 10.5 16.235"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-mute.svg b/src/browser/themes/shared/zen-icons/media-mute.svg
index 6c9e0670b..d97c674da 100644
--- a/src/browser/themes/shared/zen-icons/media-mute.svg
+++ b/src/browser/themes/shared/zen-icons/media-mute.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.852.01a.985.985 0 0 0-.532.26L4.447 3.865a.499.499 0 0 1-.34.133H1.5a1.5 1.5 0 0 0-1.5 1.5v5.003a1.5 1.5 0 0 0 1.5 1.5h2.607c.127 0 .248.048.34.134L8.32 15.73c.64.594 1.68.141 1.68-.732V1.002C10 .347 9.414-.072 8.852.01zM9 1.002v13.996l-3.873-3.596a1.497 1.497 0 0 0-1.02-.4H1.5a.5.5 0 0 1-.5-.5V5.498a.5.5 0 0 1 .5-.5h2.607a1.5 1.5 0 0 0 1.02-.401zM11.5 5.5a.5.5 0 0 0-.354.854L12.793 8l-1.647 1.647a.5.5 0 0 0 .708.708L13.5 8.707l1.646 1.648a.5.5 0 1 0 .708-.708L14.207 8l1.647-1.647a.5.5 0 0 0-.708-.708L13.5 7.293l-1.646-1.648A.498.498 0 0 0 11.5 5.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.75,5.143V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508H3.75c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.63"></path><path d="M9,13.21l3.981,2.548c.333,.213,.77-.026,.77-.421v-6.72"></path><line x1="2.75" y1="15.75" x2="16.75" y2="2.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-pause.svg b/src/browser/themes/shared/zen-icons/media-pause.svg
index 84888b297..f6bdbdafb 100644
--- a/src/browser/themes/shared/zen-icons/media-pause.svg
+++ b/src/browser/themes/shared/zen-icons/media-pause.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M7 5.5a.5.5 0 0 0-1 0v5a.5.5 0 0 0 1 0zm3 0a.5.5 0 0 0-1 0v5a.5.5 0 0 0 1 0zM8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0zM1 8a7 7 0 1 1 14 0A7 7 0 0 1 1 8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="2.75" y="2.75" width="3.5" height="12.5" rx="1" ry="1"></rect><rect x="11.75" y="2.75" width="3.5" height="12.5" rx="1" ry="1" data-color="color-2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-pip.svg b/src/browser/themes/shared/zen-icons/media-pip.svg
index e938777e7..4ef02df2b 100644
--- a/src/browser/themes/shared/zen-icons/media-pip.svg
+++ b/src/browser/themes/shared/zen-icons/media-pip.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h10a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3zm0 1h10a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2zm4 5a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8a1 1 0 0 0-1-1zm0 1h6v4h-1.293L9.354 9.646a.5.5 0 0 0-.708 0L7 11.293zm4.5 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zM9 10.707 10.293 12H7.707z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,12.25h-2c-1.105,0-2-.895-2-2V5.75c0-1.105,.895-2,2-2H12.25c1.105,0,2,.895,2,2v2"></path><rect x="8.75" y="10.75" width="7.5" height="4.5" rx="1.5" ry="1.5"></rect><polyline points="7.25 6.25 7.25 9.25 4.25 9.25" data-color="color-2"></polyline><line x1="7.25" y1="9.25" x2="4.25" y2="6.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-play.svg b/src/browser/themes/shared/zen-icons/media-play.svg
index 67eba330f..7cf4f6039 100644
--- a/src/browser/themes/shared/zen-icons/media-play.svg
+++ b/src/browser/themes/shared/zen-icons/media-play.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M7.125 5.184A.75.75 0 0 0 6 5.834v4.333a.75.75 0 0 0 1.125.65l4.125-2.383a.5.5 0 0 0 0-.866zM0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 1 0 0 14A7 7 0 0 0 8 1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.652,8.568l-3.651-2.129c-.333-.194-.752,.046-.752,.432v4.259c0,.386,.419,.626,.752,.432l3.651-2.129c.331-.193,.331-.671,0-.864Z" data-color="color-2"></path><path d="M4.987,2.961c.778-.518,1.662-.89,2.612-1.075"></path><path d="M1.879,7.631c.185-.968,.562-1.867,1.091-2.657"></path><path d="M4.987,15.039c.778,.518,1.662,.89,2.612,1.075"></path><path d="M1.879,10.369c.185,.968,.562,1.867,1.091,2.657"></path><path d="M10.435,1.892c3.317,.666,5.815,3.595,5.815,7.108s-2.499,6.443-5.817,7.108"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-speed.svg b/src/browser/themes/shared/zen-icons/media-speed.svg
index 1af6d042f..3cb15775c 100644
--- a/src/browser/themes/shared/zen-icons/media-speed.svg
+++ b/src/browser/themes/shared/zen-icons/media-speed.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.006 3A8.517 8.517 0 0 0 .03 8.545a.5.5 0 0 0 .295.644.5.5 0 0 0 .643-.294c.1-.272.232-.526.361-.78l1.928 1.073a.5.5 0 0 0 .68-.196.5.5 0 0 0-.196-.68L1.844 7.259A7.479 7.479 0 0 1 7.5 4.039V6.5A.5.5 0 0 0 8 7a.5.5 0 0 0 .5-.5V4.04c.62.041 1.23.139 1.807.325l.65-.806a1.5 1.5 0 0 1 .002-.002A8.437 8.437 0 0 0 8.006 3zm4.117 1a.5.5 0 0 0-.387.186l-5.185 6.439c-.483.6-.724 1.448-.364 2.22a2.002 2.002 0 0 0 1.987 1.147c.844-.074 1.492-.688 1.748-1.443l2.676-7.889a.5.5 0 0 0-.475-.66zm1.395 1.064-.344 1.01c.37.354.702.75.996 1.176l-1.912 1.063a.5.5 0 0 0-.195.68.5.5 0 0 0 .68.195l1.943-1.08c.128.253.245.515.345.787a.5.5 0 0 0 .643.294.5.5 0 0 0 .295-.642 8.465 8.465 0 0 0-2.451-3.483zM10.746 7.01l-1.771 5.219c-.15.439-.475.731-.887.767a.998.998 0 0 1-.994-.574c-.173-.37-.074-.786.234-1.168z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="12" r="1" fill="currentColor" data-color="color-2"></circle><path d="M12.75,12.25h3.487c.003-.083,.013-.166,.013-.25,0-4.004-3.246-7.25-7.25-7.25S1.75,7.996,1.75,12c0,.084,.01,.167,.013,.25h3.487"></path><line x1="8.495" y1="11.137" x2="6.557" y2="7.827" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-unmute.svg b/src/browser/themes/shared/zen-icons/media-unmute.svg
index 444db3b8d..dc630d8a5 100644
--- a/src/browser/themes/shared/zen-icons/media-unmute.svg
+++ b/src/browser/themes/shared/zen-icons/media-unmute.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8.85.01a.985.985 0 0 0-.53.26L4.446 3.865a.498.498 0 0 1-.34.133H1.5a1.5 1.5 0 0 0-1.5 1.5v5.003a1.5 1.5 0 0 0 1.5 1.5h2.607a.5.5 0 0 1 .34.134l3.872 3.595c.64.594 1.68.141 1.68-.732V1.002c0-.655-.586-1.074-1.149-.992zm.15.992v13.996l-3.873-3.596a1.497 1.497 0 0 0-1.02-.4H1.5a.5.5 0 0 1-.5-.5V5.498a.5.5 0 0 1 .5-.5h2.607c.378 0 .742-.143 1.02-.401zm4.62 1.495a.502.502 0 0 0-.4.834 7.007 7.007 0 0 1 0 9.337.502.502 0 0 0 .04.708c.205.184.52.166.704-.04a8.01 8.01 0 0 0 0-10.673.496.496 0 0 0-.344-.166zm-1.35 2.505a.5.5 0 0 0-.371.746 4.501 4.501 0 0 1 0 4.503.501.501 0 0 0 .868.5 5.504 5.504 0 0 0-.002-5.502.499.499 0 0 0-.494-.247z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,5.75H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508Z"></path><path d="M13.914,7.586c.781,.781,.781,2.047,0,2.828" data-color="color-2"></path><path d="M15.859,5.641c1.855,1.855,1.855,4.863,0,6.718" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/menu-bar.svg b/src/browser/themes/shared/zen-icons/menu-bar.svg
index f7d17ae57..f843149e2 100644
--- a/src/browser/themes/shared/zen-icons/menu-bar.svg
+++ b/src/browser/themes/shared/zen-icons/menu-bar.svg
@@ -1,6 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 -960 960 960"><path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="9" cy="3.25" r=".5" fill="currentColor"></circle><circle cx="9" cy="14.75" r=".5" fill="currentColor"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/menu.svg b/src/browser/themes/shared/zen-icons/menu.svg
index 609ff90fb..dc211f56a 100644
--- a/src/browser/themes/shared/zen-icons/menu.svg
+++ b/src/browser/themes/shared/zen-icons/menu.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <circle cx="8" cy="8" r="1.25"/>
-  <circle cx="13.25" cy="8" r="1.25"/>
-  <circle cx="2.75" cy="8" r="1.25"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="3.25" cy="9" r=".5" fill="currentColor"></circle><circle cx="14.75" cy="9" r=".5" fill="currentColor"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/microphone-blocked.svg b/src/browser/themes/shared/zen-icons/microphone-blocked.svg
index 6451ee589..e0c5193bc 100644
--- a/src/browser/themes/shared/zen-icons/microphone-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/microphone-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M8 0a3 3 0 0 0-3 3v5a3 3 0 1 0 6 0V3a3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2v5a2 2 0 1 1-4 0V3a2 2 0 0 1 2-2zM3 7.5a.5.5 0 0 0-.5.5 5.502 5.502 0 0 0 5 5.479V15.5a.5.5 0 0 0 1 0v-2.021A5.502 5.502 0 0 0 13.5 8a.5.5 0 0 0-1 0 4.5 4.5 0 0 1-9 0 .5.5 0 0 0-.5-.5z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="1.75" width="6.5" height="9.5" rx="3.25" ry="3.25"></rect><path d="M5.109,12.891c-1.437-1.145-2.359-2.911-2.359-4.891" data-color="color-2"></path><path d="M15.25,8c0,3.452-2.798,6.25-6.25,6.25h0c-.527,0-1.038-.065-1.527-.188" data-color="color-2"></path><line x1="9" y1="14.25" x2="9" y2="16.25" data-color="color-2"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/microphone.svg b/src/browser/themes/shared/zen-icons/microphone.svg
index 3bd48a23e..2ff9811d9 100644
--- a/src/browser/themes/shared/zen-icons/microphone.svg
+++ b/src/browser/themes/shared/zen-icons/microphone.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a3 3 0 0 0-3 3v5a3 3 0 1 0 6 0V3a3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2v5a2 2 0 1 1-4 0V3a2 2 0 0 1 2-2zM3 7.5a.5.5 0 0 0-.5.5 5.502 5.502 0 0 0 5 5.479V15.5a.5.5 0 0 0 1 0v-2.021A5.502 5.502 0 0 0 13.5 8a.5.5 0 0 0-1 0 4.5 4.5 0 0 1-9 0 .5.5 0 0 0-.5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="1.75" width="6.5" height="9.5" rx="3.25" ry="3.25"></rect><path d="M15.25,8c0,3.452-2.798,6.25-6.25,6.25h0c-3.452,0-6.25-2.798-6.25-6.25" data-color="color-2"></path><line x1="9" y1="14.25" x2="9" y2="16.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/midi.svg b/src/browser/themes/shared/zen-icons/midi.svg
index 8d98d0ef0..c7a3aae1c 100644
--- a/src/browser/themes/shared/zen-icons/midi.svg
+++ b/src/browser/themes/shared/zen-icons/midi.svg
@@ -3,6 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
   <path d="M.5 2a.5.5 0 0 0-.5.5v11a.5.5 0 0 0 .5.5h15a.5.5 0 0 0 .5-.5v-11a.5.5 0 0 0-.5-.5H.5zM1 3h14v4H1V3zm2.711 1a.75.75 0 1 0 .04 0h-.04zM10.5 4a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2zm-4.289.002a.75.75 0 1 0 .04 0h-.04zM1 8h2v3.5a.5.5 0 0 0 1 0V8h2v3.5a.5.5 0 0 0 1 0V8h2v3.5a.5.5 0 0 0 1 0V8h2v3.5a.5.5 0 0 0 1 0V8h2v5H1V8z"/>
 </svg>
diff --git a/src/browser/themes/shared/zen-icons/move-tab.svg b/src/browser/themes/shared/zen-icons/move-tab.svg
index cc863f41c..a27866f14 100644
--- a/src/browser/themes/shared/zen-icons/move-tab.svg
+++ b/src/browser/themes/shared/zen-icons/move-tab.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M10.5 1a.498.498 0 0 0-.354.854L12.293 4H2.5a.5.5 0 0 0 0 1h9.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3A.498.498 0 0 0 10.5 1zm-5 7a.498.498 0 0 0-.354.146l-3 3a.5.5 0 0 0 0 .708l3 3a.5.5 0 0 0 .708-.708L3.707 12H13.5a.5.5 0 0 0 0-1H3.707l2.147-2.146A.5.5 0 0 0 5.5 8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,16.25v-.5c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v.5"></path><path d="M3.75,11.25c0-.828,.672-1.5,1.5-1.5h7.5c.828,0,1.5,.672,1.5,1.5"></path><polyline points="11.5 4.75 9 7.25 6.5 4.75" data-color="color-2"></polyline><line x1="9" y1="7" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/new-tab-image.svg b/src/browser/themes/shared/zen-icons/new-tab-image.svg
index d8b9da402..bc40fea49 100644
--- a/src/browser/themes/shared/zen-icons/new-tab-image.svg
+++ b/src/browser/themes/shared/zen-icons/new-tab-image.svg
@@ -1,11 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3 1c-1.099 0-2 .9-2 2v10c0 1.099.9 2 2 2h10c1.099 0 2-.9 2-2V3c0-1.099-.9-2-2-2H3zm0 1h3v1.5C6 4.323 6.677 5 7.5 5H14v8c0 .563-.437 1-1 1H3c-.563 0-1-.437-1-1V3c0-.563.437-1 1-1zm4 0h6c.563 0 1 .437 1 1v1H7.5a.493.493 0 0 1-.5-.5V2z"/>
-  <circle cx="5" cy="9" r="1"/>
-  <circle cx="8" cy="9" r="1"/>
-  <circle cx="11" cy="9" r="1"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/nucleo-copyright-notice.html b/src/browser/themes/shared/zen-icons/nucleo-copyright-notice.html
new file mode 100644
index 000000000..9e53e90b2
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/nucleo-copyright-notice.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Nucleo Icons - Copyright Notice</title>
+</head>
+<body>
+	<p>Copyright (C) Nucleo</p>
+    <p>Version 1.2, 23 November 2023</p>
+    <p>Nucleo Icons</p>
+    <p><a href="https://nucleoapp.com/">https://nucleoapp.com/</a></p>
+    <p>The Nucleo icons are copyrighted. Redistribution is not permitted. Use in source and binary forms, with or without modification, is permitted only if you possess a Nucleo license.</p>
+    <p>Refer to the license page for additional information:</p>
+    <p><a href="https://nucleoapp.com/license">https://nucleoapp.com/license</a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-icons/open.svg b/src/browser/themes/shared/zen-icons/open.svg
index e92ea516c..3e0a34c1e 100644
--- a/src/browser/themes/shared/zen-icons/open.svg
+++ b/src/browser/themes/shared/zen-icons/open.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M4 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h4.5a.5.5 0 0 0 0-1H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v2.5a.5.5 0 0 0 1 0V4a3 3 0 0 0-3-3H4zm2.508 5A.5.5 0 0 0 6 6.494V11.5a.5.5 0 1 0 1 0V7.707l6.146 6.146a.5.5 0 0 0 .707-.707L7.707 7H11.5a.5.5 0 0 0 0-1H6.508z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6,14.25H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v7.5c0,1.105-.895,2-2,2h-2.25"></path><line x1="1.75" y1="6.25" x2="16.25" y2="6.25"></line><polyline points="6.5 11.25 9 8.75 11.5 11.25" data-color="color-2"></polyline><line x1="9" y1="8.75" x2="9" y2="17.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/page-portrait.svg b/src/browser/themes/shared/zen-icons/page-portrait.svg
index dfb440c09..07dab98f5 100644
--- a/src/browser/themes/shared/zen-icons/page-portrait.svg
+++ b/src/browser/themes/shared/zen-icons/page-portrait.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2 2v12a2 2 45 0 0 2 2h8a2 2 135 0 0 2-2V5.828c0-.663-.264-1.299-.732-1.768L9.94.732A2.5 2.5 0 0 0 8.172 0H4a2 2 135 0 0-2 2zm2-1h4v3.5A1.5 1.5 0 0 0 9.5 6H13v8a1 1 135 0 1-1 1H4a1 1 45 0 1-1-1V2a1 1 135 0 1 1-1zm5 .25c.083.055.161.118.232.19l3.328 3.327c.072.072.135.15.19.233H9.5a.5.5 0 0 1-.5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.16,6.25h-3.41c-.552,0-1-.448-1-1V1.852" data-color="color-2"></path><path d="M2.75,14.25V3.75c0-1.105,.895-2,2-2h5.586c.265,0,.52,.105,.707,.293l3.914,3.914c.188,.188,.293,.442,.293,.707v7.586c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/passwords.svg b/src/browser/themes/shared/zen-icons/passwords.svg
index 1529c33fb..b87deb0ff 100644
--- a/src/browser/themes/shared/zen-icons/passwords.svg
+++ b/src/browser/themes/shared/zen-icons/passwords.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M10.5 0C7.424 0 5 2.424 5 5.5c0 .397.04.795.121 1.174.058.27-.007.505-.14.639l-4.542 4.54A1.5 1.5 0 0 0 0 12.916V14.5A1.5 1.5 0 0 0 1.5 16h2A1.5 1.5 0 0 0 5 14.5V14h1a1 1 0 0 0 1-1v-1h1a1 1 0 0 0 1-1v-.18c.493.134 1.007.18 1.5.18 3.076 0 5.5-2.424 5.5-5.5S13.576 0 10.5 0zm0 1C13.024 1 15 2.976 15 5.5S13.024 10 10.5 10c-.66 0-1.274-.096-1.777-.348A.5.5 0 0 0 8 10.1v.9H7a1 1 0 0 0-1 1v1H5a1 1 0 0 0-1 1v.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-1.586a.5.5 0 0 1 .147-.354l4.54-4.54c.433-.433.523-1.044.413-1.556A4.626 4.626 0 0 1 6 5.5C6 2.976 7.976 1 10.5 1zM12 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.747,2.076l-2.847,.177-5.891,5.891c-.324-.084-.658-.144-1.009-.144-2.209,0-4,1.791-4,4s1.791,4,4,4,4-1.791,4-4c0-.362-.064-.707-.154-1.041l1.904-1.959v-2.25h2.25l1.753-1.645-.006-3.029Z"></path><circle cx="5.5" cy="12.5" r="1" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/paste-and-go.svg b/src/browser/themes/shared/zen-icons/paste-and-go.svg
index 0aa645502..05ac6e8eb 100644
--- a/src/browser/themes/shared/zen-icons/paste-and-go.svg
+++ b/src/browser/themes/shared/zen-icons/paste-and-go.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M5.5 0a1.5 1.5 0 0 0-1.414 1H2.5A1.5 1.5 0 0 0 1 2.5v12A1.5 1.5 0 0 0 2.5 16h5.844a5.536 5.536 0 0 1-1.086-1H2.5a.5.5 0 0 1-.5-.5v-12a.5.5 0 0 1 .5-.5h1.586A1.5 1.5 0 0 0 5.5 3h3a1.5 1.5 0 0 0 1.414-1H11.5a.5.5 0 0 1 .5.5v3.525c.344.031.677.096 1 .188V2.5A1.5 1.5 0 0 0 11.5 1H9.914A1.5 1.5 0 0 0 8.5 0h-3zm0 1h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1 0-1zm6 6a4.5 4.5 0 1 0 0 9 4.5 4.5 0 0 0 0-9zm0 2c.128 0 .256.049.354.146l2 2a.502.502 0 0 1 .146.35v.008a.495.495 0 0 1-.145.348l-.001.002-2 2a.5.5 0 0 1-.708-.708L12.293 12H9.5a.5.5 0 0 1 0-1h2.793l-1.147-1.146A.5.5 0 0 1 11.5 9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.25,2.75h-1c-1.105,0-2,.895-2,2V14.25c0,1.105,.895,2,2,2h7.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1"></path><rect x="6.25" y="1.25" width="5.5" height="3" rx="1" ry="1" data-color="color-2"></rect><polyline points="6.25 10.25 8 12.25 11.75 7.25" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/permissions.svg b/src/browser/themes/shared/zen-icons/permissions.svg
index 8549ff79c..bcb43381e 100644
--- a/src/browser/themes/shared/zen-icons/permissions.svg
+++ b/src/browser/themes/shared/zen-icons/permissions.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M4 2a3 3 0 0 0-3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2 2 2 0 0 1 2-2zm3.87 1a4 4 0 0 1 .127 1h6.5a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5h-6.63zM12 8a3 3 0 0 0-3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2 2 2 0 0 1 2-2zM1.5 11a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h6.63a4 4 0 0 1-.135-1h-6.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="2.75" y="2.75" width="12.5" height="12.5" rx="2" ry="2"></rect><line x1="9.75" y1="6.75" x2="12.75" y2="6.75" data-color="color-2"></line><line x1="5.25" y1="6.75" x2="7.25" y2="6.75" data-color="color-2"></line><line x1="7.25" y1="5" x2="7.25" y2="8.5" data-color="color-2"></line><line x1="10.75" y1="11.25" x2="12.75" y2="11.25" data-color="color-2"></line><line x1="5.25" y1="11.25" x2="8.25" y2="11.25" data-color="color-2"></line><line x1="10.75" y1="9.5" x2="10.75" y2="13" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg b/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg
index fdf67b861..66278262e 100644
--- a/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M4 1a2.536 2.536 0 0 0-2.42 1.787L.17 7.375A3.83 3.83 0 0 0 0 8.5v3.25A2.258 2.258 0 0 0 2.25 14h11.5A2.258 2.258 0 0 0 16 11.75v-.86a.5.5 0 0 0 0-.011V8.5c0-.381-.058-.76-.17-1.125l-1.41-4.588A2.536 2.536 0 0 0 12 1zm0 1h8c.674 0 1.265.436 1.463 1.08l1.281 4.164A2.214 2.214 0 0 0 13.75 7H2.25c-.358 0-.693.093-.994.244L2.537 3.08A1.526 1.526 0 0 1 4 2zM2.25 8h11.5c.696 0 1.25.554 1.25 1.25v2.5c0 .696-.554 1.25-1.25 1.25H2.25C1.554 13 1 12.446 1 11.75v-1.717a.5.5 0 0 0 0-.012V9.25C1 8.554 1.554 8 2.25 8zm8.25 1.875a.625.625 0 0 0-.625.625.625.625 0 0 0 .625.625.625.625 0 0 0 .625-.625.625.625 0 0 0-.625-.625zm2 0a.625.625 0 0 0-.625.625.625.625 0 0 0 .625.625.625.625 0 0 0 .625-.625.625.625 0 0 0-.625-.625z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.266"></path><path d="M15.726,8.516c-.117-.993-.952-1.766-1.976-1.766H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h4.141"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/persistent-storage.svg b/src/browser/themes/shared/zen-icons/persistent-storage.svg
index 2aacca100..65d2044b5 100644
--- a/src/browser/themes/shared/zen-icons/persistent-storage.svg
+++ b/src/browser/themes/shared/zen-icons/persistent-storage.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M4 1a2.536 2.536 0 0 0-2.42 1.787L.17 7.375A3.83 3.83 0 0 0 0 8.5v3.25A2.258 2.258 0 0 0 2.25 14h11.5A2.258 2.258 0 0 0 16 11.75v-.86a.5.5 0 0 0 0-.011V8.5c0-.381-.058-.76-.17-1.125l-1.41-4.588A2.536 2.536 0 0 0 12 1zm0 1h8c.674 0 1.265.436 1.463 1.08l1.281 4.164A2.214 2.214 0 0 0 13.75 7H2.25c-.358 0-.693.093-.994.244L2.537 3.08A1.526 1.526 0 0 1 4 2zM2.25 8h11.5c.696 0 1.25.554 1.25 1.25v2.5c0 .696-.554 1.25-1.25 1.25H2.25C1.554 13 1 12.446 1 11.75v-1.717a.5.5 0 0 0 0-.012V9.25C1 8.554 1.554 8 2.25 8zm8.25 1.875a.625.625 0 0 0-.625.625.625.625 0 0 0 .625.625.625.625 0 0 0 .625-.625.625.625 0 0 0-.625-.625zm2 0a.625.625 0 0 0-.625.625.625.625 0 0 0 .625.625.625.625 0 0 0 .625-.625.625.625 0 0 0-.625-.625z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="9.75" width="14.5" height="5" rx="1.5" ry="1.5"></rect><path d="M1.841,10.739l2.204-6.621c.272-.817,1.036-1.368,1.898-1.368h6.116c.861,0,1.626,.551,1.898,1.368l2.204,6.621"></path><line x1="4.25" y1="12.25" x2="7" y2="12.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/pin.svg b/src/browser/themes/shared/zen-icons/pin.svg
index 7f42c705b..a30c319c1 100644
--- a/src/browser/themes/shared/zen-icons/pin.svg
+++ b/src/browser/themes/shared/zen-icons/pin.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M10.049 1.004a1.995 1.995 0 0 0-1.926 1.101l-1.73 3.46a1.503 1.503 0 0 1-.786.722l-3.59 1.436a.999.999 0 0 0-.333 1.634l2.609 2.612L1 15.262v.707h.707L5 12.676l2.61 2.61a1 1 0 0 0 1.636-.337l1.436-3.59a1.5 1.5 0 0 1 .722-.783l3.457-1.73a2 2 0 0 0 .522-3.203l-4.059-4.057a1.978 1.978 0 0 0-1.275-.582zm-.069.998c.23.015.456.11.637.291l4.059 4.057a1 1 0 0 1-.262 1.601l-3.457 1.73a2.498 2.498 0 0 0-1.203 1.307l-1.436 3.59L2.391 8.65l3.59-1.435a2.498 2.498 0 0 0 1.306-1.203l1.729-3.46a1 1 0 0 1 .964-.55z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.081" y1="14.919" x2="6.409" y2="11.591" data-color="color-2"></line><path d="M10.371,15.553c.432-.557,1.02-1.47,1.348-2.718,.169-.642,.23-1.224,.243-1.701l3.005-3.005c.781-.781,.781-2.047,0-2.828l-2.268-2.268c-.781-.781-2.047-.781-2.828,0l-3.005,3.005c-.478,.013-1.059,.074-1.701,.243-1.248,.328-2.161,.916-2.718,1.348l7.925,7.925Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/plus.svg b/src/browser/themes/shared/zen-icons/plus.svg
index 282c3f42d..6ce916b23 100644
--- a/src/browser/themes/shared/zen-icons/plus.svg
+++ b/src/browser/themes/shared/zen-icons/plus.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M7.5.5A.5.5 0 0 0 7 1v6H1a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h6v6a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5V8h6a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5H8V1a.5.5 0 0 0-.5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="9" y1="3.25" x2="9" y2="14.75" data-color="color-2"></line><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/pocket-outline.svg b/src/browser/themes/shared/zen-icons/pocket-outline.svg
index 6c48e082b..c349149b4 100644
--- a/src/browser/themes/shared/zen-icons/pocket-outline.svg
+++ b/src/browser/themes/shared/zen-icons/pocket-outline.svg
@@ -3,6 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
   <path d="M2.5 2A2.507 2.507 0 0 0 0 4.5V7c0 4.412 3.588 8 8 8s8-3.588 8-8V4.5C16 3.125 14.875 2 13.5 2h-11zm0 1h11c.834 0 1.5.666 1.5 1.5V7c0 3.872-3.128 7-7 7s-7-3.128-7-7V4.5C1 3.666 1.666 3 2.5 3zm2 3a.5.5 0 0 0-.353.146.5.5 0 0 0 0 .707l3.5 3.5a.5.5 0 0 0 .706 0l3.5-3.5a.5.5 0 0 0 0-.706.5.5 0 0 0-.706 0L8 9.293 4.854 6.147A.5.5 0 0 0 4.501 6z"/>
 </svg>
diff --git a/src/browser/themes/shared/zen-icons/popup.svg b/src/browser/themes/shared/zen-icons/popup.svg
index 6bc38f9ec..9f7ea80aa 100644
--- a/src/browser/themes/shared/zen-icons/popup.svg
+++ b/src/browser/themes/shared/zen-icons/popup.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M8.5 1a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h4.793L7.147 8.146a.5.5 0 0 0 0 .707.5.5 0 0 0 .707 0L14 2.707V7.5a.5.5 0 0 0 .5.5.5.5 0 0 0 .5-.5v-6a.5.5 0 0 0-.5-.5h-6zM4 2C2.347 2 1 3.347 1 5v7c0 1.653 1.347 3 3 3h7c1.653 0 3-1.347 3-3V9.5a.5.5 0 0 0-.5-.5.5.5 0 0 0-.5.5V12c0 1.117-.883 2-2 2H4c-1.117 0-2-.883-2-2V5c0-1.117.883-2 2-2h2.5a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5H4z" style="-inkscape-stroke:none;color:#000;paint-order:stroke markers fill"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,8.709v-3.959c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.619"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/print.svg b/src/browser/themes/shared/zen-icons/print.svg
index dfc547726..ee1844f66 100644
--- a/src/browser/themes/shared/zen-icons/print.svg
+++ b/src/browser/themes/shared/zen-icons/print.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M4.5 1A1.5 1.5 0 0 0 3 2.5V3h-.5A2.5 2.5 0 0 0 0 5.5v5A1.5 1.5 0 0 0 1.5 12H3v1.5A1.5 1.5 0 0 0 4.5 15h7a1.5 1.5 0 0 0 1.5-1.5V12h1.5a1.5 1.5 0 0 0 1.5-1.5v-5A2.5 2.5 0 0 0 13.5 3H13v-.5A1.5 1.5 0 0 0 11.5 1h-7zm0 1h7a.5.5 0 0 1 .5.5V3H4v-.5a.5.5 0 0 1 .5-.5zm-2 2h11A1.5 1.5 0 0 1 15 5.5v5a.5.5 0 0 1-.5.5H13V9.5A1.5 1.5 0 0 0 11.5 8h-7A1.5 1.5 0 0 0 3 9.5V11H1.5a.5.5 0 0 1-.5-.5v-5A1.5 1.5 0 0 1 2.5 4zm2 5h7a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,5.25V2.75c0-.552,.448-1,1-1h4.5c.552,0,1,.448,1,1v2.5" data-color="color-2"></path><path d="M5.75,13.25h-1.5c-1.105,0-2-.895-2-2V7.25c0-1.105,.895-2,2-2H13.75c1.105,0,2,.895,2,2v4c0,1.105-.895,2-2,2h-1.5"></path><path d="M12.25,9.75v5.5c0,.552-.448,1-1,1H6.75c-.552,0-1-.448-1-1v-5.5h6.5Z" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/private-window.svg b/src/browser/themes/shared/zen-icons/private-window.svg
index 150401b61..98d5c73c4 100644
--- a/src/browser/themes/shared/zen-icons/private-window.svg
+++ b/src/browser/themes/shared/zen-icons/private-window.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="m3.25 0c-1.241 0.004388-2.246 1.009-2.25 2.25v9.5c0.00439 1.241 1.009 2.246 2.25 2.25h3.99c-0.1098-0.3225-0.2246-0.6595-0.2352-1h-3.754c-0.696 0-1.25-0.554-1.25-1.25v-7.75h13v-1.75c-0.004388-1.241-1.009-2.246-2.25-2.25zm0 1h9.5c0.696 0 1.25 0.554 1.25 1.25v0.75h-12v-0.75c0-0.696 0.554-1.25 1.25-1.25z"/>
-  <path d="m12 5a2.5 2.5 0 1 0 2 4h-2a1.5 1.5 0 0 1 0-3h2a2.496 2.496 0 0 0-2-1zm0 2v1h2.45a2.512 2.512 0 0 0 0-1zm-2.45 4c-0.464 0-0.855 0.236-1.116 0.53-0.26 0.29-0.434 0.684-0.434 1.09v0.32c0 1.633 1.633 3.06 4 3.06 1.24 0 2.28-0.392 2.988-1h-2.988c-2.03 0-3-1.172-3-2.06v-0.32c0-0.126 0.06-0.29 0.182-0.427 0.119-0.133 0.254-0.193 0.369-0.193h6.316a1.777 1.777 0 0 0-0.3-0.47c-0.262-0.294-0.653-0.53-1.118-0.53h-4.898zm2.45 2v1h3.762c0.147-0.315 0.23-0.653 0.238-1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,9.141V4.75c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.5"></path><rect x="10.75" y="13.75" width="6" height="3.5" rx="1" ry="1" data-color="color-2"></rect><path d="M12.25,13.75v-1.5c0-.828,.672-1.5,1.5-1.5h0c.828,0,1.5,.672,1.5,1.5v1.5" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/privateBrowsing.svg b/src/browser/themes/shared/zen-icons/privateBrowsing.svg
index c7c5564bf..1674d5457 100644
--- a/src/browser/themes/shared/zen-icons/privateBrowsing.svg
+++ b/src/browser/themes/shared/zen-icons/privateBrowsing.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a4 4 0 1 0 3.123 6.5H8V7a3 3 0 1 1 0-6v.5h3.123A3.993 3.993 0 0 0 8 0zm0 2.5v1h3.969a3.974 3.974 0 0 0-.26-1H8zm0 2v1h3.709c.128-.315.216-.65.26-1h-3.97zM3.008 9A2 2 0 0 0 1 11c0 1.691.833 2.967 2.135 3.797C4.417 15.614 6.145 16 8 16c1.694 0 3.282-.322 4.521-1H8c-1.735 0-3.258-.364-4.328-1.047C2.622 13.283 2 12.309 2 11a1 1 0 0 1 1.008-1H8v-.004h6.73A2.001 2.001 0 0 0 13 9H3.008zM8 10.996v1h6.896c.068-.314.103-.646.103-.996v-.004H8zm0 2v1h4.26l-.008.004h1.584c.283-.301.521-.635.707-1.004H8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="4.5" r="2.75"></circle><rect x="10.75" y="12.75" width="6" height="3.5" rx="1" ry="1" data-color="color-2"></rect><path d="M10.043,9.844c-.34-.057-.686-.094-1.043-.094-2.551,0-4.739,1.53-5.709,3.72-.365,.825,.087,1.774,.947,2.045,1.093,.345,2.516,.645,4.167,.708"></path><path d="M12.25,12.75v-1.5c0-.828,.672-1.5,1.5-1.5h0c.828,0,1.5,.672,1.5,1.5v1.5" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/reader-mode.svg b/src/browser/themes/shared/zen-icons/reader-mode.svg
index 0bc5ef801..8de3ff026 100644
--- a/src/browser/themes/shared/zen-icons/reader-mode.svg
+++ b/src/browser/themes/shared/zen-icons/reader-mode.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.001" stroke-linecap="round">
-  <rect x="2.5" y="1.5" width="11" height="13" rx="1.5" ry="1.5"/>
-  <path d="M5.5 10.5h3M5.5 7.5h5M5.5 4.5h5"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="6.75" x2="7.75" y2="6.75" data-color="color-2"></line><line x1="5.75" y1="9.75" x2="12.25" y2="9.75" data-color="color-2"></line><line x1="5.75" y1="12.75" x2="12.25" y2="12.75" data-color="color-2"></line><path d="M2.75,14.25V3.75c0-1.105,.895-2,2-2h5.586c.265,0,.52,.105,.707,.293l3.914,3.914c.188,.188,.293,.442,.293,.707v7.586c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2Z"></path><path d="M15.16,6.25h-3.41c-.552,0-1-.448-1-1V1.852"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/reload.svg b/src/browser/themes/shared/zen-icons/reload.svg
index cb7fe1bd9..2721a3aaf 100644
--- a/src/browser/themes/shared/zen-icons/reload.svg
+++ b/src/browser/themes/shared/zen-icons/reload.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M7.98 0a7.97 7.97 0 0 0-3.365.752 8.008 8.008 0 0 0-4.227 9.715 8.006 8.006 0 0 0 9.12 5.389 8.005 8.005 0 0 0 6.474-8.385.5.5 0 0 0-.531-.467.5.5 0 0 0-.467.533 6.994 6.994 0 0 1-5.664 7.338 6.994 6.994 0 0 1-7.98-4.717 6.993 6.993 0 0 1 3.696-8.5A6.996 6.996 0 0 1 13.745 4h-3.246a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 0-.5-.5.5.5 0 0 0-.5.5v2.215A8.014 8.014 0 0 0 7.979 0z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3,13.071c1.304,1.919,3.505,3.179,6,3.179,4.004,0,7.25-3.246,7.25-7.25S13.004,1.75,9,1.75c-3.031,0-5.627,1.86-6.71,4.5" data-color="color-2"></path><polyline points="1.88 3.305 2.288 6.25 5.232 5.843"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/report.svg b/src/browser/themes/shared/zen-icons/report.svg
index 5251be4ef..cab37aaec 100644
--- a/src/browser/themes/shared/zen-icons/report.svg
+++ b/src/browser/themes/shared/zen-icons/report.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2.5 1a.5.5 0 0 0-.5.5v14a.5.5 0 0 0 1 0V11h11a.5.5 0 0 0 .416-.777L11.602 6l2.814-4.223A.5.5 0 0 0 14 1zM3 2h10.066l-2.482 3.723a.5.5 0 0 0 0 .554L13.066 10H3zm4.5 1a.5.5 0 0 0-.5.5v3a.5.5 0 1 0 1 0v-3a.5.5 0 0 0-.5-.5zm0 5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10" data-color="color-2"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/save.svg b/src/browser/themes/shared/zen-icons/save.svg
index 6ddab5885..4247ec61c 100644
--- a/src/browser/themes/shared/zen-icons/save.svg
+++ b/src/browser/themes/shared/zen-icons/save.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3 1a2 2 0 0 0-2 2v9.998a2 2 0 0 0 2 2h3.004a1.95 1.95 0 0 1 .054-.347l.162-.653H4v-4.5a.5.5 0 0 1 .5-.5h5.443l1-.999H4.5A1.5 1.5 0 0 0 3 9.5v4.5a1 1 0 0 1-1-1v-10a1 1 0 0 1 1-1h1v2.5A1.5 1.5 0 0 0 5.5 6h4A1.5 1.5 0 0 0 11 4.5V2h.378a1 1 0 0 1 .707.294l1.621 1.62a1 1 0 0 1 .293.708v1.382a2.88 2.88 0 0 1 1 .13V4.62a2 2 0 0 0-.586-1.414l-1.62-1.621A2 2 0 0 0 11.377 1zm2 1h5v2.5a.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.5-.5zm9.13 5c-.478 0-.957.18-1.322.546l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.499a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.021-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,3.25h1.5c1.105,0,2,.895,2,2v7.5c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V5.25c0-1.105,.895-2,2-2h1.5"></path><polyline points="12 8.75 9 11.75 6 8.75" data-color="color-2"></polyline><line x1="9" y1="11.75" x2="9" y2="3.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/screen-blocked.svg b/src/browser/themes/shared/zen-icons/screen-blocked.svg
index 6350c1e88..df45780fb 100644
--- a/src/browser/themes/shared/zen-icons/screen-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/screen-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2zm0 1h12a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm6 1a.498.498 0 0 0-.353.146l-2.5 2.5a.5.5 0 1 0 .706.707L7.5 5.707V11.5a.5.5 0 0 0 1 0V5.707l1.646 1.646a.5.5 0 1 0 .707-.707l-2.5-2.5A.498.498 0 0 0 8 4z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4.75,13.25h-1c-1.105,0-2-.895-2-2v-1.25"></path><path d="M16.25,5v6.25c0,1.105-.895,2-2,2H8"></path><line x1="9" y1="2.75" x2="15.25" y2="2.75"></line><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line><polyline points="1.75 7.25 1.75 2.75 6.25 2.75" data-color="color-2"></polyline><line x1="2" y1="3" x2="6.5" y2="7.5" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/screen.svg b/src/browser/themes/shared/zen-icons/screen.svg
index 52bdd7acb..57281387e 100644
--- a/src/browser/themes/shared/zen-icons/screen.svg
+++ b/src/browser/themes/shared/zen-icons/screen.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2zm0 1h12a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm6 1a.498.498 0 0 0-.353.146l-2.5 2.5a.5.5 0 1 0 .706.707L7.5 5.707V11.5a.5.5 0 0 0 1 0V5.707l1.646 1.646a.5.5 0 1 0 .707-.707l-2.5-2.5A.498.498 0 0 0 8 4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9,2.75h5.25c1.105,0,2,.895,2,2v6.5c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2v-1.25"></path><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><polyline points="1.75 7.25 1.75 2.75 6.25 2.75" data-color="color-2"></polyline><line x1="2" y1="3" x2="7.25" y2="8.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/screenshot.svg b/src/browser/themes/shared/zen-icons/screenshot.svg
index 5d1faef78..66b488605 100644
--- a/src/browser/themes/shared/zen-icons/screenshot.svg
+++ b/src/browser/themes/shared/zen-icons/screenshot.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2 2a2 2 0 0 0-2 2v.5a.5.5 0 0 0 1 0V4a1 1 0 0 1 1-1h.5a.5.5 0 0 0 0-1H2zm2.5 0a.5.5 0 1 0 0 1H7a.5.5 0 0 0 0-1H4.5zM9 2a.5.5 0 1 0 0 1h2.5a.5.5 0 0 0 0-1H9zm4.5 0a.5.5 0 1 0 0 1h.5a1 1 0 0 1 1 1v.5a.5.5 0 0 0 1 0V4a2 2 0 0 0-2-2h-.5zM.5 6.004a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 1 0v-2a.5.5 0 0 0-.5-.5zm15 0a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 1 0v-2a.5.5 0 0 0-.5-.5zm-10 .004a.497.497 0 0 0-.42.775l2.318 3.48-1.238 1.854a2 2 0 1 0 .835.552L8 11.163l1.008 1.514a2 2 0 1 0 .832-.554l-1.238-1.86.002-.004-.602-.9-.002.002-2.086-3.127a.503.503 0 0 0-.414-.225zm5 0a.503.503 0 0 0-.414.225L8.604 8.456l.6.902 1.717-2.574a.497.497 0 0 0-.42-.776zm-9.996 4a.5.5 0 0 0-.5.5v.5a2 2 0 0 0 2 2h.25a.5.5 0 0 0 0-1h-.25a1 1 0 0 1-1-1v-.5a.5.5 0 0 0-.5-.5zm15 0a.5.5 0 0 0-.5.5v.5a1 1 0 0 1-1 1h-.252a.5.5 0 1 0 0 1h.252a2 2 0 0 0 2-2v-.5a.5.5 0 0 0-.5-.5zm-10 2.996a1 1 0 1 1 0 2 1 1 0 0 1 0-2zm5 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.25,2.75h2c1.105,0,2,.895,2,2v2" data-color="color-2"></path><path d="M6.75,15.25h-2c-1.105,0-2-.895-2-2v-2" data-color="color-2"></path><path d="M2.75,6.75v-2c0-1.105,.895-2,2-2h2"></path><path d="M15.25,11.25v2c0,1.105-.895,2-2,2h-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/search-glass.svg b/src/browser/themes/shared/zen-icons/search-glass.svg
index 4c88fd522..24d287f2f 100644
--- a/src/browser/themes/shared/zen-icons/search-glass.svg
+++ b/src/browser/themes/shared/zen-icons/search-glass.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6.5 1a5.5 5.5 0 1 0 0 11 5.48 5.48 0 0 0 3.52-1.273l4.127 4.127.068.059a.501.501 0 0 0 .64-.766l-4.128-4.127A5.5 5.5 0 0 0 6.5 1zm0 1a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="7.25" cy="7.25" r="4.5"></circle><line x1="15.25" y1="15.25" x2="12.285" y2="12.285" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/search-page.svg b/src/browser/themes/shared/zen-icons/search-page.svg
index 8d18424fc..1aad4b524 100644
--- a/src/browser/themes/shared/zen-icons/search-page.svg
+++ b/src/browser/themes/shared/zen-icons/search-page.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3.5 0A1.5 1.5 0 0 0 2 1.5v3.916A4.963 4.963 0 0 1 3 5.1V1.5a.5.5 0 0 1 .5-.5H8v3.5A1.5 1.5 0 0 0 9.5 6H13v8.5c0 .276-.09.5-.365.5h-1.559c.064.38.048.699.028 1H12.5a1.5 1.5 0 0 0 1.5-1.5V5.414a1.5 1.5 0 0 0-.44-1.06L9.647.439A1.5 1.5 0 0 0 8.586 0H3.5zM9 1.207 12.793 5H9.5a.5.5 0 0 1-.5-.5V1.207zM4 6a4 4 0 1 0 2.453 7.16l2.692 2.692a.5.5 0 1 0 .707-.707L7.16 12.453A4 4 0 0 0 4 6zm0 1a3 3 0 1 1 0 6 3 3 0 0 1 0-6z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.75,6.75v-2c0-1.105,.895-2,2-2h2"></path><path d="M11.25,2.75h2c1.105,0,2,.895,2,2v2"></path><path d="M6.75,15.25h-2c-1.105,0-2-.895-2-2v-2"></path><circle cx="9" cy="9" r="3.25" data-color="color-2"></circle><line x1="11.296" y1="11.296" x2="14.5" y2="14.5" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/security-broken.svg b/src/browser/themes/shared/zen-icons/security-broken.svg
index 39cd91075..cab37aaec 100644
--- a/src/browser/themes/shared/zen-icons/security-broken.svg
+++ b/src/browser/themes/shared/zen-icons/security-broken.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0c-.51 0-1.022.26-1.305.781l-6.51 11.98c-.546 1.005.172 2.234 1.305 2.234h13.02c1.132 0 1.85-1.23 1.305-2.234L9.305.781A1.471 1.471 0 0 0 8 0zm0 4c.554 0 1 .446 1 1v4c0 .554-.446 1-1 1s-1-.446-1-1V5c0-.554.446-1 1-1zm0 7c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10" data-color="color-2"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/security-warning.svg b/src/browser/themes/shared/zen-icons/security-warning.svg
index 5cf49839c..f74987acc 100644
--- a/src/browser/themes/shared/zen-icons/security-warning.svg
+++ b/src/browser/themes/shared/zen-icons/security-warning.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill">
-  <path d="M7 0a3 3 0 0 0-3 3v1H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h4.996c-.004-.253.22-.753.342-1H3a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v2.059c.122-.031.251-.05.39-.053.206-.013.412.01.61.065V6a2 2 0 0 0-2-2h-1V3a3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2v1H5V3a2 2 0 0 1 2-2zm0 7.5a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/>
-  <path d="M12.5 9a.899.899 0 0 0-.787.459l-2.588 5.168c-.348.61.087 1.373.785 1.373h5.182c.698 0 1.133-.763.785-1.373l-2.59-5.168A.899.899 0 0 0 12.5 9zm.002 1.5c.277 0 .5.223.5.5v1.75a.499.499 0 1 1-1 0V11c0-.277.223-.5.5-.5zm.5 4a.499.499 0 1 1-1 0c0-.268.19-.493.493-.493s.507.189.507.493z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,4.75v-1.75c0-1.243,1.007-2.25,2.25-2.25h0c1.243,0,2.25,1.007,2.25,2.25v1.75"></path><path d="M5.334,4.75h7.333c1.037,0,1.903,.793,1.992,1.827l.652,7.5c.102,1.169-.82,2.173-1.992,2.173H4.681c-1.173,0-2.094-1.005-1.992-2.173l.652-7.5c.09-1.034,.955-1.827,1.992-1.827Z"></path><line x1="9" y1="10.75" x2="9" y2="8" data-color="color-2"></line><circle cx="9" cy="13" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/security.svg b/src/browser/themes/shared/zen-icons/security.svg
index cefd377c1..a4d491f0b 100644
--- a/src/browser/themes/shared/zen-icons/security.svg
+++ b/src/browser/themes/shared/zen-icons/security.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a3 3 0 0 0-3 3v1H4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2h-1V3a3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2v1H6V3a2 2 0 0 1 2-2zM4 5h8a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1zm4 3.5a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,8.25v-3.25c0-1.795,1.455-3.25,3.25-3.25h0c1.795,0,3.25,1.455,3.25,3.25v3.25" data-color="color-2"></path><line x1="9" y1="11.75" x2="9" y2="12.75" data-color="color-2"></line><rect x="3.25" y="8.25" width="11.5" height="8" rx="2" ry="2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/send-to-device.svg b/src/browser/themes/shared/zen-icons/send-to-device.svg
index f0de7e411..eff5388f8 100644
--- a/src/browser/themes/shared/zen-icons/send-to-device.svg
+++ b/src/browser/themes/shared/zen-icons/send-to-device.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2.5 1A1.5 1.5 0 0 0 1 2.5V4h1V2.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5H8v1h5.5A1.5 1.5 0 0 0 15 9.5v-7A1.5 1.5 0 0 0 13.5 1h-11zm-1 4A1.5 1.5 0 0 0 0 6.5v8A1.5 1.5 0 0 0 1.5 16h4A1.5 1.5 0 0 0 7 14.5v-8A1.5 1.5 0 0 0 5.5 5h-4zm0 1h4a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.5-.5v-8a.5.5 0 0 1 .5-.5zM8 12v1h7.5a.5.5 0 0 0 0-1H8zm-5 1a.5.5 0 0 0 0 1h1a.5.5 0 0 0 0-1H3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.75,2.75h1.5c1.105,0,2,.895,2,2v6.5c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.5"></path><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><polyline points="6.25 5.5 9 2.75 11.75 5.5" data-color="color-2"></polyline><line x1="9" y1="2.75" x2="9" y2="10.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/settings.svg b/src/browser/themes/shared/zen-icons/settings.svg
index d3cd4db9e..142f584d2 100644
--- a/src/browser/themes/shared/zen-icons/settings.svg
+++ b/src/browser/themes/shared/zen-icons/settings.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a8.02 8.02 0 0 0-1.672.174.474.474 0 0 0-.367.377L5.617 2.44a.942.942 0 0 1-1.242.717L2.57 2.512a.47.47 0 0 0-.508.127A7.998 7.998 0 0 0 .386 5.537a.47.47 0 0 0 .143.504l1.463 1.242a.94.94 0 0 1 0 1.433L.529 9.958a.471.471 0 0 0-.143.504 7.988 7.988 0 0 0 1.676 2.898.47.47 0 0 0 .508.127l1.805-.644a.941.941 0 0 1 1.242.717l.344 1.889c.034.187.18.337.367.377A8.022 8.022 0 0 0 8 15.999c.567 0 1.126-.057 1.672-.173a.472.472 0 0 0 .366-.377l.345-1.89a.942.942 0 0 1 1.242-.717l1.805.645a.47.47 0 0 0 .508-.127 7.998 7.998 0 0 0 1.676-2.898.47.47 0 0 0-.143-.504l-1.463-1.242a.94.94 0 0 1 0-1.433l1.463-1.242a.471.471 0 0 0 .143-.504 7.988 7.988 0 0 0-1.676-2.898.47.47 0 0 0-.508-.127l-1.805.645a.941.941 0 0 1-1.242-.717L10.037.55a.472.472 0 0 0-.365-.376A8.027 8.027 0 0 0 8 0zm0 .941c.395 0 .786.032 1.17.096l.285 1.572a1.88 1.88 0 0 0 2.486 1.434l1.502-.537c.5.605.897 1.289 1.172 2.025l-1.219 1.033a1.883 1.883 0 0 0 0 2.87l1.22 1.034a7.043 7.043 0 0 1-1.173 2.025l-1.502-.537a1.882 1.882 0 0 0-2.486 1.433l-.285 1.572a7.135 7.135 0 0 1-2.342 0l-.283-1.572a1.88 1.88 0 0 0-2.486-1.433l-1.502.537a7.054 7.054 0 0 1-1.172-2.025l1.219-1.033a1.883 1.883 0 0 0 0-2.871L1.384 5.53a7.046 7.046 0 0 1 1.173-2.025l1.502.537a1.882 1.882 0 0 0 2.486-1.434l.283-1.572A7.132 7.132 0 0 1 8 .941zm0 4.56A2.5 2.5 0 1 0 8 10.5a2.5 2.5 0 0 0 0-5zm0 1a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="8.999" r="1.75" fill="currentColor" data-color="color-2"></circle><path d="m15.175,7.278l-.929-.328c-.102-.261-.219-.52-.363-.77s-.31-.48-.485-.699l.18-.968c.125-.671-.187-1.349-.778-1.69l-.351-.203c-.592-.342-1.334-.273-1.853.171l-.745.637c-.56-.086-1.133-.086-1.703,0l-.745-.638c-.519-.444-1.262-.513-1.853-.171l-.351.203c-.592.341-.903,1.019-.778,1.69l.18.965c-.36.449-.646.946-.852,1.474l-.924.326c-.644.227-1.075.836-1.075,1.519v.405c0,.683.431,1.292,1.075,1.519l.929.328c.102.261.218.519.363.769s.31.48.485.7l-.181.968c-.125.671.187,1.349.778,1.69l.351.203c.592.342,1.334.273,1.853-.171l.745-.638c.559.086,1.132.086,1.701,0l.746.639c.519.444,1.262.513,1.853.171l.351-.203c.592-.342.903-1.019.778-1.69l-.18-.966c.359-.449.646-.945.851-1.473l.925-.326c.644-.227,1.075-.836,1.075-1.519v-.405c0-.683-.431-1.292-1.075-1.519h.002Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/share.svg b/src/browser/themes/shared/zen-icons/share.svg
index c8cca0b8f..3b4ec7d20 100644
--- a/src/browser/themes/shared/zen-icons/share.svg
+++ b/src/browser/themes/shared/zen-icons/share.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M10.977 1.002a.569.569 0 0 0-.6.576v2.129l-.225.016c-3.562.282-5.65 2.536-6.148 6.627-.064.525.538.853.928.505 1.432-1.278 2.911-2.072 4.445-2.39.246-.051.493-.089.742-.115l.258-.024v2.096l.006.082c.06.453.61.666.947.334l4.496-4.422.059-.066a.588.588 0 0 0-.059-.768l-4.496-4.42-.062-.053a.537.537 0 0 0-.291-.107zM3.5 2A2.5 2.5 0 0 0 1 4.5v8A2.5 2.5 0 0 0 3.5 15h8a2.5 2.5 0 0 0 2.5-2.5v-1a.5.5 0 0 0-1 0v1a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 2 12.5v-8A1.5 1.5 0 0 1 3.5 3h3a.5.5 0 0 0 0-1h-3zm7.877.611L14.824 6l-3.447 3.389V7.232l-1.356.122-.007.001c-1.703.182-3.31.864-4.826 2 .298-1.338.807-2.344 1.476-3.066.83-.894 1.989-1.442 3.563-1.568l1.15-.078V2.61z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,4.5V1.75s4.5,4.25,4.5,4.25l-4.5,4.25v-2.75c-3.625,0-6,3.5-6,3.5,0,0,0-6.5,6-6.5Z" data-color="color-2"></path><path d="M7.25,2.75h-2.5c-1.105,0-2,.895-2,2V13.25c0,1.105,.895,2,2,2H13.25c1.105,0,2-.895,2-2v-2.5"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/sidebars-right.svg b/src/browser/themes/shared/zen-icons/sidebars-right.svg
index 453e5ec90..4db5521bf 100644
--- a/src/browser/themes/shared/zen-icons/sidebars-right.svg
+++ b/src/browser/themes/shared/zen-icons/sidebars-right.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M2 1C.901 1 0 1.901 0 3v10c0 1.099.901 2 2 2h12c1.099 0 2-.901 2-2V3c0-1.099-.901-2-2-2H2zm0 1h7v12H2c-.558 0-1-.442-1-1V3c0-.558.442-1 1-1zm8 0h4c.558 0 1 .442 1 1v10c0 .558-.442 1-1 1h-4V2zm1.5 2a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h2a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5h-2zm0 3a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h2a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5h-2zm0 3a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h2a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5h-2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="11.75" y1="2.75" x2="11.75" y2="15.25" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/source-code.svg b/src/browser/themes/shared/zen-icons/source-code.svg
index 5de449cb1..bb08f1398 100644
--- a/src/browser/themes/shared/zen-icons/source-code.svg
+++ b/src/browser/themes/shared/zen-icons/source-code.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M10.485 1a.501.501 0 0 0-.452.32l-5 13a.5.5 0 0 0 .934.36l5-13a.5.5 0 0 0-.482-.68zM3.46 4.002a.494.494 0 0 0-.34.172l-3 3.5a.502.502 0 0 0 0 .652l3 3.5a.5.5 0 0 0 .758-.652L1.158 8l2.72-3.174a.5.5 0 0 0-.417-.824zm9.078.5a.5.5 0 0 0-.418.824L14.842 8.5l-2.72 3.174a.5.5 0 1 0 .757.652l3-3.5a.502.502 0 0 0 0-.652l-3-3.5a.494.494 0 0 0-.34-.172z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="5.25 13.25 1.75 9 5.25 4.75"></polyline><polyline points="12.75 13.25 16.25 9 12.75 4.75"></polyline><line x1="7.75" y1="13.25" x2="10.25" y2="4.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/spell-check.svg b/src/browser/themes/shared/zen-icons/spell-check.svg
index 6c2c86115..455c785fe 100644
--- a/src/browser/themes/shared/zen-icons/spell-check.svg
+++ b/src/browser/themes/shared/zen-icons/spell-check.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 32 32">
-  <path d="M20 22h2l-5-12h-2l-5 12h2l1.24-3h5.53Zm-5.93-5 1.82-4.42h.25L18 17Z"/>
-  <path d="M12 28H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h20a2 2 0 0 1 2 2v11h-2V6H6v20h6Zm11-.82-2.59-2.59L19 26l4 4 7-7-1.41-1.41L23 27.18z"/>
-  <path fill="none" d="M0 0h32v32H0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="5.108 11.75 12.892 11.75 9.401 2.75 8.599 2.75 3.75 15.25"></polyline><polyline points="11.244 14.641 12.853 16.25 16.25 11.833" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/split.svg b/src/browser/themes/shared/zen-icons/split.svg
index 651c518aa..3e2337cb8 100644
--- a/src/browser/themes/shared/zen-icons/split.svg
+++ b/src/browser/themes/shared/zen-icons/split.svg
@@ -1,16 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2002_244)">
-<path d="M5.20215 0.582397V10.5824" stroke="context-fill"></path>
-</g>
-<rect x="0.702148" y="1.0824" width="9" height="9" rx="1.5" stroke="context-fill"></rect>
-<defs>
-<clipPath id="clip0_2002_244">
-<rect x="0.202148" y="0.582397" width="10" height="10" rx="2" fill="context-fill" fill-opacity="context-fill-opacity" />
-</clipPath>
-</defs>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="9" y1="1.75" x2="9" y2="16.25" data-color="color-2"></line><path d="M6.25,15.25h-1.5c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.5"></path><path d="M11.75,15.25h1.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1.5"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg b/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg
index 6b5240e82..9877ff260 100644
--- a/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg
+++ b/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path fill="context-stroke" d="M11.73 1.181 5.259 2.482l-.068.023A1.807 1.807 0 0 0 3.996 4.2v4.79c-1.645 0-3 1.354-3 3 0 1.644 1.355 3 3 3s3-1.356 3-3V8.17l4-.762v.582c-1.645 0-3 1.355-3 3s1.355 3 3 3 3-1.355 3-3V2.916c0-1.214-1.263-2.104-2.406-1.695z"/>
-  <path d="M12 6.2v3.058a2 2 0 1 0 1 1.732V2.916a.8.8 0 0 0-1.069-.753l-6.4 1.285a.8.8 0 0 0-.53.753v6.056a2 2 0 1 0 1 1.732V7.343zm0-1.062L6 6.28V4.342L12 3.2zM11 9.99a1 1 0 1 1 0 2 1 1 0 0 1 0-2zm-7 1a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="7.25" x2="5.75" y2="13.75" data-color="color-2"></line><line x1="14.75" y1="5.75" x2="14.75" y2="12.25" data-color="color-2"></line><path d="M6.586,3.361l7-1.167c.61-.102,1.164,.368,1.164,.986v2.57l-9,1.5v-2.903c0-.489,.353-.906,.836-.986Z"></path><circle cx="3.75" cy="13.75" r="2"></circle><circle cx="12.75" cy="12.25" r="2"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg b/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg
index 81c19817a..e7701a9c3 100644
--- a/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg
+++ b/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path fill="context-stroke" d="M8.5 1c-.397 0-.78.158-1.061.44L4.878 4H3.499a2.511 2.511 0 0 0-2.5 2.5v3c0 1.372 1.128 2.5 2.5 2.5h1.379l2.561 2.561a1.537 1.537 0 0 0 1.635.325c.51-.212.925-.76.926-1.385v-2.6a1.516 1.516 0 0 0 1.582-.34l.44-.44.439.44a1.516 1.516 0 0 0 2.12 0 1.515 1.515 0 0 0 0-2.121L14.143 8l.44-.44a1.515 1.515 0 0 0 0-2.12 1.516 1.516 0 0 0-2.121 0l-.44.44-.44-.44a1.51 1.51 0 0 0-1.06-.44c-.176 0-.353.034-.522.096V2.498A1.506 1.506 0 0 0 8.5 1z"/>
-  <path d="M8.5 2a.5.5 0 0 0-.353.146L5.291 5.002H3.5C2.677 5 2 5.678 2 6.5v3c0 .822.678 1.5 1.5 1.5h1.793l2.854 2.854A.5.5 0 0 0 9 13.5v-11a.5.5 0 0 0-.5-.5zM8 3.707v8.586l-2.146-2.146A.5.5 0 0 0 5.501 10h-2a.493.493 0 0 1-.5-.5v-3c0-.282.217-.5.5-.5h2a.5.5 0 0 0 .353-.146zM10.521 6a.5.5 0 0 0-.354.853L11.315 8l-1.146 1.146a.5.5 0 0 0 .707.707l1.146-1.146 1.146 1.146a.5.5 0 0 0 .707-.707L12.728 8l1.146-1.146a.5.5 0 0 0-.707-.707L12.02 7.292l-1.146-1.146A.498.498 0 0 0 10.52 6z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.25,3.952v-1.288c0-.395-.437-.634-.77-.421l-5.48,3.508H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421v-1.288"></path><circle cx="14" cy="9" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="11.298" x2="16.292" y2="6.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg b/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg
index 45ea86f0d..dc630d8a5 100644
--- a/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg
+++ b/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg
@@ -1,9 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path fill="context-stroke" d="M8.5 1c-.397 0-.78.158-1.061.44L4.878 4H3.499a2.511 2.511 0 0 0-2.5 2.5v3c0 1.372 1.128 2.5 2.5 2.5h1.379l2.561 2.561a1.537 1.537 0 0 0 1.635.325c.51-.212.925-.76.926-1.385v-1.695c.085.032.147.112.236.129-.22.504-.261 1.075.107 1.52l.003.003c.52.627 1.48.718 2.109.199v-.002S15 11.552 15 8c0-3.551-2.545-5.654-2.545-5.654l-.002-.004a1.501 1.501 0 0 0-1.092-.334h-.003c-.394.037-.758.229-1.012.533l-.003.004c-.367.444-.329 1.012-.112 1.516-.09.017-.147.098-.232.13V2.5a1.506 1.506 0 0 0-1.5-1.498z"/>
-  <path d="M8.5 2a.5.5 0 0 0-.353.146L5.291 5.002H3.5C2.677 5 2 5.678 2 6.5v3c0 .822.678 1.5 1.5 1.5h1.793l2.854 2.854A.5.5 0 0 0 9 13.5v-11a.5.5 0 0 0-.309-.46A.5.5 0 0 0 8.5 2zm2.953 1.004a.5.5 0 0 0-.338.178.5.5 0 0 0 .067.703S13 5.39 13 8c0 2.61-1.818 4.115-1.818 4.115a.5.5 0 0 0-.067.703.5.5 0 0 0 .703.066S14 11.078 14 8c0-3.079-2.182-4.885-2.182-4.885a.5.5 0 0 0-.365-.111zM8 3.707v8.586l-2.146-2.146a.5.5 0 0 0-.353-.146h-2a.493.493 0 0 1-.5-.5v-3c0-.282.217-.5.5-.5h2a.5.5 0 0 0 .353-.147zm2.441 1.297a.5.5 0 0 0-.334.186.5.5 0 0 0 .082.703s.81.592.81 2.107-.81 2.107-.81 2.107a.5.5 0 0 0-.082.703.5.5 0 0 0 .703.082S12 9.904 12 7.999s-1.19-2.893-1.19-2.893a.5.5 0 0 0-.369-.104z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,5.75H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508Z"></path><path d="M13.914,7.586c.781,.781,.781,2.047,0,2.828" data-color="color-2"></path><path d="M15.859,5.641c1.855,1.855,1.855,4.863,0,6.718" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab.svg b/src/browser/themes/shared/zen-icons/tab.svg
index b8998288a..b46663ccc 100644
--- a/src/browser/themes/shared/zen-icons/tab.svg
+++ b/src/browser/themes/shared/zen-icons/tab.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3 1c-1.099 0-2 .9-2 2v10c0 1.099.9 2 2 2h10c1.099 0 2-.9 2-2V3c0-1.099-.9-2-2-2H3zm0 1h3v1.5C6 4.323 6.677 5 7.5 5H14v8c0 .563-.437 1-1 1H3c-.563 0-1-.437-1-1V3c0-.563.437-1 1-1zm4 0h6c.563 0 1 .437 1 1v1H7.5a.493.493 0 0 1-.5-.5V2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,2.75h7c1.105,0,2,.895,2,2v1.5" data-color="color-2"></path><line x1="11.25" y1="2.75" x2="11.25" y2="6.25" data-color="color-2"></line><path d="M15.75,6.25v7c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h2.5v3.5H15.75Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tool-profiler.svg b/src/browser/themes/shared/zen-icons/tool-profiler.svg
index 4a3eef35e..870d63c02 100644
--- a/src/browser/themes/shared/zen-icons/tool-profiler.svg
+++ b/src/browser/themes/shared/zen-icons/tool-profiler.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0zm0 1a7 7 0 1 1 0 14A7 7 0 0 1 8 1zm.09 1a5.982 5.982 0 0 0-4.332 1.758 5.999 5.999 0 0 0 0 8.484.5.5 0 1 0 .707-.707 5 5 0 0 1 5.354-8.193.5.5 0 1 0 .363-.932A6.008 6.008 0 0 0 8.09 2zm3.68 1.699a.502.502 0 0 0-.32.11l-.176.138-.467.373c-.388.31-.91.727-1.443 1.158-.533.431-1.078.877-1.514 1.242-.218.182-.41.346-.56.479-.14.123-.27.243-.342.328a1.5 1.5 0 1 0 2.28 1.947c.073-.085.17-.231.27-.389.108-.17.239-.385.385-.629.292-.487.646-1.096.988-1.689.343-.594.675-1.176.92-1.607l.295-.52.11-.195a.501.501 0 0 0-.426-.746zM13.139 5.5a.5.5 0 0 0-.48.682 5.001 5.001 0 0 1-1.124 5.354.5.5 0 0 0 .707.707 6.003 6.003 0 0 0 1.35-6.424.502.502 0 0 0-.453-.319z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="11.298" y1="11.298" x2="9.53" y2="9.53" data-color="color-2"></line><line x1="13.066" y1="9.53" x2="12.005" y2="8.47" data-color="color-2"></line><line x1="9.53" y1="13.066" x2="8.47" y2="12.005" data-color="color-2"></line><line x1="7.763" y1="14.834" x2="5.995" y2="13.066" data-color="color-2"></line><circle cx="12" cy="4.75" r=".75" fill="currentColor" data-stroke="none" stroke="none"></circle><rect x="1.5" y="5.75" width="15" height="6.5" rx="1" ry="1" transform="translate(-3.728 9) rotate(-45)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tracking-protection.svg b/src/browser/themes/shared/zen-icons/tracking-protection.svg
index 336e83954..e0b5854da 100644
--- a/src/browser/themes/shared/zen-icons/tracking-protection.svg
+++ b/src/browser/themes/shared/zen-icons/tracking-protection.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 0a.5.5 0 0 0-.277.084C5.785 1.376 3.689 2.183 1.43 2.506A.5.5 0 0 0 1 3v4.5c0 3.891 2.307 6.731 6.82 8.467a.502.502 0 0 0 .36 0C12.691 14.231 15 11.392 15 7.5V3a.5.5 0 0 0-.43-.494c-2.26-.323-4.355-1.13-6.293-2.422A.5.5 0 0 0 7.999 0zm0 1.098.4.248A15.964 15.964 0 0 0 14 3.428V7.5c0 3.392-1.968 5.863-6 7.463-4.032-1.6-6-4.071-6-7.463V3.428a15.985 15.985 0 0 0 5.6-2.082l.4-.248z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.305,1.848l5.25,1.68c.414,.133,.695,.518,.695,.952v6.52c0,3.03-4.684,4.748-5.942,5.155-.203,.066-.413,.066-.616,0-1.258-.407-5.942-2.125-5.942-5.155V4.48c0-.435,.281-.82,.695-.952l5.25-1.68c.198-.063,.411-.063,.61,0Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/translations.svg b/src/browser/themes/shared/zen-icons/translations.svg
index c37e9ba34..2e9ee051d 100644
--- a/src/browser/themes/shared/zen-icons/translations.svg
+++ b/src/browser/themes/shared/zen-icons/translations.svg
@@ -1,6 +1 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="17" height="16" xmlns="http://www.w3.org/2000/svg">
-  <path d="M15.37 15H17l-3.63-8.54a.75.75 0 0 0-.69-.46h-.82c-.3 0-.58.18-.7.46L9.32 10.8l-.01-.01a10.8 10.8 0 0 1-3.27-2.2 12.38 12.38 0 0 0 2.54-4.18L9.08 3H10V1.5H5.75V0h-1.5v1.5H0V3h7.5l-.33.91c-.47 1.31-1.2 2.52-2.13 3.56-.7-.9-1.25-1.9-1.63-2.97H1.8l.18.48a12.43 12.43 0 0 0 1.97 3.56c-.9.75-1.89 1.35-2.96 1.78v1.58a12.3 12.3 0 0 0 3.96-2.26 12.31 12.31 0 0 0 3.77 2.54L7.53 15h1.64l1.06-2.5h4.08l1.06 2.5Zm-4.5-4 1.4-3.3 1.4 3.3h-2.8Z" fill="context-fill" fill-opacity="context-fill-opacity" fill-rule="nonzero"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="2.25" y1="4.25" x2="10.25" y2="4.25"></line><line x1="6.25" y1="2.25" x2="6.25" y2="4.25"></line><path d="M4.25,4.25c.091,2.676,1.916,4.981,4.5,5.684"></path><path d="M8.25,4.25c-.4,5.625-6,6-6,6"></path><polyline points="9.25 15.75 12.25 7.75 12.75 7.75 15.75 15.75" data-color="color-2"></polyline><line x1="10.188" y1="13.25" x2="14.813" y2="13.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/unpin.svg b/src/browser/themes/shared/zen-icons/unpin.svg
index 97916123b..063818335 100644
--- a/src/browser/themes/shared/zen-icons/unpin.svg
+++ b/src/browser/themes/shared/zen-icons/unpin.svg
@@ -1,6 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 -960 960 960"><path d="M200-446.667v-66.666h560v66.666H200Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/video-open.svg b/src/browser/themes/shared/zen-icons/video-open.svg
index 57180b966..dce174372 100644
--- a/src/browser/themes/shared/zen-icons/video-open.svg
+++ b/src/browser/themes/shared/zen-icons/video-open.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3 1c-1.099 0-2 .9-2 2v3.174C1.313 6.064 1.648 6 2 6V3c0-.563.437-1 1-1h3v1.5C6 4.323 6.677 5 7.5 5H14v8c0 .563-.437 1-1 1h-3c0 .352-.064.687-.174 1H13c1.1 0 2-.9 2-2V3c0-1.099-.9-2-2-2zm4 1h6c.563 0 1 .437 1 1v1H7.5a.493.493 0 0 1-.5-.5z"/>
-  <rect x=".5" y="7.5" width="8" height="8" rx="1.5" ry="1.5" fill="none" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.001"/>
-  <path d="M3 9.867v3.265a.24.24 0 0 0 .365.205l2.442-1.492a.405.405 0 0 0 0-.69L3.365 9.661A.24.24 0 0 0 3 9.867z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.211,6.984l-2.296-1.385c-.402-.243-.915,.047-.915,.516v2.771c0,.47,.513,.759,.915,.516l2.296-1.385c.389-.235,.389-.798,0-1.033Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/video-save.svg b/src/browser/themes/shared/zen-icons/video-save.svg
index c23777ef5..a9773c398 100644
--- a/src/browser/themes/shared/zen-icons/video-save.svg
+++ b/src/browser/themes/shared/zen-icons/video-save.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M14.13 7c-.478 0-.957.18-1.322.547l-4.828 4.83a2.2 2.2 0 0 0-.578 1.02l-.375 1.498a.889.889 0 0 0 1.078 1.078l1.498-.375a2.2 2.2 0 0 0 1.02-.578l4.828-4.828A1.872 1.872 0 0 0 14.13 7zm-.002 1.002c.427.002.671.224.8.537.13.314.116.643-.187.947l-4.826 4.826a1.204 1.204 0 0 1-.556.315l-1.316.332.33-1.32H8.37c.053-.21.163-.403.316-.557l4.828-4.83a.85.85 0 0 1 .614-.25zm-6.266 7 .002.002H7.86z"/>
-  <path d="M5.765 5.076A.5.5 0 0 0 5 5.5v5.15a.5.5 0 0 0 .776.417l4-2.648a.5.5 0 0 0-.01-.84z"/>
-  <path d="M3.5 1A2.5 2.5 0 0 0 1 3.5v9A2.5 2.5 0 0 0 3.5 15h2.506c.006-.115.022-.231.05-.348L6.222 14H3.5A1.5 1.5 0 0 1 2 12.5v-9A1.5 1.5 0 0 1 3.5 2h9A1.5 1.5 0 0 1 14 3.5v2.506c.044-.002.087-.006.13-.006h.005c.304.001.594.051.865.139v-2.64A2.5 2.5 0 0 0 12.5 1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.844"></path><path d="M15.75,10.313v-1.563c0-1.104-.895-2-2-2H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h5"></path><path d="M12.539,11.323l4.204,2.477c.343,.202,.343,.697,0,.899l-4.204,2.477c-.349,.206-.789-.045-.789-.449v-4.955c0-.404,.441-.655,.789-.449Z" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/win11-close-dark.svg b/src/browser/themes/shared/zen-icons/win11-close-dark.svg
deleted file mode 100644
index f9975fcc3..000000000
--- a/src/browser/themes/shared/zen-icons/win11-close-dark.svg
+++ /dev/null
@@ -1,8 +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/.
-   -->
-<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" fill="context-stroke" fill-opacity="context-stroke-opacity">
-  <path d="M1.5.875a.625.625 0 0 0-.441.184.625.625 0 0 0 0 .882l4.059 4.06-4.06 4.058a.625.625 0 0 0 0 .883.625.625 0 0 0 .883 0l4.06-4.059 4.058 4.06a.625.625 0 0 0 .883 0 .625.625 0 0 0 0-.884L6.883 6l4.06-4.059a.625.625 0 0 0 0-.882.625.625 0 0 0-.884 0L6 5.118l-4.059-4.06A.625.625 0 0 0 1.5.876z"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win11-close.svg b/src/browser/themes/shared/zen-icons/win11-close.svg
deleted file mode 100644
index 5b5d0c93a..000000000
--- a/src/browser/themes/shared/zen-icons/win11-close.svg
+++ /dev/null
@@ -1,8 +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/.
-   -->
-<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" fill="context-stroke" fill-opacity="context-stroke-opacity">
-  <path d="M1.5 1a.5.5 0 0 0-.353.146.5.5 0 0 0 0 .708L5.293 6l-4.146 4.145a.5.5 0 0 0 0 .707.5.5 0 0 0 .707 0L6 6.706l4.146 4.146a.5.5 0 0 0 .706 0 .5.5 0 0 0 0-.707L6.708 6l4.146-4.146a.5.5 0 0 0 0-.707.5.5 0 0 0-.707 0L5.998 5.292 1.855 1.146A.5.5 0 0 0 1.5 1z"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win11-maximize.svg b/src/browser/themes/shared/zen-icons/win11-maximize.svg
deleted file mode 100644
index 9b18babd2..000000000
--- a/src/browser/themes/shared/zen-icons/win11-maximize.svg
+++ /dev/null
@@ -1,8 +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/.
-   -->
-<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" fill="context-stroke" fill-opacity="context-stroke-opacity">
-  <path d="M2.5 1C1.677 1 1 1.677 1 2.5v7c0 .823.677 1.5 1.5 1.5h7c.823 0 1.5-.677 1.5-1.5v-7c0-.823-.677-1.5-1.5-1.5zm0 1h7c.282 0 .5.218.5.5v7c0 .282-.218.5-.5.5h-7a.493.493 0 0 1-.5-.5v-7c0-.282.218-.5.5-.5z"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win11-minimize.svg b/src/browser/themes/shared/zen-icons/win11-minimize.svg
deleted file mode 100644
index 02f39f213..000000000
--- a/src/browser/themes/shared/zen-icons/win11-minimize.svg
+++ /dev/null
@@ -1,9 +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/.
-   -->
-<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" fill="context-stroke" fill-opacity="context-stroke-opacity">
-  <style>@media(min-resolution:1.25dppx){path{translate:0 -0.5px;}}</style>
-  <path d="M1.5 6a.5.5 0 0 0-.5.5.5.5 0 0 0 .5.5h9a.5.5 0 0 0 .5-.5.5.5 0 0 0-.5-.5z"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/win11-restore.svg b/src/browser/themes/shared/zen-icons/win11-restore.svg
deleted file mode 100644
index 32974f67e..000000000
--- a/src/browser/themes/shared/zen-icons/win11-restore.svg
+++ /dev/null
@@ -1,8 +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/.
-   -->
-<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" fill="context-stroke" fill-opacity="context-stroke-opacity">
-  <path d="M3.5 2h5A1.5 1.5 45 0 1 10 3.5v5a1 1 135 0 0 1-1v-4A2.5 2.5 45 0 0 8.5 1h-4a1 1 135 0 0-1 1zM1 4.5v5A1.5 1.5 45 0 0 2.5 11h5A1.5 1.5 135 0 0 9 9.5v-5A1.5 1.5 45 0 0 7.5 3h-5A1.5 1.5 135 0 0 1 4.5zM2.5 4h5a.5.5 45 0 1 .5.5v5a.5.5 135 0 1-.5.5h-5a.5.5 45 0 1-.5-.5v-5a.5.5 135 0 1 .5-.5z"/>
-</svg>
diff --git a/src/browser/themes/shared/zen-icons/window.svg b/src/browser/themes/shared/zen-icons/window.svg
index e32bc52a5..bc40fea49 100644
--- a/src/browser/themes/shared/zen-icons/window.svg
+++ b/src/browser/themes/shared/zen-icons/window.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M3.5 1A2.5 2.5 0 0 0 1 3.5v9A2.5 2.5 0 0 0 3.5 15h9a2.5 2.5 0 0 0 2.5-2.5v-9A2.5 2.5 0 0 0 12.5 1h-9zm0 1h9A1.5 1.5 0 0 1 14 3.5V4H2v-.5A1.5 1.5 0 0 1 3.5 2zM2 5h12v7.5a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 2 12.5V5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/xr-blocked.svg b/src/browser/themes/shared/zen-icons/xr-blocked.svg
index f6f3afacc..839642c37 100644
--- a/src/browser/themes/shared/zen-icons/xr-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/xr-blocked.svg
@@ -1,10 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
-  <path clip-path="url(#a)" d="M8 4c-2.335 0-4.671.296-7.008.887A1.32 1.32 0 0 0 0 6.17v2.549c0 1.804 1.44 3.28 3.236 3.28H5.24a2.11 2.11 0 0 0 1.596-.732l.53-.611a.835.835 0 0 1 1.268 0l.53.611A2.11 2.11 0 0 0 10.76 12h2.004C14.559 12 16 10.523 16 8.719v-2.55c0-.602-.404-1.134-.993-1.282A28.51 28.51 0 0 0 8 4zm0 1c2.249 0 4.503.285 6.762.856.135.034.238.16.238.314v2.549C15 9.986 13.991 11 12.764 11H10.76c-.32 0-.624-.14-.838-.387l-.53-.611a1.834 1.834 0 0 0-2.781 0l-.53.611a1.11 1.11 0 0 1-.84.387H3.237C2.01 11 1.001 9.986 1.001 8.719V6.17c0-.154.104-.28.238-.315A27.504 27.504 0 0 1 8.001 5zm-.04 1A.75.75 0 1 0 8 6h-.039zM2.5 7a.5.5 0 0 0 0 1H4a.5.5 0 0 0 0-1H2.5zm9.502 0a.5.5 0 0 0-.004 1l1.5.004a.502.502 0 0 0 .502-.5c0-.276-.222-.5-.498-.5L12.002 7z"/>
-  <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.012,6.524c.315,.763,.488,1.6,.488,2.476,0,3.59-2.91,6.5-6.5,6.5-.877,0-1.713-.174-2.476-.488"></path><path d="M4.404,13.596c-1.176-1.176-1.904-2.801-1.904-4.596,0-3.59,2.91-6.5,6.5-6.5,1.795,0,3.42,.728,4.596,1.904"></path><path d="M7.409,10.591c-.407-.407-.659-.97-.659-1.591,0-1.243,1.007-2.25,2.25-2.25,.621,0,1.184,.252,1.591,.659" data-color="color-2"></path><line x1="9" y1="1" x2="9" y2="2.5"></line><line x1="17" y1="9" x2="15.5" y2="9"></line><line x1="9" y1="17" x2="9" y2="15.5"></line><line x1="1" y1="9" x2="2.5" y2="9"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/xr.svg b/src/browser/themes/shared/zen-icons/xr.svg
index d950d0b33..4ec759867 100644
--- a/src/browser/themes/shared/zen-icons/xr.svg
+++ b/src/browser/themes/shared/zen-icons/xr.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M8 4c-2.335 0-4.671.296-7.008.887A1.32 1.32 0 0 0 0 6.17v2.549c0 1.804 1.44 3.28 3.236 3.28H5.24a2.11 2.11 0 0 0 1.596-.732l.53-.611a.835.835 0 0 1 1.268 0l.53.611A2.11 2.11 0 0 0 10.76 12h2.004C14.559 12 16 10.523 16 8.719v-2.55c0-.602-.404-1.134-.993-1.282A28.51 28.51 0 0 0 8 4zm0 1c2.249 0 4.503.285 6.762.856.135.034.238.16.238.314v2.549C15 9.986 13.991 11 12.764 11H10.76c-.32 0-.624-.14-.838-.387l-.53-.611a1.834 1.834 0 0 0-2.781 0l-.53.611a1.11 1.11 0 0 1-.84.387H3.237C2.01 11 1.001 9.986 1.001 8.719V6.17c0-.154.104-.28.238-.315A27.504 27.504 0 0 1 8.001 5zm-.04 1A.75.75 0 1 0 8 6h-.039zM2.5 7a.5.5 0 0 0 0 1H4a.5.5 0 0 0 0-1H2.5zm9.502 0a.5.5 0 0 0-.004 1l1.5.004a.502.502 0 0 0 .502-.5c0-.276-.222-.5-.498-.5L12.002 7z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.75,5.75H14.25c1.105,0,2,.895,2,2v4.5c0,1.105-.895,2-2,2h-2c-.63,0-1.222-.296-1.6-.8l-.45-.6c-.6-.8-1.8-.8-2.4,0l-.45,.6c-.378,.504-.97,.8-1.6,.8H3.75c-1.105,0-2-.895-2-2V7.75c0-1.105,.895-2,2-2Z"></path><circle cx="5.5" cy="10" r=".75" fill="currentColor" data-color="color-2"></circle><circle cx="12.5" cy="10" r=".75" fill="currentColor" data-color="color-2"></circle><path d="M15.979,6.745l-1.892-3.049c-.365-.588-1.008-.946-1.699-.946h-3.387s-3.387,0-3.387,0c-.692,0-1.335,.358-1.699,.946l-1.892,3.049"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/zoom-control.svg b/src/browser/themes/shared/zen-icons/zoom-control.svg
index de500330f..77505bc5e 100644
--- a/src/browser/themes/shared/zen-icons/zoom-control.svg
+++ b/src/browser/themes/shared/zen-icons/zoom-control.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 512 512">
-  <path fill-rule="evenodd" d="M266.6667 170.6667C331.468 170.6667 384 223.1986 384 288c0 24.6932-7.628 47.6048-20.6562 66.507l81.218 81.2183-30.1699 30.1698-81.2183-81.2178c-18.9022 13.028-41.8137 20.656-66.507 20.656-64.8013 0-117.3333-52.5319-117.3333-117.3333s52.532-117.3333 117.3334-117.3333Zm0 42.6666C225.4294 213.3333 192 246.7627 192 288c0 41.2373 33.4294 74.6667 74.6667 74.6667 41.2372 0 74.6666-33.4294 74.6666-74.6667 0-41.2373-33.4294-74.6667-74.6666-74.6667Zm181.3333 64v64h-42.6667v-64H448Zm-341.3333 0v21.3334H128v42.6666H64v-64h42.6667Zm0-106.6666v64H64v-64h42.6667Zm341.3333 0v64h-42.6667v-64H448ZM448 64v64h-42.6667v-21.3333H384V64h64Zm-320 0v42.6667h-21.3333V128H64V64h64Zm213.3333 0v42.6667h-64V64h64Zm-106.6666 0v42.6667h-64V64h64Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="7.75" cy="7.75" r="5"></circle><line x1="15.25" y1="15.25" x2="11.285" y2="11.285"></line><circle cx="5.5" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="10" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><path d="M6.75,8.5h2c.276,0,.5,.224,.5,.5h0c0,.828-.672,1.5-1.5,1.5h0c-.828,0-1.5-.672-1.5-1.5h0c0-.276,.224-.5,.5-.5Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/zoom-out.svg b/src/browser/themes/shared/zen-icons/zoom-out.svg
index f673f6f36..063818335 100644
--- a/src/browser/themes/shared/zen-icons/zoom-out.svg
+++ b/src/browser/themes/shared/zen-icons/zoom-out.svg
@@ -1,8 +1 @@
-<!--
-   - This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M1 7a.5.5 0 0 0 0 1h13a.5.5 0 0 0 0-1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>

From 9c47e2a35bd120ae9f4db66f104c31c3864a3918 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 17:58:03 +0100
Subject: [PATCH 037/191] Refactor zen-glance and vertical-tabs styles for
 improved layout and button padding

---
 src/browser/base/content/zen-styles/zen-glance.css  | 13 ++++---------
 .../content/zen-styles/zen-tabs/vertical-tabs.css   |  1 +
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index 377b7a453..ed02b82d1 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -9,14 +9,6 @@
   visibility: inherit;
 }
 
-#zen-glance-sidebar-container {
-  display: none;
-
-  & toolbarbutton:hover {
-    background: var(--button-background-color-hover);
-  }
-}
-
 #zen-glance-sidebar-container {
   position: absolute;
   display: flex;
@@ -37,7 +29,6 @@
     width: 32px;
     height: 32px;
     background: light-dark(rgba(0, 0, 0, 0.9), rgba(255, 255, 255, 0.9));
-    fill: light-dark(white, black);
     transition: background 0.2s ease;
     border-radius: 999px;
     appearance: none;
@@ -51,6 +42,10 @@
     & label {
       display: none;
     }
+
+    & image {
+      filter: invert(1);
+    }
   }
 }
 
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index cdadceb55..6a8351e81 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -361,6 +361,7 @@
   align-items: center;
 
   padding-top: var(--zen-element-separation);
+  --toolbarbutton-inner-padding: 4px;
 
   & > toolbarbutton:not(#zen-workspaces-button) {
     padding: 0 !important;

From f0eeec83ee5a94bb24e9da385f09e3bd36cb220d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 18:30:08 +0100
Subject: [PATCH 038/191] Refactor vertical-tabs styles to simplify overflow
 handling and improve layout

---
 src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 6a8351e81..ceefc07bd 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -946,8 +946,7 @@
   transition: max-height 0.3s ease-out;
   opacity: 1;
   grid-template-columns: repeat(auto-fit, minmax(var(--tab-pinned-min-width-expanded), auto));
-  overflow-y: auto;
-  overflow-x: hidden;
+  overflow: hidden;
   scrollbar-width: thin;
   display: grid;
   padding: 0;

From 5a367fdad0c5907791f2cae87f427ebb82642112 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 21:41:30 +0100
Subject: [PATCH 039/191] Enhance ZenGlanceManager to manage tab selection and
 closing animations more effectively

---
 src/browser/base/zen-components/ZenGlanceManager.mjs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 3a7438a82..c25090c27 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -94,6 +94,7 @@
         browser: newTab.linkedBrowser,
       });
       this.#currentGlanceID = newUUID;
+      gBrowser.selectedTab = newTab;
       return this.#currentBrowser;
     }
 
@@ -224,6 +225,7 @@
         return;
       }
 
+      this.closingGlance = true;
       this._animating = true;
 
       gBrowser._insertTabAtIndex(this.#currentTab, {
@@ -310,7 +312,6 @@
           if (!(onTabClose && prevSelected === this.lastCurrentTab)) {
             gBrowser.removeTab(this.lastCurrentTab, { animate: true });
           }
-          this.#currentBrowser.remove();
 
           setTimeout(() => {
             prevOverlay.remove(); // Just to be sure
@@ -325,6 +326,7 @@
           this._duringOpening = false;
 
           this._animating = false;
+          this.closingGlance = false;
 
           if (this.#currentGlanceID) {
             this.quickOpenGlance();
@@ -401,7 +403,7 @@
     // note: must be async to avoid timing issues
     onLocationChange(event) {
       const tab = event.target;
-      if (this.animatingFullOpen) {
+      if (this.animatingFullOpen || this.closingGlance) {
         return;
       }
       if (this._duringOpening || !tab.hasAttribute('glance-id')) {

From 5fa7d9cc6e137e57f7de52517ffb700e669e0a94 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 22:58:39 +0100
Subject: [PATCH 040/191] Refactor ZenGlanceManager to streamline tab closing
 logic and improve animation handling

---
 .../base/zen-components/ZenGlanceManager.mjs      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index c25090c27..efbf4da88 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -304,18 +304,12 @@
           this.lastCurrentTab.removeAttribute('zen-glance-tab');
           this.lastCurrentTab._closingGlance = true;
 
-          gBrowser.tabContainer._invalidateCachedTabs();
-          const prevSelected = gBrowser.selectedTab;
           if (!isDifferent) {
             gBrowser.selectedTab = this.#currentParentTab;
           }
-          if (!(onTabClose && prevSelected === this.lastCurrentTab)) {
-            gBrowser.removeTab(this.lastCurrentTab, { animate: true });
-          }
-
-          setTimeout(() => {
-            prevOverlay.remove(); // Just to be sure
-          }, 0);
+          this._ignoreClose = true;
+          gBrowser.removeTab(this.lastCurrentTab, { animate: true });
+          gBrowser.tabContainer._invalidateCachedTabs();
 
           this.#currentParentTab.removeAttribute('glance-id');
 
@@ -442,10 +436,9 @@
           this._ignoreClose = false;
           return false;
         }
-        this._ignoreClose = isDifferent;
         this.closeGlance({ onTabClose: true, setNewID: isDifferent ? oldGlanceID : null, isDifferent });
         // only keep continueing tab close if we are not on the currently selected tab
-        return true;
+        return !isDifferent;
       }
       return false;
     }

From 20b04937c9f50b50e45f8a049f836346f43b1f82 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 2 Feb 2025 23:40:40 +0100
Subject: [PATCH 041/191] URL bar now opens instead of a newtab (optional, on
 by default)

---
 src/browser/app/profile/zen-browser.js        |  1 +
 src/browser/base/content/ZenUIManager.mjs     | 18 +++++++++
 .../base/content/browser-commands-js.patch    | 15 ++++++-
 .../urlbar/UrlbarInput-sys-mjs.patch          | 39 ++++++++++++++++---
 4 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 9f74b51a5..2dd676cc9 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -122,6 +122,7 @@ pref('zen.view.compact.color-toolbar', true);
 pref('zen.view.compact.color-sidebar', true);
 pref('zen.view.compact.animate-sidebar', true);
 
+pref('zen.urlbar.replace-newtab', true);
 pref('zen.urlbar.behavior', 'floating-on-type'); // default, floating-on-type, float
 
 #ifdef XP_MACOSX
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 009c70fb0..6502121fb 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -142,6 +142,24 @@ var gZenUIManager = {
     this.__currentPopup = null;
     this.__currentPopupTrackElement = null;
   },
+
+  handleNewTab(werePassedURL, searchClipboard, where) {
+    const shouldOpenURLBar = Services.prefs.getBoolPref('zen.urlbar.replace-newtab')
+      && !werePassedURL && !searchClipboard && where === 'tab';
+    if (shouldOpenURLBar) {
+      gURLBar._untrimmedValue = "";
+      gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
+      gURLBar.setAttribute('zen-newtab', true);
+      document.getElementById('Browser:OpenLocation').doCommand();
+      return true;
+    }
+    return false;
+  },
+
+  handleUrlbarClose() {
+    gURLBar.removeAttribute('zen-newtab');
+    gURLBar._zenHandleUrlbarClose = null;
+  },
 };
 
 var gZenVerticalTabsManager = {
diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch
index 293d011e5..e39ef0bb4 100644
--- a/src/browser/base/content/browser-commands-js.patch
+++ b/src/browser/base/content/browser-commands-js.patch
@@ -1,8 +1,19 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index 352de44dda36e3f6672eb353f42978ede0cd2681..d6956a318c34bfb12b0ba957edab1166e1a4edaf 100644
+index 352de44dda36e3f6672eb353f42978ede0cd2681..66d1616da17df3430cec0994a346f0f446944f1a 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
-@@ -407,8 +407,8 @@ var BrowserCommands = {
+@@ -318,6 +318,10 @@ var BrowserCommands = {
+       }
+     }
+ 
++    if (gZenUIManager.handleNewTab(werePassedURL, searchClipboard, where)) {
++      return;
++    }
++
+     // A notification intended to be useful for modular peformance tracking
+     // starting as close as is reasonably possible to the time when the user
+     // expressed the intent to open a new tab.  Since there are a lot of
+@@ -407,8 +411,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 5cefe55f6..61418d9e9 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33fe29e19e 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c51f83977b 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -16,7 +16,7 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -2152,6 +2159,11 @@ export class UrlbarInput {
+@@ -2144,6 +2151,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -28,7 +28,27 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
      // 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")) {
-@@ -3875,6 +3887,11 @@ export class UrlbarInput {
+@@ -2163,6 +2175,10 @@ export class UrlbarInput {
+       return;
+     }
+ 
++    if (this._zenHandleUrlbarClose) {
++      this._zenHandleUrlbarClose();
++    }
++
+     this.removeAttribute("breakout-extend");
+     this.#updateTextboxPosition();
+   }
+@@ -3305,7 +3321,7 @@ export class UrlbarInput {
+     } else {
+       where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
+     }
+-    if (lazy.UrlbarPrefs.get("openintab")) {
++    if (lazy.UrlbarPrefs.get("openintab") || this.hasAttribute("zen-newtab")) {
+       if (where == "current") {
+         where = "tab";
+       } else if (where == "tab") {
+@@ -3859,6 +3875,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -40,7 +60,16 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -3986,9 +4003,12 @@ export class UrlbarInput {
+@@ -3930,7 +3951,7 @@ export class UrlbarInput {
+       }
+     }
+ 
+-    if (this.focusedViaMousedown) {
++    if (this.focusedViaMousedown || this.hasAttribute("zen-newtab")) {
+       this.view.autoOpen({ event });
+     } else {
+       if (this._untrimOnFocusAfterKeydown) {
+@@ -3970,9 +3991,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -54,7 +83,7 @@ index 3ab07e5864b3bb200608e7f619645f92ade129fe..31085d82271b0259cd69ec9691ea5f33
  
          if (
            event.target != this.inputField &&
-@@ -3998,8 +4018,8 @@ export class UrlbarInput {
+@@ -3982,8 +4006,8 @@ export class UrlbarInput {
            break;
          }
  

From d9c8609d4318036205a3ab8473c7a1cf32c3b470 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 00:33:07 +0100
Subject: [PATCH 042/191] Add tab selection handling to ZenUIManager for
 improved URL bar management

---
 src/browser/base/content/ZenUIManager.mjs | 24 +++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 6502121fb..9a141990e 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -29,6 +29,7 @@ var gZenUIManager = {
     });
 
     window.addEventListener('TabClose', this.onTabClose.bind(this));
+    window.addEventListener('TabSelect', this.onTabSelect.bind(this));
   },
 
   updateTabsToolbar() {
@@ -143,11 +144,26 @@ var gZenUIManager = {
     this.__currentPopupTrackElement = null;
   },
 
+  _prevUrlbarLabel: null,
+  _lastSearch: "",
+
+  onTabSelect(event) {
+    this._prevUrlbarLabel = null;
+    this._lastSearch = "";
+    if (gURLBar.hasAttribute('zen-newtab')) {
+      this.handleUrlbarClose();
+    }
+  },
+
   handleNewTab(werePassedURL, searchClipboard, where) {
     const shouldOpenURLBar = Services.prefs.getBoolPref('zen.urlbar.replace-newtab')
       && !werePassedURL && !searchClipboard && where === 'tab';
     if (shouldOpenURLBar) {
-      gURLBar._untrimmedValue = "";
+      if (this._prevUrlbarLabel !== gURLBar._untrimmedValue) {
+        this._lastSearch = "";
+      }
+      this._prevUrlbarLabel = gURLBar._untrimmedValue;
+      gURLBar._untrimmedValue = this._lastSearch;
       gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
       gURLBar.setAttribute('zen-newtab', true);
       document.getElementById('Browser:OpenLocation').doCommand();
@@ -157,8 +173,12 @@ var gZenUIManager = {
   },
 
   handleUrlbarClose() {
-    gURLBar.removeAttribute('zen-newtab');
+    gURLBar.controller.clearLastQueryContextCache();
+    gURLBar.blur();
     gURLBar._zenHandleUrlbarClose = null;
+    gURLBar.removeAttribute('zen-newtab');
+    this._lastSearch = gURLBar._untrimmedValue;
+    gURLBar.handleRevert();
   },
 };
 

From eea432418ecdf50080fc76cacc8da383c2218f57 Mon Sep 17 00:00:00 2001
From: EmilyxFox <48589793+EmilyxFox@users.noreply.github.com>
Date: Mon, 3 Feb 2025 00:48:09 +0100
Subject: [PATCH 043/191] copying all tabs in view depends on setting

---
 .../base/zen-components/ZenCommonUtils.mjs    | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index 280625adb..ecc7f6dcf 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -60,12 +60,23 @@ class ZenPreloadedFeature {
 
 var gZenCommonActions = {
   copyCurrentURLToClipboard() {
-    const currentTabs = gZenViewSplitter.getTabsInCurrentView()
-    if (currentTabs) {
-      const stringArray = currentTabs.map(t => `${t.linkedBrowser.currentURI.spec}`)
-      const markdownString = stringArray.join("\n")
+    let urlStringToCopy = "";
+    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-all-tab-urls-in-view', false)) {
+      const currentTabs = gZenViewSplitter.getTabsInCurrentView();
+      if (currentTabs) {
+        const stringArray = currentTabs.map(t => `${t.linkedBrowser.currentURI.spec}`);
+        urlStringToCopy = stringArray.join("\n");
+      }
+    } else {
+      const currentUrl = gBrowser.currentURI.spec;
+      if (currentUrl) {
+
+        urlStringToCopy = `${currentUrl}`
+      }
+    }
+    if (urlStringToCopy) {
       let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-      str.data = markdownString;
+      str.data = urlStringToCopy;
       let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
       transferable.init(getLoadContext());
       transferable.addDataFlavor('text/plain');
@@ -75,10 +86,21 @@ var gZenCommonActions = {
     }
   },
   CopyCurrentURLAsMarkdownToClipboard() {
-    const currentTabs = gZenViewSplitter.getTabsInCurrentView()
-    if (currentTabs) {
-      const stringArray = currentTabs.map(t => `[${t.label}](${t.linkedBrowser.currentURI.spec})`)
-      const markdownString = stringArray.join("\n")
+    let markdownString = "";
+    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-all-tab-urls-in-view', false)) {
+      const currentTabs = gZenViewSplitter.getTabsInCurrentView();
+      if (currentTabs) {
+        const stringArray = currentTabs.map(t => `[${t.label}](${t.linkedBrowser.currentURI.spec})`);
+        markdownString = stringArray.join("\n");
+      }
+    } else {
+      const currentUrl = gBrowser.currentURI.spec;
+      const tabTitle = gBrowser.selectedTab.label;
+      if (currentUrl && tabTitle) {
+        markdownString = `[${tabTitle}](${currentUrl})`;
+      }
+    }
+    if (markdownString) {
       let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
       str.data = markdownString;
       let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);

From ffbe58b8088d3e869c1834e641c38548427c4fb9 Mon Sep 17 00:00:00 2001
From: EmilyxFox <48589793+EmilyxFox@users.noreply.github.com>
Date: Mon, 3 Feb 2025 04:09:14 +0100
Subject: [PATCH 044/191] different settings for either shortcut

---
 src/browser/base/zen-components/ZenCommonUtils.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index ecc7f6dcf..dfba3db1c 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -61,7 +61,7 @@ class ZenPreloadedFeature {
 var gZenCommonActions = {
   copyCurrentURLToClipboard() {
     let urlStringToCopy = "";
-    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-all-tab-urls-in-view', false)) {
+    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-current-url.copy-all-in-split-view', false)) {
       const currentTabs = gZenViewSplitter.getTabsInCurrentView();
       if (currentTabs) {
         const stringArray = currentTabs.map(t => `${t.linkedBrowser.currentURI.spec}`);
@@ -87,7 +87,7 @@ var gZenCommonActions = {
   },
   CopyCurrentURLAsMarkdownToClipboard() {
     let markdownString = "";
-    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-all-tab-urls-in-view', false)) {
+    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-current-url-as-markdown.copy-all-in-split-view', false)) {
       const currentTabs = gZenViewSplitter.getTabsInCurrentView();
       if (currentTabs) {
         const stringArray = currentTabs.map(t => `[${t.label}](${t.linkedBrowser.currentURI.spec})`);

From 88fbae4bec575077c5d9f2ad521c6862bb92a6a3 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 19:42:28 +0100
Subject: [PATCH 045/191] Refactor ZenPinnedTabManager and ZenUIManager for
 improved tab closing behavior and URL bar handling

---
 src/browser/base/content/ZenUIManager.mjs     | 35 ++++++------
 .../zen-styles/zen-tabs/vertical-tabs.css     | 11 ++--
 .../zen-components/ZenPinnedTabManager.mjs    |  4 +-
 .../tabbrowser/content/tab-js.patch           |  4 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 54 +++++++++++--------
 .../themes/shared/zen-icons/downloads.svg     |  2 +-
 .../themes/shared/zen-icons/reload.svg        |  2 +-
 7 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 9a141990e..696271fcb 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -29,7 +29,6 @@ var gZenUIManager = {
     });
 
     window.addEventListener('TabClose', this.onTabClose.bind(this));
-    window.addEventListener('TabSelect', this.onTabSelect.bind(this));
   },
 
   updateTabsToolbar() {
@@ -147,38 +146,40 @@ var gZenUIManager = {
   _prevUrlbarLabel: null,
   _lastSearch: "",
 
-  onTabSelect(event) {
-    this._prevUrlbarLabel = null;
-    this._lastSearch = "";
-    if (gURLBar.hasAttribute('zen-newtab')) {
-      this.handleUrlbarClose();
-    }
-  },
-
   handleNewTab(werePassedURL, searchClipboard, where) {
     const shouldOpenURLBar = Services.prefs.getBoolPref('zen.urlbar.replace-newtab')
       && !werePassedURL && !searchClipboard && where === 'tab';
     if (shouldOpenURLBar) {
-      if (this._prevUrlbarLabel !== gURLBar._untrimmedValue) {
-        this._lastSearch = "";
-      }
       this._prevUrlbarLabel = gURLBar._untrimmedValue;
-      gURLBar._untrimmedValue = this._lastSearch;
       gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
       gURLBar.setAttribute('zen-newtab', true);
       document.getElementById('Browser:OpenLocation').doCommand();
+      gURLBar.search(this._lastSearch);
       return true;
     }
     return false;
   },
 
-  handleUrlbarClose() {
-    gURLBar.controller.clearLastQueryContextCache();
-    gURLBar.blur();
+  handleUrlbarClose(onSwitch) {
     gURLBar._zenHandleUrlbarClose = null;
+    if (onSwitch) {
+      this._prevUrlbarLabel = null;
+      this._lastSearch = "";
+    } else {
+      this._lastSearch = gURLBar._untrimmedValue;
+    }
+    if (this._prevUrlbarLabel) {
+      gURLBar.setURI(this._prevUrlbarLabel, false, false, false, true);
+    }
     gURLBar.removeAttribute('zen-newtab');
-    this._lastSearch = gURLBar._untrimmedValue;
     gURLBar.handleRevert();
+    if (gURLBar.focused) {
+      gURLBar.view.close();
+      gURLBar.updateTextOverflow();
+      if (gBrowser.selectedTab.linkedBrowser && onSwitch) {
+        gURLBar.getBrowserState(gBrowser.selectedTab.linkedBrowser).urlbarFocused = false;
+      }
+    }
   },
 };
 
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index ceefc07bd..93cb23ddf 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -29,7 +29,7 @@
 
   & #zen-sidebar-top-buttons .toolbarbutton-1 {
     & > .toolbarbutton-icon {
-      padding: 5px;
+      padding: 4px;
     }
   }
 
@@ -749,12 +749,15 @@
 /* Mark: Override the default tab close button */
 #tabbrowser-tabs {
   & .tabbrowser-tab {
-    &[pinned][visuallyselected] .tab-close-button {
+    &[pinned]:not([pending='true']) .tab-close-button {
       display: none !important;
     }
 
-    &[pinned][visuallyselected]:not([zen-essential]) .tab-reset-button {
-      display: block;
+    &[pinned]:not([pending='true']):not([zen-essential]) {
+      &:hover .tab-reset-button,
+      &[visuallyselected] .tab-reset-button {
+        display: block;
+      }
     }
 
     &[zen-essential] .tab-reset-button {
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index ddc222b7c..5ce2b9520 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -450,7 +450,7 @@
       }
     }
 
-    _onCloseTabShortcut(event, selectedTab = gBrowser.selectedTab) {
+    _onCloseTabShortcut(event, selectedTab = gBrowser.selectedTab, behavior = lazy.zenPinnedTabCloseShortcutBehavior) {
       if (!selectedTab?.pinned) {
         return;
       }
@@ -458,8 +458,6 @@
       event.stopPropagation();
       event.preventDefault();
 
-      const behavior = lazy.zenPinnedTabCloseShortcutBehavior;
-
       switch (behavior) {
         case 'close':
           this._removePinnedAttributes(selectedTab, true);
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 723f781b4..9d9c6c450 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index d41c486c02a6f09dcff5741a59ad8b617294c481..855152a13afdf58433c228e3675e2e0eebe3892e 100644
+index d41c486c02a6f09dcff5741a59ad8b617294c481..44535569b609d9bcd09f10e46e3161ce0a331c30 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -37,6 +37,7 @@
@@ -33,7 +33,7 @@ index d41c486c02a6f09dcff5741a59ad8b617294c481..855152a13afdf58433c228e3675e2e0e
        }
 +
 +      if (event.target.classList.contains("tab-reset-button")) {
-+        gZenPinnedTabManager._resetTabToStoredState(this);
++        gZenPinnedTabManager._onCloseTabShortcut(event, this, 'unload-switch');
 +        gBrowser.tabContainer._blockDblClick = true;
 +      }
      }
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 4970ccd6b..2827589cd 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e9240ba35 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b9417f545 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -80,7 +80,17 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -2387,7 +2421,7 @@
+@@ -1477,6 +1511,9 @@
+           newBrowser &&
+           gURLBar.getBrowserState(newBrowser).urlbarFocused &&
+           gURLBar.focused;
++        if (gURLBar._zenHandleUrlbarClose) {
++          gURLBar._zenHandleUrlbarClose(true);
++        }
+         if (!keepFocusOnUrlBar) {
+           // Clear focus so that _adjustFocusAfterTabSwitch can detect if
+           // some element has been focused and respect that.
+@@ -2387,7 +2424,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -89,7 +99,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2447,7 +2481,7 @@
+@@ -2447,7 +2484,7 @@
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
          this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
@@ -98,7 +108,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2679,6 +2713,12 @@
+@@ -2679,6 +2716,12 @@
          );
        }
  
@@ -111,7 +121,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2742,6 +2782,12 @@
+@@ -2742,6 +2785,12 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -124,7 +134,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2885,6 +2931,9 @@
+@@ -2885,6 +2934,9 @@
          }
        }
  
@@ -134,7 +144,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3452,21 @@
+@@ -3403,6 +3455,21 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -156,7 +166,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3480,7 @@
+@@ -3416,6 +3483,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -164,7 +174,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3516,21 @@
+@@ -3451,7 +3519,21 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -187,7 +197,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
            if (select) {
              tabToSelect = tab;
            }
-@@ -3729,7 +3808,7 @@
+@@ -3729,7 +3811,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.
@@ -196,7 +206,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3859,7 @@
+@@ -3780,7 +3862,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -205,7 +215,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4174,9 @@
+@@ -4095,6 +4177,9 @@
          return;
        }
  
@@ -215,7 +225,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        this.removeTabs(selectedTabs);
      }
  
-@@ -4443,6 +4525,12 @@
+@@ -4443,6 +4528,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -228,7 +238,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4545,9 @@
+@@ -4457,7 +4548,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -239,7 +249,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4561,6 @@
+@@ -4471,7 +4564,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -247,7 +257,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4699,14 @@
+@@ -4610,14 +4702,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -264,7 +274,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5554,10 @@
+@@ -5465,10 +5557,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -277,7 +287,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5727,6 +5816,9 @@
+@@ -5727,6 +5819,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -287,7 +297,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -7443,6 +7535,7 @@
+@@ -7443,6 +7538,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -295,7 +305,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8504,7 @@ var TabContextMenu = {
+@@ -8411,7 +8507,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -304,7 +314,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8537,7 @@ var TabContextMenu = {
+@@ -8444,7 +8540,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -313,7 +323,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cca93dc8fe6300a5bee22029bbe2369e
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8770,7 @@ var TabContextMenu = {
+@@ -8677,6 +8773,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/themes/shared/zen-icons/downloads.svg b/src/browser/themes/shared/zen-icons/downloads.svg
index 4c792fe0a..6fc5ab26a 100644
--- a/src/browser/themes/shared/zen-icons/downloads.svg
+++ b/src/browser/themes/shared/zen-icons/downloads.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,6.75h1c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2H5.25c-1.105,0-2-.895-2-2v-5.5c0-1.105,.895-2,2-2h1"></path><polyline points="12 10.25 9 13.25 6 10.25" data-color="color-2"></polyline><line x1="9" y1="13.25" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.25,11.75v1.5c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2v-1.5"></path><polyline points="5.5 6.75 9 10.25 12.5 6.75" data-color="color-2"></polyline><line x1="9" y1="10.25" x2="9" y2="2.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/reload.svg b/src/browser/themes/shared/zen-icons/reload.svg
index 2721a3aaf..3aa735c04 100644
--- a/src/browser/themes/shared/zen-icons/reload.svg
+++ b/src/browser/themes/shared/zen-icons/reload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3,13.071c1.304,1.919,3.505,3.179,6,3.179,4.004,0,7.25-3.246,7.25-7.25S13.004,1.75,9,1.75c-3.031,0-5.627,1.86-6.71,4.5" data-color="color-2"></path><polyline points="1.88 3.305 2.288 6.25 5.232 5.843"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15,13.071c-1.304,1.919-3.505,3.179-6,3.179-4.004,0-7.25-3.246-7.25-7.25S4.996,1.75,9,1.75c3.031,0,5.627,1.86,6.71,4.5" data-color="color-2"></path><polyline points="16.12 3.305 15.712 6.25 12.768 5.843"></polyline></g></svg>

From 01d9fc31c16c392d68d390e86c472873950fc7e3 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 20:27:03 +0100
Subject: [PATCH 046/191] Enhance ZenUIManager and ZenPinnedTabManager for
 improved tab drag-and-drop behavior and URL bar handling

---
 src/browser/base/content/ZenUIManager.mjs     |  8 ++---
 .../zen-styles/zen-tabs/vertical-tabs.css     | 35 ++++++++++++++-----
 .../zen-components/ZenPinnedTabManager.mjs    | 26 ++++++++++++--
 .../tabbrowser/content/tab-js.patch           | 12 +++++--
 4 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 696271fcb..4c33209d4 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -144,11 +144,11 @@ var gZenUIManager = {
   },
 
   _prevUrlbarLabel: null,
-  _lastSearch: "",
+  _lastSearch: '',
 
   handleNewTab(werePassedURL, searchClipboard, where) {
-    const shouldOpenURLBar = Services.prefs.getBoolPref('zen.urlbar.replace-newtab')
-      && !werePassedURL && !searchClipboard && where === 'tab';
+    const shouldOpenURLBar =
+      Services.prefs.getBoolPref('zen.urlbar.replace-newtab') && !werePassedURL && !searchClipboard && where === 'tab';
     if (shouldOpenURLBar) {
       this._prevUrlbarLabel = gURLBar._untrimmedValue;
       gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
@@ -164,7 +164,7 @@ var gZenUIManager = {
     gURLBar._zenHandleUrlbarClose = null;
     if (onSwitch) {
       this._prevUrlbarLabel = null;
-      this._lastSearch = "";
+      this._lastSearch = '';
     } else {
       this._lastSearch = gURLBar._untrimmedValue;
     }
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 93cb23ddf..1490e8042 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -995,7 +995,7 @@
   }
 
   &:hover .tab-background {
-    background: var(--tab-selected-bgcolor);
+    background: color-mix(in srgb, var(--zen-toolbar-element-bg) 50%, var(--tab-selected-bgcolor) 50%);
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
@@ -1091,28 +1091,47 @@
 #zen-drag-indicator {
   --zen-drag-indicator-height: 2px;
   --zen-drag-indicator-bg: color-mix(in srgb, var(--zen-primary-color) 50%, light-dark(rgba(0, 0, 0, .85), rgba(255, 255, 255, .95)) 50%);
-  width: calc(var(--indicator-width) - 2 * var(--zen-drag-indicator-height) - 4px);
-  height: var(--zen-drag-indicator-height);
   position: fixed;
   z-index: 1000;
   background: var(--zen-drag-indicator-bg);
-  transition: top 0.1s ease-out;
   pointer-events: none;
-  left: calc(var(--indicator-left) + 2 * var(--zen-drag-indicator-height) + 4px);
   border-radius: 5px;
 
   &::before {
     content: "";
     position: absolute;
-    left: calc(-2 * var(--zen-drag-indicator-height));
-    top: 50%;
     height: calc(2 * var(--zen-drag-indicator-height));
     width: calc(2 * var(--zen-drag-indicator-height));
     border: var(--zen-drag-indicator-height) solid var(--zen-drag-indicator-bg);
     border-radius: 50%;
-    transform: translate(calc(-1 * var(--zen-drag-indicator-height)), -50%);
     background: transparent;
   }
+
+  &[orientation='horizontal'] {
+    left: calc(var(--indicator-left) + 2 * var(--zen-drag-indicator-height) + 4px);
+    width: calc(var(--indicator-width) - 2 * var(--zen-drag-indicator-height) - 4px);
+    height: var(--zen-drag-indicator-height);
+    transition: top 0.1s ease-out, left 0.1s ease-out, width 0.1s ease-out;
+
+    &::before {
+      left: calc(-2 * var(--zen-drag-indicator-height));
+      top: 50%;
+      transform: translate(calc(-1 * var(--zen-drag-indicator-height)), -50%);
+    }
+  }
+
+  &[orientation='vertical'] {
+    top: calc(var(--indicator-top) + 2 * var(--zen-drag-indicator-height) + 4px);
+    height: calc(var(--indicator-height) - 2 * var(--zen-drag-indicator-height) - 4px);
+    width: var(--zen-drag-indicator-height);
+    transition: top 0.1s ease-out, left 0.1s ease-out, height 0.1s ease-out;
+
+    &::before {
+      top: calc(-2 * var(--zen-drag-indicator-height));
+      left: 50%;
+      transform: translate(-50%, calc(-1 * var(--zen-drag-indicator-height)));
+    }
+  }
 }
 
 /* Horizontal tabs reordering indicators */
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 5ce2b9520..d5ed4b9d5 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -649,7 +649,7 @@
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
 
       let moved = false;
-      let isVertical = true;
+      let isVertical = this.expandedSidebarMode;
       let isRegularTabs = false;
       // Check for pinned tabs container
       if (pinnedTabsTarget) {
@@ -724,6 +724,10 @@
       return this._dragIndicator;
     }
 
+    get expandedSidebarMode() {
+      return document.documentElement.getAttribute('zen-sidebar-expanded') === 'true';
+    }
+
     applyDragoverClass(event, draggedTab) {
       const pinnedTabsTarget = event.target.closest('#vertical-pinned-tabs-container');
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
@@ -736,7 +740,7 @@
       }
 
       let shouldAddDragOverElement = false;
-      let isVertical = true;
+      let isVertical = this.expandedSidebarMode;
 
       // Decide whether we should show a dragover class for the given target
       if (pinnedTabsTarget) {
@@ -755,6 +759,7 @@
       }
 
       if (!shouldAddDragOverElement) {
+        this.removeTabContainersDragoverClass();
         return;
       }
 
@@ -771,11 +776,26 @@
         } else {
           top = rect.top + 'px';
         }
+        indicator.setAttribute('orientation', 'horizontal');
         indicator.style.setProperty('--indicator-left', rect.left + separation / 2 + 'px');
         indicator.style.setProperty('--indicator-width', rect.width - separation + 'px');
         indicator.style.top = top;
+        indicator.style.removeProperty('left');
       } else {
-        // SUPPORT FOR ESSENTIALS
+        const separation = 8;
+        const middleX = targetTab.screenX + rect.width / 2;
+        const indicator = this.dragIndicator;
+        let left = 0;
+        if (event.screenX > middleX) {
+          left = rect.left + rect.width + 1 + 'px';
+        } else {
+          left = rect.left - 2 + 'px';
+        }
+        indicator.setAttribute('orientation', 'vertical');
+        indicator.style.setProperty('--indicator-top', rect.top + separation / 2 + 'px');
+        indicator.style.setProperty('--indicator-height', rect.height - separation + 'px');
+        indicator.style.left = left;
+        indicator.style.removeProperty('top');
       }
     }
   }
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 9d9c6c450..7c9a94ac5 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index d41c486c02a6f09dcff5741a59ad8b617294c481..44535569b609d9bcd09f10e46e3161ce0a331c30 100644
+index d41c486c02a6f09dcff5741a59ad8b617294c481..544ca38934d9b0fe0722082c71ee58f148c2cc90 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -37,6 +37,7 @@
@@ -27,7 +27,15 @@ index d41c486c02a6f09dcff5741a59ad8b617294c481..44535569b609d9bcd09f10e46e3161ce
          event.target.classList.contains("tab-icon-overlay")
        ) {
          eventMaySelectTab = false;
-@@ -553,6 +555,11 @@
+@@ -544,6 +546,7 @@
+         if (this.multiselected) {
+           gBrowser.removeMultiSelectedTabs();
+         } else {
++          gZenPinnedTabManager._removePinnedAttributes(this.contextTab, true);
+           gBrowser.removeTab(this, {
+             animate: true,
+             triggeringEvent: event,
+@@ -553,6 +556,11 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }

From ff1c57c5a3594d9363d471edb0d219d1d7bd4d3d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 21:01:13 +0100
Subject: [PATCH 047/191] Refactor URL bar handling and improve tab removal
 logic for enhanced user experience

---
 src/browser/base/content/ZenUIManager.mjs     |  8 ++--
 .../base/content/zen-styles/zen-urlbar.css    |  2 +-
 .../tabbrowser/content/tab-js.patch           |  4 +-
 .../urlbar/UrlbarInput-sys-mjs.patch          | 40 +++++++++++++++----
 .../themes/shared/urlbar-searchbar-css.patch  | 15 +++++++
 5 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 src/browser/themes/shared/urlbar-searchbar-css.patch

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 4c33209d4..c33aa0071 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -162,19 +162,17 @@ var gZenUIManager = {
 
   handleUrlbarClose(onSwitch) {
     gURLBar._zenHandleUrlbarClose = null;
+    gURLBar.removeAttribute('zen-newtab');
     if (onSwitch) {
       this._prevUrlbarLabel = null;
       this._lastSearch = '';
     } else {
       this._lastSearch = gURLBar._untrimmedValue;
     }
-    if (this._prevUrlbarLabel) {
-      gURLBar.setURI(this._prevUrlbarLabel, false, false, false, true);
-    }
-    gURLBar.removeAttribute('zen-newtab');
+    gURLBar.setURI(this._prevUrlbarLabel, false, false, false, true);
     gURLBar.handleRevert();
     if (gURLBar.focused) {
-      gURLBar.view.close();
+      gURLBar.view.close({ elementPicked: onSwitch });
       gURLBar.updateTextOverflow();
       if (gBrowser.selectedTab.linkedBrowser && onSwitch) {
         gURLBar.getBrowserState(gBrowser.selectedTab.linkedBrowser).urlbarFocused = false;
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 8a6f61373..68afccce8 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -393,7 +393,7 @@ button.popup-notification-dropmarker {
 
 :root[zen-single-toolbar='true'] {
   #urlbar[open] {
-    min-width: 30vw;
+    min-width: 40vw;
   }
 
   &[zen-right-side='true'] #urlbar[open]:not([zen-floating-urlbar='true']) {
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 7c9a94ac5..e888b83a4 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index d41c486c02a6f09dcff5741a59ad8b617294c481..544ca38934d9b0fe0722082c71ee58f148c2cc90 100644
+index d41c486c02a6f09dcff5741a59ad8b617294c481..0328460c7eb45d8ffb9de4f9b8d4a7bdd7a5b7b3 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -37,6 +37,7 @@
@@ -31,7 +31,7 @@ index d41c486c02a6f09dcff5741a59ad8b617294c481..544ca38934d9b0fe0722082c71ee58f1
          if (this.multiselected) {
            gBrowser.removeMultiSelectedTabs();
          } else {
-+          gZenPinnedTabManager._removePinnedAttributes(this.contextTab, true);
++          gZenPinnedTabManager._removePinnedAttributes(this, true);
            gBrowser.removeTab(this, {
              animate: true,
              triggeringEvent: event,
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 61418d9e9..5279aa97d 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c51f83977b 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..3db8b6c04ec5a1b88dc05d4ff04721cf61913dcc 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -16,7 +16,31 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c5
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -2144,6 +2151,11 @@ export class UrlbarInput {
+@@ -424,6 +431,10 @@ export class UrlbarInput {
+     hideSearchTerms = false,
+     isSameDocument = false
+   ) {
++    if (this.hasAttribute("zen-newtab")) {
++      return;
++    }
++
+     // We only need to update the searchModeUI on tab switch conditionally
+     // as we only persist searchMode with ScotchBonnet enabled.
+     if (
+@@ -1087,7 +1098,11 @@ export class UrlbarInput {
+     }
+ 
+     if (!result.payload.providesSearchMode) {
+-      this.view.close({ elementPicked: true });
++      if (this._zenHandleUrlbarClose) {
++        this._zenHandleUrlbarClose(true);
++      } else {
++        this.view.close({ elementPicked: true });
++      }
+     }
+ 
+     this.controller.recordSelectedResult(event, result);
+@@ -2144,6 +2159,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -28,7 +52,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c5
      // 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")) {
-@@ -2163,6 +2175,10 @@ export class UrlbarInput {
+@@ -2163,6 +2183,10 @@ export class UrlbarInput {
        return;
      }
  
@@ -39,7 +63,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c5
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -3305,7 +3321,7 @@ export class UrlbarInput {
+@@ -3305,7 +3329,7 @@ export class UrlbarInput {
      } else {
        where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
      }
@@ -48,7 +72,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c5
        if (where == "current") {
          where = "tab";
        } else if (where == "tab") {
-@@ -3859,6 +3875,11 @@ export class UrlbarInput {
+@@ -3859,6 +3883,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -60,7 +84,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c5
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -3930,7 +3951,7 @@ export class UrlbarInput {
+@@ -3930,7 +3959,7 @@ export class UrlbarInput {
        }
      }
  
@@ -69,7 +93,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c5
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -3970,9 +3991,12 @@ export class UrlbarInput {
+@@ -3970,9 +3999,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -83,7 +107,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3053415e9df106c5d811e9fd597c05c5
  
          if (
            event.target != this.inputField &&
-@@ -3982,8 +4006,8 @@ export class UrlbarInput {
+@@ -3982,8 +4014,8 @@ export class UrlbarInput {
            break;
          }
  
diff --git a/src/browser/themes/shared/urlbar-searchbar-css.patch b/src/browser/themes/shared/urlbar-searchbar-css.patch
new file mode 100644
index 000000000..e270338e9
--- /dev/null
+++ b/src/browser/themes/shared/urlbar-searchbar-css.patch
@@ -0,0 +1,15 @@
+diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
+index 45aa61f93d354da432eceb1c276466609a6910d0..6585158b855af19689e86ef6a833f63736ec225c 100644
+--- a/browser/themes/shared/urlbar-searchbar.css
++++ b/browser/themes/shared/urlbar-searchbar.css
+@@ -291,7 +291,9 @@
+ }
+ 
+ #urlbar[breakout][breakout-extend] {
+-  margin-left: calc(-1 * var(--urlbar-margin-inline));
++  :root:not([zen-single-toolbar='true']) {
++    margin-left: calc(-1 * var(--urlbar-margin-inline));
++  }
+   width: calc(var(--urlbar-width) + 2 * var(--urlbar-margin-inline));
+ 
+   > .urlbar-input-container {

From 24d8e7a5d75bd21e3beca870fced8eb4f581fe58 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 21:20:29 +0100
Subject: [PATCH 048/191] Replace pnpm with npm in workflows and scripts for
 consistency across the project

---
 .github/workflows/build.yml                   | 51 +++++--------------
 .github/workflows/code-linter.yml             |  7 +--
 .github/workflows/linux-release-build.yml     | 19 ++-----
 .github/workflows/macos-release-build.yml     | 19 ++-----
 .../macos-universal-release-build.yml         | 21 +++-----
 .github/workflows/pr-test.yml                 |  5 +-
 .github/workflows/src/release-build.sh        |  4 +-
 .github/workflows/windows-profile-build.yml   |  9 ++--
 .github/workflows/windows-release-build.yml   | 18 +++----
 build/winsign/sign.ps1                        |  4 +-
 package.json                                  |  3 +-
 scripts/update_ff.py                          |  6 +--
 12 files changed, 50 insertions(+), 116 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e87ae48f..48bea4387 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -142,18 +142,9 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
         run: |
-          pnpm install
+          npm install
 
       - name: Setup Surfer
         run: |
@@ -162,12 +153,12 @@ jobs:
       - name: Bump version
         if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
         run: |
-          pnpm surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
+          npm run surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
 
       - name: Bump version without new version
         if: ${{ !inputs.update_version || inputs.update_branch == 'twilight' }}
         run: |
-          pnpm surfer ci --brand ${{ inputs.update_branch }}
+          npm run surfer ci --brand ${{ inputs.update_branch }}
 
       - name: Debug
         run: |
@@ -211,18 +202,9 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
         run: |
-          pnpm install
+          npm install
 
       - name: Setup Surfer
         run: |
@@ -231,14 +213,14 @@ jobs:
       - name: Activate Surfer CLI
         run: |
           echo "There's a bug in the Surfer CLI, we run this so that Surfer sets everything up correctly"
-          pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+          npm run surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
       - name: Check version
         run: |
           echo "$(pwd)"
           ls .
-          echo "version=$(pnpm surfer get version | xargs)" >> $GITHUB_OUTPUT
-          if [[ $(pnpm surfer get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
+          echo "version=$(npm run surfer get version | xargs)" >> $GITHUB_OUTPUT
+          if [[ $(npm run surfer get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
             echo ">>> Version matches"
           else
             echo ">>> Version mismatch"
@@ -268,27 +250,18 @@ jobs:
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
         run: |
-          pnpm install
+          npm install
 
       - name: Load Surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+        run: npm run surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
       - name: Download Firefox source and dependencies
-        run: pnpm surfer download --verbose
+        run: npm run download --verbose
 
       - name: Import
-        run: pnpm surfer import --verbose
+        run: npm run import -- --verbose
 
       - name: Compress
         run: |
@@ -400,7 +373,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          npm install -g pnpm
+          npm install
           sudo apt-get update
           sudo apt-get -y install libfuse2 desktop-file-utils appstream
 
diff --git a/.github/workflows/code-linter.yml b/.github/workflows/code-linter.yml
index 9928b2cfb..d9cd6db7c 100644
--- a/.github/workflows/code-linter.yml
+++ b/.github/workflows/code-linter.yml
@@ -27,11 +27,8 @@ jobs:
       - name: Setup autopep8
         run: sudo apt install python3-autopep8
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
       - name: Install dependencies
-        run: pnpm install
+        run: npm install
 
       - name: Lint
-        run: pnpm lint
+        run: npm run lint
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index ab28b19b8..4cdd20a43 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -81,24 +81,15 @@ jobs:
           path: /home/runner/.cache/sccache
           key: ${{ runner.os }}-sccache
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
         run: |
-          pnpm install
+          npm install
 
       - name: Load Surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox source and dependencies
-        run: pnpm surfer download
+        run: npm run download
 
       - name: Fix Rust version
         run: |
@@ -115,7 +106,7 @@ jobs:
       - name: Import
         env:
           SURFER_COMPAT: ${{ matrix.arch }}
-        run: pnpm surfer import
+        run: npm run import
 
       - name: Build language packs
         run: sh scripts/download-language-packs.sh
@@ -146,7 +137,7 @@ jobs:
         run: |
           export SURFER_PLATFORM="linux"
           export ZEN_RELEASE=1
-          pnpm package
+          npm run package
 
       - name: Rename artifacts
         run: |
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index a5a143217..4ea13678a 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -81,24 +81,15 @@ jobs:
           echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
           source ~/.bash_profile
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
         run: |
-          pnpm install
+          npm install
 
       - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox source and dependencies
-        run: pnpm surfer download
+        run: npm run download
 
       - name: Bootstrap
         run: |
@@ -111,7 +102,7 @@ jobs:
       - name: Import
         env:
           SURFER_COMPAT: ${{ matrix.arch }}
-        run: pnpm surfer import --verbose
+        run: npm run import -- --verbose
 
       - name: Build language packs
         run: sh scripts/download-language-packs.sh
@@ -134,7 +125,7 @@ jobs:
         run: |
           export SURFER_PLATFORM="darwin"
           export ZEN_RELEASE=1
-          pnpm package
+          npm run package
 
       - name: Rename artifacts
         run: |
diff --git a/.github/workflows/macos-universal-release-build.yml b/.github/workflows/macos-universal-release-build.yml
index 69a380992..2c7669783 100644
--- a/.github/workflows/macos-universal-release-build.yml
+++ b/.github/workflows/macos-universal-release-build.yml
@@ -68,24 +68,15 @@ jobs:
           echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
           source ~/.bash_profile
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
         run: |
-          pnpm install
+          npm install
 
       - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox source and dependencies
-        run: pnpm surfer download
+        run: npm run download
 
       - name: Bootstrap
         run: |
@@ -96,13 +87,13 @@ jobs:
           cd ..
 
       - name: Import
-        run: pnpm surfer import
+        run: npm run import
 
       - name: Populate mozconfig
         env:
           SURFER_MOZCONFIG_ONLY: true
         run: |
-          pnpm build
+          npm run build
           cd engine
           ./mach configure
 
@@ -252,7 +243,7 @@ jobs:
           export MAR=$(pwd)/zen-macos-host-mar
           chmod +x $MAR
           echo "MAR=$MAR"
-          pnpm package --verbose
+          npm run package -- --verbose
           mv ./dist/output.mar ./macos.mar
 
       - name: Upload build artifact (.mar)
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 385cb2fb4..2d18f0dcc 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -19,14 +19,11 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
       - name: Install Surfer
         run: npm i -g @zen-browser/surfer
 
       - name: Install dependencies
-        run: pnpm install
+        run: npm install
 
       - name: Download Firefox and dependencies
         run: surfer download
diff --git a/.github/workflows/src/release-build.sh b/.github/workflows/src/release-build.sh
index 29f1f4d32..be7119a2d 100644
--- a/.github/workflows/src/release-build.sh
+++ b/.github/workflows/src/release-build.sh
@@ -17,12 +17,12 @@ if command -v Xvfb &> /dev/null; then
     export DISPLAY=:2
   fi
   export ZEN_RELEASE=1
-  pnpm build
+  npm run build
 else
   echo "Xvfb could not be found, running without it"
   echo "ASSUMING YOU ARE RUNNING THIS ON MACOS"
 
   set -v
   export ZEN_RELEASE=1
-  pnpm build
+  npm run build
 fi
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 97a18017c..26188a930 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -41,14 +41,11 @@ jobs:
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
       - name: Install Surfer
         run: npm i -g @zen-browser/surfer
 
       - name: Load Surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download artifact
         if: ${{ matrix.arch == 'x86_64' }}
@@ -74,13 +71,13 @@ jobs:
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
           git config --global core.safecrlf false
-          pnpm surfer download
+          npm run download
 
       - name: Import patches
         if: ${{ matrix.arch == 'x86_64' }}
         env:
           SURFER_NO_BRANDING_PATCH: true
-        run: pnpm surfer import
+        run: npm run import
 
       - name: Generate
         if: ${{ matrix.arch == 'x86_64' }}
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 799db21f9..6e5b0552f 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -52,9 +52,6 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Setup pnpm
-        run: npm install -g pnpm
-
       - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
@@ -62,16 +59,16 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pnpm install
+          npm install
           sudo apt-get update
           sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm --fix-missing
 
       - name: Load Surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox and dependencies
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
-        run: pnpm surfer download
+        run: npm run download
 
       - name: win-cross Cache
         env:
@@ -152,9 +149,8 @@ jobs:
           cd engine/
           chmod -R +x "$(echo ~)/win-cross/vs2022" || true
           cd ..
-          npm install -g pnpm
           export SURFER_PLATFORM="win32"
-          pnpm surfer bootstrap
+          npm run bootstrap
           cd engine/
           ls ~/.mozbuild/clang/lib/clang/
           echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
@@ -185,7 +181,7 @@ jobs:
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         env:
           SURFER_COMPAT: ${{ matrix.arch }}
-        run: pnpm surfer import --verbose
+        run: npm run import -- --verbose
 
       - name: Build language packs
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
@@ -235,8 +231,8 @@ jobs:
           export SURFER_PLATFORM="win32"
           export ZEN_CROSS_COMPILING=1
           export ZEN_RELEASE=1
-          pnpm package
-          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
+          npm run package
+          mv ./dist/zen-$(npm run surfer get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
           ls .
 
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index 89e7b6514..fed262182 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -29,7 +29,7 @@ echo "Downloaded x86_64 artifacts"
 
 mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
 
-pnpm surfer ci --brand release
+npm run surfer ci --brand release
 
 function SignAndPackage($name) {
     echo "Executing on $name"
@@ -53,7 +53,7 @@ function SignAndPackage($name) {
     }
 
     echo "Compat Mode? $env:SURFER_COMPAT"
-    pnpm surfer package --verbose
+    npm run surfer package --verbose
 
     # In the release script, we do the following:
     #  tar -xvf .github/workflows/object/windows-x64-signed-x86_64.tar.gz -C windows-x64-signed-x86_64
diff --git a/package.json b/package.json
index 613cc3d61..807440b18 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,8 @@
     "pretty": "prettier . --write && autopep8 -r --in-place scripts/ src/",
     "lint": "npx prettier . --check && autopep8 --diff scripts/ src/",
     "prepare": "husky",
-    "reset-ff": "surfer reset"
+    "reset-ff": "surfer reset",
+    "surfer": "surfer"
   },
   "repository": {
     "type": "git",
diff --git a/scripts/update_ff.py b/scripts/update_ff.py
index cc1b0a89d..18798ecbd 100644
--- a/scripts/update_ff.py
+++ b/scripts/update_ff.py
@@ -18,8 +18,8 @@ def update_rc(last_version: str):
     with open("surfer.json", "w") as f:
       data["version"]["candidate"] = rc_version
       json.dump(data, f, indent=2)
-    print("Download the new engine by running 'pnpm download'.")
-    os.system("pnpm download")
+    print("Download the new engine by running 'npm run download'.")
+    os.system("npm run download")
   else:
     print("No new Firefox RC version available.")
 
@@ -28,7 +28,7 @@ def update_ff(is_rc: bool = False, last_version: str = ""):
   """Runs the npm command to update the 'ff' component."""
   if is_rc:
     return update_rc(last_version)
-  result = os.system("pnpm update-ff:raw")
+  result = os.system("npm run update-ff:raw")
   if result != 0:
     raise RuntimeError("Failed to update 'ff' component.")
 

From b1b83ae32a8380a15d8deacdb00d9d9f64c10b84 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 21:24:05 +0100
Subject: [PATCH 049/191] Refactor Surfer CI commands in workflows for
 consistency and improved readability

---
 .github/workflows/build.yml                         | 8 ++++----
 .github/workflows/linux-release-build.yml           | 2 +-
 .github/workflows/macos-release-build.yml           | 2 +-
 .github/workflows/macos-universal-release-build.yml | 2 +-
 .github/workflows/windows-profile-build.yml         | 2 +-
 .github/workflows/windows-release-build.yml         | 2 +-
 build/winsign/sign.ps1                              | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48bea4387..e17590993 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -153,12 +153,12 @@ jobs:
       - name: Bump version
         if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
         run: |
-          npm run surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
+          npm run surfer -- ci --brand ${{ inputs.update_branch }} --bump prerelease
 
       - name: Bump version without new version
         if: ${{ !inputs.update_version || inputs.update_branch == 'twilight' }}
         run: |
-          npm run surfer ci --brand ${{ inputs.update_branch }}
+          npm run surfer -- ci --brand ${{ inputs.update_branch }}
 
       - name: Debug
         run: |
@@ -213,7 +213,7 @@ jobs:
       - name: Activate Surfer CLI
         run: |
           echo "There's a bug in the Surfer CLI, we run this so that Surfer sets everything up correctly"
-          npm run surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+          npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
       - name: Check version
         run: |
@@ -255,7 +255,7 @@ jobs:
           npm install
 
       - name: Load Surfer CI setup
-        run: npm run surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+        run: npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
       - name: Download Firefox source and dependencies
         run: npm run download --verbose
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 4cdd20a43..2b18b6976 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -86,7 +86,7 @@ jobs:
           npm install
 
       - name: Load Surfer CI setup
-        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox source and dependencies
         run: npm run download
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 4ea13678a..b3f5c51c0 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -86,7 +86,7 @@ jobs:
           npm install
 
       - name: Load surfer CI setup
-        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox source and dependencies
         run: npm run download
diff --git a/.github/workflows/macos-universal-release-build.yml b/.github/workflows/macos-universal-release-build.yml
index 2c7669783..a940d2714 100644
--- a/.github/workflows/macos-universal-release-build.yml
+++ b/.github/workflows/macos-universal-release-build.yml
@@ -73,7 +73,7 @@ jobs:
           npm install
 
       - name: Load surfer CI setup
-        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox source and dependencies
         run: npm run download
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 26188a930..4076fcec3 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -45,7 +45,7 @@ jobs:
         run: npm i -g @zen-browser/surfer
 
       - name: Load Surfer CI setup
-        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download artifact
         if: ${{ matrix.arch == 'x86_64' }}
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 6e5b0552f..a9e59ecbf 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -64,7 +64,7 @@ jobs:
           sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm --fix-missing
 
       - name: Load Surfer CI setup
-        run: npm run surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
       - name: Download Firefox and dependencies
         if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index fed262182..09600ff68 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -29,7 +29,7 @@ echo "Downloaded x86_64 artifacts"
 
 mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
 
-npm run surfer ci --brand release
+npm run surfer -- ci --brand release
 
 function SignAndPackage($name) {
     echo "Executing on $name"

From 42dbff273f882a642e377d771f8744fc2ab4e3c6 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 21:27:38 +0100
Subject: [PATCH 050/191] Refactor npm commands in workflows for consistency
 and improved clarity

---
 .github/workflows/build.yml                 | 4 ++--
 .github/workflows/windows-release-build.yml | 2 +-
 build/winsign/sign.ps1                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e17590993..7f3d5ba22 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -219,8 +219,8 @@ jobs:
         run: |
           echo "$(pwd)"
           ls .
-          echo "version=$(npm run surfer get version | xargs)" >> $GITHUB_OUTPUT
-          if [[ $(npm run surfer get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
+          echo "version=$(npm run surfer -- get version | xargs)" >> $GITHUB_OUTPUT
+          if [[ $(npm run surfer -- get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
             echo ">>> Version matches"
           else
             echo ">>> Version mismatch"
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index a9e59ecbf..f1fa7c098 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -232,7 +232,7 @@ jobs:
           export ZEN_CROSS_COMPILING=1
           export ZEN_RELEASE=1
           npm run package
-          mv ./dist/zen-$(npm run surfer get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
+          mv ./dist/zen-$(npm run surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
           ls .
 
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index 09600ff68..c5cba97c5 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -53,7 +53,7 @@ function SignAndPackage($name) {
     }
 
     echo "Compat Mode? $env:SURFER_COMPAT"
-    npm run surfer package --verbose
+    npm run package -- --verbose
 
     # In the release script, we do the following:
     #  tar -xvf .github/workflows/object/windows-x64-signed-x86_64.tar.gz -C windows-x64-signed-x86_64

From 846b24603ee33c00fc9fd0a1afe51313102d0623 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 21:39:04 +0100
Subject: [PATCH 051/191] Refactor npm commands in workflows for consistency
 and improved clarity

---
 .github/workflows/build.yml                 | 7 +++----
 .github/workflows/windows-release-build.yml | 2 +-
 surfer.json                                 | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f3d5ba22..c3410366a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -212,15 +212,14 @@ jobs:
 
       - name: Activate Surfer CLI
         run: |
-          echo "There's a bug in the Surfer CLI, we run this so that Surfer sets everything up correctly"
           npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
       - name: Check version
         run: |
           echo "$(pwd)"
-          ls .
-          echo "version=$(npm run surfer -- get version | xargs)" >> $GITHUB_OUTPUT
-          if [[ $(npm run surfer -- get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
+          echo $(npm run --silent surfer -- get version | xargs)
+          echo "version=$(npm run --silent surfer -- get version | xargs)" >> $GITHUB_OUTPUT
+          if [[ $(npm run --silent surfer -- get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
             echo ">>> Version matches"
           else
             echo ">>> Version mismatch"
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index f1fa7c098..ff49f48f3 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -232,7 +232,7 @@ jobs:
           export ZEN_CROSS_COMPILING=1
           export ZEN_RELEASE=1
           npm run package
-          mv ./dist/zen-$(npm run surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
+          mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
           ls .
 
diff --git a/surfer.json b/surfer.json
index db7cd7020..2dccdf43e 100644
--- a/surfer.json
+++ b/surfer.json
@@ -39,7 +39,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.7.4t",
+        "displayVersion": "1.7.2t",
         "github": {
           "repo": "zen-browser/desktop"
         }

From 7758b14f26c85048eb3d47804db023bec07290e1 Mon Sep 17 00:00:00 2001
From: EmilyxFox <48589793+EmilyxFox@users.noreply.github.com>
Date: Mon, 3 Feb 2025 22:05:47 +0100
Subject: [PATCH 052/191] removed copy all in split view feature. it needs more
 work

---
 .../base/zen-components/ZenCommonUtils.mjs    | 54 ++++++-------------
 .../base/zen-components/ZenViewSplitter.mjs   |  9 ----
 2 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index dfba3db1c..c0252eb7b 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -60,23 +60,10 @@ class ZenPreloadedFeature {
 
 var gZenCommonActions = {
   copyCurrentURLToClipboard() {
-    let urlStringToCopy = "";
-    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-current-url.copy-all-in-split-view', false)) {
-      const currentTabs = gZenViewSplitter.getTabsInCurrentView();
-      if (currentTabs) {
-        const stringArray = currentTabs.map(t => `${t.linkedBrowser.currentURI.spec}`);
-        urlStringToCopy = stringArray.join("\n");
-      }
-    } else {
-      const currentUrl = gBrowser.currentURI.spec;
-      if (currentUrl) {
-
-        urlStringToCopy = `${currentUrl}`
-      }
-    }
-    if (urlStringToCopy) {
+    const currentUrl = gBrowser.currentURI.spec;
+    if (currentUrl) {
       let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-      str.data = urlStringToCopy;
+      str.data = currentUrl;
       let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
       transferable.init(getLoadContext());
       transferable.addDataFlavor('text/plain');
@@ -86,29 +73,18 @@ var gZenCommonActions = {
     }
   },
   CopyCurrentURLAsMarkdownToClipboard() {
-    let markdownString = "";
-    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.copy-current-url-as-markdown.copy-all-in-split-view', false)) {
-      const currentTabs = gZenViewSplitter.getTabsInCurrentView();
-      if (currentTabs) {
-        const stringArray = currentTabs.map(t => `[${t.label}](${t.linkedBrowser.currentURI.spec})`);
-        markdownString = stringArray.join("\n");
-      }
-    } else {
-      const currentUrl = gBrowser.currentURI.spec;
-      const tabTitle = gBrowser.selectedTab.label;
-      if (currentUrl && tabTitle) {
-        markdownString = `[${tabTitle}](${currentUrl})`;
-      }
-    }
-    if (markdownString) {
-      let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-      str.data = markdownString;
-      let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
-      transferable.init(getLoadContext());
-      transferable.addDataFlavor('text/plain');
-      transferable.setTransferData('text/plain', str);
-      Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-      ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+    const currentUrl = gBrowser.currentURI.spec;
+    const tabTitle = gBrowser.selectedTab.label;
+    if (currentUrl && tabTitle) {
+        const markdownLink = `[${tabTitle}](${currentUrl})`;
+        let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
+        str.data = markdownLink;
+        let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
+        transferable.init(getLoadContext());
+        transferable.addDataFlavor('text/plain');
+        transferable.setTransferData('text/plain', str);
+        Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
+        ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
     }
   },
 
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index ef3e75a2f..fb715e2a5 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -1136,15 +1136,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       : [gBrowser.selectedTab, tabs[nextTabIndex]];
     this.splitTabs(selected_tabs, gridType);
   }
-
-  /**
-   * Gets all the tabs in the current view.
-   * @returns {Tab[]} The tabs in the current view.
-   */
-  getTabsInCurrentView() {
-    if (this.currentView < 0) return [gBrowser.selectedTab];
-    return this._data[this.currentView].tabs;
-  }
 }
 
 window.gZenViewSplitter = new ZenViewSplitter();

From feda757c81d6997ab0eba228fa00083338054000 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 3 Feb 2025 23:44:29 +0100
Subject: [PATCH 053/191] Rename CopyCurrentURLAsMarkdownToClipboard method to
 follow camelCase convention

---
 l10n                                          |  2 +-
 .../base/zen-components/ZenCommonUtils.mjs    | 20 +++++++++----------
 .../zen-components/ZenKeyboardShortcuts.mjs   |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/l10n b/l10n
index 98c54b87d..57853cc9e 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 98c54b87df6b7ef1fe1747ca317ed0e4d4037fbc
+Subproject commit 57853cc9e10eecf7f8f2101947bae2460f0bf088
diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index c0252eb7b..701363e36 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -72,19 +72,19 @@ var gZenCommonActions = {
       ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
     }
   },
-  CopyCurrentURLAsMarkdownToClipboard() {
+  copyCurrentURLAsMarkdownToClipboard() {
     const currentUrl = gBrowser.currentURI.spec;
     const tabTitle = gBrowser.selectedTab.label;
     if (currentUrl && tabTitle) {
-        const markdownLink = `[${tabTitle}](${currentUrl})`;
-        let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
-        str.data = markdownLink;
-        let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
-        transferable.init(getLoadContext());
-        transferable.addDataFlavor('text/plain');
-        transferable.setTransferData('text/plain', str);
-        Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-        ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+      const markdownLink = `[${tabTitle}](${currentUrl})`;
+      let str = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
+      str.data = markdownLink;
+      let transferable = Cc['@mozilla.org/widget/transferable;1'].createInstance(Ci.nsITransferable);
+      transferable.init(getLoadContext());
+      transferable.addDataFlavor('text/plain');
+      transferable.setTransferData('text/plain', str);
+      Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
+      ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
     }
   },
 
diff --git a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
index 8cd251b42..342c5d68c 100644
--- a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
+++ b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
@@ -918,10 +918,10 @@ class ZenKeyboardShortcutsVersioner {
           '',
           ZEN_OTHER_SHORTCUTS_GROUP,
           KeyShortcutModifiers.fromObject({ accel: true, shift: true, alt: true }),
-          'code:gZenCommonActions.CopyCurrentURLAsMarkdownToClipboard()',
+          'code:gZenCommonActions.copyCurrentURLAsMarkdownToClipboard()',
           'zen-text-action-copy-url-markdown-shortcut'
         )
-      )
+      );
     }
     return data;
   }

From f0f58844b81a4eb70eb5e542bcadd3553bf387ba Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 4 Feb 2025 00:15:42 +0100
Subject: [PATCH 054/191] Refactor CSS for tab browser to improve styling
 consistency and fix layout issues

---
 .../themes/shared/tabbrowser/tabs-css.patch   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index f7e43dddb..75654580a 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index e5adf8c853bc6f92d1f5aae6398bb979a114b4fd..8d0783f8a23fabdfe90e5b9136e16a962b35dd5e 100644
+index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026ad23e9c7 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
    --tab-icon-overlay-fill: light-dark(white, black);
    --tab-icon-overlay-stroke: light-dark(black, white);
    --tab-label-line-height: 1.7;
@@ -11,7 +11,7 @@ index e5adf8c853bc6f92d1f5aae6398bb979a114b4fd..8d0783f8a23fabdfe90e5b9136e16a96
    --tab-hover-background-color: color-mix(in srgb, currentColor 11%, transparent);
    --tab-selected-textcolor: var(--toolbar-color);
    --tab-selected-bgcolor: var(--toolbar-bgcolor);
-@@ -205,8 +205,7 @@
+@@ -207,8 +207,7 @@
    }
  
    #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > &[pinned] {
@@ -21,7 +21,7 @@ index e5adf8c853bc6f92d1f5aae6398bb979a114b4fd..8d0783f8a23fabdfe90e5b9136e16a96
    }
  
    #tabbrowser-tabs[movingtab] &:is([selected], [multiselected]) {
-@@ -250,6 +249,7 @@
+@@ -252,6 +251,7 @@
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -29,7 +29,16 @@ index e5adf8c853bc6f92d1f5aae6398bb979a114b4fd..8d0783f8a23fabdfe90e5b9136e16a96
  
      &::before {
        position: absolute;
-@@ -573,14 +573,14 @@
+@@ -511,7 +511,7 @@
+       background-repeat: no-repeat;
+       border-radius: 10px;
+       -moz-context-properties: fill;
+-      fill: var(--tab-icon-overlay-fill);
++      filter: invert(1);
+     }
+   }
+ 
+@@ -569,14 +569,14 @@
    }
  
    &[textoverflow] {
@@ -48,7 +57,7 @@ index e5adf8c853bc6f92d1f5aae6398bb979a114b4fd..8d0783f8a23fabdfe90e5b9136e16a96
        direction: rtl;
        mask-image: linear-gradient(to right, transparent, black var(--tab-label-mask-size));
      }
-@@ -1069,7 +1069,7 @@ tab-group {
+@@ -1146,7 +1146,7 @@
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -57,7 +66,7 @@ index e5adf8c853bc6f92d1f5aae6398bb979a114b4fd..8d0783f8a23fabdfe90e5b9136e16a96
    }
  
    &:hover {
-@@ -1283,7 +1283,7 @@ tab-group {
+@@ -1347,7 +1347,7 @@
    toolbarbutton:not(#firefox-view-button),
    toolbarpaletteitem:not(#wrapper-firefox-view-button)
  ) ~ #tabbrowser-tabs {
@@ -66,7 +75,7 @@ index e5adf8c853bc6f92d1f5aae6398bb979a114b4fd..8d0783f8a23fabdfe90e5b9136e16a96
    padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
    margin-inline-start: 2px;
  }
-@@ -1318,7 +1318,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -1381,7 +1381,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

From 9d2192def11de90bd44c25d4356c08706de7f708 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 4 Feb 2025 00:18:28 +0100
Subject: [PATCH 055/191] Simplify hover background color for vertical tabs in
 CSS

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

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 1490e8042..2210e7609 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -995,7 +995,7 @@
   }
 
   &:hover .tab-background {
-    background: color-mix(in srgb, var(--zen-toolbar-element-bg) 50%, var(--tab-selected-bgcolor) 50%);
+    background: var(--tab-selected-bgcolor);
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {

From 5fba4cf081aa95b92ad738a3a61d98383c695c60 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 4 Feb 2025 11:11:20 +0100
Subject: [PATCH 056/191] Fixed common issues

---
 src/browser/app/profile/zen-browser.js        |  2 +-
 .../zen-styles/zen-tabs/vertical-tabs.css     |  2 +-
 .../content/zen-styles/zen-workspaces.css     | 14 ++-------
 .../base/zen-components/ZenTabUnloader.mjs    |  3 +-
 .../themes/shared/tabbrowser/tabs-css.patch   | 30 ++++++++++++++-----
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 2dd676cc9..e3a7c7e7c 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -100,7 +100,7 @@ pref('zen.injections.match-urls', 'http://localhost/*', locked);
 pref('zen.rice.share.notice.accepted', false);
 
 #ifdef XP_MACOSX
-pref('zen.theme.border-radius', 12); // In pixels
+pref('zen.theme.border-radius', 10); // In pixels
 #else
 #ifdef XP_WIN
 pref('zen.theme.border-radius', 12); // In pixels
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 2210e7609..94abd50a3 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -361,7 +361,7 @@
   align-items: center;
 
   padding-top: var(--zen-element-separation);
-  --toolbarbutton-inner-padding: 4px;
+  --toolbarbutton-inner-padding: 5px;
 
   & > toolbarbutton:not(#zen-workspaces-button) {
     padding: 0 !important;
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 963255594..a88c6a2aa 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -141,14 +141,6 @@
 
   & #zen-workspaces-button .zen-workspace-sidebar-icon {
     margin-inline-end: 5px;
-
-    & [no-icon='true'] {
-      display: none;
-    }
-  }
-
-  & #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon='true'] + .zen-workspace-sidebar-name {
-    margin-left: 0;
   }
 
   & #zen-workspaces-button {
@@ -431,8 +423,8 @@
   min-height: 1px !important;
   padding: 3px;
   border-radius: 4px;
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
 }
 
 #PanelUI-zen-workspaces-create-footer,
@@ -477,7 +469,7 @@
   &:hover,
   &[open='true'] {
     &::before {
-      background: var(--zen-toolbar-element-bg);
+      background: var(--tab-hover-background-color);
     }
   }
 
diff --git a/src/browser/base/zen-components/ZenTabUnloader.mjs b/src/browser/base/zen-components/ZenTabUnloader.mjs
index 4f135842c..e14b606ab 100644
--- a/src/browser/base/zen-components/ZenTabUnloader.mjs
+++ b/src/browser/base/zen-components/ZenTabUnloader.mjs
@@ -226,7 +226,7 @@
     unloadTab() {
       const tabs = TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
       for (let i = 0; i < tabs.length; i++) {
-        if (this.canUnloadTab(tabs[i], Date.now(), [], true)) {
+        if (this.canUnloadTab(tabs[i], Date.now(), this.intervalUnloader.excludedUrls, true)) {
           this.unload(tabs[i]);
         }
       }
@@ -258,6 +258,7 @@
         !tab.linkedPanel ||
         tab.splitView ||
         tab.attention ||
+        tab.hasAttribute('glance-id') ||
         tab.linkedBrowser?.zenModeActive ||
         (tab.pictureinpicture && !ignoreTimestamp) ||
         (tab.soundPlaying && !ignoreTimestamp) ||
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index 75654580a..1b399a29e 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026ad23e9c7 100644
+index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b587f1428 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -33,7 +33,7 @@
@@ -21,7 +21,15 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
    }
  
    #tabbrowser-tabs[movingtab] &:is([selected], [multiselected]) {
-@@ -252,6 +251,7 @@
+@@ -238,7 +237,6 @@
+   }
+ 
+   :root:not([uidensity=compact]) &[pinned] {
+-    padding: 0 10px;
+   }
+ 
+   &:is([selected], [multiselected]) {
+@@ -252,6 +250,7 @@
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -29,7 +37,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
  
      &::before {
        position: absolute;
-@@ -511,7 +511,7 @@
+@@ -511,7 +510,7 @@
        background-repeat: no-repeat;
        border-radius: 10px;
        -moz-context-properties: fill;
@@ -38,7 +46,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
      }
    }
  
-@@ -569,14 +569,14 @@
+@@ -569,14 +568,14 @@
    }
  
    &[textoverflow] {
@@ -57,7 +65,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
        direction: rtl;
        mask-image: linear-gradient(to right, transparent, black var(--tab-label-mask-size));
      }
-@@ -1146,7 +1146,7 @@
+@@ -1146,7 +1145,7 @@
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -66,7 +74,15 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
    }
  
    &:hover {
-@@ -1347,7 +1347,7 @@
+@@ -1194,7 +1193,6 @@
+ }
+ 
+ #vertical-pinned-tabs-container {
+-  --tab-inline-padding: calc((calc(var(--tab-collapsed-background-width) + 2 * var(--tab-pinned-margin-inline-expanded) - var(--icon-size-default)) / 2));
+   display: none;
+   grid-template-columns: repeat(auto-fit, minmax(var(--tab-pinned-min-width-expanded), auto));
+   overflow-y: auto;
+@@ -1347,7 +1345,7 @@
    toolbarbutton:not(#firefox-view-button),
    toolbarpaletteitem:not(#wrapper-firefox-view-button)
  ) ~ #tabbrowser-tabs {
@@ -75,7 +91,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9232b0b8404268fb587f4787621f1026
    padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
    margin-inline-start: 2px;
  }
-@@ -1381,7 +1381,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -1381,7 +1379,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

From ece702ec86498867fecf144ddde4def3897ecaec Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 4 Feb 2025 11:15:37 +0100
Subject: [PATCH 057/191] Fixed twilight version

---
 l10n-last-commit-hash | 0
 scripts/update_ff.py  | 3 +--
 surfer.json           | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 l10n-last-commit-hash

diff --git a/l10n-last-commit-hash b/l10n-last-commit-hash
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/update_ff.py b/scripts/update_ff.py
index 18798ecbd..df61856d5 100644
--- a/scripts/update_ff.py
+++ b/scripts/update_ff.py
@@ -63,8 +63,7 @@ def update_l10n_last_commit_hash():
     os.system(f"git clone {L10N_REPO} l10n-temp")
     if not os.path.exists("firefox-cache"):
       os.mkdir("firefox-cache")
-    with open("l10n-last-commit-hash", "w") as f:
-      os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash")
+    os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash")
   except KeyboardInterrupt:
     print("Exiting...")
   shutil.rmtree("l10n-temp")
diff --git a/surfer.json b/surfer.json
index 2dccdf43e..d84fbed49 100644
--- a/surfer.json
+++ b/surfer.json
@@ -39,7 +39,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.7.2t",
+        "displayVersion": "1.7.5t",
         "github": {
           "repo": "zen-browser/desktop"
         }

From ff0c7070611d4c18a055aad56c5849c67c961708 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 4 Feb 2025 17:04:00 +0100
Subject: [PATCH 058/191] Update Firefox version to 135.0 in README and
 configuration files

---
 README.md                                        | 4 ++--
 firefox-cache/l10n-last-commit-hash              | 2 +-
 src/browser/themes/shared/zen-icons/move-tab.svg | 2 +-
 surfer.json                                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3cbf46c84..8387bb050 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 
 ## 🖥️ Compatibility
 
-Zen is currently built using firefox version `134.0.2`! 🚀
+Zen is currently built using firefox version `135.0`! 🚀
 
 - [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using firefox version `RC 135.0`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
@@ -117,7 +117,7 @@ Some components used by @zen-browser as an attempt to make firefox forks a bette
 
 #### `Run Locally`
 
-In order to download and run zen locally, please follow [these instructions](https://docs.zen-browser.app/contribute/desktop).
+In order to download and run zen locally, please follow [these instructions](https://docs.zen-browser.app/building).
 
 #### `Special Thanks`
 
diff --git a/firefox-cache/l10n-last-commit-hash b/firefox-cache/l10n-last-commit-hash
index dd4812842..3fd61f125 100644
--- a/firefox-cache/l10n-last-commit-hash
+++ b/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-1e9d5c766342b027f104f5071ec8e343abb1088b
+7d861618502fc97ac8da8a1a78ec09b226c55dd5
diff --git a/src/browser/themes/shared/zen-icons/move-tab.svg b/src/browser/themes/shared/zen-icons/move-tab.svg
index a27866f14..dbf923668 100644
--- a/src/browser/themes/shared/zen-icons/move-tab.svg
+++ b/src/browser/themes/shared/zen-icons/move-tab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,16.25v-.5c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v.5"></path><path d="M3.75,11.25c0-.828,.672-1.5,1.5-1.5h7.5c.828,0,1.5,.672,1.5,1.5"></path><polyline points="11.5 4.75 9 7.25 6.5 4.75" data-color="color-2"></polyline><line x1="9" y1="7" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="11.25" y="10.75" width="5" height="5" rx="1.5" ry="1.5" data-color="color-2"></rect><rect x="11.25" y="2.25" width="5" height="5" rx="1.5" ry="1.5"></rect><polyline points="6.75 11.5 9 13.75 6.75 16"></polyline><path d="M9,13.75h-2.5c-2.623,0-4.75-2.127-4.75-4.75h0c0-2.623,2.127-4.75,4.75-4.75h1.75"></path></g></svg>
diff --git a/surfer.json b/surfer.json
index 2dccdf43e..14b1a4bc6 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "134.0.2",
+    "version": "135.0",
     "candidate": "135.0"
   },
   "buildOptions": {

From d9fc1e81cd24f04ea16460e8b56a627b340eda38 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 4 Feb 2025 19:26:04 +0100
Subject: [PATCH 059/191] Implement default keyboard shortcuts filling and
 migration handling

---
 .../base/zen-components/ZenKeyboardShortcuts.mjs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
index 342c5d68c..986dd3d26 100644
--- a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
+++ b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
@@ -810,6 +810,20 @@ class ZenKeyboardShortcutsVersioner {
     return this.migrateIfNeeded(data);
   }
 
+  fillDefaultIfNotPresent(data) {
+    for (let shortcut of ZenKeyboardShortcutsLoader.zenGetDefaultShortcuts()) {
+      // If it has an ID and we dont find it in the data, we add it
+      if (shortcut.getID() && !data.find((s) => s.getID() == shortcut.getID())) {
+        data.push(shortcut);
+      }
+    }
+    return data;
+  }
+
+  fixedKeyboardShortcuts(data) {
+    return this.fillDefaultIfNotPresent(this.migrateIfNeeded(data));
+  }
+
   migrate(data, version) {
     if (version < 1) {
       // Migrate from 0 to 1
@@ -950,7 +964,7 @@ var gZenKeyboardShortcutsManager = {
     if (this.inBrowserView) {
       const loadedShortcuts = await this._loadSaved();
 
-      this._currentShortcutList = this.versioner.migrateIfNeeded(loadedShortcuts);
+      this._currentShortcutList = this.versioner.fixedKeyboardShortcuts(loadedShortcuts);
       this._applyShortcuts();
 
       await this._saveShortcuts();

From 365214d7f95e00e54f9d4d8b377de2fc3b94de05 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 4 Feb 2025 19:59:24 +0100
Subject: [PATCH 060/191] Refine CSS styles for compact mode and glance view,
 improving layout and background colors

---
 .../base/content/zen-styles/zen-compact-mode.css      | 11 ++++-------
 src/browser/base/content/zen-styles/zen-glance.css    |  6 +++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index fa3d4517d..e6ecf3920 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -43,11 +43,9 @@
         z-index: 10;
         transition:
           left 0.25s ease,
-          right 0.25s ease,
-          opacity 1.5s ease;
+          right 0.25s ease;
         top: 0;
         bottom: var(--zen-element-separation);
-        opacity: 0;
         padding: 0 var(--zen-compact-float) !important;
 
         :root[zen-single-toolbar='true'] & {
@@ -59,7 +57,7 @@
         margin-left: 0 !important;
       }
 
-      & #urlbar[open] {
+      & #urlbar[open]:not([zen-floating-urlbar='true']) {
         top: 0 !important;
       }
     }
@@ -121,8 +119,8 @@
     #navigator-toolbox[movingtab],
     #navigator-toolbox:has(.tabbrowser-tab:active),
     #navigator-toolbox:has(
-        *:is([panelopen='true'], [open='true'], #nav-bar:focus-within):not(tab):not(.zen-compact-mode-ignore)
-      ) {
+        *:is([panelopen='true'], [open='true'], #urlbar:not([zen-floating-urlbar='true']):focus-within):not(tab):not(.zen-compact-mode-ignore)
+      ):not(:has(#urlbar[zen-floating-urlbar='true']:hover)) {
       &:not([animate='true']) {
         --zen-compact-mode-func: linear(
           0 0%,
@@ -230,7 +228,6 @@
         transition:
           left 0.3s var(--zen-compact-mode-func),
           right 0.3s var(--zen-compact-mode-func);
-        opacity: 1;
 
         left: -1px;
         :root[zen-right-side='true'] & {
diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index ed02b82d1..4ea37f5db 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -23,12 +23,12 @@
 
   padding: 5px;
   gap: 12px;
-  left: 3%;
+  left: 2%;
 
   & toolbarbutton {
     width: 32px;
     height: 32px;
-    background: light-dark(rgba(0, 0, 0, 0.9), rgba(255, 255, 255, 0.9));
+    background: light-dark(rgb(24, 24, 24), rgb(231, 231, 231));
     transition: background 0.2s ease;
     border-radius: 999px;
     appearance: none;
@@ -36,7 +36,7 @@
     opacity: 0;
 
     &:hover {
-      background: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
+      background: light-dark(rgb(41, 41, 41), rgb(204, 204, 204));
     }
 
     & label {

From 63109b43370829bd2def3bd0a699438b3c5a92ce Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 00:35:38 +0100
Subject: [PATCH 061/191] Enhance compact mode and URL bar behavior with
 improved transitions and offset handling; update version numbers in
 surfer.json

---
 .../content/zen-styles/zen-compact-mode.css   | 13 ++++++--
 .../base/content/zen-styles/zen-urlbar.css    |  6 ++--
 .../base/zen-components/ZenCompactMode.mjs    |  2 +-
 .../components/preferences/zen-settings.js    |  2 ++
 .../tabbrowser/content/tabbrowser-js.patch    | 30 ++++++++++++-------
 surfer.json                                   |  6 ++--
 6 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index e6ecf3920..92d7d3ae4 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -109,6 +109,11 @@
         background-size: 2000px !important; /* Dont ask me why */
         backdrop-filter: blur(5px) !important;
       }
+
+      & #urlbar[open][zen-floating-urlbar='true'] {
+        --zen-urlbar-offset: var(--zen-sidebar-width);
+        transition: left 0.1s ease;
+      }
     }
 
     #navigator-toolbox:hover,
@@ -120,8 +125,8 @@
     #navigator-toolbox:has(.tabbrowser-tab:active),
     #navigator-toolbox:has(
         *:is([panelopen='true'], [open='true'], #urlbar:not([zen-floating-urlbar='true']):focus-within):not(tab):not(.zen-compact-mode-ignore)
-      ):not(:has(#urlbar[zen-floating-urlbar='true']:hover)) {
-      &:not([animate='true']) {
+      ) {
+      &:not([animate='true']):not(:has(#urlbar[zen-floating-urlbar='true']:hover)) {
         --zen-compact-mode-func: linear(
           0 0%,
           0.002748 1%,
@@ -234,6 +239,10 @@
           right: -1px;
           left: auto;
         }
+
+        & #urlbar[open][zen-floating-urlbar='true'] {
+          --zen-urlbar-offset: 0px;
+        }
       }
     }
   }
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 68afccce8..216e43238 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -413,12 +413,14 @@ button.popup-notification-dropmarker {
   font-size: 1.15em !important;
   top: calc(var(--zen-toolbar-height) * 2) !important;
 
+  --zen-urlbar-center: calc(var(--zen-urlbar-offset, 0px) + 28vw);
+
   :root[zen-right-side='true'] & {
-    right: 28vw !important;
+    right: var(--zen-urlbar-center) !important;
   }
 
   :root:not([zen-right-side='true']) & {
-    left: 28vw !important;
+    left: var(--zen-urlbar-center) !important;
   }
 
   #urlbar-container:has(&) {
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 53c039d42..32ef544ce 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -342,7 +342,7 @@ var gZenCompactModeManager = {
           return;
         }
 
-        if (this.hoverableElements[i].keepHoverDuration) {
+        if (this.hoverableElements[i].keepHoverDuration && !event.target.querySelector('#urlbar[zen-floating-urlbar]')) {
           this.flashElement(target, this.hoverableElements[i].keepHoverDuration, 'has-hover' + target.id, 'zen-has-hover');
         } else {
           this._removeHoverFrames[target.id] = window.requestAnimationFrame(() => target.removeAttribute('zen-has-hover'));
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 58c75a627..fe770629f 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -719,6 +719,8 @@ var zenMissingKeyboardShortcutL10n = {
   goHome: 'zen-key-go-home',
   key_redo: 'zen-key-redo',
 
+  key_inspectorMac: 'zen-key-inspector-mac',
+
   // Devtools
   key_toggleToolbox: 'zen-devtools-toggle-shortcut',
   key_browserToolbox: 'zen-devtools-toggle-browser-toolbox-shortcut',
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 2827589cd..56bb251ba 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b9417f545 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b1c975652 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -225,7 +225,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        this.removeTabs(selectedTabs);
      }
  
-@@ -4443,6 +4528,12 @@
+@@ -4427,6 +4512,7 @@
+         skipSessionStore,
+       } = {}
+     ) {
++      gZenUIManager.saveScrollbarState();
+       if (UserInteraction.running("browser.tabs.opening", window)) {
+         UserInteraction.finish("browser.tabs.opening", window);
+       }
+@@ -4443,6 +4529,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -238,7 +246,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4548,9 @@
+@@ -4457,7 +4549,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -249,7 +257,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4564,6 @@
+@@ -4471,7 +4565,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -257,7 +265,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4702,14 @@
+@@ -4610,14 +4703,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -274,7 +282,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5557,10 @@
+@@ -5465,10 +5558,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -287,7 +295,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5727,6 +5819,9 @@
+@@ -5727,6 +5820,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -297,7 +305,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -7443,6 +7538,7 @@
+@@ -7443,6 +7539,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -305,7 +313,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8507,7 @@ var TabContextMenu = {
+@@ -8411,7 +8508,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -314,7 +322,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8540,7 @@ var TabContextMenu = {
+@@ -8444,7 +8541,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -323,7 +331,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..dfc5d5cc1144a0098508a28de4f1433b
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8773,7 @@ var TabContextMenu = {
+@@ -8677,6 +8774,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/surfer.json b/surfer.json
index 5b718b707..ec1373d72 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.7.4b",
+        "displayVersion": "1.7.5b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -39,7 +39,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.7.5t",
+        "displayVersion": "1.7.6t",
         "github": {
           "repo": "zen-browser/desktop"
         }
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}

From 25407369deeb77378062bdf05cd5f1be87562810 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 00:36:45 +0100
Subject: [PATCH 062/191] Update subproject commit reference in l10n

---
 l10n | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n b/l10n
index 57853cc9e..0d64a530f 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 57853cc9e10eecf7f8f2101947bae2460f0bf088
+Subproject commit 0d64a530f4f72ad19e508097a508fc8ef1ad7ede

From c401dfabdc96c2f9a22cdb1879164018d632e1d3 Mon Sep 17 00:00:00 2001
From: Sena Cahya <senacandrampc@gmail.com>
Date: Wed, 5 Feb 2025 08:56:10 +0900
Subject: [PATCH 063/191] Fix workspace swipe gesture does not respect the
 swipe direction

---
 .../base/zen-components/ZenWorkspaces.mjs     | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index e04915f99..2e4eeb992 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -8,7 +8,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   _swipeState = {
     isGestureActive: true,
-    cumulativeDelta: 0,
+    lastDelta: 0,
     direction: null,
   };
   _lastScrollTime = 0;
@@ -207,7 +207,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     element.addEventListener('MozSwipeGestureMayStart', this._handleSwipeMayStart.bind(this), true);
     element.addEventListener('MozSwipeGestureStart', this._handleSwipeStart.bind(this), true);
     element.addEventListener('MozSwipeGestureUpdate', this._handleSwipeUpdate.bind(this), true);
-    element.addEventListener('MozSwipeGestureEnd', this._handleSwipeEnd.bind(this), true);
+
+    // Use MozSwipeGesture instead of MozSwipeGestureEnd because MozSwipeGestureEnd is fired after animation ends,
+    // while MozSwipeGesture is fired immediately after swipe ends.
+    element.addEventListener('MozSwipeGesture', this._handleSwipeEnd.bind(this), true);
   }
 
   _handleSwipeMayStart(event) {
@@ -231,7 +234,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     this._swipeState = {
       isGestureActive: true,
-      cumulativeDelta: 0,
+      lastDelta: 0,
       direction: null,
     };
   }
@@ -242,23 +245,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     event.preventDefault();
     event.stopPropagation();
 
-    // Update cumulative delta
-    this._swipeState.cumulativeDelta += event.delta;
+    const delta = event.delta * 500;
+    this._swipeState.lastDelta = delta;
 
-    // Determine swipe direction based on cumulative delta
-    if (Math.abs(this._swipeState.cumulativeDelta) > 1) {
-      this._swipeState.direction = this._swipeState.cumulativeDelta > 0 ? 'left' : 'right';
+    if (Math.abs(delta) > 1) {
+      this._swipeState.direction = delta > 0 ? 'left' : 'right';
     }
 
     // Apply a translateX to the tab strip to give the user feedback on the swipe
     const stripWidth = document.getElementById('tabbrowser-tabs').scrollWidth;
-    // To make the animation larger, we multiply the delta by 5
-    let translateX = this._swipeState.cumulativeDelta * 10;
-    if (this._swipeState.direction === 'left') {
-      translateX = Math.min(translateX, stripWidth);
-    } else {
-      translateX = Math.max(translateX, -stripWidth);
-    }
+    const translateX = Math.max(-stripWidth, Math.min(delta, stripWidth));
+
     for (const element of this._animateTabsElements) {
       element.style.transform = `translateX(${translateX}px)`;
     }
@@ -282,7 +279,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     // Reset swipe state
     this._swipeState = {
       isGestureActive: false,
-      cumulativeDelta: 0,
+      lastDelta: 0,
       direction: null,
     };
   }

From 0666d18f06882a65c96ebb935c15472df2b233c7 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Wed, 5 Feb 2025 16:41:52 +0800
Subject: [PATCH 064/191] Fixed bug where container-specific essentials don't
 remain focused when switching workspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 2e4eeb992..6d8d867d7 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1338,7 +1338,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const visibleTabs = this._processTabVisibility(window.uuid, containerId, workspaces);
 
     // Second pass: Handle tab selection
-    await this._handleTabSelection(window, onInit, visibleTabs, containerId, workspaces);
+    await this._handleTabSelection(window, onInit, visibleTabs, containerId, workspaces, previousWorkspace.uuid);
 
     // Update UI and state
     await this._updateWorkspaceState(window, onInit);
@@ -1454,9 +1454,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     return tabWorkspaceId === workspaceUuid;
   }
 
-  async _handleTabSelection(window, onInit, visibleTabs, containerId, workspaces) {
+  async _handleTabSelection(window, onInit, visibleTabs, containerId, workspaces, previousWorkspaceId) {
     const currentSelectedTab = gBrowser.selectedTab;
-    const oldWorkspaceId = currentSelectedTab.getAttribute('zen-workspace-id');
+    const oldWorkspaceId = previousWorkspaceId;
     const lastSelectedTab = this._lastSelectedWorkspaceTabs[window.uuid];
 
     // Save current tab as last selected for old workspace if it shouldn't be visible in new workspace

From 23fb79c9a39b290cac722cf242cde5b2a1666adc Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 5 Feb 2025 15:18:45 +0100
Subject: [PATCH 065/191] Fixed twilight common issues

---
 .../components/sidebar/browser-sidebar-js.patch   | 13 +++++++++++++
 .../components/urlbar/UrlbarInput-sys-mjs.patch   | 15 ++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 src/browser/components/sidebar/browser-sidebar-js.patch

diff --git a/src/browser/components/sidebar/browser-sidebar-js.patch b/src/browser/components/sidebar/browser-sidebar-js.patch
new file mode 100644
index 000000000..ef02cb4ce
--- /dev/null
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
+index 1937a01b9940c79782cc2ad002b09ea5938b89e0..0846ab4b3750a556617ff8d4546d9131cda35296 100644
+--- a/browser/components/sidebar/browser-sidebar.js
++++ b/browser/components/sidebar/browser-sidebar.js
+@@ -671,7 +671,7 @@ var SidebarController = {
+    */
+   setPosition() {
+     // First reset all ordinals to match DOM ordering.
+-    let browser = document.getElementById("browser");
++    let browser = document.getElementById("tabbrowser-tabbox");
+     [...browser.children].forEach((node, i) => {
+       node.style.order = i + 1;
+     });
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 5279aa97d..04b772f1d 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..3db8b6c04ec5a1b88dc05d4ff04721cf61913dcc 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a726c67e873 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -52,18 +52,19 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3db8b6c04ec5a1b88dc05d4ff04721cf
      // 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")) {
-@@ -2163,6 +2183,10 @@ export class UrlbarInput {
+@@ -2163,6 +2183,11 @@ export class UrlbarInput {
        return;
      }
  
 +    if (this._zenHandleUrlbarClose) {
 +      this._zenHandleUrlbarClose();
 +    }
++    this.removeAttribute("zen-floating-urlbar");
 +
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -3305,7 +3329,7 @@ export class UrlbarInput {
+@@ -3305,7 +3330,7 @@ export class UrlbarInput {
      } else {
        where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
      }
@@ -72,7 +73,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3db8b6c04ec5a1b88dc05d4ff04721cf
        if (where == "current") {
          where = "tab";
        } else if (where == "tab") {
-@@ -3859,6 +3883,11 @@ export class UrlbarInput {
+@@ -3859,6 +3884,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -84,7 +85,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3db8b6c04ec5a1b88dc05d4ff04721cf
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -3930,7 +3959,7 @@ export class UrlbarInput {
+@@ -3930,7 +3960,7 @@ export class UrlbarInput {
        }
      }
  
@@ -93,7 +94,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3db8b6c04ec5a1b88dc05d4ff04721cf
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -3970,9 +3999,12 @@ export class UrlbarInput {
+@@ -3970,9 +4000,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -107,7 +108,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..3db8b6c04ec5a1b88dc05d4ff04721cf
  
          if (
            event.target != this.inputField &&
-@@ -3982,8 +4014,8 @@ export class UrlbarInput {
+@@ -3982,8 +4015,8 @@ export class UrlbarInput {
            break;
          }
  

From 7b67a08dd6cc9a62806275c6c4cb0d7a06e11788 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Wed, 5 Feb 2025 23:56:20 +0800
Subject: [PATCH 066/191] Rudimentary tab renaming. Does not persist on page
 name change or restart

---
 src/browser/base/content/zen-assets.inc.xhtml |  1 +
 .../base/content/zen-assets.jar.inc.mn        |  1 +
 .../base/zen-components/ZenTabManager.mjs     | 84 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 src/browser/base/zen-components/ZenTabManager.mjs

diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index eefa0a5dd..4ec7bf8f0 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -33,6 +33,7 @@
 <script src="chrome://browser/content/ZenUIManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
+<script src="chrome://browser/content/zen-components/ZenTabManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 69b4c1c56..72cb72b1f 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -15,6 +15,7 @@
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (zen-components/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (zen-components/ZenThemesImporter.mjs)
         content/browser/zen-components/ZenTabUnloader.mjs       (zen-components/ZenTabUnloader.mjs)
+        content/browser/zen-components/ZenTabManager.mjs        (zen-components/ZenTabManager.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs (zen-components/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs  (zen-components/ZenPinnedTabManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs       (zen-components/ZenCommonUtils.mjs)
diff --git a/src/browser/base/zen-components/ZenTabManager.mjs b/src/browser/base/zen-components/ZenTabManager.mjs
new file mode 100644
index 000000000..0a381b6f2
--- /dev/null
+++ b/src/browser/base/zen-components/ZenTabManager.mjs
@@ -0,0 +1,84 @@
+class ZenBrowserTabManager extends ZenDOMOperatedFeature {
+  _tabEdited = null;
+  init() {
+    this._insertItemsIntoTabContextMenu();
+
+  }
+
+  _insertItemsIntoTabContextMenu() {
+    const element = window.MozXULElement.parseXULToFragment(`
+      <menuitem id="context_zen-rename-tab"
+                data-l10n-id="tab-context-zen-rename-tab"
+                oncommand="gZenBrowserTabManager.contextRenameTab();" />
+    `);
+    document.getElementById('context_duplicateTabs').after(element);
+    console.log("akjsdhfjkb")
+  }
+
+  contextRenameTab(event) {
+    this.contextRenameTabStart(event);
+  }
+
+  contextRenameTabKeydown(event) {
+    if (event.key === 'Enter') {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let input = this._tabEdited.querySelector('#tab-label-input');
+      let newName = input.value;
+      this._tabEdited.setAttribute('label', newName);
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    } else if (event.key === "Escape") {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    }
+  }
+  contextRenameTabStart(event) {
+    const label = TabContextMenu.contextTab.querySelector(".tab-label-container")
+    label.style.display = 'none';
+    label.className += ' tab-label-container-editing';
+
+    const container = window.MozXULElement.parseXULToFragment(`
+      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
+    `);
+    label.after(container);
+    const containerHtml = TabContextMenu.contextTab.querySelector('.tab-editor-container');
+    const input = document.createElement('input');
+    input.id = 'tab-label-input';
+    input.value = TabContextMenu.contextTab.label;
+    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.style["white-space"] = "nowrap";
+    input.style["overflow-x"] = "scroll";
+    input.style["margin"] = "0";
+
+    containerHtml.appendChild(input);
+    input.focus();
+    input.select()
+    this._tabEdited = TabContextMenu.contextTab;
+
+    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+
+  }
+
+  contextRenameTabHalt(event) {
+    if (event.target.closest('#tab-label-input')) {
+      return;
+    }
+    this._tabEdited.querySelector('.tab-editor-container').remove();
+    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    label.style.display = '';
+    label.className = label.className.replace(' tab-label-container-editing', '');
+
+    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+  }
+
+}
+
+window.gZenBrowserTabManager = new ZenBrowserTabManager();

From 5e0b684b539d34ea29eca7fab012e60970fe4a7c Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 17:59:24 +0100
Subject: [PATCH 067/191] Implement Zen UI migration functionality and
 initialize on startup

---
 l10n                                          |  2 +-
 src/browser/base/content/ZenStartup.mjs       |  2 +
 .../base/content/browser-init-js.patch        | 19 +++---
 .../base/content/zen-assets.jar.inc.mn        |  1 +
 .../base/zen-components/ZenUIMigration.mjs    | 61 +++++++++++++++++++
 5 files changed, 75 insertions(+), 10 deletions(-)
 create mode 100644 src/browser/base/zen-components/ZenUIMigration.mjs

diff --git a/l10n b/l10n
index 0d64a530f..fb2f27225 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 0d64a530f4f72ad19e508097a508fc8ef1ad7ede
+Subproject commit fb2f27225e6ec810354ce4c95913d6a2105e200b
diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 67847f5f4..055bc2eee 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -33,6 +33,8 @@
 
         this._initSidebarScrolling();
 
+        gZenUIMigration.init();
+
         gZenCompactModeManager.init();
         ZenWorkspaces.init();
         gZenVerticalTabsManager.init();
diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch
index 3d3d188ed..a604b8ef9 100644
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,11 +1,11 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index 9df41bb3c82919839ee1408aa4d177ea7ee40a56..e37c64fa2c2ea39762be4285a1a7055463ded537 100644
+index 63100defacf66c6b3232b9e0a783a5fd14e3a46a..eb7ed966628a595847b850f981418d425b78f14b 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -152,13 +152,15 @@ var gBrowserInit = {
-        elem.setAttribute("skipintoolbarset", "true");
-      }
-    }
+@@ -162,13 +162,15 @@ var gBrowserInit = {
+         elem.setAttribute("skipintoolbarset", "true");
+       }
+     }
 +    ZenCustomizableUI.init(window);
      for (let area of CustomizableUI.areas) {
        let type = CustomizableUI.getAreaType(area);
@@ -16,14 +16,15 @@ index 9df41bb3c82919839ee1408aa4d177ea7ee40a56..e37c64fa2c2ea39762be4285a1a70554
        }
      }
 +    ZenCustomizableUI.registerToolbarNodes(window);
-    if (isVerticalTabs) {
-      // Show the vertical tabs toolbar
-      setToolbarVisibility(
-@@ -253,6 +255,10 @@ var gBrowserInit = {
+     if (isVerticalTabs) {
+       // Show the vertical tabs toolbar
+       setToolbarVisibility(
+@@ -287,6 +289,11 @@ var gBrowserInit = {
      gPrivateBrowsingUI.init();
      BrowserSearch.init();
      BrowserPageActions.init();
 +
++Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenUIMigration.mjs", window);
 +Services.scriptloader.loadSubScript("chrome://browser/content/ZenStartup.mjs", window);
 +Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", window);
 +
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 69b4c1c56..563908e14 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -4,6 +4,7 @@
         content/browser/ZenStartup.mjs                          (content/ZenStartup.mjs)
         content/browser/ZenUIManager.mjs                        (content/ZenUIManager.mjs)
         content/browser/ZenCustomizableUI.sys.mjs               (content/ZenCustomizableUI.sys.mjs)
+        content/browser/zen-components/ZenUIMigration.mjs       (zen-components/ZenUIMigration.mjs)
         content/browser/zen-components/ZenCompactMode.mjs       (zen-components/ZenCompactMode.mjs)
         content/browser/zen-components/ZenViewSplitter.mjs      (zen-components/ZenViewSplitter.mjs)
         content/browser/zen-components/ZenThemesCommon.mjs      (zen-components/ZenThemesCommon.mjs)
diff --git a/src/browser/base/zen-components/ZenUIMigration.mjs b/src/browser/base/zen-components/ZenUIMigration.mjs
new file mode 100644
index 000000000..b93d6f267
--- /dev/null
+++ b/src/browser/base/zen-components/ZenUIMigration.mjs
@@ -0,0 +1,61 @@
+
+{
+  const PREF_NAME = "zen.migration.version";
+  const MIGRATION_VERSION = 1;
+
+  class ZenUIMigration {
+    init() {
+      if (Services.prefs.prefHasUserValue(PREF_NAME)) {
+        this._migrate();
+      }
+      this.clearVariables();
+    }
+
+    get _migrationVersion() {
+      return Services.prefs.getIntPref(PREF_NAME, 0);
+    }
+
+    set _migrationVersion(value) {
+      Services.prefs.setIntPref(PREF_NAME, value);
+    }
+
+    _migrate() {
+      if (this._migrationVersion < 1) {
+        this._migrateV1();
+      }
+    }
+
+    clearVariables() {
+      this._migrationVersion = MIGRATION_VERSION;
+      window.gZenUIMigration = null;
+    }
+
+    async _migrateV1() {
+      // Introduction of the new URL bar, show a message to the user
+      const notification = gNotificationBox.appendNotification(
+        'zen-new-urlbar-notification',
+        {
+          label: { 'l10n-id': 'zen-new-urlbar-notification' },
+          image: 'chrome://browser/skin/notification-icons/persistent-storage-blocked.svg',
+          priority: gNotificationBox.PRIORITY_WARNING_HIGH,
+        },
+        [
+          {
+            'l10n-id': 'zen-disable',
+            accessKey: 'D',
+            callback: () => {
+              Services.prefs.setBoolPref('zen.urlbar.replace-newtab', false);
+            },
+          },
+          {
+            link: "https://docs.zen-browser.app/user-manual/urlbar/",
+            'l10n-id': "zen-learn-more-text",
+          }
+        ],
+      );
+      notification.persistence = -1;
+    }
+  }
+
+  window.gZenUIMigration = new ZenUIMigration();
+}

From 6d63d56fdd156ec765be0cabf4ccb855125fbce4 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 18:00:09 +0100
Subject: [PATCH 068/191] Refactor ZenUIMigration to use consistent single
 quotes for strings

---
 src/browser/base/zen-components/ZenUIMigration.mjs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/browser/base/zen-components/ZenUIMigration.mjs b/src/browser/base/zen-components/ZenUIMigration.mjs
index b93d6f267..1f025712d 100644
--- a/src/browser/base/zen-components/ZenUIMigration.mjs
+++ b/src/browser/base/zen-components/ZenUIMigration.mjs
@@ -1,6 +1,5 @@
-
 {
-  const PREF_NAME = "zen.migration.version";
+  const PREF_NAME = 'zen.migration.version';
   const MIGRATION_VERSION = 1;
 
   class ZenUIMigration {
@@ -48,10 +47,10 @@
             },
           },
           {
-            link: "https://docs.zen-browser.app/user-manual/urlbar/",
-            'l10n-id': "zen-learn-more-text",
-          }
-        ],
+            link: 'https://docs.zen-browser.app/user-manual/urlbar/',
+            'l10n-id': 'zen-learn-more-text',
+          },
+        ]
       );
       notification.persistence = -1;
     }

From 16e0b5f31919574488ea18e2ee7722e67d215e10 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 18:18:00 +0100
Subject: [PATCH 069/191] Remove existing firefox-l10n directory before cloning
 to ensure fresh download of language packs

---
 scripts/download-language-packs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh
index 11f472592..4363c6f21 100644
--- a/scripts/download-language-packs.sh
+++ b/scripts/download-language-packs.sh
@@ -10,6 +10,7 @@ cd $CURRENT_DIR
 LAST_FIREFOX_L10N_COMMIT=$(cat ./firefox-cache/l10n-last-commit-hash)
 
 cd ./l10n
+rm -rf firefox-l10n
 # clone only from LAST_FIREFOX_L10N_COMMIT
 git clone https://github.com/mozilla-l10n/firefox-l10n
 cd firefox-l10n

From 26a59ee1c17930b21f75aa9ec2c73d581f03eeea Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 19:39:12 +0100
Subject: [PATCH 070/191] Enable essentials favicon background and update tab
 icon overlay styles

---
 src/browser/app/profile/zen-browser.js            |  2 +-
 src/browser/base/content/zen-styles/zen-theme.css |  2 ++
 .../themes/shared/tabbrowser/tabs-css.patch       | 15 +++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index e3a7c7e7c..b4f0bce45 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -84,7 +84,7 @@ pref('zen.theme.accent-color', "#ffb787");
 pref('zen.theme.content-element-separation', 6); // In pixels
 pref('zen.theme.pill-button', false);
 pref('zen.theme.gradient', true);
-pref('zen.theme.essentials-favicon-bg', false);
+pref('zen.theme.essentials-favicon-bg', true);
 
 pref('zen.tabs.show-newtab-vertical', true);
 pref('zen.view.show-newtab-button-border-top', false);
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index fa51fa32f..62b2efa5c 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -131,6 +131,8 @@
   --toolbarbutton-border-radius: 6px;
   --urlbar-margin-inline: 1px !important;
 
+  --tab-icon-overlay-stroke: light-dark(white, black) !important;
+
   --fp-contextmenu-border-radius: 8px;
   --fp-contextmenu-padding: calc(4px - var(--fp-contextmenu-menuitem-border-width)) 0;
   --fp-contextmenu-menuitem-border-radius: calc(4px + var(--fp-contextmenu-menuitem-border-width));
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index 1b399a29e..93e6cab24 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b587f1428 100644
+index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..64487674de1afb711258a36757508cd9b741fcd9 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -33,7 +33,7 @@
@@ -37,16 +37,15 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b
  
      &::before {
        position: absolute;
-@@ -511,7 +510,7 @@
+@@ -511,7 +510,6 @@
        background-repeat: no-repeat;
        border-radius: 10px;
        -moz-context-properties: fill;
 -      fill: var(--tab-icon-overlay-fill);
-+      filter: invert(1);
      }
    }
  
-@@ -569,14 +568,14 @@
+@@ -569,14 +567,14 @@
    }
  
    &[textoverflow] {
@@ -65,7 +64,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b
        direction: rtl;
        mask-image: linear-gradient(to right, transparent, black var(--tab-label-mask-size));
      }
-@@ -1146,7 +1145,7 @@
+@@ -1146,7 +1144,7 @@
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -74,7 +73,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b
    }
  
    &:hover {
-@@ -1194,7 +1193,6 @@
+@@ -1194,7 +1192,6 @@
  }
  
  #vertical-pinned-tabs-container {
@@ -82,7 +81,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b
    display: none;
    grid-template-columns: repeat(auto-fit, minmax(var(--tab-pinned-min-width-expanded), auto));
    overflow-y: auto;
-@@ -1347,7 +1345,7 @@
+@@ -1347,7 +1344,7 @@
    toolbarbutton:not(#firefox-view-button),
    toolbarpaletteitem:not(#wrapper-firefox-view-button)
  ) ~ #tabbrowser-tabs {
@@ -91,7 +90,7 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..3c10b8f0d893d313fa208dba8f47007b
    padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
    margin-inline-start: 2px;
  }
-@@ -1381,7 +1379,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -1381,7 +1378,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

From 5e25b0ade9df66fb0c9c8b1841051ca4615331f0 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 19:53:49 +0100
Subject: [PATCH 071/191] Update profile preferences and modify default sidebar
 icons

---
 src/browser/app/profile/zen-browser.js             | 4 ++--
 src/browser/base/content/ZenCustomizableUI.sys.mjs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index b4f0bce45..ff35d39e5 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -176,8 +176,8 @@ pref('zen.pinned-tab-manager.debug', false);
 pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
 pref('zen.pinned-tab-manager.close-shortcut-behavior', 'switch');
 
-// Pref to enable the new profiles (TODO: Check this out!)
-//pref("browser.profiles.enabled", true);
+// TODO: Check this out!
+pref("browser.profiles.enabled", false);
 
 // Zen webpanels (calling it sidebar due to legacy reasons)
 pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n   \"url\":\"https://www.wikipedia.org/\"\n  },\n\"p2\":{\n   \"url\":\"https://m.twitter.com/\",\n\"ua\": true\n  },\n\"p3\": {\n   \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n},\n\"p4\": {\n   \"url\": \"https://translate.google.com/\",\n\"ua\": true\n},\n\"p5\": {\n   \"url\": \"https://todoist.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\",\"p4\",\"p5\"]}");
diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs
index fcd92ea1d..a3622a5ee 100644
--- a/src/browser/base/content/ZenCustomizableUI.sys.mjs
+++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs
@@ -4,7 +4,7 @@ export var ZenCustomizableUI = new (class {
   constructor() {}
 
   TYPE_TOOLBAR = 'toolbar';
-  defaultSidebarIcons = ['zen-profile-button', 'zen-workspaces-button', 'downloads-button'];
+  defaultSidebarIcons = ['preferences-button', 'zen-workspaces-button', 'downloads-button'];
 
   startup(CustomizableUIInternal) {
     CustomizableUIInternal.registerArea(

From 59373383483892e81622642480c2c1964641edf3 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 5 Feb 2025 21:22:20 +0100
Subject: [PATCH 072/191] Refactor ZenCompactMode styles for consistent sidebar
 positioning and update animation parameters

---
 .../content/zen-styles/zen-compact-mode.css    |  4 ++--
 .../base/zen-components/ZenCompactMode.mjs     | 18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 92d7d3ae4..49ce6974b 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -63,7 +63,7 @@
     }
 
     &:not([zen-right-side='true']) #navigator-toolbox {
-      left: calc(-1 * var(--zen-sidebar-width) + var(--zen-element-separation));
+      left: calc(-1 * var(--zen-sidebar-width) + 1px);
     }
 
     /* When we have multiple toolbars and the top-toolbar is NOT being hidden,
@@ -80,7 +80,7 @@
         --zen-compact-float: calc(var(--zen-element-separation) + 1px);
 
         &:not([animate='true']) {
-          right: calc(-1 * var(--zen-sidebar-width) + var(--zen-element-separation));
+          right: calc(-1 * var(--zen-sidebar-width) + 1px);
         }
       }
 
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 32ef544ce..d49ba5691 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -100,8 +100,6 @@ var gZenCompactModeManager = {
   },
 
   updateCompactModeContext(isSingleToolbar) {
-    this.getAndApplySidebarWidth(); // Ignore return value
-
     const IDs = [
       'zen-context-menu-compact-mode-hide-sidebar',
       'zen-context-menu-compact-mode-hide-toolbar',
@@ -176,21 +174,20 @@ var gZenCompactModeManager = {
             {
               ease: 'easeIn',
               type: 'spring',
-              stiffness: 3000,
-              damping: 150,
-              mass: 1,
+              bounce: 0,
+              duration: 0.2,
             }
           )
           .then(() => {
             this.sidebar.removeAttribute('animate');
-            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;
+            this.sidebar.style.transition = 'none';
             setTimeout(() => {
+              this._animating = false;
               this.sidebar.style.removeProperty('transition');
-            });
+            }, 100);
           });
       } else if (canHideSidebar && !isCompactMode) {
         document.getElementById('browser').style.overflow = 'hidden';
@@ -211,9 +208,8 @@ var gZenCompactModeManager = {
             {
               ease: 'easeOut',
               type: 'spring',
-              stiffness: 3000,
-              damping: 150,
-              mass: 1,
+              bounce: 0,
+              duration: 0.2,
             }
           )
           .then(() => {

From 5620e8d1ac49c55f31a2802f2db2efab970ebbc8 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:09:08 +0800
Subject: [PATCH 073/191] Moved rename to gZenVerticalTabsManager, changed to
 double click on pinned tabs

---
 src/browser/base/content/ZenUIManager.mjs     | 86 +++++++++++++++++++
 src/browser/base/content/zen-assets.inc.xhtml |  1 -
 .../base/content/zen-assets.jar.inc.mn        |  1 -
 .../base/zen-components/ZenTabManager.mjs     | 84 ------------------
 4 files changed, 86 insertions(+), 86 deletions(-)
 delete mode 100644 src/browser/base/zen-components/ZenTabManager.mjs

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index c33aa0071..e551deefc 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -182,6 +182,7 @@ var gZenUIManager = {
 };
 
 var gZenVerticalTabsManager = {
+  _tabEdited: null,
   init() {
     this._multiWindowFeature = new ZenMultiWindowFeature();
     this._initWaitPromise();
@@ -226,6 +227,8 @@ var gZenVerticalTabsManager = {
     if (tabs) {
       tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
     }
+
+    this._insertDoubleClickListenerPinnedTabs();
   },
 
   openNewTabOnTabsMiddleClick(event) {
@@ -593,4 +596,87 @@ var gZenVerticalTabsManager = {
     }
     target.appendChild(child);
   },
+
+
+  //_insertItemsIntoTabContextMenu() {
+  //  const element = window.MozXULElement.parseXULToFragment(`
+  //    <menuitem id="context_zen-rename-tab"
+  //              data-l10n-id="tab-context-zen-rename-tab"
+  //              oncommand="gZenVerticalTabsManager.contextRenameTab();" />
+  //  `);
+  //  document.getElementById('context_duplicateTabs').after(element);
+  //},
+
+  _insertDoubleClickListenerPinnedTabs() {
+    const tabs = gBrowser.tabs;
+    for (const tab of tabs) {
+      if (tab.pinned) {
+        tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
+      }
+    }
+  },
+
+  contextRenameTabKeydown(event) {
+    if (event.key === 'Enter') {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let input = this._tabEdited.querySelector('#tab-label-input');
+      let newName = input.value;
+      this._tabEdited.setAttribute('label', newName);
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    } else if (event.key === "Escape") {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    }
+  },
+  contextRenameTabStart(event) {
+    if (event.target.closest('.tab-label-container-editing')) {
+      return;
+    }
+    this._tabEdited = event.target.closest('.tabbrowser-tab');
+    console.log(this._tabEdited)
+    const label = this._tabEdited.querySelector(".tab-label-container")
+    label.style.display = 'none';
+    label.className += ' tab-label-container-editing';
+
+    const container = window.MozXULElement.parseXULToFragment(`
+      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
+    `);
+    label.after(container);
+    const containerHtml = this._tabEdited.querySelector('.tab-editor-container');
+    const input = document.createElement('input');
+    input.id = 'tab-label-input';
+    input.value = this._tabEdited.label;
+    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.style["white-space"] = "nowrap";
+    input.style["overflow-x"] = "scroll";
+    input.style["margin"] = "0";
+
+    containerHtml.appendChild(input);
+    input.focus();
+    input.select()
+
+    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+
+  },
+
+  contextRenameTabHalt(event) {
+    if (event.target.closest('#tab-label-input')) {
+      return;
+    }
+    this._tabEdited.querySelector('.tab-editor-container').remove();
+    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    label.style.display = '';
+    label.className = label.className.replace(' tab-label-container-editing', '');
+
+    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+  },
 };
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 4ec7bf8f0..eefa0a5dd 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -33,7 +33,6 @@
 <script src="chrome://browser/content/ZenUIManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
-<script src="chrome://browser/content/zen-components/ZenTabManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 93a415813..563908e14 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -16,7 +16,6 @@
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (zen-components/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (zen-components/ZenThemesImporter.mjs)
         content/browser/zen-components/ZenTabUnloader.mjs       (zen-components/ZenTabUnloader.mjs)
-        content/browser/zen-components/ZenTabManager.mjs        (zen-components/ZenTabManager.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs (zen-components/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs  (zen-components/ZenPinnedTabManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs       (zen-components/ZenCommonUtils.mjs)
diff --git a/src/browser/base/zen-components/ZenTabManager.mjs b/src/browser/base/zen-components/ZenTabManager.mjs
deleted file mode 100644
index 0a381b6f2..000000000
--- a/src/browser/base/zen-components/ZenTabManager.mjs
+++ /dev/null
@@ -1,84 +0,0 @@
-class ZenBrowserTabManager extends ZenDOMOperatedFeature {
-  _tabEdited = null;
-  init() {
-    this._insertItemsIntoTabContextMenu();
-
-  }
-
-  _insertItemsIntoTabContextMenu() {
-    const element = window.MozXULElement.parseXULToFragment(`
-      <menuitem id="context_zen-rename-tab"
-                data-l10n-id="tab-context-zen-rename-tab"
-                oncommand="gZenBrowserTabManager.contextRenameTab();" />
-    `);
-    document.getElementById('context_duplicateTabs').after(element);
-    console.log("akjsdhfjkb")
-  }
-
-  contextRenameTab(event) {
-    this.contextRenameTabStart(event);
-  }
-
-  contextRenameTabKeydown(event) {
-    if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
-      let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value;
-      this._tabEdited.setAttribute('label', newName);
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-      this._tabEdited = null;
-    } else if (event.key === "Escape") {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-      this._tabEdited = null;
-    }
-  }
-  contextRenameTabStart(event) {
-    const label = TabContextMenu.contextTab.querySelector(".tab-label-container")
-    label.style.display = 'none';
-    label.className += ' tab-label-container-editing';
-
-    const container = window.MozXULElement.parseXULToFragment(`
-      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
-    `);
-    label.after(container);
-    const containerHtml = TabContextMenu.contextTab.querySelector('.tab-editor-container');
-    const input = document.createElement('input');
-    input.id = 'tab-label-input';
-    input.value = TabContextMenu.contextTab.label;
-    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
-    input.style["white-space"] = "nowrap";
-    input.style["overflow-x"] = "scroll";
-    input.style["margin"] = "0";
-
-    containerHtml.appendChild(input);
-    input.focus();
-    input.select()
-    this._tabEdited = TabContextMenu.contextTab;
-
-    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
-
-  }
-
-  contextRenameTabHalt(event) {
-    if (event.target.closest('#tab-label-input')) {
-      return;
-    }
-    this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector(".tab-label-container-editing");
-    label.style.display = '';
-    label.className = label.className.replace(' tab-label-container-editing', '');
-
-    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-  }
-
-}
-
-window.gZenBrowserTabManager = new ZenBrowserTabManager();

From 48a5891c912bd1e23ce9cf5c97ba286b046fe572 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:13:20 +0800
Subject: [PATCH 074/191] Fixed code formatting for linter

---
 src/browser/base/content/ZenUIManager.mjs | 32 ++++++++---------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e551deefc..7b150122a 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -597,16 +597,6 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-
-  //_insertItemsIntoTabContextMenu() {
-  //  const element = window.MozXULElement.parseXULToFragment(`
-  //    <menuitem id="context_zen-rename-tab"
-  //              data-l10n-id="tab-context-zen-rename-tab"
-  //              oncommand="gZenVerticalTabsManager.contextRenameTab();" />
-  //  `);
-  //  document.getElementById('context_duplicateTabs').after(element);
-  //},
-
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
@@ -618,7 +608,7 @@ var gZenVerticalTabsManager = {
 
   contextRenameTabKeydown(event) {
     if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
       let newName = input.value;
       this._tabEdited.setAttribute('label', newName);
@@ -627,8 +617,8 @@ var gZenVerticalTabsManager = {
       label.className = label.className.replace(' tab-label-container-editing', '');
       document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
       this._tabEdited = null;
-    } else if (event.key === "Escape") {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+    } else if (event.key === 'Escape') {
+      let label = this._tabEdited.querySelector('.tab-label-container-editing');
       this._tabEdited.querySelector('.tab-editor-container').remove();
 
       label.style.display = '';
@@ -637,13 +627,14 @@ var gZenVerticalTabsManager = {
       this._tabEdited = null;
     }
   },
+
   contextRenameTabStart(event) {
     if (event.target.closest('.tab-label-container-editing')) {
       return;
     }
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    console.log(this._tabEdited)
-    const label = this._tabEdited.querySelector(".tab-label-container")
+    console.log(this._tabEdited);
+    const label = this._tabEdited.querySelector('.tab-label-container');
     label.style.display = 'none';
     label.className += ' tab-label-container-editing';
 
@@ -656,16 +647,15 @@ var gZenVerticalTabsManager = {
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
     input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
-    input.style["white-space"] = "nowrap";
-    input.style["overflow-x"] = "scroll";
-    input.style["margin"] = "0";
+    input.style['white-space'] = 'nowrap';
+    input.style['overflow-x'] = 'scroll';
+    input.style['margin'] = '0';
 
     containerHtml.appendChild(input);
     input.focus();
-    input.select()
+    input.select();
 
     document.addEventListener('click', this.contextRenameTabHalt.bind(this));
-
   },
 
   contextRenameTabHalt(event) {
@@ -673,7 +663,7 @@ var gZenVerticalTabsManager = {
       return;
     }
     this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    const label = this._tabEdited.querySelector('.tab-label-container-editing');
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 

From 02342e2806416b63d5696d5686ee3fabfbe5a974 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:42:53 +0800
Subject: [PATCH 075/191] Fixed bug where new pinned tabs can't be renamed

---
 src/browser/base/content/ZenUIManager.mjs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 7b150122a..4eafe5974 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -600,9 +600,7 @@ var gZenVerticalTabsManager = {
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
-      if (tab.pinned) {
-        tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
-      }
+      tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
     }
   },
 
@@ -629,11 +627,12 @@ var gZenVerticalTabsManager = {
   },
 
   contextRenameTabStart(event) {
-    if (event.target.closest('.tab-label-container-editing')) {
+    if (this._tabEdited) return;
+    this._tabEdited = event.target.closest('.tabbrowser-tab');
+    if (!this._tabEdited.pinned) {
+      this._tabEdited = null;
       return;
     }
-    this._tabEdited = event.target.closest('.tabbrowser-tab');
-    console.log(this._tabEdited);
     const label = this._tabEdited.querySelector('.tab-label-container');
     label.style.display = 'none';
     label.className += ' tab-label-container-editing';
@@ -662,11 +661,15 @@ var gZenVerticalTabsManager = {
     if (event.target.closest('#tab-label-input')) {
       return;
     }
+    if (!this._tabEdited) {
+      return;
+    }
     this._tabEdited.querySelector('.tab-editor-container').remove();
     const label = this._tabEdited.querySelector('.tab-label-container-editing');
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 
     document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+    this._tabEdited = null;
   },
 };

From 459a37fc5967a152eaeb7971595d6f81dd3dd965 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 6 Feb 2025 07:07:46 +0100
Subject: [PATCH 076/191] Enhance ZenCompactMode styles by adjusting transition
 timings and adding opacity effects for smoother animations

---
 .../base/content/zen-styles/zen-compact-mode.css    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 49ce6974b..4c4fa1053 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -42,11 +42,13 @@
         position: absolute;
         z-index: 10;
         transition:
-          left 0.25s ease,
-          right 0.25s ease;
+          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: var(--zen-element-separation);
@@ -112,7 +114,11 @@
 
       & #urlbar[open][zen-floating-urlbar='true'] {
         --zen-urlbar-offset: var(--zen-sidebar-width);
-        transition: left 0.1s ease;
+        transition: left 0.05s ease;
+
+        #navigator-toolbox:has(&) {
+          opacity: 1;
+        }
       }
     }
 
@@ -233,6 +239,7 @@
         transition:
           left 0.3s var(--zen-compact-mode-func),
           right 0.3s var(--zen-compact-mode-func);
+        opacity: 1;
 
         left: -1px;
         :root[zen-right-side='true'] & {

From 8eaceb49cf665964041ecbc5f28876d3698574d2 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 6 Feb 2025 07:32:13 +0100
Subject: [PATCH 077/191] Refactor ZenCompactMode to use async for sidebar
 width calculation and update overflow style

---
 .../base/zen-components/ZenCompactMode.mjs    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index d49ba5691..66c93e4e5 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -135,8 +135,10 @@ var gZenCompactModeManager = {
     this.animateCompactMode();
   },
 
-  getAndApplySidebarWidth() {
-    let sidebarWidth = this.sidebar.getBoundingClientRect().width;
+  async getAndApplySidebarWidth() {
+    let sidebarWidth = await window.promiseDocumentFlushed(() =>
+      window.windowUtils.getBoundsWithoutFlushing(this.sidebar).width
+    );
     if (sidebarWidth > 1) {
       this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
     }
@@ -155,8 +157,11 @@ var gZenCompactModeManager = {
     if (canAnimate) {
       this.sidebar.setAttribute('animate', 'true');
     }
-    window.requestAnimationFrame(() => {
-      let sidebarWidth = this.getAndApplySidebarWidth();
+    this.sidebar.style.removeProperty('margin-right');
+    this.sidebar.style.removeProperty('margin-left');
+    this.sidebar.style.removeProperty('transform');
+    window.requestAnimationFrame(async () => {
+      let sidebarWidth = await this.getAndApplySidebarWidth();
       if (!canAnimate) {
         this.sidebar.removeAttribute('animate');
         this._animating = false;
@@ -187,10 +192,10 @@ var gZenCompactModeManager = {
             setTimeout(() => {
               this._animating = false;
               this.sidebar.style.removeProperty('transition');
-            }, 100);
+            });
           });
       } else if (canHideSidebar && !isCompactMode) {
-        document.getElementById('browser').style.overflow = 'hidden';
+        document.getElementById('browser').style.overflow = 'clip';
         if (this.sidebarIsOnRight) {
           this.sidebar.style.marginRight = `-${sidebarWidth}px`;
         } else {
@@ -201,7 +206,7 @@ var gZenCompactModeManager = {
             this.sidebar,
             this.sidebarIsOnRight
               ? {
-                  marginRight: 0,
+                  marginRight: [`-${sidebarWidth}px`, 0],
                   transform: ['translateX(100%)', 'translateX(0)'],
                 }
               : { marginLeft: 0 },

From 1e624ae580418b06ca8cbb5744b9497f80e68921 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 6 Feb 2025 07:37:27 +0100
Subject: [PATCH 078/191] Refactor getAndApplySidebarWidth to remove async and
 simplify sidebar width calculation

---
 src/browser/base/zen-components/ZenCompactMode.mjs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 66c93e4e5..221d6025e 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -135,10 +135,8 @@ var gZenCompactModeManager = {
     this.animateCompactMode();
   },
 
-  async getAndApplySidebarWidth() {
-    let sidebarWidth = await window.promiseDocumentFlushed(() =>
-      window.windowUtils.getBoundsWithoutFlushing(this.sidebar).width
-    );
+  getAndApplySidebarWidth() {
+    let sidebarWidth = this.sidebar.getBoundingClientRect().width;
     if (sidebarWidth > 1) {
       this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
     }
@@ -160,8 +158,8 @@ var gZenCompactModeManager = {
     this.sidebar.style.removeProperty('margin-right');
     this.sidebar.style.removeProperty('margin-left');
     this.sidebar.style.removeProperty('transform');
-    window.requestAnimationFrame(async () => {
-      let sidebarWidth = await this.getAndApplySidebarWidth();
+    window.requestAnimationFrame(() => {
+      let sidebarWidth = this.getAndApplySidebarWidth();
       if (!canAnimate) {
         this.sidebar.removeAttribute('animate');
         this._animating = false;

From 23697a8930431b187263af91b09f68c9b78f45db Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 6 Feb 2025 11:13:59 +0100
Subject: [PATCH 079/191] Fixed glance opening tabs

---
 pnpm-lock.yaml                                | 1916 +++++++++++++++++
 .../base/zen-components/ZenGlanceManager.mjs  |    2 +-
 .../tabbrowser/content/tabs-js.patch          |  153 +-
 surfer.json                                   |    2 +-
 4 files changed, 2050 insertions(+), 23 deletions(-)
 create mode 100644 pnpm-lock.yaml

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
new file mode 100644
index 000000000..a05c0dac3
--- /dev/null
+++ b/pnpm-lock.yaml
@@ -0,0 +1,1916 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@zen-browser/surfer':
+        specifier: ^1.9.16
+        version: 1.9.16(glob@7.2.3)
+    devDependencies:
+      husky:
+        specifier: ^9.1.7
+        version: 9.1.7
+      lint-staged:
+        specifier: ^15.3.0
+        version: 15.3.0
+      prettier:
+        specifier: ^3.4.2
+        version: 3.4.2
+      prettier-plugin-sh:
+        specifier: ^0.14.0
+        version: 0.14.0(prettier@3.4.2)
+
+packages:
+
+  '@oozcitak/dom@1.15.10':
+    resolution: {integrity: sha512-0JT29/LaxVgRcGKvHmSrUTEvZ8BXvZhGl2LASRUgHqDTC1M5g1pLmVv56IYNyt3bG2CUjDkc67wnyZC14pbQrQ==}
+    engines: {node: '>=8.0'}
+
+  '@oozcitak/infra@1.0.8':
+    resolution: {integrity: sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==}
+    engines: {node: '>=6.0'}
+
+  '@oozcitak/url@1.0.4':
+    resolution: {integrity: sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==}
+    engines: {node: '>=8.0'}
+
+  '@oozcitak/util@8.3.8':
+    resolution: {integrity: sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==}
+    engines: {node: '>=8.0'}
+
+  '@resvg/resvg-js-android-arm-eabi@1.4.0':
+    resolution: {integrity: sha512-8C7P2dYNeL5mghCgJ+2IqNwv5V50d5pZQYIvGYlbP7d3OB/T8uVEcmuflYgWq+/vEn1gZE+Q2A0tFJOHqIvH9A==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [android]
+
+  '@resvg/resvg-js-android-arm64@1.4.0':
+    resolution: {integrity: sha512-BQp3zo+/8Ns9u2NCh7YeII2KflsiXfJDrwahXk21PuDp0l1KcMjdQ2o4dTWTskF5Dba/rcuDa94T5GD9Pgap7g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@resvg/resvg-js-darwin-arm64@1.4.0':
+    resolution: {integrity: sha512-IuvUOIpdxk5fEqr8EXgdCfugRWS88HlXwSeHPDVNCh/9kQ7exRoVi5CDOipkngUPYKxbKTekJWTxQHRUtf8oNQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@resvg/resvg-js-darwin-x64@1.4.0':
+    resolution: {integrity: sha512-XFao3tkBBPHubVvXDX/ViYf2509tgqcfUc6bDtVYHCUOecK10ppbtdMRRnXjesi3towPQj2peiRUEavTIBbfGg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@resvg/resvg-js-linux-arm-gnueabihf@1.4.0':
+    resolution: {integrity: sha512-RAjGdBJKGO5tSE1PsTl2WpG/TkgJGqsHIFtaQAUWNG4/LQ+0MNAptBOGrvNZvmRu+hVIk1t8m9rKme2RMdmlLQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@resvg/resvg-js-linux-arm64-gnu@1.4.0':
+    resolution: {integrity: sha512-mT0UWGyzSaTu48sJGQno9zaZqk7j9ZjZppNu/TkLqObYu0xSeTnxnU73/Xy+byZh9RvLY/994bEaOP50jpDW/g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@resvg/resvg-js-linux-arm64-musl@1.4.0':
+    resolution: {integrity: sha512-wfl0dk9pNExJeFxRoAO0P0ywVkqW80FqsCH6KCtTbB1f2P2NY0paAKPho1LJ2z1YSzq3ngganyAKPl2PoBqn4g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@resvg/resvg-js-linux-x64-gnu@1.4.0':
+    resolution: {integrity: sha512-XDebImgHmQMIjxISZ4UsV9iHcO2IJnkKrT9/F5SWF3MgqRLro2pIY1JsgW70sEjkHlcyF7dbTa/M7TAgSz0uvg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@resvg/resvg-js-linux-x64-musl@1.4.0':
+    resolution: {integrity: sha512-cvq7pPQECLyP5SoI5ECZL0RhKcgz7sQTjYWQdZjFdF6riN40uWSo1Le31+oLLCwSoSOo8Z60xmU95ChbZjSY5Q==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@resvg/resvg-js-win32-arm64-msvc@1.4.0':
+    resolution: {integrity: sha512-4waye03doDRsQmtibxiTQ7alAmvT2D7gt5n3gmIMsAP8fF+szRQ+cD/ClPZdBIMonhAUbe3nLMduocOe2Jp59Q==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@resvg/resvg-js-win32-ia32-msvc@1.4.0':
+    resolution: {integrity: sha512-9Ld/Hv8nXslvodPv9wL3wec8Tf9kFAO4t9632Y66aAcGZBNW/xAwzbgDOSv32N763tsLphleu1DhJ7nXKZIz9A==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@resvg/resvg-js-win32-x64-msvc@1.4.0':
+    resolution: {integrity: sha512-sMGQdOIop6a/s+cmFodnQNNykvr/MavgBXCzVt9jp1Rq4PXWtn8uwSsUupsn3SHPJCZ83kee6m4JCnak6Rec9A==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@resvg/resvg-js@1.4.0':
+    resolution: {integrity: sha512-AcsRqAPFMIOxlMZCHxSxTG5vZTbW95xFDrQDTmsX/VEwc3tgLL9E4Be2nIJjWrdvIQxsTlaWYJsn2pxkki9Ltg==}
+    engines: {node: '>= 10'}
+
+  '@types/node@17.0.45':
+    resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
+
+  '@zen-browser/surfer@1.9.16':
+    resolution: {integrity: sha512-6/Vcp1Ox9mt53hoBUuxFvpnRMnlvjFb3GBOcRhpqoYW/yi9mlV3G48icE717wGCoR2TThfuS6SYVfiT/G1kkrw==}
+    hasBin: true
+
+  ansi-escapes@7.0.0:
+    resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}
+    engines: {node: '>=18'}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@6.1.0:
+    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
+    engines: {node: '>=12'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
+  asap@2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+
+  async-compat@1.6.8:
+    resolution: {integrity: sha512-MVKdync5q2FgE+x/AErx0mtJSZgQxWBGIx7vOcQbXmTh04OAF41N2zQX5XhAb0Mq/sMSFqzZSSFwzZ3rrROsSg==}
+    engines: {node: '>=0.8'}
+
+  async-icns@1.0.2:
+    resolution: {integrity: sha512-d2P/f3aAWdOE3+tEqTW4HLj9Ob7/t54/NH2nRFK9Q7ZhJJXK7TlF1G3vgB6UP/ILHjI3Akjv+d8sFXyAZxCIFQ==}
+    hasBin: true
+
+  axios@0.21.4:
+    resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  base64-js@0.0.2:
+    resolution: {integrity: sha512-Pj9L87dCdGcKlSqPVUjD+q96pbIx1zQQLb2CUiWURfjiBELv84YX+0nGnKmyT/9KkC7PQk7UN1w+Al8bBozaxQ==}
+    engines: {node: '>= 0.4'}
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  bl@2.2.1:
+    resolution: {integrity: sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==}
+
+  bl@3.0.1:
+    resolution: {integrity: sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==}
+
+  bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
+  bops@0.1.1:
+    resolution: {integrity: sha512-Cx1zStcMp+YoFan8OgudNPMih82eJZE+27feki1WeyoFTR9Ye7AR1SUW3saE6QQvdS/g52aJ2IojBjWOiRiLbw==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  buffer-alloc-unsafe@1.1.0:
+    resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
+
+  buffer-alloc@1.2.0:
+    resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==}
+
+  buffer-fill@1.0.0:
+    resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==}
+
+  buffer-v6-polyfill@1.0.5:
+    resolution: {integrity: sha512-LdUw/JMZyKN+EBDbOHqynYtOLXDjgo+uf5vCUhfO5hVsU2chvbqyexizvxUMaU4ipYZy9MiQyIFwMeIgsb6nBA==}
+
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
+  call-once-fn@1.0.15:
+    resolution: {integrity: sha512-LPMeZc0iO4Ep9XCtvRk9ecOdQpJd1DKRWly1+95F+OinTRJri39ZUVItxJu0ru/KzBbbv0cmKFb0gzG4PJCinA==}
+    engines: {node: '>=0.8'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  chalk@5.4.1:
+    resolution: {integrity: sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  chownr@1.1.4:
+    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+
+  cli-cursor@5.0.0:
+    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
+    engines: {node: '>=18'}
+
+  cli-progress@3.12.0:
+    resolution: {integrity: sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==}
+    engines: {node: '>=4'}
+
+  cli-truncate@4.0.0:
+    resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
+    engines: {node: '>=18'}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  color-string@1.9.1:
+    resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
+
+  color@4.2.3:
+    resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
+    engines: {node: '>=12.5.0'}
+
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+
+  commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
+
+  commander@6.2.1:
+    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
+    engines: {node: '>= 6'}
+
+  commander@9.5.0:
+    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
+    engines: {node: ^12.20.0 || >=14}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  content-disposition@0.5.4:
+    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
+    engines: {node: '>= 0.6'}
+
+  core-js-pure@3.40.0:
+    resolution: {integrity: sha512-AtDzVIgRrmRKQai62yuSIN5vNiQjcJakJb4fbhVw3ehxx7Lohphvw9SGNWKhLFqSxC4ilD0g/L1huAYFQU3Q6A==}
+
+  core-util-is@1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decompress-response@6.0.0:
+    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+    engines: {node: '>=10'}
+
+  deep-extend@0.6.0:
+    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+    engines: {node: '>=4.0.0'}
+
+  detect-libc@2.0.3:
+    resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
+    engines: {node: '>=8'}
+
+  duplexify@4.1.3:
+    resolution: {integrity: sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==}
+
+  emoji-regex@10.4.0:
+    resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+
+  environment@1.1.0:
+    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
+    engines: {node: '>=18'}
+
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+
+  execa@5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+
+  execa@8.0.1:
+    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
+    engines: {node: '>=16.17'}
+
+  expand-template@2.0.3:
+    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+    engines: {node: '>=6'}
+
+  extract-base-iterator@1.2.22:
+    resolution: {integrity: sha512-gGMzo6ijt6oh9VSLOG3H+rpyzkoCYkVBgF/qdxVM/Wc/eKJyX2gxrBN8gO7IbnAMxre36wvzwzzD6umw80i3CQ==}
+    engines: {node: '>=0.8'}
+
+  fast-extract@1.3.31:
+    resolution: {integrity: sha512-P3poghIIxD7mEIHymqaeevrrdWD23JLyagIfox+/jw6r0L8CtjHJsg/S/YZsHH6V2/IfK5tHoBsiyAqBIocSHw==}
+    engines: {node: '>=0.8'}
+    peerDependencies:
+      lzma-native: '*'
+    peerDependenciesMeta:
+      lzma-native:
+        optional: true
+
+  fifo@2.4.1:
+    resolution: {integrity: sha512-XTbUCNmo54Jav0hcL6VxDuY4x1eCQH61HEF80C2Oww283pfjQ2C8avZeyq4v43sW2S2403kmzssE9j4lbF66Sg==}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  flush-write-stream@2.0.0:
+    resolution: {integrity: sha512-uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g==}
+
+  follow-redirects@1.15.9:
+    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
+  fs-constants@1.0.0:
+    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+
+  fs-extra@10.1.0:
+    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
+    engines: {node: '>=12'}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-east-asian-width@1.3.0:
+    resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}
+    engines: {node: '>=18'}
+
+  get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
+  get-stream@8.0.1:
+    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
+    engines: {node: '>=16'}
+
+  github-from-package@0.0.0:
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  globalyzer@0.1.0:
+    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
+
+  globrex@0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  hash-string@1.0.0:
+    resolution: {integrity: sha512-dtNNyxXobzHavayZwOwRWhBTqS9GX4jDjIMsGc0fDyaN2A+4zMn5Ua9ODDCggN6w3Spma6mAHL3ImmW3BkWDmQ==}
+
+  human-signals@2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
+
+  human-signals@5.0.0:
+    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
+    engines: {node: '>=16.17.0'}
+
+  husky@9.1.7:
+    resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  ini@3.0.1:
+    resolution: {integrity: sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+
+  is-absolute@1.0.0:
+    resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
+    engines: {node: '>=0.10.0'}
+
+  is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a:
+    resolution: {tarball: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a}
+    version: 1.0.1
+
+  is-arrayish@0.3.2:
+    resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
+
+  is-error@2.2.2:
+    resolution: {integrity: sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-fullwidth-code-point@4.0.0:
+    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
+    engines: {node: '>=12'}
+
+  is-fullwidth-code-point@5.0.0:
+    resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}
+    engines: {node: '>=18'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-promise@4.0.0:
+    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
+
+  is-relative@1.0.0:
+    resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
+    engines: {node: '>=0.10.0'}
+
+  is-stream@2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
+  is-stream@3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  is-unc-path@1.0.0:
+    resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
+  kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+
+  kleur@4.1.5:
+    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
+    engines: {node: '>=6'}
+
+  lifecycle@1.0.4:
+    resolution: {integrity: sha512-FJx0SNrM2rouctdOH4rATsHT+BvgyXX4LEQ+Yn9COQNPK3u4XAPp9qS7OKpRO22MeT39oxkjZkRcLnHxSmiduw==}
+
+  lilconfig@3.1.3:
+    resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
+    engines: {node: '>=14'}
+
+  lint-staged@15.3.0:
+    resolution: {integrity: sha512-vHFahytLoF2enJklgtOtCtIjZrKD/LoxlaUusd5nh7dWv/dkKQJY74ndFSzxCdv7g0ueGg1ORgTSt4Y9LPZn9A==}
+    engines: {node: '>=18.12.0'}
+    hasBin: true
+
+  listr2@8.2.5:
+    resolution: {integrity: sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==}
+    engines: {node: '>=18.0.0'}
+
+  lodash.compact@3.0.1:
+    resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==}
+
+  lodash.throttle@4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+
+  log-update@6.1.0:
+    resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}
+    engines: {node: '>=18'}
+
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+
+  mimic-function@5.0.1:
+    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
+    engines: {node: '>=18'}
+
+  mimic-response@3.1.0:
+    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+    engines: {node: '>=10'}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  mkdirp-classic@0.5.3:
+    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+
+  mock-require-lazy@1.0.14:
+    resolution: {integrity: sha512-PNuw/5/+IJLgOSJoXv4DYBu840i2NmhRFgUoB/To/hvL7J8YxjjrvNaAaPotq7Ndff344pDFSqDqGpstdhB8Tg==}
+    engines: {node: '>=0.8'}
+
+  modern-async@1.1.5:
+    resolution: {integrity: sha512-Yioj6tw1jvZef+bYjcZN9gMPBpVkkqGOMbQg/1U9dIqdij44mpftvNJxTf/u2Gc6oobuNGUFWNJwJwq8qEs9bw==}
+
+  mount-dmg@1.0.1:
+    resolution: {integrity: sha512-YEHSgtE1d6jIm6ht0uqo4MWQSXHvHYujgURXf+59hQDErH5bL5rv4uGwko8ejiFIeK6ySk8jBX1oX9NrlmBTCg==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  mvdan-sh@0.10.1:
+    resolution: {integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==}
+
+  nanoassert@2.0.0:
+    resolution: {integrity: sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==}
+
+  napi-build-utils@2.0.0:
+    resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
+
+  next-tick@1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+
+  node-abi@3.73.0:
+    resolution: {integrity: sha512-z8iYzQGBu35ZkTQ9mtR8RqugJZ9RCLn8fv3d7LsgDBzOijGQP3RdKTX4LA7LXw03ZhU5z0l4xfhIMgSES31+cg==}
+    engines: {node: '>=10'}
+
+  node-addon-api@5.1.0:
+    resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==}
+
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  npm-run-path@4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
+
+  npm-run-path@5.3.0:
+    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  on-one@0.1.4:
+    resolution: {integrity: sha512-fWyHjSVZvs7Dkt7F/fZCm4Eoxv7+uQkaiUYh3jDVN15khYa5iTnFWW9VM8rQgStAca5cDxHzyAT7cF+gfyLgcg==}
+    engines: {node: '>=0.8'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+
+  onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+
+  onetime@7.0.0:
+    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
+    engines: {node: '>=18'}
+
+  os-shim@0.1.3:
+    resolution: {integrity: sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A==}
+    engines: {node: '>= 0.4.0'}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  pidtree@0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  png-to-ico@2.1.8:
+    resolution: {integrity: sha512-Nf+IIn/cZ/DIZVdGveJp86NG5uNib1ZXMiDd/8x32HCTeKSvgpyg6D/6tUBn1QO/zybzoMK0/mc3QRgAyXdv9w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  pngjs@6.0.0:
+    resolution: {integrity: sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==}
+    engines: {node: '>=12.13.0'}
+
+  prebuild-install@7.1.3:
+    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  prettier-plugin-sh@0.14.0:
+    resolution: {integrity: sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      prettier: ^3.0.3
+
+  prettier@3.4.2:
+    resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  process-nextick-args@2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+
+  progress-stream@2.0.0:
+    resolution: {integrity: sha512-xJwOWR46jcXUq6EH9yYyqp+I52skPySOeHfkxOZ2IY1AiBi/sFJhbhAKHoV3OTw/omQ45KTio9215dRJ2Yxd3Q==}
+
+  prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+
+  pump@3.0.2:
+    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
+
+  pumpify@2.0.1:
+    resolution: {integrity: sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==}
+
+  queue-cb@1.4.16:
+    resolution: {integrity: sha512-7g8cAIeoENe4kYgLAjTF7j7nX71pLlGdIAViR8U8pmHD3UA116+LjMRyucE6c6qUYBlv4ppaYXCTZjlo/IN27w==}
+    engines: {node: '>=0.8'}
+
+  rc@1.2.8:
+    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+    hasBin: true
+
+  readable-stream@2.3.8:
+    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  require_optional@1.0.1:
+    resolution: {integrity: sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==}
+
+  resolve-from@2.0.0:
+    resolution: {integrity: sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==}
+    engines: {node: '>=0.10.0'}
+
+  restore-cursor@5.1.0:
+    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
+    engines: {node: '>=18'}
+
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
+
+  rimraf2@2.8.2:
+    resolution: {integrity: sha512-Bz7P3Zu6lEpek5LduIqg5A2mRu8kCllR+rGYofqq9bRRiHC9m+Py/EiINPt9iu/XOqQ//Q++XSka7EwL3K3Chw==}
+    hasBin: true
+    peerDependencies:
+      glob: '*'
+    peerDependenciesMeta:
+      glob:
+        optional: true
+
+  rustic@1.2.2:
+    resolution: {integrity: sha512-aagYrcImcYj3QbaP7nirOw8/q8aULMu0LkKucP9B4WsRbXlXpk195nYAEB+uJzAcgk2pKS+yMzbAJtIoOqwZoQ==}
+
+  safe-buffer@5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
+
+  semver@7.6.3:
+    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  sh-syntax@0.4.2:
+    resolution: {integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==}
+    engines: {node: '>=16.0.0'}
+
+  sharp@0.30.7:
+    resolution: {integrity: sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==}
+    engines: {node: '>=12.13.0'}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  shell-escape@0.2.0:
+    resolution: {integrity: sha512-uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw==}
+
+  short-hash@1.0.0:
+    resolution: {integrity: sha512-qbUCD2Pkl4IXRyVqneEjGnUr0NGDGLzZnBUVGJngIQZf/FrhOL0yJhH+JQzak0t8xMmScIKpoX1SxOsPHdwa4w==}
+
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
+  simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+
+  simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+
+  simple-swizzle@0.2.2:
+    resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
+
+  sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
+  slice-ansi@5.0.0:
+    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
+    engines: {node: '>=12'}
+
+  slice-ansi@7.1.0:
+    resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}
+    engines: {node: '>=18'}
+
+  speedometer@1.0.0:
+    resolution: {integrity: sha512-lgxErLl/7A5+vgIIXsh9MbeukOaCb2axgQ+bKCdIE+ibNT4XNYGNCR1qFEGq6F+YDASXK3Fh/c5FgtZchFolxw==}
+
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
+  stack-base-iterator@1.1.20:
+    resolution: {integrity: sha512-dlhhk0qesNjtXQCvJsayyvrUIh4gz6HkGC3g00RmXUgpbpYV7SJm97/Ac2HNUfO2mtq68DEGvt+msCf7Uk55Hg==}
+    engines: {node: '>=0.8'}
+
+  stream-shift@1.0.3:
+    resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==}
+
+  string-argv@0.3.2:
+    resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
+    engines: {node: '>=0.6.19'}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string-width@7.2.0:
+    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
+    engines: {node: '>=18'}
+
+  string_decoder@1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+
+  strip-final-newline@2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
+  strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+
+  strip-json-comments@2.0.1:
+    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
+    engines: {node: '>=0.10.0'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  tar-fs@2.1.2:
+    resolution: {integrity: sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==}
+
+  tar-iterator@1.2.25:
+    resolution: {integrity: sha512-PyjH/Rils3eQ2ThsBG4O8zQLx/nPkoS/Iqvob4wEtpOJoO5DcqQKeI88aGWC3ktG6ms1Lgf1qrYtCo59W4WeRg==}
+    engines: {node: '>=0.8'}
+
+  tar-stream-compat@2.1.5:
+    resolution: {integrity: sha512-hhIcRHj6S+y7IDR+VO8IcOjPUsAJ+50POvGK1fDFqbOTLTs/J7YA07TUgvpSkYkYuRUfYsuAFM/0SrvrdIZMdQ==}
+    engines: {node: '>=0.8'}
+
+  tar-stream@2.2.0:
+    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
+    engines: {node: '>=6'}
+
+  temp-suffix@0.1.14:
+    resolution: {integrity: sha512-OqUZmSYtyGgteGxgjh8mkV69Zr1GXSYMj/+VUol698zxnopimbAlmIx5cQIIg1F9XDyA01htZfxLqC1FQZ7hbw==}
+    engines: {node: '>=0.8'}
+
+  through2@2.0.5:
+    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
+
+  through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+
+  tiny-glob@0.2.9:
+    resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  to-utf8@0.0.1:
+    resolution: {integrity: sha512-zks18/TWT1iHO3v0vFp5qLKOG27m67ycq/Y7a7cTiRuUNlc4gf3HGnkRgMv0NyhnfTamtkYBJl+YeD1/j07gBQ==}
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
+  unbzip2-stream@1.4.3:
+    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
+
+  unc-path-regex@0.1.2:
+    resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
+    engines: {node: '>=0.10.0'}
+
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  wrap-ansi@9.0.0:
+    resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}
+    engines: {node: '>=18'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  xmlbuilder2@3.1.1:
+    resolution: {integrity: sha512-WCSfbfZnQDdLQLiMdGUQpMxxckeQ4oZNMNhLVkcekTu7xhD4tuUDyAPoY8CwXvBYE6LwBHd6QW2WZXlOWr1vCw==}
+    engines: {node: '>=12.0'}
+
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
+  yaml@2.6.1:
+    resolution: {integrity: sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==}
+    engines: {node: '>= 14'}
+    hasBin: true
+
+  zip-iterator@1.2.23:
+    resolution: {integrity: sha512-gS+3YsU/vIHXxaViw67Dm1DMyN7U5iVU/NFB0rWYKyN7MYlOH61icBZm8RWesDtknsUaT9saEChwj+ueZKS8Dg==}
+    engines: {node: '>=0.8'}
+
+  zip@1.2.0:
+    resolution: {integrity: sha512-8B4Z9BXJKkI8BkHhKvQan4rwCzUENnj95YHFYrI7F1NbqKCIdW86kujctzEB+kJ6XapHPiAhiZ9xi5GbW5SPdw==}
+
+snapshots:
+
+  '@oozcitak/dom@1.15.10':
+    dependencies:
+      '@oozcitak/infra': 1.0.8
+      '@oozcitak/url': 1.0.4
+      '@oozcitak/util': 8.3.8
+
+  '@oozcitak/infra@1.0.8':
+    dependencies:
+      '@oozcitak/util': 8.3.8
+
+  '@oozcitak/url@1.0.4':
+    dependencies:
+      '@oozcitak/infra': 1.0.8
+      '@oozcitak/util': 8.3.8
+
+  '@oozcitak/util@8.3.8': {}
+
+  '@resvg/resvg-js-android-arm-eabi@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-android-arm64@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-darwin-arm64@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-darwin-x64@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-linux-arm-gnueabihf@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-linux-arm64-gnu@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-linux-arm64-musl@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-linux-x64-gnu@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-linux-x64-musl@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-win32-arm64-msvc@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-win32-ia32-msvc@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js-win32-x64-msvc@1.4.0':
+    optional: true
+
+  '@resvg/resvg-js@1.4.0':
+    optionalDependencies:
+      '@resvg/resvg-js-android-arm-eabi': 1.4.0
+      '@resvg/resvg-js-android-arm64': 1.4.0
+      '@resvg/resvg-js-darwin-arm64': 1.4.0
+      '@resvg/resvg-js-darwin-x64': 1.4.0
+      '@resvg/resvg-js-linux-arm-gnueabihf': 1.4.0
+      '@resvg/resvg-js-linux-arm64-gnu': 1.4.0
+      '@resvg/resvg-js-linux-arm64-musl': 1.4.0
+      '@resvg/resvg-js-linux-x64-gnu': 1.4.0
+      '@resvg/resvg-js-linux-x64-musl': 1.4.0
+      '@resvg/resvg-js-win32-arm64-msvc': 1.4.0
+      '@resvg/resvg-js-win32-ia32-msvc': 1.4.0
+      '@resvg/resvg-js-win32-x64-msvc': 1.4.0
+
+  '@types/node@17.0.45': {}
+
+  '@zen-browser/surfer@1.9.16(glob@7.2.3)':
+    dependencies:
+      '@resvg/resvg-js': 1.4.0
+      async-icns: 1.0.2
+      axios: 0.21.4
+      chalk: 4.1.2
+      cli-progress: 3.12.0
+      commander: 6.2.1
+      execa: 5.1.1
+      fast-extract: 1.3.31(glob@7.2.3)
+      fs-extra: 10.1.0
+      ini: 3.0.1
+      is-apple-silicon: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a
+      kleur: 4.1.5
+      modern-async: 1.1.5
+      mount-dmg: 1.0.1
+      picomatch: 2.3.1
+      png-to-ico: 2.1.8
+      prompts: 2.4.2
+      rustic: 1.2.2
+      semver: 7.6.3
+      sharp: 0.30.7
+      tiny-glob: 0.2.9
+      xmlbuilder2: 3.1.1
+    transitivePeerDependencies:
+      - debug
+      - glob
+      - lzma-native
+
+  ansi-escapes@7.0.0:
+    dependencies:
+      environment: 1.1.0
+
+  ansi-regex@5.0.1: {}
+
+  ansi-regex@6.1.0: {}
+
+  ansi-styles@4.3.0:
+    dependencies:
+      color-convert: 2.0.1
+
+  ansi-styles@6.2.1: {}
+
+  argparse@1.0.10:
+    dependencies:
+      sprintf-js: 1.0.3
+
+  asap@2.0.6: {}
+
+  async-compat@1.6.8:
+    dependencies:
+      is-error: 2.2.2
+      is-promise: 4.0.0
+
+  async-icns@1.0.2:
+    dependencies:
+      commander: 9.5.0
+
+  axios@0.21.4:
+    dependencies:
+      follow-redirects: 1.15.9
+    transitivePeerDependencies:
+      - debug
+
+  balanced-match@1.0.2:
+    optional: true
+
+  base64-js@0.0.2: {}
+
+  base64-js@1.5.1: {}
+
+  bl@2.2.1:
+    dependencies:
+      readable-stream: 2.3.8
+      safe-buffer: 5.2.1
+
+  bl@3.0.1:
+    dependencies:
+      readable-stream: 3.6.2
+
+  bl@4.1.0:
+    dependencies:
+      buffer: 5.7.1
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
+  bops@0.1.1:
+    dependencies:
+      base64-js: 0.0.2
+      to-utf8: 0.0.1
+
+  brace-expansion@1.1.11:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+    optional: true
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
+  buffer-alloc-unsafe@1.1.0: {}
+
+  buffer-alloc@1.2.0:
+    dependencies:
+      buffer-alloc-unsafe: 1.1.0
+      buffer-fill: 1.0.0
+
+  buffer-fill@1.0.0: {}
+
+  buffer-v6-polyfill@1.0.5: {}
+
+  buffer@5.7.1:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
+  call-once-fn@1.0.15: {}
+
+  chalk@4.1.2:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  chalk@5.4.1: {}
+
+  chownr@1.1.4: {}
+
+  cli-cursor@5.0.0:
+    dependencies:
+      restore-cursor: 5.1.0
+
+  cli-progress@3.12.0:
+    dependencies:
+      string-width: 4.2.3
+
+  cli-truncate@4.0.0:
+    dependencies:
+      slice-ansi: 5.0.0
+      string-width: 7.2.0
+
+  color-convert@2.0.1:
+    dependencies:
+      color-name: 1.1.4
+
+  color-name@1.1.4: {}
+
+  color-string@1.9.1:
+    dependencies:
+      color-name: 1.1.4
+      simple-swizzle: 0.2.2
+
+  color@4.2.3:
+    dependencies:
+      color-convert: 2.0.1
+      color-string: 1.9.1
+
+  colorette@2.0.20: {}
+
+  commander@12.1.0: {}
+
+  commander@6.2.1: {}
+
+  commander@9.5.0: {}
+
+  concat-map@0.0.1:
+    optional: true
+
+  content-disposition@0.5.4:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  core-js-pure@3.40.0: {}
+
+  core-util-is@1.0.3: {}
+
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  debug@4.4.0:
+    dependencies:
+      ms: 2.1.3
+
+  decompress-response@6.0.0:
+    dependencies:
+      mimic-response: 3.1.0
+
+  deep-extend@0.6.0: {}
+
+  detect-libc@2.0.3: {}
+
+  duplexify@4.1.3:
+    dependencies:
+      end-of-stream: 1.4.4
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+      stream-shift: 1.0.3
+
+  emoji-regex@10.4.0: {}
+
+  emoji-regex@8.0.0: {}
+
+  end-of-stream@1.4.4:
+    dependencies:
+      once: 1.4.0
+
+  environment@1.1.0: {}
+
+  esprima@4.0.1: {}
+
+  eventemitter3@5.0.1: {}
+
+  execa@5.1.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 6.0.1
+      human-signals: 2.1.0
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  execa@8.0.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 8.0.1
+      human-signals: 5.0.0
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.3.0
+      onetime: 6.0.0
+      signal-exit: 4.1.0
+      strip-final-newline: 3.0.0
+
+  expand-template@2.0.3: {}
+
+  extract-base-iterator@1.2.22(glob@7.2.3):
+    dependencies:
+      graceful-fs: 4.2.11
+      is-absolute: 1.0.0
+      lodash.compact: 3.0.1
+      mkdirp-classic: 0.5.3
+      object-assign: 4.1.1
+      queue-cb: 1.4.16
+      rimraf2: 2.8.2(glob@7.2.3)
+      stack-base-iterator: 1.1.20
+    transitivePeerDependencies:
+      - glob
+
+  fast-extract@1.3.31(glob@7.2.3):
+    dependencies:
+      bl: 3.0.1
+      buffer-v6-polyfill: 1.0.5
+      call-once-fn: 1.0.15
+      content-disposition: 0.5.4
+      flush-write-stream: 2.0.0
+      lodash.throttle: 4.1.1
+      mkdirp-classic: 0.5.3
+      mock-require-lazy: 1.0.14
+      next-tick: 1.1.0
+      on-one: 0.1.4
+      progress-stream: 2.0.0
+      pumpify: 2.0.1
+      queue-cb: 1.4.16
+      readable-stream: 2.3.8
+      require_optional: 1.0.1
+      rimraf2: 2.8.2(glob@7.2.3)
+      signal-exit: 3.0.7
+      tar-iterator: 1.2.25(glob@7.2.3)
+      temp-suffix: 0.1.14
+      unbzip2-stream: 1.4.3
+      zip-iterator: 1.2.23(glob@7.2.3)
+    transitivePeerDependencies:
+      - glob
+
+  fifo@2.4.1: {}
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
+  flush-write-stream@2.0.0:
+    dependencies:
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
+  follow-redirects@1.15.9: {}
+
+  fs-constants@1.0.0: {}
+
+  fs-extra@10.1.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
+
+  fs.realpath@1.0.0:
+    optional: true
+
+  get-caller-file@2.0.5: {}
+
+  get-east-asian-width@1.3.0: {}
+
+  get-stream@6.0.1: {}
+
+  get-stream@8.0.1: {}
+
+  github-from-package@0.0.0: {}
+
+  glob@7.2.3:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+    optional: true
+
+  globalyzer@0.1.0: {}
+
+  globrex@0.1.2: {}
+
+  graceful-fs@4.2.11: {}
+
+  has-flag@4.0.0: {}
+
+  hash-string@1.0.0: {}
+
+  human-signals@2.1.0: {}
+
+  human-signals@5.0.0: {}
+
+  husky@9.1.7: {}
+
+  ieee754@1.2.1: {}
+
+  imurmurhash@0.1.4: {}
+
+  inflight@1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+    optional: true
+
+  inherits@2.0.4: {}
+
+  ini@1.3.8: {}
+
+  ini@3.0.1: {}
+
+  is-absolute@1.0.0:
+    dependencies:
+      is-relative: 1.0.0
+      is-windows: 1.0.2
+
+  is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a: {}
+
+  is-arrayish@0.3.2: {}
+
+  is-error@2.2.2: {}
+
+  is-fullwidth-code-point@3.0.0: {}
+
+  is-fullwidth-code-point@4.0.0: {}
+
+  is-fullwidth-code-point@5.0.0:
+    dependencies:
+      get-east-asian-width: 1.3.0
+
+  is-number@7.0.0: {}
+
+  is-promise@4.0.0: {}
+
+  is-relative@1.0.0:
+    dependencies:
+      is-unc-path: 1.0.0
+
+  is-stream@2.0.1: {}
+
+  is-stream@3.0.0: {}
+
+  is-unc-path@1.0.0:
+    dependencies:
+      unc-path-regex: 0.1.2
+
+  is-windows@1.0.2: {}
+
+  isarray@1.0.0: {}
+
+  isexe@2.0.0: {}
+
+  js-yaml@3.14.1:
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+
+  jsonfile@6.1.0:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  kleur@3.0.3: {}
+
+  kleur@4.1.5: {}
+
+  lifecycle@1.0.4: {}
+
+  lilconfig@3.1.3: {}
+
+  lint-staged@15.3.0:
+    dependencies:
+      chalk: 5.4.1
+      commander: 12.1.0
+      debug: 4.4.0
+      execa: 8.0.1
+      lilconfig: 3.1.3
+      listr2: 8.2.5
+      micromatch: 4.0.8
+      pidtree: 0.6.0
+      string-argv: 0.3.2
+      yaml: 2.6.1
+    transitivePeerDependencies:
+      - supports-color
+
+  listr2@8.2.5:
+    dependencies:
+      cli-truncate: 4.0.0
+      colorette: 2.0.20
+      eventemitter3: 5.0.1
+      log-update: 6.1.0
+      rfdc: 1.4.1
+      wrap-ansi: 9.0.0
+
+  lodash.compact@3.0.1: {}
+
+  lodash.throttle@4.1.1: {}
+
+  log-update@6.1.0:
+    dependencies:
+      ansi-escapes: 7.0.0
+      cli-cursor: 5.0.0
+      slice-ansi: 7.1.0
+      strip-ansi: 7.1.0
+      wrap-ansi: 9.0.0
+
+  merge-stream@2.0.0: {}
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  mimic-fn@2.1.0: {}
+
+  mimic-fn@4.0.0: {}
+
+  mimic-function@5.0.1: {}
+
+  mimic-response@3.1.0: {}
+
+  minimatch@3.1.2:
+    dependencies:
+      brace-expansion: 1.1.11
+    optional: true
+
+  minimist@1.2.8: {}
+
+  mkdirp-classic@0.5.3: {}
+
+  mock-require-lazy@1.0.14:
+    dependencies:
+      get-caller-file: 2.0.5
+      normalize-path: 3.0.0
+
+  modern-async@1.1.5:
+    dependencies:
+      core-js-pure: 3.40.0
+      nanoassert: 2.0.0
+
+  mount-dmg@1.0.1:
+    dependencies:
+      shell-escape: 0.2.0
+
+  ms@2.1.3: {}
+
+  mvdan-sh@0.10.1: {}
+
+  nanoassert@2.0.0: {}
+
+  napi-build-utils@2.0.0: {}
+
+  next-tick@1.1.0: {}
+
+  node-abi@3.73.0:
+    dependencies:
+      semver: 7.6.3
+
+  node-addon-api@5.1.0: {}
+
+  normalize-path@3.0.0: {}
+
+  npm-run-path@4.0.1:
+    dependencies:
+      path-key: 3.1.1
+
+  npm-run-path@5.3.0:
+    dependencies:
+      path-key: 4.0.0
+
+  object-assign@4.1.1: {}
+
+  on-one@0.1.4: {}
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  onetime@5.1.2:
+    dependencies:
+      mimic-fn: 2.1.0
+
+  onetime@6.0.0:
+    dependencies:
+      mimic-fn: 4.0.0
+
+  onetime@7.0.0:
+    dependencies:
+      mimic-function: 5.0.1
+
+  os-shim@0.1.3: {}
+
+  path-is-absolute@1.0.1:
+    optional: true
+
+  path-key@3.1.1: {}
+
+  path-key@4.0.0: {}
+
+  picomatch@2.3.1: {}
+
+  pidtree@0.6.0: {}
+
+  png-to-ico@2.1.8:
+    dependencies:
+      '@types/node': 17.0.45
+      minimist: 1.2.8
+      pngjs: 6.0.0
+
+  pngjs@6.0.0: {}
+
+  prebuild-install@7.1.3:
+    dependencies:
+      detect-libc: 2.0.3
+      expand-template: 2.0.3
+      github-from-package: 0.0.0
+      minimist: 1.2.8
+      mkdirp-classic: 0.5.3
+      napi-build-utils: 2.0.0
+      node-abi: 3.73.0
+      pump: 3.0.2
+      rc: 1.2.8
+      simple-get: 4.0.1
+      tar-fs: 2.1.2
+      tunnel-agent: 0.6.0
+
+  prettier-plugin-sh@0.14.0(prettier@3.4.2):
+    dependencies:
+      mvdan-sh: 0.10.1
+      prettier: 3.4.2
+      sh-syntax: 0.4.2
+
+  prettier@3.4.2: {}
+
+  process-nextick-args@2.0.1: {}
+
+  progress-stream@2.0.0:
+    dependencies:
+      speedometer: 1.0.0
+      through2: 2.0.5
+
+  prompts@2.4.2:
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
+  pump@3.0.2:
+    dependencies:
+      end-of-stream: 1.4.4
+      once: 1.4.0
+
+  pumpify@2.0.1:
+    dependencies:
+      duplexify: 4.1.3
+      inherits: 2.0.4
+      pump: 3.0.2
+
+  queue-cb@1.4.16: {}
+
+  rc@1.2.8:
+    dependencies:
+      deep-extend: 0.6.0
+      ini: 1.3.8
+      minimist: 1.2.8
+      strip-json-comments: 2.0.1
+
+  readable-stream@2.3.8:
+    dependencies:
+      core-util-is: 1.0.3
+      inherits: 2.0.4
+      isarray: 1.0.0
+      process-nextick-args: 2.0.1
+      safe-buffer: 5.1.2
+      string_decoder: 1.1.1
+      util-deprecate: 1.0.2
+
+  readable-stream@3.6.2:
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.1.1
+      util-deprecate: 1.0.2
+
+  require_optional@1.0.1:
+    dependencies:
+      resolve-from: 2.0.0
+      semver: 5.7.2
+
+  resolve-from@2.0.0: {}
+
+  restore-cursor@5.1.0:
+    dependencies:
+      onetime: 7.0.0
+      signal-exit: 4.1.0
+
+  rfdc@1.4.1: {}
+
+  rimraf2@2.8.2(glob@7.2.3):
+    optionalDependencies:
+      glob: 7.2.3
+
+  rustic@1.2.2: {}
+
+  safe-buffer@5.1.2: {}
+
+  safe-buffer@5.2.1: {}
+
+  semver@5.7.2: {}
+
+  semver@7.6.3: {}
+
+  sh-syntax@0.4.2:
+    dependencies:
+      tslib: 2.8.1
+
+  sharp@0.30.7:
+    dependencies:
+      color: 4.2.3
+      detect-libc: 2.0.3
+      node-addon-api: 5.1.0
+      prebuild-install: 7.1.3
+      semver: 7.6.3
+      simple-get: 4.0.1
+      tar-fs: 2.1.2
+      tunnel-agent: 0.6.0
+
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@3.0.0: {}
+
+  shell-escape@0.2.0: {}
+
+  short-hash@1.0.0:
+    dependencies:
+      hash-string: 1.0.0
+
+  signal-exit@3.0.7: {}
+
+  signal-exit@4.1.0: {}
+
+  simple-concat@1.0.1: {}
+
+  simple-get@4.0.1:
+    dependencies:
+      decompress-response: 6.0.0
+      once: 1.4.0
+      simple-concat: 1.0.1
+
+  simple-swizzle@0.2.2:
+    dependencies:
+      is-arrayish: 0.3.2
+
+  sisteransi@1.0.5: {}
+
+  slice-ansi@5.0.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      is-fullwidth-code-point: 4.0.0
+
+  slice-ansi@7.1.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      is-fullwidth-code-point: 5.0.0
+
+  speedometer@1.0.0: {}
+
+  sprintf-js@1.0.3: {}
+
+  stack-base-iterator@1.1.20:
+    dependencies:
+      asap: 2.0.6
+      async-compat: 1.6.8
+      call-once-fn: 1.0.15
+      fifo: 2.4.1
+
+  stream-shift@1.0.3: {}
+
+  string-argv@0.3.2: {}
+
+  string-width@4.2.3:
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+
+  string-width@7.2.0:
+    dependencies:
+      emoji-regex: 10.4.0
+      get-east-asian-width: 1.3.0
+      strip-ansi: 7.1.0
+
+  string_decoder@1.1.1:
+    dependencies:
+      safe-buffer: 5.1.2
+
+  strip-ansi@6.0.1:
+    dependencies:
+      ansi-regex: 5.0.1
+
+  strip-ansi@7.1.0:
+    dependencies:
+      ansi-regex: 6.1.0
+
+  strip-final-newline@2.0.0: {}
+
+  strip-final-newline@3.0.0: {}
+
+  strip-json-comments@2.0.1: {}
+
+  supports-color@7.2.0:
+    dependencies:
+      has-flag: 4.0.0
+
+  tar-fs@2.1.2:
+    dependencies:
+      chownr: 1.1.4
+      mkdirp-classic: 0.5.3
+      pump: 3.0.2
+      tar-stream: 2.2.0
+
+  tar-iterator@1.2.25(glob@7.2.3):
+    dependencies:
+      call-once-fn: 1.0.15
+      extract-base-iterator: 1.2.22(glob@7.2.3)
+      lifecycle: 1.0.4
+      lodash.compact: 3.0.1
+      mkdirp-classic: 0.5.3
+      on-one: 0.1.4
+      rimraf2: 2.8.2(glob@7.2.3)
+      tar-stream-compat: 2.1.5
+    transitivePeerDependencies:
+      - glob
+
+  tar-stream-compat@2.1.5:
+    dependencies:
+      bl: 2.2.1
+      buffer-alloc: 1.2.0
+      end-of-stream: 1.4.4
+      fs-constants: 1.0.0
+      inherits: 2.0.4
+      readable-stream: 2.3.8
+
+  tar-stream@2.2.0:
+    dependencies:
+      bl: 4.1.0
+      end-of-stream: 1.4.4
+      fs-constants: 1.0.0
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
+  temp-suffix@0.1.14:
+    dependencies:
+      imurmurhash: 0.1.4
+
+  through2@2.0.5:
+    dependencies:
+      readable-stream: 2.3.8
+      xtend: 4.0.2
+
+  through@2.3.8: {}
+
+  tiny-glob@0.2.9:
+    dependencies:
+      globalyzer: 0.1.0
+      globrex: 0.1.2
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+
+  to-utf8@0.0.1: {}
+
+  tslib@2.8.1: {}
+
+  tunnel-agent@0.6.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  unbzip2-stream@1.4.3:
+    dependencies:
+      buffer: 5.7.1
+      through: 2.3.8
+
+  unc-path-regex@0.1.2: {}
+
+  universalify@2.0.1: {}
+
+  util-deprecate@1.0.2: {}
+
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
+  wrap-ansi@9.0.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      string-width: 7.2.0
+      strip-ansi: 7.1.0
+
+  wrappy@1.0.2: {}
+
+  xmlbuilder2@3.1.1:
+    dependencies:
+      '@oozcitak/dom': 1.15.10
+      '@oozcitak/infra': 1.0.8
+      '@oozcitak/util': 8.3.8
+      js-yaml: 3.14.1
+
+  xtend@4.0.2: {}
+
+  yaml@2.6.1: {}
+
+  zip-iterator@1.2.23(glob@7.2.3):
+    dependencies:
+      buffer-v6-polyfill: 1.0.5
+      call-once-fn: 1.0.15
+      extract-base-iterator: 1.2.22(glob@7.2.3)
+      lifecycle: 1.0.4
+      lodash.compact: 3.0.1
+      mkdirp-classic: 0.5.3
+      on-one: 0.1.4
+      os-shim: 0.1.3
+      queue-cb: 1.4.16
+      readable-stream: 2.3.8
+      rimraf2: 2.8.2(glob@7.2.3)
+      short-hash: 1.0.0
+      temp-suffix: 0.1.14
+      zip: 1.2.0
+    transitivePeerDependencies:
+      - glob
+
+  zip@1.2.0:
+    dependencies:
+      bops: 0.1.1
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index efbf4da88..9757b6eb2 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -67,7 +67,7 @@
     }
 
     getTabPosition(tab) {
-      return Math.max(gBrowser._numVisiblePinTabs, tab._tPos) + 1;
+      return Math.max(gBrowser.pinnedTabCount, tab._tPos) + 1;
     }
 
     createBrowserElement(url, currentTab, existingTab = null) {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index ce90ef9aa..42143d887 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857a82ff94c 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..d5ac2cf891ec928bec4f95fd5ff0ee8d91294f78 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -28,6 +28,17 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          }
  
          /* Protects from close-tab-button errant doubleclick:
+@@ -455,8 +456,8 @@
+           let winUtils = window.windowUtils;
+           let endOfTab =
+             winUtils.getBoundsWithoutFlushing(lastTab)[
+-              (this.verticalMode && "bottom") ||
+-                (this.#rtlMode ? "left" : "right")
++            (this.verticalMode && "bottom") ||
++            (this.#rtlMode ? "left" : "right")
+             ];
+           if (
+             (this.verticalMode && event.clientY > endOfTab) ||
 @@ -659,7 +660,7 @@
        if (this.#isContainerVerticalPinnedExpanded(tab)) {
          // In expanded vertical mode, the max number of pinned tabs per row is dynamic
@@ -78,7 +89,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
                  tab.removeAttribute("tabdrop-samewindow");
  
 -                this._finishAnimateTabMove();
-+              this._finishAnimateTabMove(true);
++                this._finishAnimateTabMove(true);
                  if (dropIndex !== false) {
                    gBrowser.moveTabTo(tab, dropIndex);
                    if (!directionForward) {
@@ -87,10 +98,19 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
                  gBrowser.syncThrobberAnimations(tab);
                };
 -              if (gReduceMotion) {
-+            if (gReduceMotion || true) {
++              if (gReduceMotion || true) {
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
+@@ -1191,7 +1203,7 @@
+         let links;
+         try {
+           links = browserDragAndDrop.dropLinks(event, true);
+-        } catch (ex) {}
++        } catch (ex) { }
+ 
+         if (!links || links.length === 0) {
+           return;
 @@ -1263,7 +1275,8 @@
        if (
          dt.mozUserCancelled ||
@@ -101,6 +121,33 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        ) {
          delete draggedTab._dragData;
          return;
+@@ -1346,7 +1359,7 @@
+       var left = Math.min(
+         Math.max(
+           event.screenX * ourCssToDesktopScale -
+-            draggedTab._dragData.offsetX * screenCssToDesktopScale,
++          draggedTab._dragData.offsetX * screenCssToDesktopScale,
+           availX
+         ),
+         availX + availWidth - winWidth
+@@ -1354,7 +1367,7 @@
+       var top = Math.min(
+         Math.max(
+           event.screenY * ourCssToDesktopScale -
+-            draggedTab._dragData.offsetY * screenCssToDesktopScale,
++          draggedTab._dragData.offsetY * screenCssToDesktopScale,
+           availY
+         ),
+         availY + availHeight - winHeight
+@@ -1467,7 +1480,7 @@
+       // Normal tab title is used also in the permanent private browsing mode.
+       const l10nId =
+         PrivateBrowsingUtils.isWindowPrivate(window) &&
+-        !Services.prefs.getBoolPref("browser.privatebrowsing.autostart")
++          !Services.prefs.getBoolPref("browser.privatebrowsing.autostart")
+           ? "tabbrowser-empty-private-tab-title"
+           : "tabbrowser-empty-tab-title";
+       return gBrowser.tabLocalization.formatValueSync(l10nId);
 @@ -1512,9 +1525,18 @@
        }
  
@@ -140,6 +187,15 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        );
      }
  
+@@ -1684,7 +1707,7 @@
+       // The height we got may be incorrect if a flush is pending so re-check it after
+       // a flush completes.
+       window
+-        .promiseDocumentFlushed(() => {})
++        .promiseDocumentFlushed(() => { })
+         .then(
+           () => {
+             height =
 @@ -1816,7 +1839,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
@@ -184,12 +240,18 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1963,13 +1987,13 @@
-       let verticalTabsContainer = document.getElementById(
-         "vertical-pinned-tabs-container"
+@@ -1904,7 +1928,7 @@
+ 
+         if (tabsToReset.length) {
+           window
+-            .promiseDocumentFlushed(() => {})
++            .promiseDocumentFlushed(() => { })
+             .then(() => {
+               window.requestAnimationFrame(() => {
+                 for (let tab of tabsToReset) {
+@@ -1965,11 +1989,11 @@
        );
--      let numPinned = gBrowser.pinnedTabCount;
-+      let numPinned = gBrowser._numVisiblePinTabs;
+       let numPinned = gBrowser.pinnedTabCount;
  
 -      if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
 -        let tabs = this.visibleTabs;
@@ -235,6 +297,26 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          pinned ? numPinned : undefined
        );
  
+@@ -2367,8 +2391,8 @@
+       };
+       let moveOverThreshold = gBrowser._tabGroupsEnabled
+         ? Services.prefs.getIntPref(
+-            "browser.tabs.dragdrop.moveOverThresholdPercent"
+-          ) / 100
++          "browser.tabs.dragdrop.moveOverThresholdPercent"
++        ) / 100
+         : 0.5;
+       moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
+       let newIndex = getDragOverIndex(moveOverThreshold);
+@@ -2420,7 +2444,7 @@
+         if (
+           groupDropIndex in this.allTabs &&
+           this.allTabs[groupDropIndex] ==
+-            this.allTabs[groupDropIndex].group?.tabs.at(-1)
++          this.allTabs[groupDropIndex].group?.tabs.at(-1)
+         ) {
+           dragData.groupDropIndex = groupDropIndex;
+           dragData.groupDropAction = GROUP_DROP_ACTION_APPEND;
 @@ -2502,8 +2526,9 @@
        );
      }
@@ -247,7 +329,27 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          return;
        }
  
-@@ -2668,9 +2693,9 @@
+@@ -2552,7 +2577,7 @@
+ 
+         let movingTabSize =
+           movingTab.getBoundingClientRect()[
+-            this.verticalMode ? "height" : "width"
++          this.verticalMode ? "height" : "width"
+           ];
+         let shift = (movingTabNewIndex - movingTabOldIndex) * movingTabSize;
+ 
+@@ -2659,18 +2684,17 @@
+           let translatePos =
+             (this.#rtlMode ? -1 : 1) *
+             t._moveTogetherSelectedTabsData.translatePos;
+-          t.style.transform = `translate${
+-            this.verticalMode ? "Y" : "X"
+-          }(${translatePos}px)`;
++          t.style.transform = `translate${this.verticalMode ? "Y" : "X"
++            }(${translatePos}px)`;
+         }
+       }
+ 
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -259,7 +361,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        }
      }
  
-@@ -2754,7 +2779,7 @@
+@@ -2754,7 +2778,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -268,7 +370,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          return;
        }
  
-@@ -2772,12 +2797,14 @@
+@@ -2772,12 +2796,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -284,7 +386,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
                selectedTab,
              ];
            })
-@@ -2794,8 +2821,11 @@
+@@ -2794,8 +2820,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -292,13 +394,13 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
 -              tabRect.right <= scrollRect.right
 +              this.verticalMode
 +                ? scrollRect.top <= tabRect.top &&
-+                  tabRect.bottom <= scrollRect.bottom
++                tabRect.bottom <= scrollRect.bottom
 +                : scrollRect.left <= tabRect.left &&
-+                  tabRect.right <= scrollRect.right
++                tabRect.right <= scrollRect.right
              ) {
                return;
              }
-@@ -2803,21 +2833,29 @@
+@@ -2803,21 +2832,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (
@@ -309,13 +411,13 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
 -                ) <= scrollRect.width
 +                !selectedRect || (this.verticalMode
 +                  ? Math.max(
-+                      tabRect.bottom - selectedRect.top,
-+                      selectedRect.bottom - tabRect.top
-+                    ) <= scrollRect.height
++                    tabRect.bottom - selectedRect.top,
++                    selectedRect.bottom - tabRect.top
++                  ) <= scrollRect.height
 +                  : Math.max(
-+                      tabRect.right - selectedRect.left,
-+                      selectedRect.right - tabRect.left
-+                    ) <= scrollRect.width)
++                    tabRect.right - selectedRect.left,
++                    selectedRect.right - tabRect.left
++                  ) <= scrollRect.width)
                ) {
                  this.arrowScrollbox.ensureElementIsVisible(tabToScrollIntoView);
                  return;
@@ -338,3 +440,12 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
              }
  
              if (!this._animateElement.hasAttribute("highlight")) {
+@@ -2904,7 +2941,7 @@
+           sourceNode.localName == "tab" &&
+           sourceNode.ownerGlobal.isChromeWindow &&
+           sourceNode.ownerDocument.documentElement.getAttribute("windowtype") ==
+-            "navigator:browser" &&
++          "navigator:browser" &&
+           sourceNode.ownerGlobal.gBrowser.tabContainer == sourceNode.container
+         ) {
+           // Do not allow transfering a private tab to a non-private window
diff --git a/surfer.json b/surfer.json
index ec1373d72..30735e138 100644
--- a/surfer.json
+++ b/surfer.json
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file

From 48244046368cb87b666022b748f7a2ee7adacaa2 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 6 Feb 2025 13:56:25 +0100
Subject: [PATCH 080/191] Fixed sidebar icons

---
 src/browser/base/zen-components/ZenPinnedTabManager.mjs | 3 +++
 src/browser/themes/shared/zen-icons/icons.css           | 2 +-
 src/browser/themes/shared/zen-icons/jar.inc.mn          | 2 ++
 src/browser/themes/shared/zen-icons/sidebar.svg         | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/browser/themes/shared/zen-icons/sidebar.svg

diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index d5ed4b9d5..5f69ab10b 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -472,6 +472,9 @@
             this._resetTabToStoredState(selectedTab);
           }
           if (behavior.includes('unload')) {
+            if (selectedTab.hasAttribute('glance-id')) {
+              break;
+            }
             gBrowser.explicitUnloadTabs([selectedTab]);
             selectedTab.removeAttribute('linkedpanel');
           }
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index f2d8c8193..f41e7abd0 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -390,7 +390,7 @@
 }
 
 #zen-expand-sidebar-button {
-  list-style-image: url('move-tab.svg') !important;
+  list-style-image: url('sidebar.svg') !important;
 }
 
 .panel-header > .subviewbutton-back {
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index a21b66ae7..62141b541 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -78,6 +78,7 @@
   skin/classic/browser/zen-icons/midi.svg                      (../shared/zen-icons/midi.svg) 
   skin/classic/browser/zen-icons/move-tab.svg                      (../shared/zen-icons/move-tab.svg) 
   skin/classic/browser/zen-icons/new-tab-image.svg                      (../shared/zen-icons/new-tab-image.svg) 
+  skin/classic/browser/zen-icons/nucleo-copyright-notice.html                      (../shared/zen-icons/nucleo-copyright-notice.html) 
   skin/classic/browser/zen-icons/open.svg                      (../shared/zen-icons/open.svg) 
   skin/classic/browser/zen-icons/page-portrait.svg                      (../shared/zen-icons/page-portrait.svg) 
   skin/classic/browser/zen-icons/passwords.svg                      (../shared/zen-icons/passwords.svg) 
@@ -108,6 +109,7 @@
   skin/classic/browser/zen-icons/send-to-device.svg                      (../shared/zen-icons/send-to-device.svg) 
   skin/classic/browser/zen-icons/settings.svg                      (../shared/zen-icons/settings.svg) 
   skin/classic/browser/zen-icons/share.svg                      (../shared/zen-icons/share.svg) 
+  skin/classic/browser/zen-icons/sidebar.svg                      (../shared/zen-icons/sidebar.svg) 
   skin/classic/browser/zen-icons/sidebars-right.svg                      (../shared/zen-icons/sidebars-right.svg) 
   skin/classic/browser/zen-icons/source-code.svg                      (../shared/zen-icons/source-code.svg) 
   skin/classic/browser/zen-icons/spell-check.svg                      (../shared/zen-icons/spell-check.svg) 
diff --git a/src/browser/themes/shared/zen-icons/sidebar.svg b/src/browser/themes/shared/zen-icons/sidebar.svg
new file mode 100644
index 000000000..d1c18a645
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/sidebar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="8.25" y1="2.75" x2="8.25" y2="15.25" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><line x1="4.25" y1="6.25" x2="5.75" y2="6.25" data-color="color-2"></line><line x1="4.25" y1="9" x2="5.75" y2="9" data-color="color-2"></line><line x1="4.25" y1="11.75" x2="5.75" y2="11.75" data-color="color-2"></line></g></svg>
\ No newline at end of file

From 19b7eacfc4a189d7022983e9edfee41fc80a6240 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 21:40:04 +0800
Subject: [PATCH 081/191] Added persisting in tab label renaming, added tab
 label resetting

---
 src/browser/base/content/ZenUIManager.mjs | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 4eafe5974..fd0905c81 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -601,6 +601,23 @@ var gZenVerticalTabsManager = {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
       tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
+      tab.renamedName = null;
+      tab.originalName = null;
+
+      // Persist tab label and store changes for resetting
+      let observer = new MutationObserver((mutations) => {
+        if (!tab.renamedName) {
+          return;
+        }
+        mutations.forEach((mutation) => {
+          if (tab.label !== tab.renamedName) {
+            tab.originalName = tab.label;
+            tab.label = tab.renamedName;
+          }
+        });
+      });
+      // Run on all changes of label
+      observer.observe(tab, { attributes: true, attributeFilter: ['label'] });
     }
   },
 
@@ -608,12 +625,24 @@ var gZenVerticalTabsManager = {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value;
-      this._tabEdited.setAttribute('label', newName);
+      let newName = input.value.trim();
+
+      // Check if name is blank, reset if so
+      if (newName) {
+        this._tabEdited.originalName = this._tabEdited.label;
+        this._tabEdited.label = newName;
+        this._tabEdited.renamedName = newName;
+      } else {
+        this._tabEdited.label = this._tabEdited.originalName;
+        this._tabEdited.originalName = null;
+        this._tabEdited.renamedName = null;
+      }
+
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
       document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
@@ -658,6 +687,7 @@ var gZenVerticalTabsManager = {
   },
 
   contextRenameTabHalt(event) {
+    // Ignore click event if it's clicking the input
     if (event.target.closest('#tab-label-input')) {
       return;
     }

From 1f6233c1e14db89cd7e34d9454ac47b6ab0c8c72 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 6 Feb 2025 18:23:26 +0100
Subject: [PATCH 082/191] Fixed browser sidebar

---
 .../components/sidebar/browser-sidebar-js.patch       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/sidebar/browser-sidebar-js.patch b/src/browser/components/sidebar/browser-sidebar-js.patch
index ef02cb4ce..4bd9fb764 100644
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index 1937a01b9940c79782cc2ad002b09ea5938b89e0..0846ab4b3750a556617ff8d4546d9131cda35296 100644
+index 1937a01b9940c79782cc2ad002b09ea5938b89e0..a702e8c520fad651a98615215f94657b7e1c58eb 100644
 --- a/browser/components/sidebar/browser-sidebar.js
 +++ b/browser/components/sidebar/browser-sidebar.js
 @@ -671,7 +671,7 @@ var SidebarController = {
@@ -11,3 +11,12 @@ index 1937a01b9940c79782cc2ad002b09ea5938b89e0..0846ab4b3750a556617ff8d4546d9131
      [...browser.children].forEach((node, i) => {
        node.style.order = i + 1;
      });
+@@ -681,7 +681,7 @@ var SidebarController = {
+       // DOM ordering is:     sidebar-main |  launcher-splitter | sidebar-box  | splitter | tabbrowser-tabbox |
+       // Want to display as:  |   tabbrowser-tabbox  | splitter |  sidebar-box  | launcher-splitter | sidebar-main
+       // So we just swap box and tabbrowser-tabbox ordering and move sidebar-main to the end
+-      let tabbox = document.getElementById("tabbrowser-tabbox");
++      let tabbox = document.getElementById("tabbrowser-tabpanels");
+       let boxOrdinal = this._box.style.order;
+       this._box.style.order = tabbox.style.order;
+ 

From 3a5a0be013312c3122cd03c898bf045a3f7c8e54 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 7 Feb 2025 01:33:48 +0100
Subject: [PATCH 083/191] Fixed icons colors and other details

---
 src/browser/base/content/ZenStartup.mjs       |   2 -
 .../base/content/browser-init-js.patch        |   5 +-
 .../zen-styles/zen-tabs/vertical-tabs.css     |   2 +-
 .../base/zen-components/ZenCompactMode.mjs    |  12 +-
 .../base/zen-components/ZenUIMigration.mjs    | 106 +++++++++---------
 .../components/BrowserGlue-sys-mjs.patch      |  22 +++-
 .../shared/zen-icons/canvas-blocked.svg       |   2 +-
 .../themes/shared/zen-icons/firefox.svg       |   2 +-
 src/browser/themes/shared/zen-icons/mail.svg  |   2 +-
 src/browser/themes/shared/zen-icons/midi.svg  |   2 +-
 .../shared/zen-icons/pocket-outline.svg       |   2 +-
 11 files changed, 91 insertions(+), 68 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 055bc2eee..67847f5f4 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -33,8 +33,6 @@
 
         this._initSidebarScrolling();
 
-        gZenUIMigration.init();
-
         gZenCompactModeManager.init();
         ZenWorkspaces.init();
         gZenVerticalTabsManager.init();
diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch
index a604b8ef9..0cbd4ecba 100644
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index 63100defacf66c6b3232b9e0a783a5fd14e3a46a..eb7ed966628a595847b850f981418d425b78f14b 100644
+index 63100defacf66c6b3232b9e0a783a5fd14e3a46a..22b79b021ff0baab4dac602447a124308208c828 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
 @@ -162,13 +162,15 @@ var gBrowserInit = {
@@ -19,12 +19,11 @@ index 63100defacf66c6b3232b9e0a783a5fd14e3a46a..eb7ed966628a595847b850f981418d42
      if (isVerticalTabs) {
        // Show the vertical tabs toolbar
        setToolbarVisibility(
-@@ -287,6 +289,11 @@ var gBrowserInit = {
+@@ -287,6 +289,10 @@ var gBrowserInit = {
      gPrivateBrowsingUI.init();
      BrowserSearch.init();
      BrowserPageActions.init();
 +
-+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenUIMigration.mjs", window);
 +Services.scriptloader.loadSubScript("chrome://browser/content/ZenStartup.mjs", window);
 +Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", window);
 +
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 94abd50a3..b85d4f8e7 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1016,7 +1016,7 @@
       position: relative;
 
       &::before {
-        background: light-dark(rgba(255, 255, 255, 0.85), rgba(68, 64, 64, 0.85));
+        backdrop-filter: invert(0.5);
         margin: 2px;
         border-radius: calc(var(--border-radius-medium) - 2px);
         position: absolute;
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 221d6025e..e5fd09fc5 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -41,9 +41,15 @@ var gZenCompactModeManager = {
 
   get preference() {
     if (!document.documentElement.hasAttribute('zen-compact-mode')) {
-      document.documentElement.setAttribute(
-        'zen-compact-mode',
-        lazyCompactMode.mainAppWrapper.getAttribute('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';
diff --git a/src/browser/base/zen-components/ZenUIMigration.mjs b/src/browser/base/zen-components/ZenUIMigration.mjs
index 1f025712d..0fe371ca8 100644
--- a/src/browser/base/zen-components/ZenUIMigration.mjs
+++ b/src/browser/base/zen-components/ZenUIMigration.mjs
@@ -1,60 +1,64 @@
-{
-  const PREF_NAME = 'zen.migration.version';
-  const MIGRATION_VERSION = 1;
+const lazy = {};
 
-  class ZenUIMigration {
-    init() {
-      if (Services.prefs.prefHasUserValue(PREF_NAME)) {
-        this._migrate();
-      }
-      this.clearVariables();
+ChromeUtils.defineESModuleGetters(lazy, {
+  BrowserWindowTracker: 'resource:///modules/BrowserWindowTracker.sys.mjs',
+});
+
+class ZenUIMigration {
+  PREF_NAME = 'zen.migration.version';
+  MIGRATION_VERSION = 1;
+
+  init(isNewProfile, win) {
+    console.log(isNewProfile, win);
+    if (!isNewProfile) {
+      this._migrate(win);
     }
+    this.clearVariables();
+  }
 
-    get _migrationVersion() {
-      return Services.prefs.getIntPref(PREF_NAME, 0);
-    }
+  get _migrationVersion() {
+    return Services.prefs.getIntPref(this.PREF_NAME, 0);
+  }
 
-    set _migrationVersion(value) {
-      Services.prefs.setIntPref(PREF_NAME, value);
-    }
+  set _migrationVersion(value) {
+    Services.prefs.setIntPref(this.PREF_NAME, value);
+  }
 
-    _migrate() {
-      if (this._migrationVersion < 1) {
-        this._migrateV1();
-      }
-    }
-
-    clearVariables() {
-      this._migrationVersion = MIGRATION_VERSION;
-      window.gZenUIMigration = null;
-    }
-
-    async _migrateV1() {
-      // Introduction of the new URL bar, show a message to the user
-      const notification = gNotificationBox.appendNotification(
-        'zen-new-urlbar-notification',
-        {
-          label: { 'l10n-id': 'zen-new-urlbar-notification' },
-          image: 'chrome://browser/skin/notification-icons/persistent-storage-blocked.svg',
-          priority: gNotificationBox.PRIORITY_WARNING_HIGH,
-        },
-        [
-          {
-            'l10n-id': 'zen-disable',
-            accessKey: 'D',
-            callback: () => {
-              Services.prefs.setBoolPref('zen.urlbar.replace-newtab', false);
-            },
-          },
-          {
-            link: 'https://docs.zen-browser.app/user-manual/urlbar/',
-            'l10n-id': 'zen-learn-more-text',
-          },
-        ]
-      );
-      notification.persistence = -1;
+  _migrate(win) {
+    if (this._migrationVersion < 1) {
+      this._migrateV1(win);
     }
   }
 
-  window.gZenUIMigration = new ZenUIMigration();
+  clearVariables() {
+    this._migrationVersion = this.MIGRATION_VERSION;
+  }
+
+  async _migrateV1(win) {
+    // Introduction of the new URL bar, show a message to the user
+    const notification = win.gNotificationBox.appendNotification(
+      'zen-new-urlbar-notification',
+      {
+        label: { 'l10n-id': 'zen-new-urlbar-notification' },
+        image: 'chrome://browser/skin/notification-icons/persistent-storage-blocked.svg',
+        priority: win.gNotificationBox.PRIORITY_WARNING_HIGH,
+      },
+      [
+        {
+          'l10n-id': 'zen-disable',
+          accessKey: 'D',
+          callback: () => {
+            Services.prefs.setBoolPref('zen.urlbar.replace-newtab', false);
+          },
+        },
+        {
+          link: 'https://docs.zen-browser.app/user-manual/urlbar/',
+          'l10n-id': 'zen-learn-more-text',
+        },
+      ]
+    );
+    notification.persistence = -1;
+  }
 }
+
+export var gZenUIMigration = new ZenUIMigration();
diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch
index 042d3a1d4..cc19b6ee6 100644
--- a/src/browser/components/BrowserGlue-sys-mjs.patch
+++ b/src/browser/components/BrowserGlue-sys-mjs.patch
@@ -1,8 +1,24 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index 2de73e75bf98b21dde9ec05213a66f9e9039200f..04ab3ea4c47d674778e8965654867c4cf0f99161 100644
+index b888a753a7f23a9800fe04da51a4e6b898314ff2..35eea774e1ea4b1807ec65ebc767f423d81602bd 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
-@@ -4643,6 +4643,7 @@ BrowserGlue.prototype = {
+@@ -121,6 +121,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+   WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.sys.mjs",
+   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
+   setTimeout: "resource://gre/modules/Timer.sys.mjs",
++  gZenUIMigration: "chrome://browser/content/zen-components/ZenUIMigration.mjs",
+ });
+ 
+ if (AppConstants.MOZ_UPDATER) {
+@@ -1951,6 +1952,7 @@ BrowserGlue.prototype = {
+ 
+     lazy.UrlbarPrefs.updateFirefoxSuggestScenario();
+ 
++    lazy.gZenUIMigration.init(this._isNewProfile, aWindow);
+     // A channel for "remote troubleshooting" code...
+     let channel = new lazy.WebChannel(
+       "remote-troubleshooting",
+@@ -4761,6 +4763,7 @@ BrowserGlue.prototype = {
    },
  
    async _maybeShowDefaultBrowserPrompt() {
@@ -10,7 +26,7 @@ index 2de73e75bf98b21dde9ec05213a66f9e9039200f..04ab3ea4c47d674778e8965654867c4c
      // Highest priority is about:welcome window modal experiment
      // Second highest priority is the upgrade dialog, which can include a "primary
      // browser" request and is limited in various ways, e.g., major upgrades.
-@@ -5169,6 +5170,16 @@ BrowserGlue.prototype = {
+@@ -5302,6 +5305,16 @@ BrowserGlue.prototype = {
      "nsIObserver",
      "nsISupportsWeakReference",
    ]),
diff --git a/src/browser/themes/shared/zen-icons/canvas-blocked.svg b/src/browser/themes/shared/zen-icons/canvas-blocked.svg
index a7d8b10f0..3fa44dd19 100644
--- a/src/browser/themes/shared/zen-icons/canvas-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/canvas-blocked.svg
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" fill-opacity="context-fill-opacity">
   <defs><clipPath id="a"><path d="M2.1 0 16 13.9V0zM0 .7V16h15.3z"/></clipPath></defs>
   <path clip-path="url(#a)" d="M4 1a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V4a3 3 0 0 0-3-3H4zm0 1h8a2 2 0 0 1 2 2v8c0 .373-.102.72-.28 1.02L9.05 8.432a1.5 1.5 0 0 0-2.101 0l-4.67 4.588a1.988 1.988 0 0 1-.28-1.02V4a2 2 0 0 1 2-2zm6.5 2a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm0 1a.5.5 0 1 1 0 1 .5.5 0 0 1 0-1zM8 9.002c.127 0 .252.047.35.143l4.662 4.582A1.99 1.99 0 0 1 12 14H4c-.37 0-.715-.099-1.012-.273L7.65 9.145A.496.496 0 0 1 8 9.002z"/>
   <path d="M.5 0a.5.5 0 0 0-.354.146.5.5 0 0 0 0 .707l15 15a.5.5 0 0 0 .707 0 .5.5 0 0 0 0-.707l-15-15A.5.5 0 0 0 .499 0z"/>
diff --git a/src/browser/themes/shared/zen-icons/firefox.svg b/src/browser/themes/shared/zen-icons/firefox.svg
index 3e16f19a0..dd324812a 100644
--- a/src/browser/themes/shared/zen-icons/firefox.svg
+++ b/src/browser/themes/shared/zen-icons/firefox.svg
@@ -3,4 +3,4 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="black" fill-opacity="context-fill-opacity"><path d="M14.7498,13.0913c-.0154.9253-.7896,1.6587-1.715,1.6587h-6.956c-.2705,0-.4541-.275-.3505-.5248l.0024-.0057c.4574-1.1044,1.1996-2.0362,2.1473-2.7161.1179-.0846.2601-.1284.4052-.1284h4.7793c.9416,0,1.703.7711,1.6873,1.7163Z"/><path d="M9.9212,1.25c.2705,0,.4541.275.3505.5248l-.0024.0057c-.4574,1.1044-1.1996,2.0362-2.1473,2.7161-.1179.0846-.2601.1284-.4052.1284H2.9653c-.9254,0-1.6996-.7334-1.715-1.6587-.0158-.9452.7457-1.7163,1.6873-1.7163h6.9837Z"/><path d="M2.9372,14.75c-.2152,0-.4339-.0414-.6451-.1289-.861-.3566-1.2699-1.3437-.9132-2.2047.5485-1.3241,1.3346-2.5112,2.3367-3.5283,1.0381-1.0537,2.2623-1.877,3.6387-2.4471,1.8919-.7837,3.3654-2.2571,4.149-4.149.3566-.861,1.3437-1.2698,2.2047-.9132.861.3566,1.2699,1.3437.9132,2.2047-.5485,1.3241-1.3346,2.5112-2.3367,3.5283-1.0381,1.0537-2.2623,1.877-3.6387,2.4471-1.8919.7837-3.3654,2.2571-4.149,4.149-.2691.6498-.8975,1.0421-1.5596,1.0421Z"/></svg>
+<svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="currentColor" fill-opacity="context-fill-opacity"><path d="M14.7498,13.0913c-.0154.9253-.7896,1.6587-1.715,1.6587h-6.956c-.2705,0-.4541-.275-.3505-.5248l.0024-.0057c.4574-1.1044,1.1996-2.0362,2.1473-2.7161.1179-.0846.2601-.1284.4052-.1284h4.7793c.9416,0,1.703.7711,1.6873,1.7163Z"/><path d="M9.9212,1.25c.2705,0,.4541.275.3505.5248l-.0024.0057c-.4574,1.1044-1.1996,2.0362-2.1473,2.7161-.1179.0846-.2601.1284-.4052.1284H2.9653c-.9254,0-1.6996-.7334-1.715-1.6587-.0158-.9452.7457-1.7163,1.6873-1.7163h6.9837Z"/><path d="M2.9372,14.75c-.2152,0-.4339-.0414-.6451-.1289-.861-.3566-1.2699-1.3437-.9132-2.2047.5485-1.3241,1.3346-2.5112,2.3367-3.5283,1.0381-1.0537,2.2623-1.877,3.6387-2.4471,1.8919-.7837,3.3654-2.2571,4.149-4.149.3566-.861,1.3437-1.2698,2.2047-.9132.861.3566,1.2699,1.3437.9132,2.2047-.5485,1.3241-1.3346,2.5112-2.3367,3.5283-1.0381,1.0537-2.2623,1.877-3.6387,2.4471-1.8919.7837-3.3654,2.2571-4.149,4.149-.2691.6498-.8975,1.0421-1.5596,1.0421Z"/></svg>
diff --git a/src/browser/themes/shared/zen-icons/mail.svg b/src/browser/themes/shared/zen-icons/mail.svg
index f9e4ace67..839ce7d83 100644
--- a/src/browser/themes/shared/zen-icons/mail.svg
+++ b/src/browser/themes/shared/zen-icons/mail.svg
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" fill-opacity="context-fill-opacity">
   <path d="M2.5 1A2.5 2.5 0 0 0 0 3.5v8A2.5 2.5 0 0 0 2.5 14h11a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 13.5 1h-11zm0 1h11A1.5 1.5 0 0 1 15 3.5v.3L8 7.92 1 3.803V3.5A1.5 1.5 0 0 1 2.5 2zM15 4.961V11.5a1.5 1.5 0 0 1-1.5 1.5h-11A1.5 1.5 0 0 1 1 11.5V4.963l6.746 3.969.082.037a.5.5 0 0 0 .426-.037L15 4.961z"/>
 </svg>
 a<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,5.75l6.767,3.733c.301,.166,.665,.166,.966,0l6.767-3.733" data-color="color-2"></path><rect x="1.75" y="3.25" width="14.5" height="11.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/midi.svg b/src/browser/themes/shared/zen-icons/midi.svg
index c7a3aae1c..991acba26 100644
--- a/src/browser/themes/shared/zen-icons/midi.svg
+++ b/src/browser/themes/shared/zen-icons/midi.svg
@@ -3,6 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" fill-opacity="context-fill-opacity">
   <path d="M.5 2a.5.5 0 0 0-.5.5v11a.5.5 0 0 0 .5.5h15a.5.5 0 0 0 .5-.5v-11a.5.5 0 0 0-.5-.5H.5zM1 3h14v4H1V3zm2.711 1a.75.75 0 1 0 .04 0h-.04zM10.5 4a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2zm-4.289.002a.75.75 0 1 0 .04 0h-.04zM1 8h2v3.5a.5.5 0 0 0 1 0V8h2v3.5a.5.5 0 0 0 1 0V8h2v3.5a.5.5 0 0 0 1 0V8h2v3.5a.5.5 0 0 0 1 0V8h2v5H1V8z"/>
 </svg>
diff --git a/src/browser/themes/shared/zen-icons/pocket-outline.svg b/src/browser/themes/shared/zen-icons/pocket-outline.svg
index c349149b4..7a9d03478 100644
--- a/src/browser/themes/shared/zen-icons/pocket-outline.svg
+++ b/src/browser/themes/shared/zen-icons/pocket-outline.svg
@@ -3,6 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="black" fill-opacity="context-fill-opacity">
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" fill-opacity="context-fill-opacity">
   <path d="M2.5 2A2.507 2.507 0 0 0 0 4.5V7c0 4.412 3.588 8 8 8s8-3.588 8-8V4.5C16 3.125 14.875 2 13.5 2h-11zm0 1h11c.834 0 1.5.666 1.5 1.5V7c0 3.872-3.128 7-7 7s-7-3.128-7-7V4.5C1 3.666 1.666 3 2.5 3zm2 3a.5.5 0 0 0-.353.146.5.5 0 0 0 0 .707l3.5 3.5a.5.5 0 0 0 .706 0l3.5-3.5a.5.5 0 0 0 0-.706.5.5 0 0 0-.706 0L8 9.293 4.854 6.147A.5.5 0 0 0 4.501 6z"/>
 </svg>

From e353d48af885057a4fdf7573689d204dbfbc634a Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 7 Feb 2025 01:42:48 +0100
Subject: [PATCH 084/191] Fixed urlbar

---
 src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css | 2 +-
 src/browser/base/content/zen-styles/zen-urlbar.css             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index b85d4f8e7..94abd50a3 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1016,7 +1016,7 @@
       position: relative;
 
       &::before {
-        backdrop-filter: invert(0.5);
+        background: light-dark(rgba(255, 255, 255, 0.85), rgba(68, 64, 64, 0.85));
         margin: 2px;
         border-radius: calc(var(--border-radius-medium) - 2px);
         position: absolute;
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 216e43238..ad3630fa9 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -10,7 +10,7 @@
 }
 
 #urlbar {
-  --toolbarbutton-border-radius: 10px;
+  --toolbarbutton-border-radius: 8px;
   --urlbarView-separator-color: var(--zen-colors-border);
   --urlbarView-hover-background: var(--toolbarbutton-hover-background);
   --urlbarView-highlight-background: var(--toolbarbutton-hover-background);

From 8f1b7723c8d72f3abc65d9eb355ede74e596585e Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Fri, 7 Feb 2025 11:56:44 +0800
Subject: [PATCH 085/191] Added zen-has-static-label to session store,
 temporarily removed label persist functionality, rewrote tab reset to use DOM

---
 src/browser/base/content/ZenUIManager.mjs     | 47 +++++++------------
 .../sessionstore/TabState-sys-mjs.patch       |  5 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 42 ++++++++++-------
 3 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index fd0905c81..81071b38e 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -600,28 +600,11 @@ var gZenVerticalTabsManager = {
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
-      tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
-      tab.renamedName = null;
-      tab.originalName = null;
-
-      // Persist tab label and store changes for resetting
-      let observer = new MutationObserver((mutations) => {
-        if (!tab.renamedName) {
-          return;
-        }
-        mutations.forEach((mutation) => {
-          if (tab.label !== tab.renamedName) {
-            tab.originalName = tab.label;
-            tab.label = tab.renamedName;
-          }
-        });
-      });
-      // Run on all changes of label
-      observer.observe(tab, { attributes: true, attributeFilter: ['label'] });
+      tab.addEventListener('dblclick', this.renameTabStart.bind(this));
     }
   },
 
-  contextRenameTabKeydown(event) {
+  renameTabKeydown(event) {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
@@ -629,19 +612,21 @@ var gZenVerticalTabsManager = {
 
       // Check if name is blank, reset if so
       if (newName) {
-        this._tabEdited.originalName = this._tabEdited.label;
         this._tabEdited.label = newName;
-        this._tabEdited.renamedName = newName;
+        this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        this._tabEdited.label = this._tabEdited.originalName;
-        this._tabEdited.originalName = null;
-        this._tabEdited.renamedName = null;
+        // If the page is loaded, get the title of the page. Otherwise, keep name as is
+        this._tabEdited.label = gBrowser.getBrowserForTab(this._tabEdited).contentTitle || this._tabEdited.label;
+        // If the page had a title, reset the zen-has-static-label attribute
+        if (gBrowser.getBrowserForTab(this._tabEdited).contentTitle) {
+          this._tabEdited.removeAttribute('zen-has-static-label');
+        }
       }
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      document.removeEventListener('click', this.renameTabHalt.bind(this));
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
@@ -650,12 +635,12 @@ var gZenVerticalTabsManager = {
 
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      document.removeEventListener('click', this.renameTabHalt.bind(this));
       this._tabEdited = null;
     }
   },
 
-  contextRenameTabStart(event) {
+  renameTabStart(event) {
     if (this._tabEdited) return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
     if (!this._tabEdited.pinned) {
@@ -674,7 +659,7 @@ var gZenVerticalTabsManager = {
     const input = document.createElement('input');
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
-    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.addEventListener('keydown', this.renameTabKeydown.bind(this));
     input.style['white-space'] = 'nowrap';
     input.style['overflow-x'] = 'scroll';
     input.style['margin'] = '0';
@@ -683,10 +668,10 @@ var gZenVerticalTabsManager = {
     input.focus();
     input.select();
 
-    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+    document.addEventListener('click', this.renameTabHalt.bind(this));
   },
 
-  contextRenameTabHalt(event) {
+  renameTabHalt(event) {
     // Ignore click event if it's clicking the input
     if (event.target.closest('#tab-label-input')) {
       return;
@@ -699,7 +684,7 @@ var gZenVerticalTabsManager = {
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 
-    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+    document.removeEventListener('click', this.renameTabHalt.bind(this));
     this._tabEdited = null;
   },
 };
diff --git a/src/browser/components/sessionstore/TabState-sys-mjs.patch b/src/browser/components/sessionstore/TabState-sys-mjs.patch
index a38f9b7c4..26972ac49 100644
--- a/src/browser/components/sessionstore/TabState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabState-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..83bf443ca158c07e05075777da02b7f228d83dff 100644
+index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..dc0fdf17952df397a684f8a1da2f71739d007350 100644
 --- a/browser/components/sessionstore/TabState.sys.mjs
 +++ b/browser/components/sessionstore/TabState.sys.mjs
-@@ -84,6 +84,13 @@ class _TabState {
+@@ -84,6 +84,14 @@ class _TabState {
        tabData.groupId = tab.group.id;
      }
  
@@ -12,6 +12,7 @@ index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..83bf443ca158c07e05075777da02b7f2
 +    tabData.zenDefaultUserContextId = tab.getAttribute("zenDefaultUserContextId");
 +    tabData.zenPinnedEntry = tab.getAttribute("zen-pinned-entry");
 +    tabData.zenPinnedIcon = tab.getAttribute("zen-pinned-icon");
++    tabData.zenHasStaticLabel = tab.getAttribute("zen-has-static-label");
 +
      tabData.searchMode = tab.ownerGlobal.gURLBar.getSearchMode(browser, true);
  
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 56bb251ba..a78d75c7e 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b1c975652 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9cd3aacffe 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -144,7 +144,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3455,21 @@
+@@ -3403,6 +3455,24 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -162,11 +162,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
++          }
++          if (tabData.zenHasStaticLabel) {
++            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3483,7 @@
+@@ -3416,6 +3486,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -174,7 +177,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3519,21 @@
+@@ -3451,7 +3522,24 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -193,11 +196,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
++          }
++          if (tabData.zenHasStaticLabel) {
++            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (select) {
              tabToSelect = tab;
            }
-@@ -3729,7 +3811,7 @@
+@@ -3729,7 +3817,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.
@@ -206,7 +212,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3862,7 @@
+@@ -3780,7 +3868,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -215,7 +221,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4177,9 @@
+@@ -4095,6 +4183,9 @@
          return;
        }
  
@@ -225,7 +231,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        this.removeTabs(selectedTabs);
      }
  
-@@ -4427,6 +4512,7 @@
+@@ -4427,6 +4518,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -233,7 +239,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4443,6 +4529,12 @@
+@@ -4443,6 +4535,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -246,7 +252,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4549,9 @@
+@@ -4457,7 +4555,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -257,7 +263,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4565,6 @@
+@@ -4471,7 +4571,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -265,7 +271,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4703,14 @@
+@@ -4610,14 +4709,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -282,7 +288,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5558,10 @@
+@@ -5465,10 +5564,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -295,7 +301,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5727,6 +5820,9 @@
+@@ -5727,6 +5826,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -305,7 +311,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -7443,6 +7539,7 @@
+@@ -7443,6 +7545,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -313,7 +319,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8508,7 @@ var TabContextMenu = {
+@@ -8411,7 +8514,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -322,7 +328,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8541,7 @@ var TabContextMenu = {
+@@ -8444,7 +8547,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -331,7 +337,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8774,7 @@ var TabContextMenu = {
+@@ -8677,6 +8780,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From d2477b5f8a482a0021259950043028aa0f7184fe Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 19:30:51 +0100
Subject: [PATCH 086/191] Fixed middle clicks on the sidebar not opening a new
 tab

---
 .../content/navigator-toolbox-inc-xhtml.patch  |  4 ++--
 .../base/content/navigator-toolbox-js.patch    | 18 +++++++++++++++++-
 .../base/zen-components/ZenUIMigration.mjs     |  1 -
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 00ad568d9..6d7f1a45c 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index 00391af141d9015fe5839534e5e6b22a91ba65d9..b68767d0fef6cea2756376bbcfe00603d5d1a655 100644
+index a0a382643a2f74b6d789f3641ef300eed202d5e9..8b7b2ae3e7764d5dd77cd344f0cf67aea54a6f47 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -86,7 +86,7 @@ index 00391af141d9015fe5839534e5e6b22a91ba65d9..b68767d0fef6cea2756376bbcfe00603
    <toolbar id="nav-bar"
             class="browser-toolbar chromeclass-location"
             data-l10n-id="navbar-accessible"
-@@ -487,10 +495,12 @@
+@@ -490,10 +498,12 @@
                       consumeanchor="PanelUI-button"
                       data-l10n-id="appmenu-menu-button-closed2"/>
      </toolbaritem>
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index e9c0f33c7..59e00cfd2 100644
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..69009d53d7242c26f777ac2e0bb1897ff27ad916 100644
+index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..3434a833c4d1220554b4df6eeeed83f500c6f812 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -8,7 +8,7 @@
@@ -11,3 +11,19 @@ index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..69009d53d7242c26f777ac2e0bb1897f
      const widgetOverflow = document.getElementById("widget-overflow");
  
      function onPopupShowing(event) {
+@@ -187,6 +187,7 @@ document.addEventListener(
+         #reload-button ,
+         #urlbar-go-button,
+         #reader-mode-button,
++        #zen-browser-tabs-wrapper,
+         #picture-in-picture-button,
+         #shopping-sidebar-button,
+         #urlbar-zoom-button,
+@@ -208,6 +209,7 @@ document.addEventListener(
+         case "vertical-tabs-newtab-button":
+         case "tabs-newtab-button":
+         case "new-tab-button":
++        case "zen-browser-tabs-wrapper":
+           gBrowser.handleNewTabMiddleClick(element, event);
+           break;
+ 
diff --git a/src/browser/base/zen-components/ZenUIMigration.mjs b/src/browser/base/zen-components/ZenUIMigration.mjs
index 1f025712d..5818b3b3d 100644
--- a/src/browser/base/zen-components/ZenUIMigration.mjs
+++ b/src/browser/base/zen-components/ZenUIMigration.mjs
@@ -52,7 +52,6 @@
           },
         ]
       );
-      notification.persistence = -1;
     }
   }
 

From 302331bc7dcfe69e84cd34b27dd7d84161795a28 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 19:48:45 +0100
Subject: [PATCH 087/191] Fixed tabs appearing on the pinned tab container

---
 .../tabbrowser/content/tabs-js.patch          | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index ce90ef9aa..c60c56ef8 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857a82ff94c 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..1d630f0f402610e70e4e17f11813fddbd141cb9e 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -101,7 +101,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1512,9 +1525,18 @@
+@@ -1512,9 +1525,19 @@
        }
  
        this.#allTabs = [
@@ -109,19 +109,20 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
 +        ...document.getElementById("zen-essentials-container").children, ...this.verticalPinnedTabsContainer.children,
          ...children,
        ];
++      const lastPinnedTabIdx = gBrowser.pinnedTabCount;
 +      for (let i = 0; i < this.#allTabs.length; i++) {
 +        // add glance tabs (tabs inside tabs) to the list
 +        const glanceTab = this.#allTabs[i].querySelector("tab[zen-glance-tab]");
 +        if (glanceTab) {
 +          // insert right after the parent tab
-+          this.#allTabs.splice(i + 1, 0, glanceTab);
++          this.#allTabs.splice(Math.min(i + 1, lastPinnedTabIdx), 0, glanceTab);
 +          i++;
 +        }
 +      }
        return this.#allTabs;
      }
  
-@@ -1593,6 +1615,7 @@
+@@ -1593,6 +1616,7 @@
        }
  
        this.#focusableItems = [
@@ -129,7 +130,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1617,8 +1640,8 @@
+@@ -1617,8 +1641,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -140,7 +141,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        );
      }
  
-@@ -1816,7 +1839,7 @@
+@@ -1816,7 +1840,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -149,7 +150,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1855,7 @@
+@@ -1832,6 +1856,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -157,7 +158,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1843,7 +1867,7 @@
+@@ -1843,7 +1868,7 @@
          return;
        }
  
@@ -166,7 +167,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        if (!tabs.length) {
          return;
        }
-@@ -1879,7 +1903,7 @@
+@@ -1879,7 +1904,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -175,7 +176,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1918,7 @@
+@@ -1894,7 +1919,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -184,7 +185,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1963,13 +1987,13 @@
+@@ -1963,13 +1988,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
@@ -202,7 +203,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          }
        }
  
-@@ -1992,8 +2016,8 @@
+@@ -1992,8 +2017,8 @@
      }
  
      _positionPinnedTabs() {
@@ -213,7 +214,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2098,7 @@
+@@ -2074,7 +2099,7 @@
          return;
        }
  
@@ -222,7 +223,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2281,9 @@
+@@ -2257,9 +2282,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -235,7 +236,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2526,9 @@
+@@ -2502,8 +2527,9 @@
        );
      }
  
@@ -247,7 +248,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          return;
        }
  
-@@ -2668,9 +2693,9 @@
+@@ -2668,9 +2694,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -259,7 +260,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
        }
      }
  
-@@ -2754,7 +2779,7 @@
+@@ -2754,7 +2780,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -268,7 +269,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
          return;
        }
  
-@@ -2772,12 +2797,14 @@
+@@ -2772,12 +2798,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -284,7 +285,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
                selectedTab,
              ];
            })
-@@ -2794,8 +2821,11 @@
+@@ -2794,8 +2822,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -298,7 +299,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ad28d73fe7cc6eadc4b4724c75d54857
              ) {
                return;
              }
-@@ -2803,21 +2833,29 @@
+@@ -2803,21 +2834,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (

From 5527aaebe949e2b24d8287071e7e7c26a1d26529 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 21:08:44 +0100
Subject: [PATCH 088/191] Refactor tab selection styles and remove debug log
 from ZenUIMigration

---
 .../base/content/zen-styles/zen-tabs/vertical-tabs.css        | 4 ++--
 src/browser/base/zen-components/ZenUIMigration.mjs            | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 94abd50a3..a4e33e9c8 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -999,7 +999,7 @@
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
-    &[selected] .tab-background {
+    &[visuallyselected] .tab-background {
       &::after {
         content: "";
         inset: -50%;
@@ -1027,7 +1027,7 @@
       }
     }
 
-    &[selected]:hover .tab-background::before {
+    &[visuallyselected]:hover .tab-background::before {
       background: light-dark(rgba(255, 255, 255, 0.80), rgba(68, 64, 64, 0.80));
     }
   }
diff --git a/src/browser/base/zen-components/ZenUIMigration.mjs b/src/browser/base/zen-components/ZenUIMigration.mjs
index 0fe371ca8..6aa1454b7 100644
--- a/src/browser/base/zen-components/ZenUIMigration.mjs
+++ b/src/browser/base/zen-components/ZenUIMigration.mjs
@@ -9,7 +9,6 @@ class ZenUIMigration {
   MIGRATION_VERSION = 1;
 
   init(isNewProfile, win) {
-    console.log(isNewProfile, win);
     if (!isNewProfile) {
       this._migrate(win);
     }

From 64cadfe37a54ca7c5080acb7ef9974bd9d810985 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 22:13:37 +0100
Subject: [PATCH 089/191] Adjust margin styles for URL bar elements to improve
 layout consistency

---
 .../base/content/zen-styles/zen-tabs/vertical-tabs.css      | 4 ++--
 src/browser/base/content/zen-styles/zen-urlbar.css          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index a4e33e9c8..d2211409d 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -94,8 +94,8 @@
   #tracking-protection-icon,
   #tracking-protection-icon-box,
   #blocked-permissions-container > .blocked-permission-icon {
-    width: 12px;
-    height: 12px;
+    width: 14px;
+    height: 14px;
   }
 
   #identity-icon-box,
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index ad3630fa9..0502aa2b8 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -129,7 +129,7 @@
 :root[zen-single-toolbar='true'] {
   .urlbar-page-action:not([open]),
   #tracking-protection-icon-container {
-    margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding)) !important;
+    margin-inline-end: calc(-14px - 2 * var(--urlbar-icon-padding)) !important;
     opacity: 0;
     transition: all 0.1s ease;
   }
@@ -243,7 +243,7 @@ button.popup-notification-dropmarker {
   }
 
   #userContext-indicator {
-    margin-inline-end: 2px;
+    margin-inline-end: 4px;
   }
 
   #urlbar:hover:not([breakout-extend='true']) #userContext-icons {
@@ -288,7 +288,7 @@ button.popup-notification-dropmarker {
 #urlbar .urlbar-page-action,
 #urlbar #tracking-protection-icon-container,
 #urlbar:not([breakout-extend='true']) #identity-box:is(:not(.chromeUI), [pageproxystate='invalid']) #identity-icon-box {
-  border-radius: 10px !important;
+  border-radius: 8px !important;
 }
 
 /* Extensions or similar */

From 527b8a39f8cb34d3bc20f0a7ab65cdc1e055b4b6 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 22:23:06 +0100
Subject: [PATCH 090/191] Enhance URL bar behavior by adjusting primary
 selection suppression and refining CSS styles for compact mode

---
 .../content/zen-styles/zen-compact-mode.css   | 16 ++++++----
 .../urlbar/UrlbarInput-sys-mjs.patch          | 32 +++++++++++++------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 4c4fa1053..0c95505d9 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -241,14 +241,16 @@
           right 0.3s var(--zen-compact-mode-func);
         opacity: 1;
 
-        left: -1px;
-        :root[zen-right-side='true'] & {
-          right: -1px;
-          left: auto;
-        }
+        &:not([supress-primary-adjustment='true']) {
+          left: -1px;
+          :root[zen-right-side='true'] & {
+            right: -1px;
+            left: auto;
+          }
 
-        & #urlbar[open][zen-floating-urlbar='true'] {
-          --zen-urlbar-offset: 0px;
+          & #urlbar[open][zen-floating-urlbar='true'] {
+            --zen-urlbar-offset: 0px;
+          }
         }
       }
     }
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 04b772f1d..6ead8d889 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a726c67e873 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384b21a7fb0 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -16,7 +16,19 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -424,6 +431,10 @@ export class UrlbarInput {
+@@ -348,7 +355,11 @@ export class UrlbarInput {
+     // See _on_select().  HTMLInputElement.select() dispatches a "select"
+     // event but does not set the primary selection.
+     this._suppressPrimaryAdjustment = true;
++    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", true);
+     this.inputField.select();
++    this.document.ownerGlobal.setTimeout(() => {
++      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
++    }, 0);
+     this._suppressPrimaryAdjustment = false;
+   }
+ 
+@@ -424,6 +435,10 @@ export class UrlbarInput {
      hideSearchTerms = false,
      isSameDocument = false
    ) {
@@ -27,7 +39,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
      // We only need to update the searchModeUI on tab switch conditionally
      // as we only persist searchMode with ScotchBonnet enabled.
      if (
-@@ -1087,7 +1098,11 @@ export class UrlbarInput {
+@@ -1087,7 +1102,11 @@ export class UrlbarInput {
      }
  
      if (!result.payload.providesSearchMode) {
@@ -40,7 +52,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
      }
  
      this.controller.recordSelectedResult(event, result);
-@@ -2144,6 +2159,11 @@ export class UrlbarInput {
+@@ -2144,6 +2163,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -52,7 +64,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
      // 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")) {
-@@ -2163,6 +2183,11 @@ export class UrlbarInput {
+@@ -2163,6 +2187,11 @@ export class UrlbarInput {
        return;
      }
  
@@ -64,7 +76,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -3305,7 +3330,7 @@ export class UrlbarInput {
+@@ -3305,7 +3334,7 @@ export class UrlbarInput {
      } else {
        where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
      }
@@ -73,7 +85,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
        if (where == "current") {
          where = "tab";
        } else if (where == "tab") {
-@@ -3859,6 +3884,11 @@ export class UrlbarInput {
+@@ -3859,6 +3888,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -85,7 +97,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -3930,7 +3960,7 @@ export class UrlbarInput {
+@@ -3930,7 +3964,7 @@ export class UrlbarInput {
        }
      }
  
@@ -94,7 +106,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -3970,9 +4000,12 @@ export class UrlbarInput {
+@@ -3970,9 +4004,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -108,7 +120,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8e8e9c06613c5d5f33333fd9e128a72
  
          if (
            event.target != this.inputField &&
-@@ -3982,8 +4015,8 @@ export class UrlbarInput {
+@@ -3982,8 +4019,8 @@ export class UrlbarInput {
            break;
          }
  

From f0976bc582d400785215df1bdc99689afaa30dcf Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 22:46:53 +0100
Subject: [PATCH 091/191] Implement scrollbar state management and adjust
 overflowing behavior in Zen UI components

---
 src/browser/base/content/ZenStartup.mjs            | 3 ++-
 src/browser/base/content/ZenUIManager.mjs          | 8 ++++++--
 src/browser/base/zen-components/ZenCompactMode.mjs | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 67847f5f4..a8880efdd 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -101,7 +101,8 @@
         // to how Gecko internally rounds in those cases, we allow for some
         // minor differences (the internal Gecko layout size is 1/60th of a
         // pixel, so 0.02 should cover it).
-        let overflowing = contentSize - tabContainer.arrowScrollbox.scrollClientSize > 0.02;
+        //let overflowing = contentSize - tabContainer.arrowScrollbox.scrollClientSize > 0.02;
+        let overflowing = true; // cheatign the system, because we want to always show make the element overflowing
 
         window.requestAnimationFrame(() => {
           tabContainer.arrowScrollbox.toggleAttribute('overflowing', overflowing);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index c33aa0071..c843966c8 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -29,6 +29,7 @@ var gZenUIManager = {
     });
 
     window.addEventListener('TabClose', this.onTabClose.bind(this));
+    this.tabsWrapper.addEventListener('scroll', this.saveScrollbarState.bind(this));
   },
 
   updateTabsToolbar() {
@@ -68,10 +69,13 @@ var gZenUIManager = {
     this._scrollbarState = this.tabsWrapper.scrollTop;
   },
 
+  restoreScrollbarState() {
+    this.tabsWrapper.scrollTop = this._scrollbarState;
+  },
+
   onTabClose(event) {
     this.updateTabsToolbar();
-    this.tabsWrapper.scrollTop = this._scrollbarState;
-    this._scrollbarState = 0;
+    this.restoreScrollbarState();
   },
 
   openAndChangeToTab(url, options) {
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index e5fd09fc5..56bf32ecb 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -144,6 +144,7 @@ var gZenCompactModeManager = {
   getAndApplySidebarWidth() {
     let sidebarWidth = this.sidebar.getBoundingClientRect().width;
     if (sidebarWidth > 1) {
+      gZenUIManager.restoreScrollbarState();
       this.sidebar.style.setProperty('--zen-sidebar-width', `${sidebarWidth}px`);
     }
     return sidebarWidth;

From d16ae38b2833478c8d131c6f07e99e9eeee4a975 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 23:00:06 +0100
Subject: [PATCH 092/191] Update URL bar behavior and version numbers in
 surfer.json

---
 .../urlbar/UrlbarInput-sys-mjs.patch          | 35 ++++++++++++++-----
 surfer.json                                   |  6 ++--
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 6ead8d889..6dce5abbc 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384b21a7fb0 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..0d4c899a8a0d98d6cac41ecdd1c40df52bd050be 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -39,7 +39,20 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
      // We only need to update the searchModeUI on tab switch conditionally
      // as we only persist searchMode with ScotchBonnet enabled.
      if (
-@@ -1087,7 +1102,11 @@ export class UrlbarInput {
+@@ -697,8 +712,11 @@ export class UrlbarInput {
+         return;
+       }
+     }
+-
++    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", true);
+     this.handleNavigation({ event });
++    this.document.ownerGlobal.setTimeout(() => {
++      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
++    }, 200);
+   }
+ 
+   /**
+@@ -1087,11 +1105,14 @@ export class UrlbarInput {
      }
  
      if (!result.payload.providesSearchMode) {
@@ -52,7 +65,11 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
      }
  
      this.controller.recordSelectedResult(event, result);
-@@ -2144,6 +2163,11 @@ export class UrlbarInput {
+-
+     if (isCanonized) {
+       this.controller.engagementEvent.record(event, {
+         result,
+@@ -2144,6 +2165,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -64,7 +81,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
      // 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")) {
-@@ -2163,6 +2187,11 @@ export class UrlbarInput {
+@@ -2163,6 +2189,11 @@ export class UrlbarInput {
        return;
      }
  
@@ -76,7 +93,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -3305,7 +3334,7 @@ export class UrlbarInput {
+@@ -3305,7 +3336,7 @@ export class UrlbarInput {
      } else {
        where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
      }
@@ -85,7 +102,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
        if (where == "current") {
          where = "tab";
        } else if (where == "tab") {
-@@ -3859,6 +3888,11 @@ export class UrlbarInput {
+@@ -3859,6 +3890,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -97,7 +114,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -3930,7 +3964,7 @@ export class UrlbarInput {
+@@ -3930,7 +3966,7 @@ export class UrlbarInput {
        }
      }
  
@@ -106,7 +123,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -3970,9 +4004,12 @@ export class UrlbarInput {
+@@ -3970,9 +4006,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -120,7 +137,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f3539ff3a74474f2833800ae140b0384
  
          if (
            event.target != this.inputField &&
-@@ -3982,8 +4019,8 @@ export class UrlbarInput {
+@@ -3982,8 +4021,8 @@ export class UrlbarInput {
            break;
          }
  
diff --git a/surfer.json b/surfer.json
index 30735e138..96ac3b992 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.7.5b",
+        "displayVersion": "1.7.6b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -39,7 +39,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.7.6t",
+        "displayVersion": "1.7.7t",
         "github": {
           "repo": "zen-browser/desktop"
         }
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}

From da04a7a629bc98892e5384c59eccde16b5e7d0d6 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 23:36:07 +0100
Subject: [PATCH 093/191] Enhance tab management by allowing drag-and-drop
 functionality with the workspace indicator and adjust URL bar primary
 adjustment timing

---
 .../base/zen-components/ZenPinnedTabManager.mjs        | 10 +++++++++-
 .../components/urlbar/UrlbarInput-sys-mjs.patch        |  4 ++--
 src/browser/themes/shared/zen-icons/expand-sidebar.svg |  1 +
 src/browser/themes/shared/zen-icons/icons.css          |  2 +-
 src/browser/themes/shared/zen-icons/jar.inc.mn         |  1 +
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 src/browser/themes/shared/zen-icons/expand-sidebar.svg

diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 5f69ab10b..aa2f9213d 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -647,7 +647,8 @@
     }
 
     moveToAnotherTabContainerIfNecessary(event, draggedTab) {
-      const pinnedTabsTarget = event.target.closest('#vertical-pinned-tabs-container');
+      const pinnedTabsTarget =
+        event.target.closest('#vertical-pinned-tabs-container') || event.target.closest('#zen-current-workspace-indicator');
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
 
@@ -716,6 +717,7 @@
     removeTabContainersDragoverClass() {
       this.dragIndicator.remove();
       this._dragIndicator = null;
+      document.getElementById('zen-current-workspace-indicator').removeAttribute('open');
     }
 
     get dragIndicator() {
@@ -736,6 +738,12 @@
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
       const targetTab = event.target.closest('.tabbrowser-tab');
+      if (event.target.closest('#zen-current-workspace-indicator')) {
+        this.removeTabContainersDragoverClass();
+        event.target.setAttribute('open', true);
+      } else {
+        document.getElementById('zen-current-workspace-indicator').removeAttribute('open');
+      }
 
       // If there's no valid target tab, nothing to do
       if (!targetTab) {
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 6dce5abbc..4f76c0d50 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..0d4c899a8a0d98d6cac41ecdd1c40df52bd050be 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211ce209ff1a 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -24,7 +24,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..0d4c899a8a0d98d6cac41ecdd1c40df5
      this.inputField.select();
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
-+    }, 0);
++    }, 100);
      this._suppressPrimaryAdjustment = false;
    }
  
diff --git a/src/browser/themes/shared/zen-icons/expand-sidebar.svg b/src/browser/themes/shared/zen-icons/expand-sidebar.svg
new file mode 100644
index 000000000..a72ec63ba
--- /dev/null
+++ b/src/browser/themes/shared/zen-icons/expand-sidebar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="6.25" y1="12.5" x2="6.25" y2="15.25" data-color="color-2"></line><line x1="6.25" y1="2.75" x2="6.25" y2="5.5" data-color="color-2"></line><polyline points="8.75 6.5 6.25 9 8.75 11.5" data-color="color-2"></polyline><line x1="6.25" y1="9" x2="12.75" y2="9" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index f41e7abd0..1f9c726d7 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -390,7 +390,7 @@
 }
 
 #zen-expand-sidebar-button {
-  list-style-image: url('sidebar.svg') !important;
+  list-style-image: url('expand-sidebar.svg') !important;
 }
 
 .panel-header > .subviewbutton-back {
diff --git a/src/browser/themes/shared/zen-icons/jar.inc.mn b/src/browser/themes/shared/zen-icons/jar.inc.mn
index 62141b541..ba6f17c2c 100644
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -39,6 +39,7 @@
   skin/classic/browser/zen-icons/edit.svg                      (../shared/zen-icons/edit.svg) 
   skin/classic/browser/zen-icons/essential-add.svg                      (../shared/zen-icons/essential-add.svg) 
   skin/classic/browser/zen-icons/essential-remove.svg                      (../shared/zen-icons/essential-remove.svg) 
+  skin/classic/browser/zen-icons/expand-sidebar.svg                      (../shared/zen-icons/expand-sidebar.svg) 
   skin/classic/browser/zen-icons/ext-link.svg                      (../shared/zen-icons/ext-link.svg) 
   skin/classic/browser/zen-icons/extension-blocked.svg                      (../shared/zen-icons/extension-blocked.svg) 
   skin/classic/browser/zen-icons/extension.svg                      (../shared/zen-icons/extension.svg) 

From bf6f0b19fdf68a8ceae8a5c3385ca4cc8af15f38 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 7 Feb 2025 23:40:31 +0100
Subject: [PATCH 094/191] Update sidebar and menu icons for improved visual
 consistency

---
 src/browser/themes/shared/zen-icons/icons.css   | 9 ++++++---
 src/browser/themes/shared/zen-icons/mail.svg    | 1 -
 src/browser/themes/shared/zen-icons/sidebar.svg | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 1f9c726d7..a44d27339 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -68,11 +68,14 @@
 }
 
 #sidebar-button:-moz-locale-dir(ltr):not([positionend]),
-#sidebar-button:-moz-locale-dir(rtl)[positionend],
-#zen-sidepanel-button {
+#sidebar-button:-moz-locale-dir(rtl)[positionend] {
   list-style-image: url('chrome://browser/skin/sidebars.svg') !important;
 }
 
+#zen-sidepanel-button {
+  list-style-image: url('sidebar.svg');
+}
+
 #downloads-button,
 #downloads-indicator-anchor,
 #appMenu-downloads-button,
@@ -931,7 +934,7 @@ menuitem[contexttype='fullscreen'][label*='Exit'] {
 }
 
 #zen-context-menu-compact-mode {
-  --menu-image: url('chrome://browser/skin/sidebars.svg');
+  --menu-image: url('sidebar.svg');
 }
 
 #context_bookmarkTab,
diff --git a/src/browser/themes/shared/zen-icons/mail.svg b/src/browser/themes/shared/zen-icons/mail.svg
index 839ce7d83..18dcdff03 100644
--- a/src/browser/themes/shared/zen-icons/mail.svg
+++ b/src/browser/themes/shared/zen-icons/mail.svg
@@ -6,4 +6,3 @@
 <svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" fill-opacity="context-fill-opacity">
   <path d="M2.5 1A2.5 2.5 0 0 0 0 3.5v8A2.5 2.5 0 0 0 2.5 14h11a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 13.5 1h-11zm0 1h11A1.5 1.5 0 0 1 15 3.5v.3L8 7.92 1 3.803V3.5A1.5 1.5 0 0 1 2.5 2zM15 4.961V11.5a1.5 1.5 0 0 1-1.5 1.5h-11A1.5 1.5 0 0 1 1 11.5V4.963l6.746 3.969.082.037a.5.5 0 0 0 .426-.037L15 4.961z"/>
 </svg>
-a<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,5.75l6.767,3.733c.301,.166,.665,.166,.966,0l6.767-3.733" data-color="color-2"></path><rect x="1.75" y="3.25" width="14.5" height="11.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/sidebar.svg b/src/browser/themes/shared/zen-icons/sidebar.svg
index d1c18a645..b6134d970 100644
--- a/src/browser/themes/shared/zen-icons/sidebar.svg
+++ b/src/browser/themes/shared/zen-icons/sidebar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="8.25" y1="2.75" x2="8.25" y2="15.25" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><line x1="4.25" y1="6.25" x2="5.75" y2="6.25" data-color="color-2"></line><line x1="4.25" y1="9" x2="5.75" y2="9" data-color="color-2"></line><line x1="4.25" y1="11.75" x2="5.75" y2="11.75" data-color="color-2"></line></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="3.25" width="14.5" height="11.5" rx="2" ry="2"></rect><rect x="4.75" y="6.25" width="2" height="5.5" fill="currentColor" data-color="color-2"></rect></g></svg>

From 06a03cd4ca480588f0732e2a84dd9877c8050f2a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 8 Feb 2025 00:11:06 +0100
Subject: [PATCH 095/191] Refactor tab management logic to improve visibility
 of pinned tabs and enhance tab filtering

---
 .../components/tabbrowser/content/tabs-js.patch       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index c60c56ef8..756161868 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..1d630f0f402610e70e4e17f11813fddbd141cb9e 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..bffa5e0be62e73f380adf558c5df3441bde7b604 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -185,17 +185,14 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..1d630f0f402610e70e4e17f11813fddb
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1963,13 +1988,13 @@
-       let verticalTabsContainer = document.getElementById(
-         "vertical-pinned-tabs-container"
+@@ -1965,11 +1990,11 @@
        );
--      let numPinned = gBrowser.pinnedTabCount;
-+      let numPinned = gBrowser._numVisiblePinTabs;
+       let numPinned = gBrowser.pinnedTabCount;
  
 -      if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
 -        let tabs = this.visibleTabs;
 +      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length + document.getElementById("zen-essentials-container").children.length)) {
-+        let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
++        let tabs = this.allTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
          for (let i = 0; i < numPinned; i++) {
            tabs[i].style.marginInlineStart = "";
 -          verticalTabsContainer.appendChild(tabs[i]);

From dd9c57a1d28e3930663b4874caebabc8799467fe Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:14:11 +0100
Subject: [PATCH 096/191] Delete .github/workflows/staler.yml

Signed-off-by: mr. m  <91018726+mauro-balades@users.noreply.github.com>
---
 .github/workflows/staler.yml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .github/workflows/staler.yml

diff --git a/.github/workflows/staler.yml b/.github/workflows/staler.yml
deleted file mode 100644
index 5a4b7fc8d..000000000
--- a/.github/workflows/staler.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: 'Close stale issues and PRs'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-  workflow_dispatch:
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v9
-        with:
-          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
-          days-before-stale: 65
-          days-before-close: 10

From 4605b4f3ca0f8d94362ce7603077d65a72c1aba4 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 8 Feb 2025 19:41:56 +0100
Subject: [PATCH 097/191] Fix tab position calculation by removing unnecessary
 increment

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

diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 9757b6eb2..67760034c 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -67,7 +67,7 @@
     }
 
     getTabPosition(tab) {
-      return Math.max(gBrowser.pinnedTabCount, tab._tPos) + 1;
+      return Math.max(gBrowser.pinnedTabCount, tab._tPos);
     }
 
     createBrowserElement(url, currentTab, existingTab = null) {

From b79d6a7347e6756db64cd7f142fd0fe3fd9731ba Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 8 Feb 2025 20:20:00 +0100
Subject: [PATCH 098/191] Reduce minimum width of the URL bar when open to
 improve layout flexibility

---
 src/browser/base/content/zen-styles/zen-urlbar.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 0502aa2b8..208339888 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -393,7 +393,7 @@ button.popup-notification-dropmarker {
 
 :root[zen-single-toolbar='true'] {
   #urlbar[open] {
-    min-width: 40vw;
+    min-width: 30vw;
   }
 
   &[zen-right-side='true'] #urlbar[open]:not([zen-floating-urlbar='true']) {

From 988056e59c91755ce9ae40647293456c77dd0606 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 9 Feb 2025 14:52:05 +0100
Subject: [PATCH 099/191] Add overflow-clip-margin to vertical tabs for
 improved layout handling

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

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index d2211409d..e08650a78 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -252,6 +252,7 @@
   padding-inline-start: 0 !important;
   overflow-y: unset !important; /* DO NOT CHANGE THIS: Firefox renders badly workspace changes */
   overflow-x: clip;
+  overflow-clip-margin: var(--zen-toolbox-padding);
 
   --tab-inner-inline-margin: 0;
 

From 508812914f69d17625c6db3969c0d3a63b99bf1d Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Sun, 9 Feb 2025 21:56:22 +0800
Subject: [PATCH 100/191] Changed listener to tabContainer.addEventListener

---
 src/browser/base/content/ZenUIManager.mjs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e0e1dfa44..356286927 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -232,7 +232,8 @@ var gZenVerticalTabsManager = {
       tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
     }
 
-    this._insertDoubleClickListenerPinnedTabs();
+    //this._insertDoubleClickListenerPinnedTabs();
+    gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
   openNewTabOnTabsMiddleClick(event) {
@@ -601,12 +602,12 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-  _insertDoubleClickListenerPinnedTabs() {
-    const tabs = gBrowser.tabs;
-    for (const tab of tabs) {
-      tab.addEventListener('dblclick', this.renameTabStart.bind(this));
-    }
-  },
+  //_insertDoubleClickListenerPinnedTabs() {
+  //  const tabs = gBrowser.tabs;
+  //  for (const tab of tabs) {
+  //    tab.addEventListener('dblclick', this.renameTabStart.bind(this));
+  //  }
+  //},
 
   renameTabKeydown(event) {
     if (event.key === 'Enter') {
@@ -647,7 +648,7 @@ var gZenVerticalTabsManager = {
   renameTabStart(event) {
     if (this._tabEdited) return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited.pinned) {
+    if (!this._tabEdited || !this._tabEdited.pinned) {
       this._tabEdited = null;
       return;
     }

From 1475d3daee27615a63e7265b13d4dcbe2818eb44 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 9 Feb 2025 17:20:27 +0100
Subject: [PATCH 101/191] Refactor theme preferences by removing unused color
 options and adjusting border radius settings

---
 src/browser/app/profile/zen-browser.js        |   4 +-
 .../base/content/zen-styles/zen-theme.css     |  30 ----
 .../components/preferences/zen-settings.js    |  36 -----
 .../preferences/zenLooksAndFeel.inc.xhtml     | 141 ------------------
 .../shared/preferences/zen-preferences.css    |  19 ---
 5 files changed, 1 insertion(+), 229 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index ff35d39e5..2ee3107a7 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -103,15 +103,13 @@ pref('zen.rice.share.notice.accepted', false);
 pref('zen.theme.border-radius', 10); // In pixels
 #else
 #ifdef XP_WIN
-pref('zen.theme.border-radius', 12); // In pixels
+pref('zen.theme.border-radius', 10); // In pixels
 #else
 pref('zen.theme.border-radius', 8); // In pixels
 #endif
 #endif
 
 pref('zen.theme.color-prefs.use-workspace-colors', true);
-pref('zen.theme.color-prefs.amoled', false);
-pref('zen.theme.color-prefs.colorful', false);
 
 pref('zen.view.compact.hide-tabbar', true);
 pref('zen.view.compact.hide-toolbar', false);
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 62b2efa5c..b5a75004d 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -222,33 +222,3 @@
     --zen-browser-gradient-base: color-mix(in srgb, var(--zen-primary-color) 30%, var(--zen-dark-color-mix-base) 70%);
   }
 }
-
-@media (prefers-color-scheme: dark) {
-  @media (-moz-bool-pref: 'zen.theme.color-prefs.amoled') {
-    :root {
-      --zen-dark-color-mix-base: hsl(5 5 5);
-      --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 4%, rgb(0, 0, 0) 96%);
-    }
-  }
-
-  @media (-moz-bool-pref: 'zen.theme.color-prefs.colorful') {
-    :root {
-      --zen-in-content-dialog-background: rgb(28, 28, 32);
-
-      --zen-colors-primary: color-mix(in srgb, var(--zen-primary-color) 50%, black 50%);
-      --zen-colors-secondary: color-mix(in srgb, var(--zen-primary-color) 40%, black 60%);
-      --zen-colors-tertiary: color-mix(in srgb, var(--zen-primary-color) 15%, black 85%);
-
-      --zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, black 10%);
-      --zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%);
-
-      --zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, black 80%);
-      --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 80%, black 20%);
-
-      --zen-dialog-background: color-mix(in srgb, var(--zen-primary-color) 10%, black 90%);
-      --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, rgb(15, 15, 15) 92%);
-
-      --zen-browser-gradient-base: color-mix(in srgb, var(--zen-primary-color) 30%, black 70%);
-    }
-  }
-}
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index fe770629f..ca5f3d2a9 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -507,7 +507,6 @@ var gZenLooksAndFeel = {
         Services.prefs.removeObserver(pref, this);
       }
     });
-    this.setDarkThemeListener();
     this.setCompactModeStyle();
 
     this.applySidebarLayout();
@@ -560,41 +559,6 @@ var gZenLooksAndFeel = {
     }
   },
 
-  setDarkThemeListener() {
-    const chooser = document.getElementById('zen-dark-theme-styles-form');
-    const radios = [...chooser.querySelectorAll('input')];
-    for (let radio of radios) {
-      if (radio.value === 'amoled' && Services.prefs.getBoolPref('zen.theme.color-prefs.amoled')) {
-        radio.checked = true;
-      } else if (radio.value === 'colorful' && Services.prefs.getBoolPref('zen.theme.color-prefs.colorful')) {
-        radio.checked = true;
-      } else if (
-        radio.value === 'default' &&
-        !Services.prefs.getBoolPref('zen.theme.color-prefs.amoled') &&
-        !Services.prefs.getBoolPref('zen.theme.color-prefs.colorful')
-      ) {
-        radio.checked = true;
-      }
-      radio.addEventListener('change', (e) => {
-        let value = e.target.value;
-        switch (value) {
-          case 'amoled':
-            Services.prefs.setBoolPref('zen.theme.color-prefs.amoled', true);
-            Services.prefs.setBoolPref('zen.theme.color-prefs.colorful', false);
-            break;
-          case 'colorful':
-            Services.prefs.setBoolPref('zen.theme.color-prefs.amoled', false);
-            Services.prefs.setBoolPref('zen.theme.color-prefs.colorful', true);
-            break;
-          default:
-            Services.prefs.setBoolPref('zen.theme.color-prefs.amoled', false);
-            Services.prefs.setBoolPref('zen.theme.color-prefs.colorful', false);
-            break;
-        }
-      });
-    }
-  },
-
   setCompactModeStyle() {
     const chooser = document.getElementById('zen-compact-mode-styles-form');
     const radios = [...chooser.querySelectorAll('input')];
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 39ccef7ee..de0568844 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -68,147 +68,6 @@
 
       <hbox id="zenLooksAndFeelGradientPickerParent"></hbox>
 
-      <html:div id="ZenDarkThemeStyles">
-            <html:h2 data-l10n-id="zen-dark-theme-styles-header"/>
-            <description class="description-deemphasized" data-l10n-id="zen-dark-theme-styles-description" />
-            <form xmlns="http://www.w3.org/1999/xhtml" autocomplete="off" id="zen-dark-theme-styles-form">
-                  <label class="web-appearance-choice">
-                        <div class="web-appearance-choice-image-container">
-<svg width="50%" height="50%" viewBox="0 0 229 135" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g id="Icon-1--Icon-2" serif:id="Icon 1, Icon 2">
-        <g transform="matrix(0.983827,0,0,0.922551,1.56302,5.09242)">
-            <path d="M223.674,41.506L223.674,93.788C223.674,114.914 207.591,132.065 187.78,132.065L41.807,132.065C21.996,132.065 5.913,114.914 5.913,93.788L5.913,41.506C5.913,20.38 21.996,3.228 41.807,3.228L187.78,3.228C207.591,3.228 223.674,20.38 223.674,41.506Z" style="fill:transparent"/>
-        </g>
-        <g id="Outline">
-            <g transform="matrix(0.983827,0,0,0.922551,1.56302,5.09242)">
-                <path d="M223.674,41.506L223.674,93.788C223.674,114.914 207.591,132.065 187.78,132.065L41.807,132.065C21.996,132.065 5.913,114.914 5.913,93.788L5.913,41.506C5.913,20.38 21.996,3.228 41.807,3.228L187.78,3.228C207.591,3.228 223.674,20.38 223.674,41.506Z" style="fill:none;stroke:var(--zen-colors-border);stroke-width:4.78px;"/>
-            </g>
-            <g transform="matrix(0.790162,0,0,0.603645,44.881,47.2089)">
-                <path d="M223.674,3.228L223.674,77.954C223.674,107.819 205.151,132.065 182.335,132.065L5.913,132.065L5.913,41.506C5.913,20.38 19.016,3.228 35.155,3.228L223.674,3.228Z" style="fill:none;stroke:var(--zen-colors-border);stroke-width:4.78px;"/>
-            </g>
-        </g>
-        <g id="Top-Bar" serif:id="Top Bar">
-            <g transform="matrix(1.19149,0,0,1.19149,-7.8979,-3.64443)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-colors-primary);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,128.569,-3.64443)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-colors-primary);"/>
-            </g>
-            <g transform="matrix(1.29333,0,0,1,-30.3604,4.42935)">
-                <path d="M149.424,24.359C149.424,26.626 148,28.467 146.247,28.467L77.764,28.467C76.01,28.467 74.587,26.626 74.587,24.359C74.587,22.091 76.01,20.25 77.764,20.25L146.247,20.25C148,20.25 149.424,22.091 149.424,24.359Z" style="fill:var(--zen-colors-primary);"/>
-            </g>
-        </g>
-        <g id="Side-Bar" serif:id="Side Bar">
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,20.8338)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-colors-primary);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,44.7817)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-colors-primary);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,68.7295)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-colors-primary);"/>
-            </g>
-        </g>
-    </g>
-</svg>
-                        </div>
-                        <div class="web-appearance-choice-footer">
-                        <input type="radio" name="web-appearance" value="amoled" data-l10n-id="preferences-web-appearance-choice-input-auto"
-                        /><span data-l10n-id="zen-dark-theme-styles-amoled" />
-                  </div>
-                  </label>
-                        <label class="web-appearance-choice">
-                        <div class="web-appearance-choice-image-container">
-<svg width="50%" height="50%" viewBox="0 0 229 135" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g id="Icon-1--Icon-2" serif:id="Icon 1, Icon 2">
-        <g transform="matrix(0.983827,0,0,0.922551,1.56302,5.09242)">
-            <path d="M223.674,41.506L223.674,93.788C223.674,114.914 207.591,132.065 187.78,132.065L41.807,132.065C21.996,132.065 5.913,114.914 5.913,93.788L5.913,41.506C5.913,20.38 21.996,3.228 41.807,3.228L187.78,3.228C207.591,3.228 223.674,20.38 223.674,41.506Z" style="fill:color-mix(in srgb, var(--zen-colors-secondary) 17%, transparent 98%)"/>
-        </g>
-        <g id="Outline">
-            <g transform="matrix(0.983827,0,0,0.922551,1.56302,5.09242)">
-                <path d="M223.674,41.506L223.674,93.788C223.674,114.914 207.591,132.065 187.78,132.065L41.807,132.065C21.996,132.065 5.913,114.914 5.913,93.788L5.913,41.506C5.913,20.38 21.996,3.228 41.807,3.228L187.78,3.228C207.591,3.228 223.674,20.38 223.674,41.506Z" style="fill:none;stroke:var(--zen-colors-border);stroke-width:4.78px;"/>
-            </g>
-            <g transform="matrix(0.790162,0,0,0.603645,44.881,47.2089)">
-                <path d="M223.674,3.228L223.674,77.954C223.674,107.819 205.151,132.065 182.335,132.065L5.913,132.065L5.913,41.506C5.913,20.38 19.016,3.228 35.155,3.228L223.674,3.228Z" style="fill:none;stroke:var(--zen-colors-border);stroke-width:4.78px;"/>
-            </g>
-        </g>
-        <g id="Top-Bar" serif:id="Top Bar">
-            <g transform="matrix(1.19149,0,0,1.19149,-7.8979,-3.64443)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,128.569,-3.64443)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.29333,0,0,1,-30.3604,4.42935)">
-                <path d="M149.424,24.359C149.424,26.626 148,28.467 146.247,28.467L77.764,28.467C76.01,28.467 74.587,26.626 74.587,24.359C74.587,22.091 76.01,20.25 77.764,20.25L146.247,20.25C148,20.25 149.424,22.091 149.424,24.359Z" style="fill:var(--zen-primary-color);"/>
-            </g>
-        </g>
-        <g id="Side-Bar" serif:id="Side Bar">
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,20.8338)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,44.7817)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,68.7295)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-        </g>
-    </g>
-</svg>
-                        </div>
-                        <div class="web-appearance-choice-footer">
-                        <input type="radio" name="web-appearance" value="default" data-l10n-id="preferences-web-appearance-choice-input-light"
-                        /><span data-l10n-id="zen-dark-theme-styles-default" />
-                  </div>
-                  </label>
-                        <label class="web-appearance-choice">
-                        <div class="web-appearance-choice-image-container">
-<svg width="50%" height="50%" viewBox="0 0 229 135" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g id="Icon-1--Icon-2" serif:id="Icon 1, Icon 2">
-        <g transform="matrix(0.983827,0,0,0.922551,1.56302,5.09242)">
-            <path d="M223.674,41.506L223.674,93.788C223.674,114.914 207.591,132.065 187.78,132.065L41.807,132.065C21.996,132.065 5.913,114.914 5.913,93.788L5.913,41.506C5.913,20.38 21.996,3.228 41.807,3.228L187.78,3.228C207.591,3.228 223.674,20.38 223.674,41.506Z" style="fill:var(--zen-colors-secondary);"/>
-        </g>
-        <g id="Outline">
-            <g transform="matrix(0.983827,0,0,0.922551,1.56302,5.09242)">
-                <path d="M223.674,41.506L223.674,93.788C223.674,114.914 207.591,132.065 187.78,132.065L41.807,132.065C21.996,132.065 5.913,114.914 5.913,93.788L5.913,41.506C5.913,20.38 21.996,3.228 41.807,3.228L187.78,3.228C207.591,3.228 223.674,20.38 223.674,41.506Z" style="fill:none;stroke:var(--zen-primary-color);stroke-width:4px;"/>
-            </g>
-            <g transform="matrix(0.790162,0,0,0.603645,44.881,47.2089)">
-                <path d="M223.674,3.228L223.674,77.954C223.674,107.819 205.151,132.065 182.335,132.065L5.913,132.065L5.913,41.506C5.913,20.38 19.016,3.228 35.155,3.228L223.674,3.228Z" style="fill:none;stroke:var(--zen-primary-color);stroke-width:4.78px;"/>
-            </g>
-        </g>
-        <g id="Top-Bar" serif:id="Top Bar">
-            <g transform="matrix(1.19149,0,0,1.19149,-7.8979,-3.64443)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,128.569,-3.64443)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.29333,0,0,1,-30.3604,4.42935)">
-                <path d="M149.424,24.359C149.424,26.626 148,28.467 146.247,28.467L77.764,28.467C76.01,28.467 74.587,26.626 74.587,24.359C74.587,22.091 76.01,20.25 77.764,20.25L146.247,20.25C148,20.25 149.424,22.091 149.424,24.359Z" style="fill:var(--zen-primary-color);"/>
-            </g>
-        </g>
-        <g id="Side-Bar" serif:id="Side Bar">
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,20.8338)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,44.7817)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-            <g transform="matrix(1.19149,0,0,1.19149,-25.5066,68.7295)">
-                <circle cx="45.459" cy="27.22" r="3.448" style="fill:var(--zen-primary-color);"/>
-            </g>
-        </g>
-    </g>
-</svg>
-                        </div>
-                        <div class="web-appearance-choice-footer">
-                        <input type="radio" name="web-appearance" value="colorful" data-l10n-id="preferences-web-appearance-choice-input-dark"
-                        /><span data-l10n-id="zen-dark-theme-styles-colorful" />
-                  </div>
-                  </label>
-            </form>
-      </html:div>
       <html:div data-l10n-id="preferences-web-appearance-footer">
             <html:a id="web-appearance-manage-themes-link" class="text-link" data-l10n-name="themes-link" href="about:addons" target="_blank" />
         </html:div>
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index fa157c87b..1d3579462 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -51,24 +51,6 @@ groupbox {
   box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
 }
 
-@media (prefers-color-scheme: dark) {
-  @media (-moz-bool-pref: 'zen.theme.color-prefs.amoled') {
-    groupbox {
-      background: #141414;
-    }
-  }
-
-  @media (-moz-bool-pref: 'zen.theme.color-prefs.colorful') {
-    groupbox {
-      background: light-dark(white, color-mix(in srgb, var(--zen-primary-color) 10%, #1b1b1b 90%));
-    }
-
-    :root {
-      --zen-settings-secondary-background: light-dark(#f2f4f4, color-mix(in srgb, var(--zen-colors-tertiary) 70%, #0f0f0f 30%));
-    }
-  }
-}
-
 .subcategory + groupbox,
 #noFxaAccount,
 #hasFxaAccount {
@@ -182,7 +164,6 @@ groupbox h2 {
   margin-bottom: 15px;
 }
 
-#zen-dark-theme-styles-form,
 #zen-compact-mode-styles-form {
   display: flex;
   justify-content: space-between;

From 3708b86e58fea29446c24d1a6a5d15e4e3aba0fa Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 9 Feb 2025 18:12:30 +0100
Subject: [PATCH 102/191] Remove middle-click new tab preference and associated
 event handling for vertical tabs

---
 src/browser/app/profile/zen-browser.js    |  2 --
 src/browser/base/content/ZenUIManager.mjs | 14 --------------
 2 files changed, 16 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 2ee3107a7..99ee369df 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -158,7 +158,6 @@ pref('zen.view.hide-window-controls', true);
 pref('zen.view.experimental-no-window-controls', false);
 
 pref('zen.tabs.dim-pending', true);
-pref('zen.tabs.newtab-on-middle-click', true);
 
 pref('zen.keyboard.shortcuts.enabled', true);
 pref('zen.keyboard.shortcuts.version', 0); // Empty string means default shortcuts
@@ -184,7 +183,6 @@ pref('zen.sidebar.close-on-blur', true);
 pref('zen.sidebar.max-webpanels', 8);
 
 // Zen Split View
-pref('zen.splitView.working', false);
 pref('zen.splitView.min-resize-width', 7);
 pref('zen.splitView.change-on-hover', false);
 pref('zen.splitView.rearrange-hover-size', 24);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index c843966c8..f5938ca7b 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -221,23 +221,9 @@ var gZenVerticalTabsManager = {
 
     const tabs = document.getElementById('tabbrowser-tabs');
 
-    XPCOMUtils.defineLazyPreferenceGetter(this, 'canOpenTabOnMiddleClick', 'zen.tabs.newtab-on-middle-click', true);
-
     if (!this.isWindowsStyledButtons) {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
-
-    if (tabs) {
-      tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
-    }
-  },
-
-  openNewTabOnTabsMiddleClick(event) {
-    if (event.button === 1 && event.target.id === 'tabbrowser-tabs' && this.canOpenTabOnMiddleClick) {
-      document.getElementById('cmd_newNavigatorTabNoEvent').doCommand();
-      event.stopPropagation();
-      event.preventDefault();
-    }
   },
 
   toggleExpand() {

From 0e8646d592ee2de90ff6a7e9b6b9d1278dd7c1f3 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 10 Feb 2025 00:24:01 +0100
Subject: [PATCH 103/191] Refactor theme border-radius preference for
 consistency across platforms

---
 src/browser/app/profile/zen-browser.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 99ee369df..c4a5b7c59 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -102,12 +102,8 @@ pref('zen.rice.share.notice.accepted', false);
 #ifdef XP_MACOSX
 pref('zen.theme.border-radius', 10); // In pixels
 #else
-#ifdef XP_WIN
-pref('zen.theme.border-radius', 10); // In pixels
-#else
 pref('zen.theme.border-radius', 8); // In pixels
 #endif
-#endif
 
 pref('zen.theme.color-prefs.use-workspace-colors', true);
 

From c76066c99bed7812bc9dd1832b8345db8eb8a7e2 Mon Sep 17 00:00:00 2001
From: Jupi <73097618+JSGRD22@users.noreply.github.com>
Date: Mon, 10 Feb 2025 21:54:28 +0800
Subject: [PATCH 104/191] Improve corner radius on windows for a more native
 and consistent look

Signed-off-by: Jupi <73097618+JSGRD22@users.noreply.github.com>
---
 src/browser/app/profile/zen-browser.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 99ee369df..c4a5b7c59 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -102,12 +102,8 @@ pref('zen.rice.share.notice.accepted', false);
 #ifdef XP_MACOSX
 pref('zen.theme.border-radius', 10); // In pixels
 #else
-#ifdef XP_WIN
-pref('zen.theme.border-radius', 10); // In pixels
-#else
 pref('zen.theme.border-radius', 8); // In pixels
 #endif
-#endif
 
 pref('zen.theme.color-prefs.use-workspace-colors', true);
 

From d457e6fc766a4fdc907d809e046739f415cbc6ab Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 10 Feb 2025 20:12:00 +0100
Subject: [PATCH 105/191] Fixed urlbar hiding when entering on a composition
 state

---
 src/browser/app/profile/zen-browser.js        |  1 +
 src/browser/base/content/ZenUIManager.mjs     |  2 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 22 +++++++++----------
 .../urlbar/UrlbarInput-sys-mjs.patch          | 22 ++++++++-----------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index c4a5b7c59..6e78ff8e7 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -376,6 +376,7 @@ pref("browser.urlbar.quicksuggest.enabled", false);
 pref("browser.urlbar.suggest.quicksuggest.sponsored", false);
 pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false);
 pref("browser.urlbar.groupLabels.enabled", false);
+pref("browser.urlbar.keepPanelOpenDuringImeComposition", true); // IMPORTANT: Fixes closing the urlbar when on some languages
 pref("browser.formfill.enable", false);
 pref("security.insecure_connection_text.enabled", true);
 pref("security.insecure_connection_text.pbmode.enabled", true);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index f5938ca7b..f4462c0bd 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -173,7 +173,7 @@ var gZenUIManager = {
     } else {
       this._lastSearch = gURLBar._untrimmedValue;
     }
-    gURLBar.setURI(this._prevUrlbarLabel, false, false, false, true);
+    gURLBar.setURI(this._prevUrlbarLabel, onSwitch, false, false, !onSwitch);
     gURLBar.handleRevert();
     if (gURLBar.focused) {
       gURLBar.view.close({ elementPicked: onSwitch });
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 56bb251ba..f991c91ea 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b1c975652 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..39cb6ceda6154609daa8f3b84c4931de6604534f 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -80,16 +80,16 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1477,6 +1511,9 @@
-           newBrowser &&
-           gURLBar.getBrowserState(newBrowser).urlbarFocused &&
-           gURLBar.focused;
-+        if (gURLBar._zenHandleUrlbarClose) {
-+          gURLBar._zenHandleUrlbarClose(true);
-+        }
-         if (!keepFocusOnUrlBar) {
-           // Clear focus so that _adjustFocusAfterTabSwitch can detect if
-           // some element has been focused and respect that.
+@@ -1462,6 +1496,9 @@
+       }
+ 
+       let activeEl = document.activeElement;
++      if (gURLBar._zenHandleUrlbarClose) {
++        gURLBar._zenHandleUrlbarClose(true);
++      }
+       // If focus is on the old tab, move it to the new tab.
+       if (activeEl == oldTab) {
+         newTab.focus();
 @@ -2387,7 +2424,7 @@
  
        let panel = this.getPanel(browser);
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 4f76c0d50..f395eaa62 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211ce209ff1a 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..ea9207399b205c84d1263a4de8a63b776e36eabd 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -52,7 +52,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
    }
  
    /**
-@@ -1087,11 +1105,14 @@ export class UrlbarInput {
+@@ -1087,7 +1105,11 @@ export class UrlbarInput {
      }
  
      if (!result.payload.providesSearchMode) {
@@ -65,11 +65,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
      }
  
      this.controller.recordSelectedResult(event, result);
--
-     if (isCanonized) {
-       this.controller.engagementEvent.record(event, {
-         result,
-@@ -2144,6 +2165,11 @@ export class UrlbarInput {
+@@ -2144,6 +2166,11 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
@@ -81,7 +77,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
      // 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")) {
-@@ -2163,6 +2189,11 @@ export class UrlbarInput {
+@@ -2163,6 +2190,11 @@ export class UrlbarInput {
        return;
      }
  
@@ -93,7 +89,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
-@@ -3305,7 +3336,7 @@ export class UrlbarInput {
+@@ -3305,7 +3337,7 @@ export class UrlbarInput {
      } else {
        where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
      }
@@ -102,7 +98,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
        if (where == "current") {
          where = "tab";
        } else if (where == "tab") {
-@@ -3859,6 +3890,11 @@ export class UrlbarInput {
+@@ -3859,6 +3891,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -114,7 +110,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -3930,7 +3966,7 @@ export class UrlbarInput {
+@@ -3930,7 +3967,7 @@ export class UrlbarInput {
        }
      }
  
@@ -123,7 +119,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -3970,9 +4006,12 @@ export class UrlbarInput {
+@@ -3970,9 +4007,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -137,7 +133,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..2948efd18fb1ee609695acd5b5b0211c
  
          if (
            event.target != this.inputField &&
-@@ -3982,8 +4021,8 @@ export class UrlbarInput {
+@@ -3982,8 +4022,8 @@ export class UrlbarInput {
            break;
          }
  

From 2dbd80f5397b858d646304eb0f0587f144f41120 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 10 Feb 2025 20:30:13 +0100
Subject: [PATCH 106/191] Increase minimum width of the urlbar to improve
 usability

---
 src/browser/base/content/zen-styles/zen-urlbar.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 208339888..773014084 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -393,7 +393,7 @@ button.popup-notification-dropmarker {
 
 :root[zen-single-toolbar='true'] {
   #urlbar[open] {
-    min-width: 30vw;
+    min-width: 35vw;
   }
 
   &[zen-right-side='true'] #urlbar[open]:not([zen-floating-urlbar='true']) {

From 84bf229944a9429884169d722099b0ddcfb478fc Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 10 Feb 2025 20:48:41 +0100
Subject: [PATCH 107/191] Fixed urlbar being hidden/glitched on fullscreen

---
 src/browser/base/content/zen-styles/zen-browser-ui.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 255a9228f..403370c63 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -22,7 +22,7 @@
 :root:is([inDOMFullscreen='true'], [chromehidden~='location'], [chromehidden~='toolbar']) {
   #navigator-toolbox,
   #zen-sidebar-splitter {
-    display: none;
+    visibility: collapse;
   }
 }
 

From b5c889ab0190fcb0ded0242566852b8e7613289a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 10 Feb 2025 21:52:23 +0100
Subject: [PATCH 108/191] Refactor tab reset button label and clean up unused
 color scheme listener

---
 l10n                                               |  2 +-
 .../base/zen-components/ZenGlanceManager.mjs       |  3 +--
 src/browser/components/preferences/zen-settings.js | 14 --------------
 .../components/tabbrowser/content/tab-js.patch     |  4 ++--
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/l10n b/l10n
index fb2f27225..19e2af33c 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit fb2f27225e6ec810354ce4c95913d6a2105e200b
+Subproject commit 19e2af33c4d901a4edece2b95c4372b40d50a942
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 67760034c..fc4f13942 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -491,8 +491,6 @@
         index: this.getTabPosition(this.#currentTab),
       });
 
-      this.#currentParentTab._visuallySelected = false;
-
       this.browserWrapper.removeAttribute('style');
       this.browserWrapper.removeAttribute('has-finished-animation');
       this.browserWrapper.setAttribute('animate-full', true);
@@ -501,6 +499,7 @@
       this.#currentParentTab.removeAttribute('glance-id');
       gBrowser.selectedTab = this.#currentTab;
       this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
+      this.#currentParentTab._visuallySelected = false;
       this.hideSidebarButtons();
       gZenUIManager.motion
         .animate(
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index ca5f3d2a9..87618112a 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -495,14 +495,10 @@ var gZenLooksAndFeel = {
     this._initializeColorPicker(this._getInitialAccentColor());
     window.zenPageAccentColorChanged = this._handleAccentColorChange.bind(this);
     gZenMarketplaceManager.init();
-    var onPreferColorSchemeChange = this.onPreferColorSchemeChange.bind(this);
-    window.matchMedia('(prefers-color-scheme: dark)').addListener(onPreferColorSchemeChange);
     for (const pref of [kZenExtendedSidebar, kZenSingleToolbar]) {
       Services.prefs.addObserver(pref, this);
     }
-    this.onPreferColorSchemeChange();
     window.addEventListener('unload', () => {
-      window.matchMedia('(prefers-color-scheme: dark)').removeListener(onPreferColorSchemeChange);
       for (const pref of [kZenExtendedSidebar, kZenSingleToolbar]) {
         Services.prefs.removeObserver(pref, this);
       }
@@ -549,16 +545,6 @@ var gZenLooksAndFeel = {
     }
   },
 
-  onPreferColorSchemeChange(event) {
-    const darkTheme = window.matchMedia('(prefers-color-scheme: dark)').matches;
-    let elem = document.getElementById('ZenDarkThemeStyles');
-    if (darkTheme) {
-      elem.removeAttribute('hidden');
-    } else {
-      elem.setAttribute('hidden', 'true');
-    }
-  },
-
   setCompactModeStyle() {
     const chooser = document.getElementById('zen-compact-mode-styles-form');
     const radios = [...chooser.querySelectorAll('input')];
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index e888b83a4..06ba6a423 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index d41c486c02a6f09dcff5741a59ad8b617294c481..0328460c7eb45d8ffb9de4f9b8d4a7bdd7a5b7b3 100644
+index d41c486c02a6f09dcff5741a59ad8b617294c481..abaccd1935fc117924c44dd22cae0b322fc6a0c4 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -37,6 +37,7 @@
              </hbox>
            </vbox>
            <image class="tab-close-button close-icon" role="button" data-l10n-id="tabbrowser-close-tabs-button" data-l10n-args='{"tabCount": 1}' keyNav="false"/>
-+          <image class="tab-reset-button reset-icon" role="button" data-l10n-id="tabbrowser-reset-tabs-button" data-l10n-args='{"tabCount": 1}' keyNav="false"/>
++          <image class="tab-reset-button reset-icon" role="button" data-l10n-id="tabbrowser-unload-tab-button" data-l10n-args='{"tabCount": 1}' keyNav="false"/>
          </hbox>
        </stack>
        `;

From be2a44dab99dd3bbde6325607ed4e8b044cf382b Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 10 Feb 2025 22:16:50 +0100
Subject: [PATCH 109/191] Added a timeout before the newtab url bar can clear
 it's content

---
 src/browser/app/profile/zen-browser.js    |  3 ++-
 src/browser/base/content/ZenUIManager.mjs | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 6e78ff8e7..a61533e60 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -118,6 +118,7 @@ pref('zen.view.compact.animate-sidebar', true);
 
 pref('zen.urlbar.replace-newtab', true);
 pref('zen.urlbar.behavior', 'floating-on-type'); // default, floating-on-type, float
+pref('zen.urlbar.wait-to-clear', 45000); // in ms (default 45s)
 
 #ifdef XP_MACOSX
 // Disable for macos in the meantime until @HarryHeres finds a solution for hight DPI screens
@@ -167,7 +168,7 @@ pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
 
 pref('zen.pinned-tab-manager.debug', false);
 pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
-pref('zen.pinned-tab-manager.close-shortcut-behavior', 'switch');
+pref('zen.pinned-tab-manager.close-shortcut-behavior', 'unload-switch');
 
 // TODO: Check this out!
 pref("browser.profiles.enabled", false);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index f4462c0bd..4c58a6e90 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -8,6 +8,7 @@ var gZenUIManager = {
     document.addEventListener('popuphidden', this.onPopupHidden.bind(this));
     XPCOMUtils.defineLazyPreferenceGetter(this, 'sidebarHeightThrottle', 'zen.view.sidebar-height-throttle', 500);
     XPCOMUtils.defineLazyPreferenceGetter(this, 'contentElementSeparation', 'zen.theme.content-element-separation', 0);
+    XPCOMUtils.defineLazyPreferenceGetter(this, 'urlbarWaitToClear', 'zen.urlbar.wait-to-clear', 0);
 
     ChromeUtils.defineLazyGetter(this, 'motion', () => {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
@@ -149,11 +150,15 @@ var gZenUIManager = {
 
   _prevUrlbarLabel: null,
   _lastSearch: '',
+  _clearTimeout: null,
 
   handleNewTab(werePassedURL, searchClipboard, where) {
     const shouldOpenURLBar =
       Services.prefs.getBoolPref('zen.urlbar.replace-newtab') && !werePassedURL && !searchClipboard && where === 'tab';
     if (shouldOpenURLBar) {
+      if (this._clearTimeout) {
+        clearTimeout(this._clearTimeout);
+      }
       this._prevUrlbarLabel = gURLBar._untrimmedValue;
       gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
       gURLBar.setAttribute('zen-newtab', true);
@@ -164,14 +169,21 @@ var gZenUIManager = {
     return false;
   },
 
+  clearUrlbarData() {
+    this._prevUrlbarLabel = null;
+    this._lastSearch = '';
+  },
+
   handleUrlbarClose(onSwitch) {
     gURLBar._zenHandleUrlbarClose = null;
     gURLBar.removeAttribute('zen-newtab');
     if (onSwitch) {
-      this._prevUrlbarLabel = null;
-      this._lastSearch = '';
+      this.clearUrlbarData();
     } else {
       this._lastSearch = gURLBar._untrimmedValue;
+      this._clearTimeout = setTimeout(() => {
+        this.clearUrlbarData();
+      }, this.urlbarWaitToClear);
     }
     gURLBar.setURI(this._prevUrlbarLabel, onSwitch, false, false, !onSwitch);
     gURLBar.handleRevert();

From f37e80535ab931b81448b0de5bc92eebe0cb4900 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Tue, 11 Feb 2025 12:26:00 +0800
Subject: [PATCH 110/191] Added preference to disable tab renaming, refactored
 inline styles to css files, changed listener to blur, refactored code

---
 src/browser/app/profile/zen-browser.js        |  1 +
 src/browser/base/content/ZenUIManager.mjs     | 54 ++++++-------------
 .../zen-styles/zen-tabs/vertical-tabs.css     | 11 ++++
 .../tabbrowser/content/tabbrowser-js.patch    | 11 +++-
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index c4a5b7c59..442d59e72 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -80,6 +80,7 @@ pref('zen.welcome-screen.seen', false);
 
 pref('zen.tabs.vertical', true);
 pref('zen.tabs.vertical.right-side', false);
+pref('zen.tabs.rename-tabs', true);
 pref('zen.theme.accent-color', "#ffb787");
 pref('zen.theme.content-element-separation', 6); // In pixels
 pref('zen.theme.pill-button', false);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index dd2ed94f6..4c0fa5adc 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -186,7 +186,6 @@ var gZenUIManager = {
 };
 
 var gZenVerticalTabsManager = {
-  _tabEdited: null,
   init() {
     this._multiWindowFeature = new ZenMultiWindowFeature();
     this._initWaitPromise();
@@ -224,7 +223,8 @@ var gZenVerticalTabsManager = {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
 
-    //this._insertDoubleClickListenerPinnedTabs();
+    this._tabEdited = null;
+    this._renameTabHalt = this.renameTabHalt.bind(this);
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
@@ -586,13 +586,6 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-  //_insertDoubleClickListenerPinnedTabs() {
-  //  const tabs = gBrowser.tabs;
-  //  for (const tab of tabs) {
-  //    tab.addEventListener('dblclick', this.renameTabStart.bind(this));
-  //  }
-  //},
-
   renameTabKeydown(event) {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
@@ -604,41 +597,37 @@ var gZenVerticalTabsManager = {
         this._tabEdited.label = newName;
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        // If the page is loaded, get the title of the page. Otherwise, keep name as is
-        this._tabEdited.label = gBrowser.getBrowserForTab(this._tabEdited).contentTitle || this._tabEdited.label;
-        // If the page had a title, reset the zen-has-static-label attribute
-        if (gBrowser.getBrowserForTab(this._tabEdited).contentTitle) {
-          this._tabEdited.removeAttribute('zen-has-static-label');
-        }
+        this._tabEdited.removeAttribute('zen-has-static-label');
+        gBrowser.setTabTitle(this._tabEdited);
       }
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.renameTabHalt.bind(this));
+      label.classList.remove('tab-label-container-editing');
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       this._tabEdited.querySelector('.tab-editor-container').remove();
 
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.renameTabHalt.bind(this));
+      label.classList.remove('tab-label-container-editing');
       this._tabEdited = null;
     }
   },
 
   renameTabStart(event) {
-    if (this._tabEdited) return;
+    if (
+      this._tabEdited ||
+      !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
+      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick')
+    )
+      return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited || !this._tabEdited.pinned) {
+    if (!this._tabEdited || !this._tabEdited.pinned || this._tabEdited.hasAttribute('zen-essential')) {
       this._tabEdited = null;
       return;
     }
     const label = this._tabEdited.querySelector('.tab-label-container');
-    label.style.display = 'none';
-    label.className += ' tab-label-container-editing';
+    label.classList.add('tab-label-container-editing');
 
     const container = window.MozXULElement.parseXULToFragment(`
       <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
@@ -649,31 +638,22 @@ var gZenVerticalTabsManager = {
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
     input.addEventListener('keydown', this.renameTabKeydown.bind(this));
-    input.style['white-space'] = 'nowrap';
-    input.style['overflow-x'] = 'scroll';
-    input.style['margin'] = '0';
 
     containerHtml.appendChild(input);
     input.focus();
     input.select();
 
-    document.addEventListener('click', this.renameTabHalt.bind(this));
+    input.addEventListener('blur', this._renameTabHalt);
   },
 
   renameTabHalt(event) {
-    // Ignore click event if it's clicking the input
-    if (event.target.closest('#tab-label-input')) {
-      return;
-    }
-    if (!this._tabEdited) {
+    if (document.activeElement === event.target || !this._tabEdited) {
       return;
     }
     this._tabEdited.querySelector('.tab-editor-container').remove();
     const label = this._tabEdited.querySelector('.tab-label-container-editing');
-    label.style.display = '';
-    label.className = label.className.replace(' tab-label-container-editing', '');
+    label.classList.remove('tab-label-container-editing');
 
-    document.removeEventListener('click', this.renameTabHalt.bind(this));
     this._tabEdited = null;
   },
 };
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index e08650a78..03344faa4 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1143,3 +1143,14 @@
 #zen-essentials-container .tabbrowser-tab.drag-over-after {
   box-shadow: -3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
 }
+
+/* Renaming tab */
+.tab-label-container-editing {
+  display: none !important;
+}
+
+#tab-label-input {
+  white-space: nowrap;
+  overflow-x: scroll;
+  margin: 0;
+}
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index a78d75c7e..778fd492f 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9cd3aacffe 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7232414e2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -90,6 +90,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9c
          if (!keepFocusOnUrlBar) {
            // Clear focus so that _adjustFocusAfterTabSwitch can detect if
            // some element has been focused and respect that.
+@@ -1785,7 +1822,7 @@
+     }
+ 
+     _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
+-      if (!aLabel || aLabel.includes("about:reader?")) {
++      if (!aLabel || aLabel.includes("about:reader?") || aTab.hasAttribute("zen-has-static-label")) {
+         return false;
+       }
+ 
 @@ -2387,7 +2424,7 @@
  
        let panel = this.getPanel(browser);

From 290aa09f893d85ad99ae7a8f7c88fb6b66e5d6f5 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 11:32:09 +0100
Subject: [PATCH 111/191] Small urlbar improvements

---
 src/browser/base/content/ZenUIManager.mjs     | 15 ++++++++
 .../zen-styles/zen-tabs/vertical-tabs.css     | 34 ++++++++-----------
 .../base/content/zen-styles/zen-theme.css     |  3 +-
 .../base/content/zen-styles/zen-urlbar.css    | 22 ++++++------
 .../themes/shared/zen-icons/accessibility.svg |  2 +-
 .../shared/zen-icons/add-to-dictionary.svg    |  2 +-
 .../themes/shared/zen-icons/arrow-down.svg    |  2 +-
 .../themes/shared/zen-icons/arrow-left.svg    |  2 +-
 .../themes/shared/zen-icons/arrow-right.svg   |  2 +-
 .../themes/shared/zen-icons/arrow-up.svg      |  2 +-
 .../themes/shared/zen-icons/audio-save.svg    |  2 +-
 .../zen-icons/autoplay-media-blocked.svg      |  2 +-
 .../shared/zen-icons/autoplay-media.svg       |  2 +-
 src/browser/themes/shared/zen-icons/back.svg  |  2 +-
 .../shared/zen-icons/bookmark-hollow.svg      |  2 +-
 .../zen-icons/bookmark-star-on-tray.svg       |  2 +-
 .../themes/shared/zen-icons/bookmark.svg      |  2 +-
 .../shared/zen-icons/camera-blocked.svg       |  2 +-
 .../themes/shared/zen-icons/camera.svg        |  2 +-
 .../themes/shared/zen-icons/canvas.svg        |  2 +-
 .../themes/shared/zen-icons/checkmark.svg     |  2 +-
 .../themes/shared/zen-icons/chevron.svg       |  2 +-
 .../themes/shared/zen-icons/close-all.svg     |  2 +-
 src/browser/themes/shared/zen-icons/close.svg |  2 +-
 .../themes/shared/zen-icons/container-tab.svg |  2 +-
 .../themes/shared/zen-icons/customize.svg     |  2 +-
 .../desktop-notification-blocked.svg          |  2 +-
 .../shared/zen-icons/desktop-notification.svg |  2 +-
 .../themes/shared/zen-icons/developer.svg     |  2 +-
 .../themes/shared/zen-icons/downloads.svg     |  2 +-
 .../shared/zen-icons/drag-indicator.svg       |  2 +-
 .../themes/shared/zen-icons/duplicate-tab.svg |  2 +-
 .../themes/shared/zen-icons/edit-copy.svg     |  2 +-
 .../themes/shared/zen-icons/edit-cut.svg      |  2 +-
 .../themes/shared/zen-icons/edit-delete.svg   |  2 +-
 .../themes/shared/zen-icons/edit-paste.svg    |  2 +-
 .../themes/shared/zen-icons/edit-redo.svg     |  2 +-
 .../shared/zen-icons/edit-select-all.svg      |  2 +-
 .../themes/shared/zen-icons/edit-theme.svg    |  2 +-
 .../themes/shared/zen-icons/edit-undo.svg     |  2 +-
 src/browser/themes/shared/zen-icons/edit.svg  |  2 +-
 .../themes/shared/zen-icons/essential-add.svg |  2 +-
 .../shared/zen-icons/essential-remove.svg     |  2 +-
 .../shared/zen-icons/expand-sidebar.svg       |  2 +-
 .../themes/shared/zen-icons/ext-link.svg      |  2 +-
 .../shared/zen-icons/extension-blocked.svg    |  2 +-
 .../themes/shared/zen-icons/extension.svg     |  2 +-
 .../themes/shared/zen-icons/folder.svg        |  2 +-
 .../themes/shared/zen-icons/forget.svg        |  2 +-
 .../themes/shared/zen-icons/forward.svg       |  2 +-
 .../shared/zen-icons/fullscreen-exit.svg      |  2 +-
 .../themes/shared/zen-icons/fullscreen.svg    |  2 +-
 .../themes/shared/zen-icons/geo-blocked.svg   |  2 +-
 src/browser/themes/shared/zen-icons/geo.svg   |  2 +-
 src/browser/themes/shared/zen-icons/help.svg  |  2 +-
 .../themes/shared/zen-icons/history.svg       |  2 +-
 src/browser/themes/shared/zen-icons/home.svg  |  2 +-
 .../themes/shared/zen-icons/image-copy.svg    |  2 +-
 .../themes/shared/zen-icons/image-open.svg    |  2 +-
 .../themes/shared/zen-icons/image-save.svg    |  2 +-
 src/browser/themes/shared/zen-icons/info.svg  |  2 +-
 .../themes/shared/zen-icons/inspect.svg       |  2 +-
 .../themes/shared/zen-icons/library.svg       |  2 +-
 src/browser/themes/shared/zen-icons/link.svg  |  2 +-
 .../themes/shared/zen-icons/manage.svg        |  2 +-
 .../themes/shared/zen-icons/media-loop.svg    |  2 +-
 .../themes/shared/zen-icons/media-mute.svg    |  2 +-
 .../themes/shared/zen-icons/media-pause.svg   |  2 +-
 .../themes/shared/zen-icons/media-pip.svg     |  2 +-
 .../themes/shared/zen-icons/media-play.svg    |  2 +-
 .../themes/shared/zen-icons/media-speed.svg   |  2 +-
 .../themes/shared/zen-icons/media-unmute.svg  |  2 +-
 .../themes/shared/zen-icons/menu-bar.svg      |  2 +-
 src/browser/themes/shared/zen-icons/menu.svg  |  2 +-
 .../shared/zen-icons/microphone-blocked.svg   |  2 +-
 .../themes/shared/zen-icons/microphone.svg    |  2 +-
 .../themes/shared/zen-icons/move-tab.svg      |  2 +-
 .../themes/shared/zen-icons/new-tab-image.svg |  2 +-
 src/browser/themes/shared/zen-icons/open.svg  |  2 +-
 .../themes/shared/zen-icons/page-portrait.svg |  2 +-
 .../themes/shared/zen-icons/passwords.svg     |  2 +-
 .../themes/shared/zen-icons/paste-and-go.svg  |  2 +-
 .../themes/shared/zen-icons/permissions.svg   |  2 +-
 .../zen-icons/persistent-storage-blocked.svg  |  2 +-
 .../shared/zen-icons/persistent-storage.svg   |  2 +-
 src/browser/themes/shared/zen-icons/pin.svg   |  2 +-
 src/browser/themes/shared/zen-icons/plus.svg  |  2 +-
 src/browser/themes/shared/zen-icons/popup.svg |  2 +-
 src/browser/themes/shared/zen-icons/print.svg |  2 +-
 .../shared/zen-icons/private-window.svg       |  2 +-
 .../shared/zen-icons/privateBrowsing.svg      |  2 +-
 .../themes/shared/zen-icons/reader-mode.svg   |  2 +-
 .../themes/shared/zen-icons/reload.svg        |  2 +-
 .../themes/shared/zen-icons/report.svg        |  2 +-
 src/browser/themes/shared/zen-icons/save.svg  |  2 +-
 .../shared/zen-icons/screen-blocked.svg       |  2 +-
 .../themes/shared/zen-icons/screen.svg        |  2 +-
 .../themes/shared/zen-icons/screenshot.svg    |  2 +-
 .../themes/shared/zen-icons/search-glass.svg  |  2 +-
 .../themes/shared/zen-icons/search-page.svg   |  2 +-
 .../shared/zen-icons/security-broken.svg      |  2 +-
 .../shared/zen-icons/security-warning.svg     |  2 +-
 .../themes/shared/zen-icons/security.svg      |  2 +-
 .../shared/zen-icons/send-to-device.svg       |  2 +-
 .../themes/shared/zen-icons/settings.svg      |  2 +-
 src/browser/themes/shared/zen-icons/share.svg |  2 +-
 .../themes/shared/zen-icons/sidebar.svg       |  2 +-
 .../shared/zen-icons/sidebars-right.svg       |  2 +-
 .../themes/shared/zen-icons/source-code.svg   |  2 +-
 .../themes/shared/zen-icons/spell-check.svg   |  2 +-
 src/browser/themes/shared/zen-icons/split.svg |  2 +-
 .../zen-icons/tab-audio-blocked-small.svg     |  2 +-
 .../zen-icons/tab-audio-muted-small.svg       |  2 +-
 .../zen-icons/tab-audio-playing-small.svg     |  2 +-
 src/browser/themes/shared/zen-icons/tab.svg   |  2 +-
 .../themes/shared/zen-icons/tool-profiler.svg |  2 +-
 .../shared/zen-icons/tracking-protection.svg  |  2 +-
 .../themes/shared/zen-icons/translations.svg  |  2 +-
 src/browser/themes/shared/zen-icons/unpin.svg |  2 +-
 .../themes/shared/zen-icons/video-open.svg    |  2 +-
 .../themes/shared/zen-icons/video-save.svg    |  2 +-
 .../themes/shared/zen-icons/window.svg        |  2 +-
 .../themes/shared/zen-icons/xr-blocked.svg    |  2 +-
 src/browser/themes/shared/zen-icons/xr.svg    |  2 +-
 .../themes/shared/zen-icons/zoom-control.svg  |  2 +-
 .../themes/shared/zen-icons/zoom-out.svg      |  2 +-
 126 files changed, 164 insertions(+), 154 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 4c58a6e90..cfde08211 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -148,9 +148,18 @@ var gZenUIManager = {
     this.__currentPopupTrackElement = null;
   },
 
+  get newtabButton() {
+    if (this._newtabButton) {
+      return this._newtabButton;
+    }
+    this._newtabButton = document.getElementById('tabs-newtab-button');
+    return this._newtabButton;
+  },
+
   _prevUrlbarLabel: null,
   _lastSearch: '',
   _clearTimeout: null,
+  _lastTab: null,
 
   handleNewTab(werePassedURL, searchClipboard, where) {
     const shouldOpenURLBar =
@@ -159,9 +168,12 @@ var gZenUIManager = {
       if (this._clearTimeout) {
         clearTimeout(this._clearTimeout);
       }
+      this._lastTab = gBrowser.selectedTab;
+      this._lastTab._visuallySelected = false;
       this._prevUrlbarLabel = gURLBar._untrimmedValue;
       gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
       gURLBar.setAttribute('zen-newtab', true);
+      this.newtabButton.setAttribute('in-urlbar', true);
       document.getElementById('Browser:OpenLocation').doCommand();
       gURLBar.search(this._lastSearch);
       return true;
@@ -177,6 +189,9 @@ var gZenUIManager = {
   handleUrlbarClose(onSwitch) {
     gURLBar._zenHandleUrlbarClose = null;
     gURLBar.removeAttribute('zen-newtab');
+    this._lastTab._visuallySelected = true;
+    this._lastTab = null;
+    this.newtabButton.removeAttribute('in-urlbar');
     if (onSwitch) {
       this.clearUrlbarData();
     } else {
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index e08650a78..a593fedfc 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -87,17 +87,6 @@
     width: -moz-available !important;
   }
 
-  .sharing-icon,
-  #identity-icon,
-  .urlbar-icon,
-  #permissions-granted-icon,
-  #tracking-protection-icon,
-  #tracking-protection-icon-box,
-  #blocked-permissions-container > .blocked-permission-icon {
-    width: 14px;
-    height: 14px;
-  }
-
   #identity-icon-box,
   #identity-permission-box {
     margin-top: auto;
@@ -261,6 +250,7 @@
 
   --tab-block-margin: 2px;
   --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.12));
+  --tab-selected-shadow: 0 1px 1px 1px light-dark(rgba(0, 0, 0, 0.09), rgba(0, 0, 0, 0.1)) !important;
   grid-gap: 0 !important;
 
   &[overflow]::after,
@@ -275,10 +265,6 @@
       #tabbrowser-tabs[dont-animate-tabs] & {
         opacity: 0;
       }
-
-      &:is([selected], [multiselected], [visuallyselected]) .tab-background {
-        box-shadow: 0 1px 1px 1px light-dark(rgba(0, 0, 0, 0.09), rgba(0, 0, 0, 0.1));
-      }
     }
 
     &:active {
@@ -535,7 +521,7 @@
       }
 
       &:hover {
-        background: var(--toolbarbutton-hover-background) !important;
+        background: var(--toolbarbutton-hover-background);
 
         & image,
         label {
@@ -902,10 +888,22 @@
 @media (-moz-bool-pref: 'zen.tabs.show-newtab-vertical') {
   #tabs-newtab-button {
     display: flex !important;
+    transition: scale 0.1s ease;
     & .toolbarbutton-text {
       align-items: center;
       padding-top: 0;
     }
+    
+    &:active,
+    &[open] {
+      scale: 0.98;
+    }
+
+    &[in-urlbar] {
+      background: var(--tab-selected-bgcolor) !important;
+      opacity: 1 !important;
+      box-shadow: var(--tab-selected-shadow);
+    }
   }
 
   #tabbrowser-arrowscrollbox-periphery {
@@ -968,10 +966,6 @@
 
   --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.2));
 
-  &[selected] .tab-background {
-    box-shadow: 0 1px 1px 1px light-dark(rgba(0, 0, 0, 0.09), rgba(0, 0, 0, 0.1));
-  }
-
   &:not([selected], [multiselected="true"]) .tab-background {
     background: var(--zen-toolbar-element-bg);
     border: none;
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index b5a75004d..e4398c8ab 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -169,7 +169,6 @@
   --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
   --arrowpanel-background: var(--zen-dialog-background) !important;
 
-  --tab-selected-shadow: none !important;
   --zen-big-shadow: 0 0 9.73px 0px light-dark(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.25));
 
   /* Nativity */
@@ -213,7 +212,7 @@
     --zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%);
 
     --zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 1%, var(--zen-dark-color-mix-base) 99%);
-    --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 20%, rgb(53, 53, 53) 80%);
+    --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 20%, rgb(79, 79, 79) 80%);
     --zen-colors-border-contrast: color-mix(in srgb, var(--zen-colors-secondary) 10%, rgba(255, 255, 255, 0.11) 90%);
 
     --zen-dialog-background: var(--zen-dark-color-mix-base);
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 773014084..b56c65232 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -11,7 +11,7 @@
 
 #urlbar {
   --toolbarbutton-border-radius: 8px;
-  --urlbarView-separator-color: var(--zen-colors-border);
+  --urlbarView-separator-color: light-dark(hsl(0, 0%, 90%), hsl(0, 0%, 20%));
   --urlbarView-hover-background: var(--toolbarbutton-hover-background);
   --urlbarView-highlight-background: var(--toolbarbutton-hover-background);
   border-radius: var(--toolbarbutton-border-radius);
@@ -121,8 +121,12 @@
 }
 
 #urlbar[breakout-extend='true'] #urlbar-background {
-  border: 1px solid var(--zen-colors-border) !important;
-  box-shadow: var(--zen-big-shadow) !important;
+  box-shadow:
+    inset 0 0 0.5px 1px hsla(0, 0%, 100%, 0.1),
+    /* 2. shadow ring 👇 */ 0 0 0 1px hsla(230, 13%, 9%, 0.075),
+    /* 3. multiple soft shadows 👇 */ 0 0.3px 0.4px hsla(230, 13%, 9%, 0.02),
+    0 0.9px 1.5px hsla(230, 13%, 9%, 0.045),
+    0 6.5px 12px hsla(230, 13%, 9%, 0.1) !important;
   backdrop-filter: none !important;
 }
 
@@ -387,7 +391,7 @@ button.popup-notification-dropmarker {
     /* We cant have a transparent background with a backdrop-filter because on normal websites,
       the backdrop woudn't work, we would need to apply a clip-path to the site and that's not recommended
       due to performance issues */
-    background-color: light-dark(rgb(247, 247, 247), var(--zen-branding-bg)) !important;
+    background-color: light-dark(hsl(0, 0%, 100%), hsl(0, 0%, 14%)) !important;
   }
 }
 
@@ -405,12 +409,11 @@ button.popup-notification-dropmarker {
   z-index: 1000;
   max-width: 45vw;
   min-width: 45vw !important;
-  font-size: 1.1em;
   --urlbar-container-height: 55px !important;
   --urlbar-margin-inline: 10px !important;
   position: absolute;
 
-  font-size: 1.15em !important;
+  font-size: 1.5em !important;
   top: calc(var(--zen-toolbar-height) * 2) !important;
 
   --zen-urlbar-center: calc(var(--zen-urlbar-offset, 0px) + 28vw);
@@ -491,10 +494,9 @@ button.popup-notification-dropmarker {
   }
 
   &:hover {
-    background-color: light-dark(var(--zen-colors-secondary), var(--zen-colors-primary)) !important;
-
-    .urlbarView-favicon {
-      background-color: color-mix(in srgb, var(--zen-branding-bg-reverse) 20%, transparent 80%) !important;
+    .urlbarView-favicon,
+    & {
+      background-color: color-mix(in srgb, var(--zen-branding-bg-reverse) 5%, transparent 95%) !important;
     }
 
     .urlbarView-url,
diff --git a/src/browser/themes/shared/zen-icons/accessibility.svg b/src/browser/themes/shared/zen-icons/accessibility.svg
index 89d9baa0b..c840382d3 100644
--- a/src/browser/themes/shared/zen-icons/accessibility.svg
+++ b/src/browser/themes/shared/zen-icons/accessibility.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="2.25" r="1.5" data-color="color-2"></circle><line x1="7.25" y1="16.5" x2="7.25" y2="6.24"></line><line x1="10.75" y1="6.24" x2="10.75" y2="16.5"></line><path d="M2.75,5.75c1.751,.3,3.86,.531,6.25,.531,1.777,0,3.894-.128,6.25-.531"></path><line x1="7.25" y1="11.25" x2="10.75" y2="11.25"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="2.25" r="1.5" data-color="color-2"></circle><line x1="7.25" y1="16.5" x2="7.25" y2="6.24"></line><line x1="10.75" y1="6.24" x2="10.75" y2="16.5"></line><path d="M2.75,5.75c1.751,.3,3.86,.531,6.25,.531,1.777,0,3.894-.128,6.25-.531"></path><line x1="7.25" y1="11.25" x2="10.75" y2="11.25"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/add-to-dictionary.svg b/src/browser/themes/shared/zen-icons/add-to-dictionary.svg
index 6f6dfdabb..3ee28ba35 100644
--- a/src/browser/themes/shared/zen-icons/add-to-dictionary.svg
+++ b/src/browser/themes/shared/zen-icons/add-to-dictionary.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.181,3.257c-.221-.865-.998-1.507-1.931-1.507H5.75c-1.105,0-2,.896-2,2v12.5l5.25-3.5,5.25,3.5v-3"></path><line x1="14.25" y1="5.75" x2="14.25" y2="10.75" data-color="color-2"></line><line x1="16.75" y1="8.25" x2="11.75" y2="8.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.181,3.257c-.221-.865-.998-1.507-1.931-1.507H5.75c-1.105,0-2,.896-2,2v12.5l5.25-3.5,5.25,3.5v-3"></path><line x1="14.25" y1="5.75" x2="14.25" y2="10.75" data-color="color-2"></line><line x1="16.75" y1="8.25" x2="11.75" y2="8.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-down.svg b/src/browser/themes/shared/zen-icons/arrow-down.svg
index 1ef89c26f..3fb328224 100644
--- a/src/browser/themes/shared/zen-icons/arrow-down.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="15.25 6.5 9 12.75 2.75 6.5"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="15.25 6.5 9 12.75 2.75 6.5"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-left.svg b/src/browser/themes/shared/zen-icons/arrow-left.svg
index 21c2342a2..f44352b46 100644
--- a/src/browser/themes/shared/zen-icons/arrow-left.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-left.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="11.5 15.25 5.25 9 11.5 2.75"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="11.5 15.25 5.25 9 11.5 2.75"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-right.svg b/src/browser/themes/shared/zen-icons/arrow-right.svg
index eaf6fc7c0..cff35212a 100644
--- a/src/browser/themes/shared/zen-icons/arrow-right.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-right.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="6.5 2.75 12.75 9 6.5 15.25"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="6.5 2.75 12.75 9 6.5 15.25"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/arrow-up.svg b/src/browser/themes/shared/zen-icons/arrow-up.svg
index 7502b1f11..b206a3f9f 100644
--- a/src/browser/themes/shared/zen-icons/arrow-up.svg
+++ b/src/browser/themes/shared/zen-icons/arrow-up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 11.5 9 5.25 15.25 11.5"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 11.5 9 5.25 15.25 11.5"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/audio-save.svg b/src/browser/themes/shared/zen-icons/audio-save.svg
index a5bc48b88..6b01002fb 100644
--- a/src/browser/themes/shared/zen-icons/audio-save.svg
+++ b/src/browser/themes/shared/zen-icons/audio-save.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="7.25" x2="5.75" y2="13.75"></line><line x1="14.75" y1="5.75" x2="14.75" y2="12.25"></line><path d="m8.6399,3.0186l4.9461-.8246c.61-.102,1.164.368,1.164.986v2.57l-9,1.5"></path><circle cx="3.75" cy="13.75" r="2"></circle><circle cx="12.75" cy="12.25" r="2"></circle><line x1="3.75" y1="1.25" x2="3.75" y2="6.25" data-color="color-2"></line><line x1="6.25" y1="3.75" x2="1.25" y2="3.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="7.25" x2="5.75" y2="13.75"></line><line x1="14.75" y1="5.75" x2="14.75" y2="12.25"></line><path d="m8.6399,3.0186l4.9461-.8246c.61-.102,1.164.368,1.164.986v2.57l-9,1.5"></path><circle cx="3.75" cy="13.75" r="2"></circle><circle cx="12.75" cy="12.25" r="2"></circle><line x1="3.75" y1="1.25" x2="3.75" y2="6.25" data-color="color-2"></line><line x1="6.25" y1="3.75" x2="1.25" y2="3.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg b/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg
index aeb9a98eb..8e2760962 100644
--- a/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/autoplay-media-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.25,8.75V1.75s1.303,2.048,3.427,3.573"></path><path d="M5.406,16.13c.268,.078,.551,.12,.844,.12,1.657,0,3-1.343,3-3,0-.293-.042-.577-.12-.844"></path><path d="M7.485,10.515c-.377-.17-.795-.265-1.235-.265-1.657,0-3,1.343-3,3,0,.44,.095,.858,.265,1.235"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.25,8.75V1.75s1.303,2.048,3.427,3.573"></path><path d="M5.406,16.13c.268,.078,.551,.12,.844,.12,1.657,0,3-1.343,3-3,0-.293-.042-.577-.12-.844"></path><path d="M7.485,10.515c-.377-.17-.795-.265-1.235-.265-1.657,0-3,1.343-3,3,0,.44,.095,.858,.265,1.235"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/autoplay-media.svg b/src/browser/themes/shared/zen-icons/autoplay-media.svg
index 20a6a2c81..12ef8fcf0 100644
--- a/src/browser/themes/shared/zen-icons/autoplay-media.svg
+++ b/src/browser/themes/shared/zen-icons/autoplay-media.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.75,13.25V1.75s1.75,2.75,4.5,4.25" data-color="color-2"></path><circle cx="6.75" cy="13.25" r="3"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.75,13.25V1.75s1.75,2.75,4.5,4.25" data-color="color-2"></path><circle cx="6.75" cy="13.25" r="3"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/back.svg b/src/browser/themes/shared/zen-icons/back.svg
index 1678b6024..d2c36f023 100644
--- a/src/browser/themes/shared/zen-icons/back.svg
+++ b/src/browser/themes/shared/zen-icons/back.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="2.75" y1="9" x2="15.25" y2="9" data-color="color-2"></line><polyline points="7 13.25 2.75 9 7 4.75"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="2.75" y1="9" x2="15.25" y2="9" data-color="color-2"></line><polyline points="7 13.25 2.75 9 7 4.75"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/bookmark-hollow.svg b/src/browser/themes/shared/zen-icons/bookmark-hollow.svg
index 0d1792366..80ee175f8 100644
--- a/src/browser/themes/shared/zen-icons/bookmark-hollow.svg
+++ b/src/browser/themes/shared/zen-icons/bookmark-hollow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,16.25l-4.75-3.5-4.75,3.5V6.75c0-1.105,.895-2,2-2h5.5c1.105,0,2,.895,2,2v9.5Z"></path><path d="M6.781,2c.287-.159,.617-.25,.969-.25h5.5c1.105,0,2,.895,2,2V13.25" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,16.25l-4.75-3.5-4.75,3.5V6.75c0-1.105,.895-2,2-2h5.5c1.105,0,2,.895,2,2v9.5Z"></path><path d="M6.781,2c.287-.159,.617-.25,.969-.25h5.5c1.105,0,2,.895,2,2V13.25" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg b/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg
index 0d1792366..80ee175f8 100644
--- a/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg
+++ b/src/browser/themes/shared/zen-icons/bookmark-star-on-tray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,16.25l-4.75-3.5-4.75,3.5V6.75c0-1.105,.895-2,2-2h5.5c1.105,0,2,.895,2,2v9.5Z"></path><path d="M6.781,2c.287-.159,.617-.25,.969-.25h5.5c1.105,0,2,.895,2,2V13.25" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,16.25l-4.75-3.5-4.75,3.5V6.75c0-1.105,.895-2,2-2h5.5c1.105,0,2,.895,2,2v9.5Z"></path><path d="M6.781,2c.287-.159,.617-.25,.969-.25h5.5c1.105,0,2,.895,2,2V13.25" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/bookmark.svg b/src/browser/themes/shared/zen-icons/bookmark.svg
index d4af6bbbf..c00c201f1 100644
--- a/src/browser/themes/shared/zen-icons/bookmark.svg
+++ b/src/browser/themes/shared/zen-icons/bookmark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,16.25l-5.25-3.5-5.25,3.5V3.75c0-1.105,.895-2,2-2h6.5c1.105,0,2,.895,2,2v12.5Z"></path><polyline points="6.497 8 8.106 9.5 11.503 5" data-color="color-2"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,16.25l-5.25-3.5-5.25,3.5V3.75c0-1.105,.895-2,2-2h6.5c1.105,0,2,.895,2,2v12.5Z"></path><polyline points="6.497 8 8.106 9.5 11.503 5" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/camera-blocked.svg b/src/browser/themes/shared/zen-icons/camera-blocked.svg
index 090a80b78..fc7df3492 100644
--- a/src/browser/themes/shared/zen-icons/camera-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/camera-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.285,14.25h6.965c1.105,0,2-.895,2-2V5.75c0-.138-.014-.273-.041-.403"></path><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2"></path><path d="M7.055,10.945c-.498-.498-.805-1.185-.805-1.945,0-1.519,1.231-2.75,2.75-2.75,.759,0,1.447,.308,1.945,.805" data-color="color-2"></path><circle cx="4.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.285,14.25h6.965c1.105,0,2-.895,2-2V5.75c0-.138-.014-.273-.041-.403"></path><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2"></path><path d="M7.055,10.945c-.498-.498-.805-1.185-.805-1.945,0-1.519,1.231-2.75,2.75-2.75,.759,0,1.447,.308,1.945,.805" data-color="color-2"></path><circle cx="4.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/camera.svg b/src/browser/themes/shared/zen-icons/camera.svg
index eb7b8eb93..d8fd7902a 100644
--- a/src/browser/themes/shared/zen-icons/camera.svg
+++ b/src/browser/themes/shared/zen-icons/camera.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2H14.25c1.105,0,2-.895,2-2V5.75c0-1.105-.895-2-2-2Z"></path><circle cx="9" cy="9" r="2.75" data-color="color-2"></circle><circle cx="4.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.25,3.75h-2.25l-.507-1.351c-.146-.39-.519-.649-.936-.649h-3.114c-.417,0-.79,.259-.936,.649l-.507,1.351H3.75c-1.105,0-2,.895-2,2v6.5c0,1.105,.895,2,2,2H14.25c1.105,0,2-.895,2-2V5.75c0-1.105-.895-2-2-2Z"></path><circle cx="9" cy="9" r="2.75" data-color="color-2"></circle><circle cx="4.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/canvas.svg b/src/browser/themes/shared/zen-icons/canvas.svg
index 56e2403dc..088d715e6 100644
--- a/src/browser/themes/shared/zen-icons/canvas.svg
+++ b/src/browser/themes/shared/zen-icons/canvas.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.762,14.989l6.074-6.075c.781-.781,2.047-.781,2.828,0l2.586,2.586" data-color="color-2"></path><rect x="2.75" y="2.75" width="12.5" height="12.5" rx="2" ry="2"></rect><circle cx="6.25" cy="7.25" r="1.25" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.762,14.989l6.074-6.075c.781-.781,2.047-.781,2.828,0l2.586,2.586" data-color="color-2"></path><rect x="2.75" y="2.75" width="12.5" height="12.5" rx="2" ry="2"></rect><circle cx="6.25" cy="7.25" r="1.25" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/checkmark.svg b/src/browser/themes/shared/zen-icons/checkmark.svg
index 2e009fdf1..b2379ceba 100644
--- a/src/browser/themes/shared/zen-icons/checkmark.svg
+++ b/src/browser/themes/shared/zen-icons/checkmark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 9.5 6.5 13.25 15.25 4.5"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 9.5 6.5 13.25 15.25 4.5"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/chevron.svg b/src/browser/themes/shared/zen-icons/chevron.svg
index c4294002c..43b683ae1 100644
--- a/src/browser/themes/shared/zen-icons/chevron.svg
+++ b/src/browser/themes/shared/zen-icons/chevron.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="9.75 4.75 14 9 9.75 13.25" data-color="color-2"></polyline><polyline points="5 4.75 9.25 9 5 13.25"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="9.75 4.75 14 9 9.75 13.25" data-color="color-2"></polyline><polyline points="5 4.75 9.25 9 5 13.25"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/close-all.svg b/src/browser/themes/shared/zen-icons/close-all.svg
index a27866f14..d4c6ae30a 100644
--- a/src/browser/themes/shared/zen-icons/close-all.svg
+++ b/src/browser/themes/shared/zen-icons/close-all.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,16.25v-.5c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v.5"></path><path d="M3.75,11.25c0-.828,.672-1.5,1.5-1.5h7.5c.828,0,1.5,.672,1.5,1.5"></path><polyline points="11.5 4.75 9 7.25 6.5 4.75" data-color="color-2"></polyline><line x1="9" y1="7" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,16.25v-.5c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v.5"></path><path d="M3.75,11.25c0-.828,.672-1.5,1.5-1.5h7.5c.828,0,1.5,.672,1.5,1.5"></path><polyline points="11.5 4.75 9 7.25 6.5 4.75" data-color="color-2"></polyline><line x1="9" y1="7" x2="9" y2="1.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/close.svg b/src/browser/themes/shared/zen-icons/close.svg
index 327a6c91f..8560bd1c0 100644
--- a/src/browser/themes/shared/zen-icons/close.svg
+++ b/src/browser/themes/shared/zen-icons/close.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="14" y1="4" x2="4" y2="14" data-color="color-2"></line><line x1="4" y1="4" x2="14" y2="14"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="14" y1="4" x2="4" y2="14" data-color="color-2"></line><line x1="4" y1="4" x2="14" y2="14"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/container-tab.svg b/src/browser/themes/shared/zen-icons/container-tab.svg
index 5774a0f1d..790c58e00 100644
--- a/src/browser/themes/shared/zen-icons/container-tab.svg
+++ b/src/browser/themes/shared/zen-icons/container-tab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,2.75h7c1.105,0,2,.895,2,2v1.5" data-color="color-2"></path><line x1="11.25" y1="2.75" x2="11.25" y2="6.25" data-color="color-2"></line><line x1="14.75" y1="11.75" x2="14.75" y2="16.75" data-color="color-2"></line><path d="M15.75,9.461v-3.211H6.75V2.75h-2.5c-1.105,0-2,.895-2,2V13.25c0,1.105,.895,2,2,2h5.711"></path><line x1="17.25" y1="14.25" x2="12.25" y2="14.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,2.75h7c1.105,0,2,.895,2,2v1.5" data-color="color-2"></path><line x1="11.25" y1="2.75" x2="11.25" y2="6.25" data-color="color-2"></line><line x1="14.75" y1="11.75" x2="14.75" y2="16.75" data-color="color-2"></line><path d="M15.75,9.461v-3.211H6.75V2.75h-2.5c-1.105,0-2,.895-2,2V13.25c0,1.105,.895,2,2,2h5.711"></path><line x1="17.25" y1="14.25" x2="12.25" y2="14.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/customize.svg b/src/browser/themes/shared/zen-icons/customize.svg
index 6ddec40ff..9b4daa6fa 100644
--- a/src/browser/themes/shared/zen-icons/customize.svg
+++ b/src/browser/themes/shared/zen-icons/customize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="10.25 12.75 12.75 15.25 15.25 12.75" data-color="color-2"></polyline><polyline points="15.25 5.25 12.75 2.75 10.25 5.25" data-color="color-2"></polyline><line x1="12.75" y1="15" x2="12.75" y2="3" data-color="color-2"></line><rect x="2.75" y="10.25" width="5" height="5" rx="1" ry="1"></rect><rect x="2.75" y="2.75" width="5" height="5" rx="1" ry="1"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="10.25 12.75 12.75 15.25 15.25 12.75" data-color="color-2"></polyline><polyline points="15.25 5.25 12.75 2.75 10.25 5.25" data-color="color-2"></polyline><line x1="12.75" y1="15" x2="12.75" y2="3" data-color="color-2"></line><rect x="2.75" y="10.25" width="5" height="5" rx="1" ry="1"></rect><rect x="2.75" y="2.75" width="5" height="5" rx="1" ry="1"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg b/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg
index 4ab923e16..4a9ed8660 100644
--- a/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/desktop-notification-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.368,4.632c-.726-1.694-2.408-2.882-4.368-2.882h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2h2.5"></path><path d="M8,13.25h7.75c-1.105,0-2-.895-2-2v-3.5"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.368,4.632c-.726-1.694-2.408-2.882-4.368-2.882h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2h2.5"></path><path d="M8,13.25h7.75c-1.105,0-2-.895-2-2v-3.5"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/desktop-notification.svg b/src/browser/themes/shared/zen-icons/desktop-notification.svg
index 866964cd8..2647272ed 100644
--- a/src/browser/themes/shared/zen-icons/desktop-notification.svg
+++ b/src/browser/themes/shared/zen-icons/desktop-notification.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.75,13.25c-1.105,0-2-.895-2-2V6.5c0-2.623-2.127-4.75-4.75-4.75h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2H15.75Z"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.75,13.25c-1.105,0-2-.895-2-2V6.5c0-2.623-2.127-4.75-4.75-4.75h0c-2.623,0-4.75,2.127-4.75,4.75v4.75c0,1.105-.895,2-2,2H15.75Z"></path><path d="M10.588,15.185c-.095-.117-.237-.185-.388-.185h-2.399c-.151,0-.293,.068-.388,.185-.095,.117-.132,.271-.101,.418,.173,.822,.868,1.397,1.689,1.397s1.516-.575,1.689-1.397c.031-.147-.006-.301-.101-.418Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/developer.svg b/src/browser/themes/shared/zen-icons/developer.svg
index b2bcbe3ae..fd575bff4 100644
--- a/src/browser/themes/shared/zen-icons/developer.svg
+++ b/src/browser/themes/shared/zen-icons/developer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="11.75" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.25" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><path d="M6.25,15.25h-1c-1.105,0-2-.895-2-2v-2.625c0-.897-.728-1.625-1.625-1.625,.897,0,1.625-.728,1.625-1.625v-2.625c0-1.105,.895-2,2-2h1"></path><path d="M11.75,15.25h1c1.105,0,2-.895,2-2v-2.625c0-.897,.728-1.625,1.625-1.625-.897,0-1.625-.728-1.625-1.625v-2.625c0-1.105-.895-2-2-2h-1"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="11.75" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.25" cy="12.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><path d="M6.25,15.25h-1c-1.105,0-2-.895-2-2v-2.625c0-.897-.728-1.625-1.625-1.625,.897,0,1.625-.728,1.625-1.625v-2.625c0-1.105,.895-2,2-2h1"></path><path d="M11.75,15.25h1c1.105,0,2-.895,2-2v-2.625c0-.897,.728-1.625,1.625-1.625-.897,0-1.625-.728-1.625-1.625v-2.625c0-1.105-.895-2-2-2h-1"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/downloads.svg b/src/browser/themes/shared/zen-icons/downloads.svg
index 6fc5ab26a..271fe59dc 100644
--- a/src/browser/themes/shared/zen-icons/downloads.svg
+++ b/src/browser/themes/shared/zen-icons/downloads.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.25,11.75v1.5c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2v-1.5"></path><polyline points="5.5 6.75 9 10.25 12.5 6.75" data-color="color-2"></polyline><line x1="9" y1="10.25" x2="9" y2="2.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.25,11.75v1.5c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2v-1.5"></path><polyline points="5.5 6.75 9 10.25 12.5 6.75" data-color="color-2"></polyline><line x1="9" y1="10.25" x2="9" y2="2.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/drag-indicator.svg b/src/browser/themes/shared/zen-icons/drag-indicator.svg
index 97b4bb120..1fbf86104 100644
--- a/src/browser/themes/shared/zen-icons/drag-indicator.svg
+++ b/src/browser/themes/shared/zen-icons/drag-indicator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="6.75" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="6.75" cy="3.75" r=".5" fill="currentColor"></circle><circle cx="6.75" cy="14.25" r=".5" fill="currentColor"></circle><circle cx="11.25" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="11.25" cy="3.75" r=".5" fill="currentColor"></circle><circle cx="11.25" cy="14.25" r=".5" fill="currentColor"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="6.75" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="6.75" cy="3.75" r=".5" fill="currentColor"></circle><circle cx="6.75" cy="14.25" r=".5" fill="currentColor"></circle><circle cx="11.25" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="11.25" cy="3.75" r=".5" fill="currentColor"></circle><circle cx="11.25" cy="14.25" r=".5" fill="currentColor"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/duplicate-tab.svg b/src/browser/themes/shared/zen-icons/duplicate-tab.svg
index 67e321267..feda9b8ef 100644
--- a/src/browser/themes/shared/zen-icons/duplicate-tab.svg
+++ b/src/browser/themes/shared/zen-icons/duplicate-tab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.25" y="5.25" width="11" height="11" rx="2" ry="2"></rect><path d="M2.801,11.998L1.772,5.074c-.162-1.093,.592-2.11,1.684-2.272l6.924-1.029c.933-.139,1.81,.39,2.148,1.228" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.25" y="5.25" width="11" height="11" rx="2" ry="2"></rect><path d="M2.801,11.998L1.772,5.074c-.162-1.093,.592-2.11,1.684-2.272l6.924-1.029c.933-.139,1.81,.39,2.148,1.228" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-copy.svg b/src/browser/themes/shared/zen-icons/edit-copy.svg
index 0f4e4f2b5..20f72247b 100644
--- a/src/browser/themes/shared/zen-icons/edit-copy.svg
+++ b/src/browser/themes/shared/zen-icons/edit-copy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-cut.svg b/src/browser/themes/shared/zen-icons/edit-cut.svg
index e461be2cd..601fdd3cb 100644
--- a/src/browser/themes/shared/zen-icons/edit-cut.svg
+++ b/src/browser/themes/shared/zen-icons/edit-cut.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="12.75" y1="7.75" x2="16.25" y2="7.75" data-color="color-2"></line><line x1="4" y1="7.75" x2="9.25" y2="7.75" data-color="color-2"></line><circle cx="4" cy="5.5" r="2.25" data-color="color-2"></circle><line x1="5.409" y1="11.659" x2="14" y2="3"></line><circle cx="7" cy="13.25" r="2.25"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="12.75" y1="7.75" x2="16.25" y2="7.75" data-color="color-2"></line><line x1="4" y1="7.75" x2="9.25" y2="7.75" data-color="color-2"></line><circle cx="4" cy="5.5" r="2.25" data-color="color-2"></circle><line x1="5.409" y1="11.659" x2="14" y2="3"></line><circle cx="7" cy="13.25" r="2.25"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-delete.svg b/src/browser/themes/shared/zen-icons/edit-delete.svg
index 8bcfe2ad7..a0c77b63b 100644
--- a/src/browser/themes/shared/zen-icons/edit-delete.svg
+++ b/src/browser/themes/shared/zen-icons/edit-delete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="m13.474,7.25l-.374,7.105c-.056,1.062-.934,1.895-1.997,1.895h-4.205c-1.064,0-1.941-.833-1.997-1.895l-.374-7.105"></path><line x1="2.75" y1="4.75" x2="15.25" y2="4.75" data-color="color-2"></line><path d="m6.75,4.75v-2c0-.552.448-1,1-1h2.5c.552,0,1,.448,1,1v2" data-color="color-2"></path><line x1="7.375" y1="8.75" x2="7.625" y2="13.25" data-color="color-2"></line><line x1="10.625" y1="8.75" x2="10.375" y2="13.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="m13.474,7.25l-.374,7.105c-.056,1.062-.934,1.895-1.997,1.895h-4.205c-1.064,0-1.941-.833-1.997-1.895l-.374-7.105"></path><line x1="2.75" y1="4.75" x2="15.25" y2="4.75" data-color="color-2"></line><path d="m6.75,4.75v-2c0-.552.448-1,1-1h2.5c.552,0,1,.448,1,1v2" data-color="color-2"></path><line x1="7.375" y1="8.75" x2="7.625" y2="13.25" data-color="color-2"></line><line x1="10.625" y1="8.75" x2="10.375" y2="13.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-paste.svg b/src/browser/themes/shared/zen-icons/edit-paste.svg
index ceb616c4a..a2a9e1f6a 100644
--- a/src/browser/themes/shared/zen-icons/edit-paste.svg
+++ b/src/browser/themes/shared/zen-icons/edit-paste.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.25,2.75h-1c-1.105,0-2,.895-2,2V14.25c0,1.105,.895,2,2,2h7.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1"></path><rect x="6.25" y="1.25" width="5.5" height="3" rx="1" ry="1" data-color="color-2"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.25,2.75h-1c-1.105,0-2,.895-2,2V14.25c0,1.105,.895,2,2,2h7.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1"></path><rect x="6.25" y="1.25" width="5.5" height="3" rx="1" ry="1" data-color="color-2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-redo.svg b/src/browser/themes/shared/zen-icons/edit-redo.svg
index 39b73abb0..f08e25b4d 100644
--- a/src/browser/themes/shared/zen-icons/edit-redo.svg
+++ b/src/browser/themes/shared/zen-icons/edit-redo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15,10c-.528-.461-2.7-2.251-6-2.251s-5.472,1.79-6,2.251" data-color="color-2"></path><polyline points="13.375 5.598 15 10 10.47 11.222"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15,10c-.528-.461-2.7-2.251-6-2.251s-5.472,1.79-6,2.251" data-color="color-2"></path><polyline points="13.375 5.598 15 10 10.47 11.222"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-select-all.svg b/src/browser/themes/shared/zen-icons/edit-select-all.svg
index d90d0e5ed..e59c2a0ca 100644
--- a/src/browser/themes/shared/zen-icons/edit-select-all.svg
+++ b/src/browser/themes/shared/zen-icons/edit-select-all.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="14.75" y1=".75" x2="14.75" y2="5.75" data-color="color-2"></line><line x1="17.25" y1="3.25" x2="12.25" y2="3.25" data-color="color-2"></line><path d="M2.25,5.25c0-1.105,.895-2,2-2"></path><path d="M14.75,13.75c0,1.105-.895,2-2,2"></path><path d="M4.25,15.75c-1.105,0-2-.895-2-2"></path><line x1="7.25" y1="3.25" x2="9.25" y2="3.25"></line><line x1="7.25" y1="15.75" x2="9.75" y2="15.75"></line><line x1="14.75" y1="8.75" x2="14.75" y2="10.75"></line><line x1="2.25" y1="8.25" x2="2.25" y2="10.75"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="14.75" y1=".75" x2="14.75" y2="5.75" data-color="color-2"></line><line x1="17.25" y1="3.25" x2="12.25" y2="3.25" data-color="color-2"></line><path d="M2.25,5.25c0-1.105,.895-2,2-2"></path><path d="M14.75,13.75c0,1.105-.895,2-2,2"></path><path d="M4.25,15.75c-1.105,0-2-.895-2-2"></path><line x1="7.25" y1="3.25" x2="9.25" y2="3.25"></line><line x1="7.25" y1="15.75" x2="9.75" y2="15.75"></line><line x1="14.75" y1="8.75" x2="14.75" y2="10.75"></line><line x1="2.25" y1="8.25" x2="2.25" y2="10.75"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-theme.svg b/src/browser/themes/shared/zen-icons/edit-theme.svg
index f1a2a6a9e..97a2d2ade 100644
--- a/src/browser/themes/shared/zen-icons/edit-theme.svg
+++ b/src/browser/themes/shared/zen-icons/edit-theme.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,9.247l5.086-5.083c.552-.552,.552-1.448,0-2-.552-.552-1.448-.552-2,0l-5.094,5.096" data-color="color-2"></path><path d="M5.75,11.815c2.162,.65,3.917,.704,5.351-.764,.865-.868,.865-2.276,0-3.145s-2.261-.881-3.133,0c-1.418,1.434-.18,2.795-2.218,3.909Z" data-color="color-2"></path><path d="M16.25,8.284v4.966c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h6.965"></path><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,9.247l5.086-5.083c.552-.552,.552-1.448,0-2-.552-.552-1.448-.552-2,0l-5.094,5.096" data-color="color-2"></path><path d="M5.75,11.815c2.162,.65,3.917,.704,5.351-.764,.865-.868,.865-2.276,0-3.145s-2.261-.881-3.133,0c-1.418,1.434-.18,2.795-2.218,3.909Z" data-color="color-2"></path><path d="M16.25,8.284v4.966c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h6.965"></path><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit-undo.svg b/src/browser/themes/shared/zen-icons/edit-undo.svg
index 4e469ac9f..cf28988dd 100644
--- a/src/browser/themes/shared/zen-icons/edit-undo.svg
+++ b/src/browser/themes/shared/zen-icons/edit-undo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3,10c.528-.461,2.7-2.251,6-2.251s5.472,1.79,6,2.251" data-color="color-2"></path><polyline points="4.625 5.598 3 10 7.53 11.222"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3,10c.528-.461,2.7-2.251,6-2.251s5.472,1.79,6,2.251" data-color="color-2"></path><polyline points="4.625 5.598 3 10 7.53 11.222"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/edit.svg b/src/browser/themes/shared/zen-icons/edit.svg
index e5317afc1..052928b6b 100644
--- a/src/browser/themes/shared/zen-icons/edit.svg
+++ b/src/browser/themes/shared/zen-icons/edit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.75,15.25s3.599-.568,4.546-1.515c.947-.947,7.327-7.327,7.327-7.327,.837-.837,.837-2.194,0-3.03-.837-.837-2.194-.837-3.03,0,0,0-6.38,6.38-7.327,7.327s-1.515,4.546-1.515,4.546h0Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.75,15.25s3.599-.568,4.546-1.515c.947-.947,7.327-7.327,7.327-7.327,.837-.837,.837-2.194,0-3.03-.837-.837-2.194-.837-3.03,0,0,0-6.38,6.38-7.327,7.327s-1.515,4.546-1.515,4.546h0Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/essential-add.svg b/src/browser/themes/shared/zen-icons/essential-add.svg
index f814e9540..622d39314 100644
--- a/src/browser/themes/shared/zen-icons/essential-add.svg
+++ b/src/browser/themes/shared/zen-icons/essential-add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M8.743,7.769l-.946-.315-.316-.947c-.102-.306-.609-.306-.711,0l-.316,.947-.946,.315c-.153,.051-.257,.194-.257,.356s.104,.305,.257,.356l.946,.315,.316,.947c.051,.153,.194,.256,.355,.256s.305-.104,.355-.256l.316-.947,.946-.315c.153-.051,.257-.194,.257-.356s-.104-.305-.257-.356Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><path d="M15.144,9.976c.52-.995,.856-2.117,.856-3.367,.008-2.12-1.704-3.846-3.826-3.859-1.277,.016-2.464,.66-3.174,1.72-.709-1.061-1.896-1.704-3.173-1.72-2.123,.013-3.834,1.739-3.826,3.859,0,4.826,4.959,7.794,6.529,8.613,.297,.155,.644,.155,.941,0,.114-.059,.249-.133,.395-.214"></path><path d="M15.658,12.99l-1.263-.421-.421-1.263c-.137-.408-.812-.408-.949,0l-.421,1.263-1.263,.421c-.204,.068-.342,.259-.342,.474s.138,.406,.342,.474l1.263,.421,.421,1.263c.068,.204,.26,.342,.475,.342s.406-.138,.475-.342l.421-1.263,1.263-.421c.204-.068,.342-.259,.342-.474s-.138-.406-.342-.474Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><circle cx="12.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M8.743,7.769l-.946-.315-.316-.947c-.102-.306-.609-.306-.711,0l-.316,.947-.946,.315c-.153,.051-.257,.194-.257,.356s.104,.305,.257,.356l.946,.315,.316,.947c.051,.153,.194,.256,.355,.256s.305-.104,.355-.256l.316-.947,.946-.315c.153-.051,.257-.194,.257-.356s-.104-.305-.257-.356Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><path d="M15.144,9.976c.52-.995,.856-2.117,.856-3.367,.008-2.12-1.704-3.846-3.826-3.859-1.277,.016-2.464,.66-3.174,1.72-.709-1.061-1.896-1.704-3.173-1.72-2.123,.013-3.834,1.739-3.826,3.859,0,4.826,4.959,7.794,6.529,8.613,.297,.155,.644,.155,.941,0,.114-.059,.249-.133,.395-.214"></path><path d="M15.658,12.99l-1.263-.421-.421-1.263c-.137-.408-.812-.408-.949,0l-.421,1.263-1.263,.421c-.204,.068-.342,.259-.342,.474s.138,.406,.342,.474l1.263,.421,.421,1.263c.068,.204,.26,.342,.475,.342s.406-.138,.475-.342l.421-1.263,1.263-.421c.204-.068,.342-.259,.342-.474s-.138-.406-.342-.474Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><circle cx="12.25" cy="6.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/essential-remove.svg b/src/browser/themes/shared/zen-icons/essential-remove.svg
index 69ac1eb92..6675d71a1 100644
--- a/src/browser/themes/shared/zen-icons/essential-remove.svg
+++ b/src/browser/themes/shared/zen-icons/essential-remove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="8.999 4.927 7.75 7 10.5 8.75 8.5 10.75" data-color="color-2"></polyline><path d="M15.2,9.222l-5.48,5.694c-.393,.409-1.048,.409-1.441,0L2.799,9.222c-1.452-1.528-1.389-3.944,.139-5.395,1.528-1.452,3.944-1.389,5.395,.139,.27,.284,.495,.609,.666,.962,1.074-2.212,4.002-2.92,6.007-1.162,.535,.469,.929,1.101,1.11,1.79,.363,1.383-.034,2.738-.916,3.666Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="8.999 4.927 7.75 7 10.5 8.75 8.5 10.75" data-color="color-2"></polyline><path d="M15.2,9.222l-5.48,5.694c-.393,.409-1.048,.409-1.441,0L2.799,9.222c-1.452-1.528-1.389-3.944,.139-5.395,1.528-1.452,3.944-1.389,5.395,.139,.27,.284,.495,.609,.666,.962,1.074-2.212,4.002-2.92,6.007-1.162,.535,.469,.929,1.101,1.11,1.79,.363,1.383-.034,2.738-.916,3.666Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/expand-sidebar.svg b/src/browser/themes/shared/zen-icons/expand-sidebar.svg
index a72ec63ba..04da277e5 100644
--- a/src/browser/themes/shared/zen-icons/expand-sidebar.svg
+++ b/src/browser/themes/shared/zen-icons/expand-sidebar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="6.25" y1="12.5" x2="6.25" y2="15.25" data-color="color-2"></line><line x1="6.25" y1="2.75" x2="6.25" y2="5.5" data-color="color-2"></line><polyline points="8.75 6.5 6.25 9 8.75 11.5" data-color="color-2"></polyline><line x1="6.25" y1="9" x2="12.75" y2="9" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="6.25" y1="12.5" x2="6.25" y2="15.25" data-color="color-2"></line><line x1="6.25" y1="2.75" x2="6.25" y2="5.5" data-color="color-2"></line><polyline points="8.75 6.5 6.25 9 8.75 11.5" data-color="color-2"></polyline><line x1="6.25" y1="9" x2="12.75" y2="9" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/ext-link.svg b/src/browser/themes/shared/zen-icons/ext-link.svg
index 089c65e22..ec5374e08 100644
--- a/src/browser/themes/shared/zen-icons/ext-link.svg
+++ b/src/browser/themes/shared/zen-icons/ext-link.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4.25,9.25V3.75c0-1.105,.895-2,2-2h6c1.105,0,2,.895,2,2V13.25c0,1.105-.895,2-2,2H7.25"></path><polyline points="7.24 6.75 11.25 6.75 11.25 10.76" data-color="color-2"></polyline><line x1="11.25" y1="6.75" x2="1.75" y2="16.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4.25,9.25V3.75c0-1.105,.895-2,2-2h6c1.105,0,2,.895,2,2V13.25c0,1.105-.895,2-2,2H7.25"></path><polyline points="7.24 6.75 11.25 6.75 11.25 10.76" data-color="color-2"></polyline><line x1="11.25" y1="6.75" x2="1.75" y2="16.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/extension-blocked.svg b/src/browser/themes/shared/zen-icons/extension-blocked.svg
index 66278262e..8911071a4 100644
--- a/src/browser/themes/shared/zen-icons/extension-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/extension-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.266"></path><path d="M15.726,8.516c-.117-.993-.952-1.766-1.976-1.766H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h4.141"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.266"></path><path d="M15.726,8.516c-.117-.993-.952-1.766-1.976-1.766H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h4.141"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/extension.svg b/src/browser/themes/shared/zen-icons/extension.svg
index f462ae524..7b5ebe938 100644
--- a/src/browser/themes/shared/zen-icons/extension.svg
+++ b/src/browser/themes/shared/zen-icons/extension.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.75,8.25c.372,0,.716,.118,1,.317v-2.317c0-1.104-.895-2-2-2h-2.317c.198-.284,.317-.627,.317-1,0-.967-.784-1.75-1.75-1.75s-1.75,.783-1.75,1.75c0,.373,.118,.716,.317,1h-2.317c-1.105,0-2,.896-2,2v2.317c-.284-.198-.628-.317-1-.317-.966,0-1.75,.783-1.75,1.75s.784,1.75,1.75,1.75c.372,0,.716-.118,1-.317v2.317c0,1.104,.895,2,2,2h2.317c-.198-.284-.317-.627-.317-1,0-.967,.784-1.75,1.75-1.75s1.75,.783,1.75,1.75c0,.373-.118,.716-.317,1h2.317c1.105,0,2-.896,2-2v-2.317c-.284,.198-.628,.317-1,.317-.966,0-1.75-.783-1.75-1.75s.784-1.75,1.75-1.75Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.75,8.25c.372,0,.716,.118,1,.317v-2.317c0-1.104-.895-2-2-2h-2.317c.198-.284,.317-.627,.317-1,0-.967-.784-1.75-1.75-1.75s-1.75,.783-1.75,1.75c0,.373,.118,.716,.317,1h-2.317c-1.105,0-2,.896-2,2v2.317c-.284-.198-.628-.317-1-.317-.966,0-1.75,.783-1.75,1.75s.784,1.75,1.75,1.75c.372,0,.716-.118,1-.317v2.317c0,1.104,.895,2,2,2h2.317c-.198-.284-.317-.627-.317-1,0-.967,.784-1.75,1.75-1.75s1.75,.783,1.75,1.75c0,.373-.118,.716-.317,1h2.317c1.105,0,2-.896,2-2v-2.317c-.284,.198-.628,.317-1,.317-.966,0-1.75-.783-1.75-1.75s.784-1.75,1.75-1.75Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/folder.svg b/src/browser/themes/shared/zen-icons/folder.svg
index 410313bfe..6c5fe3631 100644
--- a/src/browser/themes/shared/zen-icons/folder.svg
+++ b/src/browser/themes/shared/zen-icons/folder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.75,5.25c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.825c.587,0,1.144,.258,1.524,.705l1.524,1.795h4.626Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.75,5.25c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.825c.587,0,1.144,.258,1.524,.705l1.524,1.795h4.626Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/forget.svg b/src/browser/themes/shared/zen-icons/forget.svg
index d02a1961a..79f824519 100644
--- a/src/browser/themes/shared/zen-icons/forget.svg
+++ b/src/browser/themes/shared/zen-icons/forget.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="9 4.75 9 9 12.25 11.25" data-color="color-2"></polyline><path d="M1.75,9C1.75,4.996,4.996,1.75,9,1.75s7.25,3.246,7.25,7.25-3.246,7.25-7.25,7.25c-3.031,0-5.627-1.86-6.71-4.5"></path><polyline points="1.88 14.695 2.288 11.75 5.232 12.157"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="9 4.75 9 9 12.25 11.25" data-color="color-2"></polyline><path d="M1.75,9C1.75,4.996,4.996,1.75,9,1.75s7.25,3.246,7.25,7.25-3.246,7.25-7.25,7.25c-3.031,0-5.627-1.86-6.71-4.5"></path><polyline points="1.88 14.695 2.288 11.75 5.232 12.157"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/forward.svg b/src/browser/themes/shared/zen-icons/forward.svg
index da06af2c8..73619dc37 100644
--- a/src/browser/themes/shared/zen-icons/forward.svg
+++ b/src/browser/themes/shared/zen-icons/forward.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="15.25" y1="9" x2="2.75" y2="9" data-color="color-2"></line><polyline points="11 4.75 15.25 9 11 13.25"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="15.25" y1="9" x2="2.75" y2="9" data-color="color-2"></line><polyline points="11 4.75 15.25 9 11 13.25"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/fullscreen-exit.svg b/src/browser/themes/shared/zen-icons/fullscreen-exit.svg
index eb189574b..43c6448a1 100644
--- a/src/browser/themes/shared/zen-icons/fullscreen-exit.svg
+++ b/src/browser/themes/shared/zen-icons/fullscreen-exit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 7.25 7.25 7.25 7.25 2.75"></polyline><line x1="7.25" y1="7.25" x2="2.75" y2="2.75"></line><polyline points="10.75 15.25 10.75 10.75 15.25 10.75" data-color="color-2"></polyline><line x1="10.75" y1="10.75" x2="15.25" y2="15.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="2.75 7.25 7.25 7.25 7.25 2.75"></polyline><line x1="7.25" y1="7.25" x2="2.75" y2="2.75"></line><polyline points="10.75 15.25 10.75 10.75 15.25 10.75" data-color="color-2"></polyline><line x1="10.75" y1="10.75" x2="15.25" y2="15.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/fullscreen.svg b/src/browser/themes/shared/zen-icons/fullscreen.svg
index 08ec0056e..4d0bb47b7 100644
--- a/src/browser/themes/shared/zen-icons/fullscreen.svg
+++ b/src/browser/themes/shared/zen-icons/fullscreen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="10.75 2.75 15.25 2.75 15.25 7.25"></polyline><line x1="15.25" y1="2.75" x2="10.75" y2="7.25"></line><polyline points="2.75 10.75 2.75 15.25 7.25 15.25" data-color="color-2"></polyline><line x1="2.75" y1="15.25" x2="7.25" y2="10.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="10.75 2.75 15.25 2.75 15.25 7.25"></polyline><line x1="15.25" y1="2.75" x2="10.75" y2="7.25"></line><polyline points="2.75 10.75 2.75 15.25 7.25 15.25" data-color="color-2"></polyline><line x1="2.75" y1="15.25" x2="7.25" y2="10.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/geo-blocked.svg b/src/browser/themes/shared/zen-icons/geo-blocked.svg
index 52a9b5377..0f803e128 100644
--- a/src/browser/themes/shared/zen-icons/geo-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/geo-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.526,12.474c-1.226-1.765-2.305-3.736-2.305-5.208C3.221,3.776,6.207,1.75,9,1.75c1.819,0,3.721,.86,4.826,2.424"></path><path d="M14.759,6.776c.013,.16,.02,.323,.02,.49,0,2.622-3.428,6.833-5.004,8.631-.413,.471-1.139,.471-1.551,0-.329-.375-.739-.856-1.181-1.405"></path><path d="M8.752,9.233c-.849-.12-1.502-.85-1.502-1.733,0-.966,.784-1.75,1.75-1.75,.887,0,1.62,.66,1.735,1.516"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.526,12.474c-1.226-1.765-2.305-3.736-2.305-5.208C3.221,3.776,6.207,1.75,9,1.75c1.819,0,3.721,.86,4.826,2.424"></path><path d="M14.759,6.776c.013,.16,.02,.323,.02,.49,0,2.622-3.428,6.833-5.004,8.631-.413,.471-1.139,.471-1.551,0-.329-.375-.739-.856-1.181-1.405"></path><path d="M8.752,9.233c-.849-.12-1.502-.85-1.502-1.733,0-.966,.784-1.75,1.75-1.75,.887,0,1.62,.66,1.735,1.516"></path><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/geo.svg b/src/browser/themes/shared/zen-icons/geo.svg
index bf395d4d4..0d0c7444e 100644
--- a/src/browser/themes/shared/zen-icons/geo.svg
+++ b/src/browser/themes/shared/zen-icons/geo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.779,7.266c0,2.622-3.428,6.833-5.004,8.631-.413,.471-1.139,.471-1.551,0-1.576-1.797-5.004-6.008-5.004-8.631C3.221,3.776,6.207,1.75,9,1.75s5.779,2.026,5.779,5.516Z"></path><circle cx="9" cy="7.5" r="1.75" data-color="color-2"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M14.779,7.266c0,2.622-3.428,6.833-5.004,8.631-.413,.471-1.139,.471-1.551,0-1.576-1.797-5.004-6.008-5.004-8.631C3.221,3.776,6.207,1.75,9,1.75s5.779,2.026,5.779,5.516Z"></path><circle cx="9" cy="7.5" r="1.75" data-color="color-2"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/help.svg b/src/browser/themes/shared/zen-icons/help.svg
index 95db53598..e0fa2e29f 100644
--- a/src/browser/themes/shared/zen-icons/help.svg
+++ b/src/browser/themes/shared/zen-icons/help.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r="7.25"></circle><path d="M6.925,6.619c.388-1.057,1.294-1.492,2.18-1.492,.895,0,1.818,.638,1.818,1.808,0,1.784-1.816,1.468-2.096,3.065" data-color="color-2"></path><path d="M8.791,13.567c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r="7.25"></circle><path d="M6.925,6.619c.388-1.057,1.294-1.492,2.18-1.492,.895,0,1.818,.638,1.818,1.808,0,1.784-1.816,1.468-2.096,3.065" data-color="color-2"></path><path d="M8.791,13.567c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/history.svg b/src/browser/themes/shared/zen-icons/history.svg
index 9d853baef..f89b5b653 100644
--- a/src/browser/themes/shared/zen-icons/history.svg
+++ b/src/browser/themes/shared/zen-icons/history.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,9c0,4.004,3.246,7.25,7.25,7.25s7.25-3.246,7.25-7.25S13.004,1.75,9,1.75c-3.031,0-5.627,1.86-6.71,4.5"></path><polyline points="1.88 3.305 2.288 6.25 5.232 5.843"></polyline><polyline points="9 4.75 9 9 12.25 11.25" data-color="color-2"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M1.75,9c0,4.004,3.246,7.25,7.25,7.25s7.25-3.246,7.25-7.25S13.004,1.75,9,1.75c-3.031,0-5.627,1.86-6.71,4.5"></path><polyline points="1.88 3.305 2.288 6.25 5.232 5.843"></polyline><polyline points="9 4.75 9 9 12.25 11.25" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/home.svg b/src/browser/themes/shared/zen-icons/home.svg
index f4a3273d7..962b7b345 100644
--- a/src/browser/themes/shared/zen-icons/home.svg
+++ b/src/browser/themes/shared/zen-icons/home.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.145,6.2l5.25-3.99c.358-.272,.853-.272,1.21,0l5.25,3.99c.249,.189,.395,.484,.395,.796v7.254c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2V6.996c0-.313,.146-.607,.395-.796Z"></path><path d="M11.652,12.152c-1.464,1.464-3.839,1.464-5.303,0" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.145,6.2l5.25-3.99c.358-.272,.853-.272,1.21,0l5.25,3.99c.249,.189,.395,.484,.395,.796v7.254c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2V6.996c0-.313,.146-.607,.395-.796Z"></path><path d="M11.652,12.152c-1.464,1.464-3.839,1.464-5.303,0" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/image-copy.svg b/src/browser/themes/shared/zen-icons/image-copy.svg
index b8df4d044..afa7e00bb 100644
--- a/src/browser/themes/shared/zen-icons/image-copy.svg
+++ b/src/browser/themes/shared/zen-icons/image-copy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.587,12.243l5.206-5.2c.391-.391,1.024-.391,1.414,0l3.043,3.043" data-color="color-2"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect><path d="M8,7c-.551,0-1-.449-1-1s.449-1,1-1,1,.449,1,1-.449,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.587,12.243l5.206-5.2c.391-.391,1.024-.391,1.414,0l3.043,3.043" data-color="color-2"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect><path d="M8,7c-.551,0-1-.449-1-1s.449-1,1-1,1,.449,1,1-.449,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/image-open.svg b/src/browser/themes/shared/zen-icons/image-open.svg
index 677757e66..15201ba80 100644
--- a/src/browser/themes/shared/zen-icons/image-open.svg
+++ b/src/browser/themes/shared/zen-icons/image-open.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4,15.25l5.836-5.836c.781-.781,2.047-.781,2.828,0l3.086,3.086" data-color="color-2"></path><rect x="2.25" y="4.75" width="13.5" height="10.5" rx="2" ry="2"></rect><line x1="4.75" y1="1.75" x2="13.25" y2="1.75" data-color="color-2"></line><circle cx="5.75" cy="8.25" r="1.25" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4,15.25l5.836-5.836c.781-.781,2.047-.781,2.828,0l3.086,3.086" data-color="color-2"></path><rect x="2.25" y="4.75" width="13.5" height="10.5" rx="2" ry="2"></rect><line x1="4.75" y1="1.75" x2="13.25" y2="1.75" data-color="color-2"></line><circle cx="5.75" cy="8.25" r="1.25" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/image-save.svg b/src/browser/themes/shared/zen-icons/image-save.svg
index 3278cba0d..60372f9a5 100644
--- a/src/browser/themes/shared/zen-icons/image-save.svg
+++ b/src/browser/themes/shared/zen-icons/image-save.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="m3.762,14.989l6.074-6.075c.781-.781,2.047-.781,2.828,0l2.586,2.586"></path><circle cx="6.25" cy="7.25" r="1.25" stroke-width="0" fill="currentColor"></circle><line x1="14.25" y1="1.25" x2="14.25" y2="6.25" data-color="color-2"></line><path d="m9.461,2.75h-4.711c-1.1046,0-2,.8955-2,2v8.5c0,1.1045.8954,2,2,2h8.5c1.1046,0,2-.8955,2-2v-4.7109"></path><line x1="16.75" y1="3.75" x2="11.75" y2="3.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="m3.762,14.989l6.074-6.075c.781-.781,2.047-.781,2.828,0l2.586,2.586"></path><circle cx="6.25" cy="7.25" r="1.25" stroke-width="0" fill="currentColor"></circle><line x1="14.25" y1="1.25" x2="14.25" y2="6.25" data-color="color-2"></line><path d="m9.461,2.75h-4.711c-1.1046,0-2,.8955-2,2v8.5c0,1.1045.8954,2,2,2h8.5c1.1046,0,2-.8955,2-2v-4.7109"></path><line x1="16.75" y1="3.75" x2="11.75" y2="3.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/info.svg b/src/browser/themes/shared/zen-icons/info.svg
index 9db7c53f9..67e41ad96 100644
--- a/src/browser/themes/shared/zen-icons/info.svg
+++ b/src/browser/themes/shared/zen-icons/info.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r="7.25"></circle><line x1="9" y1="12.819" x2="9" y2="8.25" data-color="color-2"></line><path d="M9,6.75c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r="7.25"></circle><line x1="9" y1="12.819" x2="9" y2="8.25" data-color="color-2"></line><path d="M9,6.75c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/inspect.svg b/src/browser/themes/shared/zen-icons/inspect.svg
index cdab4a408..0ba2bd2bf 100644
--- a/src/browser/themes/shared/zen-icons/inspect.svg
+++ b/src/browser/themes/shared/zen-icons/inspect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="14 6.25 16.25 4 14 1.75" data-color="color-2"></polyline><path d="M6.596,2.75h-1.846c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2H13.25c1.105,0,2-.896,2-2v-4.846"></path><polyline points="11 6.25 8.75 4 11 1.75" data-color="color-2"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="14 6.25 16.25 4 14 1.75" data-color="color-2"></polyline><path d="M6.596,2.75h-1.846c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2H13.25c1.105,0,2-.896,2-2v-4.846"></path><polyline points="11 6.25 8.75 4 11 1.75" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/library.svg b/src/browser/themes/shared/zen-icons/library.svg
index b623e3383..00c43ccdf 100644
--- a/src/browser/themes/shared/zen-icons/library.svg
+++ b/src/browser/themes/shared/zen-icons/library.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="2.75" width="4" height="12.5" rx="1" ry="1"></rect><rect x="2.75" y="4.75" width="3" height="10.5" rx="1" ry="1"></rect><rect x="11.235" y="4.719" width="3.5" height="10.5" rx="1" ry="1" transform="translate(-2.382 4.324) rotate(-17.344)"></rect><line x1="10.934" y1="9.272" x2="14.275" y2="8.228"></line><line x1="5.75" y1="7.25" x2="9.75" y2="7.25"></line><line x1="2.75" y1="8.75" x2="5.75" y2="8.75"></line><line x1="1" y1="15.25" x2="17" y2="15.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="2.75" width="4" height="12.5" rx="1" ry="1"></rect><rect x="2.75" y="4.75" width="3" height="10.5" rx="1" ry="1"></rect><rect x="11.235" y="4.719" width="3.5" height="10.5" rx="1" ry="1" transform="translate(-2.382 4.324) rotate(-17.344)"></rect><line x1="10.934" y1="9.272" x2="14.275" y2="8.228"></line><line x1="5.75" y1="7.25" x2="9.75" y2="7.25"></line><line x1="2.75" y1="8.75" x2="5.75" y2="8.75"></line><line x1="1" y1="15.25" x2="17" y2="15.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/link.svg b/src/browser/themes/shared/zen-icons/link.svg
index 5f1c21e95..24f91be91 100644
--- a/src/browser/themes/shared/zen-icons/link.svg
+++ b/src/browser/themes/shared/zen-icons/link.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M8.5,6.827c-.352,.168-.682,.398-.973,.69l-.01,.01c-1.381,1.381-1.381,3.619,0,5l2.175,2.175c1.381,1.381,3.619,1.381,5,0l.01-.01c1.381-1.381,1.381-3.619,0-5l-.931-.931" data-color="color-2"></path><path d="M9.5,11.173c.352-.168,.682-.398,.973-.69l.01-.01c1.381-1.381,1.381-3.619,0-5l-2.175-2.175c-1.381-1.381-3.619-1.381-5,0l-.01,.01c-1.381,1.381-1.381,3.619,0,5l.931,.931"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M8.5,6.827c-.352,.168-.682,.398-.973,.69l-.01,.01c-1.381,1.381-1.381,3.619,0,5l2.175,2.175c1.381,1.381,3.619,1.381,5,0l.01-.01c1.381-1.381,1.381-3.619,0-5l-.931-.931" data-color="color-2"></path><path d="M9.5,11.173c.352-.168,.682-.398,.973-.69l.01-.01c1.381-1.381,1.381-3.619,0-5l-2.175-2.175c-1.381-1.381-3.619-1.381-5,0l-.01,.01c-1.381,1.381-1.381,3.619,0,5l.931,.931"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/manage.svg b/src/browser/themes/shared/zen-icons/manage.svg
index 879093489..890b0ab0e 100644
--- a/src/browser/themes/shared/zen-icons/manage.svg
+++ b/src/browser/themes/shared/zen-icons/manage.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="4.25" y="3.25" width="9.5" height="11.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><line x1="1.25" y1="3.75" x2="1.25" y2="14.25" data-color="color-2"></line><line x1="16.75" y1="3.75" x2="16.75" y2="14.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="4.25" y="3.25" width="9.5" height="11.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><line x1="1.25" y1="3.75" x2="1.25" y2="14.25" data-color="color-2"></line><line x1="16.75" y1="3.75" x2="16.75" y2="14.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-loop.svg b/src/browser/themes/shared/zen-icons/media-loop.svg
index 347399d89..9b33cee66 100644
--- a/src/browser/themes/shared/zen-icons/media-loop.svg
+++ b/src/browser/themes/shared/zen-icons/media-loop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,13.75h-.75c-1.105,0-2-.895-2-2V6.25c0-1.105,.895-2,2-2H13.75c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2h-5.742" data-color="color-2"></path><polyline points="10.5 11.25 8.008 13.742 10.5 16.235"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,13.75h-.75c-1.105,0-2-.895-2-2V6.25c0-1.105,.895-2,2-2H13.75c1.105,0,2,.895,2,2v5.5c0,1.105-.895,2-2,2h-5.742" data-color="color-2"></path><polyline points="10.5 11.25 8.008 13.742 10.5 16.235"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-mute.svg b/src/browser/themes/shared/zen-icons/media-mute.svg
index d97c674da..c7536b3d0 100644
--- a/src/browser/themes/shared/zen-icons/media-mute.svg
+++ b/src/browser/themes/shared/zen-icons/media-mute.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.75,5.143V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508H3.75c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.63"></path><path d="M9,13.21l3.981,2.548c.333,.213,.77-.026,.77-.421v-6.72"></path><line x1="2.75" y1="15.75" x2="16.75" y2="2.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M13.75,5.143V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508H3.75c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.63"></path><path d="M9,13.21l3.981,2.548c.333,.213,.77-.026,.77-.421v-6.72"></path><line x1="2.75" y1="15.75" x2="16.75" y2="2.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-pause.svg b/src/browser/themes/shared/zen-icons/media-pause.svg
index f6bdbdafb..0c8282871 100644
--- a/src/browser/themes/shared/zen-icons/media-pause.svg
+++ b/src/browser/themes/shared/zen-icons/media-pause.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="2.75" y="2.75" width="3.5" height="12.5" rx="1" ry="1"></rect><rect x="11.75" y="2.75" width="3.5" height="12.5" rx="1" ry="1" data-color="color-2"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="2.75" y="2.75" width="3.5" height="12.5" rx="1" ry="1"></rect><rect x="11.75" y="2.75" width="3.5" height="12.5" rx="1" ry="1" data-color="color-2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-pip.svg b/src/browser/themes/shared/zen-icons/media-pip.svg
index 4ef02df2b..16952aa99 100644
--- a/src/browser/themes/shared/zen-icons/media-pip.svg
+++ b/src/browser/themes/shared/zen-icons/media-pip.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,12.25h-2c-1.105,0-2-.895-2-2V5.75c0-1.105,.895-2,2-2H12.25c1.105,0,2,.895,2,2v2"></path><rect x="8.75" y="10.75" width="7.5" height="4.5" rx="1.5" ry="1.5"></rect><polyline points="7.25 6.25 7.25 9.25 4.25 9.25" data-color="color-2"></polyline><line x1="7.25" y1="9.25" x2="4.25" y2="6.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,12.25h-2c-1.105,0-2-.895-2-2V5.75c0-1.105,.895-2,2-2H12.25c1.105,0,2,.895,2,2v2"></path><rect x="8.75" y="10.75" width="7.5" height="4.5" rx="1.5" ry="1.5"></rect><polyline points="7.25 6.25 7.25 9.25 4.25 9.25" data-color="color-2"></polyline><line x1="7.25" y1="9.25" x2="4.25" y2="6.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-play.svg b/src/browser/themes/shared/zen-icons/media-play.svg
index 7cf4f6039..0cf03d66b 100644
--- a/src/browser/themes/shared/zen-icons/media-play.svg
+++ b/src/browser/themes/shared/zen-icons/media-play.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.652,8.568l-3.651-2.129c-.333-.194-.752,.046-.752,.432v4.259c0,.386,.419,.626,.752,.432l3.651-2.129c.331-.193,.331-.671,0-.864Z" data-color="color-2"></path><path d="M4.987,2.961c.778-.518,1.662-.89,2.612-1.075"></path><path d="M1.879,7.631c.185-.968,.562-1.867,1.091-2.657"></path><path d="M4.987,15.039c.778,.518,1.662,.89,2.612,1.075"></path><path d="M1.879,10.369c.185,.968,.562,1.867,1.091,2.657"></path><path d="M10.435,1.892c3.317,.666,5.815,3.595,5.815,7.108s-2.499,6.443-5.817,7.108"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.652,8.568l-3.651-2.129c-.333-.194-.752,.046-.752,.432v4.259c0,.386,.419,.626,.752,.432l3.651-2.129c.331-.193,.331-.671,0-.864Z" data-color="color-2"></path><path d="M4.987,2.961c.778-.518,1.662-.89,2.612-1.075"></path><path d="M1.879,7.631c.185-.968,.562-1.867,1.091-2.657"></path><path d="M4.987,15.039c.778,.518,1.662,.89,2.612,1.075"></path><path d="M1.879,10.369c.185,.968,.562,1.867,1.091,2.657"></path><path d="M10.435,1.892c3.317,.666,5.815,3.595,5.815,7.108s-2.499,6.443-5.817,7.108"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-speed.svg b/src/browser/themes/shared/zen-icons/media-speed.svg
index 3cb15775c..8ac325445 100644
--- a/src/browser/themes/shared/zen-icons/media-speed.svg
+++ b/src/browser/themes/shared/zen-icons/media-speed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="12" r="1" fill="currentColor" data-color="color-2"></circle><path d="M12.75,12.25h3.487c.003-.083,.013-.166,.013-.25,0-4.004-3.246-7.25-7.25-7.25S1.75,7.996,1.75,12c0,.084,.01,.167,.013,.25h3.487"></path><line x1="8.495" y1="11.137" x2="6.557" y2="7.827" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="12" r="1" fill="currentColor" data-color="color-2"></circle><path d="M12.75,12.25h3.487c.003-.083,.013-.166,.013-.25,0-4.004-3.246-7.25-7.25-7.25S1.75,7.996,1.75,12c0,.084,.01,.167,.013,.25h3.487"></path><line x1="8.495" y1="11.137" x2="6.557" y2="7.827" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/media-unmute.svg b/src/browser/themes/shared/zen-icons/media-unmute.svg
index dc630d8a5..f21b4c813 100644
--- a/src/browser/themes/shared/zen-icons/media-unmute.svg
+++ b/src/browser/themes/shared/zen-icons/media-unmute.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,5.75H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508Z"></path><path d="M13.914,7.586c.781,.781,.781,2.047,0,2.828" data-color="color-2"></path><path d="M15.859,5.641c1.855,1.855,1.855,4.863,0,6.718" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,5.75H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508Z"></path><path d="M13.914,7.586c.781,.781,.781,2.047,0,2.828" data-color="color-2"></path><path d="M15.859,5.641c1.855,1.855,1.855,4.863,0,6.718" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/menu-bar.svg b/src/browser/themes/shared/zen-icons/menu-bar.svg
index f843149e2..500b485af 100644
--- a/src/browser/themes/shared/zen-icons/menu-bar.svg
+++ b/src/browser/themes/shared/zen-icons/menu-bar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="9" cy="3.25" r=".5" fill="currentColor"></circle><circle cx="9" cy="14.75" r=".5" fill="currentColor"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="9" cy="3.25" r=".5" fill="currentColor"></circle><circle cx="9" cy="14.75" r=".5" fill="currentColor"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/menu.svg b/src/browser/themes/shared/zen-icons/menu.svg
index dc211f56a..fa8906b3f 100644
--- a/src/browser/themes/shared/zen-icons/menu.svg
+++ b/src/browser/themes/shared/zen-icons/menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="3.25" cy="9" r=".5" fill="currentColor"></circle><circle cx="14.75" cy="9" r=".5" fill="currentColor"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="9" r=".5" fill="currentColor" data-color="color-2"></circle><circle cx="3.25" cy="9" r=".5" fill="currentColor"></circle><circle cx="14.75" cy="9" r=".5" fill="currentColor"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/microphone-blocked.svg b/src/browser/themes/shared/zen-icons/microphone-blocked.svg
index e0c5193bc..60801b32a 100644
--- a/src/browser/themes/shared/zen-icons/microphone-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/microphone-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="1.75" width="6.5" height="9.5" rx="3.25" ry="3.25"></rect><path d="M5.109,12.891c-1.437-1.145-2.359-2.911-2.359-4.891" data-color="color-2"></path><path d="M15.25,8c0,3.452-2.798,6.25-6.25,6.25h0c-.527,0-1.038-.065-1.527-.188" data-color="color-2"></path><line x1="9" y1="14.25" x2="9" y2="16.25" data-color="color-2"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="1.75" width="6.5" height="9.5" rx="3.25" ry="3.25"></rect><path d="M5.109,12.891c-1.437-1.145-2.359-2.911-2.359-4.891" data-color="color-2"></path><path d="M15.25,8c0,3.452-2.798,6.25-6.25,6.25h0c-.527,0-1.038-.065-1.527-.188" data-color="color-2"></path><line x1="9" y1="14.25" x2="9" y2="16.25" data-color="color-2"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/microphone.svg b/src/browser/themes/shared/zen-icons/microphone.svg
index 2ff9811d9..abdc0c9e7 100644
--- a/src/browser/themes/shared/zen-icons/microphone.svg
+++ b/src/browser/themes/shared/zen-icons/microphone.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="1.75" width="6.5" height="9.5" rx="3.25" ry="3.25"></rect><path d="M15.25,8c0,3.452-2.798,6.25-6.25,6.25h0c-3.452,0-6.25-2.798-6.25-6.25" data-color="color-2"></path><line x1="9" y1="14.25" x2="9" y2="16.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="5.75" y="1.75" width="6.5" height="9.5" rx="3.25" ry="3.25"></rect><path d="M15.25,8c0,3.452-2.798,6.25-6.25,6.25h0c-3.452,0-6.25-2.798-6.25-6.25" data-color="color-2"></path><line x1="9" y1="14.25" x2="9" y2="16.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/move-tab.svg b/src/browser/themes/shared/zen-icons/move-tab.svg
index dbf923668..4857214fb 100644
--- a/src/browser/themes/shared/zen-icons/move-tab.svg
+++ b/src/browser/themes/shared/zen-icons/move-tab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="11.25" y="10.75" width="5" height="5" rx="1.5" ry="1.5" data-color="color-2"></rect><rect x="11.25" y="2.25" width="5" height="5" rx="1.5" ry="1.5"></rect><polyline points="6.75 11.5 9 13.75 6.75 16"></polyline><path d="M9,13.75h-2.5c-2.623,0-4.75-2.127-4.75-4.75h0c0-2.623,2.127-4.75,4.75-4.75h1.75"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="11.25" y="10.75" width="5" height="5" rx="1.5" ry="1.5" data-color="color-2"></rect><rect x="11.25" y="2.25" width="5" height="5" rx="1.5" ry="1.5"></rect><polyline points="6.75 11.5 9 13.75 6.75 16"></polyline><path d="M9,13.75h-2.5c-2.623,0-4.75-2.127-4.75-4.75h0c0-2.623,2.127-4.75,4.75-4.75h1.75"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/new-tab-image.svg b/src/browser/themes/shared/zen-icons/new-tab-image.svg
index bc40fea49..890f8c681 100644
--- a/src/browser/themes/shared/zen-icons/new-tab-image.svg
+++ b/src/browser/themes/shared/zen-icons/new-tab-image.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/open.svg b/src/browser/themes/shared/zen-icons/open.svg
index 3e0a34c1e..5e1889c80 100644
--- a/src/browser/themes/shared/zen-icons/open.svg
+++ b/src/browser/themes/shared/zen-icons/open.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6,14.25H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v7.5c0,1.105-.895,2-2,2h-2.25"></path><line x1="1.75" y1="6.25" x2="16.25" y2="6.25"></line><polyline points="6.5 11.25 9 8.75 11.5 11.25" data-color="color-2"></polyline><line x1="9" y1="8.75" x2="9" y2="17.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6,14.25H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2H14.25c1.105,0,2,.895,2,2v7.5c0,1.105-.895,2-2,2h-2.25"></path><line x1="1.75" y1="6.25" x2="16.25" y2="6.25"></line><polyline points="6.5 11.25 9 8.75 11.5 11.25" data-color="color-2"></polyline><line x1="9" y1="8.75" x2="9" y2="17.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/page-portrait.svg b/src/browser/themes/shared/zen-icons/page-portrait.svg
index 07dab98f5..99a678428 100644
--- a/src/browser/themes/shared/zen-icons/page-portrait.svg
+++ b/src/browser/themes/shared/zen-icons/page-portrait.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.16,6.25h-3.41c-.552,0-1-.448-1-1V1.852" data-color="color-2"></path><path d="M2.75,14.25V3.75c0-1.105,.895-2,2-2h5.586c.265,0,.52,.105,.707,.293l3.914,3.914c.188,.188,.293,.442,.293,.707v7.586c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.16,6.25h-3.41c-.552,0-1-.448-1-1V1.852" data-color="color-2"></path><path d="M2.75,14.25V3.75c0-1.105,.895-2,2-2h5.586c.265,0,.52,.105,.707,.293l3.914,3.914c.188,.188,.293,.442,.293,.707v7.586c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/passwords.svg b/src/browser/themes/shared/zen-icons/passwords.svg
index b87deb0ff..98792083e 100644
--- a/src/browser/themes/shared/zen-icons/passwords.svg
+++ b/src/browser/themes/shared/zen-icons/passwords.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.747,2.076l-2.847,.177-5.891,5.891c-.324-.084-.658-.144-1.009-.144-2.209,0-4,1.791-4,4s1.791,4,4,4,4-1.791,4-4c0-.362-.064-.707-.154-1.041l1.904-1.959v-2.25h2.25l1.753-1.645-.006-3.029Z"></path><circle cx="5.5" cy="12.5" r="1" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.747,2.076l-2.847,.177-5.891,5.891c-.324-.084-.658-.144-1.009-.144-2.209,0-4,1.791-4,4s1.791,4,4,4,4-1.791,4-4c0-.362-.064-.707-.154-1.041l1.904-1.959v-2.25h2.25l1.753-1.645-.006-3.029Z"></path><circle cx="5.5" cy="12.5" r="1" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/paste-and-go.svg b/src/browser/themes/shared/zen-icons/paste-and-go.svg
index 05ac6e8eb..8af067def 100644
--- a/src/browser/themes/shared/zen-icons/paste-and-go.svg
+++ b/src/browser/themes/shared/zen-icons/paste-and-go.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.25,2.75h-1c-1.105,0-2,.895-2,2V14.25c0,1.105,.895,2,2,2h7.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1"></path><rect x="6.25" y="1.25" width="5.5" height="3" rx="1" ry="1" data-color="color-2"></rect><polyline points="6.25 10.25 8 12.25 11.75 7.25" data-color="color-2"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.25,2.75h-1c-1.105,0-2,.895-2,2V14.25c0,1.105,.895,2,2,2h7.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1"></path><rect x="6.25" y="1.25" width="5.5" height="3" rx="1" ry="1" data-color="color-2"></rect><polyline points="6.25 10.25 8 12.25 11.75 7.25" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/permissions.svg b/src/browser/themes/shared/zen-icons/permissions.svg
index bcb43381e..9b9976140 100644
--- a/src/browser/themes/shared/zen-icons/permissions.svg
+++ b/src/browser/themes/shared/zen-icons/permissions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="2.75" y="2.75" width="12.5" height="12.5" rx="2" ry="2"></rect><line x1="9.75" y1="6.75" x2="12.75" y2="6.75" data-color="color-2"></line><line x1="5.25" y1="6.75" x2="7.25" y2="6.75" data-color="color-2"></line><line x1="7.25" y1="5" x2="7.25" y2="8.5" data-color="color-2"></line><line x1="10.75" y1="11.25" x2="12.75" y2="11.25" data-color="color-2"></line><line x1="5.25" y1="11.25" x2="8.25" y2="11.25" data-color="color-2"></line><line x1="10.75" y1="9.5" x2="10.75" y2="13" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="2.75" y="2.75" width="12.5" height="12.5" rx="2" ry="2"></rect><line x1="9.75" y1="6.75" x2="12.75" y2="6.75" data-color="color-2"></line><line x1="5.25" y1="6.75" x2="7.25" y2="6.75" data-color="color-2"></line><line x1="7.25" y1="5" x2="7.25" y2="8.5" data-color="color-2"></line><line x1="10.75" y1="11.25" x2="12.75" y2="11.25" data-color="color-2"></line><line x1="5.25" y1="11.25" x2="8.25" y2="11.25" data-color="color-2"></line><line x1="10.75" y1="9.5" x2="10.75" y2="13" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg b/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg
index 66278262e..8911071a4 100644
--- a/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/persistent-storage-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.266"></path><path d="M15.726,8.516c-.117-.993-.952-1.766-1.976-1.766H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h4.141"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.266"></path><path d="M15.726,8.516c-.117-.993-.952-1.766-1.976-1.766H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h4.141"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/persistent-storage.svg b/src/browser/themes/shared/zen-icons/persistent-storage.svg
index 65d2044b5..97ac121bb 100644
--- a/src/browser/themes/shared/zen-icons/persistent-storage.svg
+++ b/src/browser/themes/shared/zen-icons/persistent-storage.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="9.75" width="14.5" height="5" rx="1.5" ry="1.5"></rect><path d="M1.841,10.739l2.204-6.621c.272-.817,1.036-1.368,1.898-1.368h6.116c.861,0,1.626,.551,1.898,1.368l2.204,6.621"></path><line x1="4.25" y1="12.25" x2="7" y2="12.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="9.75" width="14.5" height="5" rx="1.5" ry="1.5"></rect><path d="M1.841,10.739l2.204-6.621c.272-.817,1.036-1.368,1.898-1.368h6.116c.861,0,1.626,.551,1.898,1.368l2.204,6.621"></path><line x1="4.25" y1="12.25" x2="7" y2="12.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/pin.svg b/src/browser/themes/shared/zen-icons/pin.svg
index a30c319c1..734bb8374 100644
--- a/src/browser/themes/shared/zen-icons/pin.svg
+++ b/src/browser/themes/shared/zen-icons/pin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.081" y1="14.919" x2="6.409" y2="11.591" data-color="color-2"></line><path d="M10.371,15.553c.432-.557,1.02-1.47,1.348-2.718,.169-.642,.23-1.224,.243-1.701l3.005-3.005c.781-.781,.781-2.047,0-2.828l-2.268-2.268c-.781-.781-2.047-.781-2.828,0l-3.005,3.005c-.478,.013-1.059,.074-1.701,.243-1.248,.328-2.161,.916-2.718,1.348l7.925,7.925Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.081" y1="14.919" x2="6.409" y2="11.591" data-color="color-2"></line><path d="M10.371,15.553c.432-.557,1.02-1.47,1.348-2.718,.169-.642,.23-1.224,.243-1.701l3.005-3.005c.781-.781,.781-2.047,0-2.828l-2.268-2.268c-.781-.781-2.047-.781-2.828,0l-3.005,3.005c-.478,.013-1.059,.074-1.701,.243-1.248,.328-2.161,.916-2.718,1.348l7.925,7.925Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/plus.svg b/src/browser/themes/shared/zen-icons/plus.svg
index 6ce916b23..c426dc454 100644
--- a/src/browser/themes/shared/zen-icons/plus.svg
+++ b/src/browser/themes/shared/zen-icons/plus.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="9" y1="3.25" x2="9" y2="14.75" data-color="color-2"></line><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="9" y1="3.25" x2="9" y2="14.75" data-color="color-2"></line><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/popup.svg b/src/browser/themes/shared/zen-icons/popup.svg
index 9f7ea80aa..8677da7b8 100644
--- a/src/browser/themes/shared/zen-icons/popup.svg
+++ b/src/browser/themes/shared/zen-icons/popup.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,8.709v-3.959c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.619"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-stroke="none" data-color="color-2" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,8.709v-3.959c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.619"></path><circle cx="14" cy="14" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="16.298" x2="16.292" y2="11.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/print.svg b/src/browser/themes/shared/zen-icons/print.svg
index ee1844f66..390d8d0c5 100644
--- a/src/browser/themes/shared/zen-icons/print.svg
+++ b/src/browser/themes/shared/zen-icons/print.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,5.25V2.75c0-.552,.448-1,1-1h4.5c.552,0,1,.448,1,1v2.5" data-color="color-2"></path><path d="M5.75,13.25h-1.5c-1.105,0-2-.895-2-2V7.25c0-1.105,.895-2,2-2H13.75c1.105,0,2,.895,2,2v4c0,1.105-.895,2-2,2h-1.5"></path><path d="M12.25,9.75v5.5c0,.552-.448,1-1,1H6.75c-.552,0-1-.448-1-1v-5.5h6.5Z" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,5.25V2.75c0-.552,.448-1,1-1h4.5c.552,0,1,.448,1,1v2.5" data-color="color-2"></path><path d="M5.75,13.25h-1.5c-1.105,0-2-.895-2-2V7.25c0-1.105,.895-2,2-2H13.75c1.105,0,2,.895,2,2v4c0,1.105-.895,2-2,2h-1.5"></path><path d="M12.25,9.75v5.5c0,.552-.448,1-1,1H6.75c-.552,0-1-.448-1-1v-5.5h6.5Z" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/private-window.svg b/src/browser/themes/shared/zen-icons/private-window.svg
index 98d5c73c4..0c7b46a9a 100644
--- a/src/browser/themes/shared/zen-icons/private-window.svg
+++ b/src/browser/themes/shared/zen-icons/private-window.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,9.141V4.75c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.5"></path><rect x="10.75" y="13.75" width="6" height="3.5" rx="1" ry="1" data-color="color-2"></rect><path d="M12.25,13.75v-1.5c0-.828,.672-1.5,1.5-1.5h0c.828,0,1.5,.672,1.5,1.5v1.5" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><line x1="1.75" y1="7.75" x2="16.25" y2="7.75"></line><path d="M16.25,9.141V4.75c0-1.104-.895-2-2-2H3.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2h4.5"></path><rect x="10.75" y="13.75" width="6" height="3.5" rx="1" ry="1" data-color="color-2"></rect><path d="M12.25,13.75v-1.5c0-.828,.672-1.5,1.5-1.5h0c.828,0,1.5,.672,1.5,1.5v1.5" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/privateBrowsing.svg b/src/browser/themes/shared/zen-icons/privateBrowsing.svg
index 1674d5457..ee96e2860 100644
--- a/src/browser/themes/shared/zen-icons/privateBrowsing.svg
+++ b/src/browser/themes/shared/zen-icons/privateBrowsing.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="4.5" r="2.75"></circle><rect x="10.75" y="12.75" width="6" height="3.5" rx="1" ry="1" data-color="color-2"></rect><path d="M10.043,9.844c-.34-.057-.686-.094-1.043-.094-2.551,0-4.739,1.53-5.709,3.72-.365,.825,.087,1.774,.947,2.045,1.093,.345,2.516,.645,4.167,.708"></path><path d="M12.25,12.75v-1.5c0-.828,.672-1.5,1.5-1.5h0c.828,0,1.5,.672,1.5,1.5v1.5" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="4.5" r="2.75"></circle><rect x="10.75" y="12.75" width="6" height="3.5" rx="1" ry="1" data-color="color-2"></rect><path d="M10.043,9.844c-.34-.057-.686-.094-1.043-.094-2.551,0-4.739,1.53-5.709,3.72-.365,.825,.087,1.774,.947,2.045,1.093,.345,2.516,.645,4.167,.708"></path><path d="M12.25,12.75v-1.5c0-.828,.672-1.5,1.5-1.5h0c.828,0,1.5,.672,1.5,1.5v1.5" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/reader-mode.svg b/src/browser/themes/shared/zen-icons/reader-mode.svg
index 8de3ff026..af5500748 100644
--- a/src/browser/themes/shared/zen-icons/reader-mode.svg
+++ b/src/browser/themes/shared/zen-icons/reader-mode.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="6.75" x2="7.75" y2="6.75" data-color="color-2"></line><line x1="5.75" y1="9.75" x2="12.25" y2="9.75" data-color="color-2"></line><line x1="5.75" y1="12.75" x2="12.25" y2="12.75" data-color="color-2"></line><path d="M2.75,14.25V3.75c0-1.105,.895-2,2-2h5.586c.265,0,.52,.105,.707,.293l3.914,3.914c.188,.188,.293,.442,.293,.707v7.586c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2Z"></path><path d="M15.16,6.25h-3.41c-.552,0-1-.448-1-1V1.852"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="6.75" x2="7.75" y2="6.75" data-color="color-2"></line><line x1="5.75" y1="9.75" x2="12.25" y2="9.75" data-color="color-2"></line><line x1="5.75" y1="12.75" x2="12.25" y2="12.75" data-color="color-2"></line><path d="M2.75,14.25V3.75c0-1.105,.895-2,2-2h5.586c.265,0,.52,.105,.707,.293l3.914,3.914c.188,.188,.293,.442,.293,.707v7.586c0,1.105-.895,2-2,2H4.75c-1.105,0-2-.895-2-2Z"></path><path d="M15.16,6.25h-3.41c-.552,0-1-.448-1-1V1.852"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/reload.svg b/src/browser/themes/shared/zen-icons/reload.svg
index 3aa735c04..2134474d6 100644
--- a/src/browser/themes/shared/zen-icons/reload.svg
+++ b/src/browser/themes/shared/zen-icons/reload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15,13.071c-1.304,1.919-3.505,3.179-6,3.179-4.004,0-7.25-3.246-7.25-7.25S4.996,1.75,9,1.75c3.031,0,5.627,1.86,6.71,4.5" data-color="color-2"></path><polyline points="16.12 3.305 15.712 6.25 12.768 5.843"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15,13.071c-1.304,1.919-3.505,3.179-6,3.179-4.004,0-7.25-3.246-7.25-7.25S4.996,1.75,9,1.75c3.031,0,5.627,1.86,6.71,4.5" data-color="color-2"></path><polyline points="16.12 3.305 15.712 6.25 12.768 5.843"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/report.svg b/src/browser/themes/shared/zen-icons/report.svg
index cab37aaec..3125ec5cc 100644
--- a/src/browser/themes/shared/zen-icons/report.svg
+++ b/src/browser/themes/shared/zen-icons/report.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10" data-color="color-2"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10" data-color="color-2"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/save.svg b/src/browser/themes/shared/zen-icons/save.svg
index 4247ec61c..9bac1fb43 100644
--- a/src/browser/themes/shared/zen-icons/save.svg
+++ b/src/browser/themes/shared/zen-icons/save.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,3.25h1.5c1.105,0,2,.895,2,2v7.5c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V5.25c0-1.105,.895-2,2-2h1.5"></path><polyline points="12 8.75 9 11.75 6 8.75" data-color="color-2"></polyline><line x1="9" y1="11.75" x2="9" y2="3.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.25,3.25h1.5c1.105,0,2,.895,2,2v7.5c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V5.25c0-1.105,.895-2,2-2h1.5"></path><polyline points="12 8.75 9 11.75 6 8.75" data-color="color-2"></polyline><line x1="9" y1="11.75" x2="9" y2="3.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/screen-blocked.svg b/src/browser/themes/shared/zen-icons/screen-blocked.svg
index df45780fb..ffbba714a 100644
--- a/src/browser/themes/shared/zen-icons/screen-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/screen-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4.75,13.25h-1c-1.105,0-2-.895-2-2v-1.25"></path><path d="M16.25,5v6.25c0,1.105-.895,2-2,2H8"></path><line x1="9" y1="2.75" x2="15.25" y2="2.75"></line><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line><polyline points="1.75 7.25 1.75 2.75 6.25 2.75" data-color="color-2"></polyline><line x1="2" y1="3" x2="6.5" y2="7.5" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M4.75,13.25h-1c-1.105,0-2-.895-2-2v-1.25"></path><path d="M16.25,5v6.25c0,1.105-.895,2-2,2H8"></path><line x1="9" y1="2.75" x2="15.25" y2="2.75"></line><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line><polyline points="1.75 7.25 1.75 2.75 6.25 2.75" data-color="color-2"></polyline><line x1="2" y1="3" x2="6.5" y2="7.5" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/screen.svg b/src/browser/themes/shared/zen-icons/screen.svg
index 57281387e..585d8ede6 100644
--- a/src/browser/themes/shared/zen-icons/screen.svg
+++ b/src/browser/themes/shared/zen-icons/screen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9,2.75h5.25c1.105,0,2,.895,2,2v6.5c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2v-1.25"></path><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><polyline points="1.75 7.25 1.75 2.75 6.25 2.75" data-color="color-2"></polyline><line x1="2" y1="3" x2="7.25" y2="8.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9,2.75h5.25c1.105,0,2,.895,2,2v6.5c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2v-1.25"></path><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><polyline points="1.75 7.25 1.75 2.75 6.25 2.75" data-color="color-2"></polyline><line x1="2" y1="3" x2="7.25" y2="8.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/screenshot.svg b/src/browser/themes/shared/zen-icons/screenshot.svg
index 66b488605..5f4b9619b 100644
--- a/src/browser/themes/shared/zen-icons/screenshot.svg
+++ b/src/browser/themes/shared/zen-icons/screenshot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.25,2.75h2c1.105,0,2,.895,2,2v2" data-color="color-2"></path><path d="M6.75,15.25h-2c-1.105,0-2-.895-2-2v-2" data-color="color-2"></path><path d="M2.75,6.75v-2c0-1.105,.895-2,2-2h2"></path><path d="M15.25,11.25v2c0,1.105-.895,2-2,2h-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.25,2.75h2c1.105,0,2,.895,2,2v2" data-color="color-2"></path><path d="M6.75,15.25h-2c-1.105,0-2-.895-2-2v-2" data-color="color-2"></path><path d="M2.75,6.75v-2c0-1.105,.895-2,2-2h2"></path><path d="M15.25,11.25v2c0,1.105-.895,2-2,2h-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/search-glass.svg b/src/browser/themes/shared/zen-icons/search-glass.svg
index 24d287f2f..0d5faa5ee 100644
--- a/src/browser/themes/shared/zen-icons/search-glass.svg
+++ b/src/browser/themes/shared/zen-icons/search-glass.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="7.25" cy="7.25" r="4.5"></circle><line x1="15.25" y1="15.25" x2="12.285" y2="12.285" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="7.25" cy="7.25" r="4.5"></circle><line x1="15.25" y1="15.25" x2="12.285" y2="12.285" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/search-page.svg b/src/browser/themes/shared/zen-icons/search-page.svg
index 1aad4b524..da76ae067 100644
--- a/src/browser/themes/shared/zen-icons/search-page.svg
+++ b/src/browser/themes/shared/zen-icons/search-page.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.75,6.75v-2c0-1.105,.895-2,2-2h2"></path><path d="M11.25,2.75h2c1.105,0,2,.895,2,2v2"></path><path d="M6.75,15.25h-2c-1.105,0-2-.895-2-2v-2"></path><circle cx="9" cy="9" r="3.25" data-color="color-2"></circle><line x1="11.296" y1="11.296" x2="14.5" y2="14.5" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.75,6.75v-2c0-1.105,.895-2,2-2h2"></path><path d="M11.25,2.75h2c1.105,0,2,.895,2,2v2"></path><path d="M6.75,15.25h-2c-1.105,0-2-.895-2-2v-2"></path><circle cx="9" cy="9" r="3.25" data-color="color-2"></circle><line x1="11.296" y1="11.296" x2="14.5" y2="14.5" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/security-broken.svg b/src/browser/themes/shared/zen-icons/security-broken.svg
index cab37aaec..3125ec5cc 100644
--- a/src/browser/themes/shared/zen-icons/security-broken.svg
+++ b/src/browser/themes/shared/zen-icons/security-broken.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10" data-color="color-2"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M7.638,3.495L2.213,12.891c-.605,1.048,.151,2.359,1.362,2.359H14.425c1.211,0,1.967-1.31,1.362-2.359L10.362,3.495c-.605-1.048-2.119-1.048-2.724,0Z"></path><line x1="9" y1="6.5" x2="9" y2="10" data-color="color-2"></line><path d="M9,13.569c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/security-warning.svg b/src/browser/themes/shared/zen-icons/security-warning.svg
index f74987acc..622bec338 100644
--- a/src/browser/themes/shared/zen-icons/security-warning.svg
+++ b/src/browser/themes/shared/zen-icons/security-warning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,4.75v-1.75c0-1.243,1.007-2.25,2.25-2.25h0c1.243,0,2.25,1.007,2.25,2.25v1.75"></path><path d="M5.334,4.75h7.333c1.037,0,1.903,.793,1.992,1.827l.652,7.5c.102,1.169-.82,2.173-1.992,2.173H4.681c-1.173,0-2.094-1.005-1.992-2.173l.652-7.5c.09-1.034,.955-1.827,1.992-1.827Z"></path><line x1="9" y1="10.75" x2="9" y2="8" data-color="color-2"></line><circle cx="9" cy="13" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,4.75v-1.75c0-1.243,1.007-2.25,2.25-2.25h0c1.243,0,2.25,1.007,2.25,2.25v1.75"></path><path d="M5.334,4.75h7.333c1.037,0,1.903,.793,1.992,1.827l.652,7.5c.102,1.169-.82,2.173-1.992,2.173H4.681c-1.173,0-2.094-1.005-1.992-2.173l.652-7.5c.09-1.034,.955-1.827,1.992-1.827Z"></path><line x1="9" y1="10.75" x2="9" y2="8" data-color="color-2"></line><circle cx="9" cy="13" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/security.svg b/src/browser/themes/shared/zen-icons/security.svg
index a4d491f0b..8ca41d326 100644
--- a/src/browser/themes/shared/zen-icons/security.svg
+++ b/src/browser/themes/shared/zen-icons/security.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,8.25v-3.25c0-1.795,1.455-3.25,3.25-3.25h0c1.795,0,3.25,1.455,3.25,3.25v3.25" data-color="color-2"></path><line x1="9" y1="11.75" x2="9" y2="12.75" data-color="color-2"></line><rect x="3.25" y="8.25" width="11.5" height="8" rx="2" ry="2"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5.75,8.25v-3.25c0-1.795,1.455-3.25,3.25-3.25h0c1.795,0,3.25,1.455,3.25,3.25v3.25" data-color="color-2"></path><line x1="9" y1="11.75" x2="9" y2="12.75" data-color="color-2"></line><rect x="3.25" y="8.25" width="11.5" height="8" rx="2" ry="2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/send-to-device.svg b/src/browser/themes/shared/zen-icons/send-to-device.svg
index eff5388f8..5045e0362 100644
--- a/src/browser/themes/shared/zen-icons/send-to-device.svg
+++ b/src/browser/themes/shared/zen-icons/send-to-device.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.75,2.75h1.5c1.105,0,2,.895,2,2v6.5c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.5"></path><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><polyline points="6.25 5.5 9 2.75 11.75 5.5" data-color="color-2"></polyline><line x1="9" y1="2.75" x2="9" y2="10.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.75,2.75h1.5c1.105,0,2,.895,2,2v6.5c0,1.105-.895,2-2,2H3.75c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.5"></path><path d="M5.75,16.25c.758-.239,1.878-.5,3.25-.5,.795,0,1.941,.088,3.25,.5"></path><line x1="9" y1="13.25" x2="9" y2="15.75"></line><polyline points="6.25 5.5 9 2.75 11.75 5.5" data-color="color-2"></polyline><line x1="9" y1="2.75" x2="9" y2="10.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/settings.svg b/src/browser/themes/shared/zen-icons/settings.svg
index 142f584d2..73a363015 100644
--- a/src/browser/themes/shared/zen-icons/settings.svg
+++ b/src/browser/themes/shared/zen-icons/settings.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="8.999" r="1.75" fill="currentColor" data-color="color-2"></circle><path d="m15.175,7.278l-.929-.328c-.102-.261-.219-.52-.363-.77s-.31-.48-.485-.699l.18-.968c.125-.671-.187-1.349-.778-1.69l-.351-.203c-.592-.342-1.334-.273-1.853.171l-.745.637c-.56-.086-1.133-.086-1.703,0l-.745-.638c-.519-.444-1.262-.513-1.853-.171l-.351.203c-.592.341-.903,1.019-.778,1.69l.18.965c-.36.449-.646.946-.852,1.474l-.924.326c-.644.227-1.075.836-1.075,1.519v.405c0,.683.431,1.292,1.075,1.519l.929.328c.102.261.218.519.363.769s.31.48.485.7l-.181.968c-.125.671.187,1.349.778,1.69l.351.203c.592.342,1.334.273,1.853-.171l.745-.638c.559.086,1.132.086,1.701,0l.746.639c.519.444,1.262.513,1.853.171l.351-.203c.592-.342.903-1.019.778-1.69l-.18-.966c.359-.449.646-.945.851-1.473l.925-.326c.644-.227,1.075-.836,1.075-1.519v-.405c0-.683-.431-1.292-1.075-1.519h.002Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="9" cy="8.999" r="1.75" fill="currentColor" data-color="color-2"></circle><path d="m15.175,7.278l-.929-.328c-.102-.261-.219-.52-.363-.77s-.31-.48-.485-.699l.18-.968c.125-.671-.187-1.349-.778-1.69l-.351-.203c-.592-.342-1.334-.273-1.853.171l-.745.637c-.56-.086-1.133-.086-1.703,0l-.745-.638c-.519-.444-1.262-.513-1.853-.171l-.351.203c-.592.341-.903,1.019-.778,1.69l.18.965c-.36.449-.646.946-.852,1.474l-.924.326c-.644.227-1.075.836-1.075,1.519v.405c0,.683.431,1.292,1.075,1.519l.929.328c.102.261.218.519.363.769s.31.48.485.7l-.181.968c-.125.671.187,1.349.778,1.69l.351.203c.592.342,1.334.273,1.853-.171l.745-.638c.559.086,1.132.086,1.701,0l.746.639c.519.444,1.262.513,1.853.171l.351-.203c.592-.342.903-1.019.778-1.69l-.18-.966c.359-.449.646-.945.851-1.473l.925-.326c.644-.227,1.075-.836,1.075-1.519v-.405c0-.683-.431-1.292-1.075-1.519h.002Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/share.svg b/src/browser/themes/shared/zen-icons/share.svg
index 3b4ec7d20..702da7aab 100644
--- a/src/browser/themes/shared/zen-icons/share.svg
+++ b/src/browser/themes/shared/zen-icons/share.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,4.5V1.75s4.5,4.25,4.5,4.25l-4.5,4.25v-2.75c-3.625,0-6,3.5-6,3.5,0,0,0-6.5,6-6.5Z" data-color="color-2"></path><path d="M7.25,2.75h-2.5c-1.105,0-2,.895-2,2V13.25c0,1.105,.895,2,2,2H13.25c1.105,0,2-.895,2-2v-2.5"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.75,4.5V1.75s4.5,4.25,4.5,4.25l-4.5,4.25v-2.75c-3.625,0-6,3.5-6,3.5,0,0,0-6.5,6-6.5Z" data-color="color-2"></path><path d="M7.25,2.75h-2.5c-1.105,0-2,.895-2,2V13.25c0,1.105,.895,2,2,2H13.25c1.105,0,2-.895,2-2v-2.5"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/sidebar.svg b/src/browser/themes/shared/zen-icons/sidebar.svg
index b6134d970..754dce15a 100644
--- a/src/browser/themes/shared/zen-icons/sidebar.svg
+++ b/src/browser/themes/shared/zen-icons/sidebar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="3.25" width="14.5" height="11.5" rx="2" ry="2"></rect><rect x="4.75" y="6.25" width="2" height="5.5" fill="currentColor" data-color="color-2"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="3.25" width="14.5" height="11.5" rx="2" ry="2"></rect><rect x="4.75" y="6.25" width="2" height="5.5" fill="currentColor" data-color="color-2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/sidebars-right.svg b/src/browser/themes/shared/zen-icons/sidebars-right.svg
index 4db5521bf..4e7f8eb29 100644
--- a/src/browser/themes/shared/zen-icons/sidebars-right.svg
+++ b/src/browser/themes/shared/zen-icons/sidebars-right.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="11.75" y1="2.75" x2="11.75" y2="15.25" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="11.75" y1="2.75" x2="11.75" y2="15.25" data-color="color-2"></line><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/source-code.svg b/src/browser/themes/shared/zen-icons/source-code.svg
index bb08f1398..b37c7d013 100644
--- a/src/browser/themes/shared/zen-icons/source-code.svg
+++ b/src/browser/themes/shared/zen-icons/source-code.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="5.25 13.25 1.75 9 5.25 4.75"></polyline><polyline points="12.75 13.25 16.25 9 12.75 4.75"></polyline><line x1="7.75" y1="13.25" x2="10.25" y2="4.75" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="5.25 13.25 1.75 9 5.25 4.75"></polyline><polyline points="12.75 13.25 16.25 9 12.75 4.75"></polyline><line x1="7.75" y1="13.25" x2="10.25" y2="4.75" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/spell-check.svg b/src/browser/themes/shared/zen-icons/spell-check.svg
index 455c785fe..0842c6b33 100644
--- a/src/browser/themes/shared/zen-icons/spell-check.svg
+++ b/src/browser/themes/shared/zen-icons/spell-check.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="5.108 11.75 12.892 11.75 9.401 2.75 8.599 2.75 3.75 15.25"></polyline><polyline points="11.244 14.641 12.853 16.25 16.25 11.833" data-color="color-2"></polyline></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><polyline points="5.108 11.75 12.892 11.75 9.401 2.75 8.599 2.75 3.75 15.25"></polyline><polyline points="11.244 14.641 12.853 16.25 16.25 11.833" data-color="color-2"></polyline></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/split.svg b/src/browser/themes/shared/zen-icons/split.svg
index 3e2337cb8..8aa952db7 100644
--- a/src/browser/themes/shared/zen-icons/split.svg
+++ b/src/browser/themes/shared/zen-icons/split.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="9" y1="1.75" x2="9" y2="16.25" data-color="color-2"></line><path d="M6.25,15.25h-1.5c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.5"></path><path d="M11.75,15.25h1.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1.5"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="9" y1="1.75" x2="9" y2="16.25" data-color="color-2"></line><path d="M6.25,15.25h-1.5c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h1.5"></path><path d="M11.75,15.25h1.5c1.105,0,2-.895,2-2V4.75c0-1.105-.895-2-2-2h-1.5"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg b/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg
index 9877ff260..b2cf323c6 100644
--- a/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg
+++ b/src/browser/themes/shared/zen-icons/tab-audio-blocked-small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="7.25" x2="5.75" y2="13.75" data-color="color-2"></line><line x1="14.75" y1="5.75" x2="14.75" y2="12.25" data-color="color-2"></line><path d="M6.586,3.361l7-1.167c.61-.102,1.164,.368,1.164,.986v2.57l-9,1.5v-2.903c0-.489,.353-.906,.836-.986Z"></path><circle cx="3.75" cy="13.75" r="2"></circle><circle cx="12.75" cy="12.25" r="2"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="5.75" y1="7.25" x2="5.75" y2="13.75" data-color="color-2"></line><line x1="14.75" y1="5.75" x2="14.75" y2="12.25" data-color="color-2"></line><path d="M6.586,3.361l7-1.167c.61-.102,1.164,.368,1.164,.986v2.57l-9,1.5v-2.903c0-.489,.353-.906,.836-.986Z"></path><circle cx="3.75" cy="13.75" r="2"></circle><circle cx="12.75" cy="12.25" r="2"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg b/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg
index e7701a9c3..71a22dfb3 100644
--- a/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg
+++ b/src/browser/themes/shared/zen-icons/tab-audio-muted-small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.25,3.952v-1.288c0-.395-.437-.634-.77-.421l-5.48,3.508H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421v-1.288"></path><circle cx="14" cy="9" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="11.298" x2="16.292" y2="6.708" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M11.25,3.952v-1.288c0-.395-.437-.634-.77-.421l-5.48,3.508H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421v-1.288"></path><circle cx="14" cy="9" r="3.25" data-color="color-2"></circle><line x1="11.702" y1="11.298" x2="16.292" y2="6.708" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg b/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg
index dc630d8a5..f21b4c813 100644
--- a/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg
+++ b/src/browser/themes/shared/zen-icons/tab-audio-playing-small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,5.75H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508Z"></path><path d="M13.914,7.586c.781,.781,.781,2.047,0,2.828" data-color="color-2"></path><path d="M15.859,5.641c1.855,1.855,1.855,4.863,0,6.718" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M5,5.75H2.25c-.828,0-1.5,.672-1.5,1.5v3.5c0,.828,.672,1.5,1.5,1.5h2.75l5.48,3.508c.333,.213,.77-.026,.77-.421V2.664c0-.395-.437-.634-.77-.421l-5.48,3.508Z"></path><path d="M13.914,7.586c.781,.781,.781,2.047,0,2.828" data-color="color-2"></path><path d="M15.859,5.641c1.855,1.855,1.855,4.863,0,6.718" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tab.svg b/src/browser/themes/shared/zen-icons/tab.svg
index b46663ccc..cbb67eb97 100644
--- a/src/browser/themes/shared/zen-icons/tab.svg
+++ b/src/browser/themes/shared/zen-icons/tab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,2.75h7c1.105,0,2,.895,2,2v1.5" data-color="color-2"></path><line x1="11.25" y1="2.75" x2="11.25" y2="6.25" data-color="color-2"></line><path d="M15.75,6.25v7c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h2.5v3.5H15.75Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M6.75,2.75h7c1.105,0,2,.895,2,2v1.5" data-color="color-2"></path><line x1="11.25" y1="2.75" x2="11.25" y2="6.25" data-color="color-2"></line><path d="M15.75,6.25v7c0,1.105-.895,2-2,2H4.25c-1.105,0-2-.895-2-2V4.75c0-1.105,.895-2,2-2h2.5v3.5H15.75Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tool-profiler.svg b/src/browser/themes/shared/zen-icons/tool-profiler.svg
index 870d63c02..fd6ae5fc2 100644
--- a/src/browser/themes/shared/zen-icons/tool-profiler.svg
+++ b/src/browser/themes/shared/zen-icons/tool-profiler.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="11.298" y1="11.298" x2="9.53" y2="9.53" data-color="color-2"></line><line x1="13.066" y1="9.53" x2="12.005" y2="8.47" data-color="color-2"></line><line x1="9.53" y1="13.066" x2="8.47" y2="12.005" data-color="color-2"></line><line x1="7.763" y1="14.834" x2="5.995" y2="13.066" data-color="color-2"></line><circle cx="12" cy="4.75" r=".75" fill="currentColor" data-stroke="none" stroke="none"></circle><rect x="1.5" y="5.75" width="15" height="6.5" rx="1" ry="1" transform="translate(-3.728 9) rotate(-45)"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="11.298" y1="11.298" x2="9.53" y2="9.53" data-color="color-2"></line><line x1="13.066" y1="9.53" x2="12.005" y2="8.47" data-color="color-2"></line><line x1="9.53" y1="13.066" x2="8.47" y2="12.005" data-color="color-2"></line><line x1="7.763" y1="14.834" x2="5.995" y2="13.066" data-color="color-2"></line><circle cx="12" cy="4.75" r=".75" fill="currentColor" data-stroke="none" stroke="none"></circle><rect x="1.5" y="5.75" width="15" height="6.5" rx="1" ry="1" transform="translate(-3.728 9) rotate(-45)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/tracking-protection.svg b/src/browser/themes/shared/zen-icons/tracking-protection.svg
index e0b5854da..951808edf 100644
--- a/src/browser/themes/shared/zen-icons/tracking-protection.svg
+++ b/src/browser/themes/shared/zen-icons/tracking-protection.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.305,1.848l5.25,1.68c.414,.133,.695,.518,.695,.952v6.52c0,3.03-4.684,4.748-5.942,5.155-.203,.066-.413,.066-.616,0-1.258-.407-5.942-2.125-5.942-5.155V4.48c0-.435,.281-.82,.695-.952l5.25-1.68c.198-.063,.411-.063,.61,0Z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M9.305,1.848l5.25,1.68c.414,.133,.695,.518,.695,.952v6.52c0,3.03-4.684,4.748-5.942,5.155-.203,.066-.413,.066-.616,0-1.258-.407-5.942-2.125-5.942-5.155V4.48c0-.435,.281-.82,.695-.952l5.25-1.68c.198-.063,.411-.063,.61,0Z"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/translations.svg b/src/browser/themes/shared/zen-icons/translations.svg
index 2e9ee051d..fe519338d 100644
--- a/src/browser/themes/shared/zen-icons/translations.svg
+++ b/src/browser/themes/shared/zen-icons/translations.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="2.25" y1="4.25" x2="10.25" y2="4.25"></line><line x1="6.25" y1="2.25" x2="6.25" y2="4.25"></line><path d="M4.25,4.25c.091,2.676,1.916,4.981,4.5,5.684"></path><path d="M8.25,4.25c-.4,5.625-6,6-6,6"></path><polyline points="9.25 15.75 12.25 7.75 12.75 7.75 15.75 15.75" data-color="color-2"></polyline><line x1="10.188" y1="13.25" x2="14.813" y2="13.25" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="2.25" y1="4.25" x2="10.25" y2="4.25"></line><line x1="6.25" y1="2.25" x2="6.25" y2="4.25"></line><path d="M4.25,4.25c.091,2.676,1.916,4.981,4.5,5.684"></path><path d="M8.25,4.25c-.4,5.625-6,6-6,6"></path><polyline points="9.25 15.75 12.25 7.75 12.75 7.75 15.75 15.75" data-color="color-2"></polyline><line x1="10.188" y1="13.25" x2="14.813" y2="13.25" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/unpin.svg b/src/browser/themes/shared/zen-icons/unpin.svg
index 063818335..57473d9e0 100644
--- a/src/browser/themes/shared/zen-icons/unpin.svg
+++ b/src/browser/themes/shared/zen-icons/unpin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/video-open.svg b/src/browser/themes/shared/zen-icons/video-open.svg
index dce174372..d34336b6b 100644
--- a/src/browser/themes/shared/zen-icons/video-open.svg
+++ b/src/browser/themes/shared/zen-icons/video-open.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.211,6.984l-2.296-1.385c-.402-.243-.915,.047-.915,.516v2.771c0,.47,.513,.759,.915,.516l2.296-1.385c.389-.235,.389-.798,0-1.033Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M12.211,6.984l-2.296-1.385c-.402-.243-.915,.047-.915,.516v2.771c0,.47,.513,.759,.915,.516l2.296-1.385c.389-.235,.389-.798,0-1.033Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path><path d="M1.75,6.75v6.5c0,1.105,.895,2,2,2H12.25" data-color="color-2"></path><rect x="4.75" y="2.75" width="11.5" height="9.5" rx="2" ry="2" transform="translate(21 15) rotate(180)"></rect></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/video-save.svg b/src/browser/themes/shared/zen-icons/video-save.svg
index a9773c398..09ddcaa1f 100644
--- a/src/browser/themes/shared/zen-icons/video-save.svg
+++ b/src/browser/themes/shared/zen-icons/video-save.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.844"></path><path d="M15.75,10.313v-1.563c0-1.104-.895-2-2-2H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h5"></path><path d="M12.539,11.323l4.204,2.477c.343,.202,.343,.697,0,.899l-4.204,2.477c-.349,.206-.789-.045-.789-.449v-4.955c0-.404,.441-.655,.789-.449Z" data-color="color-2"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M2.25,8.75V4.75c0-1.105,.895-2,2-2h1.951c.607,0,1.18,.275,1.56,.748l.603,.752h5.386c1.105,0,2,.895,2,2v2.844"></path><path d="M15.75,10.313v-1.563c0-1.104-.895-2-2-2H4.25c-1.105,0-2,.896-2,2v4.5c0,1.104,.895,2,2,2h5"></path><path d="M12.539,11.323l4.204,2.477c.343,.202,.343,.697,0,.899l-4.204,2.477c-.349,.206-.789-.045-.789-.449v-4.955c0-.404,.441-.655,.789-.449Z" data-color="color-2"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/window.svg b/src/browser/themes/shared/zen-icons/window.svg
index bc40fea49..890f8c681 100644
--- a/src/browser/themes/shared/zen-icons/window.svg
+++ b/src/browser/themes/shared/zen-icons/window.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="1.75" y="2.75" width="14.5" height="12.5" rx="2" ry="2" transform="translate(18 18) rotate(180)"></rect><circle cx="4.25" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="6.75" cy="5.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/xr-blocked.svg b/src/browser/themes/shared/zen-icons/xr-blocked.svg
index 839642c37..266caf8b0 100644
--- a/src/browser/themes/shared/zen-icons/xr-blocked.svg
+++ b/src/browser/themes/shared/zen-icons/xr-blocked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.012,6.524c.315,.763,.488,1.6,.488,2.476,0,3.59-2.91,6.5-6.5,6.5-.877,0-1.713-.174-2.476-.488"></path><path d="M4.404,13.596c-1.176-1.176-1.904-2.801-1.904-4.596,0-3.59,2.91-6.5,6.5-6.5,1.795,0,3.42,.728,4.596,1.904"></path><path d="M7.409,10.591c-.407-.407-.659-.97-.659-1.591,0-1.243,1.007-2.25,2.25-2.25,.621,0,1.184,.252,1.591,.659" data-color="color-2"></path><line x1="9" y1="1" x2="9" y2="2.5"></line><line x1="17" y1="9" x2="15.5" y2="9"></line><line x1="9" y1="17" x2="9" y2="15.5"></line><line x1="1" y1="9" x2="2.5" y2="9"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M15.012,6.524c.315,.763,.488,1.6,.488,2.476,0,3.59-2.91,6.5-6.5,6.5-.877,0-1.713-.174-2.476-.488"></path><path d="M4.404,13.596c-1.176-1.176-1.904-2.801-1.904-4.596,0-3.59,2.91-6.5,6.5-6.5,1.795,0,3.42,.728,4.596,1.904"></path><path d="M7.409,10.591c-.407-.407-.659-.97-.659-1.591,0-1.243,1.007-2.25,2.25-2.25,.621,0,1.184,.252,1.591,.659" data-color="color-2"></path><line x1="9" y1="1" x2="9" y2="2.5"></line><line x1="17" y1="9" x2="15.5" y2="9"></line><line x1="9" y1="17" x2="9" y2="15.5"></line><line x1="1" y1="9" x2="2.5" y2="9"></line><line x1="2" y1="16" x2="16" y2="2" data-color="color-2"></line></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/xr.svg b/src/browser/themes/shared/zen-icons/xr.svg
index 4ec759867..743a3fc36 100644
--- a/src/browser/themes/shared/zen-icons/xr.svg
+++ b/src/browser/themes/shared/zen-icons/xr.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.75,5.75H14.25c1.105,0,2,.895,2,2v4.5c0,1.105-.895,2-2,2h-2c-.63,0-1.222-.296-1.6-.8l-.45-.6c-.6-.8-1.8-.8-2.4,0l-.45,.6c-.378,.504-.97,.8-1.6,.8H3.75c-1.105,0-2-.895-2-2V7.75c0-1.105,.895-2,2-2Z"></path><circle cx="5.5" cy="10" r=".75" fill="currentColor" data-color="color-2"></circle><circle cx="12.5" cy="10" r=".75" fill="currentColor" data-color="color-2"></circle><path d="M15.979,6.745l-1.892-3.049c-.365-.588-1.008-.946-1.699-.946h-3.387s-3.387,0-3.387,0c-.692,0-1.335,.358-1.699,.946l-1.892,3.049"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><path d="M3.75,5.75H14.25c1.105,0,2,.895,2,2v4.5c0,1.105-.895,2-2,2h-2c-.63,0-1.222-.296-1.6-.8l-.45-.6c-.6-.8-1.8-.8-2.4,0l-.45,.6c-.378,.504-.97,.8-1.6,.8H3.75c-1.105,0-2-.895-2-2V7.75c0-1.105,.895-2,2-2Z"></path><circle cx="5.5" cy="10" r=".75" fill="currentColor" data-color="color-2"></circle><circle cx="12.5" cy="10" r=".75" fill="currentColor" data-color="color-2"></circle><path d="M15.979,6.745l-1.892-3.049c-.365-.588-1.008-.946-1.699-.946h-3.387s-3.387,0-3.387,0c-.692,0-1.335,.358-1.699,.946l-1.892,3.049"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/zoom-control.svg b/src/browser/themes/shared/zen-icons/zoom-control.svg
index 77505bc5e..91d85daf6 100644
--- a/src/browser/themes/shared/zen-icons/zoom-control.svg
+++ b/src/browser/themes/shared/zen-icons/zoom-control.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="7.75" cy="7.75" r="5"></circle><line x1="15.25" y1="15.25" x2="11.285" y2="11.285"></line><circle cx="5.5" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="10" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><path d="M6.75,8.5h2c.276,0,.5,.224,.5,.5h0c0,.828-.672,1.5-1.5,1.5h0c-.828,0-1.5-.672-1.5-1.5h0c0-.276,.224-.5,.5-.5Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><circle cx="7.75" cy="7.75" r="5"></circle><line x1="15.25" y1="15.25" x2="11.285" y2="11.285"></line><circle cx="5.5" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><circle cx="10" cy="7.25" r=".75" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></circle><path d="M6.75,8.5h2c.276,0,.5,.224,.5,.5h0c0,.828-.672,1.5-1.5,1.5h0c-.828,0-1.5-.672-1.5-1.5h0c0-.276,.224-.5,.5-.5Z" fill="currentColor" data-color="color-2" data-stroke="none" stroke="none"></path></g></svg>
diff --git a/src/browser/themes/shared/zen-icons/zoom-out.svg b/src/browser/themes/shared/zen-icons/zoom-out.svg
index 063818335..57473d9e0 100644
--- a/src/browser/themes/shared/zen-icons/zoom-out.svg
+++ b/src/browser/themes/shared/zen-icons/zoom-out.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 18 18"><g stroke-linecap="round" stroke-width="1.5" fill="none" stroke="currentColor" stroke-opacity="context-fill-opacity" stroke-linejoin="round" class="nc-icon-wrapper"><line x1="3.25" y1="9" x2="14.75" y2="9"></line></g></svg>

From f2460549e0459a9d61d0faacbbc1a1188d613e62 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 12:41:23 +0100
Subject: [PATCH 112/191] Added outline to urlbar when floating

---
 src/browser/base/content/zen-styles/zen-urlbar.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index b56c65232..b6799d5f2 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -392,6 +392,7 @@ button.popup-notification-dropmarker {
       the backdrop woudn't work, we would need to apply a clip-path to the site and that's not recommended
       due to performance issues */
     background-color: light-dark(hsl(0, 0%, 100%), hsl(0, 0%, 14%)) !important;
+    outline: 1px solid rgba(0,0,0,.3) !important;
   }
 }
 

From 7cf0e05f705956e5524a9d0630d58346868227ac Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 13:26:50 +0100
Subject: [PATCH 113/191] Fixed normal tabs appear on pinned tab container

---
 .../base/content/zen-styles/zen-urlbar.css    |  2 +-
 .../base/zen-components/ZenGlanceManager.mjs  |  3 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 64 +++++++++++++++++--
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index b6799d5f2..a074fd993 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -392,7 +392,7 @@ button.popup-notification-dropmarker {
       the backdrop woudn't work, we would need to apply a clip-path to the site and that's not recommended
       due to performance issues */
     background-color: light-dark(hsl(0, 0%, 100%), hsl(0, 0%, 14%)) !important;
-    outline: 1px solid rgba(0,0,0,.3) !important;
+    outline: 1px solid rgba(0, 0, 0, 0.3) !important;
   }
 }
 
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index fc4f13942..58f2046fd 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -67,7 +67,7 @@
     }
 
     getTabPosition(tab) {
-      return Math.max(gBrowser.pinnedTabCount, tab._tPos);
+      return Math.max(gBrowser._numVisiblePinTabs, tab._tPos);
     }
 
     createBrowserElement(url, currentTab, existingTab = null) {
@@ -574,6 +574,7 @@
             DOMContentLoaded: {},
           },
         },
+        matches: ["https://*/*"],
       });
     }
   }
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index f991c91ea..5d2f2730d 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..39cb6ceda6154609daa8f3b84c4931de6604534f 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..f7c02c14498b4ec5fcf5521480c88abac25a2283 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -44,7 +44,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..39cb6ceda6154609daa8f3b84c4931de
        }
        return i;
      }
-@@ -807,7 +835,7 @@
+@@ -807,10 +835,10 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -52,7 +52,20 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..39cb6ceda6154609daa8f3b84c4931de
 +          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab)
          );
        } else {
-         this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
+-        this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
++        this.moveTabTo(aTab, this._numVisiblePinTabs, { forceStandaloneTab: true });
+       }
+       aTab.setAttribute("pinned", "true");
+       this._updateTabBarForPinnedTabs();
+@@ -831,7 +859,7 @@
+           this.tabContainer.arrowScrollbox.prepend(aTab);
+         });
+       } else {
+-        this.moveTabTo(aTab, this.pinnedTabCount - 1, {
++        this.moveTabTo(aTab, this._numVisiblePinTabs - 1, {
+           forceStandaloneTab: true,
+         });
+         aTab.removeAttribute("pinned");
 @@ -1055,6 +1083,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -197,16 +210,36 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..39cb6ceda6154609daa8f3b84c4931de
            if (select) {
              tabToSelect = tab;
            }
+@@ -3464,8 +3546,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) {
+-            tab._tPos = this.pinnedTabCount;
+-            this.tabContainer.insertBefore(tab, this.tabs[this.pinnedTabCount]);
++            tab._tPos = this._numVisiblePinTabs;
++            this.tabContainer.insertBefore(tab, this.tabs[this._numVisiblePinTabs]);
+             tab.toggleAttribute("pinned", true);
+             this.tabContainer._invalidateCachedTabs();
+             // Then ensure all the tab open/pinning information is sent.
 @@ -3729,7 +3811,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.
 -        index = Infinity;
-+        index = Services.prefs.getBoolPref("zen.view.show-newtab-button-top") ? this.pinnedTabCount : Infinity;
++        index = Services.prefs.getBoolPref("zen.view.show-newtab-button-top") ? this._numVisiblePinTabs : Infinity;
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3862,7 @@
+@@ -3773,14 +3855,14 @@
+       // Ensure index is within bounds.
+       if (tab.pinned) {
+         index = Math.max(index, 0);
+-        index = Math.min(index, this.pinnedTabCount);
++        index = Math.min(index, this._numVisiblePinTabs);
+       } else {
+-        index = Math.max(index, this.pinnedTabCount);
++        index = Math.max(index, this._numVisiblePinTabs);
+         index = Math.min(index, this.tabs.length);
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -295,6 +328,18 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..39cb6ceda6154609daa8f3b84c4931de
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
+@@ -5706,9 +5799,9 @@
+ 
+       // Don't allow mixing pinned and unpinned tabs.
+       if (aTab.pinned) {
+-        aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
++        aIndex = Math.min(aIndex, this._numVisiblePinTabs - 1);
+       } else {
+-        aIndex = Math.max(aIndex, this.pinnedTabCount);
++        aIndex = Math.max(aIndex, this._numVisiblePinTabs);
+       }
+       if (aTab._tPos == aIndex) {
+         return;
 @@ -5727,6 +5820,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
@@ -305,6 +350,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..39cb6ceda6154609daa8f3b84c4931de
      }
  
      moveTabToGroup(aTab, aGroup) {
+@@ -5802,7 +5898,7 @@
+         createLazyBrowser,
+       };
+ 
+-      let numPinned = this.pinnedTabCount;
++      let numPinned = this._numVisiblePinTabs;
+       if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
+         params.pinned = true;
+       }
 @@ -7443,6 +7539,7 @@
              aWebProgress.isTopLevel
            ) {

From c0589501194061786eb5501f95f590d6a6324f18 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 13:28:02 +0100
Subject: [PATCH 114/191] Formatted the project

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

diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 58f2046fd..ba9ecb0ec 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -574,7 +574,7 @@
             DOMContentLoaded: {},
           },
         },
-        matches: ["https://*/*"],
+        matches: ['https://*/*'],
       });
     }
   }

From 6600e6049805d9ba7bb3cf198de4b95b5af4b728 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 13:40:13 +0100
Subject: [PATCH 115/191] Fixed showing wrong tab when changing workspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 6d8d867d7..d7704cf43 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1480,7 +1480,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     // Find first suitable tab
     else {
-      tabToSelect = Array.from(visibleTabs).find((tab) => !tab.pinned);
+      tabToSelect = Array.from(visibleTabs).find((tab) => this._shouldShowTab(tab, window.uuid, containerId, workspaces));
     }
 
     const previousSelectedTab = gBrowser.selectedTab;

From 48badb83cf32f379366b95817b0a11cb7ed290be Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 13:45:09 +0100
Subject: [PATCH 116/191] Fixed creating a new tab when we can just select the
 last one when switching workspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index d7704cf43..c37cd4921 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1480,7 +1480,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     // Find first suitable tab
     else {
-      tabToSelect = Array.from(visibleTabs).find((tab) => this._shouldShowTab(tab, window.uuid, containerId, workspaces));
+      tabToSelect = Array.from(visibleTabs).find((tab) => !tab.pinned);
+      if (!tabToSelect && visibleTabs.length) {
+        tabToSelect = Array.from(visibleTabs)[visibleTabs.length - 1];
+      }
     }
 
     const previousSelectedTab = gBrowser.selectedTab;

From 6f612d62cf5fd23b0fd697800a3434dfc68abcef Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 16:35:06 +0100
Subject: [PATCH 117/191] Started working on new workspaec layout

---
 src/browser/base/content/ZenUIManager.mjs     |   6 +-
 .../base/zen-components/ZenWorkspaces.mjs     | 102 +++++++++++-------
 .../tabbrowser/content/tabs-js.patch          |  28 ++++-
 .../content/widgets/arrowscrollbox-js.patch   |  20 +++-
 4 files changed, 109 insertions(+), 47 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index cfde08211..46dff2042 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -149,11 +149,7 @@ var gZenUIManager = {
   },
 
   get newtabButton() {
-    if (this._newtabButton) {
-      return this._newtabButton;
-    }
-    this._newtabButton = document.getElementById('tabs-newtab-button');
-    return this._newtabButton;
+    return ZenWorkspaces.activeWorkspaceStrip.querySelector('#tabs-newtab-button');
   },
 
   _prevUrlbarLabel: null,
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index c37cd4921..4a603d441 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -97,6 +97,47 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     );
   }
 
+  get activeWorkspaceStrip() {
+    const activeWorkspace = this.activeWorkspace;
+    return document.querySelector(`.zen-workspace-tabs-section[zen-workspace-id="${activeWorkspace}"]`);
+  }
+
+  get tabboxChildren() {
+    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
+      return gBrowser.tabContainer.arrowScrollbox.children;
+    }
+    return this.activeWorkspaceStrip.children
+  }
+
+  async initializeTabsStripSections() {
+    const tabs = this.tabboxChildren;
+    const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
+    for (const workspace of (await this._workspaces()).workspaces) {
+      this._createWorkspaceTabsSection(workspace, tabs, perifery);
+    }
+    perifery.remove();
+    this._hasInitializedTabsStrip = true;
+  }
+
+  async _createWorkspaceTabsSection(workspace, tabs, perifery) {
+    const container = gBrowser.tabContainer.arrowScrollbox;
+    const section = document.createXULElement('vbox');
+    section.className = 'zen-workspace-tabs-section';
+    section.setAttribute('flex', '1');
+    section.setAttribute('zen-workspace-id', workspace.uuid);
+    container.appendChild(section);
+    this._organizeTabsToWorkspaceSections(workspace, section, tabs);
+    section.appendChild(perifery.cloneNode(true));
+  }
+
+  _organizeTabsToWorkspaceSections(workspace, section, tabs) {
+    const workspaceTabs = Array.from(tabs).filter((tab) => tab.getAttribute('zen-workspace-id') === workspace.uuid);
+    for (const tab of workspaceTabs) {
+      section.appendChild(tab);
+    }
+    this.tabContainer._invalidateCachedTabs();
+  } 
+
   initializeWorkspaceNavigation() {
     this._setupAppCommandHandlers();
     this._setupSidebarHandlers();
@@ -411,6 +452,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
           this.activeWorkspace = activeWorkspace?.uuid;
         }
       }
+      await this.initializeTabsStripSections();
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
@@ -1319,19 +1361,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     // Refresh tab cache
     this.tabContainer._invalidateCachedTabs();
 
-    let animationDirection;
     if (previousWorkspace && !onInit && !this._animatingChange) {
-      animationDirection =
-        explicitAnimationDirection ??
-        (workspaces.workspaces.findIndex((w) => w.uuid === previousWorkspace.uuid) <
-        workspaces.workspaces.findIndex((w) => w.uuid === window.uuid)
-          ? 'right'
-          : 'left');
-    }
-    if (animationDirection) {
-      // Animate tabs out of view before changing workspace, therefor we
-      // need to animate in the opposite direction
-      await this._animateTabs(animationDirection === 'left' ? 'right' : 'left', true);
+      await this._animateTabs(previousWorkspace, window);
     }
 
     // First pass: Handle tab visibility and workspace ID assignment
@@ -1343,9 +1374,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     // Update UI and state
     await this._updateWorkspaceState(window, onInit);
 
-    if (animationDirection) {
-      await this._animateTabs(animationDirection);
-    }
   }
 
   get _animateTabsElements() {
@@ -1354,35 +1382,31 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     return [...this.tabContainer.querySelectorAll(selector), ...this.tabContainer.querySelectorAll(extraSelector)];
   }
 
-  async _animateTabs(direction, out = false) {
-    this.tabContainer.removeAttribute('dont-animate-tabs');
-    const tabsWidth = this.tabContainer.getBoundingClientRect().width;
-    // order by actual position in the children list to animate
-    const elements = this._animateTabsElements;
-    if (out) {
-      const existingTransform = elements[0].style.transform;
-      const newTransform = `translateX(${direction === 'left' ? '-' : ''}${tabsWidth}px)`;
-      return gZenUIManager.motion.animate(
-        elements,
-        {
-          transform: existingTransform ? [existingTransform, newTransform] : newTransform,
-        },
-        {
-          type: 'spring',
-          bounce: 0,
-          duration: 0.12,
-        }
-      );
-    }
-    return gZenUIManager.motion.animate(
-      elements,
+  async _animateTabs(previousWorkspace, newWorkspace) {
+    const newWorkspaceContainer = this.tabContainer;
+    const previousWorkspaceContainer = document.querySelector(`[zen-workspace-id="${previousWorkspace.uuid}"]`);
+
+    const newWorkspaceLeft = newWorkspaceContainer.getBoundingClientRect().left;
+    gZenUIManager.motion.animate(
+      newWorkspaceContainer,
       {
-        transform: [`translateX(${direction === 'left' ? '-' : ''}${tabsWidth}px)`, 'translateX(0px)'],
+        transform: [`translateX(${newWorkspaceLeft}px)`, 'translateX(0)'],
       },
       {
-        duration: 0.15,
         type: 'spring',
         bounce: 0,
+        duration: 0.12,
+      }
+    );
+    gZenUIManager.motion.animate(
+      previousWorkspaceContainer,
+      {
+        transform: ['translateX(0)', `translateX(-${newWorkspaceLeft}px)`],
+      },
+      {
+        type: 'spring',
+        bounce: 0,
+        duration: 0.12,
       }
     );
   }
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 756161868..b0a668a3c 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..bffa5e0be62e73f380adf558c5df3441bde7b604 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ceab5c1dcf 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -101,7 +101,16 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..bffa5e0be62e73f380adf558c5df3441
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1512,9 +1525,19 @@
+@@ -1498,7 +1511,7 @@
+       if (this.#allTabs) {
+         return this.#allTabs;
+       }
+-      let children = Array.from(this.arrowScrollbox.children);
++      let children = Array.from(ZenWorkspaces.tabboxChildren);
+       // remove arrowScrollbox periphery element
+       children.pop();
+ 
+@@ -1512,14 +1525,24 @@
        }
  
        this.#allTabs = [
@@ -122,6 +131,21 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..bffa5e0be62e73f380adf558c5df3441
        return this.#allTabs;
      }
  
+     get allGroups() {
+-      let children = Array.from(this.arrowScrollbox.children);
++      let children = Array.from(ZenWorkspaces.tabboxChildren);
+       return children.filter(node => node.tagName == "tab-group");
+     }
+ 
+@@ -1577,7 +1600,7 @@
+       let verticalPinnedTabsContainer = document.getElementById(
+         "vertical-pinned-tabs-container"
+       );
+-      let children = Array.from(this.arrowScrollbox.children);
++      let children = Array.from(ZenWorkspaces.tabboxChildren);
+ 
+       let focusableItems = [];
+       for (let child of children) {
 @@ -1593,6 +1616,7 @@
        }
  
diff --git a/src/toolkit/content/widgets/arrowscrollbox-js.patch b/src/toolkit/content/widgets/arrowscrollbox-js.patch
index ebfbd2dec..28739a036 100644
--- a/src/toolkit/content/widgets/arrowscrollbox-js.patch
+++ b/src/toolkit/content/widgets/arrowscrollbox-js.patch
@@ -1,7 +1,25 @@
 diff --git a/toolkit/content/widgets/arrowscrollbox.js b/toolkit/content/widgets/arrowscrollbox.js
-index 328c770d275ebbaada8a44438eaf738b1a62d985..95460108c6356408170b8a4a40d55a8f0621756b 100644
+index 328c770d275ebbaada8a44438eaf738b1a62d985..070439e26bfe6a2299aa4b82ee4c434e143e1a20 100644
 --- a/toolkit/content/widgets/arrowscrollbox.js
 +++ b/toolkit/content/widgets/arrowscrollbox.js
+@@ -15,7 +15,7 @@
+     static get inheritedAttributes() {
+       return {
+         "#scrollbutton-up": "disabled=scrolledtostart",
+-        scrollbox: "orient,align,pack,dir,smoothscroll",
++        scrollbox: "align,pack,dir,smoothscroll",
+         "#scrollbutton-down": "disabled=scrolledtoend",
+       };
+     }
+@@ -26,7 +26,7 @@
+       <html:link rel="stylesheet" href="chrome://global/skin/arrowscrollbox.css"/>
+       <toolbarbutton id="scrollbutton-up" part="scrollbutton-up" keyNav="false" data-l10n-id="overflow-scroll-button-backwards"/>
+       <spacer part="overflow-start-indicator"/>
+-      <scrollbox part="scrollbox" flex="1">
++      <scrollbox part="scrollbox" orient="horizontal" flex="1">
+         <html:slot/>
+       </scrollbox>
+       <spacer part="overflow-end-indicator"/>
 @@ -98,6 +98,7 @@
  
        let slot = this.shadowRoot.querySelector("slot");

From e387652c8b3a0979b73d1c1e91ee1b210903b3f1 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 11 Feb 2025 22:01:41 +0100
Subject: [PATCH 118/191] HUGE: handle workspaces as individual containers
 instead of a single list of tabs

---
 src/browser/base/content/ZenStartup.mjs       |   1 -
 src/browser/base/content/ZenUIManager.mjs     |   2 +
 .../content/navigator-toolbox-inc-xhtml.patch |  17 +-
 .../content/zen-styles/zen-browser-ui.css     |   2 +-
 .../zen-styles/zen-tabs/horizontal-tabs.css   |   4 +-
 .../zen-styles/zen-tabs/vertical-tabs.css     |  31 +-
 .../base/content/zen-styles/zen-theme.css     |   2 +
 .../base/content/zen-styles/zen-urlbar.css    |   5 +-
 .../content/zen-styles/zen-workspaces.css     |  44 +--
 .../zen-components/ZenGradientGenerator.mjs   |   2 +-
 .../zen-components/ZenPinnedTabManager.mjs    |  10 +-
 .../base/zen-components/ZenWorkspaces.mjs     | 370 ++++++++++++------
 .../tabbrowser/content/tabbrowser-js.patch    |   4 +-
 .../tabbrowser/content/tabs-js.patch          | 105 +++--
 .../themes/shared/tabbrowser/tabs-css.patch   |  20 +-
 .../content/widgets/arrowscrollbox-js.patch   |  20 +-
 16 files changed, 413 insertions(+), 226 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index a8880efdd..a09e51f47 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -85,7 +85,6 @@
     _initSidebarScrolling() {
       // Disable smooth scroll
       const canSmoothScroll = Services.prefs.getBoolPref('zen.startup.smooth-scroll-in-tabs', false);
-      const workspaceIndicator = document.getElementById('zen-current-workspace-indicator');
       const tabsWrapper = document.getElementById('zen-browser-tabs-wrapper');
       gBrowser.tabContainer.addEventListener('wheel', (event) => {
         if (canSmoothScroll) return;
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 46dff2042..ca3354728 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -413,6 +413,8 @@ var gZenVerticalTabsManager = {
 
       gBrowser.tabContainer.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       gBrowser.tabContainer.arrowScrollbox.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
+      // on purpose, we set the orient to horizontal, because the arrowScrollbox is vertical
+      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute('orient', isVerticalTabs ? 'horizontal' : 'vertical');
 
       const buttonsTarget = document.getElementById('zen-sidebar-top-buttons-customization-target');
       if (isRightSide) {
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 6d7f1a45c..bc2ef52de 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index a0a382643a2f74b6d789f3641ef300eed202d5e9..8b7b2ae3e7764d5dd77cd344f0cf67aea54a6f47 100644
+index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde703a90ee8 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -40,20 +40,17 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..8b7b2ae3e7764d5dd77cd344f0cf67ae
          <tabs id="tabbrowser-tabs"
                is="tabbrowser-tabs"
                aria-multiselectable="true"
-@@ -50,6 +50,12 @@
+@@ -50,6 +50,9 @@
                tooltip="tabbrowser-tab-tooltip"
                orient="horizontal"
                stopwatchid="FX_TAB_CLICK_MS">
 +<html:div id="zen-essentials-container" skipintoolbarset="true"></html:div>
-+<hbox id="zen-current-workspace-indicator" skipintoolbarset="true">
-+  <hbox id="zen-current-workspace-indicator-icon"></hbox>
-+  <hbox id="zen-current-workspace-indicator-name"></hbox>
-+</hbox>
++<hbox id="zen-current-workspace-indicator-container"></hbox>
 +<html:div id="zen-browser-tabs-wrapper">
            <hbox class="tab-drop-indicator" hidden="true"/>
  # If the name (tabbrowser-arrowscrollbox) or structure of this changes
  # significantly, there is an optimization in
-@@ -57,7 +63,7 @@
+@@ -57,7 +60,7 @@
  # the current structure that we may want to revisit.
            <html:div id="vertical-pinned-tabs-container" tabindex="-1"></html:div>
            <html:div id="vertical-pinned-tabs-container-separator"></html:div>
@@ -62,7 +59,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..8b7b2ae3e7764d5dd77cd344f0cf67ae
              <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
              <hbox id="tabbrowser-arrowscrollbox-periphery">
                <toolbartabstop/>
-@@ -75,6 +81,7 @@
+@@ -75,6 +78,7 @@
                                tooltip="dynamic-shortcut-tooltip"
                                data-l10n-id="tabs-toolbar-new-tab"/>
            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
@@ -70,7 +67,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..8b7b2ae3e7764d5dd77cd344f0cf67ae
          </tabs>
  
          <toolbarbutton id="new-tab-button"
-@@ -100,11 +107,12 @@
+@@ -100,11 +104,12 @@
  #include private-browsing-indicator.inc.xhtml
      <toolbarbutton id="content-analysis-indicator"
                     class="toolbarbutton-1 content-analysis-indicator-icon"/>
@@ -86,7 +83,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..8b7b2ae3e7764d5dd77cd344f0cf67ae
    <toolbar id="nav-bar"
             class="browser-toolbar chromeclass-location"
             data-l10n-id="navbar-accessible"
-@@ -490,10 +498,12 @@
+@@ -490,10 +495,12 @@
                       consumeanchor="PanelUI-button"
                       data-l10n-id="appmenu-menu-button-closed2"/>
      </toolbaritem>
diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 403370c63..0257ac92f 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -51,7 +51,7 @@
     &[animating='true']::after {
       background: var(--zen-main-browser-background-old);
       backdrop-filter: blur(5px);
-      animation: zen-main-app-wrapper-animation 0.5s ease forwards;
+      animation: zen-main-app-wrapper-animation 0.2s ease forwards;
       transition: 0s;
     }
   }
diff --git a/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css
index e96e2fc8a..d1b2cb365 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css
@@ -28,7 +28,7 @@
     --tab-min-height: 10px !important;
   }
 
-  #vertical-pinned-tabs-container-separator {
+  .vertical-pinned-tabs-container-separator {
     display: none !important;
   }
 
@@ -214,7 +214,7 @@
   }
 
   /* Other UI Elements */
-  #zen-current-workspace-indicator {
+  .zen-current-workspace-indicator {
     display: none !important;
   }
 
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index a593fedfc..b18d303c6 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -117,7 +117,7 @@
   }
 }
 
-#vertical-pinned-tabs-container-separator {
+.vertical-pinned-tabs-container-separator {
   background: light-dark(rgba(1, 1, 1, 0.075), rgba(255, 255, 255, 0.1));
   margin: 8px auto;
   border: none;
@@ -126,8 +126,8 @@
   width: 98%;
   transition: margin 0.2s ease-in-out, background 0.2s ease-in-out, max-height 0.2s ease-in-out;
 
-  #vertical-pinned-tabs-container:not(:has(tab:not([hidden]))) + &,
-  #tabbrowser-tabs:not(:has(#tabbrowser-arrowscrollbox tab:not([hidden]))) & {
+  #vertical-pinned-tabs-container .zen-workspace-tabs-section[active]:not(:has(tab:not([hidden]))) &,
+  #tabbrowser-tabs:not(:has(#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[active] tab:not([hidden]))) & {
     max-height: 0;
     margin: 0 auto;
   }
@@ -254,18 +254,14 @@
   grid-gap: 0 !important;
 
   &[overflow]::after,
-  #vertical-tabs-newtab-button {
+  #vertical-tabs-newtab-button,
+  #vertical-pinned-tabs-container-separator { /* notice #vertical-pinned-tabs-container-separator is an ID */
     /* Hide separator they give us, eww */
     display: none !important;
   }
 
   & .tabbrowser-tab {
     transition: scale 0.07s ease;
-    #tabbrowser-tabs &:not([zen-essential='true']) {
-      #tabbrowser-tabs[dont-animate-tabs] & {
-        opacity: 0;
-      }
-    }
 
     &:active {
       scale: 0.98;
@@ -441,7 +437,7 @@
     width: calc(100% - 10px) !important;
   }
 
-  & #zen-current-workspace-indicator-icon[no-icon='true'] {
+  & .zen-current-workspace-indicator-icon[no-icon='true'] {
     display: none;
   }
 
@@ -572,11 +568,11 @@
 #navigator-toolbox:not([zen-sidebar-expanded='true']) {
   max-width: var(--zen-toolbox-max-width) !important;
   min-width: var(--zen-toolbox-max-width) !important;
-  & #zen-current-workspace-indicator-name,
+  & .zen-current-workspace-indicator-name,
   & .toolbarbutton-text {
     display: none !important;
   }
-  & #zen-current-workspace-indicator {
+  & .zen-current-workspace-indicator {
     padding-left: 0;
     padding-right: 0;
     display: flex;
@@ -893,7 +889,7 @@
       align-items: center;
       padding-top: 0;
     }
-    
+
     &:active,
     &[open] {
       scale: 0.98;
@@ -966,7 +962,7 @@
 
   --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.2));
 
-  &:not([selected], [multiselected="true"]) .tab-background {
+  &:not([visuallyselected], [multiselected="true"]) .tab-background {
     background: var(--zen-toolbar-element-bg);
     border: none;
   }
@@ -1137,3 +1133,10 @@
 #zen-essentials-container .tabbrowser-tab.drag-over-after {
   box-shadow: -3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
 }
+
+/* Section: tab workspaces stylings */
+.zen-workspace-tabs-section {
+  position: absolute;
+  transform: translateX(-100%);
+  min-width: 100%;
+}
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index e4398c8ab..480f65c52 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -157,6 +157,8 @@
   --zen-themed-toolbar-bg: light-dark(var(--zen-branding-bg), #161616);
   --zen-themed-toolbar-bg-transparent: light-dark(var(--zen-branding-bg), #161616);
 
+  --zen-workspace-indicator-height: 45px;
+
   @media (-moz-windows-mica) or (-moz-platform: macos) {
     background: transparent;
     --zen-themed-toolbar-bg-transparency: 0;
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index a074fd993..fb8bf7d2a 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -414,7 +414,10 @@ button.popup-notification-dropmarker {
   --urlbar-margin-inline: 10px !important;
   position: absolute;
 
-  font-size: 1.5em !important;
+  font-size: 1.15em !important;
+  @media (-moz-platform: macos) {
+    font-size: 1.5em !important;
+  }
   top: calc(var(--zen-toolbar-height) * 2) !important;
 
   --zen-urlbar-center: calc(var(--zen-urlbar-offset, 0px) + 28vw);
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index a88c6a2aa..9fbe38108 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -446,11 +446,20 @@
 }
 
 /* Mark workspaces indicator */
-#zen-current-workspace-indicator {
+#zen-current-workspace-indicator-container {
+  margin-bottom: var(--zen-workspace-indicator-height);
+}
+
+.zen-current-workspace-indicator {
   padding: 15px calc(4px + var(--tab-inline-padding));
   font-weight: 600;
-  align-items: center;
-  position: relative;
+  position: absolute;
+  max-height: var(--zen-workspace-indicator-height);
+  min-height: var(--zen-workspace-indicator-height);
+  gap: 5px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  flex-direction: row !important;
 
   &::before {
     border-radius: var(--border-radius-medium);
@@ -459,11 +468,11 @@
     pointer-events: none;
     content: '';
     position: absolute;
-    top: 6px;
+    top: 4px;
     left: 2px;
     z-index: -1;
     width: calc(100% - 4px);
-    height: calc(100% - 12px);
+    height: calc(100% - 10px);
   }
 
   &:hover,
@@ -473,38 +482,23 @@
     }
   }
 
-  & #zen-current-workspace-indicator-icon {
-    font-size: 14px;
+  & .zen-current-workspace-indicator-icon {
+    font-size: 12px;
   }
 
-  #zen-current-workspace-indicator-name {
+  .zen-current-workspace-indicator-name {
     font-size: 13px;
     opacity: 0.5;
-
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
     display: block;
-
-    position: absolute;
-    max-width: calc(100% - var(--zen-toolbox-padding) * 4);
-  }
-
-  & #zen-current-workspace-indicator-icon {
-    min-height: 16px;
-  }
-
-  & #zen-current-workspace-indicator-icon:not([hidden]) + #zen-current-workspace-indicator-name {
-    padding-left: 24px;
   }
 }
 
 @media not (-moz-bool-pref: 'zen.workspaces.show-workspace-indicator') {
-  #zen-current-workspace-indicator {
+  #zen-current-workspace-indicator-container {
     display: none !important;
   }
 }
 
-#zen-current-workspace-indicator[hidden='true'] {
+#zen-current-workspace-indicator-container[hidden='true'] {
   display: none !important;
 }
diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index 8080d686a..125c45da7 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -614,7 +614,7 @@
                 // Reactivate the transition after the animation
                 appWrapper.removeAttribute('post-animating');
               }, 100);
-            }, 500);
+            }, 200);
           });
         }
 
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index aa2f9213d..a3487fee7 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -648,7 +648,7 @@
 
     moveToAnotherTabContainerIfNecessary(event, draggedTab) {
       const pinnedTabsTarget =
-        event.target.closest('#vertical-pinned-tabs-container') || event.target.closest('#zen-current-workspace-indicator');
+        event.target.closest('#vertical-pinned-tabs-container') || event.target.closest('.zen-current-workspace-indicator');
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
 
@@ -717,7 +717,7 @@
     removeTabContainersDragoverClass() {
       this.dragIndicator.remove();
       this._dragIndicator = null;
-      document.getElementById('zen-current-workspace-indicator').removeAttribute('open');
+      ZenWorkspaces.activeWorkspaceIndicator.removeAttribute('open');
     }
 
     get dragIndicator() {
@@ -738,11 +738,11 @@
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
       const targetTab = event.target.closest('.tabbrowser-tab');
-      if (event.target.closest('#zen-current-workspace-indicator')) {
+      if (event.target.closest('.zen-current-workspace-indicator')) {
         this.removeTabContainersDragoverClass();
-        event.target.setAttribute('open', true);
+        ZenWorkspaces.activeWorkspaceIndicator.setAttribute('open', true);
       } else {
-        document.getElementById('zen-current-workspace-indicator').removeAttribute('open');
+        ZenWorkspaces.activeWorkspaceIndicator.removeAttribute('open');
       }
 
       // If there's no valid target tab, nothing to do
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 4a603d441..8198ff3a1 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -28,13 +28,18 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._resolvePinnedInitialized = resolve;
   });
 
+  workspaceIndicatorXUL = `
+    <hbox class="zen-current-workspace-indicator-icon"></hbox>
+    <hbox class="zen-current-workspace-indicator-name"></hbox>
+  `;
+
   async waitForPromises() {
     await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized, SessionStore.promiseAllWindowsRestored]);
   }
 
   async init() {
     if (!this.shouldHaveWorkspaces) {
-      document.getElementById('zen-current-workspace-indicator').setAttribute('hidden', 'true');
+      document.getElementById('zen-current-workspace-indicator-container').setAttribute('hidden', 'true');
       console.warn('ZenWorkspaces: !!! ZenWorkspaces is disabled in hidden windows !!!');
       return; // We are in a hidden window, don't initialize ZenWorkspaces
     }
@@ -77,6 +82,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (!this.workspaceEnabled) {
       return;
     }
+    this._pinnedTabsResizeObserver = new ResizeObserver(this.onPinnedTabsResize.bind(this));
     await this.waitForPromises();
     await this.initializeWorkspaces();
     console.info('ZenWorkspaces: ZenWorkspaces initialized');
@@ -97,46 +103,113 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     );
   }
 
+  registerPinnedResizeObserver() {
+    if (!this._hasInitializedTabsStrip) {
+      return;
+    }
+    this._pinnedTabsResizeObserver.disconnect();
+    for (let element of document.getElementById('vertical-pinned-tabs-container').children) {
+      if (element.classList.contains('tabbrowser-tab')) {
+        continue;
+      }
+      this._pinnedTabsResizeObserver.observe(element);
+    }
+  }
+
   get activeWorkspaceStrip() {
+    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
+      return gBrowser.tabContainer.arrowScrollbox;
+    }
     const activeWorkspace = this.activeWorkspace;
-    return document.querySelector(`.zen-workspace-tabs-section[zen-workspace-id="${activeWorkspace}"]`);
+    return document.querySelector(
+      `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${activeWorkspace}"]`
+    );
+  }
+
+  get activeWorkspaceIndicator() {
+    return document.querySelector(
+      `#zen-current-workspace-indicator-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
+    );
   }
 
   get tabboxChildren() {
+    return this.activeWorkspaceStrip.children;
+  }
+
+  get pinnedTabsContainer() {
     if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
-      return gBrowser.tabContainer.arrowScrollbox.children;
+      return document.getElementById('vertical-pinned-tabs-container');
     }
-    return this.activeWorkspaceStrip.children
+    return document.querySelector(
+      `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
+    );
   }
 
   async initializeTabsStripSections() {
-    const tabs = this.tabboxChildren;
     const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
+    const tabs = gBrowser.tabContainer.allTabs.filter((tab) => !tab.pinned);
     for (const workspace of (await this._workspaces()).workspaces) {
       this._createWorkspaceTabsSection(workspace, tabs, perifery);
     }
-    perifery.remove();
+    if (tabs.length) {
+      const defaultSelectedContainer = document.querySelector(
+        `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
+      );
+      for (const tab of tabs) {
+        // before to the last child (perifery)
+        defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
+      }
+      this.tabContainer._invalidateCachedTabs();
+    }
+    perifery.setAttribute('hidden', 'true');
     this._hasInitializedTabsStrip = true;
+    this.registerPinnedResizeObserver();
   }
 
-  async _createWorkspaceTabsSection(workspace, tabs, perifery) {
-    const container = gBrowser.tabContainer.arrowScrollbox;
+  _createWorkspaceSection(workspace) {
     const section = document.createXULElement('vbox');
     section.className = 'zen-workspace-tabs-section';
     section.setAttribute('flex', '1');
     section.setAttribute('zen-workspace-id', workspace.uuid);
-    container.appendChild(section);
-    this._organizeTabsToWorkspaceSections(workspace, section, tabs);
-    section.appendChild(perifery.cloneNode(true));
+    return section;
   }
 
-  _organizeTabsToWorkspaceSections(workspace, section, tabs) {
+  async _createWorkspaceTabsSection(workspace, tabs, perifery) {
+    const container = gBrowser.tabContainer.arrowScrollbox;
+    const section = this._createWorkspaceSection(workspace);
+    container.appendChild(section);
+
+    const pinnedContainer = document.getElementById('vertical-pinned-tabs-container');
+    const pinnedSection = this._createWorkspaceSection(workspace);
+    this._organizeTabsToWorkspaceSections(workspace, section, pinnedSection, tabs);
+    section.appendChild(perifery.cloneNode(true));
+    pinnedSection.appendChild(
+      window.MozXULElement.parseXULToFragment(`
+        <html:div class="vertical-pinned-tabs-container-separator"></html:div>
+      `)
+    );
+    pinnedContainer.appendChild(pinnedSection);
+
+    const workspaceIndicator = this._createWorkspaceSection(workspace);
+    workspaceIndicator.classList.add('zen-current-workspace-indicator');
+    workspaceIndicator.appendChild(window.MozXULElement.parseXULToFragment(this.workspaceIndicatorXUL));
+    document.getElementById('zen-current-workspace-indicator-container').appendChild(workspaceIndicator);
+    this.initIndicatorContextMenu(workspaceIndicator);
+  }
+
+  _organizeTabsToWorkspaceSections(workspace, section, pinnedSection, tabs) {
     const workspaceTabs = Array.from(tabs).filter((tab) => tab.getAttribute('zen-workspace-id') === workspace.uuid);
     for (const tab of workspaceTabs) {
-      section.appendChild(tab);
+      // remove tab from list
+      tabs.splice(tabs.indexOf(tab), 1);
+      if (tab.pinned) {
+        pinnedSection.appendChild(tab);
+      } else {
+        section.appendChild(tab);
+      }
     }
     this.tabContainer._invalidateCachedTabs();
-  } 
+  }
 
   initializeWorkspaceNavigation() {
     this._setupAppCommandHandlers();
@@ -462,11 +535,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         console.error('ZenWorkspaces: Error initializing theme picker', e);
       }
     }
-    this.initIndicatorContextMenu();
   }
 
-  initIndicatorContextMenu() {
-    const indicator = document.getElementById('zen-current-workspace-indicator');
+  initIndicatorContextMenu(indicator) {
     const th = (event) => {
       event.preventDefault();
       event.stopPropagation();
@@ -780,7 +851,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       if (!browser.ZenWorkspaces.workspaceEnabled) {
         return;
       }
-      await browser.ZenWorkspaces.updateWorkspaceIndicator();
       let workspaceList = browser.document.getElementById('PanelUI-zen-workspaces-list');
       const createWorkspaceElement = (workspace) => {
         let element = browser.document.createXULElement('toolbarbutton');
@@ -1074,7 +1144,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (!this.workspaceEnabled) {
       return;
     }
-    let target = event.target.closest('#zen-current-workspace-indicator') || document.getElementById('zen-workspaces-button');
+    let target = event.target.closest('.zen-current-workspace-indicator') || document.getElementById('zen-workspaces-button');
     let panel = document.getElementById('PanelUI-zen-workspaces');
     await this._propagateWorkspaceData({
       ignoreStrip: true,
@@ -1231,13 +1301,25 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
+  moveTabToWorkspace(tab, workspaceID) {
+    if (tab.getAttribute('zen-workspace-id') === workspaceID) {
+      return;
+    }
+    tab.setAttribute('zen-workspace-id', workspaceID);
+    const parent = tab.pinned ? '#zen-browser-tabs-pinned ' : '#zen-browser-tabs ';
+    const container = document.querySelector(parent + '.zen-browser-tabs-container');
+    if (container) {
+      container.insertBefore(tab, container.firstChild);
+    }
+  }
+
   _prepareNewWorkspace(window) {
     document.documentElement.setAttribute('zen-workspace-id', window.uuid);
     let tabCount = 0;
     for (let tab of gBrowser.tabs) {
       const isEssential = tab.getAttribute('zen-essential') === 'true';
       if (!tab.hasAttribute('zen-workspace-id') && !tab.pinned && !isEssential) {
-        tab.setAttribute('zen-workspace-id', window.uuid);
+        this.moveTabToWorkspace(tab, window.uuid);
         tabCount++;
       }
     }
@@ -1250,7 +1332,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let tab = gZenUIManager.openAndChangeToTab(BROWSER_NEW_TAB_URL);
 
     if (window.uuid) {
-      tab.setAttribute('zen-workspace-id', window.uuid);
+      this.moveTabToWorkspace(tab, window.uuid);
     }
   }
 
@@ -1323,7 +1405,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       await this._performWorkspaceChange(window, ...args);
     } finally {
       this._inChangingWorkspace = false;
-      this.tabContainer.removeAttribute('dont-animate-tabs');
     }
   }
 
@@ -1359,87 +1440,125 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const workspaces = await this._workspaces();
 
     // Refresh tab cache
+    gBrowser.verticalPinnedTabsContainer = this.pinnedTabsContainer;
+    gBrowser.tabContainer.verticalPinnedTabsContainer = this.pinnedTabsContainer;
     this.tabContainer._invalidateCachedTabs();
-
-    if (previousWorkspace && !onInit && !this._animatingChange) {
-      await this._animateTabs(previousWorkspace, window);
-    }
+    await this._organizeWorkspaceStripLocations(previousWorkspace);
 
     // First pass: Handle tab visibility and workspace ID assignment
-    const visibleTabs = this._processTabVisibility(window.uuid, containerId, workspaces);
+    this._processTabVisibility(window.uuid, containerId, workspaces);
 
     // Second pass: Handle tab selection
-    await this._handleTabSelection(window, onInit, visibleTabs, containerId, workspaces, previousWorkspace.uuid);
+    this.tabContainer._invalidateCachedTabs();
+    await this._handleTabSelection(window, onInit, containerId, workspaces, previousWorkspace.uuid);
+    this.tabContainer._updateVerticalPinnedTabs();
 
     // Update UI and state
     await this._updateWorkspaceState(window, onInit);
-
   }
 
   get _animateTabsElements() {
     const selector = `#zen-browser-tabs-wrapper`;
-    const extraSelector = `#zen-current-workspace-indicator`;
+    const extraSelector = `.zen-current-workspace-indicator`;
     return [...this.tabContainer.querySelectorAll(selector), ...this.tabContainer.querySelectorAll(extraSelector)];
   }
 
-  async _animateTabs(previousWorkspace, newWorkspace) {
-    const newWorkspaceContainer = this.tabContainer;
-    const previousWorkspaceContainer = document.querySelector(`[zen-workspace-id="${previousWorkspace.uuid}"]`);
+  _updateMarginTopPinnedTabs(arrowscrollbox, pinnedContainer) {
+    if (arrowscrollbox) {
+      arrowscrollbox.style.marginTop = pinnedContainer.getBoundingClientRect().height + 'px';
+    }
+  }
 
-    const newWorkspaceLeft = newWorkspaceContainer.getBoundingClientRect().left;
-    gZenUIManager.motion.animate(
-      newWorkspaceContainer,
-      {
-        transform: [`translateX(${newWorkspaceLeft}px)`, 'translateX(0)'],
-      },
-      {
-        type: 'spring',
-        bounce: 0,
-        duration: 0.12,
+  async _organizeWorkspaceStripLocations(workspace) {
+    const workspaces = await this._workspaces();
+    let workspaceIndex = workspaces.workspaces.findIndex((w) => w.uuid === workspace.uuid);
+    this._fixIndicatorsNames(workspaces);
+    for (const otherWorkspace of workspaces.workspaces) {
+      const selector = `.zen-workspace-tabs-section[zen-workspace-id="${otherWorkspace.uuid}"]`;
+      const newTransform = -(workspaceIndex - workspaces.workspaces.indexOf(otherWorkspace)) * 100;
+      for (const container of document.querySelectorAll(selector)) {
+        container.style.transform = `translateX(${newTransform}%)`;
+        container.style.opacity = !newTransform;
       }
-    );
-    gZenUIManager.motion.animate(
-      previousWorkspaceContainer,
-      {
-        transform: ['translateX(0)', `translateX(-${newWorkspaceLeft}px)`],
-      },
-      {
-        type: 'spring',
-        bounce: 0,
-        duration: 0.12,
+      const pinnedContainerId = '#vertical-pinned-tabs-container ';
+      const arrowScrollboxId = '#tabbrowser-arrowscrollbox ';
+      const pinnedContainer = document.querySelector(pinnedContainerId + selector);
+      const arrowScrollbox = document.querySelector(arrowScrollboxId + selector);
+      this._updateMarginTopPinnedTabs(arrowScrollbox, pinnedContainer);
+    }
+  }
+
+  updateWorkspaceIndicator(currentWorkspace, workspaceIndicator) {
+    if (!workspaceIndicator) {
+      return;
+    }
+    const indicatorName = workspaceIndicator.querySelector('.zen-current-workspace-indicator-name');
+    const indicatorIcon = workspaceIndicator.querySelector('.zen-current-workspace-indicator-icon');
+
+    if (this.workspaceHasIcon(currentWorkspace)) {
+      indicatorIcon.removeAttribute('no-icon');
+    } else {
+      indicatorIcon.setAttribute('no-icon', 'true');
+    }
+    indicatorIcon.textContent = this.getWorkspaceIcon(currentWorkspace);
+    indicatorName.textContent = currentWorkspace.name;
+  }
+
+  _fixIndicatorsNames(workspaces) {
+    for (const workspace of workspaces.workspaces) {
+      const workspaceIndicator = document.querySelector(
+        `#zen-current-workspace-indicator-container .zen-workspace-tabs-section[zen-workspace-id="${workspace.uuid}"]`
+      );
+      this.updateWorkspaceIndicator(workspace, workspaceIndicator);
+    }
+  }
+
+  async _animateTabs(newWorkspace, shouldAnimate) {
+    this._animatingChange = true;
+    const animations = [];
+    const workspaces = await this._workspaces();
+    const newWorkspaceIndex = workspaces.workspaces.findIndex((w) => w.uuid === newWorkspace.uuid);
+    for (const element of document.querySelectorAll('.zen-workspace-tabs-section')) {
+      const existingTransform = element.style.transform;
+      const elementWorkspaceId = element.getAttribute('zen-workspace-id');
+      const elementWorkspaceIndex = workspaces.workspaces.findIndex((w) => w.uuid === elementWorkspaceId);
+      const offset = -(newWorkspaceIndex - elementWorkspaceIndex) * 100;
+      const newTransform = `translateX(${offset}%)`;
+      if (shouldAnimate) {
+        animations.push(
+          gZenUIManager.motion.animate(
+            element,
+            {
+              transform: existingTransform ? [existingTransform, newTransform] : newTransform,
+              // -0 to convert to number
+              opacity: [!!offset - 0, !offset - 0],
+            },
+            {
+              type: 'spring',
+              bounce: 0,
+              duration: 0.3,
+            }
+          )
+        );
       }
-    );
+      if (offset === 0) {
+        element.setAttribute('active', 'true');
+      } else {
+        element.removeAttribute('active');
+      }
+    }
+    await Promise.all(animations);
+    this._animatingChange = false;
   }
 
   _processTabVisibility(workspaceUuid, containerId, workspaces) {
-    const visibleTabs = new Set();
-    const lastSelectedTab = this._lastSelectedWorkspaceTabs[workspaceUuid];
-
-    this.tabContainer.setAttribute('dont-animate-tabs', 'true');
     for (const tab of gBrowser.tabs) {
-      const tabWorkspaceId = tab.getAttribute('zen-workspace-id');
-      const isEssential = tab.getAttribute('zen-essential') === 'true';
-
-      // Always hide last selected tabs from other workspaces
-      if (lastSelectedTab === tab && tabWorkspaceId !== workspaceUuid && !isEssential) {
-        gBrowser.hideTab(tab, undefined, true);
-        continue;
-      }
-
-      if (this._shouldShowTab(tab, workspaceUuid, containerId, workspaces)) {
-        gBrowser.showTab(tab);
-        visibleTabs.add(tab);
-
-        // Assign workspace ID if needed
-        if (!tabWorkspaceId && !isEssential) {
-          tab.setAttribute('zen-workspace-id', workspaceUuid);
-        }
-      } else {
+      if (!this._shouldShowTab(tab, workspaceUuid, containerId, workspaces)) {
         gBrowser.hideTab(tab, undefined, true);
+      } else if (tab.hasAttribute('zen-essential')) {
+        gBrowser.showTab(tab, undefined, true);
       }
     }
-
-    return visibleTabs;
   }
 
   _shouldShowTab(tab, workspaceUuid, containerId, workspaces) {
@@ -1470,15 +1589,15 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     // For non-essential tabs (both normal and pinned)
     if (!tabWorkspaceId) {
       // Assign workspace ID to tabs without one
-      tab.setAttribute('zen-workspace-id', workspaceUuid);
+      this.moveTabToWorkspace(tab, workspaceUuid);
       return true;
     }
 
     // Show if tab belongs to current workspace
-    return tabWorkspaceId === workspaceUuid;
+    return true;
   }
 
-  async _handleTabSelection(window, onInit, visibleTabs, containerId, workspaces, previousWorkspaceId) {
+  async _handleTabSelection(window, onInit, containerId, workspaces, previousWorkspaceId) {
     const currentSelectedTab = gBrowser.selectedTab;
     const oldWorkspaceId = previousWorkspaceId;
     const lastSelectedTab = this._lastSelectedWorkspaceTabs[window.uuid];
@@ -1489,29 +1608,18 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     let tabToSelect = null;
-
-    // If current tab is visible in new workspace, keep it
-    if (this._shouldShowTab(currentSelectedTab, window.uuid, containerId, workspaces) && visibleTabs.has(currentSelectedTab)) {
-      tabToSelect = currentSelectedTab;
-    }
     // Try last selected tab if it is visible
-    else if (
-      lastSelectedTab &&
-      this._shouldShowTab(lastSelectedTab, window.uuid, containerId, workspaces) &&
-      visibleTabs.has(lastSelectedTab)
-    ) {
+    if (lastSelectedTab && this._shouldShowTab(lastSelectedTab, window.uuid, containerId, workspaces)) {
       tabToSelect = lastSelectedTab;
     }
     // Find first suitable tab
     else {
-      tabToSelect = Array.from(visibleTabs).find((tab) => !tab.pinned);
-      if (!tabToSelect && visibleTabs.length) {
-        tabToSelect = Array.from(visibleTabs)[visibleTabs.length - 1];
+      tabToSelect = gBrowser.visibleTabs.find((tab) => !tab.pinned);
+      if (!tabToSelect && gBrowser.visibleTabs.length) {
+        tabToSelect = gBrowser.visibleTabs[gBrowser.visibleTabs.length - 1];
       }
     }
 
-    const previousSelectedTab = gBrowser.selectedTab;
-
     // If we found a tab to select, select it
     if (tabToSelect) {
       gBrowser.selectedTab = tabToSelect;
@@ -1522,17 +1630,15 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       gBrowser.selectedTab = newTab;
       this._lastSelectedWorkspaceTabs[window.uuid] = newTab;
     }
-
-    // After selecting the new tab, hide the previous selected tab if it shouldn't be visible in the new workspace
-    if (!this._shouldShowTab(previousSelectedTab, window.uuid, containerId, workspaces)) {
-      gBrowser.hideTab(previousSelectedTab, undefined, true);
-    }
   }
 
   async _updateWorkspaceState(window, onInit) {
     // Update document state
     document.documentElement.setAttribute('zen-workspace-id', window.uuid);
 
+    // Recalculate new tab observers
+    gBrowser.tabContainer.observe(null, 'nsPref:changed', 'privacy.userContext.enabled');
+
     // Update workspace UI
     await this._updateWorkspacesChangeContextMenu();
     document.getElementById('tabbrowser-tabs')._positionPinnedTabs();
@@ -1546,6 +1652,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
     }
 
+    await this._animateTabs(window, !onInit && !this._animatingChange);
+
     // Reset bookmarks
     this._invalidateBookmarkContainers();
 
@@ -1563,22 +1671,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-  async updateWorkspaceIndicator() {
-    // Update current workspace indicator
-    const currentWorkspace = await this.getActiveWorkspace();
-    if (!currentWorkspace) return;
-    const indicatorName = document.getElementById('zen-current-workspace-indicator-name');
-    const indicatorIcon = document.getElementById('zen-current-workspace-indicator-icon');
-
-    if (this.workspaceHasIcon(currentWorkspace)) {
-      indicatorIcon.removeAttribute('no-icon');
-    } else {
-      indicatorIcon.setAttribute('no-icon', 'true');
-    }
-    indicatorIcon.textContent = this.getWorkspaceIcon(currentWorkspace);
-    indicatorName.textContent = currentWorkspace.name;
-  }
-
   async _updateWorkspacesChangeContextMenu() {
     const workspaces = await this._workspaces();
 
@@ -1612,6 +1704,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       theme: ZenThemePicker.getTheme([]),
     };
     this._prepareNewWorkspace(window);
+    const perifery = document.querySelector('#tabbrowser-arrowscrollbox-periphery[hidden]');
+    preifery?.removeAttribute('hidden');
+    this._createWorkspaceTabsSection(window, [], perifery);
+    preifery.setAttribute('hidden', 'true');
     return window;
   }
 
@@ -1622,9 +1718,23 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let workspaceData = this._createWorkspaceData(name, isDefault, icon);
     await this.saveWorkspace(workspaceData);
     await this.changeWorkspace(workspaceData);
+    this.registerPinnedResizeObserver();
     return workspaceData;
   }
 
+  onPinnedTabsResize(entries) {
+    if (!this.workspaceEnabled) {
+      return;
+    }
+    for (const entry of entries) {
+      const workspaceId = entry.target.getAttribute('zen-workspace-id');
+      const arrowScrollbox = document.querySelector(
+        `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${workspaceId}"]`
+      );
+      this._updateMarginTopPinnedTabs(arrowScrollbox, entry.target);
+    }
+  }
+
   async onTabBrowserInserted(event) {
     let tab = event.originalTarget;
     const isEssential = tab.getAttribute('zen-essential') === 'true';
@@ -1666,6 +1776,30 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
+  makeSurePinTabIsInCorrectPosition() {
+    const tabsInsidePinTab = Array.from(this.pinnedTabsContainer.parentElement.children).filter(
+      (child) => child.tagName === 'tab'
+    );
+    let changed = false;
+    for (const tab of tabsInsidePinTab) {
+      if (tab.getAttribute('zen-essential') === 'true') {
+        continue;
+      }
+      const workspaceId = tab.getAttribute('zen-workspace-id');
+      if (!workspaceId) {
+        continue;
+      }
+      const contaienr = document.querySelector(
+        `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${workspaceId}"]`
+      );
+      contaienr.insertBefore(tab, contaienr.firstChild);
+      changed = true;
+    }
+    if (changed) {
+      gBrowser.tabContainer._invalidateCachedTabs();
+    }
+  }
+
   // Context menu management
 
   _contextMenuId = null;
@@ -1801,7 +1935,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     document.getElementById('tabContextMenu').hidePopup();
     const previousWorkspaceID = document.documentElement.getAttribute('zen-workspace-id');
     for (let tab of tabs) {
-      tab.setAttribute('zen-workspace-id', workspaceID);
+      this.moveTabToWorkspace(tab, workspaceID);
       if (this._lastSelectedWorkspaceTabs[previousWorkspaceID] === tab) {
         // This tab is no longer the last selected tab in the previous workspace because it's being moved to
         // the current workspace
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 5d2f2730d..e5ba04639 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..f7c02c14498b4ec5fcf5521480c88abac25a2283 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6eeb57088 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -49,7 +49,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..f7c02c14498b4ec5fcf5521480c88aba
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
 -          this.verticalPinnedTabsContainer.appendChild(aTab)
-+          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab)
++          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.insertBefore(aTab, this.verticalPinnedTabsContainer.lastChild)
          );
        } else {
 -        this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index b0a668a3c..149134733 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ceab5c1dcf 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67709dae7d 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -101,6 +101,15 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        ) {
          delete draggedTab._dragData;
          return;
+@@ -1478,7 +1491,7 @@
+     }
+ 
+     get newTabButton() {
+-      return this.querySelector("#tabs-newtab-button");
++      return ZenWorkspaces.activeWorkspaceStrip.querySelector("#tabs-newtab-button");
+     }
+ 
+     get verticalMode() {
 @@ -1498,7 +1511,7 @@
        if (this.#allTabs) {
          return this.#allTabs;
@@ -110,7 +119,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        // remove arrowScrollbox periphery element
        children.pop();
  
-@@ -1512,14 +1525,24 @@
+@@ -1512,14 +1525,28 @@
        }
  
        this.#allTabs = [
@@ -126,6 +135,10 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
 +          // insert right after the parent tab
 +          this.#allTabs.splice(Math.min(i + 1, lastPinnedTabIdx), 0, glanceTab);
 +          i++;
++        } else if (this.#allTabs[i].classList.contains("vertical-pinned-tabs-container-separator")) {
++          // remove the separator from the list
++          this.#allTabs.splice(i, 1);
++          i--;
 +        }
 +      }
        return this.#allTabs;
@@ -137,16 +150,20 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        return children.filter(node => node.tagName == "tab-group");
      }
  
-@@ -1577,7 +1600,7 @@
-       let verticalPinnedTabsContainer = document.getElementById(
-         "vertical-pinned-tabs-container"
-       );
+@@ -1574,10 +1601,8 @@
+         return this.#focusableItems;
+       }
+ 
+-      let verticalPinnedTabsContainer = document.getElementById(
+-        "vertical-pinned-tabs-container"
+-      );
 -      let children = Array.from(this.arrowScrollbox.children);
++      let verticalPinnedTabsContainer = this.verticalPinnedTabsContainer;
 +      let children = Array.from(ZenWorkspaces.tabboxChildren);
  
        let focusableItems = [];
        for (let child of children) {
-@@ -1593,6 +1616,7 @@
+@@ -1593,6 +1618,7 @@
        }
  
        this.#focusableItems = [
@@ -154,7 +171,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1617,8 +1641,8 @@
+@@ -1617,8 +1643,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -165,7 +182,25 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        );
      }
  
-@@ -1816,7 +1840,7 @@
+@@ -1633,7 +1659,7 @@
+ 
+       if (node == null) {
+         // We have a container for non-tab elements at the end of the scrollbox.
+-        node = this.arrowScrollbox.lastChild;
++        node = ZenWorkspaces.activeWorkspaceStrip.lastChild;
+       }
+ 
+       node.before(tab);
+@@ -1733,7 +1759,7 @@
+           // There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
+           // for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
+           // Attach the long click popup to all of them.
+-          const newTab = document.getElementById("new-tab-button");
++          const newTab = ZenWorkspaces.activeWorkspaceStrip.querySelector("#tabs-newtab-button");
+           const newTab2 = this.newTabButton;
+           const newTabVertical = document.getElementById(
+             "vertical-tabs-newtab-button"
+@@ -1816,7 +1842,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -174,7 +209,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1856,7 @@
+@@ -1832,6 +1858,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -182,7 +217,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1843,7 +1868,7 @@
+@@ -1843,7 +1870,7 @@
          return;
        }
  
@@ -191,7 +226,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        if (!tabs.length) {
          return;
        }
-@@ -1879,7 +1904,7 @@
+@@ -1879,7 +1906,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -200,7 +235,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1919,7 @@
+@@ -1894,7 +1921,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -209,22 +244,40 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1965,11 +1990,11 @@
-       );
+@@ -1960,16 +1987,15 @@
+       // Move pinned tabs to another container when the tabstrip is toggled to vertical
+       // and when session restore code calls _positionPinnedTabs; update styling whenever
+       // the number of pinned tabs changes.
+-      let verticalTabsContainer = document.getElementById(
+-        "vertical-pinned-tabs-container"
+-      );
++      let verticalTabsContainer = this.verticalPinnedTabsContainer;
        let numPinned = gBrowser.pinnedTabCount;
  
 -      if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
 -        let tabs = this.visibleTabs;
-+      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length + document.getElementById("zen-essentials-container").children.length)) {
++      ZenWorkspaces.makeSurePinTabIsInCorrectPosition();
++      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length - 1 + document.getElementById("zen-essentials-container").children.length)) {
 +        let tabs = this.allTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
          for (let i = 0; i < numPinned; i++) {
            tabs[i].style.marginInlineStart = "";
 -          verticalTabsContainer.appendChild(tabs[i]);
-+          tabs[i].hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(tabs[i]) : verticalTabsContainer.appendChild(tabs[i]);
++          tabs[i].hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(tabs[i]) : verticalTabsContainer.insertBefore(tabs[i], verticalTabsContainer.lastChild);
          }
        }
  
-@@ -1992,8 +2017,8 @@
+@@ -1977,9 +2003,7 @@
+     }
+ 
+     _resetVerticalPinnedTabs() {
+-      let verticalTabsContainer = document.getElementById(
+-        "vertical-pinned-tabs-container"
+-      );
++      let verticalTabsContainer = this.verticalPinnedTabsContainer;
+ 
+       if (!verticalTabsContainer.children.length) {
+         return;
+@@ -1992,8 +2016,8 @@
      }
  
      _positionPinnedTabs() {
@@ -235,7 +288,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2099,7 @@
+@@ -2074,7 +2098,7 @@
          return;
        }
  
@@ -244,7 +297,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2282,9 @@
+@@ -2257,9 +2281,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -257,7 +310,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2527,9 @@
+@@ -2502,8 +2526,9 @@
        );
      }
  
@@ -269,7 +322,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
          return;
        }
  
-@@ -2668,9 +2694,9 @@
+@@ -2668,9 +2693,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -281,7 +334,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
        }
      }
  
-@@ -2754,7 +2780,7 @@
+@@ -2754,7 +2779,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -290,7 +343,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
          return;
        }
  
-@@ -2772,12 +2798,14 @@
+@@ -2772,12 +2797,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -306,7 +359,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
                selectedTab,
              ];
            })
-@@ -2794,8 +2822,11 @@
+@@ -2794,8 +2821,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -320,7 +373,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ef532d6b5d311cab5bc573c2d0aae6ce
              ) {
                return;
              }
-@@ -2803,21 +2834,29 @@
+@@ -2803,21 +2833,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index 93e6cab24..65ff40457 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..64487674de1afb711258a36757508cd9b741fcd9 100644
+index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..9e11e715ade485c33ba4c8f719b41002f3008dde 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -33,7 +33,7 @@
@@ -64,6 +64,15 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..64487674de1afb711258a36757508cd9
        direction: rtl;
        mask-image: linear-gradient(to right, transparent, black var(--tab-label-mask-size));
      }
+@@ -1135,7 +1133,7 @@
+   }
+ }
+ 
+-#tabbrowser-arrowscrollbox[orient="vertical"] > #tabbrowser-arrowscrollbox-periphery > #tabs-newtab-button,
++#tabbrowser-arrowscrollbox[orient="vertical"] #tabbrowser-arrowscrollbox-periphery > #tabs-newtab-button,
+ #vertical-tabs-newtab-button {
+   appearance: none;
+   min-height: var(--tab-min-height);
 @@ -1146,7 +1144,7 @@
    margin-inline: var(--tab-inner-inline-margin);
  
@@ -73,6 +82,15 @@ index 96f930638c04c7ddcc8dc1a7fe4dce8b12a325e6..64487674de1afb711258a36757508cd9
    }
  
    &:hover {
+@@ -1170,7 +1168,7 @@
+  * flex container. #tabs-newtab-button is a child of the arrowscrollbox where
+  * we don't want a gap (between tabs), so we have to add some margin.
+  */
+-#tabbrowser-arrowscrollbox[orient="vertical"] > #tabbrowser-arrowscrollbox-periphery > #tabs-newtab-button {
++#tabbrowser-arrowscrollbox[orient="vertical"] #tabbrowser-arrowscrollbox-periphery > #tabs-newtab-button {
+   margin-block: var(--tab-block-margin);
+ }
+ 
 @@ -1194,7 +1192,6 @@
  }
  
diff --git a/src/toolkit/content/widgets/arrowscrollbox-js.patch b/src/toolkit/content/widgets/arrowscrollbox-js.patch
index 28739a036..ebfbd2dec 100644
--- a/src/toolkit/content/widgets/arrowscrollbox-js.patch
+++ b/src/toolkit/content/widgets/arrowscrollbox-js.patch
@@ -1,25 +1,7 @@
 diff --git a/toolkit/content/widgets/arrowscrollbox.js b/toolkit/content/widgets/arrowscrollbox.js
-index 328c770d275ebbaada8a44438eaf738b1a62d985..070439e26bfe6a2299aa4b82ee4c434e143e1a20 100644
+index 328c770d275ebbaada8a44438eaf738b1a62d985..95460108c6356408170b8a4a40d55a8f0621756b 100644
 --- a/toolkit/content/widgets/arrowscrollbox.js
 +++ b/toolkit/content/widgets/arrowscrollbox.js
-@@ -15,7 +15,7 @@
-     static get inheritedAttributes() {
-       return {
-         "#scrollbutton-up": "disabled=scrolledtostart",
--        scrollbox: "orient,align,pack,dir,smoothscroll",
-+        scrollbox: "align,pack,dir,smoothscroll",
-         "#scrollbutton-down": "disabled=scrolledtoend",
-       };
-     }
-@@ -26,7 +26,7 @@
-       <html:link rel="stylesheet" href="chrome://global/skin/arrowscrollbox.css"/>
-       <toolbarbutton id="scrollbutton-up" part="scrollbutton-up" keyNav="false" data-l10n-id="overflow-scroll-button-backwards"/>
-       <spacer part="overflow-start-indicator"/>
--      <scrollbox part="scrollbox" flex="1">
-+      <scrollbox part="scrollbox" orient="horizontal" flex="1">
-         <html:slot/>
-       </scrollbox>
-       <spacer part="overflow-end-indicator"/>
 @@ -98,6 +98,7 @@
  
        let slot = this.shadowRoot.querySelector("slot");

From d35fcabf929c4ca2d1c3ccc2f1d16fe5fd328ed2 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 11 Feb 2025 22:06:13 +0100
Subject: [PATCH 119/191] Refactor workspace tab animations and improve
 workspace strip organization

---
 .../base/zen-components/ZenWorkspaces.mjs     | 48 +++++++------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 8198ff3a1..5047afae7 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -370,9 +370,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const stripWidth = document.getElementById('tabbrowser-tabs').scrollWidth;
     const translateX = Math.max(-stripWidth, Math.min(delta, stripWidth));
 
-    for (const element of this._animateTabsElements) {
-      element.style.transform = `translateX(${translateX}px)`;
-    }
+    const currentWorkspace = this.activeWorkspace;
+    this._organizeWorkspaceStripLocations({ uuid: currentWorkspace }, true, translateX);
   }
 
   async _handleSwipeEnd(event) {
@@ -1409,21 +1408,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   _cancelSwipeAnimation() {
-    const existingTransform = this._animateTabsElements[0].style.transform;
-    const newTransform = 'translateX(0)';
-    for (const element of this._animateTabsElements) {
-      gZenUIManager.motion.animate(
-        element,
-        {
-          transform: existingTransform ? [existingTransform, newTransform] : newTransform,
-        },
-        {
-          type: 'spring',
-          bounce: 0,
-          duration: 0.12,
-        }
-      );
-    }
+    const currentWorkspace = this.activeWorkspace;
+    this._animateTabs({ uuid: currentWorkspace }, true);
   }
 
   async _performWorkspaceChange(window, { onInit = false, alwaysChange = false, explicitAnimationDirection = undefined } = {}) {
@@ -1457,34 +1443,32 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     await this._updateWorkspaceState(window, onInit);
   }
 
-  get _animateTabsElements() {
-    const selector = `#zen-browser-tabs-wrapper`;
-    const extraSelector = `.zen-current-workspace-indicator`;
-    return [...this.tabContainer.querySelectorAll(selector), ...this.tabContainer.querySelectorAll(extraSelector)];
-  }
-
   _updateMarginTopPinnedTabs(arrowscrollbox, pinnedContainer) {
     if (arrowscrollbox) {
       arrowscrollbox.style.marginTop = pinnedContainer.getBoundingClientRect().height + 'px';
     }
   }
 
-  async _organizeWorkspaceStripLocations(workspace) {
+  async _organizeWorkspaceStripLocations(workspace, justMove = false, offsetPixels = 0) {
     const workspaces = await this._workspaces();
     let workspaceIndex = workspaces.workspaces.findIndex((w) => w.uuid === workspace.uuid);
-    this._fixIndicatorsNames(workspaces);
+    if (!justMove) {
+      this._fixIndicatorsNames(workspaces);
+    }
     for (const otherWorkspace of workspaces.workspaces) {
       const selector = `.zen-workspace-tabs-section[zen-workspace-id="${otherWorkspace.uuid}"]`;
       const newTransform = -(workspaceIndex - workspaces.workspaces.indexOf(otherWorkspace)) * 100;
       for (const container of document.querySelectorAll(selector)) {
-        container.style.transform = `translateX(${newTransform}%)`;
+        container.style.transform = `translateX(calc(${newTransform}% + ${offsetPixels}px))`;
         container.style.opacity = !newTransform;
       }
-      const pinnedContainerId = '#vertical-pinned-tabs-container ';
-      const arrowScrollboxId = '#tabbrowser-arrowscrollbox ';
-      const pinnedContainer = document.querySelector(pinnedContainerId + selector);
-      const arrowScrollbox = document.querySelector(arrowScrollboxId + selector);
-      this._updateMarginTopPinnedTabs(arrowScrollbox, pinnedContainer);
+      if (!justMove) {
+        const pinnedContainerId = '#vertical-pinned-tabs-container ';
+        const arrowScrollboxId = '#tabbrowser-arrowscrollbox ';
+        const pinnedContainer = document.querySelector(pinnedContainerId + selector);
+        const arrowScrollbox = document.querySelector(arrowScrollboxId + selector);
+        this._updateMarginTopPinnedTabs(arrowScrollbox, pinnedContainer);
+      }
     }
   }
 

From c4b4aa6287a7c669bbb5788ba3a3bc4fcb7d5067 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 11 Feb 2025 23:27:43 +0100
Subject: [PATCH 120/191] Fixed switching workspaces with

---
 .../base/zen-components/ZenWorkspaces.mjs     | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 5047afae7..117a3dd15 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -384,7 +384,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let rawDirection = moveForward ? 1 : -1;
     if (this._swipeState.direction) {
       let direction = this.naturalScroll ? -1 : 1;
-      this.changeWorkspaceShortcut(rawDirection * direction);
+      this.changeWorkspaceShortcut(rawDirection * direction, true);
     } else {
       this._cancelSwipeAnimation();
     }
@@ -1412,7 +1412,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._animateTabs({ uuid: currentWorkspace }, true);
   }
 
-  async _performWorkspaceChange(window, { onInit = false, alwaysChange = false, explicitAnimationDirection = undefined } = {}) {
+  async _performWorkspaceChange(window, { onInit = false, alwaysChange = false, whileScrolling = false } = {}) {
     const previousWorkspace = await this.getActiveWorkspace();
     alwaysChange = alwaysChange || onInit;
 
@@ -1429,7 +1429,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     gBrowser.verticalPinnedTabsContainer = this.pinnedTabsContainer;
     gBrowser.tabContainer.verticalPinnedTabsContainer = this.pinnedTabsContainer;
     this.tabContainer._invalidateCachedTabs();
-    await this._organizeWorkspaceStripLocations(previousWorkspace);
+    if (!whileScrolling) {
+      await this._organizeWorkspaceStripLocations(previousWorkspace);
+    }
 
     // First pass: Handle tab visibility and workspace ID assignment
     this._processTabVisibility(window.uuid, containerId, workspaces);
@@ -1459,8 +1461,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const selector = `.zen-workspace-tabs-section[zen-workspace-id="${otherWorkspace.uuid}"]`;
       const newTransform = -(workspaceIndex - workspaces.workspaces.indexOf(otherWorkspace)) * 100;
       for (const container of document.querySelectorAll(selector)) {
-        container.style.transform = `translateX(calc(${newTransform}% + ${offsetPixels}px))`;
-        container.style.opacity = !newTransform;
+        container.style.transform = `translateX(${newTransform + offsetPixels / 2}%)`;
+        container.style.opacity = offsetPixels ? 1 : !newTransform;
       }
       if (!justMove) {
         const pinnedContainerId = '#vertical-pinned-tabs-container ';
@@ -1508,14 +1510,18 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const elementWorkspaceIndex = workspaces.workspaces.findIndex((w) => w.uuid === elementWorkspaceId);
       const offset = -(newWorkspaceIndex - elementWorkspaceIndex) * 100;
       const newTransform = `translateX(${offset}%)`;
+      const isCurrent = offset === 0;
       if (shouldAnimate) {
+        if (isCurrent) {
+          element.style.opacity = 1;
+        }
         animations.push(
           gZenUIManager.motion.animate(
             element,
             {
               transform: existingTransform ? [existingTransform, newTransform] : newTransform,
               // -0 to convert to number
-              opacity: [!!offset - 0, !offset - 0],
+              opacity: !isCurrent ? [!!offset - 0, !offset - 0] : [1, 1],
             },
             {
               type: 'spring',
@@ -1532,6 +1538,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
     }
     await Promise.all(animations);
+    if (this._beforeSelectedTab) {
+      this._beforeSelectedTab._visuallySelected = false;
+      this._beforeSelectedTab = null;
+    }
     this._animatingChange = false;
   }
 
@@ -1614,6 +1624,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       gBrowser.selectedTab = newTab;
       this._lastSelectedWorkspaceTabs[window.uuid] = newTab;
     }
+    // Always make sure we always unselect the tab from the old workspace
+    currentSelectedTab._selected = false;
+    currentSelectedTab._visuallySelected = true; // we do want to animate the tab deselection
+    this._beforeSelectedTab = currentSelectedTab;
   }
 
   async _updateWorkspaceState(window, onInit) {
@@ -1880,7 +1894,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._emojis = null;
   }
 
-  async changeWorkspaceShortcut(offset = 1) {
+  async changeWorkspaceShortcut(offset = 1, whileScrolling = false) {
     // Cycle through workspaces
     let workspaces = await this._workspaces();
     let activeWorkspace = await this.getActiveWorkspace();
@@ -1897,7 +1911,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     let nextWorkspace = workspaces.workspaces[targetIndex];
-    await this.changeWorkspace(nextWorkspace, { explicitAnimationDirection: offset > 0 ? 'right' : 'left' });
+    await this.changeWorkspace(nextWorkspace, { whileScrolling });
   }
 
   _initializeWorkspaceTabContextMenus() {

From 22cad83c8fc08c565734e9cd0af8d1c9fce0ea06 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 10:58:53 +0100
Subject: [PATCH 121/191] Fixed creating a new workspace in the new system

---
 src/browser/base/content/zen-styles/zen-workspaces.css | 2 +-
 src/browser/base/zen-components/ZenWorkspaces.mjs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 9fbe38108..32f2a7c9a 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -456,7 +456,7 @@
   position: absolute;
   max-height: var(--zen-workspace-indicator-height);
   min-height: var(--zen-workspace-indicator-height);
-  gap: 5px;
+  gap: 12px;
   overflow: hidden;
   text-overflow: ellipsis;
   flex-direction: row !important;
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 117a3dd15..636ab27d8 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1703,9 +1703,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     };
     this._prepareNewWorkspace(window);
     const perifery = document.querySelector('#tabbrowser-arrowscrollbox-periphery[hidden]');
-    preifery?.removeAttribute('hidden');
+    perifery?.removeAttribute('hidden');
     this._createWorkspaceTabsSection(window, [], perifery);
-    preifery.setAttribute('hidden', 'true');
+    perifery.setAttribute('hidden', 'true');
     return window;
   }
 

From 40a843200f3abba7aeb94d95c08db014542cb855 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 12:39:13 +0100
Subject: [PATCH 122/191] Fixed unpinning tabs

---
 .../content/zen-styles/zen-tabs/vertical-tabs.css     |  2 +-
 src/browser/base/zen-components/ZenWorkspaces.mjs     | 11 ++++++-----
 .../components/tabbrowser/content/tabbrowser-js.patch | 10 +++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index b18d303c6..56415a234 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -369,7 +369,7 @@
 #zen-browser-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
-  overflow-x: hidden;
+  overflow-x: clip;
   height: 100%;
   scrollbar-width: thin;
 }
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 636ab27d8..50a830328 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -359,7 +359,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     event.preventDefault();
     event.stopPropagation();
 
-    const delta = event.delta * 500;
+    const delta = event.delta * 300;
     this._swipeState.lastDelta = delta;
 
     if (Math.abs(delta) > 1) {
@@ -1625,9 +1625,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       this._lastSelectedWorkspaceTabs[window.uuid] = newTab;
     }
     // Always make sure we always unselect the tab from the old workspace
-    currentSelectedTab._selected = false;
-    currentSelectedTab._visuallySelected = true; // we do want to animate the tab deselection
-    this._beforeSelectedTab = currentSelectedTab;
+    if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
+      currentSelectedTab._selected = false;
+      currentSelectedTab._visuallySelected = true; // we do want to animate the tab deselection
+      this._beforeSelectedTab = currentSelectedTab;
+    }
   }
 
   async _updateWorkspaceState(window, onInit) {
@@ -1639,7 +1641,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     // Update workspace UI
     await this._updateWorkspacesChangeContextMenu();
-    document.getElementById('tabbrowser-tabs')._positionPinnedTabs();
     gZenUIManager.updateTabsToolbar();
     await this._propagateWorkspaceData({ clearCache: false });
 
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index e5ba04639..1e2d0b8fc 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6eeb57088 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cbeb4472fdc7dc12c2a45a0c578d166c1cac1b6b 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -57,8 +57,12 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6
        }
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -831,7 +859,7 @@
-           this.tabContainer.arrowScrollbox.prepend(aTab);
+@@ -828,10 +856,10 @@
+           // the moving of a tab from the vertical pinned tabs container
+           // and back into arrowscrollbox.
+           aTab.removeAttribute("pinned");
+-          this.tabContainer.arrowScrollbox.prepend(aTab);
++          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
          });
        } else {
 -        this.moveTabTo(aTab, this.pinnedTabCount - 1, {

From bd4f9788ccb851cd4300ea5c188f0981f1e06cbb Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 13:16:20 +0100
Subject: [PATCH 123/191] Fixed urlbar glitching when focusing in compact mode

---
 src/browser/components/urlbar/UrlbarInput-sys-mjs.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index f395eaa62..3871b2fe8 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..ea9207399b205c84d1263a4de8a63b776e36eabd 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..f8587b68ac057bb0f829fc21f08ade6605b14c92 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -20,7 +20,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..ea9207399b205c84d1263a4de8a63b77
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
-+    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", true);
++    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", !this.document.getElementById("navigator-toolbox").hasAttribute("zen-has-hover"));
      this.inputField.select();
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
@@ -44,7 +44,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..ea9207399b205c84d1263a4de8a63b77
        }
      }
 -
-+    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", true);
++    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", !this.document.getElementById("navigator-toolbox").hasAttribute("zen-has-hover"));
      this.handleNavigation({ event });
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");

From 23d9487ca7957b5608682ccd54722eee1baa14ac Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 15:35:37 +0100
Subject: [PATCH 124/191] Fixed pinned tabs separator using the wrong tabs when
 hiding

---
 .../zen-styles/zen-tabs/vertical-tabs.css        |  3 +--
 .../base/zen-components/ZenWorkspaces.mjs        | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 56415a234..2c530b8df 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -126,8 +126,7 @@
   width: 98%;
   transition: margin 0.2s ease-in-out, background 0.2s ease-in-out, max-height 0.2s ease-in-out;
 
-  #vertical-pinned-tabs-container .zen-workspace-tabs-section[active]:not(:has(tab:not([hidden]))) &,
-  #tabbrowser-tabs:not(:has(#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[active] tab:not([hidden]))) & {
+  #vertical-pinned-tabs-container .zen-workspace-tabs-section[hide-separator] & {
     max-height: 0;
     margin: 0 auto;
   }
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 50a830328..4535abca0 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -509,6 +509,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       this._initializeWorkspaceTabContextMenus();
       await this.workspaceBookmarks();
       window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
+      window.addEventListener('TabOpen', this.updateTabsContainers.bind(this));
+      window.addEventListener('TabClose', this.updateTabsContainers.bind(this));
       let workspaces = await this._workspaces();
       let activeWorkspace = null;
       if (workspaces.workspaces.length === 0) {
@@ -1721,6 +1723,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     return workspaceData;
   }
 
+  updateTabsContainers() {
+    this.onPinnedTabsResize([this.pinnedTabsContainer]);
+  }
+
+  updateShouldHideSeparator(arrowScrollbox, pinnedContainer) {
+    const shouldHideSeparator = pinnedContainer.children.length === 1 || arrowScrollbox.children.length === 1;
+    if (shouldHideSeparator) {
+      pinnedContainer.setAttribute('hide-separator', 'true');
+    } else {
+      pinnedContainer.removeAttribute('hide-separator');
+    }
+  }
+
   onPinnedTabsResize(entries) {
     if (!this.workspaceEnabled) {
       return;
@@ -1731,6 +1746,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${workspaceId}"]`
       );
       this._updateMarginTopPinnedTabs(arrowScrollbox, entry.target);
+      this.updateShouldHideSeparator(arrowScrollbox, entry.target);
     }
   }
 

From aebc2c9660957926eba04cb654ca1eac835ac8c8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 15:36:59 +0100
Subject: [PATCH 125/191] Fixed handling tab opens/close on workspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 4535abca0..803854dd5 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1724,7 +1724,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   updateTabsContainers() {
-    this.onPinnedTabsResize([this.pinnedTabsContainer]);
+    this.onPinnedTabsResize([{ target: this.pinnedTabsContainer }]);
   }
 
   updateShouldHideSeparator(arrowScrollbox, pinnedContainer) {

From 9f6fbc5e57616d8a0daf9bafc304a0b8f9957047 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 12 Feb 2025 20:03:00 +0100
Subject: [PATCH 126/191] Refactor tab handling and session restore logic for
 improved workspace management

---
 .../zen-styles/zen-tabs/vertical-tabs.css     |  4 +-
 .../base/zen-components/ZenWorkspaces.mjs     | 41 ++++++++++++++++++-
 .../sessionstore/SessionStore-sys-mjs.patch   | 13 +++++-
 .../tabbrowser/content/tabbrowser-js.patch    | 10 ++---
 .../tabbrowser/content/tabs-js.patch          | 37 +++++++++--------
 surfer.json                                   |  2 +-
 6 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 2c530b8df..68c7d8624 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -371,6 +371,7 @@
   overflow-x: clip;
   height: 100%;
   scrollbar-width: thin;
+  position: relative;
 }
 
 #vertical-pinned-tabs-container {
@@ -378,7 +379,8 @@
   display: flex !important;
   flex-direction: column;
   min-height: fit-content !important;
-  overflow: visible;
+  overflow-x: clip;
+  overflow-y: visible;
   max-height: unset !important;
 
   & .tabbrowser-tab:not(:hover) .tab-background:not([selected]):not([multiselected]) {
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 803854dd5..9ecf698ed 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1308,7 +1308,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     tab.setAttribute('zen-workspace-id', workspaceID);
     const parent = tab.pinned ? '#zen-browser-tabs-pinned ' : '#zen-browser-tabs ';
-    const container = document.querySelector(parent + '.zen-browser-tabs-container');
+    const container = document.querySelector(parent + '.zen-workspace-tabs-section');
     if (container) {
       container.insertBefore(tab, container.firstChild);
     }
@@ -2043,4 +2043,43 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     // Return true only if the bookmark is in another workspace and not in the active one
     return isInOtherWorkspace && !isInActiveWorkspace;
   }
+
+  // Session restore functions
+  get allStoredTabs() {
+    if (!this._hasInitializedTabsStrip) {
+      const children = Array.from(this.tabboxChildren);
+      children.pop(); // Remove the last child which is the new tab button
+      return children;
+    }
+
+    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');
+    const containers = [essentialsContainer, ...pinnedContainers, ...normalContainers];
+    for (const container of containers) {
+      for (const tab of container.children) {
+        if (tab.tagName === 'tab' || tab.tagName == 'tab-group') {
+          tabs.push(tab);
+        }
+      }
+    }
+    return tabs;
+  }
+
+  get pinnedTabCount() {
+    return this.pinnedTabsContainer.children.length - 1;
+  }
+
+  get normalTabCount() {
+    return this.tabboxChildren.length - 1;
+  }
+
+  get allWorkspaceTabs() {
+    const currentWorkspace = this.activeWorkspace;
+    return this.allStoredTabs.filter(
+      (tab) => tab.hasAttribute('zen-essential') || tab.getAttribute('zen-workspace-id') === currentWorkspace
+    );
+  }
 })();
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 85c7071f7..2c7b2688f 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 8125c1afc07f3365a2ad030adaf6a560453d7fe6..2856c5f93bfc9d68b98e09b2f26e3d5266c1f46a 100644
+index 908743177d9f95e2e6549c689e7a493ca8668701..b452d7dfc93f6171f8a65668e052a37638f1f6c3 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -3679,6 +3679,7 @@ var SessionStoreInternal = {
+@@ -3848,6 +3848,7 @@ var SessionStoreInternal = {
          aWindow.gBrowser.selectedTab = newTab;
        }
  
@@ -10,3 +10,12 @@ index 8125c1afc07f3365a2ad030adaf6a560453d7fe6..2856c5f93bfc9d68b98e09b2f26e3d52
        // Restore the state into the new tab.
        this.restoreTab(newTab, tabState, {
          restoreImmediately: aRestoreImmediately,
+@@ -5315,7 +5316,7 @@ var SessionStoreInternal = {
+     }
+ 
+     let tabbrowser = aWindow.gBrowser;
+-    let tabs = tabbrowser.tabs;
++    let tabs = aWindow.ZenWorkspaces.allStoredTabs;
+     /** @type {WindowStateData} */
+     let winData = this._windows[aWindow.__SSi];
+     let tabsData = (winData.tabs = []);
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 1e2d0b8fc..e5ba04639 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cbeb4472fdc7dc12c2a45a0c578d166c1cac1b6b 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6eeb57088 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -57,12 +57,8 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cbeb4472fdc7dc12c2a45a0c578d166c
        }
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -828,10 +856,10 @@
-           // the moving of a tab from the vertical pinned tabs container
-           // and back into arrowscrollbox.
-           aTab.removeAttribute("pinned");
--          this.tabContainer.arrowScrollbox.prepend(aTab);
-+          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
+@@ -831,7 +859,7 @@
+           this.tabContainer.arrowScrollbox.prepend(aTab);
          });
        } else {
 -        this.moveTabTo(aTab, this.pinnedTabCount - 1, {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 149134733..dfafb0b6c 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67709dae7d 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b20e112db 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -209,7 +209,12 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1858,7 @@
+@@ -1828,10 +1854,12 @@
+ 
+     _handleTabSelect(aInstant) {
+       let selectedTab = this.selectedItem;
++      if (!selectedTab) return;
+       if (this.overflowing) {
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -217,7 +222,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1843,7 +1870,7 @@
+@@ -1843,7 +1871,7 @@
          return;
        }
  
@@ -226,7 +231,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        if (!tabs.length) {
          return;
        }
-@@ -1879,7 +1906,7 @@
+@@ -1879,7 +1907,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -235,7 +240,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1921,7 @@
+@@ -1894,7 +1922,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -244,7 +249,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1960,16 +1987,15 @@
+@@ -1960,16 +1988,15 @@
        // Move pinned tabs to another container when the tabstrip is toggled to vertical
        // and when session restore code calls _positionPinnedTabs; update styling whenever
        // the number of pinned tabs changes.
@@ -266,7 +271,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          }
        }
  
-@@ -1977,9 +2003,7 @@
+@@ -1977,9 +2004,7 @@
      }
  
      _resetVerticalPinnedTabs() {
@@ -277,7 +282,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
  
        if (!verticalTabsContainer.children.length) {
          return;
-@@ -1992,8 +2016,8 @@
+@@ -1992,8 +2017,8 @@
      }
  
      _positionPinnedTabs() {
@@ -288,7 +293,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2098,7 @@
+@@ -2074,7 +2099,7 @@
          return;
        }
  
@@ -297,7 +302,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2281,9 @@
+@@ -2257,9 +2282,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -310,7 +315,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2526,9 @@
+@@ -2502,8 +2527,9 @@
        );
      }
  
@@ -322,7 +327,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          return;
        }
  
-@@ -2668,9 +2693,9 @@
+@@ -2668,9 +2694,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -334,7 +339,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        }
      }
  
-@@ -2754,7 +2779,7 @@
+@@ -2754,7 +2780,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -343,7 +348,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          return;
        }
  
-@@ -2772,12 +2797,14 @@
+@@ -2772,12 +2798,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -359,7 +364,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
                selectedTab,
              ];
            })
-@@ -2794,8 +2821,11 @@
+@@ -2794,8 +2822,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -373,7 +378,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
              ) {
                return;
              }
-@@ -2803,21 +2833,29 @@
+@@ -2803,21 +2834,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (
diff --git a/surfer.json b/surfer.json
index 96ac3b992..8b97e5388 100644
--- a/surfer.json
+++ b/surfer.json
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file

From d16992f5b21ea5e3bb2aff560a0eda5a541ef606 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 12 Feb 2025 20:05:56 +0100
Subject: [PATCH 127/191] Force overflow-x clipping in vertical tabs to ensure
 consistent styling

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

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 68c7d8624..a5ca41b3f 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -368,7 +368,7 @@
 #zen-browser-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
-  overflow-x: clip;
+  overflow-x: clip !important; /* might break custom css with new design, so let's force it */
   height: 100%;
   scrollbar-width: thin;
   position: relative;

From 8b98469936ff756cb4c53a22dfb3382555aa1a5d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 12 Feb 2025 21:38:05 +0100
Subject: [PATCH 128/191] Added support for acrylic backgrounds for windows 11
 with mica support

---
 .../libpref/init/StaticPrefList-yaml.patch    | 13 +++++++++---
 src/widget/windows/nsWindow-cpp.patch         | 21 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 src/widget/windows/nsWindow-cpp.patch

diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index 6d3166133..fadcff2b1 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 5c5992d7b32e4c16d6a92815ca6fd54e8fcec824..6c8e67e36f02b578c800fa460868135afb73c66b 100644
+index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e770a24ec7 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -17810,7 +17810,7 @@
+@@ -18067,7 +18067,7 @@
  # Whether we use the mica backdrop. Off by default for now.
  - name: widget.windows.mica
    type: bool
@@ -11,7 +11,7 @@ index 5c5992d7b32e4c16d6a92815ca6fd54e8fcec824..6c8e67e36f02b578c800fa460868135a
    mirror: once
  #endif
  
-@@ -17923,6 +17923,19 @@
+@@ -18180,6 +18180,26 @@
    mirror: always
  #endif
  
@@ -27,6 +27,13 @@ index 5c5992d7b32e4c16d6a92815ca6fd54e8fcec824..6c8e67e36f02b578c800fa460868135a
 +  value: false
 +  mirror: always
 +#endif
++
++#ifdef XP_WIN
++- name: zen.widget.windows.acrylic
++  type: bool
++  value: true
++  mirror: once
++#endif
 +
  #---------------------------------------------------------------------------
  # Prefs starting with "zoom."
diff --git a/src/widget/windows/nsWindow-cpp.patch b/src/widget/windows/nsWindow-cpp.patch
new file mode 100644
index 000000000..99fe82efa
--- /dev/null
+++ b/src/widget/windows/nsWindow-cpp.patch
@@ -0,0 +1,21 @@
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index b735e78b1c2f3e0d85a5224311cdc746007c7eac..50f3c6e40b11220b71a8a3811305661887bb4360 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -165,6 +165,7 @@
+ #include "mozilla/StaticPrefs_layout.h"
+ #include "mozilla/StaticPrefs_ui.h"
+ #include "mozilla/StaticPrefs_widget.h"
++#include "mozilla/StaticPrefs_zen.h"
+ #include "nsNativeAppSupportWin.h"
+ 
+ #include "nsIGfxInfo.h"
+@@ -1071,7 +1072,7 @@ nsresult nsWindow::Create(nsIWidget* aParent, const LayoutDeviceIntRect& aRect,
+ 
+   if (WinUtils::MicaEnabled() && !IsPopup()) {
+     // Enable Mica Alt Material if available.
+-    const DWM_SYSTEMBACKDROP_TYPE tabbedWindow = DWMSBT_TABBEDWINDOW;
++    const DWM_SYSTEMBACKDROP_TYPE tabbedWindow = StaticPrefs::zen_widget_windows_acrylic_AtStartup() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW;
+     DwmSetWindowAttribute(mWnd, DWMWA_SYSTEMBACKDROP_TYPE, &tabbedWindow,
+                           sizeof tabbedWindow);
+   }

From 539535e66ff6058b8c25a569026d443f891ef4fe Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 13 Feb 2025 08:32:13 +0800
Subject: [PATCH 129/191] Deactivated listener in collapsed sidebar mode,
 refactored code

---
 src/browser/base/content/ZenUIManager.mjs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 93d919e99..2bb409f25 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -246,7 +246,6 @@ var gZenVerticalTabsManager = {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
 
-    this._tabEdited = null;
     this._renameTabHalt = this.renameTabHalt.bind(this);
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
@@ -619,7 +618,7 @@ var gZenVerticalTabsManager = {
 
       // Check if name is blank, reset if so
       if (newName) {
-        this._tabEdited.label = newName;
+        gBrowser._setTabLabel(this._tabEdited, newName);
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
         this._tabEdited.removeAttribute('zen-has-static-label');
@@ -631,11 +630,7 @@ var gZenVerticalTabsManager = {
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
-      let label = this._tabEdited.querySelector('.tab-label-container-editing');
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-
-      label.classList.remove('tab-label-container-editing');
-      this._tabEdited = null;
+      event.target.blur();
     }
   },
 
@@ -643,7 +638,8 @@ var gZenVerticalTabsManager = {
     if (
       this._tabEdited ||
       !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
-      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick')
+      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick') ||
+      !gZenVerticalTabsManager._prefsSidebarExpanded
     )
       return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');

From 4f41aab3fabebce9b90eab7f8adf411da788b280 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Feb 2025 11:00:56 +0100
Subject: [PATCH 130/191] merge

---
 .../base/zen-components/ZenWorkspaces.mjs     | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 803854dd5..2fa911df9 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1440,11 +1440,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     // Second pass: Handle tab selection
     this.tabContainer._invalidateCachedTabs();
-    await this._handleTabSelection(window, onInit, containerId, workspaces, previousWorkspace.uuid);
-    this.tabContainer._updateVerticalPinnedTabs();
+    const tabToSelect = await this._handleTabSelection(window, onInit, containerId, workspaces, previousWorkspace.uuid);
 
     // Update UI and state
-    await this._updateWorkspaceState(window, onInit);
+    await this._updateWorkspaceState(window, onInit, tabToSelect);
   }
 
   _updateMarginTopPinnedTabs(arrowscrollbox, pinnedContainer) {
@@ -1540,10 +1539,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
     }
     await Promise.all(animations);
-    if (this._beforeSelectedTab) {
-      this._beforeSelectedTab._visuallySelected = false;
-      this._beforeSelectedTab = null;
-    }
     this._animatingChange = false;
   }
 
@@ -1617,21 +1612,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     // If we found a tab to select, select it
-    if (tabToSelect) {
-      gBrowser.selectedTab = tabToSelect;
-      this._lastSelectedWorkspaceTabs[window.uuid] = tabToSelect;
-    } else if (!onInit) {
+    if (!onInit && !tabToSelect) {
       // Create new tab if needed and no suitable tab was found
       const newTab = this._createNewTabForWorkspace(window);
-      gBrowser.selectedTab = newTab;
-      this._lastSelectedWorkspaceTabs[window.uuid] = newTab;
+      tabToSelect = newTab;
     }
+    tabToSelect._visuallySelected = true;
+    this._lastSelectedWorkspaceTabs[window.uuid] = tabToSelect;
+
     // Always make sure we always unselect the tab from the old workspace
     if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
       currentSelectedTab._selected = false;
-      currentSelectedTab._visuallySelected = true; // we do want to animate the tab deselection
-      this._beforeSelectedTab = currentSelectedTab;
     }
+    return tabToSelect;
   }
 
   async _updateWorkspaceState(window, onInit) {
@@ -1659,7 +1652,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._invalidateBookmarkContainers();
 
     // Update workspace indicator
-    await this.updateWorkspaceIndicator();
+    await this.updateWorkspaceIndicator(window, this.workspaceIndicator);
   }
 
   _invalidateBookmarkContainers() {

From ab836eb762606f1aba1df2ee0676c06f953f239d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Feb 2025 11:16:16 +0100
Subject: [PATCH 131/191] Fixed workspace switching

---
 src/browser/base/zen-components/ZenGradientGenerator.mjs | 1 -
 src/browser/base/zen-components/ZenWorkspaces.mjs        | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index 125c45da7..963f87f76 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -37,7 +37,6 @@
       this.initCanvas();
       this.initCustomColorInput();
 
-      ZenWorkspaces.addChangeListeners(this.onWorkspaceChange.bind(this));
       window.matchMedia('(prefers-color-scheme: dark)').addListener(this.onDarkModeChange.bind(this));
     }
 
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 9aeeeabb7..421f46a8a 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1627,7 +1627,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     return tabToSelect;
   }
 
-  async _updateWorkspaceState(window, onInit) {
+  async _updateWorkspaceState(window, onInit, tabToSelect) {
     // Update document state
     document.documentElement.setAttribute('zen-workspace-id', window.uuid);
 
@@ -1639,6 +1639,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     gZenUIManager.updateTabsToolbar();
     await this._propagateWorkspaceData({ clearCache: false });
 
+    gZenThemePicker.onWorkspaceChange(window);
+
+    await this._animateTabs(window, !onInit && !this._animatingChange);
+    gBrowser.selectedTab = tabToSelect;
+
     // Notify listeners
     if (this._changeListeners?.length) {
       for (const listener of this._changeListeners) {
@@ -1646,8 +1651,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
     }
 
-    await this._animateTabs(window, !onInit && !this._animatingChange);
-
     // Reset bookmarks
     this._invalidateBookmarkContainers();
 

From 5f7283531f6f46903e154ac8baf5d57964dbc70c Mon Sep 17 00:00:00 2001
From: Jupi <73097618+JSGRD22@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:24:55 +0800
Subject: [PATCH 132/191] Set gfx.canvas.accelerated.cache-size to 256 by
 default

Signed-off-by: Jupi <73097618+JSGRD22@users.noreply.github.com>
---
 src/browser/app/profile/zen-browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index a61533e60..c13375eb1 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -425,7 +425,7 @@ pref("browser.aboutwelcome.enabled", false);
 
 // ---- Experimental settings to try make zen faster
 pref("gfx.canvas.accelerated.cache-items", 32768);
-pref("gfx.canvas.accelerated.cache-size", 4096);
+pref("gfx.canvas.accelerated.cache-size", 256);
 pref("gfx.content.skia-font-cache-size", 80);
 
 pref("media.memory_cache_max_size", 1048576);

From d6acd4deb8a0b62ced98d6522b4c6b428ca9f19a Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Feb 2025 16:29:34 +0100
Subject: [PATCH 133/191] Fixed switching workspaces

---
 src/browser/base/content/ZenUIManager.mjs        |  2 +-
 .../base/content/zen-styles/zen-workspaces.css   |  1 +
 .../base/zen-components/ZenWorkspaces.mjs        | 13 +++++++++----
 .../tabbrowser/content/tabbrowser-js.patch       | 16 +++++++++++-----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index ca3354728..ca1aaecd3 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -414,7 +414,7 @@ var gZenVerticalTabsManager = {
       gBrowser.tabContainer.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       gBrowser.tabContainer.arrowScrollbox.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       // on purpose, we set the orient to horizontal, because the arrowScrollbox is vertical
-      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute('orient', isVerticalTabs ? 'horizontal' : 'vertical');
+      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute('orient', (isVerticalTabs && ZenWorkspaces.workspaceEnabled) ? 'horizontal' : 'vertical');
 
       const buttonsTarget = document.getElementById('zen-sidebar-top-buttons-customization-target');
       if (isRightSide) {
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 32f2a7c9a..288032e8b 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -457,6 +457,7 @@
   max-height: var(--zen-workspace-indicator-height);
   min-height: var(--zen-workspace-indicator-height);
   gap: 12px;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   flex-direction: row !important;
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 421f46a8a..65c0a824d 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1500,7 +1500,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-  async _animateTabs(newWorkspace, shouldAnimate) {
+  async _animateTabs(newWorkspace, shouldAnimate, tabToSelect = null) {
     this._animatingChange = true;
     const animations = [];
     const workspaces = await this._workspaces();
@@ -1534,11 +1534,18 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
       if (offset === 0) {
         element.setAttribute('active', 'true');
+        if (tabToSelect) {
+          gBrowser.selectedTab = tabToSelect;
+          tabToSelect._visuallySelected = false;
+        }
       } else {
         element.removeAttribute('active');
       }
     }
     await Promise.all(animations);
+    if (tabToSelect) {
+      tabToSelect._visuallySelected = false;
+    }
     this._animatingChange = false;
   }
 
@@ -1618,7 +1625,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       tabToSelect = newTab;
     }
     tabToSelect._visuallySelected = true;
-    this._lastSelectedWorkspaceTabs[window.uuid] = tabToSelect;
 
     // Always make sure we always unselect the tab from the old workspace
     if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
@@ -1641,8 +1647,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     gZenThemePicker.onWorkspaceChange(window);
 
-    await this._animateTabs(window, !onInit && !this._animatingChange);
-    gBrowser.selectedTab = tabToSelect;
+    await this._animateTabs(window, !onInit && !this._animatingChange, tabToSelect);
 
     // Notify listeners
     if (this._changeListeners?.length) {
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index e5ba04639..3863cf041 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6eeb57088 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbef2582976 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -57,8 +57,12 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6
        }
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -831,7 +859,7 @@
-           this.tabContainer.arrowScrollbox.prepend(aTab);
+@@ -828,10 +856,10 @@
+           // the moving of a tab from the vertical pinned tabs container
+           // and back into arrowscrollbox.
+           aTab.removeAttribute("pinned");
+-          this.tabContainer.arrowScrollbox.prepend(aTab);
++          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
          });
        } else {
 -        this.moveTabTo(aTab, this.pinnedTabCount - 1, {
@@ -112,11 +116,13 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2447,7 +2484,7 @@
+@@ -2446,8 +2483,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) {
-         this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
+-        this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
 -        this.tabs[1].linkedBrowser.browsingContext.hasSiblings = true;
++        if (this.tabs[0].linkedBrowser.browsingContext) this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
 +        if (this.tabs[1].linkedBrowser.browsingContext) this.tabs[1].linkedBrowser.browsingContext.hasSiblings = true;
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;

From a5ae4077cfbc88b48ee0068d0a771bbc2968de98 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 17:32:33 +0100
Subject: [PATCH 134/191] Refactor workspace tab transformations and update tab
 selection logic

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 65c0a824d..01da4272b 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1544,7 +1544,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     await Promise.all(animations);
     if (tabToSelect) {
-      tabToSelect._visuallySelected = false;
+      tabToSelect._visuallySelected = true;
     }
     this._animatingChange = false;
   }
@@ -1592,7 +1592,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     // Show if tab belongs to current workspace
-    return true;
+    return tabWorkspaceId === workspaceUuid;
   }
 
   async _handleTabSelection(window, onInit, containerId, workspaces, previousWorkspaceId) {

From 31ef8d2ec935161d1e9e6db44c0eeac631e9b4cf Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 19:17:20 +0100
Subject: [PATCH 135/191] Refactor tab management and update CSS for improved
 layout and performance

---
 src/browser/base/content/ZenUIManager.mjs      |  7 +++++--
 .../content/navigator-toolbox-inc-xhtml.patch  | 14 ++++++++------
 .../zen-styles/zen-tabs/vertical-tabs.css      |  5 ++++-
 .../base/zen-components/ZenWorkspaces.mjs      | 18 ++++++++++--------
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index ca1aaecd3..a20dafdef 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -35,7 +35,7 @@ var gZenUIManager = {
 
   updateTabsToolbar() {
     // Set tabs max-height to the "toolbar-items" height
-    const tabs = document.getElementById('zen-browser-tabs-wrapper');
+    const tabs = this.tabsWrapper;
     // Remove tabs so we can accurately calculate the height
     // without them affecting the height of the toolbar
     for (const tab of gBrowser.tabs) {
@@ -414,7 +414,10 @@ var gZenVerticalTabsManager = {
       gBrowser.tabContainer.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       gBrowser.tabContainer.arrowScrollbox.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       // on purpose, we set the orient to horizontal, because the arrowScrollbox is vertical
-      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute('orient', (isVerticalTabs && ZenWorkspaces.workspaceEnabled) ? 'horizontal' : 'vertical');
+      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute(
+        'orient',
+        isVerticalTabs && ZenWorkspaces.workspaceEnabled ? 'horizontal' : 'vertical'
+      );
 
       const buttonsTarget = document.getElementById('zen-sidebar-top-buttons-customization-target');
       if (isRightSide) {
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index bc2ef52de..0419daa0c 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde703a90ee8 100644
+index a0a382643a2f74b6d789f3641ef300eed202d5e9..fd60aceee18e22d40c7d86506408803e3f4ffd45 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -40,17 +40,18 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde7
          <tabs id="tabbrowser-tabs"
                is="tabbrowser-tabs"
                aria-multiselectable="true"
-@@ -50,6 +50,9 @@
+@@ -50,6 +50,10 @@
                tooltip="tabbrowser-tab-tooltip"
                orient="horizontal"
                stopwatchid="FX_TAB_CLICK_MS">
 +<html:div id="zen-essentials-container" skipintoolbarset="true"></html:div>
 +<hbox id="zen-current-workspace-indicator-container"></hbox>
 +<html:div id="zen-browser-tabs-wrapper">
++<html:div id="zen-browser-tabs-container">
            <hbox class="tab-drop-indicator" hidden="true"/>
  # If the name (tabbrowser-arrowscrollbox) or structure of this changes
  # significantly, there is an optimization in
-@@ -57,7 +60,7 @@
+@@ -57,7 +61,7 @@
  # the current structure that we may want to revisit.
            <html:div id="vertical-pinned-tabs-container" tabindex="-1"></html:div>
            <html:div id="vertical-pinned-tabs-container-separator"></html:div>
@@ -59,15 +60,16 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde7
              <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
              <hbox id="tabbrowser-arrowscrollbox-periphery">
                <toolbartabstop/>
-@@ -75,6 +78,7 @@
+@@ -75,6 +79,8 @@
                                tooltip="dynamic-shortcut-tooltip"
                                data-l10n-id="tabs-toolbar-new-tab"/>
            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
++</html:div>
 +</html:div>
          </tabs>
  
          <toolbarbutton id="new-tab-button"
-@@ -100,11 +104,12 @@
+@@ -100,11 +106,12 @@
  #include private-browsing-indicator.inc.xhtml
      <toolbarbutton id="content-analysis-indicator"
                     class="toolbarbutton-1 content-analysis-indicator-icon"/>
@@ -83,7 +85,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde7
    <toolbar id="nav-bar"
             class="browser-toolbar chromeclass-location"
             data-l10n-id="navbar-accessible"
-@@ -490,10 +495,12 @@
+@@ -490,10 +497,12 @@
                       consumeanchor="PanelUI-button"
                       data-l10n-id="appmenu-menu-button-closed2"/>
      </toolbaritem>
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index a5ca41b3f..5efc7354f 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -368,9 +368,12 @@
 #zen-browser-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
-  overflow-x: clip !important; /* might break custom css with new design, so let's force it */
   height: 100%;
   scrollbar-width: thin;
+}
+
+#zen-browser-tabs-container {
+  overflow-x: clip !important; /* might break custom css with new design, so let's force it */
   position: relative;
 }
 
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 01da4272b..e622626b8 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1464,13 +1464,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       for (const container of document.querySelectorAll(selector)) {
         container.style.transform = `translateX(${newTransform + offsetPixels / 2}%)`;
         container.style.opacity = offsetPixels ? 1 : !newTransform;
-      }
-      if (!justMove) {
-        const pinnedContainerId = '#vertical-pinned-tabs-container ';
-        const arrowScrollboxId = '#tabbrowser-arrowscrollbox ';
-        const pinnedContainer = document.querySelector(pinnedContainerId + selector);
-        const arrowScrollbox = document.querySelector(arrowScrollboxId + selector);
-        this._updateMarginTopPinnedTabs(arrowScrollbox, pinnedContainer);
+        if (!offsetPixels && !container.hasAttribute('active')) {
+          container.style.position = 'fixed';
+        } else {
+          container.style.removeProperty('position');
+        }
       }
     }
   }
@@ -1513,6 +1511,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const newTransform = `translateX(${offset}%)`;
       const isCurrent = offset === 0;
       if (shouldAnimate) {
+        element.style.removeProperty('position');
         if (isCurrent) {
           element.style.opacity = 1;
         }
@@ -1534,7 +1533,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
       if (offset === 0) {
         element.setAttribute('active', 'true');
-        if (tabToSelect) {
+        if (tabToSelect != gBrowser.selectedTab) {
           gBrowser.selectedTab = tabToSelect;
           tabToSelect._visuallySelected = false;
         }
@@ -1647,7 +1646,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     gZenThemePicker.onWorkspaceChange(window);
 
+    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = 'none';
     await this._animateTabs(window, !onInit && !this._animatingChange, tabToSelect);
+    await this._organizeWorkspaceStripLocations(window, true);
+    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = '';
 
     // Notify listeners
     if (this._changeListeners?.length) {

From 855c36280ba34c34b97fbabef6f1af1fc8f527ff Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 19:36:00 +0100
Subject: [PATCH 136/191] Refactor tab overflow detection and adjust workspace
 initialization logic

---
 src/browser/base/content/ZenStartup.mjs           | 4 ++--
 src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index a09e51f47..e25539c50 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -94,8 +94,8 @@
       // Detect overflow and underflow
       const observer = new ResizeObserver((_) => {
         const tabContainer = gBrowser.tabContainer;
-        const isVertical = tabContainer.getAttribute('orient') === 'vertical';
-        let contentSize = tabsWrapper.getBoundingClientRect()[isVertical ? 'height' : 'width'];
+        // const isVertical = tabContainer.getAttribute('orient') === 'vertical';
+        // let contentSize = tabsWrapper.getBoundingClientRect()[isVertical ? 'height' : 'width'];
         // NOTE: This should be contentSize > scrollClientSize, but due
         // to how Gecko internally rounds in those cases, we allow for some
         // minor differences (the internal Gecko layout size is 1/60th of a
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index e622626b8..072f7494b 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -526,7 +526,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
           this.activeWorkspace = activeWorkspace?.uuid;
         }
       }
-      await this.initializeTabsStripSections();
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
@@ -535,6 +534,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       } catch (e) {
         console.error('ZenWorkspaces: Error initializing theme picker', e);
       }
+      await this.initializeTabsStripSections();
     }
   }
 

From 48879fb6a087060ffa879c6a0960161f519cf9bc Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 21:15:55 +0100
Subject: [PATCH 137/191] Enhance workspace tab initialization and update tab
 toolbar on load

---
 src/browser/base/content/ZenUIManager.mjs         | 1 +
 src/browser/base/zen-components/ZenWorkspaces.mjs | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index a20dafdef..c4cb657e7 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -27,6 +27,7 @@ var gZenUIManager = {
 
     SessionStore.promiseAllWindowsRestored.then(() => {
       this._hasLoadedDOM = true;
+      this.updateTabsToolbar();
     });
 
     window.addEventListener('TabClose', this.onTabClose.bind(this));
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 072f7494b..ec56db764 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -148,7 +148,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   async initializeTabsStripSections() {
     const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
     const tabs = gBrowser.tabContainer.allTabs.filter((tab) => !tab.pinned);
-    for (const workspace of (await this._workspaces()).workspaces) {
+    const workspaces = await this._workspaces();
+    for (const workspace of workspaces.workspaces) {
       this._createWorkspaceTabsSection(workspace, tabs, perifery);
     }
     if (tabs.length) {
@@ -164,6 +165,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     perifery.setAttribute('hidden', 'true');
     this._hasInitializedTabsStrip = true;
     this.registerPinnedResizeObserver();
+    this._fixIndicatorsNames(workspaces);
   }
 
   _createWorkspaceSection(workspace) {
@@ -526,6 +528,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
           this.activeWorkspace = activeWorkspace?.uuid;
         }
       }
+      await this.initializeTabsStripSections();
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
@@ -534,7 +537,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       } catch (e) {
         console.error('ZenWorkspaces: Error initializing theme picker', e);
       }
-      await this.initializeTabsStripSections();
     }
   }
 
@@ -1740,7 +1742,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   onPinnedTabsResize(entries) {
-    if (!this.workspaceEnabled) {
+    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
       return;
     }
     for (const entry of entries) {

From 07ede1b96bd6895cd4960978a5ba3a54cb68e9fa Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 22:02:17 +0100
Subject: [PATCH 138/191] Add Windows acrylic support and enhance toolbar
 transparency styles

---
 src/browser/app/profile/zen-browser.js            |  4 ++++
 src/browser/base/content/zen-styles/zen-theme.css | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index a61533e60..bbc3d7069 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -127,6 +127,10 @@ pref('zen.view.experimental-rounded-view', false);
 pref('zen.view.experimental-rounded-view', true);
 #endif
 
+#ifdef XP_WIN
+pref('zen.widget.windows.acrylic', true);
+#endif
+
 // Glance
 pref('zen.glance.enabled', true);
 pref('zen.glance.hold-duration', 300); // in ms
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 480f65c52..f5482f7ac 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -162,9 +162,13 @@
   @media (-moz-windows-mica) or (-moz-platform: macos) {
     background: transparent;
     --zen-themed-toolbar-bg-transparency: 0;
-    --zen-themed-toolbar-bg-transparent: light-dark(
-      rgba(255, 255, 255, var(--zen-themed-toolbar-bg-transparency)),
-      rgba(0, 0, 0, var(--zen-themed-toolbar-bg-transparency))
+    @media (-moz-bool-pref: 'zen.widget.windows.acrylic') {
+      --zen-themed-toolbar-bg-transparency: 15%;
+    }
+    --zen-themed-toolbar-bg-transparent: color-mix(
+      in srgb,
+      var(--zen-themed-toolbar-bg) calc(100% - var(--zen-themed-toolbar-bg-transparency)),
+      transparent var(--zen-themed-toolbar-bg-transparency)
     );
   }
 

From 869c2eb8b295924bd1d2cdae82f6135c5d5c4052 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 11:29:25 +0100
Subject: [PATCH 139/191] Refactor pinned tab management and improve event
 handling for workspace initialization

---
 src/browser/base/content/ZenUIManager.mjs     |  4 +-
 .../zen-components/ZenPinnedTabManager.mjs    | 53 +++-------------
 .../zen-components/ZenPinnedTabsStorage.mjs   |  1 -
 .../base/zen-components/ZenWorkspaces.mjs     | 61 +++++++++++++------
 .../sessionstore/SessionStore-sys-mjs.patch   | 18 +++++-
 .../tabbrowser/content/tabbrowser-js.patch    | 27 +++++---
 .../tabbrowser/content/tabs-js.patch          | 26 +++++---
 7 files changed, 102 insertions(+), 88 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index c4cb657e7..9e83c5a32 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -241,9 +241,7 @@ var gZenVerticalTabsManager = {
     window.addEventListener('customizationstarting', this._preCustomize.bind(this));
     window.addEventListener('aftercustomization', this._postCustomize.bind(this));
 
-    window.addEventListener('DOMContentLoaded', updateEvent, { once: true });
-
-    const tabs = document.getElementById('tabbrowser-tabs');
+    window.addEventListener('MozAfterPaint', updateEvent, { once: true });
 
     if (!this.isWindowsStyledButtons) {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index a3487fee7..a046f472a 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -69,7 +69,9 @@
         return;
       }
 
-      await this._refreshPinnedTabs(newWorkspace, { init: onInit });
+      if (onInit) {
+        await this._refreshPinnedTabs(newWorkspace, { init: onInit });
+      }
     }
 
     log(message) {
@@ -152,7 +154,7 @@
       const pinsToCreate = new Set(pins.map((p) => p.uuid));
 
       // First pass: identify existing tabs and remove those without pins
-      for (let tab of gBrowser.tabs) {
+      for (let tab of ZenWorkspaces.allStoredTabs) {
         const pinId = tab.getAttribute('zen-pin-id');
         if (!pinId) {
           continue;
@@ -178,10 +180,6 @@
           continue; // Skip pins that already have tabs
         }
 
-        if (!this._shouldShowPin(pin, currentWorkspace, workspaces)) {
-          continue; // Skip pins not relevant to current workspace
-        }
-
         let params = {
           skipAnimation: true,
           allowInheritPrincipal: false,
@@ -234,6 +232,12 @@
 
         this.log(`Created new pinned tab for pin ${pin.uuid} (isEssential: ${pin.isEssential})`);
         gBrowser.pinTab(newTab);
+        if (!pin.isEssential) {
+          const contaienr = document.querySelector(
+            `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${pin.workspaceUuid}"]`
+          );
+          contaienr.insertBefore(newTab, contaienr.lastChild);
+        }
 
         newTab.initialize();
       }
@@ -246,43 +250,6 @@
       gBrowser._updateTabBarForPinnedTabs();
     }
 
-    _shouldShowPin(pin, currentWorkspace, workspaces) {
-      const isEssential = pin.isEssential;
-      const pinWorkspaceUuid = pin.workspaceUuid;
-      const pinContextId = pin.containerTabId ? pin.containerTabId.toString() : '0';
-      const workspaceContextId = currentWorkspace.containerTabId?.toString() || '0';
-      const containerSpecificEssentials = ZenWorkspaces.containerSpecificEssentials;
-
-      // Handle essential pins
-      if (isEssential) {
-        if (!containerSpecificEssentials) {
-          return true; // Show all essential pins when containerSpecificEssentials is false
-        }
-
-        if (workspaceContextId !== '0') {
-          // In workspaces with default container: Show essentials that match the container
-          return pinContextId === workspaceContextId;
-        } else {
-          // In workspaces without a default container: Show essentials that aren't in container-specific workspaces
-          // or have userContextId="0" or no userContextId
-          return (
-            !pinContextId ||
-            pinContextId === '0' ||
-            !workspaces.workspaces.some((workspace) => workspace.containerTabId === parseInt(pinContextId, 10))
-          );
-        }
-      }
-
-      // For non-essential pins
-      if (!pinWorkspaceUuid) {
-        // Pins without a workspace belong to all workspaces (if that's your desired behavior)
-        return true;
-      }
-
-      // Show if pin belongs to current workspace
-      return pinWorkspaceUuid === currentWorkspace.uuid;
-    }
-
     _onPinnedTabEvent(action, event) {
       if (!this.enabled) return;
       const tab = event.target;
diff --git a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
index 7e5ab6017..b47850b4e 100644
--- a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
@@ -46,7 +46,6 @@ var ZenPinnedTabsStorage = {
         CREATE INDEX IF NOT EXISTS idx_zen_pins_changes_uuid ON zen_pins_changes(uuid)
       `);
 
-      await SessionStore.promiseInitialized;
       this._resolveInitialized();
     });
   },
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index ec56db764..bd698f616 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -28,13 +28,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._resolvePinnedInitialized = resolve;
   });
 
+  promiseSectionsInitialized = new Promise((resolve) => {
+    this._resolveSectionsInitialized = resolve;
+  });
+
   workspaceIndicatorXUL = `
     <hbox class="zen-current-workspace-indicator-icon"></hbox>
     <hbox class="zen-current-workspace-indicator-name"></hbox>
   `;
 
   async waitForPromises() {
-    await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized, SessionStore.promiseAllWindowsRestored]);
+    await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized]);
   }
 
   async init() {
@@ -75,18 +79,21 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     );
     ChromeUtils.defineLazyGetter(this, 'tabContainer', () => document.getElementById('tabbrowser-tabs'));
     this._activeWorkspace = Services.prefs.getStringPref('zen.workspaces.active', '');
-    this._delayedStartup();
+    await SessionStore.promiseInitialized;
+    if (!this._hasInitializedTabsStrip) {
+      await this.delayedStartup();
+    }
+    await this.promiseSectionsInitialized;
+    window.addEventListener('MozAfterPaint', async () => {
+      await SessionStore.promiseAllWindowsRestored;
+      await this.afterLoadInit();
+    }, { once: true });
   }
 
-  async _delayedStartup() {
-    if (!this.workspaceEnabled) {
-      return;
-    }
-    this._pinnedTabsResizeObserver = new ResizeObserver(this.onPinnedTabsResize.bind(this));
-    await this.waitForPromises();
-    await this.initializeWorkspaces();
+  async afterLoadInit() {
     console.info('ZenWorkspaces: ZenWorkspaces initialized');
 
+    await this.initializeWorkspaces();
     if (Services.prefs.getBoolPref('zen.workspaces.swipe-actions', false) && this.workspaceEnabled) {
       this.initializeGestureHandlers();
       this.initializeWorkspaceNavigation();
@@ -103,6 +110,16 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     );
   }
 
+  async delayedStartup() {
+    if (!this.workspaceEnabled) {
+      return;
+    }
+    this._pinnedTabsResizeObserver = new ResizeObserver(this.onPinnedTabsResize.bind(this));
+    await this.waitForPromises();
+    await this.initializeTabsStripSections();
+    this._resolveSectionsInitialized();
+  }
+
   registerPinnedResizeObserver() {
     if (!this._hasInitializedTabsStrip) {
       return;
@@ -117,7 +134,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   get activeWorkspaceStrip() {
-    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
+    if (!this._hasInitializedTabsStrip) {
       return gBrowser.tabContainer.arrowScrollbox;
     }
     const activeWorkspace = this.activeWorkspace;
@@ -147,7 +164,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   async initializeTabsStripSections() {
     const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
-    const tabs = gBrowser.tabContainer.allTabs.filter((tab) => !tab.pinned);
+    const tabs = gBrowser.tabContainer.allTabs;
     const workspaces = await this._workspaces();
     for (const workspace of workspaces.workspaces) {
       this._createWorkspaceTabsSection(workspace, tabs, perifery);
@@ -156,11 +173,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const defaultSelectedContainer = document.querySelector(
         `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
       );
+      const pinnedContainer = document.querySelector(
+        `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
+      );
       for (const tab of tabs) {
+        if (tab.pinned) {
+          pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
+          continue;
+        }
         // before to the last child (perifery)
         defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
       }
-      this.tabContainer._invalidateCachedTabs();
     }
     perifery.setAttribute('hidden', 'true');
     this._hasInitializedTabsStrip = true;
@@ -210,7 +233,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         section.appendChild(tab);
       }
     }
-    this.tabContainer._invalidateCachedTabs();
   }
 
   initializeWorkspaceNavigation() {
@@ -512,7 +534,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       await this.workspaceBookmarks();
       window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
       window.addEventListener('TabOpen', this.updateTabsContainers.bind(this));
-      window.addEventListener('TabClose', this.updateTabsContainers.bind(this));
       let workspaces = await this._workspaces();
       let activeWorkspace = null;
       if (workspaces.workspaces.length === 0) {
@@ -528,11 +549,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
           this.activeWorkspace = activeWorkspace?.uuid;
         }
       }
-      await this.initializeTabsStripSections();
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
           await this.changeWorkspace(activeWorkspace, { onInit: true });
+          gBrowser.tabContainer._positionPinnedTabs();
         }
       } catch (e) {
         console.error('ZenWorkspaces: Error initializing theme picker', e);
@@ -1335,8 +1356,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let tab = gZenUIManager.openAndChangeToTab(BROWSER_NEW_TAB_URL);
 
     if (window.uuid) {
-      this.moveTabToWorkspace(tab, window.uuid);
+      tab.setAttribute("zen-workspace-id", window.uuid)
     }
+
+    return tab;
   }
 
   async saveWorkspaceFromCreate() {
@@ -1401,8 +1424,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (!this.workspaceEnabled || this._inChangingWorkspace) {
       return;
     }
-
-    await SessionStore.promiseInitialized;
     this._inChangingWorkspace = true;
     try {
       await this._performWorkspaceChange(window, ...args);
@@ -1742,7 +1763,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   onPinnedTabsResize(entries) {
-    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
+    if (!this._hasInitializedTabsStrip) {
       return;
     }
     for (const entry of entries) {
@@ -1790,7 +1811,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
 
       // Switch workspace if needed
-      if (workspaceID && workspaceID !== activeWorkspace.uuid) {
+      if (workspaceID && workspaceID !== activeWorkspace.uuid && parent.ZenWorkspaces._hasInitializedTabsStrip) {
         await parent.ZenWorkspaces.changeWorkspace({ uuid: workspaceID });
       }
     }
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 2c7b2688f..c00a2b8e4 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,8 +1,20 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 908743177d9f95e2e6549c689e7a493ca8668701..b452d7dfc93f6171f8a65668e052a37638f1f6c3 100644
+index 908743177d9f95e2e6549c689e7a493ca8668701..2dd53f5fdbffb21dfdc8bf68a6771d4ac0acd8be 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -3848,6 +3848,7 @@ var SessionStoreInternal = {
+@@ -2174,9 +2174,10 @@ var SessionStoreInternal = {
+           TelemetryStopwatch.finish(
+             "FX_SESSION_RESTORE_STARTUP_ONLOAD_INITIAL_WINDOW_MS"
+           );
+-
++          aWindow.ZenWorkspaces.delayedStartup().then(() => {
+           // Let everyone know we're done.
+           this._deferredInitialized.resolve();
++          });
+         }
+       })
+       .catch(ex => {
+@@ -3848,6 +3849,7 @@ var SessionStoreInternal = {
          aWindow.gBrowser.selectedTab = newTab;
        }
  
@@ -10,7 +22,7 @@ index 908743177d9f95e2e6549c689e7a493ca8668701..b452d7dfc93f6171f8a65668e052a376
        // Restore the state into the new tab.
        this.restoreTab(newTab, tabState, {
          restoreImmediately: aRestoreImmediately,
-@@ -5315,7 +5316,7 @@ var SessionStoreInternal = {
+@@ -5315,7 +5317,7 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 3863cf041..5511152c7 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbef2582976 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5e12e95a1 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -321,7 +321,16 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5558,10 @@
+@@ -4812,6 +4905,8 @@
+         this.tabs[i]._tPos = i;
+       }
+ 
++      ZenWorkspaces.updateTabsContainers();
++
+       if (!this._windowIsClosing) {
+         if (wasPinned) {
+           this.tabContainer._positionPinnedTabs();
+@@ -5465,10 +5560,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -334,7 +343,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5706,9 +5799,9 @@
+@@ -5706,9 +5801,9 @@
  
        // Don't allow mixing pinned and unpinned tabs.
        if (aTab.pinned) {
@@ -346,7 +355,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
        }
        if (aTab._tPos == aIndex) {
          return;
-@@ -5727,6 +5820,9 @@
+@@ -5727,6 +5822,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -356,7 +365,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -5802,7 +5898,7 @@
+@@ -5802,7 +5900,7 @@
          createLazyBrowser,
        };
  
@@ -365,7 +374,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
        if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
          params.pinned = true;
        }
-@@ -7443,6 +7539,7 @@
+@@ -7443,6 +7541,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -373,7 +382,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8508,7 @@ var TabContextMenu = {
+@@ -8411,7 +8510,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -382,7 +391,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8541,7 @@ var TabContextMenu = {
+@@ -8444,7 +8543,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -391,7 +400,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8774,7 @@ var TabContextMenu = {
+@@ -8677,6 +8776,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index dfafb0b6c..acadf284f 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b20e112db 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..0bbce48745d85188ffc0ed9758ee4978bb3c8e59 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -293,7 +293,15 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2099,7 @@
+@@ -2003,6 +2028,7 @@
+       if (this.verticalMode) {
+         this._updateVerticalPinnedTabs();
+       } else if (absPositionHorizontalTabs) {
++        return;
+         let layoutData = this._pinnedTabsLayoutCache;
+         let uiDensity = document.documentElement.getAttribute("uidensity");
+         if (!layoutData || layoutData.uiDensity != uiDensity) {
+@@ -2074,7 +2100,7 @@
          return;
        }
  
@@ -302,7 +310,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2282,9 @@
+@@ -2257,9 +2283,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -315,7 +323,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2527,9 @@
+@@ -2502,8 +2528,9 @@
        );
      }
  
@@ -327,7 +335,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
          return;
        }
  
-@@ -2668,9 +2694,9 @@
+@@ -2668,9 +2695,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -339,7 +347,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
        }
      }
  
-@@ -2754,7 +2780,7 @@
+@@ -2754,7 +2781,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -348,7 +356,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
          return;
        }
  
-@@ -2772,12 +2798,14 @@
+@@ -2772,12 +2799,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -364,7 +372,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
                selectedTab,
              ];
            })
-@@ -2794,8 +2822,11 @@
+@@ -2794,8 +2823,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -378,7 +386,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
              ) {
                return;
              }
-@@ -2803,21 +2834,29 @@
+@@ -2803,21 +2835,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (

From 46ff0020bb74e4cb7f40f0a5a0549b5ccf89afc7 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 11:32:40 +0100
Subject: [PATCH 140/191] Format event listener and improve attribute setting
 for workspace tabs

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index bd698f616..4a0cbfea6 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -84,10 +84,14 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       await this.delayedStartup();
     }
     await this.promiseSectionsInitialized;
-    window.addEventListener('MozAfterPaint', async () => {
-      await SessionStore.promiseAllWindowsRestored;
-      await this.afterLoadInit();
-    }, { once: true });
+    window.addEventListener(
+      'MozAfterPaint',
+      async () => {
+        await SessionStore.promiseAllWindowsRestored;
+        await this.afterLoadInit();
+      },
+      { once: true }
+    );
   }
 
   async afterLoadInit() {
@@ -1356,7 +1360,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let tab = gZenUIManager.openAndChangeToTab(BROWSER_NEW_TAB_URL);
 
     if (window.uuid) {
-      tab.setAttribute("zen-workspace-id", window.uuid)
+      tab.setAttribute('zen-workspace-id', window.uuid);
     }
 
     return tab;

From c27a26eee4d1308b67bfaa080df1636267efc855 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 11:38:00 +0100
Subject: [PATCH 141/191] Rename 'zen-browser-tabs-wrapper' to
 'zen-tabs-wrapper' across multiple files for consistency

---
 src/browser/base/content/ZenStartup.mjs                     | 2 +-
 src/browser/base/content/ZenUIManager.mjs                   | 2 +-
 src/browser/base/content/navigator-toolbox-inc-xhtml.patch  | 4 ++--
 src/browser/base/content/navigator-toolbox-js.patch         | 6 +++---
 .../base/content/zen-styles/zen-tabs/vertical-tabs.css      | 2 +-
 src/browser/base/zen-components/ZenPinnedTabManager.mjs     | 2 +-
 src/browser/base/zen-components/ZenWorkspaces.mjs           | 4 ++--
 src/browser/components/tabbrowser/content/tabs-js.patch     | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index e25539c50..c4dcd6817 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -85,7 +85,7 @@
     _initSidebarScrolling() {
       // Disable smooth scroll
       const canSmoothScroll = Services.prefs.getBoolPref('zen.startup.smooth-scroll-in-tabs', false);
-      const tabsWrapper = document.getElementById('zen-browser-tabs-wrapper');
+      const tabsWrapper = document.getElementById('zen-tabs-wrapper');
       gBrowser.tabContainer.addEventListener('wheel', (event) => {
         if (canSmoothScroll) return;
         event.preventDefault(); // Prevent the smooth scroll behavior
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 9e83c5a32..e9f32b5b7 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -63,7 +63,7 @@ var gZenUIManager = {
     if (this._tabsWrapper) {
       return this._tabsWrapper;
     }
-    this._tabsWrapper = document.getElementById('zen-browser-tabs-wrapper');
+    this._tabsWrapper = document.getElementById('zen-tabs-wrapper');
     return this._tabsWrapper;
   },
 
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 0419daa0c..0f75a3ff5 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index a0a382643a2f74b6d789f3641ef300eed202d5e9..fd60aceee18e22d40c7d86506408803e3f4ffd45 100644
+index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae402a465de 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -46,7 +46,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..fd60aceee18e22d40c7d86506408803e
                stopwatchid="FX_TAB_CLICK_MS">
 +<html:div id="zen-essentials-container" skipintoolbarset="true"></html:div>
 +<hbox id="zen-current-workspace-indicator-container"></hbox>
-+<html:div id="zen-browser-tabs-wrapper">
++<html:div id="zen-tabs-wrapper">
 +<html:div id="zen-browser-tabs-container">
            <hbox class="tab-drop-indicator" hidden="true"/>
  # If the name (tabbrowser-arrowscrollbox) or structure of this changes
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index 59e00cfd2..721a1e01b 100644
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..3434a833c4d1220554b4df6eeeed83f500c6f812 100644
+index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..9e1e888554279b6e1df3bc1cb907afd2ccb330ca 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -8,7 +8,7 @@
@@ -15,7 +15,7 @@ index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..3434a833c4d1220554b4df6eeeed83f5
          #reload-button ,
          #urlbar-go-button,
          #reader-mode-button,
-+        #zen-browser-tabs-wrapper,
++        #zen-tabs-wrapper,
          #picture-in-picture-button,
          #shopping-sidebar-button,
          #urlbar-zoom-button,
@@ -23,7 +23,7 @@ index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..3434a833c4d1220554b4df6eeeed83f5
          case "vertical-tabs-newtab-button":
          case "tabs-newtab-button":
          case "new-tab-button":
-+        case "zen-browser-tabs-wrapper":
++        case "zen-tabs-wrapper":
            gBrowser.handleNewTabMiddleClick(element, event);
            break;
  
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 5efc7354f..286493476 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -365,7 +365,7 @@
   }
 }
 
-#zen-browser-tabs-wrapper {
+#zen-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
   height: 100%;
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index a046f472a..c81e6a670 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -642,7 +642,7 @@
         }
       }
       // Check for normal tabs container
-      else if (tabsTarget || event.target.id === 'zen-browser-tabs-wrapper') {
+      else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
         if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
           gBrowser.unpinTab(draggedTab);
           moved = true;
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 4a0cbfea6..0991160cf 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1673,10 +1673,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     gZenThemePicker.onWorkspaceChange(window);
 
-    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = 'none';
+    document.getElementById('zen-tabs-wrapper').style.scrollbarWidth = 'none';
     await this._animateTabs(window, !onInit && !this._animatingChange, tabToSelect);
     await this._organizeWorkspaceStripLocations(window, true);
-    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = '';
+    document.getElementById('zen-tabs-wrapper').style.scrollbarWidth = '';
 
     // Notify listeners
     if (this._changeListeners?.length) {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index acadf284f..c4903a593 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..0bbce48745d85188ffc0ed9758ee4978bb3c8e59 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..2e8cacae772cca001fc7374ddd8281e0cb7f1f3f 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -16,7 +16,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..0bbce48745d85188ffc0ed9758ee4978
        if (
          event.button != 0 ||
 -        event.target != this.arrowScrollbox ||
-+        event.target != document.getElementById("zen-browser-tabs-wrapper") ||
++        event.target != document.getElementById("zen-tabs-wrapper") ||
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;

From 31f5762efddbe3976b670465026d306993491499 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 12:45:48 +0100
Subject: [PATCH 142/191] Improve active workspace selection logic in
 ZenWorkspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 0991160cf..8e934159a 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -544,14 +544,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         activeWorkspace = await this.createAndSaveWorkspace('Default Workspace', true, '🏠');
       } else {
         activeWorkspace = await this.getActiveWorkspace();
-        if (!activeWorkspace) {
-          activeWorkspace = workspaces.workspaces.find((workspace) => workspace.default);
-          this.activeWorkspace = activeWorkspace?.uuid;
-        }
-        if (!activeWorkspace) {
-          activeWorkspace = workspaces.workspaces[0];
-          this.activeWorkspace = activeWorkspace?.uuid;
-        }
+        this.activeWorkspace = activeWorkspace?.uuid;
       }
       try {
         if (activeWorkspace) {
@@ -777,7 +770,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   async getActiveWorkspace() {
     const workspaces = await this._workspaces();
-    return workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ?? workspaces.workspaces[0];
+    return workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ??
+      workspaces.workspaces.find((workspace) => workspace.default) ?? workspaces.workspaces[0];
   }
   // Workspaces dialog UI management
 

From 5ace391a61b8b38dfdbd43e8dece0e9413bc02f2 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 16:52:46 +0100
Subject: [PATCH 143/191] Fixed common bugs with workspaces

---
 .../base/zen-components/ZenWorkspaces.mjs     | 57 +++++++++++++------
 .../tabbrowser/content/tabbrowser-js.patch    | 37 ++++--------
 .../tabbrowser/content/tabs-js.patch          |  6 +-
 3 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 8e934159a..8cc404986 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -177,16 +177,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const defaultSelectedContainer = document.querySelector(
         `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
       );
-      const pinnedContainer = document.querySelector(
-        `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
-      );
-      for (const tab of tabs) {
-        if (tab.pinned) {
-          pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
-          continue;
+      // New profile with no workspaces does not have a default selected container
+      if (defaultSelectedContainer) {
+        const pinnedContainer = document.querySelector(
+          `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
+        );
+        for (const tab of tabs) {
+          if (tab.pinned) {
+            pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
+            continue;
+          }
+          // before to the last child (perifery)
+          defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
         }
-        // before to the last child (perifery)
-        defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
       }
     }
     perifery.setAttribute('hidden', 'true');
@@ -1556,16 +1559,12 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         element.setAttribute('active', 'true');
         if (tabToSelect != gBrowser.selectedTab) {
           gBrowser.selectedTab = tabToSelect;
-          tabToSelect._visuallySelected = false;
         }
       } else {
         element.removeAttribute('active');
       }
     }
     await Promise.all(animations);
-    if (tabToSelect) {
-      tabToSelect._visuallySelected = true;
-    }
     this._animatingChange = false;
   }
 
@@ -1644,7 +1643,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const newTab = this._createNewTabForWorkspace(window);
       tabToSelect = newTab;
     }
-    tabToSelect._visuallySelected = true;
+    if (tabToSelect) {
+      tabToSelect._visuallySelected = true;
+    }
 
     // Always make sure we always unselect the tab from the old workspace
     if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
@@ -1720,7 +1721,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-  _createWorkspaceData(name, isDefault, icon) {
+  _createWorkspaceData(name, isDefault, icon, tabs) {
     let window = {
       uuid: gZenUIManager.generateUuidv4(),
       default: isDefault,
@@ -1731,7 +1732,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._prepareNewWorkspace(window);
     const perifery = document.querySelector('#tabbrowser-arrowscrollbox-periphery[hidden]');
     perifery?.removeAttribute('hidden');
-    this._createWorkspaceTabsSection(window, [], perifery);
+    this._createWorkspaceTabsSection(window, tabs, perifery);
     perifery.setAttribute('hidden', 'true');
     return window;
   }
@@ -1740,10 +1741,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (!this.workspaceEnabled) {
       return;
     }
-    let workspaceData = this._createWorkspaceData(name, isDefault, icon);
+    // get extra tabs remaning (e.g. on new profiles) and just move them to the new workspace
+    const extraTabs = Array.from(gBrowser.tabContainer.arrowScrollbox.children).filter(
+      (child) => child.tagName === 'tab' && !child.hasAttribute('zen-workspace-id')
+    );
+    let workspaceData = this._createWorkspaceData(name, isDefault, icon, extraTabs);
     await this.saveWorkspace(workspaceData);
-    await this.changeWorkspace(workspaceData);
     this.registerPinnedResizeObserver();
+    let changed = extraTabs.length > 0;
+    if (changed) {
+      gBrowser.tabContainer._invalidateCachedTabs();
+      gBrowser.selectedTab = extraTabs[0];
+    }
+    await this.changeWorkspace(workspaceData);
     return workspaceData;
   }
 
@@ -1816,12 +1826,21 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   makeSurePinTabIsInCorrectPosition() {
+    if (!this.pinnedTabsContainer) {
+      return 0; // until we initialize the pinned tabs container
+    }
     const tabsInsidePinTab = Array.from(this.pinnedTabsContainer.parentElement.children).filter(
       (child) => child.tagName === 'tab'
     );
     let changed = false;
     for (const tab of tabsInsidePinTab) {
+      if (tab.getAttribute('zen-glance-tab') === 'true') {
+        continue;
+      }
       if (tab.getAttribute('zen-essential') === 'true') {
+        const container = document.getElementById('zen-essentials-container');
+        container.appendChild(tab);
+        changed = true;
         continue;
       }
       const workspaceId = tab.getAttribute('zen-workspace-id');
@@ -1837,6 +1856,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (changed) {
       gBrowser.tabContainer._invalidateCachedTabs();
     }
+    // Return the number of essentials INSIDE the pinned tabs container so we can correctly change their parent
+    return Array.from(this.pinnedTabsContainer.children).filter((child) => child.getAttribute('zen-essential') === 'true').length;
   }
 
   // Context menu management
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 5511152c7..6790f1ba4 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5e12e95a1 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b62093051cc9a 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -9,7 +9,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +    get _numVisiblePinTabs() {
 +      let i = 0;
 +      for (let tab of this.tabs) {
-+        if (!tab.pinned) {
++        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
 +          break;
 +        }
 +        if (!tab.hidden) {
@@ -22,7 +22,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +    get _numZenEssentials() {
 +      let i = 0;
 +      for (let tab of this.tabs) {
-+        if (!tab.hasAttribute("zen-essential")) {
++        if (!tab.hasAttribute("zen-essential") && !tab.hasAttribute("zen-glance-tab")) {
 +          break;
 +        }
 +        if (!tab.hidden) {
@@ -37,14 +37,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 -        if (!this.tabs[i].pinned) {
 +      let i = 0;
 +      for (let tab of this.tabs) {
-+        if (!tab.pinned) {
++        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
            break;
          }
 +        i++;
        }
        return i;
      }
-@@ -807,10 +835,10 @@
+@@ -807,7 +835,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -52,12 +52,8 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.insertBefore(aTab, this.verticalPinnedTabsContainer.lastChild)
          );
        } else {
--        this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
-+        this.moveTabTo(aTab, this._numVisiblePinTabs, { forceStandaloneTab: true });
-       }
-       aTab.setAttribute("pinned", "true");
-       this._updateTabBarForPinnedTabs();
-@@ -828,10 +856,10 @@
+         this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
+@@ -828,7 +856,7 @@
            // the moving of a tab from the vertical pinned tabs container
            // and back into arrowscrollbox.
            aTab.removeAttribute("pinned");
@@ -65,11 +61,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
          });
        } else {
--        this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-+        this.moveTabTo(aTab, this._numVisiblePinTabs - 1, {
-           forceStandaloneTab: true,
-         });
-         aTab.removeAttribute("pinned");
+         this.moveTabTo(aTab, this.pinnedTabCount - 1, {
 @@ -1055,6 +1083,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -232,20 +224,11 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
        if (typeof index != "number") {
          // Move the new tab after another tab if needed, to the end otherwise.
 -        index = Infinity;
-+        index = Services.prefs.getBoolPref("zen.view.show-newtab-button-top") ? this._numVisiblePinTabs : Infinity;
++        index = Services.prefs.getBoolPref("zen.view.show-newtab-button-top") ? this.pinnedTabCount : Infinity;
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3773,14 +3855,14 @@
-       // Ensure index is within bounds.
-       if (tab.pinned) {
-         index = Math.max(index, 0);
--        index = Math.min(index, this.pinnedTabCount);
-+        index = Math.min(index, this._numVisiblePinTabs);
-       } else {
--        index = Math.max(index, this.pinnedTabCount);
-+        index = Math.max(index, this._numVisiblePinTabs);
-         index = Math.min(index, this.tabs.length);
+@@ -3780,7 +3862,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index c4903a593..878c2193a 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..2e8cacae772cca001fc7374ddd8281e0cb7f1f3f 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..3d323615040dcb5e379519878fb7874d5b28de81 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -261,8 +261,8 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..2e8cacae772cca001fc7374ddd8281e0
  
 -      if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
 -        let tabs = this.visibleTabs;
-+      ZenWorkspaces.makeSurePinTabIsInCorrectPosition();
-+      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length - 1 + document.getElementById("zen-essentials-container").children.length)) {
++      let count = ZenWorkspaces.makeSurePinTabIsInCorrectPosition();
++      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length - count - 1 + document.getElementById("zen-essentials-container").children.length)) {
 +        let tabs = this.allTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
          for (let i = 0; i < numPinned; i++) {
            tabs[i].style.marginInlineStart = "";

From 12e2781668fab975c6b21be8d389b93058e00a2e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 16:53:03 +0100
Subject: [PATCH 144/191] Format code for better readability in ZenWorkspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 8cc404986..1518cb41b 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -773,8 +773,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   async getActiveWorkspace() {
     const workspaces = await this._workspaces();
-    return workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ??
-      workspaces.workspaces.find((workspace) => workspace.default) ?? workspaces.workspaces[0];
+    return (
+      workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ??
+      workspaces.workspaces.find((workspace) => workspace.default) ??
+      workspaces.workspaces[0]
+    );
   }
   // Workspaces dialog UI management
 
@@ -1857,7 +1860,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       gBrowser.tabContainer._invalidateCachedTabs();
     }
     // Return the number of essentials INSIDE the pinned tabs container so we can correctly change their parent
-    return Array.from(this.pinnedTabsContainer.children).filter((child) => child.getAttribute('zen-essential') === 'true').length;
+    return Array.from(this.pinnedTabsContainer.children).filter((child) => child.getAttribute('zen-essential') === 'true')
+      .length;
   }
 
   // Context menu management

From 786a377ada2870194b6502e123e67ccb6a27a7a8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 17:01:28 +0100
Subject: [PATCH 145/191] Invalidate cached tabs after inserting a new pinned
 tab in ZenPinnedTabManager

---
 src/browser/base/zen-components/ZenPinnedTabManager.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index c81e6a670..0e6d0fee9 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -238,6 +238,7 @@
           );
           contaienr.insertBefore(newTab, contaienr.lastChild);
         }
+        gBrowser.tabContainer._invalidateCachedTabs();
 
         newTab.initialize();
       }

From 1a293fc5ff26eaf8b1eef5173dd5bbf838cef3d1 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:32:56 +0100
Subject: [PATCH 146/191] Refactor initialization logic in ZenStartup and
 update tab toolbar handling in ZenUIManager and ZenPinnedTabManager

---
 src/browser/base/content/ZenStartup.mjs                 | 8 +++-----
 src/browser/base/content/ZenUIManager.mjs               | 5 +++--
 src/browser/base/zen-components/ZenPinnedTabManager.mjs | 1 +
 src/browser/base/zen-components/ZenWorkspaces.mjs       | 3 +++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index c4dcd6817..88e4fad4b 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -3,11 +3,9 @@
   var ZenStartup = {
     init() {
       this.openWatermark();
-      window.SessionStore.promiseInitialized.then(() => {
-        this._changeSidebarLocation();
-        this._zenInitBrowserLayout();
-        this._initSearchBar();
-      });
+      this._changeSidebarLocation();
+      this._zenInitBrowserLayout();
+      this._initSearchBar();
     },
 
     _zenInitBrowserLayout() {
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e9f32b5b7..42da71cc8 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -14,7 +14,7 @@ var gZenUIManager = {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
     });
 
-    new ResizeObserver(gZenCommonActions.throttle(this.updateTabsToolbar.bind(this), this.sidebarHeightThrottle)).observe(
+    new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(
       document.getElementById('TabsToolbar')
     );
 
@@ -241,7 +241,7 @@ var gZenVerticalTabsManager = {
     window.addEventListener('customizationstarting', this._preCustomize.bind(this));
     window.addEventListener('aftercustomization', this._postCustomize.bind(this));
 
-    window.addEventListener('MozAfterPaint', updateEvent, { once: true });
+    this._updateEvent();
 
     if (!this.isWindowsStyledButtons) {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
@@ -570,6 +570,7 @@ var gZenVerticalTabsManager = {
     } catch (e) {
       console.error(e);
     }
+    gZenUIManager.updateTabsToolbar();
     this._isUpdating = false;
   },
 
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 0e6d0fee9..3bb7f747f 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -249,6 +249,7 @@
       }
 
       gBrowser._updateTabBarForPinnedTabs();
+      gZenUIManager.updateTabsToolbar();
     }
 
     _onPinnedTabEvent(action, event) {
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 1518cb41b..523f6e095 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -232,6 +232,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   _organizeTabsToWorkspaceSections(workspace, section, pinnedSection, tabs) {
     const workspaceTabs = Array.from(tabs).filter((tab) => tab.getAttribute('zen-workspace-id') === workspace.uuid);
     for (const tab of workspaceTabs) {
+      if (tab.hasAttribute('zen-essential')) {
+        continue; // Ignore essentials as they need to be in their own section
+      }
       // remove tab from list
       tabs.splice(tabs.indexOf(tab), 1);
       if (tab.pinned) {

From bf91ffddf3d6ce1dbbace757762778e651d06604 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:42:48 +0100
Subject: [PATCH 147/191] Update visibility handling in ZenWorkspaces by
 replacing position styles with hidden attribute

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 523f6e095..7baabccac 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1495,9 +1495,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         container.style.transform = `translateX(${newTransform + offsetPixels / 2}%)`;
         container.style.opacity = offsetPixels ? 1 : !newTransform;
         if (!offsetPixels && !container.hasAttribute('active')) {
-          container.style.position = 'fixed';
+          container.setAttribute('hidden', 'true');
         } else {
-          container.style.removeProperty('position');
+          container.removeAttribute('hidden');
         }
       }
     }
@@ -1541,7 +1541,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const newTransform = `translateX(${offset}%)`;
       const isCurrent = offset === 0;
       if (shouldAnimate) {
-        element.style.removeProperty('position');
+        element.removeAttribute('hidden');
         if (isCurrent) {
           element.style.opacity = 1;
         }

From 47824d8bca4b15d45ef44a539b44bfc859dd3269 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:43:57 +0100
Subject: [PATCH 148/191] Simplify ResizeObserver initialization in
 ZenUIManager by consolidating method calls

---
 src/browser/base/content/ZenUIManager.mjs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 42da71cc8..dcc947dc1 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -14,9 +14,7 @@ var gZenUIManager = {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
     });
 
-    new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(
-      document.getElementById('TabsToolbar')
-    );
+    new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(document.getElementById('TabsToolbar'));
 
     new ResizeObserver(
       gZenCommonActions.throttle(

From 8813c5174e2adfe4c1ca8827aa1da748f6e3d070 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:57:54 +0100
Subject: [PATCH 149/191] Update newtabButton to newtabButtons for multiple
 button handling in ZenUIManager

---
 src/browser/base/content/ZenUIManager.mjs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index dcc947dc1..3613dca34 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -147,8 +147,8 @@ var gZenUIManager = {
     this.__currentPopupTrackElement = null;
   },
 
-  get newtabButton() {
-    return ZenWorkspaces.activeWorkspaceStrip.querySelector('#tabs-newtab-button');
+  get newtabButtons() {
+    return document.querySelectorAll('#tabs-newtab-button');
   },
 
   _prevUrlbarLabel: null,
@@ -168,7 +168,9 @@ var gZenUIManager = {
       this._prevUrlbarLabel = gURLBar._untrimmedValue;
       gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
       gURLBar.setAttribute('zen-newtab', true);
-      this.newtabButton.setAttribute('in-urlbar', true);
+      for (const button of this.newtabButtons) {
+        button.setAttribute('in-urlbar', true);
+      }
       document.getElementById('Browser:OpenLocation').doCommand();
       gURLBar.search(this._lastSearch);
       return true;
@@ -186,7 +188,9 @@ var gZenUIManager = {
     gURLBar.removeAttribute('zen-newtab');
     this._lastTab._visuallySelected = true;
     this._lastTab = null;
-    this.newtabButton.removeAttribute('in-urlbar');
+    for (const button of this.newtabButtons) {
+      button.removeAttribute('in-urlbar');
+    }
     if (onSwitch) {
       this.clearUrlbarData();
     } else {

From 7a6398db45a75f40225eb3eb009e3642b21ab4fb Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 23:57:10 +0100
Subject: [PATCH 150/191] Update MOZ_APP_DISPLAYNAME to use a consistent
 branding name in mozconfig

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

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index f840e768c..fce7a4692 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -9,7 +9,7 @@ ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_BASENAME=Zen
 export MOZ_APP_PROFILE=${binName}
-export MOZ_APP_DISPLAYNAME="${name}"
+export MOZ_APP_DISPLAYNAME="Zen"
 export MOZ_BRANDING_DIRECTORY=${brandingDir}
 export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
 

From 697db429f60f192c12e7277051794e7a90ca0d7b Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 00:45:07 +0100
Subject: [PATCH 151/191] Refactor zen-theme.css to improve toolbar background
 transparency handling

---
 .../base/content/zen-styles/zen-theme.css     |   9 +-
 .../zen-components/ZenPinnedTabManager.mjs    | 112 +++++++++---------
 .../tabbrowser/content/tabs-js.patch          |   4 +-
 3 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index f5482f7ac..72955e154 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -161,15 +161,10 @@
 
   @media (-moz-windows-mica) or (-moz-platform: macos) {
     background: transparent;
-    --zen-themed-toolbar-bg-transparency: 0;
+    --zen-themed-toolbar-bg-transparent: transparent;
     @media (-moz-bool-pref: 'zen.widget.windows.acrylic') {
-      --zen-themed-toolbar-bg-transparency: 15%;
+      --zen-themed-toolbar-bg-transparent: color-mix(in srgb, var(--zen-themed-toolbar-bg) 85%, transparent 15%);
     }
-    --zen-themed-toolbar-bg-transparent: color-mix(
-      in srgb,
-      var(--zen-themed-toolbar-bg) calc(100% - var(--zen-themed-toolbar-bg-transparency)),
-      transparent var(--zen-themed-toolbar-bg-transparency)
-    );
   }
 
   --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 3bb7f747f..97a373cb0 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -615,68 +615,70 @@
       document.getElementById('context_zen-pinned-tab-separator').hidden = !isVisible;
     }
 
-    moveToAnotherTabContainerIfNecessary(event, draggedTab) {
+    moveToAnotherTabContainerIfNecessary(event, movingTabs) {
       const pinnedTabsTarget =
         event.target.closest('#vertical-pinned-tabs-container') || event.target.closest('.zen-current-workspace-indicator');
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
 
-      let moved = false;
       let isVertical = this.expandedSidebarMode;
-      let isRegularTabs = false;
-      // Check for pinned tabs container
-      if (pinnedTabsTarget) {
-        if (!draggedTab.pinned) {
-          gBrowser.pinTab(draggedTab);
-          moved = true;
-        } else if (draggedTab.hasAttribute('zen-essential')) {
-          this.removeEssentials(draggedTab);
-          gBrowser.pinTab(draggedTab);
-          moved = true;
-        }
-      }
-      // Check for essentials container
-      else if (essentialTabsTarget) {
-        if (!draggedTab.hasAttribute('zen-essential')) {
-          this.addToEssentials(draggedTab);
-          moved = true;
-          isVertical = false;
-        }
-      }
-      // Check for normal tabs container
-      else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
-        if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
-          gBrowser.unpinTab(draggedTab);
-          moved = true;
-          isRegularTabs = true;
-        } else if (draggedTab.hasAttribute('zen-essential')) {
-          this.removeEssentials(draggedTab);
-          moved = true;
-          isRegularTabs = true;
-        }
-      }
-
-      // If the tab was moved, adjust its position relative to the target tab
-      if (moved) {
-        const targetTab = event.target.closest('.tabbrowser-tab');
-        if (targetTab) {
-          const rect = targetTab.getBoundingClientRect();
-          let newIndex = targetTab._tPos;
-
-          if (isVertical) {
-            const middleY = targetTab.screenY + rect.height / 2;
-            if (!isRegularTabs && event.screenY > middleY) {
-              newIndex++;
-            } else if (isRegularTabs && event.screenY < middleY) {
-              newIndex--;
-            }
-          } else {
-            const middleX = targetTab.screenX + rect.width / 2;
-            if (event.screenX > middleX) {
-              newIndex++;
-            }
+      let moved = false;
+      for (const draggedTab of movingTabs) {
+        let isRegularTabs = false;
+        // Check for pinned tabs container
+        if (pinnedTabsTarget) {
+          if (!draggedTab.pinned) {
+            gBrowser.pinTab(draggedTab);
+            moved = true;
+          } else if (draggedTab.hasAttribute('zen-essential')) {
+            this.removeEssentials(draggedTab);
+            gBrowser.pinTab(draggedTab);
+            moved = true;
+          }
+        }
+        // Check for essentials container
+        else if (essentialTabsTarget) {
+          if (!draggedTab.hasAttribute('zen-essential')) {
+            this.addToEssentials(draggedTab);
+            moved = true;
+            isVertical = false;
+          }
+        }
+        // Check for normal tabs container
+        else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
+          if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
+            gBrowser.unpinTab(draggedTab);
+            moved = true;
+            isRegularTabs = true;
+          } else if (draggedTab.hasAttribute('zen-essential')) {
+            this.removeEssentials(draggedTab);
+            moved = true;
+            isRegularTabs = true;
+          }
+        }
+
+        // If the tab was moved, adjust its position relative to the target tab
+        if (moved) {
+          const targetTab = event.target.closest('.tabbrowser-tab');
+          if (targetTab) {
+            const rect = targetTab.getBoundingClientRect();
+            let newIndex = targetTab._tPos;
+
+            if (isVertical) {
+              const middleY = targetTab.screenY + rect.height / 2;
+              if (!isRegularTabs && event.screenY > middleY) {
+                newIndex++;
+              } else if (isRegularTabs && event.screenY < middleY) {
+                newIndex--;
+              }
+            } else {
+              const middleX = targetTab.screenX + rect.width / 2;
+              if (event.screenX > middleX) {
+                newIndex++;
+              }
+            }
+            gBrowser.moveTabTo(draggedTab, newIndex);
           }
-          gBrowser.moveTabTo(draggedTab, newIndex);
         }
       }
 
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 878c2193a..03326222f 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..3d323615040dcb5e379519878fb7874d5b28de81 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..393458caa425e0a980223cd3800ea0ef33542c84 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -52,7 +52,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..3d323615040dcb5e379519878fb7874d
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
 +      if (draggedTab && dropEffect == "move") {
-+        let moved = gZenPinnedTabManager.moveToAnotherTabContainerIfNecessary(event, draggedTab);
++        let moved = gZenPinnedTabManager.moveToAnotherTabContainerIfNecessary(event, movingTabs);
 +
 +        if (moved) {
 +          this._finishMoveTogetherSelectedTabs(draggedTab);

From 1aea93a57b8974c9580959efff903740554a1753 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:08:40 +0100
Subject: [PATCH 152/191]

---
 .../tabbrowser/content/tabbrowser-js.patch    | 89 +++++++++++--------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 6790f1ba4..43ac69e29 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b62093051cc9a 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f13966d8e2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -406,11 +406,39 @@
+@@ -406,11 +406,52 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -13,6 +13,19 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +          break;
 +        }
 +        if (!tab.hidden) {
++          i += !tab.hasAttribute("zen-glance-tab");
++        }
++      }
++      return i;
++    }
++
++    get _numVisiblePinTabsWithoutGlance() {
++      let i = 0;
++      for (let tab of this.tabs) {
++        if (!tab.pinned) {
++          break;
++        }
++        if (!tab.hidden && !tab.hasAttribute("zen-glance-tab")) {
 +          i++;
 +        }
 +      }
@@ -26,7 +39,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +          break;
 +        }
 +        if (!tab.hidden) {
-+          i++;
++          i += !tab.hasAttribute("zen-glance-tab");
 +        }
 +      }
 +      return i;
@@ -40,11 +53,11 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
            break;
          }
-+        i++;
++        i += !tab.hasAttribute("zen-glance-tab");
        }
        return i;
      }
-@@ -807,7 +835,7 @@
+@@ -807,7 +848,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -53,7 +66,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          );
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
-@@ -828,7 +856,7 @@
+@@ -828,7 +869,7 @@
            // the moving of a tab from the vertical pinned tabs container
            // and back into arrowscrollbox.
            aTab.removeAttribute("pinned");
@@ -62,7 +75,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          });
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1055,6 +1083,8 @@
+@@ -1055,6 +1096,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -71,7 +84,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1065,6 +1095,9 @@
+@@ -1065,6 +1108,9 @@
          );
          return;
        }
@@ -81,7 +94,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1310,6 +1343,7 @@
+@@ -1310,6 +1356,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -89,7 +102,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1462,6 +1496,9 @@
+@@ -1462,6 +1509,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -99,7 +112,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -2387,7 +2424,7 @@
+@@ -2387,7 +2437,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -108,7 +121,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2446,8 +2483,8 @@
+@@ -2446,8 +2496,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) {
@@ -119,7 +132,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2679,6 +2716,12 @@
+@@ -2679,6 +2729,12 @@
          );
        }
  
@@ -132,7 +145,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2742,6 +2785,12 @@
+@@ -2742,6 +2798,12 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -145,7 +158,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2885,6 +2934,9 @@
+@@ -2885,6 +2947,9 @@
          }
        }
  
@@ -155,7 +168,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3455,21 @@
+@@ -3403,6 +3468,21 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -177,7 +190,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3483,7 @@
+@@ -3416,6 +3496,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -185,7 +198,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3519,21 @@
+@@ -3451,7 +3532,21 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -208,7 +221,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (select) {
              tabToSelect = tab;
            }
-@@ -3464,8 +3546,8 @@
+@@ -3464,8 +3559,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) {
@@ -219,7 +232,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
              tab.toggleAttribute("pinned", true);
              this.tabContainer._invalidateCachedTabs();
              // Then ensure all the tab open/pinning information is sent.
-@@ -3729,7 +3811,7 @@
+@@ -3729,7 +3824,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.
@@ -228,7 +241,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3862,7 @@
+@@ -3780,7 +3875,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -237,7 +250,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4177,9 @@
+@@ -4095,6 +4190,9 @@
          return;
        }
  
@@ -247,7 +260,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        this.removeTabs(selectedTabs);
      }
  
-@@ -4427,6 +4512,7 @@
+@@ -4427,6 +4525,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -255,7 +268,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4443,6 +4529,12 @@
+@@ -4443,6 +4542,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -268,7 +281,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4549,9 @@
+@@ -4457,7 +4562,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -279,7 +292,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4565,6 @@
+@@ -4471,7 +4578,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -287,7 +300,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4703,14 @@
+@@ -4610,14 +4716,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -304,7 +317,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4812,6 +4905,8 @@
+@@ -4812,6 +4918,8 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -313,7 +326,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (!this._windowIsClosing) {
          if (wasPinned) {
            this.tabContainer._positionPinnedTabs();
-@@ -5465,10 +5560,10 @@
+@@ -5465,10 +5573,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -326,19 +339,19 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5706,9 +5801,9 @@
+@@ -5706,9 +5814,9 @@
  
        // Don't allow mixing pinned and unpinned tabs.
        if (aTab.pinned) {
 -        aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
-+        aIndex = Math.min(aIndex, this._numVisiblePinTabs - 1);
++        aIndex = Math.min(aIndex, (aTab.hasAttribute('zen-essential') ? this._numZenEssentials : this._numVisiblePinTabsWithoutGlance) - 1);
        } else {
 -        aIndex = Math.max(aIndex, this.pinnedTabCount);
-+        aIndex = Math.max(aIndex, this._numVisiblePinTabs);
++        aIndex = Math.max(aIndex, this._numVisiblePinTabsWithoutGlance);
        }
        if (aTab._tPos == aIndex) {
          return;
-@@ -5727,6 +5822,9 @@
+@@ -5727,6 +5835,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -348,7 +361,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -5802,7 +5900,7 @@
+@@ -5802,7 +5913,7 @@
          createLazyBrowser,
        };
  
@@ -357,7 +370,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
          params.pinned = true;
        }
-@@ -7443,6 +7541,7 @@
+@@ -7443,6 +7554,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -365,7 +378,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8510,7 @@ var TabContextMenu = {
+@@ -8411,7 +8523,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -374,7 +387,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8543,7 @@ var TabContextMenu = {
+@@ -8444,7 +8556,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -383,7 +396,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8776,7 @@ var TabContextMenu = {
+@@ -8677,6 +8789,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From e3bcffdd6b9462b98787ebf347eb87ba28a50444 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:26:32 +0100
Subject: [PATCH 153/191] Refactor vertical-tabs.css to enhance tab background
 styling and improve layout consistency

---
 .../zen-styles/zen-tabs/vertical-tabs.css     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 286493476..7f0312f38 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -280,10 +280,6 @@
       }
     }
 
-    &[selected] .tab-background {
-      backdrop-filter: blur(10px);
-    }
-
     @media (-moz-bool-pref: 'zen.tabs.dim-pending') {
       &[pending='true'] .tab-icon-image {
         opacity: 0.5;
@@ -326,13 +322,18 @@
     /* On essentials, glance tabs are floating */
     &[zen-essential='true'] .tabbrowser-tab {
       position: absolute;
-      top: 4px;
-      right: 4px;
-      --tab-collapsed-width: 35px;
+      top: 0px;
+      right: 0px;
+      --tab-collapsed-width: 34px;
       --tab-min-height: 16px;
       width: var(--tab-collapsed-width) !important;
       z-index: 1;
       pointer-events: none;
+      & .tab-background {
+        /* Solid colors because we don't want to show the background */
+        background: light-dark(rgb(249, 249, 249), rgb(63, 63, 63)) !important;
+        border: 2px solid light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4));
+      }
     }
   }
 }
@@ -954,7 +955,7 @@
   padding: 0;
 }
 
-#zen-essentials-container .tabbrowser-tab {
+#zen-essentials-container > .tabbrowser-tab {
   --toolbarbutton-inner-padding: 0;
   max-width: unset;
   width: 100% !important;
@@ -994,7 +995,7 @@
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
-    &[visuallyselected] .tab-background {
+    &[visuallyselected] > .tab-stack > .tab-background {
       &::after {
         content: "";
         inset: -50%;

From 1eb04862fcf0f3538e645aab6e877e3190f789c9 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:29:45 +0100
Subject: [PATCH 154/191] Remove update-submodules workflow file to streamline
 CI processes

---
 .github/workflows/update-submodules.yml | 31 -------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 .github/workflows/update-submodules.yml

diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
deleted file mode 100644
index 18fa6cc26..000000000
--- a/.github/workflows/update-submodules.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Update Components Submodules
-
-on:
-  push:
-    branches:
-      - dev
-  workflow_dispatch:
-  workflow_call:
-
-jobs:
-  update-submodules:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.DEPLOY_KEY }}
-
-      - name: Update submodules
-        run: |
-          git submodule update --remote --merge
-
-      - name: Commit
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: '[skip ci] 📦 Update submodules'
-          commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-auto@users.noreply.github.com

From 25b41f8bb6479cfd68c9204395949f890c712187 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:49:22 +0100
Subject: [PATCH 155/191] Enhance tab label handling to support static labels
 and filter glance tabs during tab movement

---
 .../tabbrowser/content/tabbrowser-js.patch    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 43ac69e29..3a56da16a 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f13966d8e2 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafeda43b085 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,52 @@
@@ -112,6 +112,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f1
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
+@@ -1785,7 +1835,7 @@
+     }
+ 
+     _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
+-      if (!aLabel || aLabel.includes("about:reader?")) {
++      if (!aLabel || aLabel.includes("about:reader?") || aTab.hasAttribute("zen-has-static-label")) {
+         return false;
+       }
+ 
 @@ -2387,7 +2437,7 @@
  
        let panel = this.getPanel(browser);
@@ -351,6 +360,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f1
        }
        if (aTab._tPos == aIndex) {
          return;
+@@ -5717,7 +5825,7 @@
+       this._lastRelatedTabMap = new WeakMap();
+ 
+       this._handleTabMove(aTab, () => {
+-        let neighbor = this.tabs[aIndex];
++        let neighbor = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab"))[aIndex];
+         if (forceStandaloneTab && neighbor.group) {
+           neighbor = neighbor.group;
+         }
 @@ -5727,6 +5835,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }

From a5e34fc9a556810c05b832e1f0c121ab7c81056e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 02:10:37 +0100
Subject: [PATCH 156/191] Refactor tab renaming logic to ensure consistent
 label handling and add animation effect; update CSS for vertical tabs to
 improve styling

---
 src/browser/base/content/ZenUIManager.mjs             | 11 ++++++++++-
 .../content/zen-styles/zen-tabs/vertical-tabs.css     |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index de6c363ae..f09b26044 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -624,14 +624,23 @@ var gZenVerticalTabsManager = {
       let newName = input.value.trim();
 
       // Check if name is blank, reset if so
+      // Always remove, so we can always rename and if it's empty,
+      // it will reset to the original name anyway
+      this._tabEdited.removeAttribute('zen-has-static-label');
       if (newName) {
         gBrowser._setTabLabel(this._tabEdited, newName);
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        this._tabEdited.removeAttribute('zen-has-static-label');
         gBrowser.setTabTitle(this._tabEdited);
       }
 
+      // Maybe add some confetti here?!?
+      gZenUIManager.motion.animate(this._tabEdited, {
+        scale: [1, 0.98, 1],
+      }, {
+        duration: 0.25,
+      });
+
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.classList.remove('tab-label-container-editing');
 
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 0ca35b4f0..eeab85cdb 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1148,6 +1148,9 @@
   white-space: nowrap;
   overflow-x: scroll;
   margin: 0;
+  background: transparent;
+  border: none;
+  padding: 0;
 }
 
 /* Section: tab workspaces stylings */

From be6cd98ceca143e28ea2ab6121c9bc278489fde8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 09:57:40 +0100
Subject: [PATCH 157/191] Refactor animation code for tab editing to improve
 readability and maintainability

---
 src/browser/base/content/ZenUIManager.mjs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index f09b26044..8e77740e0 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -635,11 +635,15 @@ var gZenVerticalTabsManager = {
       }
 
       // Maybe add some confetti here?!?
-      gZenUIManager.motion.animate(this._tabEdited, {
-        scale: [1, 0.98, 1],
-      }, {
-        duration: 0.25,
-      });
+      gZenUIManager.motion.animate(
+        this._tabEdited,
+        {
+          scale: [1, 0.98, 1],
+        },
+        {
+          duration: 0.25,
+        }
+      );
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.classList.remove('tab-label-container-editing');

From 60be48609589a623c4b0c44d5491426ba9b894b0 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 11:23:44 +0100
Subject: [PATCH 158/191] Implement toast notifications for user actions and
 enhance UI feedback

---
 src/browser/base/content/ZenUIManager.mjs     | 36 +++++++++++++++++++
 src/browser/base/content/browser-xhtml.patch  |  5 +--
 .../base/content/zen-styles/zen-popup.css     | 27 ++++++++++++++
 .../base/zen-components/ZenCommonUtils.mjs    |  4 +--
 .../zen-components/ZenGradientGenerator.mjs   |  2 +-
 .../base/zen-components/ZenViewSplitter.mjs   |  5 ++-
 6 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 8e77740e0..8180d1772 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -14,6 +14,10 @@ var gZenUIManager = {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
     });
 
+    ChromeUtils.defineLazyGetter(this, '_toastContainer', () => {
+      return document.getElementById('zen-toast-container');
+    });
+
     new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(document.getElementById('TabsToolbar'));
 
     new ResizeObserver(
@@ -209,6 +213,38 @@ var gZenUIManager = {
       }
     }
   },
+
+  // Section: Notification messages
+  _createToastElement(messageId, options) {
+    const element = document.createXULElement('vbox');
+    const label = document.createXULElement('label');
+    document.l10n.setAttributes(label, messageId, options);
+    element.appendChild(label);
+    if (options.descriptionId) {
+      const description = document.createXULElement('label');
+      description.classList.add('description');
+      document.l10n.setAttributes(description, options.descriptionId, options);
+      element.appendChild(description);
+    }
+    element.classList.add('zen-toast');
+    return element;
+  },
+
+  async showToast(messageId, options = {}) {
+    const toast = this._createToastElement(messageId, options);
+    this._toastContainer.removeAttribute('hidden');
+    this._toastContainer.appendChild(toast);
+    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', duration: 0.3 });
+    await new Promise((resolve) => setTimeout(resolve, 3000));
+    await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
+    const toastHeight = toast.getBoundingClientRect().height;
+    // 5 for the separation between toasts
+    await this.motion.animate(toast, { marginBottom: [0, `-${toastHeight + 5}px`] }, { duration: 0.2 });
+    toast.remove();
+    if (!this._toastContainer.hasChildNodes()) {
+      this._toastContainer.setAttribute('hidden', 'true');
+    }
+  },
 };
 
 var gZenVerticalTabsManager = {
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index f55a99295..248781b38 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b09d63ac5 100644
+index 891c067d6ad718061c410c04743bed25744504b5..b7ded9691225068b23e4d6a5113242d0c0f5f842 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -99,6 +99,8 @@
@@ -19,7 +19,7 @@ index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -164,9 +167,12 @@
+@@ -164,9 +167,13 @@
      </vbox>
    </html:template>
  
@@ -27,6 +27,7 @@ index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b
 -
 -#include browser-box.inc.xhtml
 +  <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>
diff --git a/src/browser/base/content/zen-styles/zen-popup.css b/src/browser/base/content/zen-styles/zen-popup.css
index adc2fb884..e6f773936 100644
--- a/src/browser/base/content/zen-styles/zen-popup.css
+++ b/src/browser/base/content/zen-styles/zen-popup.css
@@ -349,3 +349,30 @@ menuitem {
 #editBMPanel_workspaceList input[type='checkbox'] {
   margin-right: 8px;
 }
+
+/* Section: Toast notifications */
+
+#zen-toast-container {
+  position: fixed;
+  top: calc(var(--zen-element-separation) * 2);
+  right: calc(var(--zen-element-separation) * 2);
+  z-index: 1000;
+  gap: 1rem;
+
+  & .zen-toast {
+    padding: 0.9rem 0.8rem;
+    border-radius: 12px;
+    background-color: var(--button-primary-bgcolor);
+    color: var(--button-primary-color);
+    box-shadow: var(--zen-big-shadow);
+    display: flex;
+    gap: 5px;
+    flex-direction: column;
+    gap: 2px;
+    width: fit-content;
+
+    & .description {
+      opacity: 0.6;
+    }
+  }
+}
diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index 701363e36..83a75a1c8 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -69,7 +69,7 @@ var gZenCommonActions = {
       transferable.addDataFlavor('text/plain');
       transferable.setTransferData('text/plain', str);
       Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-      ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+      gZenUIManager.showToast('zen-copy-current-url-confirmation');
     }
   },
   copyCurrentURLAsMarkdownToClipboard() {
@@ -84,7 +84,7 @@ var gZenCommonActions = {
       transferable.addDataFlavor('text/plain');
       transferable.setTransferData('text/plain', str);
       Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-      ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+      gZenUIManager.showToast('zen-copy-current-url-confirmation');
     }
   },
 
diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index 963f87f76..59a19671a 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -725,7 +725,7 @@
       if (!skipSave) {
         await ZenWorkspacesStorage.saveWorkspaceTheme(currentWorkspace.uuid, gradient);
         await ZenWorkspaces._propagateWorkspaceData();
-        ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-panel-ui-gradient-generator-saved-message');
+        gZenUIManager.showToast('zen-panel-ui-gradient-generator-saved-message');
         currentWorkspace = await ZenWorkspaces.getActiveWorkspace();
       }
 
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index fb715e2a5..2224f6c5c 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -192,14 +192,13 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
 
   afterRearangeAction() {
     document.getElementById('zenSplitViewModifier').hidePopup();
-    ConfirmationHint.show(document.getElementById('zen-split-views-box'), 'zen-split-view-modifier-enabled-toast', {
+    gZenUIManager.showToast('zen-split-view-modifier-enabled-toast', {
       descriptionId: 'zen-split-view-modifier-enabled-toast-description',
-      showDescription: true,
     });
   }
 
   afterRearangeRemove() {
-    ConfirmationHint.show(document.getElementById('zen-split-views-box'), 'zen-split-view-modifier-disabled-toast');
+    gZenUIManager.showToast('zen-split-view-modifier-disabled-toast');
   }
 
   toggleWrapperDisplay(value) {

From 534627fd113ff390a5b1c2405b67611e32bd76bc Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 11:35:51 +0100
Subject: [PATCH 159/191] Add hover effect to toolbar elements in
 zen-workspaces.css for improved UI interaction

---
 src/browser/base/content/zen-styles/zen-workspaces.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 288032e8b..34a6e6466 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -73,6 +73,10 @@
           filter: grayscale(0);
           opacity: 1;
         }
+
+        &:hover {
+          background-color: var(--zen-toolbar-element-bg);
+        }
       }
     }
   }

From 3c3efde2e65f379f71b3217bba16bb58142908de Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 13:01:09 +0100
Subject: [PATCH 160/191] Refactor CSS variables for button backgrounds and
 text colors to enhance theme consistency and improve hover effects

---
 .../base/content/zen-styles/zen-theme.css     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 72955e154..9a36206bf 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -12,8 +12,8 @@
 :root,
 .zenLooksAndFeelColorOption {
   /** We also add `.zenLooksAndFeelColorOption` so that it recalculates the colors when the theme changes
-  * in the preferences page.
-  */
+   * in the preferences page.
+   */
 
   /* Default values */
   --zen-border-radius: 7px;
@@ -46,21 +46,21 @@
 
   --in-content-primary-button-background: color-mix(
     in srgb,
-    var(--zen-primary-color) 10%,
-    var(--zen-branding-bg) 90%
+    var(--zen-primary-color) 30%,
+    var(--zen-branding-bg-reverse) 70%
   ) !important;
   --in-content-primary-button-background-hover: color-mix(
     in srgb,
-    var(--zen-primary-color) 15%,
-    var(--zen-branding-bg) 85%
+    var(--zen-primary-color) 35%,
+    var(--zen-branding-bg-reverse) 65%
   ) !important;
   --in-content-primary-button-background-active: color-mix(
     in srgb,
-    var(--zen-primary-color) 20%,
-    var(--zen-branding-bg) 80%
+    var(--zen-primary-color) 40%,
+    var(--zen-branding-bg-reverse) 60%
   ) !important;
-  --button-text-color-primary: var(--zen-branding-bg-reverse) !important;
-  --in-content-primary-button-text-color: var(--zen-colors-primary-foreground) !important;
+  --button-text-color-primary: var(--zen-branding-bg) !important;
+  --in-content-primary-button-text-color: var(--zen-branding-bg) !important;
   --in-content-primary-button-border-color: transparent !important;
   --in-content-primary-button-border-hover: transparent !important;
   --in-content-primary-button-border-active: var(--zen-colors-border) !important;
@@ -72,7 +72,7 @@
   /* This is like the secondary button */
   --in-content-button-background: transparent !important;
   --in-content-button-text-color: var(--zen-secondary-btn-color) !important;
-  --in-content-button-background-hover: color-mix(in srgb, var(--zen-primary-color) 5%, var(--zen-branding-bg) 60%) !important;
+  --in-content-button-background-hover: color-mix(in srgb, currentColor 3%, transparent 97%) !important;
   --button-bgcolor: var(--in-content-button-background) !important;
   --button-hover-bgcolor: var(--in-content-button-background-hover) !important;
   --button-hover-color: var(--in-content-button-text-color-hover) !important;
@@ -88,7 +88,7 @@
 
   --button-background-color: var(--in-content-button-background) !important;
   --button-background-color-hover: var(--in-content-button-background-hover) !important;
-  --button-background-color-active: var(--in-content-primary-button-background-active) !important;
+  --button-background-color-active: color-mix(in srgb, currentColor 5%, transparent 95%) !important;
 
   --color-accent-primary: var(--button-primary-bgcolor) !important;
   --color-accent-primary-hover: var(--button-primary-hover-bgcolor) !important;
@@ -180,9 +180,9 @@
   --zen-native-inner-radius: var(
     --zen-webview-border-radius,
     /* Inner radius calculation:
-      * 1. If the native radius - the separation is less than 4px, use 4px.
-      * 2. Otherwise, use the the calculated value (inner radius = outer radius - separation).
-    */
+       * 1. If the native radius - the separation is less than 4px, use 4px.
+       * 2. Otherwise, use the the calculated value (inner radius = outer radius - separation).
+     */
       max(5px, calc(var(--zen-native-content-radius) - var(--zen-element-separation) / 2))
   );
 

From 123128bfc7e867629831015647f6ef518be78757 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 15 Feb 2025 18:37:13 +0100
Subject: [PATCH 161/191] Added support for macos monochrome titlebar buttons,
 on by default

---
 src/browser/app/profile/zen-browser.js        |  1 +
 .../content/zen-styles/zen-browser-ui.css     | 24 +++++++++++++++--
 .../base/zen-components/ZenCompactMode.mjs    |  8 ++++--
 .../libpref/init/StaticPrefList-yaml.patch    | 13 +++------
 src/widget/cocoa/nsCocoaWindow-mm.patch       | 27 -------------------
 5 files changed, 32 insertions(+), 41 deletions(-)
 delete mode 100644 src/widget/cocoa/nsCocoaWindow-mm.patch

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index e0d21b352..fb124d615 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -143,6 +143,7 @@ pref('zen.view.sidebar-expanded.max-width', 500);
 
 #ifdef XP_MACOSX
 pref('zen.view.mac.show-three-dot-menu', false);
+pref('zen.widget.mac.mono-window-controls', true);
 #endif
 pref('zen.view.show-bottom-border', false);
 pref('zen.view.use-single-toolbar', true);
diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 0257ac92f..92f956bea 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -152,12 +152,32 @@
   gap: var(--zen-element-separation);
 }
 
-.titlebar-buttonbox-container {
-  height: 100%;
+@media not (-moz-platform: macos) { 
+  .titlebar-buttonbox-container {
+    height: 100%;
+  }
 }
 
 @media (-moz-platform: macos) {
   .titlebar-buttonbox-container {
     margin-inline-end: 8px;
+
+    & > .titlebar-buttonbox {
+      margin-inline-start: var(--zen-toolbox-padding);
+    }
+  }
+
+  @media (-moz-bool-pref: 'zen.widget.mac.mono-window-controls') {
+    .titlebar-buttonbox-container {
+      /* Draw 3 dots as background to represent the window controls,
+        all with the same cololr as the titlebar */
+      background-image: radial-gradient(circle, #4d4c4a 6px, transparent 0.5px);
+      background-size: 20px 22px;
+      background-position: 52% 50%;
+
+      &:not([zen-has-hover='true']) > .titlebar-buttonbox {
+        opacity: 0;
+      }
+    }
   }
 }
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 56bf32ecb..d510aed56 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -292,6 +292,9 @@ var gZenCompactModeManager = {
         element: document.getElementById('zen-appcontent-navbar-container'),
         screenEdge: 'top',
       },
+      {
+        element: gZenVerticalTabsManager.actualWindowButtons,
+      }
     ];
   },
 
@@ -336,8 +339,9 @@ var gZenCompactModeManager = {
       target.addEventListener('mouseleave', (event) => {
         // If on Mac, ignore mouseleave in the area of window buttons
         if (AppConstants.platform == 'macosx') {
-          const MAC_WINDOW_BUTTONS_X_BORDER = 75;
-          const MAC_WINDOW_BUTTONS_Y_BORDER = 40;
+          const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
+          const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
+          const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
           if (event.clientX < MAC_WINDOW_BUTTONS_X_BORDER && event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER) {
             return;
           }
diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index fadcff2b1..ac8018292 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e770a24ec7 100644
+index ce2393978f77f55f42ae9b97e5d40328ce8eaae4..a426679de76c2d172974ec87f5fe48e22d5ab7b0 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -18067,7 +18067,7 @@
+@@ -18060,7 +18060,7 @@
  # Whether we use the mica backdrop. Off by default for now.
  - name: widget.windows.mica
    type: bool
@@ -11,7 +11,7 @@ index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e7
    mirror: once
  #endif
  
-@@ -18180,6 +18180,26 @@
+@@ -18173,6 +18173,19 @@
    mirror: always
  #endif
  
@@ -21,13 +21,6 @@ index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e7
 +  value: true
 +  mirror: never
 +
-+#ifdef XP_MACOSX
-+- name: zen.widget.mac.mono-window-controls
-+  type: RelaxedAtomicBool
-+  value: false
-+  mirror: always
-+#endif
-+
 +#ifdef XP_WIN
 +- name: zen.widget.windows.acrylic
 +  type: bool
diff --git a/src/widget/cocoa/nsCocoaWindow-mm.patch b/src/widget/cocoa/nsCocoaWindow-mm.patch
deleted file mode 100644
index 071a19813..000000000
--- a/src/widget/cocoa/nsCocoaWindow-mm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
-index f1c87dd8faef8c6caf9248ce7d9f40c12f5db9f6..f5280b8fc6cf46d3941d1ff04835b12dd2755170 100644
---- a/widget/cocoa/nsCocoaWindow.mm
-+++ b/widget/cocoa/nsCocoaWindow.mm
-@@ -51,6 +51,7 @@
- #include "mozilla/ScopeExit.h"
- #include "mozilla/StaticPrefs_gfx.h"
- #include "mozilla/StaticPrefs_widget.h"
-+#include "mozilla/StaticPrefs_zen.h"
- #include "mozilla/WritingModes.h"
- #include "mozilla/layers/CompositorBridgeChild.h"
- #include "mozilla/widget/Screen.h"
-@@ -682,9 +683,11 @@ static unsigned int WindowMaskForBorderStyle(BorderStyle aBorderStyle) {
-       continue;
-     }
-     NSWindow* win = ancestor->GetCocoaWindow();
--    [[win standardWindowButton:NSWindowCloseButton] setEnabled:!aModal];
--    [[win standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!aModal];
--    [[win standardWindowButton:NSWindowZoomButton] setEnabled:!aModal];
-+
-+    auto zenBtnEnabled = StaticPrefs::zen_widget_mac_mono_window_controls() ? false : !aModal;
-+    [[win standardWindowButton:NSWindowCloseButton] setEnabled:zenBtnEnabled];
-+    [[win standardWindowButton:NSWindowMiniaturizeButton] setEnabled:zenBtnEnabled];
-+    [[win standardWindowButton:NSWindowZoomButton] setEnabled:zenBtnEnabled];
-   }
-   if (aModal) {
-     mWindow.level = NSModalPanelWindowLevel;

From 894d237841c5ef1f64d9521cfbd609378200c593 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 15 Feb 2025 18:48:31 +0100
Subject: [PATCH 162/191] Fixed havhing monochrome titlebar buttons not being
 disabled

---
 .../base/content/zen-styles/zen-browser-ui.css      |  3 ++-
 src/browser/base/zen-components/ZenCompactMode.mjs  | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 92f956bea..d4ca2ea19 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -152,7 +152,7 @@
   gap: var(--zen-element-separation);
 }
 
-@media not (-moz-platform: macos) { 
+@media not (-moz-platform: macos) {
   .titlebar-buttonbox-container {
     height: 100%;
   }
@@ -161,6 +161,7 @@
 @media (-moz-platform: macos) {
   .titlebar-buttonbox-container {
     margin-inline-end: 8px;
+    padding: 3px 0;
 
     & > .titlebar-buttonbox {
       margin-inline-start: var(--zen-toolbox-padding);
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index d510aed56..7e0c35b97 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -294,7 +294,7 @@ var gZenCompactModeManager = {
       },
       {
         element: gZenVerticalTabsManager.actualWindowButtons,
-      }
+      },
     ];
   },
 
@@ -343,7 +343,16 @@ var gZenCompactModeManager = {
           const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
           const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
           if (event.clientX < MAC_WINDOW_BUTTONS_X_BORDER && event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER) {
-            return;
+            // Also check if it has gone from the top or left if we are exiting the titlebar
+            // button area
+            if (
+              !(
+                target.classList.contains('titlebar-buttonbox-container') &&
+                (event.clientX < buttonRect.x || event.clientY < buttonRect.y)
+              )
+            ) {
+              return;
+            }
           }
         }
 

From 4d364acc1d280977a4fd93d91636be9316510e88 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:08:40 +0100
Subject: [PATCH 163/191] merge

---
 .../tabbrowser/content/tabbrowser-js.patch    | 89 +++++++++++--------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 6790f1ba4..43ac69e29 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b62093051cc9a 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f13966d8e2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -406,11 +406,39 @@
+@@ -406,11 +406,52 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -13,6 +13,19 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +          break;
 +        }
 +        if (!tab.hidden) {
++          i += !tab.hasAttribute("zen-glance-tab");
++        }
++      }
++      return i;
++    }
++
++    get _numVisiblePinTabsWithoutGlance() {
++      let i = 0;
++      for (let tab of this.tabs) {
++        if (!tab.pinned) {
++          break;
++        }
++        if (!tab.hidden && !tab.hasAttribute("zen-glance-tab")) {
 +          i++;
 +        }
 +      }
@@ -26,7 +39,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +          break;
 +        }
 +        if (!tab.hidden) {
-+          i++;
++          i += !tab.hasAttribute("zen-glance-tab");
 +        }
 +      }
 +      return i;
@@ -40,11 +53,11 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
            break;
          }
-+        i++;
++        i += !tab.hasAttribute("zen-glance-tab");
        }
        return i;
      }
-@@ -807,7 +835,7 @@
+@@ -807,7 +848,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -53,7 +66,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          );
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
-@@ -828,7 +856,7 @@
+@@ -828,7 +869,7 @@
            // the moving of a tab from the vertical pinned tabs container
            // and back into arrowscrollbox.
            aTab.removeAttribute("pinned");
@@ -62,7 +75,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          });
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1055,6 +1083,8 @@
+@@ -1055,6 +1096,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -71,7 +84,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1065,6 +1095,9 @@
+@@ -1065,6 +1108,9 @@
          );
          return;
        }
@@ -81,7 +94,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1310,6 +1343,7 @@
+@@ -1310,6 +1356,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -89,7 +102,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1462,6 +1496,9 @@
+@@ -1462,6 +1509,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -99,7 +112,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -2387,7 +2424,7 @@
+@@ -2387,7 +2437,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -108,7 +121,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2446,8 +2483,8 @@
+@@ -2446,8 +2496,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) {
@@ -119,7 +132,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2679,6 +2716,12 @@
+@@ -2679,6 +2729,12 @@
          );
        }
  
@@ -132,7 +145,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2742,6 +2785,12 @@
+@@ -2742,6 +2798,12 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -145,7 +158,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2885,6 +2934,9 @@
+@@ -2885,6 +2947,9 @@
          }
        }
  
@@ -155,7 +168,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3455,21 @@
+@@ -3403,6 +3468,21 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -177,7 +190,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3483,7 @@
+@@ -3416,6 +3496,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -185,7 +198,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3519,21 @@
+@@ -3451,7 +3532,21 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -208,7 +221,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (select) {
              tabToSelect = tab;
            }
-@@ -3464,8 +3546,8 @@
+@@ -3464,8 +3559,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) {
@@ -219,7 +232,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
              tab.toggleAttribute("pinned", true);
              this.tabContainer._invalidateCachedTabs();
              // Then ensure all the tab open/pinning information is sent.
-@@ -3729,7 +3811,7 @@
+@@ -3729,7 +3824,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.
@@ -228,7 +241,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3862,7 @@
+@@ -3780,7 +3875,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -237,7 +250,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4177,9 @@
+@@ -4095,6 +4190,9 @@
          return;
        }
  
@@ -247,7 +260,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        this.removeTabs(selectedTabs);
      }
  
-@@ -4427,6 +4512,7 @@
+@@ -4427,6 +4525,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -255,7 +268,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4443,6 +4529,12 @@
+@@ -4443,6 +4542,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -268,7 +281,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4549,9 @@
+@@ -4457,7 +4562,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -279,7 +292,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4565,6 @@
+@@ -4471,7 +4578,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -287,7 +300,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4703,14 @@
+@@ -4610,14 +4716,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -304,7 +317,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4812,6 +4905,8 @@
+@@ -4812,6 +4918,8 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -313,7 +326,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (!this._windowIsClosing) {
          if (wasPinned) {
            this.tabContainer._positionPinnedTabs();
-@@ -5465,10 +5560,10 @@
+@@ -5465,10 +5573,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -326,19 +339,19 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5706,9 +5801,9 @@
+@@ -5706,9 +5814,9 @@
  
        // Don't allow mixing pinned and unpinned tabs.
        if (aTab.pinned) {
 -        aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
-+        aIndex = Math.min(aIndex, this._numVisiblePinTabs - 1);
++        aIndex = Math.min(aIndex, (aTab.hasAttribute('zen-essential') ? this._numZenEssentials : this._numVisiblePinTabsWithoutGlance) - 1);
        } else {
 -        aIndex = Math.max(aIndex, this.pinnedTabCount);
-+        aIndex = Math.max(aIndex, this._numVisiblePinTabs);
++        aIndex = Math.max(aIndex, this._numVisiblePinTabsWithoutGlance);
        }
        if (aTab._tPos == aIndex) {
          return;
-@@ -5727,6 +5822,9 @@
+@@ -5727,6 +5835,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -348,7 +361,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -5802,7 +5900,7 @@
+@@ -5802,7 +5913,7 @@
          createLazyBrowser,
        };
  
@@ -357,7 +370,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
          params.pinned = true;
        }
-@@ -7443,6 +7541,7 @@
+@@ -7443,6 +7554,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -365,7 +378,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8510,7 @@ var TabContextMenu = {
+@@ -8411,7 +8523,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -374,7 +387,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8543,7 @@ var TabContextMenu = {
+@@ -8444,7 +8556,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -383,7 +396,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8776,7 @@ var TabContextMenu = {
+@@ -8677,6 +8789,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From 8e6b4515ed9da54f601321c6229e82a7bbd90c2c Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:26:32 +0100
Subject: [PATCH 164/191] Refactor vertical-tabs.css to enhance tab background
 styling and improve layout consistency

---
 .../zen-styles/zen-tabs/vertical-tabs.css     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 286493476..7f0312f38 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -280,10 +280,6 @@
       }
     }
 
-    &[selected] .tab-background {
-      backdrop-filter: blur(10px);
-    }
-
     @media (-moz-bool-pref: 'zen.tabs.dim-pending') {
       &[pending='true'] .tab-icon-image {
         opacity: 0.5;
@@ -326,13 +322,18 @@
     /* On essentials, glance tabs are floating */
     &[zen-essential='true'] .tabbrowser-tab {
       position: absolute;
-      top: 4px;
-      right: 4px;
-      --tab-collapsed-width: 35px;
+      top: 0px;
+      right: 0px;
+      --tab-collapsed-width: 34px;
       --tab-min-height: 16px;
       width: var(--tab-collapsed-width) !important;
       z-index: 1;
       pointer-events: none;
+      & .tab-background {
+        /* Solid colors because we don't want to show the background */
+        background: light-dark(rgb(249, 249, 249), rgb(63, 63, 63)) !important;
+        border: 2px solid light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4));
+      }
     }
   }
 }
@@ -954,7 +955,7 @@
   padding: 0;
 }
 
-#zen-essentials-container .tabbrowser-tab {
+#zen-essentials-container > .tabbrowser-tab {
   --toolbarbutton-inner-padding: 0;
   max-width: unset;
   width: 100% !important;
@@ -994,7 +995,7 @@
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
-    &[visuallyselected] .tab-background {
+    &[visuallyselected] > .tab-stack > .tab-background {
       &::after {
         content: "";
         inset: -50%;

From 6b3e0c4ac45b72fb4c658ac7420da848a73e76e6 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:29:45 +0100
Subject: [PATCH 165/191] Remove update-submodules workflow file to streamline
 CI processes

---
 .github/workflows/update-submodules.yml | 31 -------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 .github/workflows/update-submodules.yml

diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
deleted file mode 100644
index 18fa6cc26..000000000
--- a/.github/workflows/update-submodules.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Update Components Submodules
-
-on:
-  push:
-    branches:
-      - dev
-  workflow_dispatch:
-  workflow_call:
-
-jobs:
-  update-submodules:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.DEPLOY_KEY }}
-
-      - name: Update submodules
-        run: |
-          git submodule update --remote --merge
-
-      - name: Commit
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: '[skip ci] 📦 Update submodules'
-          commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-auto@users.noreply.github.com

From c7bd7d0bf65079f726474f6de646409abf68729a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:49:22 +0100
Subject: [PATCH 166/191] Enhance tab label handling to support static labels
 and filter glance tabs during tab movement

---
 .../tabbrowser/content/tabbrowser-js.patch    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 43ac69e29..3a56da16a 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f13966d8e2 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafeda43b085 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,52 @@
@@ -112,6 +112,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f1
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
+@@ -1785,7 +1835,7 @@
+     }
+ 
+     _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
+-      if (!aLabel || aLabel.includes("about:reader?")) {
++      if (!aLabel || aLabel.includes("about:reader?") || aTab.hasAttribute("zen-has-static-label")) {
+         return false;
+       }
+ 
 @@ -2387,7 +2437,7 @@
  
        let panel = this.getPanel(browser);
@@ -351,6 +360,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f1
        }
        if (aTab._tPos == aIndex) {
          return;
+@@ -5717,7 +5825,7 @@
+       this._lastRelatedTabMap = new WeakMap();
+ 
+       this._handleTabMove(aTab, () => {
+-        let neighbor = this.tabs[aIndex];
++        let neighbor = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab"))[aIndex];
+         if (forceStandaloneTab && neighbor.group) {
+           neighbor = neighbor.group;
+         }
 @@ -5727,6 +5835,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }

From 62a7e70ebe8055eca35c0ed08cb9b98d6d7b423d Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Wed, 5 Feb 2025 23:56:20 +0800
Subject: [PATCH 167/191] Rudimentary tab renaming. Does not persist on page
 name change or restart

---
 src/browser/base/content/zen-assets.inc.xhtml |  1 +
 .../base/content/zen-assets.jar.inc.mn        |  1 +
 .../base/zen-components/ZenTabManager.mjs     | 84 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 src/browser/base/zen-components/ZenTabManager.mjs

diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index eefa0a5dd..4ec7bf8f0 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -33,6 +33,7 @@
 <script src="chrome://browser/content/ZenUIManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
+<script src="chrome://browser/content/zen-components/ZenTabManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 563908e14..93a415813 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -16,6 +16,7 @@
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (zen-components/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (zen-components/ZenThemesImporter.mjs)
         content/browser/zen-components/ZenTabUnloader.mjs       (zen-components/ZenTabUnloader.mjs)
+        content/browser/zen-components/ZenTabManager.mjs        (zen-components/ZenTabManager.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs (zen-components/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs  (zen-components/ZenPinnedTabManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs       (zen-components/ZenCommonUtils.mjs)
diff --git a/src/browser/base/zen-components/ZenTabManager.mjs b/src/browser/base/zen-components/ZenTabManager.mjs
new file mode 100644
index 000000000..0a381b6f2
--- /dev/null
+++ b/src/browser/base/zen-components/ZenTabManager.mjs
@@ -0,0 +1,84 @@
+class ZenBrowserTabManager extends ZenDOMOperatedFeature {
+  _tabEdited = null;
+  init() {
+    this._insertItemsIntoTabContextMenu();
+
+  }
+
+  _insertItemsIntoTabContextMenu() {
+    const element = window.MozXULElement.parseXULToFragment(`
+      <menuitem id="context_zen-rename-tab"
+                data-l10n-id="tab-context-zen-rename-tab"
+                oncommand="gZenBrowserTabManager.contextRenameTab();" />
+    `);
+    document.getElementById('context_duplicateTabs').after(element);
+    console.log("akjsdhfjkb")
+  }
+
+  contextRenameTab(event) {
+    this.contextRenameTabStart(event);
+  }
+
+  contextRenameTabKeydown(event) {
+    if (event.key === 'Enter') {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let input = this._tabEdited.querySelector('#tab-label-input');
+      let newName = input.value;
+      this._tabEdited.setAttribute('label', newName);
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    } else if (event.key === "Escape") {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    }
+  }
+  contextRenameTabStart(event) {
+    const label = TabContextMenu.contextTab.querySelector(".tab-label-container")
+    label.style.display = 'none';
+    label.className += ' tab-label-container-editing';
+
+    const container = window.MozXULElement.parseXULToFragment(`
+      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
+    `);
+    label.after(container);
+    const containerHtml = TabContextMenu.contextTab.querySelector('.tab-editor-container');
+    const input = document.createElement('input');
+    input.id = 'tab-label-input';
+    input.value = TabContextMenu.contextTab.label;
+    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.style["white-space"] = "nowrap";
+    input.style["overflow-x"] = "scroll";
+    input.style["margin"] = "0";
+
+    containerHtml.appendChild(input);
+    input.focus();
+    input.select()
+    this._tabEdited = TabContextMenu.contextTab;
+
+    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+
+  }
+
+  contextRenameTabHalt(event) {
+    if (event.target.closest('#tab-label-input')) {
+      return;
+    }
+    this._tabEdited.querySelector('.tab-editor-container').remove();
+    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    label.style.display = '';
+    label.className = label.className.replace(' tab-label-container-editing', '');
+
+    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+  }
+
+}
+
+window.gZenBrowserTabManager = new ZenBrowserTabManager();

From 71d2bfab38300ae132107fe7a2bb67766f764231 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:09:08 +0800
Subject: [PATCH 168/191] Moved rename to gZenVerticalTabsManager, changed to
 double click on pinned tabs

---
 src/browser/base/content/ZenUIManager.mjs     | 98 +++++++++++++++++++
 src/browser/base/content/zen-assets.inc.xhtml |  1 -
 .../base/content/zen-assets.jar.inc.mn        |  1 -
 .../base/zen-components/ZenTabManager.mjs     | 84 ----------------
 4 files changed, 98 insertions(+), 86 deletions(-)
 delete mode 100644 src/browser/base/zen-components/ZenTabManager.mjs

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 3613dca34..952b891a9 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -212,6 +212,7 @@ var gZenUIManager = {
 };
 
 var gZenVerticalTabsManager = {
+  _tabEdited: null,
   init() {
     this._multiWindowFeature = new ZenMultiWindowFeature();
     this._initWaitPromise();
@@ -248,6 +249,20 @@ var gZenVerticalTabsManager = {
     if (!this.isWindowsStyledButtons) {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
+
+    if (tabs) {
+      tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
+    }
+
+    this._insertDoubleClickListenerPinnedTabs();
+  },
+
+  openNewTabOnTabsMiddleClick(event) {
+    if (event.button === 1 && event.target.id === 'tabbrowser-tabs' && this.canOpenTabOnMiddleClick) {
+      document.getElementById('cmd_newNavigatorTabNoEvent').doCommand();
+      event.stopPropagation();
+      event.preventDefault();
+    }
   },
 
   toggleExpand() {
@@ -613,4 +628,87 @@ var gZenVerticalTabsManager = {
     }
     target.appendChild(child);
   },
+
+
+  //_insertItemsIntoTabContextMenu() {
+  //  const element = window.MozXULElement.parseXULToFragment(`
+  //    <menuitem id="context_zen-rename-tab"
+  //              data-l10n-id="tab-context-zen-rename-tab"
+  //              oncommand="gZenVerticalTabsManager.contextRenameTab();" />
+  //  `);
+  //  document.getElementById('context_duplicateTabs').after(element);
+  //},
+
+  _insertDoubleClickListenerPinnedTabs() {
+    const tabs = gBrowser.tabs;
+    for (const tab of tabs) {
+      if (tab.pinned) {
+        tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
+      }
+    }
+  },
+
+  contextRenameTabKeydown(event) {
+    if (event.key === 'Enter') {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let input = this._tabEdited.querySelector('#tab-label-input');
+      let newName = input.value;
+      this._tabEdited.setAttribute('label', newName);
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    } else if (event.key === "Escape") {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    }
+  },
+  contextRenameTabStart(event) {
+    if (event.target.closest('.tab-label-container-editing')) {
+      return;
+    }
+    this._tabEdited = event.target.closest('.tabbrowser-tab');
+    console.log(this._tabEdited)
+    const label = this._tabEdited.querySelector(".tab-label-container")
+    label.style.display = 'none';
+    label.className += ' tab-label-container-editing';
+
+    const container = window.MozXULElement.parseXULToFragment(`
+      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
+    `);
+    label.after(container);
+    const containerHtml = this._tabEdited.querySelector('.tab-editor-container');
+    const input = document.createElement('input');
+    input.id = 'tab-label-input';
+    input.value = this._tabEdited.label;
+    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.style["white-space"] = "nowrap";
+    input.style["overflow-x"] = "scroll";
+    input.style["margin"] = "0";
+
+    containerHtml.appendChild(input);
+    input.focus();
+    input.select()
+
+    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+
+  },
+
+  contextRenameTabHalt(event) {
+    if (event.target.closest('#tab-label-input')) {
+      return;
+    }
+    this._tabEdited.querySelector('.tab-editor-container').remove();
+    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    label.style.display = '';
+    label.className = label.className.replace(' tab-label-container-editing', '');
+
+    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+  },
 };
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 4ec7bf8f0..eefa0a5dd 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -33,7 +33,6 @@
 <script src="chrome://browser/content/ZenUIManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
-<script src="chrome://browser/content/zen-components/ZenTabManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 93a415813..563908e14 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -16,7 +16,6 @@
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (zen-components/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (zen-components/ZenThemesImporter.mjs)
         content/browser/zen-components/ZenTabUnloader.mjs       (zen-components/ZenTabUnloader.mjs)
-        content/browser/zen-components/ZenTabManager.mjs        (zen-components/ZenTabManager.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs (zen-components/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs  (zen-components/ZenPinnedTabManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs       (zen-components/ZenCommonUtils.mjs)
diff --git a/src/browser/base/zen-components/ZenTabManager.mjs b/src/browser/base/zen-components/ZenTabManager.mjs
deleted file mode 100644
index 0a381b6f2..000000000
--- a/src/browser/base/zen-components/ZenTabManager.mjs
+++ /dev/null
@@ -1,84 +0,0 @@
-class ZenBrowserTabManager extends ZenDOMOperatedFeature {
-  _tabEdited = null;
-  init() {
-    this._insertItemsIntoTabContextMenu();
-
-  }
-
-  _insertItemsIntoTabContextMenu() {
-    const element = window.MozXULElement.parseXULToFragment(`
-      <menuitem id="context_zen-rename-tab"
-                data-l10n-id="tab-context-zen-rename-tab"
-                oncommand="gZenBrowserTabManager.contextRenameTab();" />
-    `);
-    document.getElementById('context_duplicateTabs').after(element);
-    console.log("akjsdhfjkb")
-  }
-
-  contextRenameTab(event) {
-    this.contextRenameTabStart(event);
-  }
-
-  contextRenameTabKeydown(event) {
-    if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
-      let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value;
-      this._tabEdited.setAttribute('label', newName);
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-      this._tabEdited = null;
-    } else if (event.key === "Escape") {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-      this._tabEdited = null;
-    }
-  }
-  contextRenameTabStart(event) {
-    const label = TabContextMenu.contextTab.querySelector(".tab-label-container")
-    label.style.display = 'none';
-    label.className += ' tab-label-container-editing';
-
-    const container = window.MozXULElement.parseXULToFragment(`
-      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
-    `);
-    label.after(container);
-    const containerHtml = TabContextMenu.contextTab.querySelector('.tab-editor-container');
-    const input = document.createElement('input');
-    input.id = 'tab-label-input';
-    input.value = TabContextMenu.contextTab.label;
-    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
-    input.style["white-space"] = "nowrap";
-    input.style["overflow-x"] = "scroll";
-    input.style["margin"] = "0";
-
-    containerHtml.appendChild(input);
-    input.focus();
-    input.select()
-    this._tabEdited = TabContextMenu.contextTab;
-
-    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
-
-  }
-
-  contextRenameTabHalt(event) {
-    if (event.target.closest('#tab-label-input')) {
-      return;
-    }
-    this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector(".tab-label-container-editing");
-    label.style.display = '';
-    label.className = label.className.replace(' tab-label-container-editing', '');
-
-    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-  }
-
-}
-
-window.gZenBrowserTabManager = new ZenBrowserTabManager();

From df30fcf37bee007e36a822d751846de3cd152d8c Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:13:20 +0800
Subject: [PATCH 169/191] Fixed code formatting for linter

---
 src/browser/base/content/ZenUIManager.mjs | 32 ++++++++---------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 952b891a9..9c27f7bc9 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -629,16 +629,6 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-
-  //_insertItemsIntoTabContextMenu() {
-  //  const element = window.MozXULElement.parseXULToFragment(`
-  //    <menuitem id="context_zen-rename-tab"
-  //              data-l10n-id="tab-context-zen-rename-tab"
-  //              oncommand="gZenVerticalTabsManager.contextRenameTab();" />
-  //  `);
-  //  document.getElementById('context_duplicateTabs').after(element);
-  //},
-
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
@@ -650,7 +640,7 @@ var gZenVerticalTabsManager = {
 
   contextRenameTabKeydown(event) {
     if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
       let newName = input.value;
       this._tabEdited.setAttribute('label', newName);
@@ -659,8 +649,8 @@ var gZenVerticalTabsManager = {
       label.className = label.className.replace(' tab-label-container-editing', '');
       document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
       this._tabEdited = null;
-    } else if (event.key === "Escape") {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+    } else if (event.key === 'Escape') {
+      let label = this._tabEdited.querySelector('.tab-label-container-editing');
       this._tabEdited.querySelector('.tab-editor-container').remove();
 
       label.style.display = '';
@@ -669,13 +659,14 @@ var gZenVerticalTabsManager = {
       this._tabEdited = null;
     }
   },
+
   contextRenameTabStart(event) {
     if (event.target.closest('.tab-label-container-editing')) {
       return;
     }
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    console.log(this._tabEdited)
-    const label = this._tabEdited.querySelector(".tab-label-container")
+    console.log(this._tabEdited);
+    const label = this._tabEdited.querySelector('.tab-label-container');
     label.style.display = 'none';
     label.className += ' tab-label-container-editing';
 
@@ -688,16 +679,15 @@ var gZenVerticalTabsManager = {
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
     input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
-    input.style["white-space"] = "nowrap";
-    input.style["overflow-x"] = "scroll";
-    input.style["margin"] = "0";
+    input.style['white-space'] = 'nowrap';
+    input.style['overflow-x'] = 'scroll';
+    input.style['margin'] = '0';
 
     containerHtml.appendChild(input);
     input.focus();
-    input.select()
+    input.select();
 
     document.addEventListener('click', this.contextRenameTabHalt.bind(this));
-
   },
 
   contextRenameTabHalt(event) {
@@ -705,7 +695,7 @@ var gZenVerticalTabsManager = {
       return;
     }
     this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    const label = this._tabEdited.querySelector('.tab-label-container-editing');
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 

From a716c99152240cced94f998528b1b64991c0d693 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:42:53 +0800
Subject: [PATCH 170/191] Fixed bug where new pinned tabs can't be renamed

---
 src/browser/base/content/ZenUIManager.mjs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 9c27f7bc9..7966ddac7 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -632,9 +632,7 @@ var gZenVerticalTabsManager = {
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
-      if (tab.pinned) {
-        tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
-      }
+      tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
     }
   },
 
@@ -661,11 +659,12 @@ var gZenVerticalTabsManager = {
   },
 
   contextRenameTabStart(event) {
-    if (event.target.closest('.tab-label-container-editing')) {
+    if (this._tabEdited) return;
+    this._tabEdited = event.target.closest('.tabbrowser-tab');
+    if (!this._tabEdited.pinned) {
+      this._tabEdited = null;
       return;
     }
-    this._tabEdited = event.target.closest('.tabbrowser-tab');
-    console.log(this._tabEdited);
     const label = this._tabEdited.querySelector('.tab-label-container');
     label.style.display = 'none';
     label.className += ' tab-label-container-editing';
@@ -694,11 +693,15 @@ var gZenVerticalTabsManager = {
     if (event.target.closest('#tab-label-input')) {
       return;
     }
+    if (!this._tabEdited) {
+      return;
+    }
     this._tabEdited.querySelector('.tab-editor-container').remove();
     const label = this._tabEdited.querySelector('.tab-label-container-editing');
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 
     document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+    this._tabEdited = null;
   },
 };

From 8080e2fe471b35bd44d3229d6b92a2ceaf8cccb8 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 21:40:04 +0800
Subject: [PATCH 171/191] Added persisting in tab label renaming, added tab
 label resetting

---
 src/browser/base/content/ZenUIManager.mjs | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 7966ddac7..ceced730d 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -633,6 +633,23 @@ var gZenVerticalTabsManager = {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
       tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
+      tab.renamedName = null;
+      tab.originalName = null;
+
+      // Persist tab label and store changes for resetting
+      let observer = new MutationObserver((mutations) => {
+        if (!tab.renamedName) {
+          return;
+        }
+        mutations.forEach((mutation) => {
+          if (tab.label !== tab.renamedName) {
+            tab.originalName = tab.label;
+            tab.label = tab.renamedName;
+          }
+        });
+      });
+      // Run on all changes of label
+      observer.observe(tab, { attributes: true, attributeFilter: ['label'] });
     }
   },
 
@@ -640,12 +657,24 @@ var gZenVerticalTabsManager = {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value;
-      this._tabEdited.setAttribute('label', newName);
+      let newName = input.value.trim();
+
+      // Check if name is blank, reset if so
+      if (newName) {
+        this._tabEdited.originalName = this._tabEdited.label;
+        this._tabEdited.label = newName;
+        this._tabEdited.renamedName = newName;
+      } else {
+        this._tabEdited.label = this._tabEdited.originalName;
+        this._tabEdited.originalName = null;
+        this._tabEdited.renamedName = null;
+      }
+
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
       document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
@@ -690,6 +719,7 @@ var gZenVerticalTabsManager = {
   },
 
   contextRenameTabHalt(event) {
+    // Ignore click event if it's clicking the input
     if (event.target.closest('#tab-label-input')) {
       return;
     }

From 27dc41dd9edcfa36dd73bba4481c9a0759545e63 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Fri, 7 Feb 2025 11:56:44 +0800
Subject: [PATCH 172/191] Added zen-has-static-label to session store,
 temporarily removed label persist functionality, rewrote tab reset to use DOM

---
 src/browser/base/content/ZenUIManager.mjs     | 47 ++++------
 .../sessionstore/TabState-sys-mjs.patch       |  5 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 94 +++++--------------
 3 files changed, 44 insertions(+), 102 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index ceced730d..e2c5d4927 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -632,28 +632,11 @@ var gZenVerticalTabsManager = {
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
-      tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
-      tab.renamedName = null;
-      tab.originalName = null;
-
-      // Persist tab label and store changes for resetting
-      let observer = new MutationObserver((mutations) => {
-        if (!tab.renamedName) {
-          return;
-        }
-        mutations.forEach((mutation) => {
-          if (tab.label !== tab.renamedName) {
-            tab.originalName = tab.label;
-            tab.label = tab.renamedName;
-          }
-        });
-      });
-      // Run on all changes of label
-      observer.observe(tab, { attributes: true, attributeFilter: ['label'] });
+      tab.addEventListener('dblclick', this.renameTabStart.bind(this));
     }
   },
 
-  contextRenameTabKeydown(event) {
+  renameTabKeydown(event) {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
@@ -661,19 +644,21 @@ var gZenVerticalTabsManager = {
 
       // Check if name is blank, reset if so
       if (newName) {
-        this._tabEdited.originalName = this._tabEdited.label;
         this._tabEdited.label = newName;
-        this._tabEdited.renamedName = newName;
+        this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        this._tabEdited.label = this._tabEdited.originalName;
-        this._tabEdited.originalName = null;
-        this._tabEdited.renamedName = null;
+        // If the page is loaded, get the title of the page. Otherwise, keep name as is
+        this._tabEdited.label = gBrowser.getBrowserForTab(this._tabEdited).contentTitle || this._tabEdited.label;
+        // If the page had a title, reset the zen-has-static-label attribute
+        if (gBrowser.getBrowserForTab(this._tabEdited).contentTitle) {
+          this._tabEdited.removeAttribute('zen-has-static-label');
+        }
       }
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      document.removeEventListener('click', this.renameTabHalt.bind(this));
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
@@ -682,12 +667,12 @@ var gZenVerticalTabsManager = {
 
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      document.removeEventListener('click', this.renameTabHalt.bind(this));
       this._tabEdited = null;
     }
   },
 
-  contextRenameTabStart(event) {
+  renameTabStart(event) {
     if (this._tabEdited) return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
     if (!this._tabEdited.pinned) {
@@ -706,7 +691,7 @@ var gZenVerticalTabsManager = {
     const input = document.createElement('input');
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
-    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.addEventListener('keydown', this.renameTabKeydown.bind(this));
     input.style['white-space'] = 'nowrap';
     input.style['overflow-x'] = 'scroll';
     input.style['margin'] = '0';
@@ -715,10 +700,10 @@ var gZenVerticalTabsManager = {
     input.focus();
     input.select();
 
-    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+    document.addEventListener('click', this.renameTabHalt.bind(this));
   },
 
-  contextRenameTabHalt(event) {
+  renameTabHalt(event) {
     // Ignore click event if it's clicking the input
     if (event.target.closest('#tab-label-input')) {
       return;
@@ -731,7 +716,7 @@ var gZenVerticalTabsManager = {
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 
-    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+    document.removeEventListener('click', this.renameTabHalt.bind(this));
     this._tabEdited = null;
   },
 };
diff --git a/src/browser/components/sessionstore/TabState-sys-mjs.patch b/src/browser/components/sessionstore/TabState-sys-mjs.patch
index a38f9b7c4..26972ac49 100644
--- a/src/browser/components/sessionstore/TabState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabState-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..83bf443ca158c07e05075777da02b7f228d83dff 100644
+index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..dc0fdf17952df397a684f8a1da2f71739d007350 100644
 --- a/browser/components/sessionstore/TabState.sys.mjs
 +++ b/browser/components/sessionstore/TabState.sys.mjs
-@@ -84,6 +84,13 @@ class _TabState {
+@@ -84,6 +84,14 @@ class _TabState {
        tabData.groupId = tab.group.id;
      }
  
@@ -12,6 +12,7 @@ index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..83bf443ca158c07e05075777da02b7f2
 +    tabData.zenDefaultUserContextId = tab.getAttribute("zenDefaultUserContextId");
 +    tabData.zenPinnedEntry = tab.getAttribute("zen-pinned-entry");
 +    tabData.zenPinnedIcon = tab.getAttribute("zen-pinned-icon");
++    tabData.zenHasStaticLabel = tab.getAttribute("zen-has-static-label");
 +
      tabData.searchMode = tab.ownerGlobal.gURLBar.getSearchMode(browser, true);
  
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 3a56da16a..fc40d1675 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafeda43b085 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9cd3aacffe 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,52 @@
@@ -25,7 +25,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
 +        if (!tab.pinned) {
 +          break;
 +        }
-+        if (!tab.hidden && !tab.hasAttribute("zen-glance-tab")) {
++        if (!tab.hidden) {
 +          i++;
 +        }
 +      }
@@ -177,7 +177,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3468,21 @@
+@@ -3403,6 +3455,24 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -195,11 +195,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
++          }
++          if (tabData.zenHasStaticLabel) {
++            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3496,7 @@
+@@ -3416,6 +3486,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -207,7 +210,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3532,21 @@
+@@ -3451,7 +3522,24 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -226,22 +229,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
++          }
++          if (tabData.zenHasStaticLabel) {
++            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (select) {
              tabToSelect = tab;
            }
-@@ -3464,8 +3559,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) {
--            tab._tPos = this.pinnedTabCount;
--            this.tabContainer.insertBefore(tab, this.tabs[this.pinnedTabCount]);
-+            tab._tPos = this._numVisiblePinTabs;
-+            this.tabContainer.insertBefore(tab, this.tabs[this._numVisiblePinTabs]);
-             tab.toggleAttribute("pinned", true);
-             this.tabContainer._invalidateCachedTabs();
-             // Then ensure all the tab open/pinning information is sent.
-@@ -3729,7 +3824,7 @@
+@@ -3729,7 +3817,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.
@@ -250,7 +245,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3875,7 @@
+@@ -3780,7 +3868,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -259,7 +254,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4190,9 @@
+@@ -4095,6 +4183,9 @@
          return;
        }
  
@@ -269,7 +264,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
        this.removeTabs(selectedTabs);
      }
  
-@@ -4427,6 +4525,7 @@
+@@ -4427,6 +4518,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -277,7 +272,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4443,6 +4542,12 @@
+@@ -4443,6 +4535,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -290,7 +285,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4562,9 @@
+@@ -4457,7 +4555,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -301,7 +296,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4578,6 @@
+@@ -4471,7 +4571,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -309,7 +304,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4716,14 @@
+@@ -4610,14 +4709,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -326,16 +321,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4812,6 +4918,8 @@
-         this.tabs[i]._tPos = i;
-       }
- 
-+      ZenWorkspaces.updateTabsContainers();
-+
-       if (!this._windowIsClosing) {
-         if (wasPinned) {
-           this.tabContainer._positionPinnedTabs();
-@@ -5465,10 +5573,10 @@
+@@ -5465,10 +5564,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -348,28 +334,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5706,9 +5814,9 @@
- 
-       // Don't allow mixing pinned and unpinned tabs.
-       if (aTab.pinned) {
--        aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
-+        aIndex = Math.min(aIndex, (aTab.hasAttribute('zen-essential') ? this._numZenEssentials : this._numVisiblePinTabsWithoutGlance) - 1);
-       } else {
--        aIndex = Math.max(aIndex, this.pinnedTabCount);
-+        aIndex = Math.max(aIndex, this._numVisiblePinTabsWithoutGlance);
-       }
-       if (aTab._tPos == aIndex) {
-         return;
-@@ -5717,7 +5825,7 @@
-       this._lastRelatedTabMap = new WeakMap();
- 
-       this._handleTabMove(aTab, () => {
--        let neighbor = this.tabs[aIndex];
-+        let neighbor = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab"))[aIndex];
-         if (forceStandaloneTab && neighbor.group) {
-           neighbor = neighbor.group;
-         }
-@@ -5727,6 +5835,9 @@
+@@ -5727,6 +5826,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -379,16 +344,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -5802,7 +5913,7 @@
-         createLazyBrowser,
-       };
- 
--      let numPinned = this.pinnedTabCount;
-+      let numPinned = this._numVisiblePinTabs;
-       if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
-         params.pinned = true;
-       }
-@@ -7443,6 +7554,7 @@
+@@ -7443,6 +7545,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -396,7 +352,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8523,7 @@ var TabContextMenu = {
+@@ -8411,7 +8514,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -405,7 +361,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8556,7 @@ var TabContextMenu = {
+@@ -8444,7 +8547,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -414,7 +370,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafe
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8789,7 @@ var TabContextMenu = {
+@@ -8677,6 +8780,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From 34355d8e00fe1e0c8f7c487a939cb1022c87da75 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Sun, 9 Feb 2025 21:56:22 +0800
Subject: [PATCH 173/191] Changed listener to tabContainer.addEventListener

---
 src/browser/base/content/ZenUIManager.mjs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e2c5d4927..1b52a7aff 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -254,7 +254,8 @@ var gZenVerticalTabsManager = {
       tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
     }
 
-    this._insertDoubleClickListenerPinnedTabs();
+    //this._insertDoubleClickListenerPinnedTabs();
+    gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
   openNewTabOnTabsMiddleClick(event) {
@@ -629,12 +630,12 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-  _insertDoubleClickListenerPinnedTabs() {
-    const tabs = gBrowser.tabs;
-    for (const tab of tabs) {
-      tab.addEventListener('dblclick', this.renameTabStart.bind(this));
-    }
-  },
+  //_insertDoubleClickListenerPinnedTabs() {
+  //  const tabs = gBrowser.tabs;
+  //  for (const tab of tabs) {
+  //    tab.addEventListener('dblclick', this.renameTabStart.bind(this));
+  //  }
+  //},
 
   renameTabKeydown(event) {
     if (event.key === 'Enter') {
@@ -675,7 +676,7 @@ var gZenVerticalTabsManager = {
   renameTabStart(event) {
     if (this._tabEdited) return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited.pinned) {
+    if (!this._tabEdited || !this._tabEdited.pinned) {
       this._tabEdited = null;
       return;
     }

From d56f4962bf767e6b66fbd2fdad88e1fc8259161c Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Tue, 11 Feb 2025 12:26:00 +0800
Subject: [PATCH 174/191] Added preference to disable tab renaming, refactored
 inline styles to css files, changed listener to blur, refactored code

---
 src/browser/app/profile/zen-browser.js        |  1 +
 src/browser/base/content/ZenUIManager.mjs     | 58 ++++++-------------
 .../zen-styles/zen-tabs/vertical-tabs.css     | 11 ++++
 .../tabbrowser/content/tabbrowser-js.patch    | 26 ++++-----
 4 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index cdb976ff1..e0d21b352 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -80,6 +80,7 @@ pref('zen.welcome-screen.seen', false);
 
 pref('zen.tabs.vertical', true);
 pref('zen.tabs.vertical.right-side', false);
+pref('zen.tabs.rename-tabs', true);
 pref('zen.theme.accent-color', "#ffb787");
 pref('zen.theme.content-element-separation', 6); // In pixels
 pref('zen.theme.pill-button', false);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 1b52a7aff..3264605e8 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -212,7 +212,6 @@ var gZenUIManager = {
 };
 
 var gZenVerticalTabsManager = {
-  _tabEdited: null,
   init() {
     this._multiWindowFeature = new ZenMultiWindowFeature();
     this._initWaitPromise();
@@ -250,11 +249,8 @@ var gZenVerticalTabsManager = {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
 
-    if (tabs) {
-      tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
-    }
-
-    //this._insertDoubleClickListenerPinnedTabs();
+    this._tabEdited = null;
+    this._renameTabHalt = this.renameTabHalt.bind(this);
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
@@ -630,13 +626,6 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-  //_insertDoubleClickListenerPinnedTabs() {
-  //  const tabs = gBrowser.tabs;
-  //  for (const tab of tabs) {
-  //    tab.addEventListener('dblclick', this.renameTabStart.bind(this));
-  //  }
-  //},
-
   renameTabKeydown(event) {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
@@ -648,41 +637,37 @@ var gZenVerticalTabsManager = {
         this._tabEdited.label = newName;
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        // If the page is loaded, get the title of the page. Otherwise, keep name as is
-        this._tabEdited.label = gBrowser.getBrowserForTab(this._tabEdited).contentTitle || this._tabEdited.label;
-        // If the page had a title, reset the zen-has-static-label attribute
-        if (gBrowser.getBrowserForTab(this._tabEdited).contentTitle) {
-          this._tabEdited.removeAttribute('zen-has-static-label');
-        }
+        this._tabEdited.removeAttribute('zen-has-static-label');
+        gBrowser.setTabTitle(this._tabEdited);
       }
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.renameTabHalt.bind(this));
+      label.classList.remove('tab-label-container-editing');
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       this._tabEdited.querySelector('.tab-editor-container').remove();
 
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.renameTabHalt.bind(this));
+      label.classList.remove('tab-label-container-editing');
       this._tabEdited = null;
     }
   },
 
   renameTabStart(event) {
-    if (this._tabEdited) return;
+    if (
+      this._tabEdited ||
+      !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
+      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick')
+    )
+      return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited || !this._tabEdited.pinned) {
+    if (!this._tabEdited || !this._tabEdited.pinned || this._tabEdited.hasAttribute('zen-essential')) {
       this._tabEdited = null;
       return;
     }
     const label = this._tabEdited.querySelector('.tab-label-container');
-    label.style.display = 'none';
-    label.className += ' tab-label-container-editing';
+    label.classList.add('tab-label-container-editing');
 
     const container = window.MozXULElement.parseXULToFragment(`
       <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
@@ -693,31 +678,22 @@ var gZenVerticalTabsManager = {
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
     input.addEventListener('keydown', this.renameTabKeydown.bind(this));
-    input.style['white-space'] = 'nowrap';
-    input.style['overflow-x'] = 'scroll';
-    input.style['margin'] = '0';
 
     containerHtml.appendChild(input);
     input.focus();
     input.select();
 
-    document.addEventListener('click', this.renameTabHalt.bind(this));
+    input.addEventListener('blur', this._renameTabHalt);
   },
 
   renameTabHalt(event) {
-    // Ignore click event if it's clicking the input
-    if (event.target.closest('#tab-label-input')) {
-      return;
-    }
-    if (!this._tabEdited) {
+    if (document.activeElement === event.target || !this._tabEdited) {
       return;
     }
     this._tabEdited.querySelector('.tab-editor-container').remove();
     const label = this._tabEdited.querySelector('.tab-label-container-editing');
-    label.style.display = '';
-    label.className = label.className.replace(' tab-label-container-editing', '');
+    label.classList.remove('tab-label-container-editing');
 
-    document.removeEventListener('click', this.renameTabHalt.bind(this));
     this._tabEdited = null;
   },
 };
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 7f0312f38..d694cbc52 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1139,6 +1139,17 @@
   box-shadow: -3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
 }
 
+/* Renaming tab */
+.tab-label-container-editing {
+  display: none !important;
+}
+
+#tab-label-input {
+  white-space: nowrap;
+  overflow-x: scroll;
+  margin: 0;
+}
+
 /* Section: tab workspaces stylings */
 .zen-workspace-tabs-section {
   position: absolute;
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index fc40d1675..34bfd4b41 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9cd3aacffe 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7232414e2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,52 @@
@@ -102,17 +102,17 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9c
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1462,6 +1509,9 @@
-       }
- 
-       let activeEl = document.activeElement;
-+      if (gURLBar._zenHandleUrlbarClose) {
-+        gURLBar._zenHandleUrlbarClose(true);
-+      }
-       // If focus is on the old tab, move it to the new tab.
-       if (activeEl == oldTab) {
-         newTab.focus();
-@@ -1785,7 +1835,7 @@
+@@ -1477,6 +1511,9 @@
+           newBrowser &&
+           gURLBar.getBrowserState(newBrowser).urlbarFocused &&
+           gURLBar.focused;
++        if (gURLBar._zenHandleUrlbarClose) {
++          gURLBar._zenHandleUrlbarClose(true);
++        }
+         if (!keepFocusOnUrlBar) {
+           // Clear focus so that _adjustFocusAfterTabSwitch can detect if
+           // some element has been focused and respect that.
+@@ -1785,7 +1822,7 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -121,7 +121,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9c
          return false;
        }
  
-@@ -2387,7 +2437,7 @@
+@@ -2387,7 +2424,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();

From 2c92c61015627496d51d51319e16990c3baa19c0 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 13 Feb 2025 08:32:13 +0800
Subject: [PATCH 175/191] Deactivated listener in collapsed sidebar mode,
 refactored code

---
 src/browser/base/content/ZenUIManager.mjs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 3264605e8..d39f428a4 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -249,7 +249,6 @@ var gZenVerticalTabsManager = {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
 
-    this._tabEdited = null;
     this._renameTabHalt = this.renameTabHalt.bind(this);
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
@@ -634,7 +633,7 @@ var gZenVerticalTabsManager = {
 
       // Check if name is blank, reset if so
       if (newName) {
-        this._tabEdited.label = newName;
+        gBrowser._setTabLabel(this._tabEdited, newName);
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
         this._tabEdited.removeAttribute('zen-has-static-label');
@@ -646,11 +645,7 @@ var gZenVerticalTabsManager = {
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
-      let label = this._tabEdited.querySelector('.tab-label-container-editing');
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-
-      label.classList.remove('tab-label-container-editing');
-      this._tabEdited = null;
+      event.target.blur();
     }
   },
 
@@ -658,7 +653,8 @@ var gZenVerticalTabsManager = {
     if (
       this._tabEdited ||
       !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
-      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick')
+      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick') ||
+      !gZenVerticalTabsManager._prefsSidebarExpanded
     )
       return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');

From 945eec69311a6119bb0dada44829295896120ee6 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 02:10:37 +0100
Subject: [PATCH 176/191] Refactor tab renaming logic to ensure consistent
 label handling and add animation effect; update CSS for vertical tabs to
 improve styling

---
 src/browser/base/content/ZenUIManager.mjs             | 11 ++++++++++-
 .../content/zen-styles/zen-tabs/vertical-tabs.css     |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index d39f428a4..9d6536f02 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -632,14 +632,23 @@ var gZenVerticalTabsManager = {
       let newName = input.value.trim();
 
       // Check if name is blank, reset if so
+      // Always remove, so we can always rename and if it's empty,
+      // it will reset to the original name anyway
+      this._tabEdited.removeAttribute('zen-has-static-label');
       if (newName) {
         gBrowser._setTabLabel(this._tabEdited, newName);
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        this._tabEdited.removeAttribute('zen-has-static-label');
         gBrowser.setTabTitle(this._tabEdited);
       }
 
+      // Maybe add some confetti here?!?
+      gZenUIManager.motion.animate(this._tabEdited, {
+        scale: [1, 0.98, 1],
+      }, {
+        duration: 0.25,
+      });
+
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.classList.remove('tab-label-container-editing');
 
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index d694cbc52..e0e834675 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1148,6 +1148,9 @@
   white-space: nowrap;
   overflow-x: scroll;
   margin: 0;
+  background: transparent;
+  border: none;
+  padding: 0;
 }
 
 /* Section: tab workspaces stylings */

From 8372671b706bb42b87ef2e874ce67ec75b46b97f Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 09:57:40 +0100
Subject: [PATCH 177/191] Refactor animation code for tab editing to improve
 readability and maintainability

---
 src/browser/base/content/ZenUIManager.mjs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 9d6536f02..9fed376ca 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -643,11 +643,15 @@ var gZenVerticalTabsManager = {
       }
 
       // Maybe add some confetti here?!?
-      gZenUIManager.motion.animate(this._tabEdited, {
-        scale: [1, 0.98, 1],
-      }, {
-        duration: 0.25,
-      });
+      gZenUIManager.motion.animate(
+        this._tabEdited,
+        {
+          scale: [1, 0.98, 1],
+        },
+        {
+          duration: 0.25,
+        }
+      );
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.classList.remove('tab-label-container-editing');

From 3649d7f1115fc0c17c2ec6c1f24fd7b2570ad4a8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 11:23:44 +0100
Subject: [PATCH 178/191] Implement toast notifications for user actions and
 enhance UI feedback

---
 src/browser/base/content/ZenUIManager.mjs     | 36 +++++++++++++++++++
 src/browser/base/content/browser-xhtml.patch  |  5 +--
 .../base/content/zen-styles/zen-popup.css     | 27 ++++++++++++++
 .../base/zen-components/ZenCommonUtils.mjs    |  4 +--
 .../zen-components/ZenGradientGenerator.mjs   |  2 +-
 .../base/zen-components/ZenViewSplitter.mjs   |  5 ++-
 6 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 9fed376ca..f669c4924 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -14,6 +14,10 @@ var gZenUIManager = {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
     });
 
+    ChromeUtils.defineLazyGetter(this, '_toastContainer', () => {
+      return document.getElementById('zen-toast-container');
+    });
+
     new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(document.getElementById('TabsToolbar'));
 
     new ResizeObserver(
@@ -209,6 +213,38 @@ var gZenUIManager = {
       }
     }
   },
+
+  // Section: Notification messages
+  _createToastElement(messageId, options) {
+    const element = document.createXULElement('vbox');
+    const label = document.createXULElement('label');
+    document.l10n.setAttributes(label, messageId, options);
+    element.appendChild(label);
+    if (options.descriptionId) {
+      const description = document.createXULElement('label');
+      description.classList.add('description');
+      document.l10n.setAttributes(description, options.descriptionId, options);
+      element.appendChild(description);
+    }
+    element.classList.add('zen-toast');
+    return element;
+  },
+
+  async showToast(messageId, options = {}) {
+    const toast = this._createToastElement(messageId, options);
+    this._toastContainer.removeAttribute('hidden');
+    this._toastContainer.appendChild(toast);
+    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', duration: 0.3 });
+    await new Promise((resolve) => setTimeout(resolve, 3000));
+    await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
+    const toastHeight = toast.getBoundingClientRect().height;
+    // 5 for the separation between toasts
+    await this.motion.animate(toast, { marginBottom: [0, `-${toastHeight + 5}px`] }, { duration: 0.2 });
+    toast.remove();
+    if (!this._toastContainer.hasChildNodes()) {
+      this._toastContainer.setAttribute('hidden', 'true');
+    }
+  },
 };
 
 var gZenVerticalTabsManager = {
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index f55a99295..248781b38 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b09d63ac5 100644
+index 891c067d6ad718061c410c04743bed25744504b5..b7ded9691225068b23e4d6a5113242d0c0f5f842 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -99,6 +99,8 @@
@@ -19,7 +19,7 @@ index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -164,9 +167,12 @@
+@@ -164,9 +167,13 @@
      </vbox>
    </html:template>
  
@@ -27,6 +27,7 @@ index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b
 -
 -#include browser-box.inc.xhtml
 +  <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>
diff --git a/src/browser/base/content/zen-styles/zen-popup.css b/src/browser/base/content/zen-styles/zen-popup.css
index adc2fb884..e6f773936 100644
--- a/src/browser/base/content/zen-styles/zen-popup.css
+++ b/src/browser/base/content/zen-styles/zen-popup.css
@@ -349,3 +349,30 @@ menuitem {
 #editBMPanel_workspaceList input[type='checkbox'] {
   margin-right: 8px;
 }
+
+/* Section: Toast notifications */
+
+#zen-toast-container {
+  position: fixed;
+  top: calc(var(--zen-element-separation) * 2);
+  right: calc(var(--zen-element-separation) * 2);
+  z-index: 1000;
+  gap: 1rem;
+
+  & .zen-toast {
+    padding: 0.9rem 0.8rem;
+    border-radius: 12px;
+    background-color: var(--button-primary-bgcolor);
+    color: var(--button-primary-color);
+    box-shadow: var(--zen-big-shadow);
+    display: flex;
+    gap: 5px;
+    flex-direction: column;
+    gap: 2px;
+    width: fit-content;
+
+    & .description {
+      opacity: 0.6;
+    }
+  }
+}
diff --git a/src/browser/base/zen-components/ZenCommonUtils.mjs b/src/browser/base/zen-components/ZenCommonUtils.mjs
index 701363e36..83a75a1c8 100644
--- a/src/browser/base/zen-components/ZenCommonUtils.mjs
+++ b/src/browser/base/zen-components/ZenCommonUtils.mjs
@@ -69,7 +69,7 @@ var gZenCommonActions = {
       transferable.addDataFlavor('text/plain');
       transferable.setTransferData('text/plain', str);
       Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-      ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+      gZenUIManager.showToast('zen-copy-current-url-confirmation');
     }
   },
   copyCurrentURLAsMarkdownToClipboard() {
@@ -84,7 +84,7 @@ var gZenCommonActions = {
       transferable.addDataFlavor('text/plain');
       transferable.setTransferData('text/plain', str);
       Services.clipboard.setData(transferable, null, Ci.nsIClipboard.kGlobalClipboard);
-      ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-copy-current-url-confirmation');
+      gZenUIManager.showToast('zen-copy-current-url-confirmation');
     }
   },
 
diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index 963f87f76..59a19671a 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -725,7 +725,7 @@
       if (!skipSave) {
         await ZenWorkspacesStorage.saveWorkspaceTheme(currentWorkspace.uuid, gradient);
         await ZenWorkspaces._propagateWorkspaceData();
-        ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-panel-ui-gradient-generator-saved-message');
+        gZenUIManager.showToast('zen-panel-ui-gradient-generator-saved-message');
         currentWorkspace = await ZenWorkspaces.getActiveWorkspace();
       }
 
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index fb715e2a5..2224f6c5c 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -192,14 +192,13 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
 
   afterRearangeAction() {
     document.getElementById('zenSplitViewModifier').hidePopup();
-    ConfirmationHint.show(document.getElementById('zen-split-views-box'), 'zen-split-view-modifier-enabled-toast', {
+    gZenUIManager.showToast('zen-split-view-modifier-enabled-toast', {
       descriptionId: 'zen-split-view-modifier-enabled-toast-description',
-      showDescription: true,
     });
   }
 
   afterRearangeRemove() {
-    ConfirmationHint.show(document.getElementById('zen-split-views-box'), 'zen-split-view-modifier-disabled-toast');
+    gZenUIManager.showToast('zen-split-view-modifier-disabled-toast');
   }
 
   toggleWrapperDisplay(value) {

From 47cb4e488fb6bcae1163bd4a0bdc1475e307d006 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 11:35:51 +0100
Subject: [PATCH 179/191] Add hover effect to toolbar elements in
 zen-workspaces.css for improved UI interaction

---
 src/browser/base/content/zen-styles/zen-workspaces.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 288032e8b..34a6e6466 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -73,6 +73,10 @@
           filter: grayscale(0);
           opacity: 1;
         }
+
+        &:hover {
+          background-color: var(--zen-toolbar-element-bg);
+        }
       }
     }
   }

From a6ec05da49449bec55a1426d9739f56a6e1345e2 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 13:01:09 +0100
Subject: [PATCH 180/191] Refactor CSS variables for button backgrounds and
 text colors to enhance theme consistency and improve hover effects

---
 .../base/content/zen-styles/zen-theme.css     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 72955e154..9a36206bf 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -12,8 +12,8 @@
 :root,
 .zenLooksAndFeelColorOption {
   /** We also add `.zenLooksAndFeelColorOption` so that it recalculates the colors when the theme changes
-  * in the preferences page.
-  */
+   * in the preferences page.
+   */
 
   /* Default values */
   --zen-border-radius: 7px;
@@ -46,21 +46,21 @@
 
   --in-content-primary-button-background: color-mix(
     in srgb,
-    var(--zen-primary-color) 10%,
-    var(--zen-branding-bg) 90%
+    var(--zen-primary-color) 30%,
+    var(--zen-branding-bg-reverse) 70%
   ) !important;
   --in-content-primary-button-background-hover: color-mix(
     in srgb,
-    var(--zen-primary-color) 15%,
-    var(--zen-branding-bg) 85%
+    var(--zen-primary-color) 35%,
+    var(--zen-branding-bg-reverse) 65%
   ) !important;
   --in-content-primary-button-background-active: color-mix(
     in srgb,
-    var(--zen-primary-color) 20%,
-    var(--zen-branding-bg) 80%
+    var(--zen-primary-color) 40%,
+    var(--zen-branding-bg-reverse) 60%
   ) !important;
-  --button-text-color-primary: var(--zen-branding-bg-reverse) !important;
-  --in-content-primary-button-text-color: var(--zen-colors-primary-foreground) !important;
+  --button-text-color-primary: var(--zen-branding-bg) !important;
+  --in-content-primary-button-text-color: var(--zen-branding-bg) !important;
   --in-content-primary-button-border-color: transparent !important;
   --in-content-primary-button-border-hover: transparent !important;
   --in-content-primary-button-border-active: var(--zen-colors-border) !important;
@@ -72,7 +72,7 @@
   /* This is like the secondary button */
   --in-content-button-background: transparent !important;
   --in-content-button-text-color: var(--zen-secondary-btn-color) !important;
-  --in-content-button-background-hover: color-mix(in srgb, var(--zen-primary-color) 5%, var(--zen-branding-bg) 60%) !important;
+  --in-content-button-background-hover: color-mix(in srgb, currentColor 3%, transparent 97%) !important;
   --button-bgcolor: var(--in-content-button-background) !important;
   --button-hover-bgcolor: var(--in-content-button-background-hover) !important;
   --button-hover-color: var(--in-content-button-text-color-hover) !important;
@@ -88,7 +88,7 @@
 
   --button-background-color: var(--in-content-button-background) !important;
   --button-background-color-hover: var(--in-content-button-background-hover) !important;
-  --button-background-color-active: var(--in-content-primary-button-background-active) !important;
+  --button-background-color-active: color-mix(in srgb, currentColor 5%, transparent 95%) !important;
 
   --color-accent-primary: var(--button-primary-bgcolor) !important;
   --color-accent-primary-hover: var(--button-primary-hover-bgcolor) !important;
@@ -180,9 +180,9 @@
   --zen-native-inner-radius: var(
     --zen-webview-border-radius,
     /* Inner radius calculation:
-      * 1. If the native radius - the separation is less than 4px, use 4px.
-      * 2. Otherwise, use the the calculated value (inner radius = outer radius - separation).
-    */
+       * 1. If the native radius - the separation is less than 4px, use 4px.
+       * 2. Otherwise, use the the calculated value (inner radius = outer radius - separation).
+     */
       max(5px, calc(var(--zen-native-content-radius) - var(--zen-element-separation) / 2))
   );
 

From 3da54549ea588698db7a6bcb498cf21f8e462b9e Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 15 Feb 2025 18:37:13 +0100
Subject: [PATCH 181/191] Added support for macos monochrome titlebar buttons,
 on by default

---
 src/browser/app/profile/zen-browser.js        |  1 +
 .../content/zen-styles/zen-browser-ui.css     | 24 +++++++++++++++--
 .../base/zen-components/ZenCompactMode.mjs    |  8 ++++--
 .../libpref/init/StaticPrefList-yaml.patch    | 13 +++------
 src/widget/cocoa/nsCocoaWindow-mm.patch       | 27 -------------------
 5 files changed, 32 insertions(+), 41 deletions(-)
 delete mode 100644 src/widget/cocoa/nsCocoaWindow-mm.patch

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index e0d21b352..fb124d615 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -143,6 +143,7 @@ pref('zen.view.sidebar-expanded.max-width', 500);
 
 #ifdef XP_MACOSX
 pref('zen.view.mac.show-three-dot-menu', false);
+pref('zen.widget.mac.mono-window-controls', true);
 #endif
 pref('zen.view.show-bottom-border', false);
 pref('zen.view.use-single-toolbar', true);
diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 0257ac92f..92f956bea 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -152,12 +152,32 @@
   gap: var(--zen-element-separation);
 }
 
-.titlebar-buttonbox-container {
-  height: 100%;
+@media not (-moz-platform: macos) { 
+  .titlebar-buttonbox-container {
+    height: 100%;
+  }
 }
 
 @media (-moz-platform: macos) {
   .titlebar-buttonbox-container {
     margin-inline-end: 8px;
+
+    & > .titlebar-buttonbox {
+      margin-inline-start: var(--zen-toolbox-padding);
+    }
+  }
+
+  @media (-moz-bool-pref: 'zen.widget.mac.mono-window-controls') {
+    .titlebar-buttonbox-container {
+      /* Draw 3 dots as background to represent the window controls,
+        all with the same cololr as the titlebar */
+      background-image: radial-gradient(circle, #4d4c4a 6px, transparent 0.5px);
+      background-size: 20px 22px;
+      background-position: 52% 50%;
+
+      &:not([zen-has-hover='true']) > .titlebar-buttonbox {
+        opacity: 0;
+      }
+    }
   }
 }
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 56bf32ecb..d510aed56 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -292,6 +292,9 @@ var gZenCompactModeManager = {
         element: document.getElementById('zen-appcontent-navbar-container'),
         screenEdge: 'top',
       },
+      {
+        element: gZenVerticalTabsManager.actualWindowButtons,
+      }
     ];
   },
 
@@ -336,8 +339,9 @@ var gZenCompactModeManager = {
       target.addEventListener('mouseleave', (event) => {
         // If on Mac, ignore mouseleave in the area of window buttons
         if (AppConstants.platform == 'macosx') {
-          const MAC_WINDOW_BUTTONS_X_BORDER = 75;
-          const MAC_WINDOW_BUTTONS_Y_BORDER = 40;
+          const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
+          const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
+          const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
           if (event.clientX < MAC_WINDOW_BUTTONS_X_BORDER && event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER) {
             return;
           }
diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index fadcff2b1..ac8018292 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e770a24ec7 100644
+index ce2393978f77f55f42ae9b97e5d40328ce8eaae4..a426679de76c2d172974ec87f5fe48e22d5ab7b0 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -18067,7 +18067,7 @@
+@@ -18060,7 +18060,7 @@
  # Whether we use the mica backdrop. Off by default for now.
  - name: widget.windows.mica
    type: bool
@@ -11,7 +11,7 @@ index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e7
    mirror: once
  #endif
  
-@@ -18180,6 +18180,26 @@
+@@ -18173,6 +18173,19 @@
    mirror: always
  #endif
  
@@ -21,13 +21,6 @@ index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e7
 +  value: true
 +  mirror: never
 +
-+#ifdef XP_MACOSX
-+- name: zen.widget.mac.mono-window-controls
-+  type: RelaxedAtomicBool
-+  value: false
-+  mirror: always
-+#endif
-+
 +#ifdef XP_WIN
 +- name: zen.widget.windows.acrylic
 +  type: bool
diff --git a/src/widget/cocoa/nsCocoaWindow-mm.patch b/src/widget/cocoa/nsCocoaWindow-mm.patch
deleted file mode 100644
index 071a19813..000000000
--- a/src/widget/cocoa/nsCocoaWindow-mm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
-index f1c87dd8faef8c6caf9248ce7d9f40c12f5db9f6..f5280b8fc6cf46d3941d1ff04835b12dd2755170 100644
---- a/widget/cocoa/nsCocoaWindow.mm
-+++ b/widget/cocoa/nsCocoaWindow.mm
-@@ -51,6 +51,7 @@
- #include "mozilla/ScopeExit.h"
- #include "mozilla/StaticPrefs_gfx.h"
- #include "mozilla/StaticPrefs_widget.h"
-+#include "mozilla/StaticPrefs_zen.h"
- #include "mozilla/WritingModes.h"
- #include "mozilla/layers/CompositorBridgeChild.h"
- #include "mozilla/widget/Screen.h"
-@@ -682,9 +683,11 @@ static unsigned int WindowMaskForBorderStyle(BorderStyle aBorderStyle) {
-       continue;
-     }
-     NSWindow* win = ancestor->GetCocoaWindow();
--    [[win standardWindowButton:NSWindowCloseButton] setEnabled:!aModal];
--    [[win standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!aModal];
--    [[win standardWindowButton:NSWindowZoomButton] setEnabled:!aModal];
-+
-+    auto zenBtnEnabled = StaticPrefs::zen_widget_mac_mono_window_controls() ? false : !aModal;
-+    [[win standardWindowButton:NSWindowCloseButton] setEnabled:zenBtnEnabled];
-+    [[win standardWindowButton:NSWindowMiniaturizeButton] setEnabled:zenBtnEnabled];
-+    [[win standardWindowButton:NSWindowZoomButton] setEnabled:zenBtnEnabled];
-   }
-   if (aModal) {
-     mWindow.level = NSModalPanelWindowLevel;

From 6ffe5fd249d59e2b5b814364995e2afc230f25e8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 15 Feb 2025 18:48:31 +0100
Subject: [PATCH 182/191] Fixed havhing monochrome titlebar buttons not being
 disabled

---
 .../base/content/zen-styles/zen-browser-ui.css      |  3 ++-
 src/browser/base/zen-components/ZenCompactMode.mjs  | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 92f956bea..d4ca2ea19 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -152,7 +152,7 @@
   gap: var(--zen-element-separation);
 }
 
-@media not (-moz-platform: macos) { 
+@media not (-moz-platform: macos) {
   .titlebar-buttonbox-container {
     height: 100%;
   }
@@ -161,6 +161,7 @@
 @media (-moz-platform: macos) {
   .titlebar-buttonbox-container {
     margin-inline-end: 8px;
+    padding: 3px 0;
 
     & > .titlebar-buttonbox {
       margin-inline-start: var(--zen-toolbox-padding);
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index d510aed56..7e0c35b97 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -294,7 +294,7 @@ var gZenCompactModeManager = {
       },
       {
         element: gZenVerticalTabsManager.actualWindowButtons,
-      }
+      },
     ];
   },
 
@@ -343,7 +343,16 @@ var gZenCompactModeManager = {
           const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
           const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
           if (event.clientX < MAC_WINDOW_BUTTONS_X_BORDER && event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER) {
-            return;
+            // Also check if it has gone from the top or left if we are exiting the titlebar
+            // button area
+            if (
+              !(
+                target.classList.contains('titlebar-buttonbox-container') &&
+                (event.clientX < buttonRect.x || event.clientY < buttonRect.y)
+              )
+            ) {
+              return;
+            }
           }
         }
 

From beb7873c5d26107c2f6bfebe2923e22bb66728a3 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 15 Feb 2025 20:13:37 +0100
Subject: [PATCH 183/191] Fixed patches

---
 .../tabbrowser/content/tabbrowser-js.patch    | 130 +++++++++++-------
 1 file changed, 81 insertions(+), 49 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 3323b47e9..3a56da16a 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,7 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7232414e2 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafeda43b085 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -406,11 +406,52 @@
 @@ -406,11 +406,52 @@
        return this.tabContainer.visibleTabs;
      }
@@ -26,7 +25,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
 +        if (!tab.pinned) {
 +          break;
 +        }
-+        if (!tab.hidden) {
++        if (!tab.hidden && !tab.hasAttribute("zen-glance-tab")) {
 +          i++;
 +        }
 +      }
@@ -41,7 +40,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
 +        }
 +        if (!tab.hidden) {
 +          i += !tab.hasAttribute("zen-glance-tab");
-+          i += !tab.hasAttribute("zen-glance-tab");
 +        }
 +      }
 +      return i;
@@ -55,12 +53,10 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
 +        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
            break;
          }
-+        i += !tab.hasAttribute("zen-glance-tab");
 +        i += !tab.hasAttribute("zen-glance-tab");
        }
        return i;
      }
-@@ -807,7 +848,7 @@
 @@ -807,7 +848,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
@@ -70,7 +66,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
          );
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
-@@ -828,7 +869,7 @@
 @@ -828,7 +869,7 @@
            // the moving of a tab from the vertical pinned tabs container
            // and back into arrowscrollbox.
@@ -80,7 +75,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
          });
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1055,6 +1096,8 @@
 @@ -1055,6 +1096,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -90,7 +84,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1065,6 +1108,9 @@
 @@ -1065,6 +1108,9 @@
          );
          return;
@@ -101,7 +94,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1310,6 +1356,7 @@
 @@ -1310,6 +1356,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
@@ -110,17 +102,17 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1477,6 +1511,9 @@
-           newBrowser &&
-           gURLBar.getBrowserState(newBrowser).urlbarFocused &&
-           gURLBar.focused;
-+        if (gURLBar._zenHandleUrlbarClose) {
-+          gURLBar._zenHandleUrlbarClose(true);
-+        }
-         if (!keepFocusOnUrlBar) {
-           // Clear focus so that _adjustFocusAfterTabSwitch can detect if
-           // some element has been focused and respect that.
-@@ -1785,7 +1822,7 @@
+@@ -1462,6 +1509,9 @@
+       }
+ 
+       let activeEl = document.activeElement;
++      if (gURLBar._zenHandleUrlbarClose) {
++        gURLBar._zenHandleUrlbarClose(true);
++      }
+       // If focus is on the old tab, move it to the new tab.
+       if (activeEl == oldTab) {
+         newTab.focus();
+@@ -1785,7 +1835,7 @@
      }
  
      _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -129,7 +121,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
          return false;
        }
  
-@@ -2387,7 +2424,7 @@
+@@ -2387,7 +2437,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -138,7 +130,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2446,8 +2496,8 @@
 @@ -2446,8 +2496,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.
@@ -150,7 +141,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2679,6 +2729,12 @@
 @@ -2679,6 +2729,12 @@
          );
        }
@@ -164,7 +154,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2742,6 +2798,12 @@
 @@ -2742,6 +2798,12 @@
            noInitialLabel,
            skipBackgroundNotify,
@@ -178,7 +167,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2885,6 +2947,9 @@
 @@ -2885,6 +2947,9 @@
          }
        }
@@ -189,7 +177,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3455,24 @@
+@@ -3403,6 +3468,21 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -207,14 +195,11 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
-+          }
-+          if (tabData.zenHasStaticLabel) {
-+            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3486,7 @@
+@@ -3416,6 +3496,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -222,7 +207,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3522,24 @@
+@@ -3451,7 +3532,21 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -241,14 +226,22 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
-+          }
-+          if (tabData.zenHasStaticLabel) {
-+            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (select) {
              tabToSelect = tab;
            }
-@@ -3729,7 +3817,7 @@
+@@ -3464,8 +3559,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) {
+-            tab._tPos = this.pinnedTabCount;
+-            this.tabContainer.insertBefore(tab, this.tabs[this.pinnedTabCount]);
++            tab._tPos = this._numVisiblePinTabs;
++            this.tabContainer.insertBefore(tab, this.tabs[this._numVisiblePinTabs]);
+             tab.toggleAttribute("pinned", true);
+             this.tabContainer._invalidateCachedTabs();
+             // Then ensure all the tab open/pinning information is sent.
+@@ -3729,7 +3824,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.
@@ -257,7 +250,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3868,7 @@
+@@ -3780,7 +3875,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -266,7 +259,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4183,9 @@
+@@ -4095,6 +4190,9 @@
          return;
        }
  
@@ -276,7 +269,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        this.removeTabs(selectedTabs);
      }
  
-@@ -4427,6 +4518,7 @@
+@@ -4427,6 +4525,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -284,7 +277,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4443,6 +4535,12 @@
+@@ -4443,6 +4542,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -297,7 +290,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4555,9 @@
+@@ -4457,7 +4562,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -308,7 +301,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4571,6 @@
+@@ -4471,7 +4578,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -316,7 +309,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4709,14 @@
+@@ -4610,14 +4716,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -333,7 +326,16 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5564,10 @@
+@@ -4812,6 +4918,8 @@
+         this.tabs[i]._tPos = i;
+       }
+ 
++      ZenWorkspaces.updateTabsContainers();
++
+       if (!this._windowIsClosing) {
+         if (wasPinned) {
+           this.tabContainer._positionPinnedTabs();
+@@ -5465,10 +5573,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -346,7 +348,28 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5727,6 +5826,9 @@
+@@ -5706,9 +5814,9 @@
+ 
+       // Don't allow mixing pinned and unpinned tabs.
+       if (aTab.pinned) {
+-        aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
++        aIndex = Math.min(aIndex, (aTab.hasAttribute('zen-essential') ? this._numZenEssentials : this._numVisiblePinTabsWithoutGlance) - 1);
+       } else {
+-        aIndex = Math.max(aIndex, this.pinnedTabCount);
++        aIndex = Math.max(aIndex, this._numVisiblePinTabsWithoutGlance);
+       }
+       if (aTab._tPos == aIndex) {
+         return;
+@@ -5717,7 +5825,7 @@
+       this._lastRelatedTabMap = new WeakMap();
+ 
+       this._handleTabMove(aTab, () => {
+-        let neighbor = this.tabs[aIndex];
++        let neighbor = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab"))[aIndex];
+         if (forceStandaloneTab && neighbor.group) {
+           neighbor = neighbor.group;
+         }
+@@ -5727,6 +5835,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -356,7 +379,16 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -7443,6 +7545,7 @@
+@@ -5802,7 +5913,7 @@
+         createLazyBrowser,
+       };
+ 
+-      let numPinned = this.pinnedTabCount;
++      let numPinned = this._numVisiblePinTabs;
+       if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
+         params.pinned = true;
+       }
+@@ -7443,6 +7554,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -364,7 +396,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8514,7 @@ var TabContextMenu = {
+@@ -8411,7 +8523,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -373,7 +405,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8547,7 @@ var TabContextMenu = {
+@@ -8444,7 +8556,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -382,7 +414,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8780,7 @@ var TabContextMenu = {
+@@ -8677,6 +8789,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From cad5703185a62a4ccb5182e21716a355496c5849 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 15 Feb 2025 20:24:34 +0100
Subject: [PATCH 184/191] Fixed previous merges

---
 src/browser/base/content/ZenUIManager.mjs     | 125 ------------------
 .../zen-styles/zen-tabs/vertical-tabs.css     |  12 +-
 2 files changed, 1 insertion(+), 136 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index cdb6c75c0..8180d1772 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -18,10 +18,6 @@ var gZenUIManager = {
       return document.getElementById('zen-toast-container');
     });
 
-    ChromeUtils.defineLazyGetter(this, '_toastContainer', () => {
-      return document.getElementById('zen-toast-container');
-    });
-
     new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(document.getElementById('TabsToolbar'));
 
     new ResizeObserver(
@@ -249,38 +245,6 @@ var gZenUIManager = {
       this._toastContainer.setAttribute('hidden', 'true');
     }
   },
-
-  // Section: Notification messages
-  _createToastElement(messageId, options) {
-    const element = document.createXULElement('vbox');
-    const label = document.createXULElement('label');
-    document.l10n.setAttributes(label, messageId, options);
-    element.appendChild(label);
-    if (options.descriptionId) {
-      const description = document.createXULElement('label');
-      description.classList.add('description');
-      document.l10n.setAttributes(description, options.descriptionId, options);
-      element.appendChild(description);
-    }
-    element.classList.add('zen-toast');
-    return element;
-  },
-
-  async showToast(messageId, options = {}) {
-    const toast = this._createToastElement(messageId, options);
-    this._toastContainer.removeAttribute('hidden');
-    this._toastContainer.appendChild(toast);
-    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', duration: 0.3 });
-    await new Promise((resolve) => setTimeout(resolve, 3000));
-    await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
-    const toastHeight = toast.getBoundingClientRect().height;
-    // 5 for the separation between toasts
-    await this.motion.animate(toast, { marginBottom: [0, `-${toastHeight + 5}px`] }, { duration: 0.2 });
-    toast.remove();
-    if (!this._toastContainer.hasChildNodes()) {
-      this._toastContainer.setAttribute('hidden', 'true');
-    }
-  },
 };
 
 var gZenVerticalTabsManager = {
@@ -325,14 +289,6 @@ var gZenVerticalTabsManager = {
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
-  openNewTabOnTabsMiddleClick(event) {
-    if (event.button === 1 && event.target.id === 'tabbrowser-tabs' && this.canOpenTabOnMiddleClick) {
-      document.getElementById('cmd_newNavigatorTabNoEvent').doCommand();
-      event.stopPropagation();
-      event.preventDefault();
-    }
-  },
-
   toggleExpand() {
     const newVal = !Services.prefs.getBoolPref('zen.view.sidebar-expanded');
     Services.prefs.setBoolPref('zen.view.sidebar-expanded', newVal);
@@ -777,85 +733,4 @@ var gZenVerticalTabsManager = {
 
     this._tabEdited = null;
   },
-
-  renameTabKeydown(event) {
-    if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector('.tab-label-container-editing');
-      let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value.trim();
-
-      // Check if name is blank, reset if so
-      // Always remove, so we can always rename and if it's empty,
-      // it will reset to the original name anyway
-      this._tabEdited.removeAttribute('zen-has-static-label');
-      if (newName) {
-        gBrowser._setTabLabel(this._tabEdited, newName);
-        this._tabEdited.setAttribute('zen-has-static-label', 'true');
-      } else {
-        gBrowser.setTabTitle(this._tabEdited);
-      }
-
-      // Maybe add some confetti here?!?
-      gZenUIManager.motion.animate(
-        this._tabEdited,
-        {
-          scale: [1, 0.98, 1],
-        },
-        {
-          duration: 0.25,
-        }
-      );
-
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.classList.remove('tab-label-container-editing');
-
-      this._tabEdited = null;
-    } else if (event.key === 'Escape') {
-      event.target.blur();
-    }
-  },
-
-  renameTabStart(event) {
-    if (
-      this._tabEdited ||
-      !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
-      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick') ||
-      !gZenVerticalTabsManager._prefsSidebarExpanded
-    )
-      return;
-    this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited || !this._tabEdited.pinned || this._tabEdited.hasAttribute('zen-essential')) {
-      this._tabEdited = null;
-      return;
-    }
-    const label = this._tabEdited.querySelector('.tab-label-container');
-    label.classList.add('tab-label-container-editing');
-
-    const container = window.MozXULElement.parseXULToFragment(`
-      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
-    `);
-    label.after(container);
-    const containerHtml = this._tabEdited.querySelector('.tab-editor-container');
-    const input = document.createElement('input');
-    input.id = 'tab-label-input';
-    input.value = this._tabEdited.label;
-    input.addEventListener('keydown', this.renameTabKeydown.bind(this));
-
-    containerHtml.appendChild(input);
-    input.focus();
-    input.select();
-
-    input.addEventListener('blur', this._renameTabHalt);
-  },
-
-  renameTabHalt(event) {
-    if (document.activeElement === event.target || !this._tabEdited) {
-      return;
-    }
-    this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector('.tab-label-container-editing');
-    label.classList.remove('tab-label-container-editing');
-
-    this._tabEdited = null;
-  },
 };
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 8689e6a68..eeab85cdb 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -325,9 +325,6 @@
       top: 0px;
       right: 0px;
       --tab-collapsed-width: 34px;
-      top: 0px;
-      right: 0px;
-      --tab-collapsed-width: 34px;
       --tab-min-height: 16px;
       width: var(--tab-collapsed-width) !important;
       z-index: 1;
@@ -337,11 +334,6 @@
         background: light-dark(rgb(249, 249, 249), rgb(63, 63, 63)) !important;
         border: 2px solid light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4));
       }
-      & .tab-background {
-        /* Solid colors because we don't want to show the background */
-        background: light-dark(rgb(249, 249, 249), rgb(63, 63, 63)) !important;
-        border: 2px solid light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4));
-      }
     }
   }
 }
@@ -963,7 +955,6 @@
   padding: 0;
 }
 
-#zen-essentials-container > .tabbrowser-tab {
 #zen-essentials-container > .tabbrowser-tab {
   --toolbarbutton-inner-padding: 0;
   max-width: unset;
@@ -1004,7 +995,6 @@
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
-    &[visuallyselected] > .tab-stack > .tab-background {
     &[visuallyselected] > .tab-stack > .tab-background {
       &::after {
         content: "";
@@ -1149,7 +1139,7 @@
   box-shadow: -3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
 }
 
-/* Renaming tab */
+/* Renaming tabs */
 .tab-label-container-editing {
   display: none !important;
 }

From ceefc076096470068ced79a564894d8f324e3a6e Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Feb 2025 00:48:03 +0100
Subject: [PATCH 185/191] Changed automatic release API

---
 .github/workflows/build.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c3410366a..a66ffa1aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -515,7 +515,7 @@ jobs:
         # If we are on Twilight, we want to just update the Twilight tag's release
       - name: Update Twilight tag
         if: ${{ inputs.update_branch == 'twilight' }}
-        uses: marvinpinto/action-automatic-releases@master
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             zen.source.tar.zst
@@ -535,11 +535,13 @@ jobs:
             zen.installer.exe
             zen.installer-arm64.exe
             zen.macos-universal.dmg
-          automatic_release_tag: 'twilight'
-          title: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
+          tag_name: 'twilight'
+          name: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
           draft: false
+          generate_release_notes: false
           prerelease: true
-          repo_token: ${{ secrets.DEPLOY_KEY }}
+          token: ${{ secrets.DEPLOY_KEY }}
+          fail_on_unmatched_files: false
         env:
           GITHUB_REPOSITORY: ${{ github.repository }}
 
@@ -547,10 +549,12 @@ jobs:
         uses: marvinpinto/action-automatic-releases@master
         if: ${{ inputs.update_branch == 'release' }}
         with:
-          repo_token: '${{ secrets.DEPLOY_KEY }}'
-          automatic_release_tag: ${{ needs.build-data.outputs.version }}
+          token: '${{ secrets.DEPLOY_KEY }}'
+          tag_name: ${{ needs.build-data.outputs.version }}
           prerelease: false
-          title: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          fail_on_unmatched_files: false
+          generate_release_notes: false
+          name: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
             zen.source.tar.zst
             zen.linux-x86_64.tar.xz

From 06a29292cce504411ac61ad34f96d8ee8e3b68bd Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Feb 2025 07:50:40 +0100
Subject: [PATCH 186/191] Fixed twilight builds upload path

---
 .github/workflows/build.yml | 68 ++++++++++++++++++-------------------
 package-lock.json           | 15 ++++----
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a66ffa1aa..bf05d6432 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -518,23 +518,23 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            zen.source.tar.zst
-            zen.linux-x86_64.tar.xz
-            zen.linux-aarch64.tar.xz
-            zen-x86_64.AppImage
-            zen-x86_64.AppImage.zsync
-            zen-aarch64.AppImage
-            zen-aarch64.AppImage.zsync
-            zen.win-x86_64.zip
-            zen.win-arm64.zip
-            linux.mar
-            linux-aarch64.mar
-            windows.mar
-            windows-arm64.mar
-            macos.mar
-            zen.installer.exe
-            zen.installer-arm64.exe
-            zen.macos-universal.dmg
+            ./zen.source.tar.zst
+            ./zen.linux-x86_64.tar.xz
+            ./zen.linux-aarch64.tar.xz
+            ./zen-x86_64.AppImage
+            ./zen-x86_64.AppImage.zsync
+            ./zen-aarch64.AppImage
+            ./zen-aarch64.AppImage.zsync
+            ./zen.win-x86_64.zip
+            ./zen.win-arm64.zip
+            ./linux.mar
+            ./linux-aarch64.mar
+            ./windows.mar
+            ./windows-arm64.mar
+            ./macos.mar
+            ./zen.installer.exe
+            ./zen.installer-arm64.exe
+            ./zen.macos-universal.dmg
           tag_name: 'twilight'
           name: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
           draft: false
@@ -556,23 +556,23 @@ jobs:
           generate_release_notes: false
           name: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
-            zen.source.tar.zst
-            zen.linux-x86_64.tar.xz
-            zen.linux-aarch64.tar.xz
-            zen-x86_64.AppImage
-            zen-x86_64.AppImage.zsync
-            zen-aarch64.AppImage
-            zen-aarch64.AppImage.zsync
-            .github/workflows/object/windows-x64-signed-x86_64/zen.win-x86_64.zip
-            .github/workflows/object/windows-x64-signed-arm64/zen.win-arm64.zip
-            linux.mar
-            linux-aarch64.mar
-            .github/workflows/object/windows-x64-signed-x86_64/windows.mar
-            .github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
-            macos.mar
-            .github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
-            .github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
-            zen.macos-universal.dmg
+            ./zen.source.tar.zst
+            ./zen.linux-x86_64.tar.xz
+            ./zen.linux-aarch64.tar.xz
+            ./zen-x86_64.AppImage
+            ./zen-x86_64.AppImage.zsync
+            ./zen-aarch64.AppImage
+            ./zen-aarch64.AppImage.zsync
+            ./.github/workflows/object/windows-x64-signed-x86_64/zen.win-x86_64.zip
+            ./.github/workflows/object/windows-x64-signed-arm64/zen.win-arm64.zip
+            ./linux.mar
+            ./linux-aarch64.mar
+            ./.github/workflows/object/windows-x64-signed-x86_64/windows.mar
+            ./.github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
+            ./macos.mar
+            ./.github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
+            ./.github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
+            ./zen.macos-universal.dmg
 
   prepare-flatpak:
     if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
diff --git a/package-lock.json b/package-lock.json
index 5391ea4b9..cfae67f55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@zen-browser/surfer": "^1.9.14"
+        "@zen-browser/surfer": "^1.9.16"
       },
       "devDependencies": {
         "husky": "^9.1.7",
@@ -270,9 +270,10 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.9.15",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.15.tgz",
-      "integrity": "sha512-mG/nTFduaXpYmGNYh5+d5ZzRX6XOkF6VEgia1nSZUoiPAXbwKblmwKro/b6uYAELTvpMCEneRl86CIU8HK++Tg==",
+      "version": "1.9.16",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.16.tgz",
+      "integrity": "sha512-6/Vcp1Ox9mt53hoBUuxFvpnRMnlvjFb3GBOcRhpqoYW/yi9mlV3G48icE717wGCoR2TThfuS6SYVfiT/G1kkrw==",
+      "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
         "async-icns": "^1.0.2",
@@ -2810,9 +2811,9 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "@zen-browser/surfer": {
-      "version": "1.9.15",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.15.tgz",
-      "integrity": "sha512-mG/nTFduaXpYmGNYh5+d5ZzRX6XOkF6VEgia1nSZUoiPAXbwKblmwKro/b6uYAELTvpMCEneRl86CIU8HK++Tg==",
+      "version": "1.9.16",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.16.tgz",
+      "integrity": "sha512-6/Vcp1Ox9mt53hoBUuxFvpnRMnlvjFb3GBOcRhpqoYW/yi9mlV3G48icE717wGCoR2TThfuS6SYVfiT/G1kkrw==",
       "requires": {
         "@resvg/resvg-js": "^1.4.0",
         "async-icns": "^1.0.2",

From 7b6b69356c98b16d42cd7fe11765606ff6ddda66 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Feb 2025 12:28:48 +0100
Subject: [PATCH 187/191] FIxed uploading twilight assets

---
 .github/workflows/build.yml                   | 57 ++++++++++---------
 .../content/zen-styles/zen-browser-ui.css     |  4 +-
 .../base/zen-components/ZenCompactMode.mjs    | 18 +++---
 3 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf05d6432..1d67ab40f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -482,6 +482,7 @@ jobs:
           token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Download object files
+        if: ${{ inputs.update_branch == 'release' }}
         run: |
           git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object
 
@@ -518,23 +519,23 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            ./zen.source.tar.zst
-            ./zen.linux-x86_64.tar.xz
-            ./zen.linux-aarch64.tar.xz
-            ./zen-x86_64.AppImage
-            ./zen-x86_64.AppImage.zsync
-            ./zen-aarch64.AppImage
-            ./zen-aarch64.AppImage.zsync
-            ./zen.win-x86_64.zip
-            ./zen.win-arm64.zip
-            ./linux.mar
-            ./linux-aarch64.mar
-            ./windows.mar
-            ./windows-arm64.mar
-            ./macos.mar
-            ./zen.installer.exe
-            ./zen.installer-arm64.exe
-            ./zen.macos-universal.dmg
+            ./zen.source.tar.zst/*
+            ./zen.linux-x86_64.tar.xz/*
+            ./zen.linux-aarch64.tar.xz/*
+            ./zen-x86_64.AppImage/*
+            ./zen-x86_64.AppImage.zsync/*
+            ./zen-aarch64.AppImage/*
+            ./zen-aarch64.AppImage.zsync/*
+            ./zen.win-x86_64.zip/*
+            ./zen.win-arm64.zip/*
+            ./linux.mar/*
+            ./linux-aarch64.mar/*
+            ./windows.mar/*
+            ./windows-arm64.mar/*
+            ./macos.mar/*
+            ./zen.installer.exe/*
+            ./zen.installer-arm64.exe/*
+            ./zen.macos-universal.dmg/*
           tag_name: 'twilight'
           name: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
           draft: false
@@ -556,23 +557,23 @@ jobs:
           generate_release_notes: false
           name: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
-            ./zen.source.tar.zst
-            ./zen.linux-x86_64.tar.xz
-            ./zen.linux-aarch64.tar.xz
-            ./zen-x86_64.AppImage
-            ./zen-x86_64.AppImage.zsync
-            ./zen-aarch64.AppImage
-            ./zen-aarch64.AppImage.zsync
+            ./zen.source.tar.zst/*
+            ./zen.linux-x86_64.tar.xz/*
+            ./zen.linux-aarch64.tar.xz/*
+            ./zen-x86_64.AppImage/*
+            ./zen-x86_64.AppImage.zsync/*
+            ./zen-aarch64.AppImage/*
+            ./zen-aarch64.AppImage.zsync/*
             ./.github/workflows/object/windows-x64-signed-x86_64/zen.win-x86_64.zip
             ./.github/workflows/object/windows-x64-signed-arm64/zen.win-arm64.zip
-            ./linux.mar
-            ./linux-aarch64.mar
+            ./linux.mar/*
+            ./linux-aarch64.mar/*
             ./.github/workflows/object/windows-x64-signed-x86_64/windows.mar
             ./.github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
-            ./macos.mar
+            ./macos.mar/*
             ./.github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
             ./.github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
-            ./zen.macos-universal.dmg
+            ./zen.macos-universal.dmg/*
 
   prepare-flatpak:
     if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index d4ca2ea19..853af4fbb 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -172,9 +172,9 @@
     .titlebar-buttonbox-container {
       /* Draw 3 dots as background to represent the window controls,
         all with the same cololr as the titlebar */
-      background-image: radial-gradient(circle, #4d4c4a 6px, transparent 0.5px);
+      background-image: radial-gradient(circle, var(--zen-toolbar-element-bg) 6px, transparent 0.5px);
       background-size: 20px 22px;
-      background-position: 52% 50%;
+      background-position: 53% 50%;
 
       &:not([zen-has-hover='true']) > .titlebar-buttonbox {
         opacity: 0;
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 7e0c35b97..2dc713b25 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -342,17 +342,13 @@ var gZenCompactModeManager = {
           const buttonRect = gZenVerticalTabsManager.actualWindowButtons.getBoundingClientRect();
           const MAC_WINDOW_BUTTONS_X_BORDER = buttonRect.width + buttonRect.x;
           const MAC_WINDOW_BUTTONS_Y_BORDER = buttonRect.height + buttonRect.y;
-          if (event.clientX < MAC_WINDOW_BUTTONS_X_BORDER && event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER) {
-            // Also check if it has gone from the top or left if we are exiting the titlebar
-            // button area
-            if (
-              !(
-                target.classList.contains('titlebar-buttonbox-container') &&
-                (event.clientX < buttonRect.x || event.clientY < buttonRect.y)
-              )
-            ) {
-              return;
-            }
+          if (
+            event.clientX < MAC_WINDOW_BUTTONS_X_BORDER &&
+            event.clientY < MAC_WINDOW_BUTTONS_Y_BORDER &&
+            event.clientX > buttonRect.x &&
+            event.clientY > buttonRect.y
+          ) {
+            return;
           }
         }
 

From c322051dddc00c50a5a67d913f4c6007f192b8f8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Feb 2025 12:42:33 +0100
Subject: [PATCH 188/191] Changed mac bundle name from `Zen Browser` -> `Zen`

---
 configs/common/mozconfig |  1 -
 package-lock.json        | 14 +++++++-------
 package.json             |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index fce7a4692..74fda5740 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -9,7 +9,6 @@ ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_BASENAME=Zen
 export MOZ_APP_PROFILE=${binName}
-export MOZ_APP_DISPLAYNAME="Zen"
 export MOZ_BRANDING_DIRECTORY=${brandingDir}
 export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
 
diff --git a/package-lock.json b/package-lock.json
index cfae67f55..4b7c228ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@zen-browser/surfer": "^1.9.16"
+        "@zen-browser/surfer": "^1.9.17"
       },
       "devDependencies": {
         "husky": "^9.1.7",
@@ -270,9 +270,9 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.9.16",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.16.tgz",
-      "integrity": "sha512-6/Vcp1Ox9mt53hoBUuxFvpnRMnlvjFb3GBOcRhpqoYW/yi9mlV3G48icE717wGCoR2TThfuS6SYVfiT/G1kkrw==",
+      "version": "1.9.17",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.17.tgz",
+      "integrity": "sha512-Z39jGD8Vf9LqmcFwg0/blvbDVZX7kpXkCSVM1ABDy8yqyJm0emGdwrhZhKrxe0hZgxAEY13cVf1baSyZOVGS+g==",
       "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
@@ -2811,9 +2811,9 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "@zen-browser/surfer": {
-      "version": "1.9.16",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.16.tgz",
-      "integrity": "sha512-6/Vcp1Ox9mt53hoBUuxFvpnRMnlvjFb3GBOcRhpqoYW/yi9mlV3G48icE717wGCoR2TThfuS6SYVfiT/G1kkrw==",
+      "version": "1.9.17",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.17.tgz",
+      "integrity": "sha512-Z39jGD8Vf9LqmcFwg0/blvbDVZX7kpXkCSVM1ABDy8yqyJm0emGdwrhZhKrxe0hZgxAEY13cVf1baSyZOVGS+g==",
       "requires": {
         "@resvg/resvg-js": "^1.4.0",
         "async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index 807440b18..1fe740ca2 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.9.16"
+    "@zen-browser/surfer": "^1.9.17"
   },
   "devDependencies": {
     "husky": "^9.1.7",

From 4bc5e41c3506bab3f37314b6435febc1b2cdd7bc Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Feb 2025 13:17:36 +0100
Subject: [PATCH 189/191] Trim more the urlbar on single toolbar, fixed pinned
 tabs issues and removed security indicator on the urlbar unless it's hovered

---
 src/browser/base/content/ZenUIManager.mjs        | 16 +++++++++++++++-
 .../base/content/zen-styles/zen-urlbar.css       |  8 +++++---
 .../base/zen-components/ZenPinnedTabManager.mjs  |  3 +++
 .../components/urlbar/UrlbarInput-sys-mjs.patch  | 11 ++++++++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 8180d1772..72783045b 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -10,6 +10,8 @@ var gZenUIManager = {
     XPCOMUtils.defineLazyPreferenceGetter(this, 'contentElementSeparation', 'zen.theme.content-element-separation', 0);
     XPCOMUtils.defineLazyPreferenceGetter(this, 'urlbarWaitToClear', 'zen.urlbar.wait-to-clear', 0);
 
+    gURLBar._zenTrimURL = this.urlbarTrim.bind(this);
+
     ChromeUtils.defineLazyGetter(this, 'motion', () => {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
     });
@@ -151,6 +153,8 @@ var gZenUIManager = {
     this.__currentPopupTrackElement = null;
   },
 
+  // Section: URL bar
+
   get newtabButtons() {
     return document.querySelectorAll('#tabs-newtab-button');
   },
@@ -214,6 +218,16 @@ var gZenUIManager = {
     }
   },
 
+  urlbarTrim(aURL) {
+    if (gZenVerticalTabsManager._hasSetSingleToolbar) {
+      let url = BrowserUIUtils.removeSingleTrailingSlashFromURL(aURL);
+      return (url.startsWith("http://") || url.startsWith("https://"))
+          ? url.split('/')[2]
+          : url;
+    }
+    return BrowserUIUtils.trimURL(aURL);
+  },
+
   // Section: Notification messages
   _createToastElement(messageId, options) {
     const element = document.createXULElement('vbox');
@@ -234,7 +248,7 @@ var gZenUIManager = {
     const toast = this._createToastElement(messageId, options);
     this._toastContainer.removeAttribute('hidden');
     this._toastContainer.appendChild(toast);
-    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', duration: 0.3 });
+    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', bounce: 0.4 });
     await new Promise((resolve) => setTimeout(resolve, 3000));
     await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
     const toastHeight = toast.getBoundingClientRect().height;
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index fb8bf7d2a..a9f1dc608 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -132,8 +132,9 @@
 
 :root[zen-single-toolbar='true'] {
   .urlbar-page-action:not([open]),
+  .identity-box-button:not([open]),
   #tracking-protection-icon-container {
-    margin-inline-end: calc(-14px - 2 * var(--urlbar-icon-padding)) !important;
+    margin-inline-end: calc(-8px - 2 * var(--urlbar-icon-padding)) !important;
     opacity: 0;
     transition: all 0.1s ease;
   }
@@ -142,9 +143,10 @@
     visibility: collapse;
   }
 
-  #urlbar[open] :is(#tracking-protection-icon-container, .urlbar-page-action),
-  #urlbar:hover :is(#tracking-protection-icon-container, .urlbar-page-action),
+  #urlbar[open] :is(#tracking-protection-icon-container, .urlbar-page-action, .identity-box-button),
+  #urlbar:hover :is(#tracking-protection-icon-container, .urlbar-page-action, .identity-box-button),
   .urlbar-page-action[open],
+  .identity-box-button[open],
   #tracking-protection-icon-container[open] {
     opacity: 1;
     margin-inline-end: 0 !important;
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 97a373cb0..084cb0ad1 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -290,6 +290,9 @@
       for (let otherTab of gBrowser.tabs) {
         if (otherTab.pinned && otherTab._tPos > tab.position) {
           const actualPin = this._pinsCache.find((pin) => pin.uuid === otherTab.getAttribute('zen-pin-id'));
+          if (!actualPin) {
+            continue;
+          }
           actualPin.position = otherTab._tPos;
           await ZenPinnedTabsStorage.savePin(actualPin, false);
         }
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 3871b2fe8..83d57783e 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..f8587b68ac057bb0f829fc21f08ade6605b14c92 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..ff77a2407b8ca628bcad06a9822ba2dbf0d43a51 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -89,6 +89,15 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..f8587b68ac057bb0f829fc21f08ade66
      this.removeAttribute("breakout-extend");
      this.#updateTextboxPosition();
    }
+@@ -2946,7 +2978,7 @@ export class UrlbarInput {
+    */
+   _trimValue(val) {
+     let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
+-      ? lazy.BrowserUIUtils.trimURL(val)
++      ? this._zenTrimURL(val)
+       : val;
+     // Only trim value if the directionality doesn't change to RTL and we're not
+     // showing a strikeout https protocol.
 @@ -3305,7 +3337,7 @@ export class UrlbarInput {
      } else {
        where = lazy.BrowserUtils.whereToOpenLink(event, false, false);

From eddc804a92348b8042459f7a75c1dcff79c2fee0 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Feb 2025 13:39:09 +0100
Subject: [PATCH 190/191] Formatted the project

---
 src/browser/base/content/ZenUIManager.mjs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 72783045b..82de90f62 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -221,9 +221,7 @@ var gZenUIManager = {
   urlbarTrim(aURL) {
     if (gZenVerticalTabsManager._hasSetSingleToolbar) {
       let url = BrowserUIUtils.removeSingleTrailingSlashFromURL(aURL);
-      return (url.startsWith("http://") || url.startsWith("https://"))
-          ? url.split('/')[2]
-          : url;
+      return url.startsWith('http://') || url.startsWith('https://') ? url.split('/')[2] : url;
     }
     return BrowserUIUtils.trimURL(aURL);
   },

From 9bf97e78e53abbb4fc24f763c6c32bc528b28d0f Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sun, 16 Feb 2025 17:06:10 +0100
Subject: [PATCH 191/191] Updated surfer dependency to the latest version

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4b7c228ee..060ae5c5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@zen-browser/surfer": "^1.9.17"
+        "@zen-browser/surfer": "^1.9.18"
       },
       "devDependencies": {
         "husky": "^9.1.7",
@@ -270,9 +270,9 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.9.17",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.17.tgz",
-      "integrity": "sha512-Z39jGD8Vf9LqmcFwg0/blvbDVZX7kpXkCSVM1ABDy8yqyJm0emGdwrhZhKrxe0hZgxAEY13cVf1baSyZOVGS+g==",
+      "version": "1.9.18",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.18.tgz",
+      "integrity": "sha512-lTMQ/RkIYI1fBjvd+UWHwcZqIk3H2X0wZniwFFpQOVg3wNEjljk3DVcuxwOEy08PrQYbxEX1vfQLyyjzlJWnEw==",
       "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
@@ -2811,9 +2811,9 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "@zen-browser/surfer": {
-      "version": "1.9.17",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.17.tgz",
-      "integrity": "sha512-Z39jGD8Vf9LqmcFwg0/blvbDVZX7kpXkCSVM1ABDy8yqyJm0emGdwrhZhKrxe0hZgxAEY13cVf1baSyZOVGS+g==",
+      "version": "1.9.18",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.9.18.tgz",
+      "integrity": "sha512-lTMQ/RkIYI1fBjvd+UWHwcZqIk3H2X0wZniwFFpQOVg3wNEjljk3DVcuxwOEy08PrQYbxEX1vfQLyyjzlJWnEw==",
       "requires": {
         "@resvg/resvg-js": "^1.4.0",
         "async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index 1fe740ca2..0e72e8cda 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.9.17"
+    "@zen-browser/surfer": "^1.9.18"
   },
   "devDependencies": {
     "husky": "^9.1.7",