diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
index c4c69fef64..4ac90fe691 100644
--- a/gtk/theme/Adwaita/_colors.scss
+++ b/gtk/theme/Adwaita/_colors.scss
@@ -18,6 +18,8 @@ $top_hilight: $borders_edge;
 $dark_fill: mix($borders_color, $bg_color, 35%);
 $headerbar_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%));
 $menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));
+$popover_bg_color: darken($bg_color, 5%);
+$popover_hover_color: $bg_color;
 
 $scrollbar_bg_color: darken($bg_color, 7%);
 
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2bce268a17..1e07337e31 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -804,7 +804,7 @@ modelbutton.flat,
   outline-offset: -2px;
 
   @extend %undecorated_button;
-  &:hover { background-color: $base_hover_color; } // FIXME
+  &:hover { background-color: $popover_hover_color; }
 
   &:selected { @extend %selected_items; }
 
@@ -1733,12 +1733,16 @@ menuitem {
 popover.background {
   padding: 2px;
   border-radius: 5px;
+  background-color: $popover_bg_color;
 
   &, .csd & { border: 1px solid $borders_color; }
 
   box-shadow: 0 1px 2px transparentize(black, 0.7);
 
-  &:backdrop { box-shadow: none; }
+  &:backdrop {
+    background-color: $backdrop_bg_color;
+    box-shadow: none;
+  }
 
   > list,
   > .view,
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3774814f6c..c8b8602992 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1196,7 +1196,7 @@ modelbutton.flat,
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: rgba(238, 238, 236, 0.05); }
+    background-color: #393f3f; }
   modelbutton.flat check:last-child,
   modelbutton.flat radio:last-child,
   .menuitem.button.flat check:last-child,
@@ -2118,10 +2118,12 @@ menuitem radio {
 popover.background {
   padding: 2px;
   border-radius: 5px;
+  background-color: #2d3232;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
   popover.background, .csd popover.background {
     border: 1px solid #1c1f1f; }
   popover.background:backdrop {
+    background-color: #393f3f;
     box-shadow: none; }
   popover.background > list,
   popover.background > .view,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c65b53d11b..02c4090e03 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1196,7 +1196,7 @@ modelbutton.flat,
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: rgba(46, 52, 54, 0.05); }
+    background-color: #e8e8e7; }
   modelbutton.flat check:last-child,
   modelbutton.flat radio:last-child,
   .menuitem.button.flat check:last-child,
@@ -2128,10 +2128,12 @@ menuitem radio {
 popover.background {
   padding: 2px;
   border-radius: 5px;
+  background-color: #dcdcda;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
   popover.background, .csd popover.background {
     border: 1px solid #9d9d99; }
   popover.background:backdrop {
+    background-color: #e8e8e7;
     box-shadow: none; }
   popover.background > list,
   popover.background > .view,