diff --git a/css/styles.css b/css/styles.css
index 9a2c5eb7..04dba3da 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -6,10 +6,16 @@ radio {
   margin-left: -2px;
 }
 /* Adwaita is missing osd ListBox */
-.osd list {
+.playlistrow {
+  border-radius: 5px;
+}
+.playlistrow {
+  color: @theme_fg_color;
+}
+.osd .playlist {
   background: none;
 }
-.osd list row image {
+.osd .playlist row image {
   -gtk-icon-shadow: none;
 }
 .osdheaderbar {
@@ -28,18 +34,15 @@ radio {
 .linkedright image {
   margin-right: 2px;
 }
-/* Non-osd style for popover menu */
-.menupopover label {
-  color: @theme_text_color;
-}
-.menupopover arrow {
-  background: @theme_base_color;
-  border-color: @insensitive_base_color;
-}
-.menupopover contents {
-  background: @theme_base_color;
-  border-color: @insensitive_base_color;
+
+/* Flat popovers */
+popover arrow,
+popover contents {
+  border-color: transparent;
+  box-shadow: none;
 }
+
+/* Rounded corners */
 .adwrounded.csd {
   border-radius: 8px;
 }
@@ -167,9 +170,6 @@ scale trough slider {
   margin-right: -4px;
 }
 .positionscale trough highlight {
-  min-height: 4px;
-}
-.osd .positionscale trough highlight {
   min-height: 6px;
 }
 .fullscreen.tvmode .positionscale trough slider {
@@ -234,6 +234,9 @@ scale trough slider {
   margin-top: -4px;
   margin-bottom: -6px;
 }
+.volumescale trough highlight {
+  min-width: 4px;
+}
 .fullscreen.tvmode .volumescale trough highlight {
   min-width: 6px;
 }
@@ -251,6 +254,9 @@ scale trough slider {
 .fullscreen.tvmode .elapsedpopoverbox {
   min-width: 360px;
 }
+.speedscale trough highlight {
+  min-height: 4px;
+}
 .fullscreen.tvmode .speedscale trough highlight {
   min-height: 6px;
 }
diff --git a/src/headerbarBase.js b/src/headerbarBase.js
index cf9a142b..d9db3f30 100644
--- a/src/headerbarBase.js
+++ b/src/headerbarBase.js
@@ -17,7 +17,6 @@ class ClapperHeaderBarBase extends Gtk.Box
             margin_start: 6,
             margin_end: 6,
         });
-        this.add_css_class('osd');
         this.add_css_class('osdheaderbar');
 
         this.isMaximized = false;
@@ -40,11 +39,11 @@ class ClapperHeaderBarBase extends Gtk.Box
             valign: Gtk.Align.CENTER,
             can_focus: false,
         });
+        const menuToggleButton = this.menuButton.get_first_child();
+        menuToggleButton.add_css_class('osd');
         const mainMenuModel = uiBuilder.get_object('mainMenu');
         const mainMenuPopover = new HeaderBarPopover(mainMenuModel);
-        mainMenuPopover.add_css_class('menupopover');
         this.menuButton.set_popover(mainMenuPopover);
-        this.menuButton.add_css_class('osd');
         this.menuButton.add_css_class('circular');
         this.menuWidget.append(this.menuButton);
 
diff --git a/src/playlist.js b/src/playlist.js
index b0d80e39..1c2bcbb9 100644
--- a/src/playlist.js
+++ b/src/playlist.js
@@ -28,6 +28,7 @@ class ClapperPlaylistWidget extends Gtk.ListBox
         });
         this.activeRowId = -1;
         this.repeatMode = RepeatMode.NONE;
+        this.add_css_class('playlist');
 
         this.connect('row-activated', this._onRowActivated.bind(this));
     }
@@ -254,6 +255,7 @@ class ClapperPlaylistItem extends Gtk.ListBoxRow
         }
         this.filename = filename || uri;
         this.set_tooltip_text(this.filename);
+        this.add_css_class('playlistrow');
 
         const box = new Gtk.Box({
             orientation: Gtk.Orientation.HORIZONTAL,