From 38fcd7e872f2ead8f8cf3f4e6ae62c9e7d482766 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 7 Feb 2026 18:47:06 +0100
Subject: [PATCH] fix: Fixed private windows closing when all tabs are cleared,
 b=closes #12242, c=common, folders, tabs, workspaces

---
 src/zen/common/styles/zen-overflowing-addons.css | 1 +
 src/zen/common/styles/zen-theme.css              | 5 +----
 src/zen/drag-and-drop/ZenDragAndDrop.js          | 3 ++-
 src/zen/folders/ZenFolder.mjs                    | 2 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css          | 2 +-
 src/zen/workspaces/ZenWorkspaces.mjs             | 5 +++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/zen/common/styles/zen-overflowing-addons.css b/src/zen/common/styles/zen-overflowing-addons.css
index 354279b35..1d8d4aa24 100644
--- a/src/zen/common/styles/zen-overflowing-addons.css
+++ b/src/zen/common/styles/zen-overflowing-addons.css
@@ -20,6 +20,7 @@
     margin: 0;
     width: 100%;
     height: 100%;
+    padding: 8px 0;
     justify-content: center;
     align-items: center;
   }
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index 46e4151f4..7037fa253 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -228,10 +228,7 @@
   --toolbar-field-color: var(--toolbox-textcolor) !important;
 
   &[zen-private-window='true'] {
-    --zen-main-browser-background: linear-gradient(130deg,
-      color-mix(in srgb, rgb(10, 6, 11) 80%, var(--zen-themed-toolbar-bg-transparent)) 0%,
-      color-mix(in srgb, rgb(19, 7, 22) 80%, var(--zen-themed-toolbar-bg-transparent)) 100%
-    );
+    --zen-main-browser-background: color-mix(in srgb, rgb(11, 10, 11) 90%, var(--zen-themed-toolbar-bg-transparent));
     --zen-main-browser-background-toolbar: var(--zen-main-browser-background);
     --zen-primary-color: light-dark(rgb(93, 42, 107), rgb(110, 48, 125)) !important;
     --toolbox-textcolor: color-mix(in srgb, currentColor 95%, transparent) !important;
diff --git a/src/zen/drag-and-drop/ZenDragAndDrop.js b/src/zen/drag-and-drop/ZenDragAndDrop.js
index f7195a91f..37cccf4a3 100644
--- a/src/zen/drag-and-drop/ZenDragAndDrop.js
+++ b/src/zen/drag-and-drop/ZenDragAndDrop.js
@@ -962,7 +962,8 @@
         dropElement = dragData.dropElement;
         dropBefore = dragData.dropBefore;
       }
-      if (!dropElement) {
+      // Essentials should be properly handled by ::animateVerticalPinnedGridDragOver
+      if (!dropElement || dropElement.hasAttribute("zen-essential")) {
         this.clearDragOverVisuals();
         return null;
       }
diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index cddb56104..f7da4979b 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -21,7 +21,7 @@ export class nsZenFolder extends MozTabbrowserTabGroup {
 
   static rawIcon = new DOMParser().parseFromString(
     `
-      <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <svg width="29" height="29" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
         <defs>
           <linearGradient gradientUnits="userSpaceOnUse" x1="14" y1="5.625" x2="14" y2="22.375" id="gradient-0">
             <stop offset="0" style="stop-color: rgb(255, 255, 255)"/>
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index e757ec649..fe647eb2d 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -209,7 +209,7 @@
   }
 
   :root[zen-unsynced-window="true"] & {
-    transform: translateY(-4px);
+    display: none !important;
   }
 }
 
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index ab27d0c9e..8308ac2ec 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1130,7 +1130,7 @@ class nsZenWorkspaces {
     return (
       !window.toolbar.visible ||
       Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab") ||
-      this.privateWindowOrDisabled
+      (this.privateWindowOrDisabled && !this.isPrivateWindow)
     );
   }
 
@@ -2436,7 +2436,8 @@ class nsZenWorkspaces {
     if (!this.currentWindowIsSyncing) {
       containerTabId = parseInt(gBrowser.selectedTab.getAttribute("usercontextid")) || 0;
       let label = ContextualIdentityService.getUserContextLabel(containerTabId) || "Default";
-      name = this.isPrivateWindow ? "Private " + name : label;
+      name = this.isPrivateWindow ? "Incognito" : label;
+      icon = gZenEmojiPicker.getSVGURL("eye.svg");
     }
     let workspace = {
       uuid: gZenUIManager.generateUuidv4(),