diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 90b09a635f..d64cc120da 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -536,7 +536,8 @@ button {
         transition: $button_transition;
         transition-duration: 500ms;
       }
-      &:active {
+      &:active,
+      &:checked {
         @include button(undecorated-active);
         transition: $button_transition;
       }
@@ -1396,9 +1397,10 @@ windowcontrols {
     min-height: 0;
     &:hover {
       //special case hover colors inside a headerbar
-      @include button(undecorated-hover,$c:$headerbar_bg_color);
+      @include button(undecorated-hover,$c:darken($headerbar_bg_color,10%));
     }
-    &:active { @include button(undecorated-active,$c:$headerbar_bg_color); }
+    &:active,
+    &:checked { @include button(undecorated-active,$c:darken($headerbar_bg_color,10%)); }
   }
 }
 
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index dd45692767..aca1fa8651 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -419,7 +419,7 @@
     box-shadow: none;
     text-shadow: none;
     @if $variant == 'light' {
-      background-color: darken($c,26%);
+      background-color: darken($c,14%);
     }
     @else {
       background-color: darken($c,10%);
@@ -431,7 +431,7 @@
     box-shadow: none;
     text-shadow: none;
     @if $variant == 'light' {
-      background-color: darken($c,40%);
+      background-color: darken($c,30%);
     }
     @else {
       background-color: darken($c,14%);