diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 25b3a8761a..05a0c05cf7 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -730,7 +730,7 @@ modelbutton.flat,
 }
 
 
-GtkColorButton.button {
+button.color {
   padding: 5px; // Uniform padding on the GtkColorButton
 
   GtkColorSwatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets overridden by the
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index f21466336d..4ec0208942 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1233,12 +1233,13 @@ modelbutton.flat,
   .menuitem.button.flat:hover {
     background-color: #4b5150; }
 
-GtkColorButton.button {
+button.color, headerbar button.color.titlebutton,
+.titlebar button.color.titlebutton {
   padding: 5px; }
-  GtkColorButton.button GtkColorSwatch:first-child:last-child {
+  button.color GtkColorSwatch:first-child:last-child {
     border-radius: 0;
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    GtkColorButton.button GtkColorSwatch:first-child:last-child:insensitive, GtkColorButton.button GtkColorSwatch:first-child:last-child:backdrop {
+    button.color GtkColorSwatch:first-child:last-child:insensitive, button.color GtkColorSwatch:first-child:last-child:backdrop {
       box-shadow: none; }
 
 /*********
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 977f032f7a..641e295ac1 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1233,12 +1233,13 @@ modelbutton.flat,
   .menuitem.button.flat:hover {
     background-color: #dadbdb; }
 
-GtkColorButton.button {
+button.color, headerbar button.color.titlebutton,
+.titlebar button.color.titlebutton {
   padding: 5px; }
-  GtkColorButton.button GtkColorSwatch:first-child:last-child {
+  button.color GtkColorSwatch:first-child:last-child {
     border-radius: 0;
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
-    GtkColorButton.button GtkColorSwatch:first-child:last-child:insensitive, GtkColorButton.button GtkColorSwatch:first-child:last-child:backdrop {
+    button.color GtkColorSwatch:first-child:last-child:insensitive, button.color GtkColorSwatch:first-child:last-child:backdrop {
       box-shadow: none; }
 
 /*********