diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 9e103ec1c..8975c1eaa 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -171,7 +171,7 @@ const UserListItem = new Lang.Class({
         if (GLib.file_test(iconFileName, GLib.FileTest.EXISTS))
             this._setIconFromFile(iconFileName, 'login-dialog-user-list-item-icon');
         else
-            this._setIconFromName('avatar-default', 'login-dialog-user-list-item-icon');
+            this._setIconFromName('avatar-default-symbolic', 'login-dialog-user-list-item-icon');
     },
 
     syncStyleClasses: function() {
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index a48719624..d4b4c4310 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -391,7 +391,7 @@ const EndSessionDialog = new Lang.Class({
             if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
                 this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
             else
-                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
+                this._setIconFromName('avatar-default-symbolic', dialogContent.iconStyleClass);
         } else if (dialogContent.iconName) {
             this._setIconFromName(dialogContent.iconName,
                                   dialogContent.iconStyleClass);
diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js
index 0f374a3be..1f1ef75e2 100644
--- a/js/ui/polkitAuthenticationAgent.js
+++ b/js/ui/polkitAuthenticationAgent.js
@@ -321,7 +321,7 @@ const AuthenticationDialog = new Lang.Class({
                 if (iconFile.query_exists(null)) {
                     icon = new Gio.FileIcon({file: iconFile});
                 } else {
-                    icon = new Gio.ThemedIcon({name: 'avatar-default'});
+                    icon = new Gio.ThemedIcon({name: 'avatar-default-symbolic'});
                 }
                 this._userIcon.set_gicon (icon);
                 this._userIcon.show();
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 404fac804..05a5aae44 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1771,7 +1771,7 @@ const NMApplet = new Lang.Class({
         wrapper._activationFailedId = wrapper.connect('activation-failed', Lang.bind(this, function(device, reason) {
             // XXX: nm-applet has no special text depending on reason
             // but I'm not sure of this generic message
-            this._notifyForDevice(device, 'network-error',
+            this._notifyForDevice(device, 'network-error-symbolic',
                                   _("Connection failed"),
                                   _("Activation of network connection failed"),
                                   MessageTray.Urgency.HIGH);