diff --git a/src/dev/esp32/esp32.cpp b/src/dev/esp32/esp32.cpp
index c3e5dc0c..db5752f0 100644
--- a/src/dev/esp32/esp32.cpp
+++ b/src/dev/esp32/esp32.cpp
@@ -264,7 +264,7 @@ void Esp32Device::get_info(JsonDocument& doc)
     /* ESP Stats */
     buffer = String(get_cpu_frequency());
     buffer += F("MHz");
-    info[F(D_INFO_MODULE)]    = get_chip_model(); // 10ms
+    info[F(D_INFO_MODEL)]     = get_chip_model(); // 10ms
     info[F(D_INFO_FREQUENCY)] = buffer;
 
     info[F(D_INFO_CORE_VERSION)] = get_core_version();
diff --git a/src/hasp/hasp_parser.cpp b/src/hasp/hasp_parser.cpp
index 16d9c849..a1f7057e 100644
--- a/src/hasp/hasp_parser.cpp
+++ b/src/hasp/hasp_parser.cpp
@@ -171,18 +171,18 @@ bool Parser::is_only_digits(const char* s)
 
 int Parser::format_bytes(size_t filesize, char* buf, size_t len)
 {
-    if(filesize < 1024) return snprintf_P(buf, len, PSTR("%d B"), filesize);
+    if(filesize < D_FILE_SIZE_DIVIDER) return snprintf_P(buf, len, PSTR("%d " D_FILE_SIZE_BYTES), filesize);
+    filesize = filesize * 10;
 
-    char labels[] = "kMGT";
-    filesize      = filesize * 10 / 1024; // multiply by 10 for 1 decimal place
-    int unit      = 0;
+    filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 10 for 1 decimal place
+    if(filesize < D_FILE_SIZE_DIVIDER * 10)
+        return snprintf_P(buf, len, PSTR(D_FILE_SIZE_DECIMAL " " D_FILE_SIZE_KILOBYTES), filesize / 10, filesize % 10);
 
-    while(filesize >= 10240 && unit < (sizeof(labels) - 1)) { // it is multiplied by 10
-        unit++;
-        filesize = filesize / 1024;
-    }
+    filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 10 for 1 decimal place
+    if(filesize < D_FILE_SIZE_DIVIDER * 10)
+        return snprintf_P(buf, len, PSTR(D_FILE_SIZE_DECIMAL " " D_FILE_SIZE_MEGABYTES), filesize / 10, filesize % 10);
 
-    return snprintf_P(buf, len, PSTR("%d.%d %ciB"), filesize / 10, filesize % 10, labels[unit]);
+    return snprintf_P(buf, len, PSTR(D_FILE_SIZE_DECIMAL " " D_FILE_SIZE_GIGABYTES), filesize / 10, filesize % 10);
 }
 
 uint8_t Parser::get_action_id(const char* action)
diff --git a/src/lang/en_US.h b/src/lang/en_US.h
index 838621ef..6ef6b58a 100644
--- a/src/lang/en_US.h
+++ b/src/lang/en_US.h
@@ -17,11 +17,16 @@
 #define D_FILE_LOADING "Loading %s"
 #define D_FILE_LOADED "Loaded %s"
 #define D_FILE_LOAD_FAILED "Failed to load %s"
-
 #define D_FILE_SAVING "Saving %s"
 #define D_FILE_SAVED "Saved %s"
 #define D_FILE_SAVE_FAILED "Failed to save %s"
 #define D_FILE_NOT_FOUND "File not found" // new
+#define D_FILE_SIZE_BYTES "bytes"         // new
+#define D_FILE_SIZE_KILOBYTES "KiB"       // new
+#define D_FILE_SIZE_MEGABYTES "MiB"       // new
+#define D_FILE_SIZE_GIGABYTES "GiB"       // new
+#define D_FILE_SIZE_DIVIDER 1024          // new, kibi or kilo bytes
+#define F_FILE_SIZE_DECIMAL "%d.%d"       // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Starting..."
 #define D_SERVICE_STARTED "Started"
diff --git a/src/lang/sp_ES.h b/src/lang/es_ES.h
similarity index 95%
rename from src/lang/sp_ES.h
rename to src/lang/es_ES.h
index 1a3265cf..358dd4bb 100644
--- a/src/lang/sp_ES.h
+++ b/src/lang/es_ES.h
@@ -5,7 +5,7 @@
 #define D_PASSWORD "Contraseña:"
 #define D_SSID "Ssid:"
 #define D_YES "Si" // New
-#define D_NO "No"   // New
+#define D_NO "No"  // New
 
 #define D_ERROR_OUT_OF_MEMORY "Memory llena"
 #define D_ERROR_UNKNOWN "Error desconocido"
@@ -17,11 +17,16 @@
 #define D_FILE_LOADING "Cargando %s"
 #define D_FILE_LOADED "%s cargado"
 #define D_FILE_LOAD_FAILED "No se pudo cargar %s"
-
 #define D_FILE_SAVING "Guardando %s"
 #define D_FILE_SAVED "%s guardado"
 #define D_FILE_SAVE_FAILED "No se pudo guardar %s"
-#define D_FILE_NOT_FOUND "Archivo no encontrado" // new
+#define D_FILE_NOT_FOUND "Archivo no encontrado"
+#define D_FILE_SIZE_BYTES "bytes"   // new
+#define D_FILE_SIZE_KILOBYTES "KiB" // new
+#define D_FILE_SIZE_MEGABYTES "MiB" // new
+#define D_FILE_SIZE_GIGABYTES "GiB" // new
+#define D_FILE_SIZE_DIVIDER 1024    // new, kibi or kilo bytes
+#define F_FILE_SIZE_DECIMAL "%d,%d" // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Inicializando..."
 #define D_SERVICE_STARTED "Inicializado"
@@ -31,7 +36,7 @@
 #define D_SERVICE_CONNECTED "Conectado"
 #define D_SERVICE_DISCONNECTED "Desconectado"
 
-#define D_SETTING_ENABLED "habilitado"   // New
+#define D_SETTING_ENABLED "habilitado"     // New
 #define D_SETTING_DISABLED "Deshabilitado" // New
 
 #define D_NETWORK_IP_ADDRESS_RECEIVED "Se recibió la dirección IP: %s"
diff --git a/src/lang/fr_FR.h b/src/lang/fr_FR.h
index e423e592..c00903e1 100644
--- a/src/lang/fr_FR.h
+++ b/src/lang/fr_FR.h
@@ -17,11 +17,16 @@
 #define D_FILE_LOADING "Charger %s"
 #define D_FILE_LOADED "Chargé %s"
 #define D_FILE_LOAD_FAILED "Échec du chargement %s"
-
 #define D_FILE_SAVING "Enregistrer %s"
 #define D_FILE_SAVED "Enregistré %s"
 #define D_FILE_SAVE_FAILED "Échec de l'enregistrement %s"
 #define D_FILE_NOT_FOUND "Fichier non trouvé"
+#define D_FILE_SIZE_BYTES "octets"
+#define D_FILE_SIZE_KILOBYTES "Kio"
+#define D_FILE_SIZE_MEGABYTES "Mio"
+#define D_FILE_SIZE_GIGABYTES "Gio"
+#define D_FILE_SIZE_DIVIDER 1024    // new, kibi or kilo bytes
+#define F_FILE_SIZE_DECIMAL "%d,%d" // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Démarer..."
 #define D_SERVICE_STARTED "Démaré"
diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h
index e0463bd8..2c923436 100644
--- a/src/lang/hu_HU.h
+++ b/src/lang/hu_HU.h
@@ -18,10 +18,15 @@
 #define D_FILE_LOADED "%s betöltve"
 #define D_FILE_LOAD_FAILED "%s betöltése nem sikerült"
 #define D_FILE_NOT_FOUND "File not found" // new
-
 #define D_FILE_SAVING "%s mentése"
 #define D_FILE_SAVED "%s mentve"
 #define D_FILE_SAVE_FAILED "%s mentése meghiúsult"
+#define D_FILE_SIZE_BYTES "bytes"   // new
+#define D_FILE_SIZE_KILOBYTES "KiB" // new
+#define D_FILE_SIZE_MEGABYTES "MiB" // new
+#define D_FILE_SIZE_GIGABYTES "GiB" // new
+#define D_FILE_SIZE_DIVIDER 1024    // new, kibi or kilo bytes
+#define F_FILE_SIZE_DECIMAL "%d,%d" // new, decimal comma or point
 
 #define D_SERVICE_STARTING "Indítás..."
 #define D_SERVICE_STARTED "Elindítva"
diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h
index f358f1b9..3e25217f 100644
--- a/src/lang/nl_NL.h
+++ b/src/lang/nl_NL.h
@@ -17,11 +17,16 @@
 #define D_FILE_LOADING "%s laden..."
 #define D_FILE_LOADED "%s geladen"
 #define D_FILE_LOAD_FAILED "%s laden mislukt"
-
 #define D_FILE_SAVING "%s bewaren..."
 #define D_FILE_SAVED "%s bewaard"
 #define D_FILE_SAVE_FAILED "%s bewaren mislukt"
-#define D_FILE_NOT_FOUND "Bestand niet gevonden" // new
+#define D_FILE_NOT_FOUND "Bestand niet gevonden"
+#define D_FILE_SIZE_BYTES "bytes"
+#define D_FILE_SIZE_KILOBYTES "KiB"
+#define D_FILE_SIZE_MEGABYTES "MiB"
+#define D_FILE_SIZE_GIGABYTES "GiB"
+#define D_FILE_SIZE_DIVIDER 1024    //  kibi or kilo bytes
+#define F_FILE_SIZE_DECIMAL "%d,%d" //  decimal comma or point
 
 #define D_SETTING_ENABLED "Ingeschakeld"
 #define D_SETTING_DISABLED "Uitgeschakeld"
diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h
index bb5c4196..122f9028 100644
--- a/src/lang/ro_RO.h
+++ b/src/lang/ro_RO.h
@@ -17,11 +17,16 @@
 #define D_FILE_LOADING "Se încarcă %s"
 #define D_FILE_LOADED "S-a încărcat %s"
 #define D_FILE_LOAD_FAILED "Încărcarea %s a eșuat"
-
 #define D_FILE_SAVING "Se salvează %s"
 #define D_FILE_SAVED "S-a salvat %s"
 #define D_FILE_SAVE_FAILED "Salvarea %s a eșuat"
 #define D_FILE_NOT_FOUND "File not found" // new
+#define D_FILE_SIZE_BYTES "bytes"         // new
+#define D_FILE_SIZE_KILOBYTES "KiB"       // new
+#define D_FILE_SIZE_MEGABYTES "MiB"       // new
+#define D_FILE_SIZE_GIGABYTES "GiB"       // new
+#define D_FILE_SIZE_DIVIDER 1024          // new, kibi or kilo bytes
+#define F_FILE_SIZE_DECIMAL "%d,%d"       // new, decimal comma or point
 
 #define D_SETTING_ENABLED "Activ"
 #define D_SETTING_DISABLED "Inactiv"