diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 9fd219c0a3..52429d03a5 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -741,8 +741,9 @@ modelbutton.flat,
   }
 }
 
-modelbutton arrow {
+modelbutton.flat arrow {
   background: none;
+  &:hover { background: none; }
   &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
   &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 60c0bc13e7..bd67454569 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1241,11 +1241,13 @@ modelbutton.flat,
   .menuitem.button.flat:hover {
     background-color: #4b5150; }
 
-modelbutton arrow {
+modelbutton.flat arrow {
   background: none; }
-  modelbutton arrow.left {
+  modelbutton.flat arrow:hover {
+    background: none; }
+  modelbutton.flat arrow.left {
     -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-  modelbutton arrow.right {
+  modelbutton.flat arrow.right {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
 button.color, headerbar button.color.titlebutton,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 8199fb7245..78fc0f6103 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1241,11 +1241,13 @@ modelbutton.flat,
   .menuitem.button.flat:hover {
     background-color: #d5d6d5; }
 
-modelbutton arrow {
+modelbutton.flat arrow {
   background: none; }
-  modelbutton arrow.left {
+  modelbutton.flat arrow:hover {
+    background: none; }
+  modelbutton.flat arrow.left {
     -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-  modelbutton arrow.right {
+  modelbutton.flat arrow.right {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
 button.color, headerbar button.color.titlebutton,