diff --git a/data/theme/gnome-shell-sass/widgets/_login-lock.scss b/data/theme/gnome-shell-sass/widgets/_login-lock.scss
index 52441a5c1..4dc9aec0b 100644
--- a/data/theme/gnome-shell-sass/widgets/_login-lock.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-lock.scss
@@ -279,16 +279,18 @@ $_gdm_dialog_width: 25em;
 }
 
 
-// User Widget
-.user-widget {
+.login-dialog,
+.unlock-dialog {
 
-  .user-widget-label {
-    color: $_gdm_fg;
-  }
+  // User Widget
+  .user-widget {
 
-  & .user-icon {
-    border-radius: $forced_circular_radius;
-    StIcon {
+    // common
+    .user-widget-label {
+      color: $_gdm_fg;
+    }
+
+    .user-icon {
       background-color: transparentize($_gdm_fg, .87);
       color: $_gdm_fg;
 
@@ -297,41 +299,31 @@ $_gdm_dialog_width: 25em;
         box-shadow:inset 0 0 0 1px $hc_inset_color;
       }
     }
-  }
 
-  // layout of the user list
-  &.horizontal {
-    spacing: $base_padding * 3;
-    .user-widget-label {
-      @extend %title_3;
-    }
-
-    .user-icon {
-      icon-size: $base_icon_size * 4;
-
-      & StIcon {
-        padding: $base_padding * 2;
-        icon-size: $base_icon_size * 2;
+    // layout of the user list
+    &.horizontal {
+      spacing: $base_padding * 3;
+      .user-widget-label {
+        @extend %title_3;
       }
     }
-  }
 
-  // layout of the login prompt
-  &.vertical {
-    spacing: $base_padding * 4;
+    // layout of the login prompt
+    &.vertical {
+      spacing: $base_padding * 4;
 
-    .user-widget-label {
-      @extend %title_1;
-      text-align: center;
-      margin-bottom: .75em;
-    }
+      .user-widget-label {
+        @extend %title_1;
+        text-align: center;
+        margin-bottom: .75em;
+      }
 
-    .user-icon {
-      icon-size: $base_icon_size * 10;
+      .user-icon {
+        icon-size: $base_icon_size * 10;
 
-      & StIcon {
-        padding: $base_padding * 4;
-        icon-size: $base_icon_size * 4;
+        & StIcon {
+          padding: $base_padding * 4;
+        }
       }
     }
   }
diff --git a/data/theme/gnome-shell-sass/widgets/_misc.scss b/data/theme/gnome-shell-sass/widgets/_misc.scss
index 545924dbc..35f9dc9a1 100644
--- a/data/theme/gnome-shell-sass/widgets/_misc.scss
+++ b/data/theme/gnome-shell-sass/widgets/_misc.scss
@@ -7,15 +7,14 @@
 // User icon
 .user-icon {
   background-size: contain;
-  color: $osd_fg_color;
   border-radius: $forced_circular_radius;
-  icon-size: $base_icon_size * 4; // 64px
+  icon-size: $base_icon_size * 4;
+
+  background-color: transparentize($osd_fg_color,0.95);
+  color: $osd_fg_color;
 
   & StIcon {
-    background-color: transparentize($osd_fg_color,0.95);
-    border-radius: $forced_circular_radius;
-    padding: $base_padding * 2 ; // 12px
-    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
+    padding: $base_padding * 2;
   }
 
   &.user-avatar {