diff --git a/src/renderer/features/now-playing/components/sidebar-play-queue.module.css b/src/renderer/features/now-playing/components/sidebar-play-queue.module.css
index dac5efc25..2c029c746 100644
--- a/src/renderer/features/now-playing/components/sidebar-play-queue.module.css
+++ b/src/renderer/features/now-playing/components/sidebar-play-queue.module.css
@@ -45,7 +45,6 @@
     flex-direction: column;
     height: 100%;
     min-height: 0;
-    padding: var(--theme-spacing-md);
     overflow: hidden;
     background: var(--theme-colors-background);
     background-color: var(--theme-colors-background-alternate);
diff --git a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.module.css b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.module.css
index 210cc5a97..2c2e5c774 100644
--- a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.module.css
+++ b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.module.css
@@ -18,6 +18,7 @@
 }
 
 .container .settings-icon {
+    z-index: 100;
     opacity: 0;
     transition: opacity 0.2s ease-in-out;
 }
diff --git a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx
index af3e3a911..f23f8413d 100644
--- a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx
+++ b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx
@@ -229,9 +229,9 @@ export const Visualizer = () => {
                 iconProps={{ size: 'lg' }}
                 onClick={openVisualizerSettingsModal}
                 pos="absolute"
-                right={0}
-                top={0}
-                variant="transparent"
+                right="var(--theme-spacing-sm)"
+                top="var(--theme-spacing-sm)"
+                variant="subtle"
             />
             <ComponentErrorBoundary>
                 <VisualizerInner />
diff --git a/src/renderer/features/visualizer/components/butternchurn/visualizer.module.css b/src/renderer/features/visualizer/components/butternchurn/visualizer.module.css
index 045b92929..36c2e434c 100644
--- a/src/renderer/features/visualizer/components/butternchurn/visualizer.module.css
+++ b/src/renderer/features/visualizer/components/butternchurn/visualizer.module.css
@@ -13,8 +13,8 @@
 }
 
 .container .settings-icon {
+    z-index: 100;
     opacity: 0;
-    transition: opacity 0.2s ease-in-out;
 }
 
 .canvas {
diff --git a/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx b/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx
index e1c0ef346..cf1b7877f 100644
--- a/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx
+++ b/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx
@@ -306,16 +306,16 @@ const VisualizerInner = () => {
 
 export const Visualizer = () => {
     return (
-        <div className={styles.container} style={{ position: 'relative' }}>
+        <div className={styles.container}>
             <ActionIcon
                 className={styles.settingsIcon}
                 icon="settings2"
                 iconProps={{ size: 'lg' }}
                 onClick={openVisualizerSettingsModal}
                 pos="absolute"
-                right={0}
-                top={0}
-                variant="transparent"
+                right="var(--theme-spacing-sm)"
+                top="var(--theme-spacing-sm)"
+                variant="subtle"
             />
             <ComponentErrorBoundary>
                 <VisualizerInner />