diff --git a/application/core/Players/PlayerDetailed.php b/application/core/Players/PlayerDetailed.php
index aba4fbe4..4b9ab3b0 100644
--- a/application/core/Players/PlayerDetailed.php
+++ b/application/core/Players/PlayerDetailed.php
@@ -69,8 +69,7 @@ class PlayerDetailed {
 		//Nation Quad
 		$countryQuad = new Quad();
 		$frame->add($countryQuad);
-		$countryCode = Formatter::mapCountry($target->getCountry());
-		$countryQuad->setImage("file://Skins/Avatars/Flags/{$countryCode}.dds");
+		$countryQuad->setImage("file://ZoneFlags/Login/{$targetLogin}/country");
 		$countryQuad->setPosition(-$this->width / 2 + 10, $y);
 		$countryQuad->setSize(5, 5);
 		$countryQuad->setZ(-0.1);
@@ -188,7 +187,7 @@ class PlayerDetailed {
 
 		$quad = new Quad();
 		$frame->add($quad);
-		$quad->setImage('file://' . $target->avatar);
+		$quad->setImage('file://Avatars/' . $targetLogin . "/default");
 		$quad->setPosition(-$this->width / 2 + 50, -$this->height / 2 + 34);
 		$quad->setAlign(Control::RIGHT, Control::TOP);
 		$quad->setSize(20, 20);
diff --git a/application/core/Players/PlayerList.php b/application/core/Players/PlayerList.php
index 73ef1494..369c73e7 100644
--- a/application/core/Players/PlayerList.php
+++ b/application/core/Players/PlayerList.php
@@ -213,8 +213,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
 				// Nation Quad
 				$countryQuad = new Quad();
 				$playerFrame->add($countryQuad);
-				$countryCode = Formatter::mapCountry($listPlayer->getCountry());
-				$countryQuad->setImage("file://Skins/Avatars/Flags/{$countryCode}.dds");
+				$countryQuad->setImage("file://ZoneFlags/Login/{$listPlayer->login}/country");
 				$countryQuad->setX($x + 98);
 				$countryQuad->setSize(4, 4);
 				$countryQuad->setZ(1);