diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl
index 1b3181ac9..f355bde3c 100644
--- a/admin-dev/themes/default/template/controllers/products/attachments.tpl
+++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl
@@ -52,7 +52,7 @@
 		<label>{l s='File'}</label>
 		<div class="margin-form">
 			<p><input type="file" name="attachment_file" /></p>
-			<p class="preference_description">{l s='Upload a file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE} {l s='MB maximum'})</p>
+			<p class="preference_description">{l s='Upload a file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE|string_format:"%.2f"} {l s='MB max.'})</p>
 		</div>
 		<div class="clear">&nbsp;</div>
 		<div class="margin-form">
diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index f57eb6d80..d1d59c69c 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -41,7 +41,7 @@
 				<div id="progressBarImage" class="progressBarImage"></div>
 				<div id="showCounter" style="display:none;"><span id="imageUpload">0</span><span id="imageTotal">0</span></div>
 					<p class="preference_description" style="clear: both;">
-						{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='kB max.'}
+						{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
 					</p>
 			</td>
 		</tr>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 3ed8cbfd3..b589a1a41 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3306,7 +3306,7 @@ class AdminProductsControllerCore extends AdminController
 
 			$data->assign('token', $this->token);
 			$data->assign('table', $this->table);
-			$data->assign('max_image_size', $this->max_image_size / 1024);
+			$data->assign('max_image_size', $this->max_image_size / 1024 / 1024);
 
 			$data->assign('up_filename', strval(Tools::getValue('virtual_product_filename_attribute')));
 			$data->assign('currency', $this->context->currency);
diff --git a/install-dev/data/theme.sql b/install-dev/data/theme.sql
index 580e43aca..197adac49 100644
--- a/install-dev/data/theme.sql
+++ b/install-dev/data/theme.sql
@@ -7,7 +7,7 @@ UPDATE `PREFIX_configuration` SET value = '4' WHERE name = 'PS_PRODUCTS_ORDER_BY
 UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_DISPLAY_QTIES';
 UPDATE `PREFIX_configuration` SET value = '20' WHERE name = 'PS_NB_DAYS_NEW_PRODUCT';
 UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_BLOCK_CART_AJAX';
-UPDATE `PREFIX_configuration` SET value = '131072' WHERE name = 'PS_PRODUCT_PICTURE_MAX_SIZE';
+UPDATE `PREFIX_configuration` SET value = '8388608' WHERE name = 'PS_PRODUCT_PICTURE_MAX_SIZE';
 UPDATE `PREFIX_configuration` SET value = '64' WHERE name = 'PS_PRODUCT_PICTURE_WIDTH';
 UPDATE `PREFIX_configuration` SET value = '64' WHERE name = 'PS_PRODUCT_PICTURE_HEIGHT';
 UPDATE `PREFIX_configuration` SET value = '3' WHERE name = 'PS_SEARCH_MINWORDLEN';
diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
index ba922bbf2..679430048 100644
--- a/install-dev/data/xml/configuration.xml
+++ b/install-dev/data/xml/configuration.xml
@@ -105,7 +105,7 @@
       <value>3</value>
     </configuration>
     <configuration id="PS_PRODUCT_PICTURE_MAX_SIZE" name="PS_PRODUCT_PICTURE_MAX_SIZE">
-      <value>131072</value>
+      <value>8388608</value>
     </configuration>
     <configuration id="PS_PRODUCT_PICTURE_WIDTH" name="PS_PRODUCT_PICTURE_WIDTH">
       <value>64</value>
@@ -306,7 +306,7 @@
       <value>fr</value>
     </configuration>
     <configuration id="PS_ATTACHMENT_MAXIMUM_SIZE" name="PS_ATTACHMENT_MAXIMUM_SIZE">
-      <value>2</value>
+      <value>8</value>
     </configuration>
     <configuration id="PS_SMARTY_CACHE" name="PS_SMARTY_CACHE">
       <value>1</value>
diff --git a/translations/fr/admin.php b/translations/fr/admin.php
index 572e8767f..512da4d55 100644
--- a/translations/fr/admin.php
+++ b/translations/fr/admin.php
@@ -2468,6 +2468,7 @@ $_LANGADM['AdminProducts2b05e1a0e6c62dbf0018af09ed38f4e0'] = 'Format : YYYY-MM-D
 $_LANGADM['AdminProducts2b89fa14a6da62e13fd505ca5dec4d9f'] = 'Attention : Ce produit n\'existe pas dans cette boutique. Si vous soumettez ce formulaire, ce produit sera disponible pour cette boutique également.';
 $_LANGADM['AdminProducts2ba18b8df558ceaabcc89f3a16772a9b'] = 'Recherche uniquement';
 $_LANGADM['AdminProducts2bb8274755d1ebd33d759a3005bfbcd3'] = 'Prix à l\'unité HT';
+$_LANGADM['AdminProducts2f972dbb48435d9b8087d7e3c22daa09'] = 'Mo max.';
 $_LANGADM['AdminProducts2fbbffeb17347d2d997ea3a61c1ceb73'] = 'Utiliser un produit dans la liste';
 $_LANGADM['AdminProducts3020c78ae45aff9a35b95856af076765'] = 'Entrepôts';
 $_LANGADM['AdminProducts30398718bca5d62f8e76919dffe29308'] = 'Hauteur (du paquet) :';
@@ -2502,7 +2503,6 @@ $_LANGADM['AdminProducts418734e88e64dbe12a62122833c89da7'] = 'Caractères spéci
 $_LANGADM['AdminProducts42d00bc24fd43cfe3e2e30d01f39ee95'] = 'Filtrer par catégorie';
 $_LANGADM['AdminProducts43880cea190f9b18389e53a50ebca906'] = 'associer vos entrepôts avec des transporteurs';
 $_LANGADM['AdminProducts44118d6d6ecd2f24f53ec6393a66baa1'] = 'Nombre de jours durant lesquels le fichier sera accessible par les clients après leur commande';
-$_LANGADM['AdminProducts44192a57b2533a15a4ffeef4a3c40a2e'] = 'mégaoctets maximum';
 $_LANGADM['AdminProducts4492081ca02b059f9e8af4ddaf0f7292'] = 'Pack';
 $_LANGADM['AdminProducts459d8220fb2b8f415cb373fc53832d99'] = 'Vous ne pouvez pas avoir de déclinaisons avec un produit virtuel.';
 $_LANGADM['AdminProducts461900b74731e07320ca79366df3e809'] = 'Image :';
@@ -2596,7 +2596,6 @@ $_LANGADM['AdminProducts8284ae5df53e6e7ffc1f2cc67ae68765'] = 'Référence du fou
 $_LANGADM['AdminProducts82913a5c53d8d818aa69936a630336a3'] = 'Règle de taxe :';
 $_LANGADM['AdminProducts8300b58d12ed9de055d7a727c72ef55a'] = 'Sélectionner votre image :';
 $_LANGADM['AdminProducts8321e79c278ec510f63675c040594892'] = 'Maximum';
-$_LANGADM['AdminProducts839af95e357936503d910adb5ae209a3'] = 'ko max.';
 $_LANGADM['AdminProducts8524de963f07201e5c086830d370797f'] = 'Chargement...';
 $_LANGADM['AdminProducts853fd1651461ce105a2f19272b700f06'] = 'Nouvelle déclinaison';
 $_LANGADM['AdminProducts85f0bf927be7014e2265c4bc96bd50d2'] = '(Europe, Japon)';