diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 5ce7ee1334..b3efa3571c 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -856,7 +856,7 @@ GtkColorButton.button {
     background-image: none;
     border-style: none none none solid;
     border-color: transparentize($borders_color,0.7);
-    color: mix($fg_color,$base_color,95%);
+    color: mix($fg_color, $base_color,90%);
     border-radius: 0;
     box-shadow: none;
   //  padding-left: 6px;
@@ -874,6 +874,7 @@ GtkColorButton.button {
       background-color: transparentize(black,0.9);
     }
     &:backdrop {
+      color: mix($backdrop_fg_color, $backdrop_base_color, 90%);
       border-color: transparentize($backdrop_borders_color,0.7);
       background-color: transparent;
     }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index ea7e15ec80..7e71c3a599 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1362,7 +1362,7 @@ GtkCalendar.header .button.titlebutton:visited {
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(28, 31, 31, 0.3);
-    color: #e4e4e2;
+    color: #dadad8;
     border-radius: 0;
     box-shadow: none; }
     .spinbutton .button:dir(rtl) {
@@ -1376,6 +1376,7 @@ GtkCalendar.header .button.titlebutton:visited {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     .spinbutton .button:backdrop {
+      color: #b9bbb9;
       border-color: rgba(30, 34, 34, 0.3);
       background-color: transparent; }
     .spinbutton .button:backdrop:insensitive {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index bc29815428..1221968c7a 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1354,7 +1354,7 @@ GtkCalendar.header .button.titlebutton:visited {
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(161, 161, 161, 0.3);
-    color: #383e40;
+    color: #42484a;
     border-radius: 0;
     box-shadow: none; }
     .spinbutton .button:dir(rtl) {
@@ -1368,6 +1368,7 @@ GtkCalendar.header .button.titlebutton:visited {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     .spinbutton .button:backdrop {
+      color: #64696a;
       border-color: rgba(168, 168, 168, 0.3);
       background-color: transparent; }
     .spinbutton .button:backdrop:insensitive {