diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 951fec081..a14012f7e 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -360,3 +360,17 @@ stage {
   &:active { @include button(active, $tc:$system_fg_color, $c:$system_bg_color);}
   &:checked { @include button(checked, $tc:$system_fg_color, $c:$system_bg_color);}
 }
+
+/* Lockscreen Elements */
+
+// entries
+%lockscreen_entry {
+  @extend %entry_common;
+  @include entry(normal, $c:$system_fg_color, $style: lockscreen, $always_dark: true);
+  &:hover { @include entry(hover, $c:$system_fg_color, $style: lockscreen, $always_dark: true);}
+  &:focus { @include entry(focus, $c:$system_fg_color, $style: lockscreen, $always_dark: true);}
+  &:insensitive { @include entry(insensitive, $c:$system_fg_color, $style: lockscreen, $always_dark: true);}
+
+  StLabel.hint-text { color: transparentize($system_fg_color, 0.3);}
+}
+
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index ae9c02ff8..b95dbba88 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -63,7 +63,7 @@
 }
 
 // Text entries drawing function
-@mixin entry($type, $c:$fg_color, $bc:$bg_color, $always_dark: false) {
+@mixin entry($type, $c:$fg_color, $bc:$bg_color, $style: null, $always_dark: false) {
   //
   // $type:         entry type, possible values: normal, focus, hover, insensitive
   // $c:            text color
@@ -71,8 +71,19 @@
   // $always_dark:  override the light theme check to use dark colors, true or false
   //
 
-  // background color
+  // entry colors
+  $entry_fg_color: $c;
   $entry_bg_color: mix($c, $bc, $background_mix_factor);
+  $entry_focus_color: $focus_color;
+
+  // entry color overrides for lockscreen style
+  @if $style == 'lockscreen' {
+    $entry_bg_color: transparentize($c, 0.95);
+    $entry_focus_color: transparentize($entry_fg_color, 0.6);
+    @if $contrast == 'high' {
+      $entry_focus_color: transparentize($entry_fg_color, 0.3);
+    }
+  }
 
   // background color adjustment factors
   // the % a color is lightened or darkened for button states
@@ -96,26 +107,32 @@
   // normal
   @if $type == 'normal' {
     background-color: $entry_bg_color;
-    color: transparentize($c,0.3);
+    color: transparentize($c, 0.3);
   }
 
   // focus styles
   @if $type == 'focus' {
     @include focus_ring();
     background-color: focus_bg_color($entry_bg_color);
-    color: $c;
+    color: $entry_fg_color;
+
+    // lockscreen style
+    @if $style == 'lockscreen' {
+      @include focus_ring($fc:$entry_focus_color);
+      background-color: focus_bg_color($entry_bg_color, $fc:$entry_focus_color);
+    }
   }
 
   // hover styles
   @if $type == 'hover' {
     background-color: $hover_entry_bg_color;
-    color: $c;
+    color: $entry_fg_color;
   }
 
   // insensitive styles
   @if $type == 'insensitive' {
     background-color: $insensitive_entry_bg_color;
-    color: transparentize($c, 0.5);
+    color: transparentize($entry_fg_color, 0.5);
   }
 }
 
diff --git a/data/theme/gnome-shell-sass/widgets/_login-lock.scss b/data/theme/gnome-shell-sass/widgets/_login-lock.scss
index 899ca6c3c..ca9793173 100644
--- a/data/theme/gnome-shell-sass/widgets/_login-lock.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-lock.scss
@@ -5,6 +5,7 @@ $_gdm_dialog_width: 23em;
 // common style for gdm and lockscreen
 .login-dialog,
 .unlock-dialog {
+  color: $_gdm_fg;
 
   .caps-lock-warning-label,
   .login-dialog-message-warning {
@@ -155,9 +156,8 @@ $_gdm_dialog_width: 23em;
 .unlock-dialog {
   background-color: transparent;
 
-  // %system_entry style override to have neutral focus color with wallpaper background
   .login-dialog-prompt-entry {
-    &:focus { @include entry(focus, $c:$system_fg_color);}
+    @extend %lockscreen_entry;
   }
 }