diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs
index 50716e894..6cbdb9f23 100644
--- a/src/browser/base/content/ZenCustomizableUI.sys.mjs
+++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs
@@ -15,7 +15,7 @@ export var ZenCustomizableUI = new class {
       {
         type: this.TYPE_TOOLBAR,
         defaultPlacements: [
-          "PanelUI-menu-button", "zen-expand-sidebar-button", "zen-profile-button"
+          "preferences-button", "zen-expand-sidebar-button", "zen-profile-button"
         ],
         defaultCollapsed: null,
       }
@@ -71,8 +71,6 @@ export var ZenCustomizableUI = new class {
       </toolbar>
     `);
     window.document.getElementById('navigator-toolbox').prepend(sidebarBox);
-    const sideBarTopButtons = window.document.getElementById('zen-sidebar-top-buttons')
-      .querySelector('#zen-sidebar-top-buttons-customization-target');
 
     const newTab = window.document.getElementById('vertical-tabs-newtab-button');
     newTab.classList.add('zen-sidebar-action-button');
@@ -81,13 +79,6 @@ export var ZenCustomizableUI = new class {
     wrapper.id = 'zen-workspaces-button';
     window.document.getElementById('zen-sidebar-icons-wrapper').prepend(wrapper);
 
-    const panelMenu = window.document.getElementById('PanelUI-menu-button');
-    panelMenu.classList.add('zen-sidebar-action-button');
-    panelMenu.setAttribute('cui-areatype', 'toolbar');
-    panelMenu.setAttribute('removable', 'true');
-
-    sideBarTopButtons.prepend(panelMenu);
-
     for (let id of this.defaultSidebarIcons) {
       const elem = window.document.getElementById(id);
       if (!elem) continue;
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index 072a6099b..a8648e284 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit 072a6099b4faf381e555e8d98dbaedd7a3c8c773
+Subproject commit a8648e284b6addbc85fce367f6916808cd534cd1
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 01ace92a4..1f3290a55 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -649,6 +649,7 @@ var zenMissingKeyboardShortcutL10n = {
   key_sanitize: "zen-key-sanitize",
   key_wrCaptureCmd: "zen-key-wr-capture-cmd", 
   key_wrToggleCaptureSequenceCmd: "zen-key-wr-toggle-capture-sequence-cmd",
+  key_undoCloseWindow: "zen-key-undo-close-window",
 
   key_selectTab1: "zen-key-select-tab-1",
   key_selectTab2: "zen-key-select-tab-2",
@@ -723,10 +724,7 @@ var gZenCKSSettings = {
       const group = shortcut.getGroup();
       const keyInString = shortcut.toUserString();
 
-      const hasLabel = !l10nID;
-      const labelValue = !hasLabel 
-        ? l10nID 
-        : zenMissingKeyboardShortcutL10n[keyID];
+      const labelValue = zenMissingKeyboardShortcutL10n[keyID] ?? l10nID;
       
       let fragment = window.MozXULElement.parseXULToFragment(`
         <hbox class="${ZEN_CKS_CLASS_BASE}">