diff --git a/src/img/avatars/armchair.png b/src/img/avatars/armchair.png
deleted file mode 100644
index a659d7dad..000000000
Binary files a/src/img/avatars/armchair.png and /dev/null differ
diff --git a/src/img/avatars/avatar_0.png b/src/img/avatars/avatar_0.png
deleted file mode 100644
index d2e28014f..000000000
Binary files a/src/img/avatars/avatar_0.png and /dev/null differ
diff --git a/src/img/avatars/cap.png b/src/img/avatars/cap.png
deleted file mode 100644
index 41c0e0457..000000000
Binary files a/src/img/avatars/cap.png and /dev/null differ
diff --git a/src/img/avatars/carrot.png b/src/img/avatars/carrot.png
deleted file mode 100644
index c947fe448..000000000
Binary files a/src/img/avatars/carrot.png and /dev/null differ
diff --git a/src/img/avatars/cup.png b/src/img/avatars/cup.png
deleted file mode 100644
index 7fdb3db77..000000000
Binary files a/src/img/avatars/cup.png and /dev/null differ
diff --git a/src/img/avatars/football.png b/src/img/avatars/football.png
deleted file mode 100644
index b9c284226..000000000
Binary files a/src/img/avatars/football.png and /dev/null differ
diff --git a/src/img/avatars/jar.png b/src/img/avatars/jar.png
deleted file mode 100644
index 0b8171ef9..000000000
Binary files a/src/img/avatars/jar.png and /dev/null differ
diff --git a/src/img/avatars/logo-black.png b/src/img/avatars/logo-black.png
new file mode 100644
index 000000000..0bf5ecd3c
Binary files /dev/null and b/src/img/avatars/logo-black.png differ
diff --git a/src/img/avatars/logo-darkblue.png b/src/img/avatars/logo-darkblue.png
new file mode 100644
index 000000000..cc5d01a2d
Binary files /dev/null and b/src/img/avatars/logo-darkblue.png differ
diff --git a/src/img/avatars/logo-green.png b/src/img/avatars/logo-green.png
new file mode 100644
index 000000000..d3a9478ea
Binary files /dev/null and b/src/img/avatars/logo-green.png differ
diff --git a/src/img/avatars/logo-orange.png b/src/img/avatars/logo-orange.png
new file mode 100644
index 000000000..41b8972a6
Binary files /dev/null and b/src/img/avatars/logo-orange.png differ
diff --git a/src/img/avatars/logo-red.png b/src/img/avatars/logo-red.png
new file mode 100644
index 000000000..fff296cb7
Binary files /dev/null and b/src/img/avatars/logo-red.png differ
diff --git a/src/img/avatars/logo-yellow.png b/src/img/avatars/logo-yellow.png
new file mode 100644
index 000000000..c93d47024
Binary files /dev/null and b/src/img/avatars/logo-yellow.png differ
diff --git a/src/img/avatars/logo.png b/src/img/avatars/logo.png
new file mode 100644
index 000000000..0cc10339f
Binary files /dev/null and b/src/img/avatars/logo.png differ
diff --git a/src/img/avatars/meat.png b/src/img/avatars/meat.png
deleted file mode 100644
index 26c9f84d9..000000000
Binary files a/src/img/avatars/meat.png and /dev/null differ
diff --git a/src/img/avatars/owl.png b/src/img/avatars/owl.png
deleted file mode 100644
index b314e289f..000000000
Binary files a/src/img/avatars/owl.png and /dev/null differ
diff --git a/src/img/avatars/pan.png b/src/img/avatars/pan.png
deleted file mode 100644
index d7bbddbee..000000000
Binary files a/src/img/avatars/pan.png and /dev/null differ
diff --git a/src/img/avatars/rubber-duck.png b/src/img/avatars/rubber-duck.png
deleted file mode 100644
index fadc59165..000000000
Binary files a/src/img/avatars/rubber-duck.png and /dev/null differ
diff --git a/src/img/avatars/space-rocket.png b/src/img/avatars/space-rocket.png
deleted file mode 100644
index 29cec3187..000000000
Binary files a/src/img/avatars/space-rocket.png and /dev/null differ
diff --git a/src/img/avatars/umbrella.png b/src/img/avatars/umbrella.png
deleted file mode 100644
index 3235e8972..000000000
Binary files a/src/img/avatars/umbrella.png and /dev/null differ
diff --git a/src/theme.scss b/src/theme.scss
index 02c4c99f8..7c4d7438c 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1178,6 +1178,7 @@ footer {
 }
 
 .settings-avatar-selector {
+    text-align: center;
 
     .grid {
         margin-top: 20px;
@@ -1206,6 +1207,9 @@ footer {
         }
 
         &.add {
+            border-radius: 2px;
+            width: 54px;
+            height: 54px;
             background-color: $brand-primary;
             background-image: url('/img/plus.png');
             background-repeat: no-repeat;
diff --git a/src/views/settings.js b/src/views/settings.js
index bea87254f..1fc2161cd 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -157,55 +157,31 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         availableAvatars: [{
             file: null,
             data: null,
-            url: '/img/avatars/avatar_0.png',
+            url: '/img/avatars/logo.png',
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/rubber-duck.png'
+            url: '/img/avatars/logo-green.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/carrot.png'
+            url: '/img/avatars/logo-orange.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/cup.png'
+            url: '/img/avatars/logo-darkblue.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/football.png'
+            url: '/img/avatars/logo-red.png'
+        },  {
+            file: null,
+            data: null,
+            url: '/img/avatars/logo-yellow.png'
         }, {
             file: null,
             data: null,
-            url: '/img/avatars/owl.png'
-        }, {
-            file: null,
-            data: null,
-            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'
+            url: '/img/avatars/logo-black.png'
         }],
 
         getBlobFromImg: function (img, callback) {