diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 499ca7bb1..8a399a26e 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -9,6 +9,7 @@
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-toolbar.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-tabs.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-ui.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-gradient-generator.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-panel-ui.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-single-components.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-container.css" />
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index 8db952694..6f05fb2ac 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit 8db952694edba7734a30a19d1c1c0c7883714d72
+Subproject commit 6f05fb2acb9a239cf7d4408035415ca3b8d35843
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index 4bb8a6a9c..17ea2fd59 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -105,9 +105,6 @@
   <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>
diff --git a/src/browser/base/content/zen-styles/zen-animations.css b/src/browser/base/content/zen-styles/zen-animations.css
index c6c4b7107..546fec965 100644
--- a/src/browser/base/content/zen-styles/zen-animations.css
+++ b/src/browser/base/content/zen-styles/zen-animations.css
@@ -13,6 +13,18 @@
   }
 }
 
+@keyframes zen-theme-picker-dot-animation {
+  from {
+    transform: scale(0.8);
+  }
+  50% {
+    transform: scale(1.2);
+  }
+  to {
+    transform: scale(1);
+  }
+}
+
 @keyframes zen-jello-out-animation {
   0% {
     transform: scale3d(1, 1, 1);
diff --git a/src/browser/base/content/zen-styles/zen-gradient-generator.css b/src/browser/base/content/zen-styles/zen-gradient-generator.css
index 5835f9da9..98210008b 100644
--- a/src/browser/base/content/zen-styles/zen-gradient-generator.css
+++ b/src/browser/base/content/zen-styles/zen-gradient-generator.css
@@ -1,54 +1,32 @@
 
+#PanelUI-zen-gradient-generator {
+  --panel-width: 300px;
+  min-width: var(--panel-width);
+}
+
 .zen-theme-picker-gradient {
-  border-radius: 10px;
   position: relative;
-  overflow: hidden;
-  background: white;
+  border-radius: var(--zen-border-radius);
+  border: 1px solid var(--zen-colors-border);
+  background: var(--zen-themed-toolbar-bg);
 
-  & .zen-theme-picker-gradient-container {
-    --zen-gradient-picker-padding: 10px;
+  min-height: calc(var(--panel-width) - var(--panel-padding) * 2);
+  min-width: calc(var(--panel-width) - var(--panel-padding) * 2);
+
+  & .zen-theme-picker-dot {
     position: absolute;
-    top: var(--zen-gradient-picker-padding);
-    left: var(--zen-gradient-picker-padding);
-    height: calc(100% - 2 * var(--zen-gradient-picker-padding));
-    width: calc(100% - 2 * var(--zen-gradient-picker-padding));
-    display: flex;
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    background: var(--zen-theme-picker-dot-color);
+    box-shadow: 0 0 0 2px var(--zen-themed-toolbar-bg);
+    cursor: pointer;
+    border: 3px solid var(--zen-colors-border);
+    animation: zen-theme-picker-dot-animation .5s;
+    transition: transform .2s;
 
-    background: color-mix(in srgb, var(--zen-colors-primary) 70%, transparent 30%);
-    border-radius: 10px;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
-
-    backdrop-filter: blur(20px);
-
-    border: 1px solid var(--zen-colors-border);
-
-    & .zen-theme-picker-gradient-color {
-      &[primary='true'] {
-        width: 30px;
-        height: 30px;
-        border-width: 6px;
-      }
-
-      &:not([primary='true']) {
-        width: 20px;
-        height: 20px;
-        border-width: 4px;
-      }
-
-      border-radius: 50%;
-      border-style: solid;
-      border-color: white;
-      background: var(--zen-chosen-color, black);
-
-      transform: translate(-50%, -50%);
-
-      cursor: move;
-      position: absolute;
-
-      transition: transform 0.2s;
-      &[dragging='true'] {
-        transform: scale(1.2) translate(-50%, -50%);
-      }
+    &[dragging='true'] {
+      transform: scale(1.2);
     }
   }
 }
diff --git a/src/browser/components/preferences/zen-preferences-links.xhtml b/src/browser/components/preferences/zen-preferences-links.xhtml
index 517c7d660..ebc2252af 100644
--- a/src/browser/components/preferences/zen-preferences-links.xhtml
+++ b/src/browser/components/preferences/zen-preferences-links.xhtml
@@ -3,9 +3,5 @@
   rel="stylesheet"
   href="chrome://browser/skin/preferences/zen-preferences.css"
 />
-<link
-  rel="stylesheet"
-  href="chrome://browser/content/zen-styles/zen-gradient-generator.css"
-/>
 <script src="chrome://browser/content/zenThemeModifier.js"/>
 <link rel="localization" href="browser/preferences/zen-preferences.ftl"/>
\ No newline at end of file