diff --git a/src/gtk-3.20/scss/widgets/_choosers.scss b/src/gtk-3.20/scss/widgets/_choosers.scss
index 803329b..6741bd8 100644
--- a/src/gtk-3.20/scss/widgets/_choosers.scss
+++ b/src/gtk-3.20/scss/widgets/_choosers.scss
@@ -155,8 +155,6 @@
             &:checked { colorswatch:only-child { box-shadow: none; } }
         }
     }
-
-    colorchooser .popover.osd { border-radius: $roundness; }
 }
 
 
diff --git a/src/gtk-3.20/scss/widgets/_menu.scss b/src/gtk-3.20/scss/widgets/_menu.scss
index c0dd114..4f233f2 100644
--- a/src/gtk-3.20/scss/widgets/_menu.scss
+++ b/src/gtk-3.20/scss/widgets/_menu.scss
@@ -232,17 +232,6 @@
 
         &:backdrop { box-shadow: none; }
 
-        .osd & {
-            box-shadow: 0 2px 7px 3px alpha($black, .5);
-
-            > toolbar button {
-                border-radius: 0;
-                border-width: 0;
-                background-color: transparent;
-                background-image: none;
-            }
-        }
-
         treeview.view {
             &:hover, &:selected, &:selected:focus, &:backdrop:selected, &:backdrop:selected:focus { border-top-color: $selected_bg_color; }
 
diff --git a/src/gtk-3.20/scss/widgets/_osd.scss b/src/gtk-3.20/scss/widgets/_osd.scss
index 0d5e56f..155a6bd 100644
--- a/src/gtk-3.20/scss/widgets/_osd.scss
+++ b/src/gtk-3.20/scss/widgets/_osd.scss
@@ -8,6 +8,8 @@
 @include exports("osd") {
     overlay.osd { background-color: transparent; }
 
+    colorchooser .popover.osd { border-radius: $roundness; }
+
     button.osd,
     #XfceNotifyWindow button {
         @include button($osd_bg, $osd_fg);
@@ -38,6 +40,26 @@
         &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
     }
 
+    progressbar.osd { // progressbar.osd used for epiphany page loading progress
+        margin: 2px;
+        min-height: 2px;
+        min-width: 2px;
+
+        trough {
+            border-style: none;
+            border-radius: 0;
+            background-image: none;
+            background-color: transparent;
+        }
+
+        progress {
+            border-style: none;
+            border-radius: 0;
+            background-color: $selected_bg_color;
+            background-image: none;
+        }
+    }
+
     .osd,
     #XfceNotifyWindow {
         background-color: $osd_bg;
@@ -62,6 +84,7 @@
 
         progressbar { background-color: $osd_fg; }
 
+        // Old GTK 3.0 code
         scale {
             slider {
                 @include linear-gradient(shade($osd_bg, 1.08));
@@ -89,6 +112,33 @@
             }
         }
 
+        // New GTK 3.20 code
+        scale {
+            //OSD troughs
+            trough {
+                background-color: lighten($osd_bg, 7%);
+
+                highlight { background-color: $selected_bg_color; }
+            }
+
+            // OSD sliders
+            slider {
+                background-clip: border-box;
+                background-color: $selected_bg_color;
+                border-color: $selected_bg_color;
+
+                &:hover {
+                    background-color: lighten($selected_bg_color, 10%);
+                    border-color: lighten($selected_bg_color, 10%)
+                }
+
+                &:active {
+                    background-color: darken($selected_bg_color, 10%);
+                    border-color: darken($selected_bg_color, 10%);
+                }
+            }
+        }
+
         &.view, .view, view { background-color: $osd_bg; }
 
         scrollbar {
@@ -127,6 +177,17 @@
             background-color: $osd_bg;
         }
 
+        popover.background {
+            box-shadow: 0 2px 7px 3px alpha($black, .5);
+
+            > toolbar button {
+                border-radius: 0;
+                border-width: 0;
+                background-color: transparent;
+                background-image: none;
+            }
+        }
+
         spinbutton {
             // OSD horizontal
             &:not(.vertical) {
diff --git a/src/gtk-3.20/scss/widgets/_progress.scss b/src/gtk-3.20/scss/widgets/_progress.scss
index b3c9f12..832692a 100644
--- a/src/gtk-3.20/scss/widgets/_progress.scss
+++ b/src/gtk-3.20/scss/widgets/_progress.scss
@@ -52,26 +52,6 @@
                 border-top-right-radius: $roundness;
             }
         }
-
-        &.osd { // progressbar.osd used for epiphany page loading progress
-            margin: 2px;
-            min-height: 2px;
-            min-width: 2px;
-
-            trough {
-                border-style: none;
-                border-radius: 0;
-                background-image: none;
-                background-color: transparent;
-            }
-
-            progress {
-                border-style: none;
-                border-radius: 0;
-                background-color: $selected_bg_color;
-                background-image: none;
-            }
-        }
     }
 
     levelbar {
@@ -194,13 +174,6 @@
 
             &:disabled { background-color: transparentize($_scale_trough_bg, .45); }
 
-            //OSD troughs
-            .osd & {
-                background-color: lighten($osd_bg, 7%);
-
-                highlight { background-color: $selected_bg_color; }
-            }
-
             // Troughs in selected list-rows and infobars
             menuitem:hover &,
             row:selected &,
@@ -280,23 +253,6 @@
                     border-color: mix($selected_fg_color, $selected_bg_color, .55);
                 }
             }
-
-            // OSD sliders
-            .osd & {
-                background-clip: border-box;
-                background-color: $selected_bg_color;
-                border-color: $selected_bg_color;
-
-                &:hover {
-                    background-color: lighten($selected_bg_color, 10%);
-                    border-color: lighten($selected_bg_color, 10%)
-                }
-
-                &:active {
-                    background-color: darken($selected_bg_color, 10%);
-                    border-color: darken($selected_bg_color, 10%);
-                }
-            }
         }
 
         value { color: alpha(currentColor, .4); }