diff --git a/LICENSE.artwork b/LICENSE.artwork
index 799f744dd..a795245b7 100644
--- a/LICENSE.artwork
+++ b/LICENSE.artwork
@@ -25,3 +25,6 @@ Creative Commons Attribution 3.0 Unported license (CC BY-3.0):
 
 Creative Commons Attribution 3.0 United States   (CC BY-3.0 US):
    ic_donate by Peter van Driel https://thenounproject.com/term/donate/239009/
+
+Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0):
+   ic_device_amazfit_bip by Michael quelbs@gmail.com
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 dd326e1f3..918f956fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -35,15 +35,15 @@ public enum DeviceType {
     PEBBLE(1, R.drawable.ic_device_pebble, R.drawable.ic_device_pebble_disabled, R.string.devicetype_pebble),
     MIBAND(10, R.drawable.ic_device_miband, R.drawable.ic_device_miband_disabled, R.string.devicetype_miband),
     MIBAND2(11, R.drawable.ic_device_miband2, R.drawable.ic_device_miband2_disabled, R.string.devicetype_miband2),
-    AMAZFITBIP(12, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_amazfit_bip),
+    AMAZFITBIP(12, R.drawable.ic_device_amazfit_bip, R.drawable.ic_device_amazfit_bip_disabled, R.string.devicetype_amazfit_bip),
     AMAZFITCOR(13, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_amazfit_cor),
     MIBAND3(14, R.drawable.ic_device_miband2, R.drawable.ic_device_miband2_disabled, R.string.devicetype_miband3),
     AMAZFITCOR2(15, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_amazfit_cor2),
     MIBAND4(16, R.drawable.ic_device_miband2, R.drawable.ic_device_miband2_disabled, R.string.devicetype_miband4),
-    AMAZFITBIP_LITE(17, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_amazfit_bip_lite),
+    AMAZFITBIP_LITE(17, R.drawable.ic_device_amazfit_bip, R.drawable.ic_device_amazfit_bip_disabled, R.string.devicetype_amazfit_bip_lite),
     AMAZFITGTR(18, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_amazfit_gtr),
-    AMAZFITGTS(19, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_amazfit_gts),
-    AMAZFITBIPS(20, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_amazfit_bips),
+    AMAZFITGTS(19, R.drawable.ic_device_amazfit_bip, R.drawable.ic_device_amazfit_bip_disabled, R.string.devicetype_amazfit_gts),
+    AMAZFITBIPS(20, R.drawable.ic_device_amazfit_bip, R.drawable.ic_device_amazfit_bip_disabled, R.string.devicetype_amazfit_bips),
     AMAZFITGTR_LITE(21, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_amazfit_gtr),
     AMAZFITTREX(22, R.drawable.ic_device_zetime, R.drawable.ic_device_zetime_disabled, R.string.devicetype_amazfit_trex),
     LIVEVIEW(30, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_liveview),
diff --git a/app/src/main/res/drawable/ic_device_amazfit_bip.xml b/app/src/main/res/drawable/ic_device_amazfit_bip.xml
new file mode 100644
index 000000000..f8868dfb8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_amazfit_bip.xml
@@ -0,0 +1,8 @@
+<vector android:height="26.9dp" android:viewportHeight="26.95"
+    android:viewportWidth="26.95" android:width="26.9dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#6cb8f7" android:pathData="m3.612,2.619h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
+    <path android:fillColor="#0c84e3" android:pathData="m3.611,3.393h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
+    <path android:fillColor="#2196f3" android:pathData="m3.61,3.024h19.7a0.8541,0.8541 0,0 1,0.8541 0.854v18.94a0.8541,0.8541 0,0 1,-0.8541 0.854h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.854v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.854z"/>
+    <path android:fillColor="#fff" android:pathData="m10.38,6.588c-0.8142,-0.0172 -0.9082,0.1552 -0.8846,0.9659 -0.7213,0.1264 -1.342,1.159 -1.326,2.124l0.005,7.825c0.0937,0.8834 0.6257,1.487 1.321,1.867 -0.0007,0.813 0.0765,0.9907 0.8846,0.9907h5.81c0.8465,0 0.8262,-0.2367 0.8055,-0.9907 0.8715,-0.4163 1.209,-0.8924 1.295,-1.867 -0.0007,-0.7652 0.0013,-3.423 0.0013,-3.437 0.1229,-0.2049 0.1513,-0.0276 0.2187,0.0502 0.0945,0.1092 0.2143,0.0627 0.2676,-0.0896l0.0026,-1.14c-0.0551,-0.1149 -0.0998,-0.2132 -0.2505,-0.1176 -0.0771,0.0489 -0.1091,0.2215 -0.2397,0.0852v-3.444c-0.0865,-0.9028 -0.4723,-1.509 -1.295,-1.838 0.0077,-0.9455 -0.0592,-0.9913 -0.8055,-0.9801zM10.4315,8.015 L16.2065,8.0669c0.8048,0.0072 1.471,0.8282 1.469,1.343l-0.0276,7.942c-0.0029,0.8324 -0.7174,1.512 -1.443,1.512h-5.924c-0.5357,0 -1.498,-0.6497 -1.492,-1.426l0.0624,-7.877c0.0076,-0.9565 0.7608,-1.554 1.58,-1.546z"/>
+    <path android:fillAlpha="0.5345" android:fillColor="#fff" android:pathData="m10.43,8.015c-0.8188,-0.0074 -1.572,0.5903 -1.58,1.547l-0.0623,7.877c-0.0061,0.776 0.9564,1.425 1.492,1.425h5.924c0.7252,0 1.44,-0.6794 1.443,-1.512l0.0273,-7.942c0.002,-0.5152 -0.6638,-1.336 -1.469,-1.343zM9.9475,9.827h6.568v6.696h-6.568z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml b/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml
new file mode 100644
index 000000000..e97015794
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml
@@ -0,0 +1,8 @@
+<vector android:height="26.9dp" android:viewportHeight="26.95"
+    android:viewportWidth="26.95" android:width="26.9dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#a1a1a1" android:pathData="m3.612,2.619h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
+    <path android:fillColor="#7d7d7d" android:pathData="m3.611,3.393h19.7a0.8541,0.8541 0,0 1,0.8541 0.8541v18.94a0.8541,0.8541 0,0 1,-0.8541 0.8541h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.8541v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.8541z"/>
+    <path android:fillColor="#8a8a8a" android:fillAlpha="0.94" android:pathData="m3.61,3.024h19.7a0.8541,0.8541 0,0 1,0.8541 0.854v18.94a0.8541,0.8541 0,0 1,-0.8541 0.854h-19.7a0.8541,0.8541 0,0 1,-0.8541 -0.854v-18.94a0.8541,0.8541 0,0 1,0.8541 -0.854z"/>
+    <path android:fillColor="#fff" android:pathData="m10.38,6.588c-0.8142,-0.0172 -0.9082,0.1552 -0.8846,0.9659 -0.7213,0.1264 -1.342,1.159 -1.326,2.124l0.005,7.825c0.0937,0.8834 0.6257,1.487 1.321,1.867 -0.0007,0.813 0.0765,0.9907 0.8846,0.9907h5.81c0.8465,0 0.8262,-0.2367 0.8055,-0.9907 0.8715,-0.4163 1.209,-0.8924 1.295,-1.867 -0.0007,-0.7652 0.0013,-3.423 0.0013,-3.437 0.1229,-0.2049 0.1513,-0.0276 0.2187,0.0502 0.0945,0.1092 0.2143,0.0627 0.2676,-0.0896l0.0026,-1.14c-0.0551,-0.1149 -0.0998,-0.2132 -0.2505,-0.1176 -0.0771,0.0489 -0.1091,0.2215 -0.2397,0.0852v-3.444c-0.0865,-0.9028 -0.4723,-1.509 -1.295,-1.838 0.0077,-0.9455 -0.0592,-0.9913 -0.8055,-0.9801zM10.4315,8.015 L16.2065,8.0669c0.8048,0.0072 1.471,0.8282 1.469,1.343l-0.0276,7.942c-0.0029,0.8324 -0.7174,1.512 -1.443,1.512h-5.924c-0.5357,0 -1.498,-0.6497 -1.492,-1.426l0.0624,-7.877c0.0076,-0.9565 0.7608,-1.554 1.58,-1.546z"/>
+    <path android:fillAlpha="0.5345" android:fillColor="#fff" android:pathData="m10.43,8.015c-0.8188,-0.0074 -1.572,0.5903 -1.58,1.547l-0.0623,7.877c-0.0061,0.776 0.9564,1.425 1.492,1.425h5.924c0.7252,0 1.44,-0.6794 1.443,-1.512l0.0273,-7.942c0.002,-0.5152 -0.6638,-1.336 -1.469,-1.343zM9.9475,9.827h6.568v6.696h-6.568z"/>
+</vector>