diff --git a/webadmin/src/img/avatars/armchair.png b/webadmin/src/img/avatars/armchair.png
new file mode 100644
index 000000000..a659d7dad
Binary files /dev/null and b/webadmin/src/img/avatars/armchair.png differ
diff --git a/webadmin/src/img/avatars/cap.png b/webadmin/src/img/avatars/cap.png
new file mode 100644
index 000000000..41c0e0457
Binary files /dev/null and b/webadmin/src/img/avatars/cap.png differ
diff --git a/webadmin/src/img/avatars/carrot.png b/webadmin/src/img/avatars/carrot.png
new file mode 100644
index 000000000..c947fe448
Binary files /dev/null and b/webadmin/src/img/avatars/carrot.png differ
diff --git a/webadmin/src/img/avatars/cloudfacegreen.png b/webadmin/src/img/avatars/cloudfacegreen.png
deleted file mode 100644
index e819b560d..000000000
Binary files a/webadmin/src/img/avatars/cloudfacegreen.png and /dev/null differ
diff --git a/webadmin/src/img/avatars/cloudfaceturquoise.png b/webadmin/src/img/avatars/cloudfaceturquoise.png
deleted file mode 100644
index f0c5782c2..000000000
Binary files a/webadmin/src/img/avatars/cloudfaceturquoise.png and /dev/null differ
diff --git a/webadmin/src/img/avatars/cloudglassesgreen.png b/webadmin/src/img/avatars/cloudglassesgreen.png
deleted file mode 100644
index bf3ece573..000000000
Binary files a/webadmin/src/img/avatars/cloudglassesgreen.png and /dev/null differ
diff --git a/webadmin/src/img/avatars/cloudglassespink.png b/webadmin/src/img/avatars/cloudglassespink.png
deleted file mode 100644
index 1e6189cc9..000000000
Binary files a/webadmin/src/img/avatars/cloudglassespink.png and /dev/null differ
diff --git a/webadmin/src/img/avatars/cloudglassesturquoise.png b/webadmin/src/img/avatars/cloudglassesturquoise.png
deleted file mode 100644
index 79cdb3c41..000000000
Binary files a/webadmin/src/img/avatars/cloudglassesturquoise.png and /dev/null differ
diff --git a/webadmin/src/img/avatars/cloudglassesyellow.png b/webadmin/src/img/avatars/cloudglassesyellow.png
deleted file mode 100644
index 0403b9de9..000000000
Binary files a/webadmin/src/img/avatars/cloudglassesyellow.png and /dev/null differ
diff --git a/webadmin/src/img/avatars/cup.png b/webadmin/src/img/avatars/cup.png
new file mode 100644
index 000000000..7fdb3db77
Binary files /dev/null and b/webadmin/src/img/avatars/cup.png differ
diff --git a/webadmin/src/img/avatars/football.png b/webadmin/src/img/avatars/football.png
new file mode 100644
index 000000000..b9c284226
Binary files /dev/null and b/webadmin/src/img/avatars/football.png differ
diff --git a/webadmin/src/img/avatars/jar.png b/webadmin/src/img/avatars/jar.png
new file mode 100644
index 000000000..0b8171ef9
Binary files /dev/null and b/webadmin/src/img/avatars/jar.png differ
diff --git a/webadmin/src/img/avatars/meat.png b/webadmin/src/img/avatars/meat.png
new file mode 100644
index 000000000..26c9f84d9
Binary files /dev/null and b/webadmin/src/img/avatars/meat.png differ
diff --git a/webadmin/src/img/avatars/owl.png b/webadmin/src/img/avatars/owl.png
new file mode 100644
index 000000000..b314e289f
Binary files /dev/null and b/webadmin/src/img/avatars/owl.png differ
diff --git a/webadmin/src/img/avatars/pan.png b/webadmin/src/img/avatars/pan.png
new file mode 100644
index 000000000..d7bbddbee
Binary files /dev/null and b/webadmin/src/img/avatars/pan.png differ
diff --git a/webadmin/src/img/avatars/rubber-duck.png b/webadmin/src/img/avatars/rubber-duck.png
new file mode 100644
index 000000000..fadc59165
Binary files /dev/null and b/webadmin/src/img/avatars/rubber-duck.png differ
diff --git a/webadmin/src/img/avatars/space-rocket.png b/webadmin/src/img/avatars/space-rocket.png
new file mode 100644
index 000000000..29cec3187
Binary files /dev/null and b/webadmin/src/img/avatars/space-rocket.png differ
diff --git a/webadmin/src/img/avatars/umbrella.png b/webadmin/src/img/avatars/umbrella.png
new file mode 100644
index 000000000..3235e8972
Binary files /dev/null and b/webadmin/src/img/avatars/umbrella.png differ
diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index 1659ad0a5..5b0246720 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -51,27 +51,51 @@ app.service('Wizard', [ function () {
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudfacegreen.png'
+            url: '/img/avatars/rubber-duck.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudfaceturquoise.png'
+            url: '/img/avatars/carrot.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassesgreen.png'
+            url: '/img/avatars/cup.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassespink.png'
+            url: '/img/avatars/football.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassesturquoise.png'
+            url: '/img/avatars/owl.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassesyellow.png'
+            url: '/img/avatars/space-rocket.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/armchair.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/cap.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/pan.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/meat.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/umbrella.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/jar.png'
         }];
         this.avatar = {};
         this.avatarBlob = null;
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index 569ad4044..deaa22eb0 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -41,27 +41,51 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudfacegreen.png'
+            url: '/img/avatars/rubber-duck.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudfaceturquoise.png'
+            url: '/img/avatars/carrot.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassesgreen.png'
+            url: '/img/avatars/cup.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassespink.png'
+            url: '/img/avatars/football.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassesturquoise.png'
+            url: '/img/avatars/owl.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cloudglassesyellow.png'
+            url: '/img/avatars/space-rocket.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/armchair.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/cap.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/pan.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/meat.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/umbrella.png'
+        }, {
+            file: null,
+            data: null,
+            url: '/img/avatars/jar.png'
         }]
     };