diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2302945f53..aeb1e2563e 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3187,16 +3187,27 @@ GtkColorSwatch {
  * Misc *
  ********/
 
-.scale-popup .button { // +/- buttons on GtkVolumeButton popup
-  padding: 6px;
-  &:hover {
-    @extend %undecorated_button;
-    background-color: transparentize($fg_color,0.9);
-    border-radius: 5px;
+.scale-popup {
+
+   .osd & { @extend %osd; }
+
+   .osd & .button.flat {  //FIXME: quick hack, redo properly
+     padding: 6px;
+     border-style: none;
+     border-radius: 5px;
+   }
+
+  .button { // +/- buttons on GtkVolumeButton popup
+    padding: 6px;
+    &:hover {
+      @extend %undecorated_button;
+      background-color: transparentize($fg_color,0.9);
+      border-radius: 5px;
+    }
+    &:backdrop,
+    &:backdrop:hover,
+    &:backdrop:insensitive { @extend %undecorated_button; }
   }
-  &:backdrop,
-  &:backdrop:hover,
-  &:backdrop:insensitive { @extend %undecorated_button; }
 }
 
 GtkVolumeButton.button { padding: 8px; }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 2b7b1b3ba3..56d00c1861 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -120,7 +120,7 @@ GtkTextView {
     outline-offset: -2px; }
 
 .popover.osd, .app-notification,
-.app-notification.frame, .osd {
+.app-notification.frame, .osd .scale-popup, .osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.7);
@@ -129,7 +129,7 @@ GtkTextView {
   box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -4274,6 +4274,12 @@ GtkColorSwatch {
 /********
  * Misc *
  ********/
+.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
+.osd .scale-popup .titlebar .titlebutton.button,
+.titlebar .osd .scale-popup .titlebutton.button {
+  padding: 6px;
+  border-style: none;
+  border-radius: 5px; }
 .scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
 .scale-popup .titlebar .button.titlebutton,
 .titlebar .scale-popup .button.titlebutton {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index de59b0fcf8..90d25c7f2d 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -120,7 +120,7 @@ GtkTextView {
     outline-offset: -2px; }
 
 .popover.osd, .app-notification,
-.app-notification.frame, .osd {
+.app-notification.frame, .osd .scale-popup, .osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.7);
@@ -129,7 +129,7 @@ GtkTextView {
   box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -4446,6 +4446,12 @@ GtkColorSwatch {
 /********
  * Misc *
  ********/
+.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
+.osd .scale-popup .titlebar .titlebutton.button,
+.titlebar .osd .scale-popup .titlebutton.button {
+  padding: 6px;
+  border-style: none;
+  border-radius: 5px; }
 .scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
 .scale-popup .titlebar .button.titlebutton,
 .titlebar .scale-popup .button.titlebutton {