diff --git a/l10n b/l10n
index 3ef7e8235..4af2d205f 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 3ef7e82352f9553198049ea2cf69892ae94f5543
+Subproject commit 4af2d205f0c439dfaf67974d64ea4f8f13aeff86
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 74d0d6af7..499ca7bb1 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -29,6 +29,7 @@
 <script src="chrome://browser/content/zen-components/ZenThemesImporter.mjs" />
 <script src="chrome://browser/content/zen-components/ZenCompactMode.mjs" />
 <script src="chrome://browser/content/ZenUIManager.mjs" />
+<script src="chrome://browser/content/zen-components/ZenGradientGenerator.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/ZenWorkspaces.mjs" />
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index dc1400f4d..8db952694 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit dc1400f4dbb1f8e4b5d0d401db5856089f08b044
+Subproject commit 8db952694edba7734a30a19d1c1c0c7883714d72
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index 0ecc0c96d..4bb8a6a9c 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -101,6 +101,18 @@
   </vbox>
 </panelview>
 
+<panel flip="side" type="arrow" orient="vertical" id="PanelUI-zen-gradient-generator" position="bottomright topright" mainview="true" side="left">
+  <panelmultiview id="PanelUI-zen-gradient-generator-multiview" mainViewId="PanelUI-zen-gradient-generator-view">
+    <panelview id="PanelUI-zen-gradient-generator-view" class="PanelUI-subView zen-theme-picker" role="document" mainview-with-header="true" has-custom-header="true">
+      <hbox class="zen-theme-picker-gradient">
+        <hbox class="zen-theme-picker-gradient-container">
+        </hbox>
+        <html:canvas class="zen-theme-picker-gradient-canvas" width="180" height="180"></html:canvas>
+      </hbox>
+    </panelview>
+  </panelmultiview>
+</panel>
+
 <panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left" onpopuphidden="ZenWorkspaces.handlePanelHidden();">
   <panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
     <panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true" closemenu="none">
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index b513e05e2..b0d542435 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -497,7 +497,6 @@ var gZenLooksAndFeel = {
     var onPreferColorSchemeChange = this.onPreferColorSchemeChange.bind(this);
     window.matchMedia('(prefers-color-scheme: dark)').addListener(onPreferColorSchemeChange);
     this.onPreferColorSchemeChange();
-    this.themePicker = new ZenThemePicker(document.getElementById('zenLooksAndFeelGradientPickerParent'));
     window.addEventListener('unload', () => {
       window.matchMedia('(prefers-color-scheme: dark)').removeListener(onPreferColorSchemeChange);
     });
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 45d2a8e11..f3bfd9945 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -1,5 +1,4 @@
 <script src="chrome://browser/content/zen-components/ZenThemeBuilder.mjs" defer=""/>
-<script src="chrome://browser/content/zen-components/ZenGradientGenerator.mjs" defer=""/>
 <script src="chrome://browser/content/preferences/zen-settings.js"/>
 <html:template id="template-paneZenLooks">
 <hbox id="zenLooksCategory"
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index c0813fbe5..23da02185 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -164,7 +164,8 @@
   --menu-image: url('bookmark-hollow.svg') !important;
 }
 
-#context_zenEditWorkspace {
+#context_zenEditWorkspace,
+#zenToolbarThemePicker {
   --menu-image: url('edit.svg') !important;
 }