diff --git a/android-mobile/res/xml/device_filter.xml b/android-mobile/res/xml/device_filter.xml
index 046b12f2b..59742610d 100644
--- a/android-mobile/res/xml/device_filter.xml
+++ b/android-mobile/res/xml/device_filter.xml
@@ -19,8 +19,10 @@
     <usb-device vendor-id="0x1493" product-id="0x30"/>
     <!-- EON Steel core -->
     <usb-device vendor-id="0x1493" product-id="0x33"/>
-    <!-- Scubapro G2 -->
+    <!-- Scubapro G2 (wrist/console/hud) -->
     <usb-device vendor-id="0x2e6c" product-id="0x3201"/>
+    <usb-device vendor-id="0x2e6c" product-id="0x3211"/>
+    <usb-device vendor-id="0x2e6c" product-id="0x4201"/>
     <!-- Scubapro Aladin Square -->
     <usb-device vendor-id="0xc251" product-id="0x2006"/>
     <!-- Atomics Aquatics Cobalt -->
diff --git a/android/res/xml/device_filter.xml b/android/res/xml/device_filter.xml
index 046b12f2b..59742610d 100644
--- a/android/res/xml/device_filter.xml
+++ b/android/res/xml/device_filter.xml
@@ -19,8 +19,10 @@
     <usb-device vendor-id="0x1493" product-id="0x30"/>
     <!-- EON Steel core -->
     <usb-device vendor-id="0x1493" product-id="0x33"/>
-    <!-- Scubapro G2 -->
+    <!-- Scubapro G2 (wrist/console/hud) -->
     <usb-device vendor-id="0x2e6c" product-id="0x3201"/>
+    <usb-device vendor-id="0x2e6c" product-id="0x3211"/>
+    <usb-device vendor-id="0x2e6c" product-id="0x4201"/>
     <!-- Scubapro Aladin Square -->
     <usb-device vendor-id="0xc251" product-id="0x2006"/>
     <!-- Atomics Aquatics Cobalt -->
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index 9b52ee211..4616ad04f 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -1938,17 +1938,19 @@ void QMLManager::showDownloadPage(QString deviceString)
 				.arg(connectionListModel.indexOf("Suunto"))
 				.arg(productList["Suunto"].indexOf("EON Core"))
 				.arg(connectionListModel.indexOf("USB device"));
-	} else if (deviceString.contains("mVendorId=11884") && // 0x2e6c / 0x3201
-		   deviceString.contains("mProductId=12801")) {
+	} else if (deviceString.contains("mVendorId=11884") && // 0x2e6c / 0x3201,0x3211,0x4201
+		   (deviceString.contains("mProductId=12801") ||
+		    deviceString.contains("mProductId=12817") ||
+		    deviceString.contains("mProductId=16897"))) {
 		name = QString("%1;%2;%3")
 				.arg(connectionListModel.indexOf("Scubapro"))
-				.arg(productList["Suunto"].indexOf("G2"))
+				.arg(productList["Scubapro"].indexOf("G2"))
 				.arg(connectionListModel.indexOf("USB device"));
 	} else if (deviceString.contains("mVendorId=49745") && // 0xc251 / 0x2006
 		   deviceString.contains("mProductId=8198")) {
 		name = QString("%1;%2;%3")
 				.arg(connectionListModel.indexOf("Scubapro"))
-				.arg(productList["Suunto"].indexOf("Aladin Square"))
+				.arg(productList["Scubapro"].indexOf("Aladin Square"))
 				.arg(connectionListModel.indexOf("USB device"));
 	} else if (deviceString.contains("mVendorId=1027") && // 0x0403 / 0x6001,0x6010,0x6011,0x6015
 		   (deviceString.contains("mProductId=24577") ||