diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index 827df6e0..79837384 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -236,7 +236,7 @@
   }
 
   @if $t == flat-normal {
-    color: if($tc != $light_fg_color, $alt_fg_color, $light_fg_color);
+    color: $tc;
     background-color: transparent;
     border-color: transparent;
     box-shadow: none;
@@ -245,7 +245,7 @@
   }
 
   @if $t == flat-focus {
-    color: if($tc != $light_fg_color, $fg_color, $light_fg_color);
+    color: $tc;
     text-shadow: none;
     icon-shadow: none;
     box-shadow: none;
@@ -253,7 +253,7 @@
   }
 
   @if $t == flat-hover {
-    color: if($tc != $light_fg_color, $fg_color, $light_fg_color);
+    color: $tc;
     background-color: $divider_color;
     border-color: transparent;
     box-shadow: none;
@@ -262,7 +262,7 @@
   }
 
   @if $t == flat-active {
-    color: if($tc != $light_fg_color, $fg_color, $light_fg_color);
+    color: $tc;
     background-color: $track_color;
     border-color: transparent;
     box-shadow: none;
@@ -271,7 +271,7 @@
   }
 
   @if $t == flat-insensitive {
-    color: if($tc != $light_fg_color, $disabled_fg_color, $light_alt_disabled_fg_color);
+    color: if($tc == $fg_color, $disabled_fg_color, $tc);
     background-color: transparent;
     border-color: transparent;
     box-shadow: none;
diff --git a/src/sass/gnome-shell/common/_login-dialog.scss b/src/sass/gnome-shell/common/_login-dialog.scss
index db04f36f..d3f86a22 100644
--- a/src/sass/gnome-shell/common/_login-dialog.scss
+++ b/src/sass/gnome-shell/common/_login-dialog.scss
@@ -61,6 +61,7 @@
     height: 32px;
     border: none;
     background-color: rgba($borders_color, 0.1);
+    color: $light_fg_color;
 
     StIcon { icon-size: 16px; }
   }