diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 75baa7bed4..36e89dfdad 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3054,18 +3054,18 @@ tooltip {
                                               // very dark backgrounds
   }
 
-  color: white;
   padding: 4px; /* not working */
   border-radius: 5px;
   box-shadow: none; // otherwise it gets inherited by windowframe.csd
   text-shadow: 0 1px black;
   // FIXME: we need a border or tooltips vanish on black background.
-  decoration.csd {
+  decoration {
     background-color: transparent;
   }
   * { //Yeah this is ugly
     padding: 4px;
     background-color: transparent;
+    color: white;
   }
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index aff2631e93..c6719734ff 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4261,7 +4261,6 @@ infobar {
  * Tooltips *
  ************/
 tooltip {
-  color: white;
   padding: 4px;
   /* not working */
   border-radius: 5px;
@@ -4271,11 +4270,12 @@ tooltip {
     background-color: rgba(0, 0, 0, 0.8);
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
-  tooltip decoration.csd {
+  tooltip decoration {
     background-color: transparent; }
   tooltip * {
     padding: 4px;
-    background-color: transparent; }
+    background-color: transparent;
+    color: white; }
 
 /*****************
  * Color Chooser *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c54fbaab79..6e4eb2da1c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4433,7 +4433,6 @@ infobar {
  * Tooltips *
  ************/
 tooltip {
-  color: white;
   padding: 4px;
   /* not working */
   border-radius: 5px;
@@ -4443,11 +4442,12 @@ tooltip {
     background-color: rgba(0, 0, 0, 0.8);
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
-  tooltip decoration.csd {
+  tooltip decoration {
     background-color: transparent; }
   tooltip * {
     padding: 4px;
-    background-color: transparent; }
+    background-color: transparent;
+    color: white; }
 
 /*****************
  * Color Chooser *