diff --git a/admin/intro.php b/admin/intro.php
index cfb362600..740d088ed 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -154,7 +154,7 @@ $template->assign(
     'NB_RATES' => $nb_rates,
     'NB_VIEWS' => number_format_human_readable($nb_views),
     'NB_PLUGINS' => count($pwg_loaded_plugins),
-    'STORAGE_USED' => l10n('%sGB', number_format($du_gb, $du_decimals)),
+    'STORAGE_USED' => str_replace(' ', ' ', l10n('%sGB', number_format($du_gb, $du_decimals))),
     'U_QUICK_SYNC' => PHPWG_ROOT_PATH.'admin.php?page=site_update&site=1&quick_sync=1&pwg_token='.get_pwg_token(),
     'CHECK_FOR_UPDATES' => $conf['dashboard_check_for_updates'],
     )
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index 63d788adb..d12ea5912 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -7,6 +7,8 @@ var piwigo_need_update_msg = '<a href="admin.php?page=updates">{'A new version o
 var ext_need_update_msg = '<a href="admin.php?page=updates&amp;tab=ext">{'Some upgrades are available for extensions.'|@translate|@escape:"javascript"} <i class="icon-right"></i></a>';
 const str_gb_used = "{'%s GB used'|translate}";
 const str_mb_used = "{'%s MB used'|translate}";
+const str_gb = "{'%sGB'|translate}".replace(' ', '&nbsp;');
+const str_mb = "{'%sMB'|translate}".replace(' ', '&nbsp;');
 const storage_total = {$STORAGE_TOTAL};
 {literal}
 jQuery().ready(function(){
@@ -80,9 +82,9 @@ let str_size = "";
 {/literal}
 {foreach from=$STORAGE_CHART_DATA key=type item=value}
   size = {$value};
-  str_size_type = size > 1000000 ? "GB" : "MB";
+  str_size_type_string = size > 1000000 ? str_gb : str_mb;
   size_nb = size > 1000000 ? (size / 1000000).toFixed(2) : (size / 1000).toFixed(0);
-  str_size = " : " + size_nb.toString() + " " + str_size_type;
+  str_size = " : " + str_size_type_string.replace("%s", size_nb);
   $("#storage-{$type}").html("<b></b>" + str_size);
   $("#storage-{$type} b").html("{$type|translate}");
 {/foreach}
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index df858675f..d87e92267 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -985,6 +985,8 @@ $lang['Deletion in progress'] = 'Deletion in progress';
 $lang['checksum'] = 'checksum';
 $lang['orphans to delete'] = 'orphans to delete';
 $lang['Dashboard'] = 'Dashboard';
+$lang['%sGB'] = '%s GB';
+$lang['%sMB'] = '%s MB';
 $lang['Storage used'] = 'Storage used';
 $lang['First photo added'] = 'First photo added';
 $lang['No filter on album. Select one or type to search'] = 'No filter on album. Select one or type to search';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 9dc687e82..cf2b63634 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -985,6 +985,8 @@ $lang['Confirm deletion'] = 'Confirmer la suppression';
 $lang['checksum'] = 'somme de contrôle';
 $lang['orphans to delete'] = 'orphelines à supprimer';
 $lang['Dashboard'] = 'Tableau de bord';
+$lang['%sGB'] = '%s Go';
+$lang['%sMB'] = '%s Mo';
 $lang['Storage used'] = 'Stockage utilisé';
 $lang['First photo added'] = 'Première photo';
 $lang['No filter on album. Select one or type to search'] = 'Aucun filtre. Tapez ici pour chercher un album.';
@@ -1074,8 +1076,8 @@ $lang['Are you sure you want to update all extensions?'] = 'Êtes-vous sûr de v
 $lang['Are you sure you want to delete the user "%s"?'] = 'Êtes-vous sûr de vouloir supprimer l\'utilisateur "%s"&nbsp?';
 $lang['Please upgrade your PHP version before any update.'] = 'Il faudra mettre à jour votre PHP avant de pouvoir mettre à jour Piwigo.';
 $lang['Requires PHP %s'] = 'Requiert PHP %s';
-$lang['%s MB used'] = '%s MB utilisés';
-$lang['%s GB used'] = '%s GB utilisés';
+$lang['%s MB used'] = '%s Mo utilisés';
+$lang['%s GB used'] = '%s Go utilisés';
 $lang['Manage users'] = 'Gérer les utilisateurs';
 $lang['between %s and %s'] = 'entre %s et %s';
 $lang['Edit guest user'] = 'Editer l\'utilisateur invité';