diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index cbce2b15d..405d9cbd6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -70,7 +70,7 @@ public enum DeviceType {
     BANGLEJS(160, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_banglejs),
     FOSSILQHYBRID(170, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_qhybrid),
     TLW64(180, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_tlw64),
-    PINETIME_JF(190, R.drawable.ic_device_watchxplus, R.drawable.ic_device_watchxplus_disabled, R.string.devicetype_pinetime_jf),
+    PINETIME_JF(190, R.drawable.ic_device_pinetime, R.drawable.ic_device_pinetime_disabled, R.string.devicetype_pinetime_jf),
     MIJIA_LYWSD02(200, R.drawable.ic_device_pebble, R.drawable.ic_device_pebble_disabled, R.string.devicetype_mijia_lywsd02),
     ITAG(250, R.drawable.ic_device_itag, R.drawable.ic_device_itag_disabled, R.string.devicetype_itag),
     VIBRATISSIMO(300, R.drawable.ic_device_lovetoy, R.drawable.ic_device_lovetoy_disabled, R.string.devicetype_vibratissimo),
diff --git a/app/src/main/res/drawable/ic_device_pinetime.xml b/app/src/main/res/drawable/ic_device_pinetime.xml
new file mode 100644
index 000000000..36a4b2818
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_pinetime.xml
@@ -0,0 +1,96 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28.740126dp"
+    android:height="28.740126dp"
+    android:viewportWidth="28.740126"
+    android:viewportHeight="28.740126">
+  <path
+      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#1f7fdb"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#4dabf5"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#2196f3"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M12.2691,6.7079L16.8107,6.7079A0.425,0.425 0,0 1,17.2357 7.1329L17.2357,22.1721A0.425,0.425 0,0 1,16.8107 22.5971L12.2691,22.5971A0.425,0.425 0,0 1,11.844 22.1721L11.844,7.1329A0.425,0.425 0,0 1,12.2691 6.7079z"
+      android:strokeWidth="2.43489814"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M10.9153,9.6924L18.2086,9.6924A1.1042,1.1042 0,0 1,19.3129 10.7967L19.3129,18.09A1.1042,1.1042 0,0 1,18.2086 19.1942L10.9153,19.1942A1.1042,1.1042 0,0 1,9.8111 18.09L9.8111,10.7967A1.1042,1.1042 0,0 1,10.9153 9.6924z"
+      android:strokeWidth="3.5"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M9.8173,13.4853L10.2236,13.4853A0.2609,0.2609 0,0 1,10.4845 13.7462L10.4845,15.3015A0.2609,0.2609 0,0 1,10.2236 15.5624L9.8173,15.5624A0.2609,0.2609 0,0 1,9.5564 15.3015L9.5564,13.7462A0.2609,0.2609 0,0 1,9.8173 13.4853z"
+      android:strokeWidth="3.5"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M11.7155,10.731L17.4222,10.731A0.866,0.8376 90,0 1,18.2598 11.597L18.2598,16.6054A0.866,0.8376 90,0 1,17.4222 17.4713L11.7155,17.4713A0.866,0.8376 90,0 1,10.8779 16.6054L10.8779,11.597A0.866,0.8376 90,0 1,11.7155 10.731z"
+      android:strokeWidth="5.10916853"
+      android:fillColor="#2196f3"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.689,15.1735L15.8745,15.605A0.0973,0.2672 90,0 1,15.8745 15.7425L14.689,16.174A0.0973,0.2672 90,0 1,14.311 16.174L13.1255,15.7425A0.0973,0.2672 90,0 1,13.1255 15.605L14.311,15.1735A0.0973,0.2672 90,0 1,14.689 15.1735z"
+      android:strokeWidth="3.12518311"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.6811,13.9257L15.7183,14.3474A0.1041,0.2561 90,0 1,15.7183 14.4947L14.6811,14.9165A0.1041,0.2561 90,0 1,14.3189 14.9165L13.2817,14.4947A0.1041,0.2561 90,0 1,13.2817 14.3474L14.3189,13.9257A0.1041,0.2561 90,0 1,14.6811 13.9257z"
+      android:strokeWidth="2.83754849"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.6489,12.6994L15.6098,13.1338A0.0952,0.2106 90,0 1,15.6098 13.2685L14.6489,13.7029A0.0952,0.2106 90,0 1,14.3511 13.7029L13.3902,13.2685A0.0952,0.2106 90,0 1,13.3902 13.1338L14.3511,12.6994A0.0952,0.2106 90,0 1,14.6489 12.6994z"
+      android:strokeWidth="2.59477019"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.6794,11.5563L15.3255,11.9074A0.1379,0.2538 90,0 1,15.3255 12.1024L14.6794,12.4535A0.1379,0.2538 90,0 1,14.3206 12.4535L13.6745,12.1024A0.1379,0.2538 90,0 1,13.6745 11.9074L14.3206,11.5563A0.1379,0.2538 90,0 1,14.6794 11.5563z"
+      android:strokeWidth="2.1484313"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.3945,16.0233L14.6055,16.0233A0.0938,0.0938 0,0 1,14.6992 16.117L14.6992,16.493A0.0938,0.0938 0,0 1,14.6055 16.5867L14.3945,16.5867A0.0938,0.0938 0,0 1,14.3008 16.493L14.3008,16.117A0.0938,0.0938 0,0 1,14.3945 16.0233z"
+      android:strokeWidth="3.5"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m13.6299,13.4368c0.8811,0.4157 0.8692,0.3498 0.1189,0.6586 -0.7503,0.3088 -0.6702,0.3466 -0.801,-0.3779 -0.1308,-0.7245 -0.199,-0.6964 0.6821,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m13.5499,14.6758c0.9831,0.4157 0.9698,0.3498 0.1326,0.6586 -0.8372,0.3088 -0.7478,0.3466 -0.8937,-0.3779 -0.1459,-0.7245 -0.222,-0.6964 0.7611,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m15.4483,14.6788c-0.9831,0.4157 -0.9698,0.3498 -0.1326,0.6586 0.8372,0.3088 0.7478,0.3466 0.8937,-0.3779 0.1459,-0.7245 0.222,-0.6964 -0.7611,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m15.3969,13.4375c-0.8811,0.4157 -0.8692,0.3498 -0.1189,0.6586 0.7503,0.3088 0.6702,0.3466 0.801,-0.3779 0.1308,-0.7245 0.199,-0.6964 -0.6821,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m15.2751,12.2031c-0.7572,0.4305 -0.7482,0.3645 -0.0904,0.6605 0.6578,0.296 0.5889,0.3352 0.6884,-0.3914 0.0995,-0.7265 0.1593,-0.6996 -0.598,-0.2691z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m13.7234,12.2005c0.7572,0.4305 0.7482,0.3645 0.0904,0.6605 -0.6578,0.296 -0.5889,0.3352 -0.6884,-0.3914 -0.0995,-0.7265 -0.1593,-0.6996 0.598,-0.2691z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_pinetime_disabled.xml b/app/src/main/res/drawable/ic_device_pinetime_disabled.xml
new file mode 100644
index 000000000..14556aac4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_pinetime_disabled.xml
@@ -0,0 +1,97 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28.740126dp"
+    android:height="28.740126dp"
+    android:viewportWidth="28.740126"
+    android:viewportHeight="28.740126">
+  <path
+      android:pathData="M3.8712,3.8769L24.7963,3.8769A0.9472,0.9472 0,0 1,25.7435 4.8241L25.7435,24.8343A0.9472,0.9472 0,0 1,24.7963 25.7815L3.8712,25.7815A0.9472,0.9472 0,0 1,2.924 24.8343L2.924,4.8241A0.9472,0.9472 0,0 1,3.8712 3.8769z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#7a7a7a"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.879,3.0349L24.8041,3.0349A0.9472,0.9472 0,0 1,25.7514 3.9822L25.7514,23.9924A0.9472,0.9472 0,0 1,24.8041 24.9396L3.879,24.9396A0.9472,0.9472 0,0 1,2.9318 23.9924L2.9318,3.9822A0.9472,0.9472 0,0 1,3.879 3.0349z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#9f9f9f"
+      android:strokeColor="#00000000"
+      android:fillAlpha="0.9411765"/>
+  <path
+      android:pathData="M3.8711,3.4131L24.7962,3.4131A0.9472,0.9472 0,0 1,25.7435 4.3603L25.7435,24.3705A0.9472,0.9472 0,0 1,24.7962 25.3177L3.8711,25.3177A0.9472,0.9472 0,0 1,2.9239 24.3705L2.9239,4.3603A0.9472,0.9472 0,0 1,3.8711 3.4131z"
+      android:strokeWidth="3.57115173"
+      android:fillColor="#8a8a8a"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M12.2783,6.3989L16.82,6.3989A0.425,0.425 0,0 1,17.245 6.824L17.245,21.8631A0.425,0.425 0,0 1,16.82 22.2882L12.2783,22.2882A0.425,0.425 0,0 1,11.8533 21.8631L11.8533,6.824A0.425,0.425 0,0 1,12.2783 6.3989z"
+      android:strokeWidth="2.43489814"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M10.9246,9.3835L18.2179,9.3835A1.1042,1.1042 0,0 1,19.3221 10.4877L19.3221,17.781A1.1042,1.1042 0,0 1,18.2179 18.8852L10.9246,18.8852A1.1042,1.1042 0,0 1,9.8204 17.781L9.8204,10.4877A1.1042,1.1042 0,0 1,10.9246 9.3835z"
+      android:strokeWidth="3.5"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M9.8266,13.1763L10.2329,13.1763A0.2609,0.2609 0,0 1,10.4938 13.4373L10.4938,14.9926A0.2609,0.2609 0,0 1,10.2329 15.2535L9.8266,15.2535A0.2609,0.2609 0,0 1,9.5657 14.9926L9.5657,13.4373A0.2609,0.2609 0,0 1,9.8266 13.1763z"
+      android:strokeWidth="3.5"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M11.7248,10.422L17.4314,10.422A0.866,0.8376 90,0 1,18.269 11.288L18.269,16.2964A0.866,0.8376 90,0 1,17.4314 17.1624L11.7248,17.1624A0.866,0.8376 90,0 1,10.8872 16.2964L10.8872,11.288A0.866,0.8376 90,0 1,11.7248 10.422z"
+      android:strokeWidth="5.10916853"
+      android:fillColor="#8a8a8a"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.7669,14.9324L15.9524,15.3639A0.0973,0.2672 90,0 1,15.9524 15.5015L14.7669,15.933A0.0973,0.2672 90,0 1,14.389 15.933L13.2035,15.5015A0.0973,0.2672 90,0 1,13.2035 15.3639L14.389,14.9324A0.0973,0.2672 90,0 1,14.7669 14.9324z"
+      android:strokeWidth="3.12518311"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.759,13.6846L15.7962,14.1064A0.1041,0.2561 90,0 1,15.7962 14.2537L14.759,14.6755A0.1041,0.2561 90,0 1,14.3968 14.6755L13.3596,14.2537A0.1041,0.2561 90,0 1,13.3596 14.1064L14.3968,13.6846A0.1041,0.2561 90,0 1,14.759 13.6846z"
+      android:strokeWidth="2.83754849"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.7268,12.4584L15.6877,12.8928A0.0952,0.2106 90,0 1,15.6877 13.0275L14.7268,13.4619A0.0952,0.2106 90,0 1,14.429 13.4619L13.4681,13.0275A0.0952,0.2106 90,0 1,13.4681 12.8928L14.429,12.4584A0.0952,0.2106 90,0 1,14.7268 12.4584z"
+      android:strokeWidth="2.59477019"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.7574,11.3152L15.4034,11.6663A0.1379,0.2538 90,0 1,15.4034 11.8614L14.7574,12.2124A0.1379,0.2538 90,0 1,14.3985 12.2124L13.7524,11.8614A0.1379,0.2538 90,0 1,13.7524 11.6663L14.3985,11.3152A0.1379,0.2538 90,0 1,14.7574 11.3152z"
+      android:strokeWidth="2.1484313"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.4724,15.7822L14.6834,15.7822A0.0938,0.0938 0,0 1,14.7771 15.876L14.7771,16.2519A0.0938,0.0938 0,0 1,14.6834 16.3457L14.4724,16.3457A0.0938,0.0938 0,0 1,14.3787 16.2519L14.3787,15.876A0.0938,0.0938 0,0 1,14.4724 15.7822z"
+      android:strokeWidth="3.5"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m13.7078,13.1958c0.8811,0.4157 0.8692,0.3498 0.1189,0.6586 -0.7503,0.3088 -0.6702,0.3466 -0.801,-0.3779 -0.1308,-0.7245 -0.199,-0.6964 0.6821,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m13.6278,14.4347c0.9831,0.4157 0.9698,0.3498 0.1326,0.6586 -0.8372,0.3088 -0.7478,0.3466 -0.8937,-0.3779 -0.1459,-0.7245 -0.222,-0.6964 0.7611,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m15.5262,14.4378c-0.9831,0.4157 -0.9698,0.3498 -0.1326,0.6586 0.8372,0.3088 0.7478,0.3466 0.8937,-0.3779 0.1459,-0.7245 0.222,-0.6964 -0.7611,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m15.4748,13.1964c-0.8811,0.4157 -0.8692,0.3498 -0.1189,0.6586 0.7503,0.3088 0.6702,0.3466 0.801,-0.3779 0.1308,-0.7245 0.199,-0.6964 -0.6821,-0.2807z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m15.353,11.9621c-0.7572,0.4305 -0.7482,0.3645 -0.0904,0.6605 0.6578,0.296 0.5889,0.3352 0.6884,-0.3914 0.0995,-0.7265 0.1593,-0.6996 -0.598,-0.2691z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m13.8013,11.9595c0.7572,0.4305 0.7482,0.3645 0.0904,0.6605 -0.6578,0.296 -0.5889,0.3352 -0.6884,-0.3914 -0.0995,-0.7265 -0.1593,-0.6996 0.598,-0.2691z"
+      android:strokeWidth="1.08117461"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"/>
+</vector>