diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index 626e773202..c6bd97a3c5 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -277,9 +277,9 @@
     border-color: if($c!=$bg_color, _border_color($c), $borders_color);
     @if $variant == 'light' { background-image: image(darken($c, 8%)); }
     @else { background-image: image(darken($c, 6%)); }
-    @include _button_text_shadow($tc, darken($c,10%));
-    @include _shadows(inset 0 2px 1px -2px transparentize(black,0.4),
+    @include _shadows(inset 0 1px transparentize($_hilight_color, 1),
                       $_button_edge);
+
     text-shadow: none;
     -gtk-icon-shadow: none;
   }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3223390df4..d564f838ef 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -468,9 +468,7 @@ button {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #212424;
     background-image: image(#2a2f2f);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     transition-duration: 50ms; }
@@ -796,9 +794,7 @@ button.suggested-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #0f2b48;
     background-image: image(#1b4e83);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .selection-mode button.titlebutton:backdrop,
@@ -975,9 +971,7 @@ button.destructive-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #760909;
     background-image: image(#b90e0e);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   button.destructive-action:backdrop,
@@ -1195,9 +1189,7 @@ button.needs-attention > image, stacksidebar row.needs-attention > label {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #212424;
     background-image: image(#2a2f2f);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled {
@@ -1744,9 +1736,7 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #0f2b48;
         background-image: image(#1b4e83);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-        -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-        box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop,
@@ -1875,9 +1865,7 @@ headerbar {
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #212424;
           background-image: image(#2a2f2f);
-          text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-          -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-          box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           text-shadow: none;
           -gtk-icon-shadow: none;
           border-color: #0f2b48; }
@@ -2776,9 +2764,7 @@ radio {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #212424;
     background-image: image(#2a2f2f);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   check:disabled,
@@ -4164,9 +4150,7 @@ infobar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0f2b48;
       background-image: image(#1b4e83);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-      -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-      box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .info button:disabled,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index f2df6f4a3d..baa9554aae 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -468,9 +468,7 @@ button {
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #b6b6b3;
     background-image: image(#d4d4d2);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
     transition-duration: 50ms; }
@@ -799,9 +797,7 @@ button.suggested-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #215d9c;
     background-image: image(#2b7bcf);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .selection-mode button.titlebutton:backdrop,
@@ -978,9 +974,7 @@ button.destructive-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #a60c0c;
     background-image: image(#df1111);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   button.destructive-action:backdrop,
@@ -1198,9 +1192,7 @@ button.needs-attention > image, stacksidebar row.needs-attention > label {
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #b6b6b3;
     background-image: image(#d4d4d2);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled {
@@ -1751,9 +1743,7 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #215d9c;
         background-image: image(#2b7bcf);
-        text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-        -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-        box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop,
@@ -1882,9 +1872,7 @@ headerbar {
           outline-color: rgba(46, 52, 54, 0.3);
           border-color: #b6b6b3;
           background-image: image(#d4d4d2);
-          text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           text-shadow: none;
           -gtk-icon-shadow: none;
           border-color: #184472; }
@@ -2801,9 +2789,7 @@ radio {
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #b6b6b3;
     background-image: image(#d4d4d2);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
   check:disabled,
@@ -4193,9 +4179,7 @@ infobar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #215d9c;
       background-image: image(#2b7bcf);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-      -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-      box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .info button:disabled,