diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 03f09b862a..0a4ee52aad 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -393,16 +393,22 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the GtkColorButton
     background-image: none;
     border-width: 0 0 0 1px;
     border-color: transparentize($borders_color,0.7);
+    color: mix($fg_color,$base_color,95%);
     border-radius: 0;
     box-shadow: none;
   //  padding-left: 6px;
   //  padding-right: 6px;
     &:dir(rtl) { border-width: 0 1px 0 0; }
+    &:hover {
+      color: $fg_color;
+      background-color: transparentize(black,0.95);
+    }
     &:insensitive {
       color: transparentize($insensitive_fg_color,0.7);
     }
     &:active {
       box-shadow: inset 0 2px 3px -1px transparentize(black,0.8);
+      background-color: transparentize(black,0.9);
     }
     &:backdrop {
       border-color: transparentize($backdrop_borders_color,0.7);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 6af33ccf90..34f00c7cbd 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -499,14 +499,19 @@ GtkColorButton.button {
   background-image: none;
   border-width: 0 0 0 1px;
   border-color: rgba(28, 31, 31, 0.3);
+  color: #e4e4e2;
   border-radius: 0;
   box-shadow: none; }
   .spinbutton .button:dir(rtl) {
     border-width: 0 1px 0 0; }
+  .spinbutton .button:hover {
+    color: #eeeeec;
+    background-color: rgba(0, 0, 0, 0.05); }
   .spinbutton .button:insensitive {
     color: rgba(147, 150, 149, 0.3); }
   .spinbutton .button:active {
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
+    background-color: rgba(0, 0, 0, 0.1); }
   .spinbutton .button:backdrop {
     border-color: rgba(30, 34, 34, 0.3); }
   .spinbutton .button:backdrop:insensitive {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index c4f02dcd7c..c929c8f198 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -499,14 +499,19 @@ GtkColorButton.button {
   background-image: none;
   border-width: 0 0 0 1px;
   border-color: rgba(161, 161, 161, 0.3);
+  color: #383e40;
   border-radius: 0;
   box-shadow: none; }
   .spinbutton .button:dir(rtl) {
     border-width: 0 1px 0 0; }
+  .spinbutton .button:hover {
+    color: #2e3436;
+    background-color: rgba(0, 0, 0, 0.05); }
   .spinbutton .button:insensitive {
     color: rgba(141, 144, 145, 0.3); }
   .spinbutton .button:active {
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
+    background-color: rgba(0, 0, 0, 0.1); }
   .spinbutton .button:backdrop {
     border-color: rgba(168, 168, 168, 0.3); }
   .spinbutton .button:backdrop:insensitive {