diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index adaa529..4b7d6fe 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -148,13 +148,17 @@
 @define-color error_color #cc0000;
 @define-color success_color #4e9a06;
 
-@define-color info_fg_color rgb (181, 171, 156);
+@define-color info_fg_color black;
+@define-color info_text_shadow alpha(black, 0.1);
 @define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color rgb (173, 120, 41);
+@define-color warning_fg_color black;
+@define-color warning_text_shadow alpha(black, 0.1);
 @define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (97, 122, 214);
+@define-color question_fg_color white;
+@define-color question_text_shadow alpha(black, 0.5);
 @define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color rgb (166, 38, 38);
+@define-color error_fg_color white;
+@define-color error_text_shadow alpha(black, 0.5);
 @define-color error_bg_color rgb (237, 54, 54);
 
 @define-color os_chrome_bg_color black;
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index f1e4d22..ed95632 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -50,13 +50,17 @@
 @define-color error_color #cc0000;
 @define-color success_color #4e9a06;
 
-@define-color info_fg_color rgb (181, 171, 156);
+@define-color info_fg_color black;
+@define-color info_text_shadow alpha(black, 0.1);
 @define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color rgb (173, 120, 41);
+@define-color warning_fg_color black;
+@define-color warning_text_shadow alpha(black, 0.1);
 @define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (97, 122, 214);
+@define-color question_fg_color white;
+@define-color question_text_shadow alpha(black, 0.5);
 @define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color rgb (166, 38, 38);
+@define-color error_fg_color white;
+@define-color error_text_shadow alpha(black, 0.5);
 @define-color error_bg_color rgb (237, 54, 54);
 
 @define-color keyboard_focus_border_a #a2c9f1;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 028fae5..4a8927d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -2313,12 +2313,21 @@ GtkInfoBar .button:active:backdrop,
     border-width: 1px;
 }
 
-GtkInfoBar,
-.info,
-.warning,
-.question,
+
+.info {
+    text-shadow: 0 1 @info_text_shadow;
+}
+
+.warning {
+    text-shadow: 0 1 @warning_text_shadow;
+}
+
+.question {
+    text-shadow: 0 1 @question_text_shadow;
+}
+
 .error {
-    text-shadow: 0 1 alpha(black, 0.15);
+    text-shadow: 0 1 @error_text_shadow;
 }
 
 GtkInfoBar:backdrop,
