diff --git a/.vscode/settings.json b/.vscode/settings.json
index de5fbd69..0ec6ca76 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,6 +17,7 @@
     "songlink",
     "speechiness",
     "Spotube",
+    "titlebar",
     "winget"
   ],
   "editor.formatOnSave": true,
diff --git a/lib/components/page_window_title_bar.dart b/lib/components/page_window_title_bar.dart
deleted file mode 100644
index c5fc11e7..00000000
--- a/lib/components/page_window_title_bar.dart
+++ /dev/null
@@ -1,653 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
-import 'package:spotube/utils/platform.dart';
-import 'package:titlebar_buttons/titlebar_buttons.dart';
-import 'dart:math';
-import 'package:flutter/foundation.dart' show kIsWeb;
-import 'dart:io' show Platform;
-
-import 'package:window_manager/window_manager.dart';
-
-class PageWindowTitleBar extends StatefulHookConsumerWidget
-    implements PreferredSizeWidget {
-  final Widget? leading;
-  final bool automaticallyImplyLeading;
-  final List<Widget>? actions;
-  final Color? backgroundColor;
-  final Color? foregroundColor;
-  final IconThemeData? actionsIconTheme;
-  final bool? centerTitle;
-  final double? titleSpacing;
-  final double toolbarOpacity;
-  final double? leadingWidth;
-  final TextStyle? toolbarTextStyle;
-  final TextStyle? titleTextStyle;
-  final double? titleWidth;
-  final Widget? title;
-
-  final bool _sliver;
-
-  const PageWindowTitleBar({
-    super.key,
-    this.actions,
-    this.title,
-    this.toolbarOpacity = 1,
-    this.backgroundColor,
-    this.actionsIconTheme,
-    this.automaticallyImplyLeading = false,
-    this.centerTitle,
-    this.foregroundColor,
-    this.leading,
-    this.leadingWidth,
-    this.titleSpacing,
-    this.titleTextStyle,
-    this.titleWidth,
-    this.toolbarTextStyle,
-  })  : _sliver = false,
-        pinned = false,
-        floating = false,
-        snap = false,
-        stretch = false;
-
-  final bool pinned;
-  final bool floating;
-  final bool snap;
-  final bool stretch;
-
-  const PageWindowTitleBar.sliver({
-    super.key,
-    this.actions,
-    this.title,
-    this.backgroundColor,
-    this.actionsIconTheme,
-    this.automaticallyImplyLeading = false,
-    this.centerTitle,
-    this.foregroundColor,
-    this.leading,
-    this.leadingWidth,
-    this.titleSpacing,
-    this.titleTextStyle,
-    this.titleWidth,
-    this.toolbarTextStyle,
-    this.pinned = false,
-    this.floating = false,
-    this.snap = false,
-    this.stretch = false,
-  })  : _sliver = true,
-        toolbarOpacity = 1;
-
-  @override
-  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
-
-  @override
-  ConsumerState<PageWindowTitleBar> createState() => _PageWindowTitleBarState();
-}
-
-class _PageWindowTitleBarState extends ConsumerState<PageWindowTitleBar> {
-  void onDrag(details) {
-    final systemTitleBar =
-        ref.read(userPreferencesProvider.select((s) => s.systemTitleBar));
-    if (kIsDesktop && !systemTitleBar) {
-      windowManager.startDragging();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final mediaQuery = MediaQuery.of(context);
-
-    if (widget._sliver) {
-      return SliverLayoutBuilder(
-        builder: (context, constraints) {
-          final hasFullscreen =
-              mediaQuery.size.width == constraints.crossAxisExtent;
-          final hasLeadingOrCanPop =
-              widget.leading != null || Navigator.canPop(context);
-
-          return SliverPadding(
-            padding: EdgeInsets.only(
-              left: kIsMacOS && hasFullscreen && hasLeadingOrCanPop ? 65 : 0,
-            ),
-            sliver: SliverAppBar(
-              leading: widget.leading,
-              automaticallyImplyLeading: widget.automaticallyImplyLeading,
-              actions: [
-                ...?widget.actions,
-                WindowTitleBarButtons(foregroundColor: widget.foregroundColor),
-              ],
-              backgroundColor: widget.backgroundColor,
-              foregroundColor: widget.foregroundColor,
-              actionsIconTheme: widget.actionsIconTheme,
-              centerTitle: widget.centerTitle,
-              titleSpacing: widget.titleSpacing,
-              leadingWidth: widget.leadingWidth,
-              toolbarTextStyle: widget.toolbarTextStyle,
-              titleTextStyle: widget.titleTextStyle,
-              title: SizedBox(
-                width: double.infinity, // workaround to force dragging
-                child: widget.title ?? const Text(""),
-              ),
-              pinned: widget.pinned,
-              floating: widget.floating,
-              snap: widget.snap,
-              stretch: widget.stretch,
-            ),
-          );
-        },
-      );
-    }
-
-    return LayoutBuilder(builder: (context, constrains) {
-      final hasFullscreen = mediaQuery.size.width == constrains.maxWidth;
-      final hasLeadingOrCanPop =
-          widget.leading != null || Navigator.canPop(context);
-
-      return GestureDetector(
-        onHorizontalDragStart: onDrag,
-        onVerticalDragStart: onDrag,
-        child: Padding(
-          padding: EdgeInsets.only(
-            left: kIsMacOS && hasFullscreen && hasLeadingOrCanPop ? 65 : 0,
-          ),
-          child: AppBar(
-            leading: widget.leading,
-            automaticallyImplyLeading: widget.automaticallyImplyLeading,
-            actions: [
-              ...?widget.actions,
-              WindowTitleBarButtons(foregroundColor: widget.foregroundColor),
-            ],
-            backgroundColor: widget.backgroundColor,
-            foregroundColor: widget.foregroundColor,
-            actionsIconTheme: widget.actionsIconTheme,
-            centerTitle: widget.centerTitle,
-            titleSpacing: widget.titleSpacing,
-            toolbarOpacity: widget.toolbarOpacity,
-            leadingWidth: widget.leadingWidth,
-            toolbarTextStyle: widget.toolbarTextStyle,
-            titleTextStyle: widget.titleTextStyle,
-            title: SizedBox(
-              width: double.infinity, // workaround to force dragging
-              child: widget.title ?? const Text(""),
-            ),
-            scrolledUnderElevation: 0,
-            shadowColor: Colors.transparent,
-            forceMaterialTransparency: true,
-            elevation: 0,
-          ),
-        ),
-      );
-    });
-  }
-}
-
-class WindowTitleBarButtons extends HookConsumerWidget {
-  final Color? foregroundColor;
-  const WindowTitleBarButtons({
-    super.key,
-    this.foregroundColor,
-  });
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final preferences = ref.watch(userPreferencesProvider);
-    final isMaximized = useState<bool?>(null);
-    const type = ThemeType.auto;
-
-    Future<void> onClose() async {
-      await windowManager.close();
-    }
-
-    useEffect(() {
-      if (kIsDesktop) {
-        windowManager.isMaximized().then((value) {
-          isMaximized.value = value;
-        });
-      }
-      return null;
-    }, []);
-
-    if (!kIsDesktop || kIsMacOS || preferences.systemTitleBar) {
-      return const SizedBox.shrink();
-    }
-
-    if (kIsWindows) {
-      final theme = Theme.of(context);
-      final colors = WindowButtonColors(
-        normal: Colors.transparent,
-        iconNormal: foregroundColor ?? theme.colorScheme.onBackground,
-        mouseOver: theme.colorScheme.onBackground.withOpacity(0.1),
-        mouseDown: theme.colorScheme.onBackground.withOpacity(0.2),
-        iconMouseOver: theme.colorScheme.onBackground,
-        iconMouseDown: theme.colorScheme.onBackground,
-      );
-
-      final closeColors = WindowButtonColors(
-        normal: Colors.transparent,
-        iconNormal: foregroundColor ?? theme.colorScheme.onBackground,
-        mouseOver: Colors.red,
-        mouseDown: Colors.red[800]!,
-        iconMouseOver: Colors.white,
-        iconMouseDown: Colors.black,
-      );
-
-      return Padding(
-        padding: const EdgeInsets.only(bottom: 25),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            MinimizeWindowButton(
-              onPressed: windowManager.minimize,
-              colors: colors,
-            ),
-            if (isMaximized.value != true)
-              MaximizeWindowButton(
-                colors: colors,
-                onPressed: () {
-                  windowManager.maximize();
-                  isMaximized.value = true;
-                },
-              )
-            else
-              RestoreWindowButton(
-                colors: colors,
-                onPressed: () {
-                  windowManager.unmaximize();
-                  isMaximized.value = false;
-                },
-              ),
-            CloseWindowButton(
-              colors: closeColors,
-              onPressed: onClose,
-            ),
-          ],
-        ),
-      );
-    }
-
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 20, left: 10),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          DecoratedMinimizeButton(
-            type: type,
-            onPressed: windowManager.minimize,
-          ),
-          DecoratedMaximizeButton(
-            type: type,
-            onPressed: () async {
-              if (await windowManager.isMaximized()) {
-                await windowManager.unmaximize();
-                isMaximized.value = false;
-              } else {
-                await windowManager.maximize();
-                isMaximized.value = true;
-              }
-            },
-          ),
-          DecoratedCloseButton(
-            type: type,
-            onPressed: onClose,
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-typedef WindowButtonIconBuilder = Widget Function(
-    WindowButtonContext buttonContext);
-typedef WindowButtonBuilder = Widget Function(
-    WindowButtonContext buttonContext, Widget icon);
-
-class WindowButtonContext {
-  BuildContext context;
-  MouseState mouseState;
-  Color? backgroundColor;
-  Color iconColor;
-  WindowButtonContext(
-      {required this.context,
-      required this.mouseState,
-      this.backgroundColor,
-      required this.iconColor});
-}
-
-class WindowButtonColors {
-  late Color normal;
-  late Color mouseOver;
-  late Color mouseDown;
-  late Color iconNormal;
-  late Color iconMouseOver;
-  late Color iconMouseDown;
-  WindowButtonColors(
-      {Color? normal,
-      Color? mouseOver,
-      Color? mouseDown,
-      Color? iconNormal,
-      Color? iconMouseOver,
-      Color? iconMouseDown}) {
-    this.normal = normal ?? _defaultButtonColors.normal;
-    this.mouseOver = mouseOver ?? _defaultButtonColors.mouseOver;
-    this.mouseDown = mouseDown ?? _defaultButtonColors.mouseDown;
-    this.iconNormal = iconNormal ?? _defaultButtonColors.iconNormal;
-    this.iconMouseOver = iconMouseOver ?? _defaultButtonColors.iconMouseOver;
-    this.iconMouseDown = iconMouseDown ?? _defaultButtonColors.iconMouseDown;
-  }
-}
-
-final _defaultButtonColors = WindowButtonColors(
-  normal: Colors.transparent,
-  iconNormal: const Color(0xFF805306),
-  mouseOver: const Color(0xFF404040),
-  mouseDown: const Color(0xFF202020),
-  iconMouseOver: const Color(0xFFFFFFFF),
-  iconMouseDown: const Color(0xFFF0F0F0),
-);
-
-class WindowButton extends StatelessWidget {
-  final WindowButtonBuilder? builder;
-  final WindowButtonIconBuilder? iconBuilder;
-  late final WindowButtonColors colors;
-  final bool animate;
-  final EdgeInsets? padding;
-  final VoidCallback? onPressed;
-
-  WindowButton(
-      {super.key,
-      WindowButtonColors? colors,
-      this.builder,
-      @required this.iconBuilder,
-      this.padding,
-      this.onPressed,
-      this.animate = false}) {
-    this.colors = colors ?? _defaultButtonColors;
-  }
-
-  Color getBackgroundColor(MouseState mouseState) {
-    if (mouseState.isMouseDown) return colors.mouseDown;
-    if (mouseState.isMouseOver) return colors.mouseOver;
-    return colors.normal;
-  }
-
-  Color getIconColor(MouseState mouseState) {
-    if (mouseState.isMouseDown) return colors.iconMouseDown;
-    if (mouseState.isMouseOver) return colors.iconMouseOver;
-    return colors.iconNormal;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (kIsWeb) {
-      return Container();
-    } else {
-      // Don't show button on macOS
-      if (Platform.isMacOS) {
-        return Container();
-      }
-    }
-
-    return MouseStateBuilder(
-      builder: (context, mouseState) {
-        WindowButtonContext buttonContext = WindowButtonContext(
-            mouseState: mouseState,
-            context: context,
-            backgroundColor: getBackgroundColor(mouseState),
-            iconColor: getIconColor(mouseState));
-
-        var icon =
-            (iconBuilder != null) ? iconBuilder!(buttonContext) : Container();
-
-        var fadeOutColor =
-            getBackgroundColor(MouseState()..isMouseOver = true).withOpacity(0);
-        var padding = this.padding ?? const EdgeInsets.all(10);
-        var animationMs =
-            mouseState.isMouseOver ? (animate ? 100 : 0) : (animate ? 200 : 0);
-        Widget iconWithPadding = Padding(padding: padding, child: icon);
-        iconWithPadding = AnimatedContainer(
-            curve: Curves.easeOut,
-            duration: Duration(milliseconds: animationMs),
-            color: buttonContext.backgroundColor ?? fadeOutColor,
-            child: iconWithPadding);
-        var button =
-            (builder != null) ? builder!(buttonContext, icon) : iconWithPadding;
-        return SizedBox(
-          width: 45,
-          height: 32,
-          child: button,
-        );
-      },
-      onPressed: () {
-        if (onPressed != null) onPressed!();
-      },
-    );
-  }
-}
-
-class MinimizeWindowButton extends WindowButton {
-  MinimizeWindowButton(
-      {super.key, super.colors, super.onPressed, bool? animate})
-      : super(
-          animate: animate ?? false,
-          iconBuilder: (buttonContext) =>
-              MinimizeIcon(color: buttonContext.iconColor),
-        );
-}
-
-class MaximizeWindowButton extends WindowButton {
-  MaximizeWindowButton(
-      {super.key, super.colors, super.onPressed, bool? animate})
-      : super(
-          animate: animate ?? false,
-          iconBuilder: (buttonContext) =>
-              MaximizeIcon(color: buttonContext.iconColor),
-        );
-}
-
-class RestoreWindowButton extends WindowButton {
-  RestoreWindowButton({super.key, super.colors, super.onPressed, bool? animate})
-      : super(
-          animate: animate ?? false,
-          iconBuilder: (buttonContext) =>
-              RestoreIcon(color: buttonContext.iconColor),
-        );
-}
-
-final _defaultCloseButtonColors = WindowButtonColors(
-    mouseOver: const Color(0xFFD32F2F),
-    mouseDown: const Color(0xFFB71C1C),
-    iconNormal: const Color(0xFF805306),
-    iconMouseOver: const Color(0xFFFFFFFF));
-
-class CloseWindowButton extends WindowButton {
-  CloseWindowButton(
-      {super.key, WindowButtonColors? colors, super.onPressed, bool? animate})
-      : super(
-          colors: colors ?? _defaultCloseButtonColors,
-          animate: animate ?? false,
-          iconBuilder: (buttonContext) =>
-              CloseIcon(color: buttonContext.iconColor),
-        );
-}
-
-// Switched to CustomPaint icons by https://github.com/esDotDev
-
-/// Close
-class CloseIcon extends StatelessWidget {
-  final Color color;
-  const CloseIcon({super.key, required this.color});
-  @override
-  Widget build(BuildContext context) => Align(
-        alignment: Alignment.topLeft,
-        child: Stack(children: [
-          // Use rotated containers instead of a painter because it renders slightly crisper than a painter for some reason.
-          Transform.rotate(
-              angle: pi * .25,
-              child:
-                  Center(child: Container(width: 14, height: 1, color: color))),
-          Transform.rotate(
-              angle: pi * -.25,
-              child:
-                  Center(child: Container(width: 14, height: 1, color: color))),
-        ]),
-      );
-}
-
-/// Maximize
-class MaximizeIcon extends StatelessWidget {
-  final Color color;
-  const MaximizeIcon({super.key, required this.color});
-  @override
-  Widget build(BuildContext context) => _AlignedPaint(_MaximizePainter(color));
-}
-
-class _MaximizePainter extends _IconPainter {
-  _MaximizePainter(super.color);
-  @override
-  void paint(Canvas canvas, Size size) {
-    Paint p = getPaint(color);
-    canvas.drawRect(Rect.fromLTRB(0, 0, size.width - 1, size.height - 1), p);
-  }
-}
-
-/// Restore
-class RestoreIcon extends StatelessWidget {
-  final Color color;
-  const RestoreIcon({
-    super.key,
-    required this.color,
-  });
-  @override
-  Widget build(BuildContext context) => _AlignedPaint(_RestorePainter(color));
-}
-
-class _RestorePainter extends _IconPainter {
-  _RestorePainter(super.color);
-  @override
-  void paint(Canvas canvas, Size size) {
-    Paint p = getPaint(color);
-    canvas.drawRect(Rect.fromLTRB(0, 2, size.width - 2, size.height), p);
-    canvas.drawLine(const Offset(2, 2), const Offset(2, 0), p);
-    canvas.drawLine(const Offset(2, 0), Offset(size.width, 0), p);
-    canvas.drawLine(
-        Offset(size.width, 0), Offset(size.width, size.height - 2), p);
-    canvas.drawLine(Offset(size.width, size.height - 2),
-        Offset(size.width - 2, size.height - 2), p);
-  }
-}
-
-/// Minimize
-class MinimizeIcon extends StatelessWidget {
-  final Color color;
-  const MinimizeIcon({super.key, required this.color});
-  @override
-  Widget build(BuildContext context) => _AlignedPaint(_MinimizePainter(color));
-}
-
-class _MinimizePainter extends _IconPainter {
-  _MinimizePainter(super.color);
-  @override
-  void paint(Canvas canvas, Size size) {
-    Paint p = getPaint(color);
-    canvas.drawLine(
-        Offset(0, size.height / 2), Offset(size.width, size.height / 2), p);
-  }
-}
-
-/// Helpers
-abstract class _IconPainter extends CustomPainter {
-  _IconPainter(this.color);
-  final Color color;
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
-}
-
-class _AlignedPaint extends StatelessWidget {
-  const _AlignedPaint(this.painter);
-  final CustomPainter painter;
-
-  @override
-  Widget build(BuildContext context) {
-    return Align(
-        alignment: Alignment.center,
-        child: CustomPaint(size: const Size(10, 10), painter: painter));
-  }
-}
-
-Paint getPaint(Color color, [bool isAntiAlias = false]) => Paint()
-  ..color = color
-  ..style = PaintingStyle.stroke
-  ..isAntiAlias = isAntiAlias
-  ..strokeWidth = 1;
-
-typedef MouseStateBuilderCB = Widget Function(
-    BuildContext context, MouseState mouseState);
-
-class MouseState {
-  bool isMouseOver = false;
-  bool isMouseDown = false;
-  MouseState();
-  @override
-  String toString() {
-    return "isMouseDown: $isMouseDown - isMouseOver: $isMouseOver";
-  }
-}
-
-T? _ambiguate<T>(T? value) => value;
-
-class MouseStateBuilder extends StatefulWidget {
-  final MouseStateBuilderCB builder;
-  final VoidCallback? onPressed;
-  const MouseStateBuilder({super.key, required this.builder, this.onPressed});
-  @override
-  // ignore: library_private_types_in_public_api
-  _MouseStateBuilderState createState() => _MouseStateBuilderState();
-}
-
-class _MouseStateBuilderState extends State<MouseStateBuilder> {
-  late MouseState _mouseState;
-  _MouseStateBuilderState() {
-    _mouseState = MouseState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MouseRegion(
-        onEnter: (event) {
-          setState(() {
-            _mouseState.isMouseOver = true;
-          });
-        },
-        onExit: (event) {
-          setState(() {
-            _mouseState.isMouseOver = false;
-          });
-        },
-        child: GestureDetector(
-            onTapDown: (_) {
-              setState(() {
-                _mouseState.isMouseDown = true;
-              });
-            },
-            onTapCancel: () {
-              setState(() {
-                _mouseState.isMouseDown = false;
-              });
-            },
-            onTap: () {
-              setState(() {
-                _mouseState.isMouseDown = false;
-                _mouseState.isMouseOver = false;
-              });
-              _ambiguate(WidgetsBinding.instance)!.addPostFrameCallback((_) {
-                if (widget.onPressed != null) {
-                  widget.onPressed!();
-                }
-              });
-            },
-            onTapUp: (_) {},
-            child: widget.builder(context, _mouseState)));
-  }
-}
diff --git a/lib/components/titlebar/mouse_state.dart b/lib/components/titlebar/mouse_state.dart
new file mode 100644
index 00000000..726c6595
--- /dev/null
+++ b/lib/components/titlebar/mouse_state.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+
+typedef MouseStateBuilderCB = Widget Function(
+    BuildContext context, MouseState mouseState);
+
+class MouseState {
+  bool isMouseOver = false;
+  bool isMouseDown = false;
+  MouseState();
+  @override
+  String toString() {
+    return "isMouseDown: $isMouseDown - isMouseOver: $isMouseOver";
+  }
+}
+
+T? _ambiguate<T>(T? value) => value;
+
+class MouseStateBuilder extends StatefulWidget {
+  final MouseStateBuilderCB builder;
+  final VoidCallback? onPressed;
+  const MouseStateBuilder({super.key, required this.builder, this.onPressed});
+  @override
+  // ignore: library_private_types_in_public_api
+  _MouseStateBuilderState createState() => _MouseStateBuilderState();
+}
+
+class _MouseStateBuilderState extends State<MouseStateBuilder> {
+  late MouseState _mouseState;
+  _MouseStateBuilderState() {
+    _mouseState = MouseState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MouseRegion(
+        onEnter: (event) {
+          setState(() {
+            _mouseState.isMouseOver = true;
+          });
+        },
+        onExit: (event) {
+          setState(() {
+            _mouseState.isMouseOver = false;
+          });
+        },
+        child: GestureDetector(
+            onTapDown: (_) {
+              setState(() {
+                _mouseState.isMouseDown = true;
+              });
+            },
+            onTapCancel: () {
+              setState(() {
+                _mouseState.isMouseDown = false;
+              });
+            },
+            onTap: () {
+              setState(() {
+                _mouseState.isMouseDown = false;
+                _mouseState.isMouseOver = false;
+              });
+              _ambiguate(WidgetsBinding.instance)!.addPostFrameCallback((_) {
+                if (widget.onPressed != null) {
+                  widget.onPressed!();
+                }
+              });
+            },
+            onTapUp: (_) {},
+            child: widget.builder(context, _mouseState)));
+  }
+}
diff --git a/lib/components/titlebar/titlebar.dart b/lib/components/titlebar/titlebar.dart
new file mode 100644
index 00000000..76a5ec8a
--- /dev/null
+++ b/lib/components/titlebar/titlebar.dart
@@ -0,0 +1,179 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:spotube/components/titlebar/titlebar_buttons.dart';
+import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
+import 'package:spotube/utils/platform.dart';
+
+import 'package:window_manager/window_manager.dart';
+
+class PageWindowTitleBar extends StatefulHookConsumerWidget
+    implements PreferredSizeWidget {
+  final Widget? leading;
+  final bool automaticallyImplyLeading;
+  final List<Widget>? actions;
+  final Color? backgroundColor;
+  final Color? foregroundColor;
+  final IconThemeData? actionsIconTheme;
+  final bool? centerTitle;
+  final double? titleSpacing;
+  final double toolbarOpacity;
+  final double? leadingWidth;
+  final TextStyle? toolbarTextStyle;
+  final TextStyle? titleTextStyle;
+  final double? titleWidth;
+  final Widget? title;
+
+  final bool _sliver;
+
+  const PageWindowTitleBar({
+    super.key,
+    this.actions,
+    this.title,
+    this.toolbarOpacity = 1,
+    this.backgroundColor,
+    this.actionsIconTheme,
+    this.automaticallyImplyLeading = false,
+    this.centerTitle,
+    this.foregroundColor,
+    this.leading,
+    this.leadingWidth,
+    this.titleSpacing,
+    this.titleTextStyle,
+    this.titleWidth,
+    this.toolbarTextStyle,
+  })  : _sliver = false,
+        pinned = false,
+        floating = false,
+        snap = false,
+        stretch = false;
+
+  final bool pinned;
+  final bool floating;
+  final bool snap;
+  final bool stretch;
+
+  const PageWindowTitleBar.sliver({
+    super.key,
+    this.actions,
+    this.title,
+    this.backgroundColor,
+    this.actionsIconTheme,
+    this.automaticallyImplyLeading = false,
+    this.centerTitle,
+    this.foregroundColor,
+    this.leading,
+    this.leadingWidth,
+    this.titleSpacing,
+    this.titleTextStyle,
+    this.titleWidth,
+    this.toolbarTextStyle,
+    this.pinned = false,
+    this.floating = false,
+    this.snap = false,
+    this.stretch = false,
+  })  : _sliver = true,
+        toolbarOpacity = 1;
+
+  @override
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+
+  @override
+  ConsumerState<PageWindowTitleBar> createState() => _PageWindowTitleBarState();
+}
+
+class _PageWindowTitleBarState extends ConsumerState<PageWindowTitleBar> {
+  void onDrag(details) {
+    final systemTitleBar =
+        ref.read(userPreferencesProvider.select((s) => s.systemTitleBar));
+    if (kIsDesktop && !systemTitleBar) {
+      windowManager.startDragging();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final mediaQuery = MediaQuery.of(context);
+
+    if (widget._sliver) {
+      return SliverLayoutBuilder(
+        builder: (context, constraints) {
+          final hasFullscreen =
+              mediaQuery.size.width == constraints.crossAxisExtent;
+          final hasLeadingOrCanPop =
+              widget.leading != null || Navigator.canPop(context);
+
+          return SliverPadding(
+            padding: EdgeInsets.only(
+              left: kIsMacOS && hasFullscreen && hasLeadingOrCanPop ? 65 : 0,
+            ),
+            sliver: SliverAppBar(
+              leading: widget.leading,
+              automaticallyImplyLeading: widget.automaticallyImplyLeading,
+              actions: [
+                ...?widget.actions,
+                WindowTitleBarButtons(foregroundColor: widget.foregroundColor),
+              ],
+              backgroundColor: widget.backgroundColor,
+              foregroundColor: widget.foregroundColor,
+              actionsIconTheme: widget.actionsIconTheme,
+              centerTitle: widget.centerTitle,
+              titleSpacing: widget.titleSpacing,
+              leadingWidth: widget.leadingWidth,
+              toolbarTextStyle: widget.toolbarTextStyle,
+              titleTextStyle: widget.titleTextStyle,
+              title: SizedBox(
+                width: double.infinity, // workaround to force dragging
+                child: widget.title ?? const Text(""),
+              ),
+              pinned: widget.pinned,
+              floating: widget.floating,
+              snap: widget.snap,
+              stretch: widget.stretch,
+            ),
+          );
+        },
+      );
+    }
+
+    return LayoutBuilder(builder: (context, constrains) {
+      final hasFullscreen = mediaQuery.size.width == constrains.maxWidth;
+      final hasLeadingOrCanPop =
+          widget.leading != null || Navigator.canPop(context);
+
+      return GestureDetector(
+        onHorizontalDragStart: onDrag,
+        onVerticalDragStart: onDrag,
+        child: Padding(
+          padding: EdgeInsets.only(
+            left: kIsMacOS && hasFullscreen && hasLeadingOrCanPop ? 65 : 0,
+          ),
+          child: AppBar(
+            leading: widget.leading,
+            automaticallyImplyLeading: widget.automaticallyImplyLeading,
+            actions: [
+              ...?widget.actions,
+              WindowTitleBarButtons(foregroundColor: widget.foregroundColor),
+            ],
+            backgroundColor: widget.backgroundColor,
+            foregroundColor: widget.foregroundColor,
+            actionsIconTheme: widget.actionsIconTheme,
+            centerTitle: widget.centerTitle,
+            titleSpacing: widget.titleSpacing,
+            toolbarOpacity: widget.toolbarOpacity,
+            leadingWidth: widget.leadingWidth,
+            toolbarTextStyle: widget.toolbarTextStyle,
+            titleTextStyle: widget.titleTextStyle,
+            title: SizedBox(
+              width: double.infinity, // workaround to force dragging
+              child: widget.title ?? const Text(""),
+            ),
+            scrolledUnderElevation: 0,
+            shadowColor: Colors.transparent,
+            forceMaterialTransparency: true,
+            elevation: 0,
+          ),
+        ),
+      );
+    });
+  }
+}
diff --git a/lib/components/titlebar/titlebar_buttons.dart b/lib/components/titlebar/titlebar_buttons.dart
new file mode 100644
index 00000000..425bf2f1
--- /dev/null
+++ b/lib/components/titlebar/titlebar_buttons.dart
@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:spotube/components/titlebar/titlebar_icon_buttons.dart';
+import 'package:spotube/components/titlebar/window_button.dart';
+import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
+import 'package:spotube/utils/platform.dart';
+import 'package:titlebar_buttons/titlebar_buttons.dart';
+import 'package:window_manager/window_manager.dart';
+
+class WindowTitleBarButtons extends HookConsumerWidget {
+  final Color? foregroundColor;
+  const WindowTitleBarButtons({
+    super.key,
+    this.foregroundColor,
+  });
+
+  @override
+  Widget build(BuildContext context, ref) {
+    final preferences = ref.watch(userPreferencesProvider);
+    final isMaximized = useState<bool?>(null);
+    const type = ThemeType.auto;
+
+    Future<void> onClose() async {
+      await windowManager.close();
+    }
+
+    useEffect(() {
+      if (kIsDesktop) {
+        windowManager.isMaximized().then((value) {
+          isMaximized.value = value;
+        });
+      }
+      return null;
+    }, []);
+
+    if (!kIsDesktop || kIsMacOS || preferences.systemTitleBar) {
+      return const SizedBox.shrink();
+    }
+
+    if (kIsWindows) {
+      final theme = Theme.of(context);
+      final colors = WindowButtonColors(
+        normal: Colors.transparent,
+        iconNormal: foregroundColor ?? theme.colorScheme.onBackground,
+        mouseOver: theme.colorScheme.onBackground.withOpacity(0.1),
+        mouseDown: theme.colorScheme.onBackground.withOpacity(0.2),
+        iconMouseOver: theme.colorScheme.onBackground,
+        iconMouseDown: theme.colorScheme.onBackground,
+      );
+
+      final closeColors = WindowButtonColors(
+        normal: Colors.transparent,
+        iconNormal: foregroundColor ?? theme.colorScheme.onBackground,
+        mouseOver: Colors.red,
+        mouseDown: Colors.red[800]!,
+        iconMouseOver: Colors.white,
+        iconMouseDown: Colors.black,
+      );
+
+      return Padding(
+        padding: const EdgeInsets.only(bottom: 25),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            MinimizeWindowButton(
+              onPressed: windowManager.minimize,
+              colors: colors,
+            ),
+            if (isMaximized.value != true)
+              MaximizeWindowButton(
+                colors: colors,
+                onPressed: () {
+                  windowManager.maximize();
+                  isMaximized.value = true;
+                },
+              )
+            else
+              RestoreWindowButton(
+                colors: colors,
+                onPressed: () {
+                  windowManager.unmaximize();
+                  isMaximized.value = false;
+                },
+              ),
+            CloseWindowButton(
+              colors: closeColors,
+              onPressed: onClose,
+            ),
+          ],
+        ),
+      );
+    }
+
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 20, left: 10),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          DecoratedMinimizeButton(
+            type: type,
+            onPressed: windowManager.minimize,
+          ),
+          DecoratedMaximizeButton(
+            type: type,
+            onPressed: () async {
+              if (await windowManager.isMaximized()) {
+                await windowManager.unmaximize();
+                isMaximized.value = false;
+              } else {
+                await windowManager.maximize();
+                isMaximized.value = true;
+              }
+            },
+          ),
+          DecoratedCloseButton(
+            type: type,
+            onPressed: onClose,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/components/titlebar/titlebar_icon_buttons.dart b/lib/components/titlebar/titlebar_icon_buttons.dart
new file mode 100644
index 00000000..70170262
--- /dev/null
+++ b/lib/components/titlebar/titlebar_icon_buttons.dart
@@ -0,0 +1,161 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:spotube/components/titlebar/window_button.dart';
+
+class MinimizeWindowButton extends WindowButton {
+  MinimizeWindowButton(
+      {super.key, super.colors, super.onPressed, bool? animate})
+      : super(
+          animate: animate ?? false,
+          iconBuilder: (buttonContext) =>
+              MinimizeIcon(color: buttonContext.iconColor),
+        );
+}
+
+class MaximizeWindowButton extends WindowButton {
+  MaximizeWindowButton(
+      {super.key, super.colors, super.onPressed, bool? animate})
+      : super(
+          animate: animate ?? false,
+          iconBuilder: (buttonContext) =>
+              MaximizeIcon(color: buttonContext.iconColor),
+        );
+}
+
+class RestoreWindowButton extends WindowButton {
+  RestoreWindowButton({super.key, super.colors, super.onPressed, bool? animate})
+      : super(
+          animate: animate ?? false,
+          iconBuilder: (buttonContext) =>
+              RestoreIcon(color: buttonContext.iconColor),
+        );
+}
+
+final _defaultCloseButtonColors = WindowButtonColors(
+    mouseOver: const Color(0xFFD32F2F),
+    mouseDown: const Color(0xFFB71C1C),
+    iconNormal: const Color(0xFF805306),
+    iconMouseOver: const Color(0xFFFFFFFF));
+
+class CloseWindowButton extends WindowButton {
+  CloseWindowButton(
+      {super.key, WindowButtonColors? colors, super.onPressed, bool? animate})
+      : super(
+          colors: colors ?? _defaultCloseButtonColors,
+          animate: animate ?? false,
+          iconBuilder: (buttonContext) =>
+              CloseIcon(color: buttonContext.iconColor),
+        );
+}
+
+// Switched to CustomPaint icons by https://github.com/esDotDev
+
+/// Close
+class CloseIcon extends StatelessWidget {
+  final Color color;
+  const CloseIcon({super.key, required this.color});
+  @override
+  Widget build(BuildContext context) => Align(
+        alignment: Alignment.topLeft,
+        child: Stack(children: [
+          // Use rotated containers instead of a painter because it renders slightly crisper than a painter for some reason.
+          Transform.rotate(
+              angle: pi * .25,
+              child:
+                  Center(child: Container(width: 14, height: 1, color: color))),
+          Transform.rotate(
+              angle: pi * -.25,
+              child:
+                  Center(child: Container(width: 14, height: 1, color: color))),
+        ]),
+      );
+}
+
+/// Maximize
+class MaximizeIcon extends StatelessWidget {
+  final Color color;
+  const MaximizeIcon({super.key, required this.color});
+  @override
+  Widget build(BuildContext context) => _AlignedPaint(_MaximizePainter(color));
+}
+
+class _MaximizePainter extends _IconPainter {
+  _MaximizePainter(super.color);
+  @override
+  void paint(Canvas canvas, Size size) {
+    Paint p = getPaint(color);
+    canvas.drawRect(Rect.fromLTRB(0, 0, size.width - 1, size.height - 1), p);
+  }
+}
+
+/// Restore
+class RestoreIcon extends StatelessWidget {
+  final Color color;
+  const RestoreIcon({
+    super.key,
+    required this.color,
+  });
+  @override
+  Widget build(BuildContext context) => _AlignedPaint(_RestorePainter(color));
+}
+
+class _RestorePainter extends _IconPainter {
+  _RestorePainter(super.color);
+  @override
+  void paint(Canvas canvas, Size size) {
+    Paint p = getPaint(color);
+    canvas.drawRect(Rect.fromLTRB(0, 2, size.width - 2, size.height), p);
+    canvas.drawLine(const Offset(2, 2), const Offset(2, 0), p);
+    canvas.drawLine(const Offset(2, 0), Offset(size.width, 0), p);
+    canvas.drawLine(
+        Offset(size.width, 0), Offset(size.width, size.height - 2), p);
+    canvas.drawLine(Offset(size.width, size.height - 2),
+        Offset(size.width - 2, size.height - 2), p);
+  }
+}
+
+/// Minimize
+class MinimizeIcon extends StatelessWidget {
+  final Color color;
+  const MinimizeIcon({super.key, required this.color});
+  @override
+  Widget build(BuildContext context) => _AlignedPaint(_MinimizePainter(color));
+}
+
+class _MinimizePainter extends _IconPainter {
+  _MinimizePainter(super.color);
+  @override
+  void paint(Canvas canvas, Size size) {
+    Paint p = getPaint(color);
+    canvas.drawLine(
+        Offset(0, size.height / 2), Offset(size.width, size.height / 2), p);
+  }
+}
+
+/// Helpers
+abstract class _IconPainter extends CustomPainter {
+  _IconPainter(this.color);
+  final Color color;
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}
+
+class _AlignedPaint extends StatelessWidget {
+  const _AlignedPaint(this.painter);
+  final CustomPainter painter;
+
+  @override
+  Widget build(BuildContext context) {
+    return Align(
+        alignment: Alignment.center,
+        child: CustomPaint(size: const Size(10, 10), painter: painter));
+  }
+}
+
+Paint getPaint(Color color, [bool isAntiAlias = false]) => Paint()
+  ..color = color
+  ..style = PaintingStyle.stroke
+  ..isAntiAlias = isAntiAlias
+  ..strokeWidth = 1;
diff --git a/lib/components/titlebar/window_button.dart b/lib/components/titlebar/window_button.dart
new file mode 100644
index 00000000..3201d191
--- /dev/null
+++ b/lib/components/titlebar/window_button.dart
@@ -0,0 +1,133 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:spotube/components/titlebar/mouse_state.dart';
+
+typedef WindowButtonIconBuilder = Widget Function(
+    WindowButtonContext buttonContext);
+typedef WindowButtonBuilder = Widget Function(
+    WindowButtonContext buttonContext, Widget icon);
+
+class WindowButtonContext {
+  BuildContext context;
+  MouseState mouseState;
+  Color? backgroundColor;
+  Color iconColor;
+  WindowButtonContext(
+      {required this.context,
+      required this.mouseState,
+      this.backgroundColor,
+      required this.iconColor});
+}
+
+class WindowButtonColors {
+  late Color normal;
+  late Color mouseOver;
+  late Color mouseDown;
+  late Color iconNormal;
+  late Color iconMouseOver;
+  late Color iconMouseDown;
+  WindowButtonColors(
+      {Color? normal,
+      Color? mouseOver,
+      Color? mouseDown,
+      Color? iconNormal,
+      Color? iconMouseOver,
+      Color? iconMouseDown}) {
+    this.normal = normal ?? _defaultButtonColors.normal;
+    this.mouseOver = mouseOver ?? _defaultButtonColors.mouseOver;
+    this.mouseDown = mouseDown ?? _defaultButtonColors.mouseDown;
+    this.iconNormal = iconNormal ?? _defaultButtonColors.iconNormal;
+    this.iconMouseOver = iconMouseOver ?? _defaultButtonColors.iconMouseOver;
+    this.iconMouseDown = iconMouseDown ?? _defaultButtonColors.iconMouseDown;
+  }
+}
+
+final _defaultButtonColors = WindowButtonColors(
+  normal: Colors.transparent,
+  iconNormal: const Color(0xFF805306),
+  mouseOver: const Color(0xFF404040),
+  mouseDown: const Color(0xFF202020),
+  iconMouseOver: const Color(0xFFFFFFFF),
+  iconMouseDown: const Color(0xFFF0F0F0),
+);
+
+class WindowButton extends StatelessWidget {
+  final WindowButtonBuilder? builder;
+  final WindowButtonIconBuilder? iconBuilder;
+  late final WindowButtonColors colors;
+  final bool animate;
+  final EdgeInsets? padding;
+  final VoidCallback? onPressed;
+
+  WindowButton(
+      {super.key,
+      WindowButtonColors? colors,
+      this.builder,
+      @required this.iconBuilder,
+      this.padding,
+      this.onPressed,
+      this.animate = false}) {
+    this.colors = colors ?? _defaultButtonColors;
+  }
+
+  Color getBackgroundColor(MouseState mouseState) {
+    if (mouseState.isMouseDown) return colors.mouseDown;
+    if (mouseState.isMouseOver) return colors.mouseOver;
+    return colors.normal;
+  }
+
+  Color getIconColor(MouseState mouseState) {
+    if (mouseState.isMouseDown) return colors.iconMouseDown;
+    if (mouseState.isMouseOver) return colors.iconMouseOver;
+    return colors.iconNormal;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (kIsWeb) {
+      return Container();
+    } else {
+      // Don't show button on macOS
+      if (Platform.isMacOS) {
+        return Container();
+      }
+    }
+
+    return MouseStateBuilder(
+      builder: (context, mouseState) {
+        WindowButtonContext buttonContext = WindowButtonContext(
+            mouseState: mouseState,
+            context: context,
+            backgroundColor: getBackgroundColor(mouseState),
+            iconColor: getIconColor(mouseState));
+
+        var icon =
+            (iconBuilder != null) ? iconBuilder!(buttonContext) : Container();
+
+        var fadeOutColor =
+            getBackgroundColor(MouseState()..isMouseOver = true).withOpacity(0);
+        var padding = this.padding ?? const EdgeInsets.all(10);
+        var animationMs =
+            mouseState.isMouseOver ? (animate ? 100 : 0) : (animate ? 200 : 0);
+        Widget iconWithPadding = Padding(padding: padding, child: icon);
+        iconWithPadding = AnimatedContainer(
+            curve: Curves.easeOut,
+            duration: Duration(milliseconds: animationMs),
+            color: buttonContext.backgroundColor ?? fadeOutColor,
+            child: iconWithPadding);
+        var button =
+            (builder != null) ? builder!(buttonContext, icon) : iconWithPadding;
+        return SizedBox(
+          width: 45,
+          height: 32,
+          child: button,
+        );
+      },
+      onPressed: () {
+        if (onPressed != null) onPressed!();
+      },
+    );
+  }
+}
diff --git a/lib/components/tracks_view/track_view.dart b/lib/components/tracks_view/track_view.dart
index 36d334cd..2a3f5237 100644
--- a/lib/components/tracks_view/track_view.dart
+++ b/lib/components/tracks_view/track_view.dart
@@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:sliver_tools/sliver_tools.dart';
 import 'package:spotube/components/inter_scrollbar/inter_scrollbar.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/components/tracks_view/sections/header/flexible_header.dart';
 import 'package:spotube/components/tracks_view/sections/body/track_view_body.dart';
 import 'package:spotube/components/tracks_view/track_view_props.dart';
diff --git a/lib/modules/player/player.dart b/lib/modules/player/player.dart
index 7eaf53ae..6a8a3e52 100644
--- a/lib/modules/player/player.dart
+++ b/lib/modules/player/player.dart
@@ -13,7 +13,7 @@ import 'package:spotube/modules/player/volume_slider.dart';
 import 'package:spotube/components/animated_gradient.dart';
 import 'package:spotube/components/dialogs/track_details_dialog.dart';
 import 'package:spotube/components/links/artist_link.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/components/image/universal_image.dart';
 import 'package:spotube/components/panels/sliding_up_panel.dart';
 import 'package:spotube/extensions/artist_simple.dart';
diff --git a/lib/pages/artist/artist.dart b/lib/pages/artist/artist.dart
index d38fe778..04389ffc 100644
--- a/lib/pages/artist/artist.dart
+++ b/lib/pages/artist/artist.dart
@@ -4,7 +4,7 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/artist/artist_album_list.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/models/logger.dart';
diff --git a/lib/pages/connect/connect.dart b/lib/pages/connect/connect.dart
index 1e4e3938..d3b0d0cb 100644
--- a/lib/pages/connect/connect.dart
+++ b/lib/pages/connect/connect.dart
@@ -3,7 +3,7 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/modules/connect/local_devices.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/pages/connect/control/control.dart';
 import 'package:spotube/provider/connect/clients.dart';
diff --git a/lib/pages/connect/control/control.dart b/lib/pages/connect/control/control.dart
index afd17387..eb2c48c5 100644
--- a/lib/pages/connect/control/control.dart
+++ b/lib/pages/connect/control/control.dart
@@ -8,7 +8,7 @@ import 'package:spotube/modules/player/volume_slider.dart';
 import 'package:spotube/components/image/universal_image.dart';
 import 'package:spotube/components/links/anchor_button.dart';
 import 'package:spotube/components/links/artist_link.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/extensions/duration.dart';
diff --git a/lib/pages/desktop_login/desktop_login.dart b/lib/pages/desktop_login/desktop_login.dart
index 1f7cb1b5..80548898 100644
--- a/lib/pages/desktop_login/desktop_login.dart
+++ b/lib/pages/desktop_login/desktop_login.dart
@@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import 'package:spotube/collections/assets.gen.dart';
 import 'package:spotube/modules/desktop_login/login_form.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/pages/mobile_login/mobile_login.dart';
diff --git a/lib/pages/desktop_login/login_tutorial.dart b/lib/pages/desktop_login/login_tutorial.dart
index d96942e4..d78143e4 100644
--- a/lib/pages/desktop_login/login_tutorial.dart
+++ b/lib/pages/desktop_login/login_tutorial.dart
@@ -6,7 +6,7 @@ import 'package:introduction_screen/introduction_screen.dart';
 import 'package:spotube/collections/assets.gen.dart';
 import 'package:spotube/modules/desktop_login/login_form.dart';
 import 'package:spotube/components/links/hyper_link.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/pages/home/home.dart';
 import 'package:spotube/provider/authentication_provider.dart';
diff --git a/lib/pages/getting_started/getting_started.dart b/lib/pages/getting_started/getting_started.dart
index 97af2ef4..0159a77f 100644
--- a/lib/pages/getting_started/getting_started.dart
+++ b/lib/pages/getting_started/getting_started.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/assets.gen.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/pages/getting_started/sections/greeting.dart';
 import 'package:spotube/pages/getting_started/sections/playback.dart';
diff --git a/lib/pages/home/feed/feed_section.dart b/lib/pages/home/feed/feed_section.dart
index 42a22f10..bcfc0b81 100644
--- a/lib/pages/home/feed/feed_section.dart
+++ b/lib/pages/home/feed/feed_section.dart
@@ -5,7 +5,7 @@ import 'package:spotube/collections/fake.dart';
 import 'package:spotube/modules/album/album_card.dart';
 import 'package:spotube/modules/artist/artist_card.dart';
 import 'package:spotube/modules/playlist/playlist_card.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/provider/spotify/views/home_section.dart';
 
diff --git a/lib/pages/home/genres/genre_playlists.dart b/lib/pages/home/genres/genre_playlists.dart
index 4ad37630..58436bcf 100644
--- a/lib/pages/home/genres/genre_playlists.dart
+++ b/lib/pages/home/genres/genre_playlists.dart
@@ -7,7 +7,7 @@ import 'package:spotify/spotify.dart' hide Offset;
 import 'package:spotube/collections/fake.dart';
 import 'package:spotube/modules/playlist/playlist_card.dart';
 import 'package:spotube/components/image/universal_image.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/components/waypoint.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/provider/spotify/spotify.dart';
diff --git a/lib/pages/home/genres/genres.dart b/lib/pages/home/genres/genres.dart
index cf033bb9..4846d633 100644
--- a/lib/pages/home/genres/genres.dart
+++ b/lib/pages/home/genres/genres.dart
@@ -6,7 +6,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/gradients.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/pages/home/genres/genre_playlists.dart';
diff --git a/lib/pages/home/home.dart b/lib/pages/home/home.dart
index 27b4cc01..7afd5938 100644
--- a/lib/pages/home/home.dart
+++ b/lib/pages/home/home.dart
@@ -12,7 +12,7 @@ import 'package:spotube/modules/home/sections/genres.dart';
 import 'package:spotube/modules/home/sections/made_for_user.dart';
 import 'package:spotube/modules/home/sections/new_releases.dart';
 import 'package:spotube/modules/home/sections/recent.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/pages/settings/settings.dart';
 import 'package:spotube/utils/platform.dart';
diff --git a/lib/pages/lastfm_login/lastfm_login.dart b/lib/pages/lastfm_login/lastfm_login.dart
index 1f4c64e1..da2e4e13 100644
--- a/lib/pages/lastfm_login/lastfm_login.dart
+++ b/lib/pages/lastfm_login/lastfm_login.dart
@@ -5,7 +5,7 @@ import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/dialogs/prompt_dialog.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/provider/scrobbler_provider.dart';
 
diff --git a/lib/pages/library/library.dart b/lib/pages/library/library.dart
index 66477761..a0bc1bb7 100644
--- a/lib/pages/library/library.dart
+++ b/lib/pages/library/library.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' hide Image;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import 'package:spotube/modules/library/user_local_tracks.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/library/user_albums.dart';
 import 'package:spotube/modules/library/user_artists.dart';
 import 'package:spotube/modules/library/user_downloads.dart';
diff --git a/lib/pages/library/local_folder.dart b/lib/pages/library/local_folder.dart
index 648b3c50..830e8a5d 100644
--- a/lib/pages/library/local_folder.dart
+++ b/lib/pages/library/local_folder.dart
@@ -10,7 +10,7 @@ import 'package:spotube/modules/library/user_local_tracks.dart';
 import 'package:spotube/components/expandable_search/expandable_search.dart';
 import 'package:spotube/components/fallbacks/not_found.dart';
 import 'package:spotube/components/inter_scrollbar/inter_scrollbar.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/components/sort_tracks_dropdown.dart';
 import 'package:spotube/components/track_tile/track_tile.dart';
 import 'package:spotube/extensions/artist_simple.dart';
diff --git a/lib/pages/library/playlist_generate/playlist_generate.dart b/lib/pages/library/playlist_generate/playlist_generate.dart
index 74b7fe26..c73c0b08 100644
--- a/lib/pages/library/playlist_generate/playlist_generate.dart
+++ b/lib/pages/library/playlist_generate/playlist_generate.dart
@@ -12,7 +12,7 @@ import 'package:spotube/modules/library/playlist_generate/recommendation_attribu
 import 'package:spotube/modules/library/playlist_generate/seeds_multi_autocomplete.dart';
 import 'package:spotube/modules/library/playlist_generate/simple_track_tile.dart';
 import 'package:spotube/components/image/universal_image.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/extensions/image.dart';
diff --git a/lib/pages/library/playlist_generate/playlist_generate_result.dart b/lib/pages/library/playlist_generate/playlist_generate_result.dart
index a481eac4..90838300 100644
--- a/lib/pages/library/playlist_generate/playlist_generate_result.dart
+++ b/lib/pages/library/playlist_generate/playlist_generate_result.dart
@@ -7,7 +7,7 @@ import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/modules/library/playlist_generate/simple_track_tile.dart';
 import 'package:spotube/modules/playlist/playlist_create_dialog.dart';
 import 'package:spotube/components/dialogs/playlist_add_track_dialog.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/models/spotify/recommendation_seeds.dart';
 import 'package:spotube/pages/playlist/playlist.dart';
diff --git a/lib/pages/lyrics/lyrics.dart b/lib/pages/lyrics/lyrics.dart
index 1a4ea7c1..f75c715c 100644
--- a/lib/pages/lyrics/lyrics.dart
+++ b/lib/pages/lyrics/lyrics.dart
@@ -7,7 +7,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/fallbacks/anonymous_fallback.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/components/image/universal_image.dart';
 import 'package:spotube/components/themed_button_tab_bar.dart';
 import 'package:spotube/extensions/constrains.dart';
diff --git a/lib/pages/lyrics/mini_lyrics.dart b/lib/pages/lyrics/mini_lyrics.dart
index bd8fc0a1..603f90d3 100644
--- a/lib/pages/lyrics/mini_lyrics.dart
+++ b/lib/pages/lyrics/mini_lyrics.dart
@@ -9,7 +9,7 @@ import 'package:spotube/modules/player/player_controls.dart';
 import 'package:spotube/modules/player/player_queue.dart';
 import 'package:spotube/modules/root/sidebar.dart';
 import 'package:spotube/components/fallbacks/anonymous_fallback.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/hooks/utils/use_force_update.dart';
 import 'package:spotube/pages/lyrics/plain_lyrics.dart';
diff --git a/lib/pages/profile/profile.dart b/lib/pages/profile/profile.dart
index 06f6848a..e6546960 100644
--- a/lib/pages/profile/profile.dart
+++ b/lib/pages/profile/profile.dart
@@ -8,7 +8,7 @@ import 'package:spotube/collections/fake.dart';
 import 'package:spotube/collections/spotify_markets.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/image/universal_image.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/image.dart';
 import 'package:spotube/provider/spotify/spotify.dart';
 import 'package:url_launcher/url_launcher_string.dart';
diff --git a/lib/pages/search/search.dart b/lib/pages/search/search.dart
index 828e4aef..4f53f8e6 100644
--- a/lib/pages/search/search.dart
+++ b/lib/pages/search/search.dart
@@ -12,7 +12,7 @@ import 'package:spotify/spotify.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/inter_scrollbar/inter_scrollbar.dart';
 import 'package:spotube/components/fallbacks/anonymous_fallback.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/hooks/utils/use_force_update.dart';
diff --git a/lib/pages/settings/about.dart b/lib/pages/settings/about.dart
index 2692bfdc..4d093cfe 100644
--- a/lib/pages/settings/about.dart
+++ b/lib/pages/settings/about.dart
@@ -4,7 +4,7 @@ import 'package:spotube/collections/assets.gen.dart';
 import 'package:spotube/collections/env.dart';
 import 'package:spotube/components/image/universal_image.dart';
 import 'package:spotube/components/links/hyper_link.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/hooks/controllers/use_package_info.dart';
 
diff --git a/lib/pages/settings/blacklist.dart b/lib/pages/settings/blacklist.dart
index c30864fe..b5e10821 100644
--- a/lib/pages/settings/blacklist.dart
+++ b/lib/pages/settings/blacklist.dart
@@ -6,7 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/inter_scrollbar/inter_scrollbar.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/provider/blacklist_provider.dart';
 
diff --git a/lib/pages/settings/logs.dart b/lib/pages/settings/logs.dart
index a790c39d..65e4c82e 100644
--- a/lib/pages/settings/logs.dart
+++ b/lib/pages/settings/logs.dart
@@ -6,7 +6,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/modules/settings/section_card_with_heading.dart';
 import 'package:spotube/components/inter_scrollbar/inter_scrollbar.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/models/logger.dart';
 
diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
index 2d1c9224..8bce4bcf 100644
--- a/lib/pages/settings/settings.dart
+++ b/lib/pages/settings/settings.dart
@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/pages/settings/sections/about.dart';
 import 'package:spotube/pages/settings/sections/accounts.dart';
diff --git a/lib/pages/stats/albums/albums.dart b/lib/pages/stats/albums/albums.dart
index 81eba384..868f068a 100644
--- a/lib/pages/stats/albums/albums.dart
+++ b/lib/pages/stats/albums/albums.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/stats/common/album_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
diff --git a/lib/pages/stats/artists/artists.dart b/lib/pages/stats/artists/artists.dart
index f5445326..b3f8c240 100644
--- a/lib/pages/stats/artists/artists.dart
+++ b/lib/pages/stats/artists/artists.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/stats/common/artist_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
diff --git a/lib/pages/stats/fees/fees.dart b/lib/pages/stats/fees/fees.dart
index 5aa06af9..ee141475 100644
--- a/lib/pages/stats/fees/fees.dart
+++ b/lib/pages/stats/fees/fees.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:sliver_tools/sliver_tools.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/stats/common/artist_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
diff --git a/lib/pages/stats/minutes/minutes.dart b/lib/pages/stats/minutes/minutes.dart
index 9ce84548..ea0a0c10 100644
--- a/lib/pages/stats/minutes/minutes.dart
+++ b/lib/pages/stats/minutes/minutes.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/stats/common/track_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
diff --git a/lib/pages/stats/playlists/playlists.dart b/lib/pages/stats/playlists/playlists.dart
index bf1fee93..d31f1dfa 100644
--- a/lib/pages/stats/playlists/playlists.dart
+++ b/lib/pages/stats/playlists/playlists.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/stats/common/playlist_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
diff --git a/lib/pages/stats/stats.dart b/lib/pages/stats/stats.dart
index 7dfab844..b2dc03c2 100644
--- a/lib/pages/stats/stats.dart
+++ b/lib/pages/stats/stats.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/stats/summary/summary.dart';
 import 'package:spotube/modules/stats/top/top.dart';
 import 'package:spotube/utils/platform.dart';
diff --git a/lib/pages/stats/streams/streams.dart b/lib/pages/stats/streams/streams.dart
index 12631816..3df34483 100644
--- a/lib/pages/stats/streams/streams.dart
+++ b/lib/pages/stats/streams/streams.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/modules/stats/common/track_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
diff --git a/lib/pages/track/track.dart b/lib/pages/track/track.dart
index f797c2f2..b5c9e4fa 100644
--- a/lib/pages/track/track.dart
+++ b/lib/pages/track/track.dart
@@ -10,7 +10,7 @@ import 'package:spotube/components/heart_button.dart';
 import 'package:spotube/components/image/universal_image.dart';
 import 'package:spotube/components/links/artist_link.dart';
 import 'package:spotube/components/links/link_text.dart';
-import 'package:spotube/components/page_window_title_bar.dart';
+import 'package:spotube/components/titlebar/titlebar.dart';
 import 'package:spotube/components/track_tile/track_options.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/extensions/image.dart';