diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 26095349e0..b55d6683c8 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -261,7 +261,7 @@ GtkLabel {
     @include button(active);
     transition-duration: 50ms;
   }
-  &:backdrop, &.flat:backdrop {
+  &:backdrop {
     @include button(backdrop);
     -gtk-image-effect: none;
     &:active {
@@ -1939,7 +1939,10 @@ GtkScrolledWindow {
   &:selected {
     @extend .list-row:selected;
     &:active { box-shadow: inset 0 2px 3px -1px transparentize(black,0.5); }
-    &:hover { background-color: mix(black, $selected_bg_color, 10%);}
+    &:hover {
+      @extend .list-row:selected;
+      background-color: mix(black, $selected_bg_color, 10%);
+    }
   }
   &:backdrop:hover {
     @extend %undecorated_button;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 9b9eefe46d..a0747e3178 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -284,7 +284,7 @@
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1);
     transition-duration: 50ms; }
-  .button:backdrop, .button.flat:backdrop {
+  .button:backdrop {
     border-style: solid;
     color: #c9cbc9;
     border-color: #1e2222;
@@ -293,19 +293,19 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     -gtk-image-effect: none; }
-    .button:backdrop:active, .button.flat:backdrop:active {
+    .button:backdrop:active {
       border-style: solid;
       color: #c9cbc9;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2f3434);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .button:backdrop:insensitive, .button.flat:backdrop:insensitive {
+    .button:backdrop:insensitive {
       border-style: solid;
       color: #454c4c;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:active {
+    .button:backdrop:insensitive:active {
       border-style: solid;
       color: #454c4c;
       border-color: #1e2222;
@@ -2455,10 +2455,10 @@ GtkScrolledWindow GtkViewport.frame {
   .button.list-row:hover:selected {
     background-color: #1d538c; }
 
-.list-row:selected, .list-row.button:selected {
+.list-row:selected, .list-row.button:selected, .list-row.button:selected:hover {
   color: white;
   background-color: #215d9c; }
-  .list-row:selected:backdrop {
+  .list-row:selected:backdrop, .list-row.button:backdrop:selected:hover {
     color: #2c2c2c; }
 
 /*.list-row.button:selected,
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index e86f37d44f..0a3563f389 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -276,7 +276,7 @@
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white;
     transition-duration: 50ms; }
-  .button:backdrop, .button.flat:backdrop {
+  .button:backdrop {
     border-style: solid;
     color: #54595a;
     border-color: #a8a8a8;
@@ -285,19 +285,19 @@
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     -gtk-image-effect: none; }
-    .button:backdrop:active, .button.flat:backdrop:active {
+    .button:backdrop:active {
       border-style: solid;
       color: #54595a;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #d4d4d4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .button:backdrop:insensitive, .button.flat:backdrop:insensitive {
+    .button:backdrop:insensitive {
       border-style: solid;
       color: #c7c7c7;
       border-color: #a8a8a8;
       background-image: linear-gradient(to bottom, #ededed);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:active {
+    .button:backdrop:insensitive:active {
       border-style: solid;
       color: #c7c7c7;
       border-color: #a8a8a8;
@@ -2447,10 +2447,10 @@ GtkScrolledWindow GtkViewport.frame {
   .button.list-row:hover:selected {
     background-color: #4281c3; }
 
-.list-row:selected, .list-row.button:selected {
+.list-row:selected, .list-row.button:selected, .list-row.button:selected:hover {
   color: white;
   background-color: #4a90d9; }
-  .list-row:selected:backdrop {
+  .list-row:selected:backdrop, .list-row.button:backdrop:selected:hover {
     color: #fcfcfc; }
 
 /*.list-row.button:selected,