diff --git a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
index ca86c703..b4dcca49 100644
--- a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
+++ b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
@@ -4,12 +4,10 @@ import { useRef } from 'react';
 
 import { PlayQueueListControls } from './play-queue-list-controls';
 
-import { PageHeader } from '/@/renderer/components/page-header/page-header';
 import { VirtualGridContainer } from '/@/renderer/components/virtual-grid';
 import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue';
 import { useWindowSettings } from '/@/renderer/store/settings.store';
 import { Box } from '/@/shared/components/box/box';
-import { Stack } from '/@/shared/components/stack/stack';
 import { Song } from '/@/shared/types/domain-types';
 import { Platform } from '/@/shared/types/types';
 
@@ -20,14 +18,9 @@ export const SidebarPlayQueue = () => {
     const isWeb = windowBarStyle === Platform.WEB;
     return (
         <VirtualGridContainer>
-            {isWeb && (
-                <Stack mr={isWeb ? '130px' : undefined}>
-                    <PageHeader />
-                </Stack>
-            )}
             <Box
                 display={!isWeb ? 'flex' : undefined}
-                h={!isWeb ? '65px' : undefined}
+                h="65px"
             >
                 <PlayQueueListControls
                     tableRef={queueRef}
diff --git a/src/renderer/features/window-controls/components/window-controls.module.css b/src/renderer/features/window-controls/components/window-controls.module.css
index 0d25094a..90f60943 100644
--- a/src/renderer/features/window-controls/components/window-controls.module.css
+++ b/src/renderer/features/window-controls/components/window-controls.module.css
@@ -3,6 +3,7 @@
     width: 130px;
     height: 100%;
     -webkit-app-region: no-drag;
+    background-color: var(--theme-colors-background);
 }
 
 .windows-button {
@@ -25,5 +26,7 @@
 }
 
 .windows-button.exit-button {
-    background: var(--theme-colors-state-error);
+    &:hover {
+        background: var(--theme-colors-state-error);
+    }
 }
diff --git a/src/renderer/features/window-controls/components/window-controls.tsx b/src/renderer/features/window-controls/components/window-controls.tsx
index c6757ff7..c2e78e71 100644
--- a/src/renderer/features/window-controls/components/window-controls.tsx
+++ b/src/renderer/features/window-controls/components/window-controls.tsx
@@ -7,10 +7,6 @@ import styles from './window-controls.module.css';
 
 const browser = isElectron() ? window.api.browser : null;
 
-interface WindowControlsProps {
-    style?: 'linux' | 'macos' | 'windows';
-}
-
 const close = () => browser?.exit();
 
 const minimize = () => browser?.minimize();
@@ -19,7 +15,7 @@ const maximize = () => browser?.maximize();
 
 const unmaximize = () => browser?.unmaximize();
 
-export const WindowControls = ({ style }: WindowControlsProps) => {
+export const WindowControls = () => {
     const [max, setMax] = useState(false);
 
     const handleMinimize = () => minimize();
@@ -39,29 +35,29 @@ export const WindowControls = ({ style }: WindowControlsProps) => {
         <>
             {isElectron() && (
                 <>
-                    {style === 'windows' && (
-                        <div className={styles.windowsButtonGroup}>
-                            <div
-                                onClick={handleMinimize}
-                                role="button"
-                            >
-                                <RiSubtractLine size={19} />
-                            </div>
-                            <div
-                                onClick={handleMaximize}
-                                role="button"
-                            >
-                                <RiCheckboxBlankLine size={13} />
-                            </div>
-                            <div
-                                className={clsx(styles.windowsButton, styles.exitButton)}
-                                onClick={handleClose}
-                                role="button"
-                            >
-                                <RiCloseLine size={19} />
-                            </div>
+                    <div className={styles.windowsButtonGroup}>
+                        <div
+                            className={styles.windowsButton}
+                            onClick={handleMinimize}
+                            role="button"
+                        >
+                            <RiSubtractLine size={19} />
                         </div>
-                    )}
+                        <div
+                            className={styles.windowsButton}
+                            onClick={handleMaximize}
+                            role="button"
+                        >
+                            <RiCheckboxBlankLine size={13} />
+                        </div>
+                        <div
+                            className={clsx(styles.windowsButton, styles.exitButton)}
+                            onClick={handleClose}
+                            role="button"
+                        >
+                            <RiCloseLine size={19} />
+                        </div>
+                    </div>
                 </>
             )}
         </>
diff --git a/src/shared/styles/global.css b/src/shared/styles/global.css
index 73229912..8b11a4f0 100644
--- a/src/shared/styles/global.css
+++ b/src/shared/styles/global.css
@@ -321,6 +321,7 @@ button {
     }
 
     .ag-header {
+        width: auto;
         border-bottom: 2px solid var(--theme-colors-border);
     }