diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeightUnit.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeightUnit.kt
index d5c686effb..ecc7c1ae4f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeightUnit.kt
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeightUnit.kt
@@ -44,7 +44,11 @@ enum class WeightUnit {
                 }
 
                 KILOGRAM -> {
-                    context.getString(R.string.weight_scale_kilogram_format, convertedWeight)
+                    if (convertedWeight != 0.0 && convertedWeight < 1) {
+                        context.getString(R.string.weight_scale_gram_format, (convertedWeight * 1000).roundToInt())
+                    } else {
+                        context.getString(R.string.weight_scale_kilogram_format, convertedWeight)
+                    }
                 }
             }
         }
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index dbea8b8bad..64b2a92b7c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -3962,7 +3962,7 @@
     <string name="weight_scale_jin">jin – 市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">kilogram – kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">libra – lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Zobrazit váhu</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b0d36506b1..b64c59c170 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3830,7 +3830,7 @@
     <string name="weight_scale_jin">Jin (500 g)</string>
     <string name="weight_scale_jin_format">%1$.2f Jin (500 g)</string>
     <string name="weight_scale_kilogram">Kilogramm – kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">Pfund – lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Gewicht anzeigen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 523b813853..ba8c2532bc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3811,7 +3811,7 @@
     <string name="weight_scale_jin">jin - 市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">kilogramo - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">libra - lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Mostrar peso</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1b65b5c3d7..244f905646 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3638,7 +3638,7 @@
     <string name="unit_celsius">℃</string>
     <string name="unit_fahrenheit">℉</string>
     <string name="weight_scale_kilogram">kilogramme - Kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f Kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f Kg</string>
     <string name="weight_scale_show_measurement">Afficher poids</string>
     <string name="workout_charts">Graphiques d’entraînement</string>
     <string name="pref_display_enabled_title">Affichage activé</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 4087b4344c..36f4a41c15 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -3764,7 +3764,7 @@
     <string name="weight_scale_jin">jin - 市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">kilogramm - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">font - lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Tömeg megjelenítése</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index cfa02aadac..385880284c 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -3663,7 +3663,7 @@
     <string name="weight_scale_jin">jin - 市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">kilogram - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">pound - lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Vis vekt</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d07341edf7..6b53d0312a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -3963,7 +3963,7 @@
     <string name="unit_celsius">℃</string>
     <string name="unit_fahrenheit">℉</string>
     <string name="weight_scale_kilogram">kilogram - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">pond - lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Toon gewicht</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d8142bf6b3..e4f305c220 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3976,7 +3976,7 @@
     <string name="weight_scale_jin">jin - 市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">kilogram - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">funt - lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Pokaż wagę</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 382753d18b..b8fb680fb6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -3915,7 +3915,7 @@
     <string name="first_start_permissions_do_not_ask_again">Больше не спрашивать</string>
     <string name="first_start_permissions_do_not_ask_warning_summary">Отказ от предоставления разрешения может вызвать проблемы. Вы можете снова открыть этот экран с экрана настроек.</string>
     <string name="weight_scale_kilogram">килограмм - кг</string>
-    <string name="weight_scale_kilogram_format">%1$.3f кг</string>
+    <string name="weight_scale_kilogram_format">%1$.2f кг</string>
     <string name="weight_scale_pound">фунт - фт</string>
     <string name="weight_scale_pound_format">%1$.3f фт</string>
     <string name="weight_scale_show_measurement">Показать вес</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 8720642b39..440e407c39 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -3879,7 +3879,7 @@
     <string name="weight_scale_jin">சின் - இச்சிகோ</string>
     <string name="weight_scale_jin_format">%1$.2f நகர வகை</string>
     <string name="weight_scale_kilogram">கிலோகிராம் - கிலோ</string>
-    <string name="weight_scale_kilogram_format">%1$.3f கிலோ</string>
+    <string name="weight_scale_kilogram_format">%1$.2f கிலோ</string>
     <string name="weight_scale_pound">பவுண்டு - பவுண்டு</string>
     <string name="weight_scale_show_measurement">எடையைக் காட்டு</string>
     <string name="weight_scale_stone">கல் - ச்டம்ப்</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 7c39704db8..f4a9748093 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -3682,7 +3682,7 @@
     <string name="unit_celsius">℃</string>
     <string name="unit_fahrenheit">℉</string>
     <string name="weight_scale_kilogram">kilogram - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Ağırlığı Göster</string>
     <string name="weight_scale_stone_format">%1$d st %2$d lb</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b292c16b8d..388aecc581 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -3803,7 +3803,7 @@
     <string name="weight_scale_jin">чути - 市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">кілограм - кг</string>
-    <string name="weight_scale_kilogram_format">%1$.3f кг</string>
+    <string name="weight_scale_kilogram_format">%1$.2f кг</string>
     <string name="weight_scale_pound">фунт - фунт</string>
     <string name="weight_scale_pound_format">%1$.3f фунт</string>
     <string name="weight_scale_show_measurement">Показати вагу</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 17e32ac7da..a562ba1fe8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -3953,7 +3953,7 @@
     <string name="weight_scale_jin">市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">千克 - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
     <string name="weight_scale_pound">磅 - lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">显示体重</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03363c5856..7ae12bd9ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4364,7 +4364,8 @@
     <string name="weight_scale_jin">jin - 市斤</string>
     <string name="weight_scale_jin_format">%1$.2f 市斤</string>
     <string name="weight_scale_kilogram">kilogram - kg</string>
-    <string name="weight_scale_kilogram_format">%1$.3f kg</string>
+    <string name="weight_scale_kilogram_format">%1$.2f kg</string>
+    <string name="weight_scale_gram_format">%1$d g</string>
     <string name="weight_scale_pound">pound - lb</string>
     <string name="weight_scale_pound_format">%1$.3f lb</string>
     <string name="weight_scale_show_measurement">Show Weight</string>