diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 5a82443..16ce412 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1633,12 +1633,12 @@ headerbar {
     &:backdrop { opacity: 0.65; background-image: none; }
   }
 
-  stackswitcher, .stack-switcher {
+  stackswitcher {
     box-shadow: inset 0 0 0 1px $light_borders_color;
     border-radius: $bt_radius;
     padding: 0;
 
-    button {
+    > button {
       margin: 0;
       font-weight: 500;
 
diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss
index aaa5454..dd09f8e 100644
--- a/src/sass/gtk/_drawing.scss
+++ b/src/sass/gtk/_drawing.scss
@@ -301,9 +301,10 @@
   //
   // header-bar insensitive pushed button
   //
-    color: rgba($header_fg, 0.35);
+    label, & { color: rgba($header_fg, 0.35); }
     background-image: none;
     background-color: transparent;
+    box-shadow: none;
   }
 
   @else if $t==osd {
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index e4a36b7..730144f 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -3072,10 +3072,10 @@ dialog.background.csd {
 
   stack scrolledwindow {
     &.frame {
-      border-radius: $wm_radius;
+      border-radius: $bt_radius;
 
       textview.view {
-        border-radius: $wm_radius;
+        border-radius: $bt_radius;
 
         > text {
           background: none;
@@ -3086,7 +3086,7 @@ dialog.background.csd {
     }
 
     viewport.frame {
-      &.view { border-radius: $wm_radius; }
+      &.view { border-radius: $bt_radius; }
     }
   }