diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 504792e91..3c5aa49e0 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -620,18 +620,6 @@ StScrollBar StButton#vhandle:active {
     padding: .4em;
 }
 
-.status-chooser-user-icon {
-    border: 2px solid #8b8b8b;
-    border-radius: 5px;
-    width: 48pt;
-    height: 48pt;
-    background-size: contain;
-}
-
-.status-chooser-user-icon:hover {
-    border: 2px solid #bbbbbb;
-}
-
 .status-chooser-user-name {
     font-weight: bold;
     font-size: 1.3em;
@@ -2207,6 +2195,18 @@ StScrollBar StButton#vhandle:active {
 
 /* Login Dialog */
 
+.framed-user-icon {
+    border: 2px solid #8b8b8b;
+    border-radius: 5px;
+    width: 48pt;
+    height: 48pt;
+    background-size: contain;
+}
+
+.framed-user-icon:hover {
+    border: 2px solid #bbbbbb;
+}
+
 .login-dialog-banner {
     font-size: 10pt;
     font-weight: bold;
diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js
index 276b86b03..47c28aad0 100644
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -24,7 +24,7 @@ const Avatar = new Lang.Class({
         this._user = user;
         params = Params.parse(params, { reactive: false,
                                         iconSize: AVATAR_ICON_SIZE,
-                                        styleClass: 'status-chooser-user-icon' });
+                                        styleClass: 'framed-user-icon' });
         this._iconSize = params.iconSize;
 
         this.actor = new St.Bin({ style_class: params.styleClass,