diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc
index 006e811e..7c55b677 100755
--- a/src/gui/qt/resources.qrc
+++ b/src/gui/qt/resources.qrc
@@ -10,26 +10,12 @@
         <file>resources/graphics/actions/action_winner.png</file>
     </qresource>
     <qresource prefix="/avatar" >
-        <file>resources/avatar/Chales_Johnson.png</file>
-        <file>resources/avatar/Eli_Hodapp.png</file>
-        <file>resources/avatar/Eli_Hodapp1.png</file>
-        <file>resources/avatar/Hans_Dekker.png</file>
-        <file>resources/avatar/Indigo_Goat.png</file>
-        <file>resources/avatar/Jerry_Daykin.png</file>
-        <file>resources/avatar/Presty.png</file>
-        <file>resources/avatar/The_Marmot.png</file>
-        <file>resources/avatar/William_Holtkamp.png</file>
-        <file>resources/avatar/cr.png</file>
-        <file>resources/avatar/dps.png</file>
-        <file>resources/avatar/ellievanhoutte.png</file>
-        <file>resources/avatar/jarrodtrainique.png</file>
-        <file>resources/avatar/joeltelling.png</file>
-        <file>resources/avatar/loufi.png</file>
-        <file>resources/avatar/riccardodivirgilio.png</file>
-        <file>resources/avatar/riccardodivirgilio1.png</file>
-        <file>resources/avatar/rileyroxx.png</file>
-        <file>resources/avatar/saidanddone.png</file>
-        <file>resources/avatar/scottfeldstein.png</file>
+        <file>resources/avatar/albert_einstein.png</file>
+        <file>resources/avatar/clipart1.png</file>
+        <file>resources/avatar/goethe.png</file>
+        <file>resources/avatar/linus.png</file>
+        <file>resources/avatar/marc.png</file>
+        <file>resources/avatar/mozart.png</file>
     </qresource>
     <qresource prefix="/cards" >
         <file>resources/graphics/cards/0.png</file>
diff --git a/src/gui/qt/resources/avatar/Chales_Johnson.png b/src/gui/qt/resources/avatar/Chales_Johnson.png
deleted file mode 100644
index 734826b0..00000000
Binary files a/src/gui/qt/resources/avatar/Chales_Johnson.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/Eli_Hodapp.png b/src/gui/qt/resources/avatar/Eli_Hodapp.png
deleted file mode 100644
index 7033156d..00000000
Binary files a/src/gui/qt/resources/avatar/Eli_Hodapp.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/Eli_Hodapp1.png b/src/gui/qt/resources/avatar/Eli_Hodapp1.png
deleted file mode 100644
index bf4b7f58..00000000
Binary files a/src/gui/qt/resources/avatar/Eli_Hodapp1.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/Hans_Dekker.png b/src/gui/qt/resources/avatar/Hans_Dekker.png
deleted file mode 100644
index 4a1c50fa..00000000
Binary files a/src/gui/qt/resources/avatar/Hans_Dekker.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/Indigo_Goat.png b/src/gui/qt/resources/avatar/Indigo_Goat.png
deleted file mode 100644
index a6d5a972..00000000
Binary files a/src/gui/qt/resources/avatar/Indigo_Goat.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/Jerry_Daykin.png b/src/gui/qt/resources/avatar/Jerry_Daykin.png
deleted file mode 100644
index d138d63d..00000000
Binary files a/src/gui/qt/resources/avatar/Jerry_Daykin.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/Presty.png b/src/gui/qt/resources/avatar/Presty.png
deleted file mode 100644
index a02e6d41..00000000
Binary files a/src/gui/qt/resources/avatar/Presty.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/The_Marmot.png b/src/gui/qt/resources/avatar/The_Marmot.png
deleted file mode 100644
index b2f24d7d..00000000
Binary files a/src/gui/qt/resources/avatar/The_Marmot.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/William_Holtkamp.png b/src/gui/qt/resources/avatar/William_Holtkamp.png
deleted file mode 100644
index 001b2410..00000000
Binary files a/src/gui/qt/resources/avatar/William_Holtkamp.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/albert_einstein.png b/src/gui/qt/resources/avatar/albert_einstein.png
new file mode 100644
index 00000000..ba8e3ef1
Binary files /dev/null and b/src/gui/qt/resources/avatar/albert_einstein.png differ
diff --git a/src/gui/qt/resources/avatar/clipart1.png b/src/gui/qt/resources/avatar/clipart1.png
new file mode 100644
index 00000000..d7098421
Binary files /dev/null and b/src/gui/qt/resources/avatar/clipart1.png differ
diff --git a/src/gui/qt/resources/avatar/cr.png b/src/gui/qt/resources/avatar/cr.png
deleted file mode 100644
index ee2e34df..00000000
Binary files a/src/gui/qt/resources/avatar/cr.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/dps.png b/src/gui/qt/resources/avatar/dps.png
deleted file mode 100644
index 92af03c8..00000000
Binary files a/src/gui/qt/resources/avatar/dps.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/ellievanhoutte.png b/src/gui/qt/resources/avatar/ellievanhoutte.png
deleted file mode 100644
index ea51b087..00000000
Binary files a/src/gui/qt/resources/avatar/ellievanhoutte.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/goethe.png b/src/gui/qt/resources/avatar/goethe.png
new file mode 100644
index 00000000..b3be73a6
Binary files /dev/null and b/src/gui/qt/resources/avatar/goethe.png differ
diff --git a/src/gui/qt/resources/avatar/jarrodtrainique.png b/src/gui/qt/resources/avatar/jarrodtrainique.png
deleted file mode 100644
index 99035271..00000000
Binary files a/src/gui/qt/resources/avatar/jarrodtrainique.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/joeltelling.png b/src/gui/qt/resources/avatar/joeltelling.png
deleted file mode 100644
index ee1922d8..00000000
Binary files a/src/gui/qt/resources/avatar/joeltelling.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/linus.png b/src/gui/qt/resources/avatar/linus.png
new file mode 100644
index 00000000..3135c773
Binary files /dev/null and b/src/gui/qt/resources/avatar/linus.png differ
diff --git a/src/gui/qt/resources/avatar/loufi.png b/src/gui/qt/resources/avatar/loufi.png
deleted file mode 100644
index 04245585..00000000
Binary files a/src/gui/qt/resources/avatar/loufi.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/marc.png b/src/gui/qt/resources/avatar/marc.png
new file mode 100644
index 00000000..e8b697cf
Binary files /dev/null and b/src/gui/qt/resources/avatar/marc.png differ
diff --git a/src/gui/qt/resources/avatar/mozart.png b/src/gui/qt/resources/avatar/mozart.png
new file mode 100644
index 00000000..330d595a
Binary files /dev/null and b/src/gui/qt/resources/avatar/mozart.png differ
diff --git a/src/gui/qt/resources/avatar/riccardodivirgilio.png b/src/gui/qt/resources/avatar/riccardodivirgilio.png
deleted file mode 100644
index 562a6c17..00000000
Binary files a/src/gui/qt/resources/avatar/riccardodivirgilio.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/riccardodivirgilio1.png b/src/gui/qt/resources/avatar/riccardodivirgilio1.png
deleted file mode 100644
index 97356399..00000000
Binary files a/src/gui/qt/resources/avatar/riccardodivirgilio1.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/rileyroxx.png b/src/gui/qt/resources/avatar/rileyroxx.png
deleted file mode 100644
index afabcb8b..00000000
Binary files a/src/gui/qt/resources/avatar/rileyroxx.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/saidanddone.png b/src/gui/qt/resources/avatar/saidanddone.png
deleted file mode 100644
index bad44e1d..00000000
Binary files a/src/gui/qt/resources/avatar/saidanddone.png and /dev/null differ
diff --git a/src/gui/qt/resources/avatar/scottfeldstein.png b/src/gui/qt/resources/avatar/scottfeldstein.png
deleted file mode 100644
index 2074b73b..00000000
Binary files a/src/gui/qt/resources/avatar/scottfeldstein.png and /dev/null differ
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
index 863fbe97..253a0196 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
@@ -52,29 +52,15 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
 // 	};
 
 	QStringList avatarList;
-	avatarList << ":avatar/resources/avatar/Chales_Johnson.png";
-        avatarList << ":avatar/resources/avatar/Eli_Hodapp.png";
-        avatarList << ":avatar/resources/avatar/Eli_Hodapp1.png";
-        avatarList << ":avatar/resources/avatar/Hans_Dekker.png";
-        avatarList << ":avatar/resources/avatar/Indigo_Goat.png";
-        avatarList << ":avatar/resources/avatar/Jerry_Daykin.png";
-        avatarList << ":avatar/resources/avatar/Presty.png";
-        avatarList << ":avatar/resources/avatar/The_Marmot.png";
-        avatarList << ":avatar/resources/avatar/William_Holtkamp.png";
-        avatarList << ":avatar/resources/avatar/cr.png";
-        avatarList << ":avatar/resources/avatar/dps.png";
-        avatarList << ":avatar/resources/avatar/ellievanhoutte.png";
-        avatarList << ":avatar/resources/avatar/jarrodtrainique.png";
-        avatarList << ":avatar/resources/avatar/joeltelling.png";
-        avatarList << ":avatar/resources/avatar/loufi.png";
-        avatarList << ":avatar/resources/avatar/riccardodivirgilio.png";
-        avatarList << ":avatar/resources/avatar/riccardodivirgilio1.png";
-        avatarList << ":avatar/resources/avatar/rileyroxx.png";
-        avatarList << ":avatar/resources/avatar/saidanddone.png";
-        avatarList << ":avatar/resources/avatar/scottfeldstein.png";
+	avatarList << ":avatar/resources/avatar/albert_einstein.png";
+	avatarList << ":avatar/resources/avatar/goethe.png";
+	avatarList << ":avatar/resources/avatar/linus.png";
+	avatarList << ":avatar/resources/avatar/mozart.png";
+	avatarList << ":avatar/resources/avatar/marc.png";
+	avatarList << ":avatar/resources/avatar/clipart1.png";
 
 	int i;
-	for (i=0; i<20; i++) {
+	for (i=0; i<avatarList.size(); i++) {
 	
 		MyAvatarListItem *myItem = new MyAvatarListItem(listWidget);
 		myItem->setIcon(QIcon(QPixmap(avatarList.at(i)).scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation)));