diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 4e46feb71..a1501349b 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -59,7 +59,7 @@ class AdminCustomersControllerCore extends AdminController
 		{
 			$gender_file = 'genders/'.$gender->id.'.jpg';
 			if (file_exists(_PS_IMG_DIR_.$gender_file))
-				$genders_icon[$gender->id] = '../'.$gender_file;
+				$genders_icon[$gender->id] = array('src' => '../'.$gender_file, 'alt' => $gender->name);
 			else
 				$genders_icon[$gender->id] = $gender->name;
 			$genders[$gender->id] = $gender->name;
diff --git a/install-dev/data/img/genders/Mr.jpg b/install-dev/data/img/genders/1.jpg
similarity index 100%
rename from install-dev/data/img/genders/Mr.jpg
rename to install-dev/data/img/genders/1.jpg
diff --git a/install-dev/data/img/genders/Miss.jpg b/install-dev/data/img/genders/2.jpg
similarity index 100%
rename from install-dev/data/img/genders/Miss.jpg
rename to install-dev/data/img/genders/2.jpg
diff --git a/install-dev/data/img/genders/Ms.jpg b/install-dev/data/img/genders/3.jpg
similarity index 100%
rename from install-dev/data/img/genders/Ms.jpg
rename to install-dev/data/img/genders/3.jpg
diff --git a/install-dev/fixtures/apple/data/customer.xml b/install-dev/fixtures/apple/data/customer.xml
index c194b8732..4cfb26be1 100644
--- a/install-dev/fixtures/apple/data/customer.xml
+++ b/install-dev/fixtures/apple/data/customer.xml
@@ -19,7 +19,7 @@
     <field name="is_guest"/>
   </fields>
   <entities>
-    <customer id="John" id_gender="4" id_default_group="3" firstname="John" lastname="DOE" passwd="75b019568bc6c84dda367661e855bdc2" last_passwd_gen="2012-02-01 09:08:06" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="b59e02456693eb0903a3645512ac9e1a" active="1" is_guest="0">
+    <customer id="John" id_gender="1" id_default_group="3" firstname="John" lastname="DOE" passwd="75b019568bc6c84dda367661e855bdc2" last_passwd_gen="2012-02-01 09:08:06" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="b59e02456693eb0903a3645512ac9e1a" active="1" is_guest="0">
       <email>pub@prestashop.com</email>
       <note/>
     </customer>
diff --git a/install-dev/upgrade/php/add_unknown_gender.php b/install-dev/upgrade/php/add_unknown_gender.php
index 0d30d25e5..3a66f3a29 100644
--- a/install-dev/upgrade/php/add_unknown_gender.php
+++ b/install-dev/upgrade/php/add_unknown_gender.php
@@ -40,16 +40,16 @@ function add_unknown_gender()
 	// inserts lang values
 	$languages = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'lang`');
 	$lang_names = array(
-		1 => 'Unknown',
-		2 => 'Unbekannte',
-		3 => 'Desconocido',
-		4 => 'Inconnu',
-		5 => 'Sconosciuto',
+		'en' => 'Unknown',
+		'de' => 'Unbekannte',
+		'es' => 'Desconocido',
+		'fr' => 'Inconnu',
+		'it' => 'Sconosciuto',
 	);
 
 	foreach ($languages as $lang)
 	{
-		$name = (isset($lang_names[$lang['id_lang']]) ? $lang_names[$lang['id_lang']] : 'Unknown');
+		$name = (isset($lang_names[$lang['iso_code']]) ? $lang_names[$lang['iso_code']] : 'Unknown');
 		$res &= Db::getInstance()->execute('
 			INSERT INTO `'._DB_PREFIX_.'gender_lang` (`id_gender`, `id_lang`, `name`) VALUES
 				('.(int)$id_gender.', '.(int)$lang['id_lang'].', \''.pSQL($name).'\')');