From 3fd89a93f5dda8ac55a6b499da0ffbe2b8aa6c6a Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 29 Mar 2026 19:20:11 +0200
Subject: [PATCH] no-bug: Move live folder context menu item to the toolbar
 menu (gh-12991)

---
 .../base/content/zen-panels/popups.inc        | 17 -----------------
 src/zen/common/modules/ZenUIManager.mjs       |  2 +-
 src/zen/compact-mode/ZenCompactMode.mjs       |  2 +-
 src/zen/folders/ZenFolders.mjs                | 19 ++++++++++++++++++-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/browser/base/content/zen-panels/popups.inc b/src/browser/base/content/zen-panels/popups.inc
index c79bf726b..c888a26c2 100644
--- a/src/browser/base/content/zen-panels/popups.inc
+++ b/src/browser/base/content/zen-panels/popups.inc
@@ -3,23 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <menupopup id="zenCreateNewPopup">
-  <menu data-l10n-id="zen-panel-ui-live-folder-create" id="zen-panel-ui-live-folder-create">
-    <menupopup>
-      <menuitem
-        data-l10n-id="zen-live-folder-github-pull-requests"
-        command="cmd_zenNewLiveFolder"
-        image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
-      <menuitem
-        data-l10n-id="zen-live-folder-github-issues"
-        command="cmd_zenNewLiveFolder"
-        image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
-      <menuitem
-        data-l10n-id="zen-live-folder-type-rss"
-        command="cmd_zenNewLiveFolder"
-        image="chrome://browser/skin/zen-icons/selectable/logo-rss.svg"/>
-    </menupopup>
-  </menu>
-  <menuseparator/>
   <menuitem data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenOpenWorkspaceCreation" image="chrome://browser/skin/zen-icons/duplicate-tab.svg" />
   <menuitem data-l10n-id="zen-panel-ui-folder-create" command="cmd_zenOpenFolderCreation" image="chrome://browser/skin/zen-icons/folder.svg" />
   <menuseparator/>
diff --git a/src/zen/common/modules/ZenUIManager.mjs b/src/zen/common/modules/ZenUIManager.mjs
index 5a3826d2f..e26abe4db 100644
--- a/src/zen/common/modules/ZenUIManager.mjs
+++ b/src/zen/common/modules/ZenUIManager.mjs
@@ -999,7 +999,7 @@ window.gZenVerticalTabsManager = {
                 command="cmd_zenToggleTabsOnRight"
         />
     `);
-    document.getElementById("viewToolbarsMenuSeparator").before(fragment);
+    document.getElementById("toolbar-context-customize").before(fragment);
   },
 
   get _topButtonsSeparatorElement() {
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 19b0abd68..ae6424fe3 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -247,7 +247,7 @@ window.gZenCompactModeManager = {
       }
     }
 
-    document.getElementById("viewToolbarsMenuSeparator").before(fragment);
+    document.getElementById("toolbar-context-customize").before(fragment);
     this.updateContextMenu();
   },
 
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index ffb57831e..f3183c76f 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -70,7 +70,24 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
     );
     document.getElementById("context_moveTabToGroup").before(contextMenuItems);
     const contextMenuItemsToolbar = window.MozXULElement.parseXULToFragment(
-      `<menuitem id="zen-context-menu-new-folder-toolbar" data-l10n-id="zen-toolbar-context-new-folder"/>`
+      `<menuitem id="zen-context-menu-new-folder-toolbar" data-l10n-id="zen-toolbar-context-new-folder"/>
+       <menuseparator />
+       <menu data-l10n-id="zen-panel-ui-live-folder-create" id="zen-panel-ui-live-folder-create">
+         <menupopup>
+           <menuitem
+             data-l10n-id="zen-live-folder-github-pull-requests"
+             command="cmd_zenNewLiveFolder"
+             image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
+           <menuitem
+             data-l10n-id="zen-live-folder-github-issues"
+             command="cmd_zenNewLiveFolder"
+             image="chrome://browser/skin/zen-icons/selectable/logo-github.svg" />
+           <menuitem
+             data-l10n-id="zen-live-folder-type-rss"
+             command="cmd_zenNewLiveFolder"
+             image="chrome://browser/skin/zen-icons/selectable/logo-rss.svg"/>
+         </menupopup>
+       </menu>`
     );
     document
       .getElementById("toolbar-context-openANewTab")