diff --git a/data/style.css b/data/style.css
index 3e29e9cd..57ed1866 100644
--- a/data/style.css
+++ b/data/style.css
@@ -306,11 +306,6 @@ label.bold-link link {
 }
 
 button.large {
-  min-width: 48px;
-  min-height: 48px;
-}
-
-button.larger {
-  min-height: 60px;
-  min-width: 60px;
+  min-width: 40px;
+  min-height: 40px;
 }
diff --git a/data/ui/components/player/now-playing/view.blp b/data/ui/components/player/now-playing/view.blp
index 6938cb97..bf9aea15 100644
--- a/data/ui/components/player/now-playing/view.blp
+++ b/data/ui/components/player/now-playing/view.blp
@@ -156,18 +156,22 @@ template $PlayerNowPlayingView : Adw.NavigationPage {
               styles [
                 "circular",
                 "large",
+                "flat",
               ]
             }
 
             Button play_button {
-              tooltip-text: _("Play");
+              tooltip-text: _("Toggle Play/Pause");
               action-name: "player.play-pause";
 
               styles [
-                "circular",
-                "larger",
+                "pill",
                 "suggested-action",
               ]
+
+              Image play_image {
+                pixel-size: 26;
+              }
             }
 
             Button next_button {
@@ -179,6 +183,7 @@ template $PlayerNowPlayingView : Adw.NavigationPage {
               styles [
                 "circular",
                 "large",
+                "flat",
               ]
             }
 
diff --git a/data/ui/window.blp b/data/ui/window.blp
index 0a4cabbc..402bade5 100644
--- a/data/ui/window.blp
+++ b/data/ui/window.blp
@@ -4,7 +4,7 @@ using Adw 1;
 template $MuzikaWindow : Adw.ApplicationWindow {
   default-width: 1000;
   default-height: 800;
-  width-request: 300;
+  width-request: 330;
   height-request: 200;
 
   styles [
diff --git a/src/components/player/full.ts b/src/components/player/full.ts
index 3a16c653..4f134f61 100644
--- a/src/components/player/full.ts
+++ b/src/components/player/full.ts
@@ -24,7 +24,6 @@ export class FullPlayerView extends Gtk.ActionBar {
         "subtitle",
         "shuffle_button",
         "prev_button",
-        "play_button",
         "play_image",
         "next_button",
         "repeat_button",
diff --git a/src/components/player/now-playing/view.ts b/src/components/player/now-playing/view.ts
index df216164..ed095bb9 100644
--- a/src/components/player/now-playing/view.ts
+++ b/src/components/player/now-playing/view.ts
@@ -28,7 +28,7 @@ export class PlayerNowPlayingView extends Adw.NavigationPage {
         "picture",
         "timestamp",
         "duration",
-        "play_button",
+        "play_image",
         "switcher_bar",
         "overlay_bin",
         "repeat_button",
@@ -65,7 +65,7 @@ export class PlayerNowPlayingView extends Adw.NavigationPage {
   private _picture!: FixedRatioThumbnail;
   private _timestamp!: Gtk.Label;
   private _duration!: Gtk.Label;
-  private _play_button!: Gtk.Button;
+  private _play_image!: Gtk.Image;
   private _switcher_bar!: Adw.ViewSwitcherBar;
   private _overlay_bin!: Adw.Bin;
   private _repeat_button!: Gtk.ToggleButton;
@@ -139,7 +139,7 @@ export class PlayerNowPlayingView extends Adw.NavigationPage {
         },
         null,
       ),
-      bind_play_icon(this._play_button),
+      bind_play_icon(this._play_image),
       ...bind_repeat_button(this._repeat_button),
     );
   }