diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index 7980d5112e..0796d72829 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -4792,12 +4792,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user: 
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Буфер: %d.%03dMB"
-    player: "Буф: %d.%03dMB"
+    *: "Буфер:"
+    player: "Буф:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 2b582371b1..d2ccf1af88 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -9295,12 +9295,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user: 
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "缓冲: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "缓冲:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "缓冲大小"
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 3ecb7a7bd8..deecacbcb0 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -9296,12 +9296,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "緩沖: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "緩沖:"
+    player: "Buf:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index d63d824803..8ce7abd2be 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -6843,12 +6843,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Vyrovnávací paměť"
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 5c3ad92d40..bc5bc3dfc0 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -10511,12 +10511,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMiB"
-    player: "Buf: %d.%03dMiB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer størrelse"
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 0af57572af..c9fbc03040 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -6863,12 +6863,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Puffer: %d.%03dMB"
-    player: "Puf: %d.%03dMB"
+    *: "Puffer:"
+    player: "Puf:"
   </dest>
   <voice>
     *: "Puffergröße"
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index b8f4ba81ad..b81d2343a6 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -6894,12 +6894,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 53a904bd19..6d002d89be 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -9878,12 +9878,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Tamaño de bufer"
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 2a2c08fe89..db90567f2a 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -10439,12 +10439,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Puskuri: %d.%03dMt"
-    player: "Puskuri: %d.%03dMt"
+    *: "Puskuri:"
+    player: "Puskuri:"
   </dest>
   <voice>
     *: "Puskurin koko"
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 7a2050036d..0e2a264b8d 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -6867,12 +6867,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Tampon: %d.%03dMB"
-    player: "Tamp.: %d.%03dMB"
+    *: "Tampon:"
+    player: "Tamp.:"
   </dest>
   <voice>
     *: "Tampon"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 2e094b64eb..20abea102d 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -6819,12 +6819,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Μνήμη: %d.%03dMB"
-    player: "Μνη: %d.%03dMB"
+    *: "Μνήμη:"
+    player: "Μνη:"
   </dest>
   <voice>
     *: "Μέγεθος μνήμης"
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 3337670f94..9957a5be9d 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -10506,12 +10506,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "חוצץ: %d.%03dMB"
-    player: "חצץ: %d.%03dMB"
+    *: "חוצץ:"
+    player: "חצץ:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 860c0b5c07..9123914469 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -10486,12 +10486,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Dimensione buffer"
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 2ea59b898d..ca23d8d326 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -6699,12 +6699,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "バッファ: %d.%03dMB"
-    player: "バッファ: %d.%03dMB"
+    *: "バッファ:"
+    player: "バッファ:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index a38e0b3abe..36998a0880 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -6810,12 +6810,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Puffer: %d.%03dMB"
-    player: "Puf: %d.%03dMB"
+    *: "Puffer:"
+    player: "Puf:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 9e69ba1479..1c0d1eef28 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -10470,12 +10470,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 03bc207839..5da534a8a1 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -9933,12 +9933,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 07494dc12e..fd97c37d82 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -10451,12 +10451,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Bufferstørrelse"
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 76251c6d8c..006adbeeb5 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -10082,12 +10082,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user: 
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Bufor: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Bufor:"
+    player: "Buf:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 7eda2450e0..c1b623e5f1 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -6817,12 +6817,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Tamanho do buffer"
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 4061b5dfdb..863c80b150 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -5033,12 +5033,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user: 
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index c292672669..9f5ac71c44 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -8829,16 +8829,16 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Буфер: %d.%03dМб"
-    player: "Буф: %d.%03dМб"
+    *: "Буфер:"
+    player: "Буф:"
   </dest>
   <voice>
-    *: "Буфер: %d.%03dМб"
-    player: "Буф: %d.%03dМб"
+    *: "Буфер:"
+    player: "Буф:"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 6b2c114d6d..52d346ff51 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -6861,12 +6861,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Бафер: %d.%03dMБ"
-    player: "Buf: %d.%03dMB"
+    *: "Бафер:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Величина бафера"
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 252476efcd..ce40700365 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -6827,12 +6827,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffert: %d.%03d MB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffert:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffertstorlek"
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 30fcf186bb..7a4db6482d 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -7694,12 +7694,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 2b07f1c283..62d62f3066 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -6844,12 +6844,12 @@
   desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    *: "Buffer:"
+    player: "Buf:"
   </source>
   <dest>
-    *: "บัฟเฟอร์: %d.%03dMB"
-    player: "บัฟเฟอร์: %d.%03dMB"
+    *: "บัฟเฟอร์:"
+    player: "บัฟเฟอร์:"
   </dest>
   <voice>
     *: ""
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index c77e9a7d16..2f3b63fd6c 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -220,11 +220,9 @@ static char* info_getname(int selected_item, void *data,
 #endif
         case INFO_BUFFER: /* buffer */
         {
-            long buflen = ((audiobufend - audiobuf) * 2) / 2097;  /* avoid overflow */
-            int integer = buflen / 1000;
-            int decimal = buflen % 1000;
-            snprintf(buffer, buffer_len, (char *)str(LANG_BUFFER_STAT),
-                     integer, decimal);
+            long kib = (audiobufend - audiobuf) / 1024; /* to KiB */
+            output_dyn_value(s1, sizeof(s1), kib, kbyte_units, true);
+            snprintf(buffer, buffer_len, "%s %s", str(LANG_BUFFER_STAT), s1);
         }
         break;
         case INFO_BATTERY: /* battery */
@@ -332,8 +330,8 @@ static int info_speak_item(int selected_item, void * data)
         case INFO_BUFFER: /* buffer */
         {
             talk_id(LANG_BUFFER_STAT, false);
-            long buflen = ((audiobufend - audiobuf) * 2) / 2097;  /* avoid overflow */
-            output_dyn_value(NULL, 0, buflen, kbyte_units, true);
+            long kib = (audiobufend - audiobuf) / 1024; /* to KiB */
+            output_dyn_value(NULL, 0, kib, kbyte_units, true);
             break;
         }
         case INFO_BATTERY: /* battery */