diff --git a/app/src/main/java/net/i2p/android/router/service/RouterService.java b/app/src/main/java/net/i2p/android/router/service/RouterService.java
index 638c9c35e..ad25adcba 100644
--- a/app/src/main/java/net/i2p/android/router/service/RouterService.java
+++ b/app/src/main/java/net/i2p/android/router/service/RouterService.java
@@ -26,7 +26,6 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.RouterLaunch;
 
 import java.lang.ref.WeakReference;
-import java.text.DecimalFormat;
 
 /**
  * Runs the router
@@ -260,26 +259,16 @@ public class RouterService extends Service {
         int inCl = ctx.tunnelManager().getInboundClientTunnelCount();
         int outCl = ctx.tunnelManager().getOutboundClientTunnelCount();
         String uptime = DataHelper.formatDuration(ctx.router().getUptime());
-        double inBW = ctx.bandwidthLimiter().getReceiveBps() / 1024;
-        double outBW = ctx.bandwidthLimiter().getSendBps() / 1024;
-        // control total width
-        DecimalFormat fmt;
-        if(inBW >= 1000 || outBW >= 1000) {
-            fmt = new DecimalFormat("#0");
-        } else if(inBW >= 100 || outBW >= 100) {
-            fmt = new DecimalFormat("#0.0");
-        } else {
-            fmt = new DecimalFormat("#0.00");
-        }
+        double inBW = ctx.bandwidthLimiter().getReceiveBps();
+        double outBW = ctx.bandwidthLimiter().getSendBps();
 
         String text =
                 getResources().getString(R.string.notification_status_text,
                         Util.formatSize(inBW), Util.formatSize(outBW));
 
-        // TODO change string resource after 0.9.20 to use Util.formatSize()
         String bigText =
                 getResources().getString(R.string.notification_status_bw,
-                        fmt.format(inBW), fmt.format(outBW)) + '\n'
+                        Util.formatSize(inBW), Util.formatSize(outBW)) + '\n'
                 + getResources().getString(R.string.notification_status_peers,
                         active, known) + '\n'
                 + getResources().getString(R.string.notification_status_expl,
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index a9901c679..e5e006371 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -99,7 +99,6 @@
   <string name="notification_status_stopping_after_net">Xarxa desconnectada, aturant I2P</string>
   <string name="notification_status_shutdown_cancelled">Aturada cancel·lada</string>
   <string name="notification_status_shutting_down">S\'està aturant I2P</string>
-  <string name="notification_status_bw">Ample de banda: %1$s KBps baixada / %2$s KBps pujada</string>
   <string name="notification_status_peers">Iguals: %1$d actius, %2$d coneguts</string>
   <string name="notification_status_expl">Túnels d\'exploració: %1$d/%2$d</string>
   <string name="notification_status_client">Túnels de clients: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5f2c9cab2..ebf7d336e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">Netzwerk getrennt, I2P wird gestoppt</string>
   <string name="notification_status_shutdown_cancelled">Herunterfahren abgebrochen</string>
   <string name="notification_status_shutting_down">I2P fährt herunter</string>
-  <string name="notification_status_bw">Bandbreite: %1$s KB/s eingehend / %2$s KB/s ausgehend</string>
   <string name="notification_status_peers">Teilnehmer: %1$d aktiv, %2$d bekannt</string>
   <string name="notification_status_expl">Erkundungstunnel: %1$d/%2$d</string>
   <string name="notification_status_client">Kliententunnel: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d850cfe87..d9425583c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">Red desconectada, deteniendo I2P</string>
   <string name="notification_status_shutdown_cancelled">Cierre cancelado</string>
   <string name="notification_status_shutting_down">I2P se está cerrando</string>
-  <string name="notification_status_bw">Ancho de banda: %1$s KBps bajada / %2$s KBps subida</string>
   <string name="notification_status_peers">Pares: %1$d activos, %2$d conocidos</string>
   <string name="notification_status_expl">Túneles exploratorios: %1$d/%2$d</string>
   <string name="notification_status_client">Túneles de cliente: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3367a0893..ae2aa28a6 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -82,7 +82,6 @@
   <string name="notification_status_stopping_after_net">Verkkoyhteys katkesi, pysäytetään I2P</string>
   <string name="notification_status_shutdown_cancelled">Sulkeminen peruttu</string>
   <string name="notification_status_shutting_down">I2P on sulkeutumassa</string>
-  <string name="notification_status_bw">Kaistanleveys: %1$s kilotavua/s alaspäin / %2$s kilotavua/s ylöspäin</string>
   <string name="notification_status_peers">Vertaisverkkovastaanottajaa: %1$d aktiivista, %2$d tunnettua</string>
   <string name="notification_status_client">Asiakastunnelit: %1$d/%2$d</string>
   <string name="menu_settings">Asetukset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ad384201f..14e6b267f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">Réseau déconnecté, arrêt d\'I2P</string>
   <string name="notification_status_shutdown_cancelled">Arrêt annulé</string>
   <string name="notification_status_shutting_down">I2P est en cours d\'arrêt</string>
-  <string name="notification_status_bw">Bande passante : %1$s KBps down / %2$s KBps up</string>
   <string name="notification_status_peers">Pairs : %1$d actifs, %2$d connus</string>
   <string name="notification_status_expl">Tunnels exploratoires : %1$d/%2$d</string>
   <string name="notification_status_client">Tunnels client : %1$d/%2$d</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 041048fc3..cf5d43c8f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">Disconnesso da internet, I2P in spegnimento</string>
   <string name="notification_status_shutdown_cancelled">Spegnimento cancellato</string>
   <string name="notification_status_shutting_down">I2P si sta spegnendo</string>
-  <string name="notification_status_bw">Banda: %1$s KBps ricezione / %2$s KBps invio</string>
   <string name="notification_status_peers">Peer: %1$d attivo, %2$d conosciuto</string>
   <string name="notification_status_expl">Tunnel d\'esplorazione: %1$d/%2$d</string>
   <string name="notification_status_client">Tunnel del client : %1$d/%2$d</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d9bf9d425..1a9ba6087 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -51,7 +51,6 @@
   <string name="configure_graphs">グラフ設定</string>
   <string name="netdb_routers_empty">NetDB にルーターがありません。</string>
   <string name="netdb_leases_empty">NetDB にリースセットがありません。</string>
-  <string name="notification_status_bw">帯域幅: %1$s KBps 下方向 / %2$s KBps 上方向</string>
   <string name="notification_status_peers">ピア: %1$d アクティブ、 %2$d 既知</string>
   <string name="notification_status_expl">予備トンネル: %1$d/%2$d</string>
   <string name="notification_status_client">クライアントトンネル: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a99359aac..53295ce6f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">네트워크 끊김, I2P 멈추는 중</string>
   <string name="notification_status_shutdown_cancelled">종료 취소됨</string>
   <string name="notification_status_shutting_down">I2P 종료 중</string>
-  <string name="notification_status_bw">대역폭: %1$s KBps 다운 / %2$s KBps 업로드</string>
   <string name="notification_status_peers">피어들: %1$d 활성, %2$d 알려짐</string>
   <string name="notification_status_expl">예비 터널들: %1$d/%2$d</string>
   <string name="notification_status_client">클라이언트 터널들: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index c0f4ae001..01a2ea80d 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -51,7 +51,6 @@
   <string name="configure_graphs">Konfigurer grafer</string>
   <string name="netdb_routers_empty">Ingen rutere i din NetDB</string>
   <string name="netdb_leases_empty">Ingen LeaseSets i din NetDB.</string>
-  <string name="notification_status_bw">Båndbredde: %1$s KBps ned / %2$s KBps opp</string>
   <string name="notification_status_peers">Likemenn: %1$d aktive, %2$d kjente</string>
   <string name="notification_status_expl">Utforsknings-tunneler: %1$d/%2$d</string>
   <string name="notification_status_client">Klient-tunneler: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 70b511840..472cadab5 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -106,7 +106,6 @@
   <string name="notification_status_stopping_after_net">Netwerk verbroken, I2P wordt gestopt</string>
   <string name="notification_status_shutdown_cancelled">Afsluiten geannuleerd</string>
   <string name="notification_status_shutting_down">I2P is aan het afsluiten</string>
-  <string name="notification_status_bw">Bandbreedte: %1$s KBps down / %2$s KBps up</string>
   <string name="notification_status_peers">Peers: %1$d actief, %2$d bekend</string>
   <string name="notification_status_expl">Verkennende tunnels: %1$d/%2$d</string>
   <string name="notification_status_client">Cliënttunnels: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1f302a17b..65acf3d1e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -103,7 +103,6 @@
   <string name="notification_status_stopping_after_net">Sieć rozłączona, zatrzymywanie I2P</string>
   <string name="notification_status_shutdown_cancelled">Anulowano zamknięcie</string>
   <string name="notification_status_shutting_down">Trwa wyłączanie I2P</string>
-  <string name="notification_status_bw">Przepustowość: %1$s KBps pobieranie / %2$s KBps wysyłanie</string>
   <string name="notification_status_peers">Peery: %1$d aktywnych, %2$d znanych</string>
   <string name="notification_status_expl">Tunelów rozpoznawczych: %1$d/%2$d</string>
   <string name="notification_status_client">Tunele klienta: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 071a324dc..dc6e3a51b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -87,7 +87,6 @@
   <string name="notification_status_stopping_after_net">Rede desconectada, interrompendo I2P</string>
   <string name="notification_status_shutdown_cancelled">Desligamento cancelado</string>
   <string name="notification_status_shutting_down">O roteador I2P está sendo desligado</string>
-  <string name="notification_status_bw">Largura de banda: %1$s KBps Down/ %2$s KBps up</string>
   <string name="notification_status_peers">Pares: %1$d ativos, %2$d conhecidos</string>
   <string name="notification_status_expl">Túneis exploratórios: %1$d/%2$d</string>
   <string name="notification_status_client">Túneis cliente: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bb80d467d..237ac7efa 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">Sem ligação à rede, a parar o I2P</string>
   <string name="notification_status_shutdown_cancelled">Cancelada a ordem para desligar</string>
   <string name="notification_status_shutting_down">O I2P está a desligar</string>
-  <string name="notification_status_bw">Largura de banda: %1$s KBps down / %2$s KBps up</string>
   <string name="notification_status_peers">Nós: %1$d ativos, %2$d conhecidos</string>
   <string name="notification_status_expl">Túneis exploratórios: %1$d/%2$d</string>
   <string name="notification_status_client">Túneis cliente: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 04c75e483..f1e7a7bbd 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -76,7 +76,6 @@
   <string name="notification_status_restarting">I2P repornește</string>
   <string name="notification_status_waiting">I2P așteaptă pentru o conexiune la rețea</string>
   <string name="notification_status_running">I2P rulează</string>
-  <string name="notification_status_bw">Lățime de bandă: %1$s KBps desc / %2$s KBps în</string>
   <string name="notification_status_peers">Parteneri: %1$d activi, %2$d cunoscuți</string>
   <string name="menu_settings">Configurări</string>
   <string name="settings_enable">Activează</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d8edf27a3..61aa0660e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">Сеть отключена, остановка I2P</string>
   <string name="notification_status_shutdown_cancelled">Выключение отменено</string>
   <string name="notification_status_shutting_down">I2P выключается</string>
-  <string name="notification_status_bw">Пропускная способность: %1$s KBps прием / %2$s KBps отправка</string>
   <string name="notification_status_peers">Узлы: %1$d активны, %2$d известны</string>
   <string name="notification_status_expl">Исследовательские туннели: %1$d/%2$d</string>
   <string name="notification_status_client">Туннели клиента: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 1f9fa92ea..abec5d1d2 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -109,7 +109,6 @@ Var god läs release kommentarerna och licens-information.</string>
   <string name="notification_status_stopping_after_net">Nätverk nedkopplat, stannar I2P</string>
   <string name="notification_status_shutdown_cancelled">Avstängning avbruten</string>
   <string name="notification_status_shutting_down">I2P stänger ner</string>
-  <string name="notification_status_bw">Bandbredd:%1$s KBps ner / %2$s KBps upp</string>
   <string name="notification_status_peers">Peers: %1$d aktiva, %2$d kända</string>
   <string name="notification_status_expl">Utforskande tunnlar: %1$d/%2$d</string>
   <string name="notification_status_client">Klienttunnlar:%1$d/%2$d</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0e3dade7e..e6a484ed1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -92,7 +92,6 @@
   <string name="notification_status_stopping_after_net">Ağ devre dışı bırakıldı, I2P durduruluyor</string>
   <string name="notification_status_shutdown_cancelled">Kapatma iptal edildi</string>
   <string name="notification_status_shutting_down">I2P kapatılıyor</string>
-  <string name="notification_status_bw">Bant genişliği: %1$s KBps indirme / %2$s KBps yükleme</string>
   <string name="notification_status_peers">Eşler: %1$d etkin, %2$d bilinmeyen</string>
   <string name="notification_status_expl">Keşif tünelleri: %1$d/%2$d</string>
   <string name="notification_status_client">İstemci tünelleri: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 931ff261d..8f3620396 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -104,7 +104,6 @@
   <string name="notification_status_stopping_after_net">Немає з\'єднання з мережею, вимикаємо I2P</string>
   <string name="notification_status_shutdown_cancelled">Вимикання було відмінено</string>
   <string name="notification_status_shutting_down">Вимикаємо I2P</string>
-  <string name="notification_status_bw">Пропускна здатність: %1$s КБ/с прийом / %2$s КБ/с передача</string>
   <string name="notification_status_peers">Піри: %1$d активно, %2$d відомо</string>
   <string name="notification_status_expl">Пошукові тунелі: %1$d/%2$d</string>
   <string name="notification_status_client">Клієнтські тунелі: %1$d/%2$d</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index b95bc2c75..f076dfec4 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -108,7 +108,6 @@
   <string name="notification_status_stopping_after_net">网络已中断，正在停止 I2P</string>
   <string name="notification_status_shutdown_cancelled">关闭已取消</string>
   <string name="notification_status_shutting_down">I2P 正在关闭</string>
-  <string name="notification_status_bw">带宽：下行 %1$s KB/s / 上行 %2$s KB/s</string>
   <string name="notification_status_peers">节点：%1$d 活动，%2$d 已知</string>
   <string name="notification_status_expl">探索隧道：%1$d/%2$d</string>
   <string name="notification_status_client">客户隧道：%1$d/%2$d</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ead2341a..e98a6f5f9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -142,7 +142,7 @@
     <string name="notification_status_shutdown_cancelled">Shutdown cancelled</string>
     <string name="notification_status_shutting_down">I2P is shutting down</string>
     <string name="notification_status_text" translatable="false">%1$sBps ↓ / %2$sBps ↑</string>
-    <string name="notification_status_bw">Bandwidth: %1$s KBps down / %2$s KBps up</string>
+    <string name="notification_status_bw">Bandwidth: %1$sBps down / %2$sBps up</string>
     <string name="notification_status_peers">Peers: %1$d active, %2$d known</string>
     <string name="notification_status_expl">Exploratory tunnels: %1$d/%2$d</string>
     <string name="notification_status_client">Client tunnels: %1$d/%2$d</string>