diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
index f6bc5afad..240885089 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
@@ -105,6 +105,33 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
         };
     }
 
+    @Override
+    public String[] getSupportedLanguageSettings(GBDevice device) {
+        return new String[]{
+                "auto",
+                "cs_CZ",
+                "de_DE",
+                "el_GR",
+                "en_US",
+                "es_ES",
+                "fr_FR",
+                "id_ID",
+                "it_IT",
+                "ja_JP",
+                "ko_KO",
+                "nl_NL",
+                "pl_PL",
+                "pt_BR",
+                "ru_RU",
+                "th_TH",
+                "tr_TR",
+                "uk_UA",
+                "vi_VN",
+                "zh_CH",
+                "zh_TW",
+        };
+    }
+
     @Override
     public int getBondingStyle() {
         return BONDING_STYLE_REQUIRE_KEY;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java
index 2c8c418f9..b03e326fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java
@@ -31,7 +31,14 @@ public class AmazfitBipUProFirmwareInfo extends HuamiFirmwareInfo {
     private static Map<Integer, String> crcToVersion = new HashMap<>();
 
     static {
-        // no known fw yet
+        // fw
+        crcToVersion.put(46603, "1.0.2.92");
+
+        // resources
+        crcToVersion.put(33532, "1.0.2.92");
+
+        // font
+        crcToVersion.put(60101, "8");
     }
 
     public AmazfitBipUProFirmwareInfo(byte[] bytes) {
diff --git a/app/src/main/res/xml/devicesettings_amazfitbipupro.xml b/app/src/main/res/xml/devicesettings_amazfitbipupro.xml
index fd4afa948..94e2042e8 100644
--- a/app/src/main/res/xml/devicesettings_amazfitbipupro.xml
+++ b/app/src/main/res/xml/devicesettings_amazfitbipupro.xml
@@ -10,12 +10,4 @@
         android:persistent="true"
         android:summary="@string/mi2_prefs_display_items_summary"
         android:title="@string/mi2_prefs_display_items" />
-    <ListPreference
-        android:icon="@drawable/ic_language"
-        android:defaultValue="auto"
-        android:entries="@array/pref_amazfitbip_language"
-        android:entryValues="@array/pref_amazfitbip_language_values"
-        android:key="language"
-        android:summary="%s"
-        android:title="@string/pref_title_language" />
 </androidx.preference.PreferenceScreen>