diff --git a/data/gfx/avatars/default/goethe.png b/data/gfx/avatars/default/0c04318e6fa54534935e3e6cfe12c4a1.png
similarity index 100%
rename from data/gfx/avatars/default/goethe.png
rename to data/gfx/avatars/default/0c04318e6fa54534935e3e6cfe12c4a1.png
diff --git a/data/gfx/avatars/default/clipart1.png b/data/gfx/avatars/default/0c24b06358f7b308d6b47c59ebace73d.png
similarity index 100%
rename from data/gfx/avatars/default/clipart1.png
rename to data/gfx/avatars/default/0c24b06358f7b308d6b47c59ebace73d.png
diff --git a/data/gfx/avatars/default/mozart.png b/data/gfx/avatars/default/14e3f39cc775608bcecf5597248b3558.png
similarity index 100%
rename from data/gfx/avatars/default/mozart.png
rename to data/gfx/avatars/default/14e3f39cc775608bcecf5597248b3558.png
diff --git a/data/gfx/avatars/default/James_Watt.png b/data/gfx/avatars/default/16b702a87f681c4343486523a1a867e8.png
similarity index 100%
rename from data/gfx/avatars/default/James_Watt.png
rename to data/gfx/avatars/default/16b702a87f681c4343486523a1a867e8.png
diff --git a/data/gfx/avatars/default/George_Washington.png b/data/gfx/avatars/default/237c518f2bb6ac99f6eb1012e18460b9.png
similarity index 100%
rename from data/gfx/avatars/default/George_Washington.png
rename to data/gfx/avatars/default/237c518f2bb6ac99f6eb1012e18460b9.png
diff --git a/data/gfx/avatars/default/albert_einstein.png b/data/gfx/avatars/default/45e16bc214942321a3814fb43a84a88e.png
similarity index 100%
rename from data/gfx/avatars/default/albert_einstein.png
rename to data/gfx/avatars/default/45e16bc214942321a3814fb43a84a88e.png
diff --git a/data/gfx/avatars/default/Catherine_russia.png b/data/gfx/avatars/default/490ed3a748f6f4d6c261436198f2368f.png
similarity index 100%
rename from data/gfx/avatars/default/Catherine_russia.png
rename to data/gfx/avatars/default/490ed3a748f6f4d6c261436198f2368f.png
diff --git a/data/gfx/avatars/default/felix.png b/data/gfx/avatars/default/6ad16e2c3e4b8e4e6da47032d4372f4b.png
similarity index 100%
rename from data/gfx/avatars/default/felix.png
rename to data/gfx/avatars/default/6ad16e2c3e4b8e4e6da47032d4372f4b.png
diff --git a/data/gfx/avatars/default/linus.png b/data/gfx/avatars/default/6ecea83d9fac6b4cae97e2fccd09a5f6.png
similarity index 100%
rename from data/gfx/avatars/default/linus.png
rename to data/gfx/avatars/default/6ecea83d9fac6b4cae97e2fccd09a5f6.png
diff --git a/data/gfx/avatars/default/benedikt.png b/data/gfx/avatars/default/74672ebfa2ab02968386c4e441a08668.png
similarity index 100%
rename from data/gfx/avatars/default/benedikt.png
rename to data/gfx/avatars/default/74672ebfa2ab02968386c4e441a08668.png
diff --git a/data/gfx/avatars/default/viktoria.png b/data/gfx/avatars/default/93dec21823a314fb8ef2261b7aa75ae5.png
similarity index 100%
rename from data/gfx/avatars/default/viktoria.png
rename to data/gfx/avatars/default/93dec21823a314fb8ef2261b7aa75ae5.png
diff --git a/data/gfx/avatars/default/Mona_Lisa.png b/data/gfx/avatars/default/95df673e5ee4d02f0f95d5c7ff091cfb.png
similarity index 100%
rename from data/gfx/avatars/default/Mona_Lisa.png
rename to data/gfx/avatars/default/95df673e5ee4d02f0f95d5c7ff091cfb.png
diff --git a/data/gfx/avatars/default/Louis_XIV.png b/data/gfx/avatars/default/9f49fc3d6062ddc08dc6bbd9ef9b399d.png
similarity index 100%
rename from data/gfx/avatars/default/Louis_XIV.png
rename to data/gfx/avatars/default/9f49fc3d6062ddc08dc6bbd9ef9b399d.png
diff --git a/data/gfx/avatars/default/Martin_Luther_King.png b/data/gfx/avatars/default/bc28d08c451a775f9e332c14a397096b.png
similarity index 100%
rename from data/gfx/avatars/default/Martin_Luther_King.png
rename to data/gfx/avatars/default/bc28d08c451a775f9e332c14a397096b.png
diff --git a/data/gfx/avatars/default/Sissi.png b/data/gfx/avatars/default/bed234c6672d512bdb4c2768f0b3f90c.png
similarity index 100%
rename from data/gfx/avatars/default/Sissi.png
rename to data/gfx/avatars/default/bed234c6672d512bdb4c2768f0b3f90c.png
diff --git a/data/gfx/avatars/default/lotodore.png b/data/gfx/avatars/default/c018b15b8164a303b9395b1e89c51004.png
similarity index 100%
rename from data/gfx/avatars/default/lotodore.png
rename to data/gfx/avatars/default/c018b15b8164a303b9395b1e89c51004.png
diff --git a/data/gfx/avatars/default/PopeInnocentX.png b/data/gfx/avatars/default/cbd2e0c6ee579fb8e0f3942639cf988d.png
similarity index 100%
rename from data/gfx/avatars/default/PopeInnocentX.png
rename to data/gfx/avatars/default/cbd2e0c6ee579fb8e0f3942639cf988d.png
diff --git a/data/gfx/avatars/default/bach.png b/data/gfx/avatars/default/d21268e1d2ec969367ee5b54bd34738b.png
similarity index 100%
rename from data/gfx/avatars/default/bach.png
rename to data/gfx/avatars/default/d21268e1d2ec969367ee5b54bd34738b.png
diff --git a/data/gfx/avatars/default/Pope_Clement_VII.png b/data/gfx/avatars/default/d66940c138c207c68a338769d683e691.png
similarity index 100%
rename from data/gfx/avatars/default/Pope_Clement_VII.png
rename to data/gfx/avatars/default/d66940c138c207c68a338769d683e691.png
diff --git a/data/gfx/avatars/default/Columbus.png b/data/gfx/avatars/default/d6f8a45e9243b7e7e4e2c8e41df1c9f5.png
similarity index 100%
rename from data/gfx/avatars/default/Columbus.png
rename to data/gfx/avatars/default/d6f8a45e9243b7e7e4e2c8e41df1c9f5.png
diff --git a/data/gfx/avatars/default/marc.png b/data/gfx/avatars/default/d90bd3fbbe3671ebac5f9f223d0c6d65.png
similarity index 100%
rename from data/gfx/avatars/default/marc.png
rename to data/gfx/avatars/default/d90bd3fbbe3671ebac5f9f223d0c6d65.png
diff --git a/data/gfx/avatars/default/florian.png b/data/gfx/avatars/default/da34195981d255656f39c05481de3b6a.png
similarity index 100%
rename from data/gfx/avatars/default/florian.png
rename to data/gfx/avatars/default/da34195981d255656f39c05481de3b6a.png
diff --git a/data/gfx/avatars/default/Elisabeth1.png b/data/gfx/avatars/default/e3e1ae15f7d808fce16c26c049e2cbe9.png
similarity index 100%
rename from data/gfx/avatars/default/Elisabeth1.png
rename to data/gfx/avatars/default/e3e1ae15f7d808fce16c26c049e2cbe9.png
diff --git a/data/gfx/avatars/default/Kapitan.png b/data/gfx/avatars/default/e54e67ebd5265cf549362a2cda5a999c.png
similarity index 100%
rename from data/gfx/avatars/default/Kapitan.png
rename to data/gfx/avatars/default/e54e67ebd5265cf549362a2cda5a999c.png
diff --git a/data/gfx/avatars/default/Napoleon.png b/data/gfx/avatars/default/ef0975f38a367a45cb8042b438957304.png
similarity index 100%
rename from data/gfx/avatars/default/Napoleon.png
rename to data/gfx/avatars/default/ef0975f38a367a45cb8042b438957304.png
diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp
index 86be6b74..498e2133 100644
--- a/src/core/common/avatarmanager.cpp
+++ b/src/core/common/avatarmanager.cpp
@@ -42,7 +42,7 @@ AvatarManager::Init(const std::string &dataDir, const std::string &cacheDir)
 	bool retVal = false;
 	try
 	{
-		InternalReadDirectory(dataDir);
+		InternalReadDirectory(dataDir + "gfx/avatars/default/");
 		InternalReadDirectory(cacheDir);
 		m_cacheDir = cacheDir;
 		retVal = true;
diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
index 2760a4e7..1a0dd380 100644
--- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
@@ -56,31 +56,31 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
 
 	QStringList avatarList;
 
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Mona_Lisa.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Catherine_russia.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Elisabeth1.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/George_Washington.png";	
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Louis_XIV.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Sissi.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Columbus.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Napoleon.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Martin_Luther_King.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/PopeInnocentX.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Pope_Clement_VII.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/James_Watt.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/albert_einstein.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/bach.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/mozart.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/goethe.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/linus.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/marc.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/viktoria.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/benedikt.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/Kapitan.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/florian.png";	
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/felix.png";
-	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/lotodore.png";
-        avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/clipart1.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/95df673e5ee4d02f0f95d5c7ff091cfb.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/490ed3a748f6f4d6c261436198f2368f.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/e3e1ae15f7d808fce16c26c049e2cbe9.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/237c518f2bb6ac99f6eb1012e18460b9.png";	
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/9f49fc3d6062ddc08dc6bbd9ef9b399d.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/bed234c6672d512bdb4c2768f0b3f90c.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/d6f8a45e9243b7e7e4e2c8e41df1c9f5.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/ef0975f38a367a45cb8042b438957304.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/bc28d08c451a775f9e332c14a397096b.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/cbd2e0c6ee579fb8e0f3942639cf988d.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/d66940c138c207c68a338769d683e691.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/16b702a87f681c4343486523a1a867e8.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/45e16bc214942321a3814fb43a84a88e.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/d21268e1d2ec969367ee5b54bd34738b.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/14e3f39cc775608bcecf5597248b3558.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/0c04318e6fa54534935e3e6cfe12c4a1.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/6ecea83d9fac6b4cae97e2fccd09a5f6.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/d90bd3fbbe3671ebac5f9f223d0c6d65.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/93dec21823a314fb8ef2261b7aa75ae5.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/74672ebfa2ab02968386c4e441a08668.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/e54e67ebd5265cf549362a2cda5a999c.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/da34195981d255656f39c05481de3b6a.png";	
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/6ad16e2c3e4b8e4e6da47032d4372f4b.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/c018b15b8164a303b9395b1e89c51004.png";
+	avatarList << myQtHelper->getDataPath() +"gfx/avatars/default/0c24b06358f7b308d6b47c59ebace73d.png";
 	
 	int i;
 	for (i=0; i<avatarList.size(); i++) {
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 8f14e3e0..e4581c6f 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -111,6 +111,7 @@ int main( int argc, char **argv )
 	boost::shared_ptr<GuiInterface> myGuiInterface(new GuiWrapper(myConfig));
 	{
 		boost::shared_ptr<Session> session(new Session(myGuiInterface.get(), myConfig));
+		session->init(); // TODO handle error
 		myGuiInterface->setSession(session);
 	}
 
diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp
index 40141c75..93b5dcb6 100644
--- a/src/pokerth_server.cpp
+++ b/src/pokerth_server.cpp
@@ -88,6 +88,7 @@ main(int argc, char *argv[])
 	boost::shared_ptr<GuiInterface> myServerGuiInterface(new ServerGuiWrapper(myConfig, NULL, NULL));
 	{
 		boost::shared_ptr<Session> session(new Session(myServerGuiInterface.get(), myConfig));
+		session->init(); // TODO handle error
 		myServerGuiInterface->setSession(session);
 	}
 
diff --git a/src/session.cpp b/src/session.cpp
index e244a7f3..b77f20e5 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -51,6 +51,10 @@ Session::~Session()
 	myConfig = 0;
 }
 
+bool Session::init()
+{
+	return myAvatarManager->Init(myConfig->readConfigString("AppDataDir"), myConfig->readConfigString("CacheDir"));
+}
 
 void Session::startLocalGame(const GameData &gameData, const StartData &startData) {
 
diff --git a/src/session.h b/src/session.h
index f11a59b7..3bc9e60f 100755
--- a/src/session.h
+++ b/src/session.h
@@ -39,6 +39,8 @@ public:
 
 	~Session();
 
+	bool init();
+
 	void startLocalGame(const GameData &gameData, const StartData &startData);
 	void startClientGame(boost::shared_ptr<Game> game);