diff --git a/app/src/main/res/drawable-hdpi/ic_activitytracker.png b/app/src/main/res/drawable-hdpi/ic_activitytracker.png
deleted file mode 100644
index 1b54cfb56..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_activitytracker.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_hplus.png b/app/src/main/res/drawable-hdpi/ic_device_hplus.png
deleted file mode 100644
index e587d6c94..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_hplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_hplus_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_hplus_disabled.png
deleted file mode 100644
index e0161308c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_hplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_lovetoy.png b/app/src/main/res/drawable-hdpi/ic_device_lovetoy.png
deleted file mode 100644
index c7178523e..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_lovetoy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_lovetoy_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_lovetoy_disabled.png
deleted file mode 100644
index 3dd7f4066..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_lovetoy_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_miband.png b/app/src/main/res/drawable-hdpi/ic_device_miband.png
deleted file mode 100644
index 2f0329a1b..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_miband.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_miband2.png b/app/src/main/res/drawable-hdpi/ic_device_miband2.png
deleted file mode 100644
index 8cc9cc357..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_miband2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_miband2_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_miband2_disabled.png
deleted file mode 100644
index 2307aa024..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_miband2_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png
deleted file mode 100644
index f9f7be9c7..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_pebble.png b/app/src/main/res/drawable-hdpi/ic_device_pebble.png
deleted file mode 100644
index c889b478e..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_pebble.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_pebble_disabled.png
deleted file mode 100644
index 8eb1835a8..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_pebble_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png b/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png
deleted file mode 100644
index 749155a19..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png
deleted file mode 100644
index 212cb44d5..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_firmware.png b/app/src/main/res/drawable-hdpi/ic_firmware.png
deleted file mode 100644
index aba8fba83..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_firmware.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_activitytracker.png b/app/src/main/res/drawable-mdpi/ic_activitytracker.png
deleted file mode 100644
index ec01b54e3..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_activitytracker.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_hplus.png b/app/src/main/res/drawable-mdpi/ic_device_hplus.png
deleted file mode 100644
index 1c75995d9..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_hplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_hplus_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_hplus_disabled.png
deleted file mode 100644
index c95833b78..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_hplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_lovetoy.png b/app/src/main/res/drawable-mdpi/ic_device_lovetoy.png
deleted file mode 100644
index 1b29201fb..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_lovetoy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_lovetoy_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_lovetoy_disabled.png
deleted file mode 100644
index 0734fe39a..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_lovetoy_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_miband.png b/app/src/main/res/drawable-mdpi/ic_device_miband.png
deleted file mode 100644
index 29ac9990d..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_miband.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_miband2.png b/app/src/main/res/drawable-mdpi/ic_device_miband2.png
deleted file mode 100644
index c56be18d8..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_miband2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_miband2_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_miband2_disabled.png
deleted file mode 100644
index 0ea803d73..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_miband2_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png
deleted file mode 100644
index 9d9f007a9..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_pebble.png b/app/src/main/res/drawable-mdpi/ic_device_pebble.png
deleted file mode 100644
index ca399415e..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_pebble.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_pebble_disabled.png
deleted file mode 100644
index 924fcb587..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_pebble_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_watchxplus.png b/app/src/main/res/drawable-mdpi/ic_device_watchxplus.png
deleted file mode 100644
index 417066742..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_watchxplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_watchxplus_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_watchxplus_disabled.png
deleted file mode 100644
index bf5c47acc..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_watchxplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_firmware.png b/app/src/main/res/drawable-mdpi/ic_firmware.png
deleted file mode 100644
index 883c22e66..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_firmware.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_activitytracker.png b/app/src/main/res/drawable-xhdpi/ic_activitytracker.png
deleted file mode 100644
index a1c5d5fc6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_activitytracker.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_hplus.png b/app/src/main/res/drawable-xhdpi/ic_device_hplus.png
deleted file mode 100644
index 79ed8c60d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_hplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_hplus_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_hplus_disabled.png
deleted file mode 100644
index 838b66ad1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_hplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_lovetoy.png b/app/src/main/res/drawable-xhdpi/ic_device_lovetoy.png
deleted file mode 100644
index 54773d9a0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_lovetoy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_lovetoy_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_lovetoy_disabled.png
deleted file mode 100644
index 4889a2712..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_lovetoy_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_miband.png b/app/src/main/res/drawable-xhdpi/ic_device_miband.png
deleted file mode 100644
index d3f076c98..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_miband.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_miband2.png b/app/src/main/res/drawable-xhdpi/ic_device_miband2.png
deleted file mode 100644
index 297969cd4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_miband2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_miband2_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_miband2_disabled.png
deleted file mode 100644
index 2b1f455c8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_miband2_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png
deleted file mode 100644
index 401e1750e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_pebble.png b/app/src/main/res/drawable-xhdpi/ic_device_pebble.png
deleted file mode 100644
index 485fdf9ad..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_pebble.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_pebble_disabled.png
deleted file mode 100644
index f231da8ec..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_pebble_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_watchxplus.png b/app/src/main/res/drawable-xhdpi/ic_device_watchxplus.png
deleted file mode 100644
index 8e4f9383d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_watchxplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_watchxplus_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_watchxplus_disabled.png
deleted file mode 100644
index 8edabcb99..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_watchxplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_firmware.png b/app/src/main/res/drawable-xhdpi/ic_firmware.png
deleted file mode 100644
index 2ef582113..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_firmware.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_activitytracker.png b/app/src/main/res/drawable-xxhdpi/ic_activitytracker.png
deleted file mode 100644
index a07cf3d18..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_activitytracker.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_hplus.png b/app/src/main/res/drawable-xxhdpi/ic_device_hplus.png
deleted file mode 100644
index 6f8cd91ba..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_hplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_hplus_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_hplus_disabled.png
deleted file mode 100644
index b2cea45b2..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_hplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_lovetoy.png b/app/src/main/res/drawable-xxhdpi/ic_device_lovetoy.png
deleted file mode 100644
index 3eab74f0c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_lovetoy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_lovetoy_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_lovetoy_disabled.png
deleted file mode 100644
index 4eebb7933..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_lovetoy_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_miband.png b/app/src/main/res/drawable-xxhdpi/ic_device_miband.png
deleted file mode 100644
index 7962dc1e1..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_miband.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_miband2.png b/app/src/main/res/drawable-xxhdpi/ic_device_miband2.png
deleted file mode 100644
index a4a684e1c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_miband2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_miband2_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_miband2_disabled.png
deleted file mode 100644
index a6f88c666..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_miband2_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png
deleted file mode 100644
index 0242632fd..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_pebble.png b/app/src/main/res/drawable-xxhdpi/ic_device_pebble.png
deleted file mode 100644
index 44a823bd9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_pebble.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_pebble_disabled.png
deleted file mode 100644
index 351baa09a..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_pebble_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_watchxplus.png b/app/src/main/res/drawable-xxhdpi/ic_device_watchxplus.png
deleted file mode 100644
index effbfc8bc..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_watchxplus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_watchxplus_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_watchxplus_disabled.png
deleted file mode 100644
index 60c81f798..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_device_watchxplus_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_firmware.png b/app/src/main/res/drawable-xxhdpi/ic_firmware.png
deleted file mode 100644
index 1f1769eda..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_firmware.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_activitytracker.xml b/app/src/main/res/drawable/ic_activitytracker.xml
new file mode 100644
index 000000000..1a21f55a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activitytracker.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_hplus.xml b/app/src/main/res/drawable/ic_device_hplus.xml
new file mode 100644
index 000000000..8b1a81b18
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_hplus.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_hplus_disabled.xml b/app/src/main/res/drawable/ic_device_hplus_disabled.xml
new file mode 100644
index 000000000..e41427442
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_hplus_disabled.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_lovetoy.xml b/app/src/main/res/drawable/ic_device_lovetoy.xml
new file mode 100644
index 000000000..f7e14fab4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_lovetoy.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml b/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml
new file mode 100644
index 000000000..24dc22baf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_lovetoy_disabled.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_miband.xml b/app/src/main/res/drawable/ic_device_miband.xml
new file mode 100644
index 000000000..3f5368451
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miband.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_miband2.xml b/app/src/main/res/drawable/ic_device_miband2.xml
new file mode 100644
index 000000000..a2a883c20
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miband2.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_miband2_disabled.xml b/app/src/main/res/drawable/ic_device_miband2_disabled.xml
new file mode 100644
index 000000000..63b59f3b2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miband2_disabled.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_miband_disabled.xml b/app/src/main/res/drawable/ic_device_miband_disabled.xml
new file mode 100644
index 000000000..40571ad3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miband_disabled.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_pebble.xml b/app/src/main/res/drawable/ic_device_pebble.xml
new file mode 100644
index 000000000..3d6190798
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_pebble.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_pebble_disabled.xml b/app/src/main/res/drawable/ic_device_pebble_disabled.xml
new file mode 100644
index 000000000..cdc33f920
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_pebble_disabled.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_watchxplus.xml b/app/src/main/res/drawable/ic_device_watchxplus.xml
new file mode 100644
index 000000000..4a77da1f7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_watchxplus.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml b/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml
new file mode 100644
index 000000000..f39919418
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_watchxplus_disabled.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_firmware.xml b/app/src/main/res/drawable/ic_firmware.xml
new file mode 100644
index 000000000..85870ac96
--- /dev/null
+++ b/app/src/main/res/drawable/ic_firmware.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+