diff --git a/app/src/main/res/drawable-hdpi/ic_visibility.png b/app/src/main/res/drawable-hdpi/ic_visibility.png
deleted file mode 100644
index a014628e30..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_visibility.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png
deleted file mode 100644
index 4b36a0cc23..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-hdpi/icon_actions_temptarget.png
deleted file mode 100644
index f839a6894b..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_actions_temptarget.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 0fe1cd628b..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-hdpi/icon_cp_age_battery.png
deleted file mode 100644
index abc626901a..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_age_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-hdpi/icon_cp_age_canula.png
deleted file mode 100644
index ecccc39426..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_age_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png
deleted file mode 100644
index ab4d345881..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png
deleted file mode 100644
index 30d5d02de0..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_announcement.png b/app/src/main/res/drawable-hdpi/icon_cp_announcement.png
deleted file mode 100644
index 23c9a9847d..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_announcement.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 56569a264a..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index 98c076905c..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index 97dd4e2ed8..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 710bf6e0da..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index 699be54792..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index 8887e60f27..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png
deleted file mode 100644
index e917402c48..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 2cf826dad1..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_exercise.png b/app/src/main/res/drawable-hdpi/icon_cp_exercise.png
deleted file mode 100644
index e9aee1ac8a..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_exercise.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_note.png b/app/src/main/res/drawable-hdpi/icon_cp_note.png
deleted file mode 100644
index b6b752e150..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png
deleted file mode 100644
index b4a4f2923a..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png
deleted file mode 100644
index e75d9ed81d..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index f780c23e37..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_question.png b/app/src/main/res/drawable-hdpi/icon_cp_question.png
deleted file mode 100644
index 65102f2abf..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_cp_question.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_local_activate.png b/app/src/main/res/drawable-hdpi/icon_local_activate.png
deleted file mode 100644
index 4ef567ffb6..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_local_activate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_local_activatehdpi.png b/app/src/main/res/drawable-hdpi/icon_local_activatehdpi.png
deleted file mode 100644
index 4ef567ffb6..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_local_activatehdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_local_reset.png b/app/src/main/res/drawable-hdpi/icon_local_reset.png
deleted file mode 100644
index 7d38cf0b50..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_local_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/icon_local_resethdpi.png b/app/src/main/res/drawable-hdpi/icon_local_resethdpi.png
deleted file mode 100644
index 7d38cf0b50..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_local_resethdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_visibility.png b/app/src/main/res/drawable-mdpi/ic_visibility.png
deleted file mode 100644
index d5a9dc9ca4..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_visibility.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png
deleted file mode 100644
index eeae6ccfdb..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-mdpi/icon_actions_temptarget.png
deleted file mode 100644
index 39170bab37..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_actions_temptarget.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index dc50653883..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-mdpi/icon_cp_age_battery.png
deleted file mode 100644
index 6c7fc56139..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_age_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-mdpi/icon_cp_age_canula.png
deleted file mode 100644
index 303ad946cd..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_age_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 5cd8598faa..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png
deleted file mode 100644
index d312b6c572..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_announcement.png b/app/src/main/res/drawable-mdpi/icon_cp_announcement.png
deleted file mode 100644
index 6e1338ac24..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_announcement.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 0cb14c2f57..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index ce4d8fb9d3..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index 54b51e126e..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index b2ba41c27d..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index 67c0fb1ba2..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index e0f0a15cc8..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png
deleted file mode 100644
index 14a44bc852..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 86ce00442c..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_exercise.png b/app/src/main/res/drawable-mdpi/icon_cp_exercise.png
deleted file mode 100644
index 1c92c0ebb5..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_exercise.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_note.png b/app/src/main/res/drawable-mdpi/icon_cp_note.png
deleted file mode 100644
index 7c8663a4fe..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png
deleted file mode 100644
index f4dab169a8..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png
deleted file mode 100644
index ee512c5fef..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index 70a90c596f..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_question.png b/app/src/main/res/drawable-mdpi/icon_cp_question.png
deleted file mode 100644
index 5d430d9164..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_cp_question.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_local_activate.png b/app/src/main/res/drawable-mdpi/icon_local_activate.png
deleted file mode 100644
index b39c72b407..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_local_activate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_local_activatemdpi.png b/app/src/main/res/drawable-mdpi/icon_local_activatemdpi.png
deleted file mode 100644
index b39c72b407..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_local_activatemdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_local_reset.png b/app/src/main/res/drawable-mdpi/icon_local_reset.png
deleted file mode 100644
index ad2e0eaf6d..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_local_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_local_resetmdpi.png b/app/src/main/res/drawable-mdpi/icon_local_resetmdpi.png
deleted file mode 100644
index ad2e0eaf6d..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_local_resetmdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/icon_local_savemdpi.png b/app/src/main/res/drawable-mdpi/icon_local_savemdpi.png
deleted file mode 100644
index 843beed523..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_local_savemdpi.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility.png b/app/src/main/res/drawable-xhdpi/ic_visibility.png
deleted file mode 100644
index 1e16fb934f..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_visibility.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png
deleted file mode 100644
index 57864f6ed5..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png
deleted file mode 100644
index c484837e53..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 4239e40ba7..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png
deleted file mode 100644
index 3d75b9dc7a..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png
deleted file mode 100644
index 8629a7998d..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 2e88ec9ad4..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png
deleted file mode 100644
index a3577da118..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_announcement.png b/app/src/main/res/drawable-xhdpi/icon_cp_announcement.png
deleted file mode 100644
index 472b51d775..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_announcement.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 030099f910..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index 908f33ccd8..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index 52ef734adf..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 8d2e9690fc..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index af93321e3a..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index e4c50f2667..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png
deleted file mode 100644
index ce23d1cf54..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png
deleted file mode 100644
index fbd5880490..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_exercise.png b/app/src/main/res/drawable-xhdpi/icon_cp_exercise.png
deleted file mode 100644
index 90cc102c07..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_exercise.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_note.png b/app/src/main/res/drawable-xhdpi/icon_cp_note.png
deleted file mode 100644
index cf821a9d1f..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png
deleted file mode 100644
index 15af2af396..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png
deleted file mode 100644
index 84ae19c4a3..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index d40a8540e6..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_question.png b/app/src/main/res/drawable-xhdpi/icon_cp_question.png
deleted file mode 100644
index 43df04ef81..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_question.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_local_activate.png b/app/src/main/res/drawable-xhdpi/icon_local_activate.png
deleted file mode 100644
index 75e9af38ed..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_local_activate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_local_reset.png b/app/src/main/res/drawable-xhdpi/icon_local_reset.png
deleted file mode 100644
index 2813cb448d..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_local_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility.png b/app/src/main/res/drawable-xxhdpi/ic_visibility.png
deleted file mode 100644
index dbc192368f..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_visibility.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png
deleted file mode 100644
index 29e28afe02..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png
deleted file mode 100644
index 4fa88421ae..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 1b4603bafc..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png
deleted file mode 100644
index d32a7791e1..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png
deleted file mode 100644
index 715682129b..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 79a21cea45..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png
deleted file mode 100644
index bb269c3af9..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png b/app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png
deleted file mode 100644
index e287fa15d4..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 4e68c25d70..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index c91b515001..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index e13a420bad..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 6a9fb42088..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index f1a791b702..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index d40cba3c46..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png
deleted file mode 100644
index 47d5de66a1..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 13fc303aa2..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png b/app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png
deleted file mode 100644
index 4fb54d3703..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_note.png b/app/src/main/res/drawable-xxhdpi/icon_cp_note.png
deleted file mode 100644
index c1881112b7..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png
deleted file mode 100644
index 1a6d44bba0..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png
deleted file mode 100644
index 6021f928ed..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index c7a8897a52..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_question.png b/app/src/main/res/drawable-xxhdpi/icon_cp_question.png
deleted file mode 100644
index 09455d09fd..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_question.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_activate.png b/app/src/main/res/drawable-xxhdpi/icon_local_activate.png
deleted file mode 100644
index 600e6ee61c..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_local_activate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_reset.png b/app/src/main/res/drawable-xxhdpi/icon_local_reset.png
deleted file mode 100644
index dc9d659dd7..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_local_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_visibility.png b/app/src/main/res/drawable-xxxhdpi/ic_visibility.png
deleted file mode 100644
index 882eacdee5..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_visibility.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png
deleted file mode 100644
index d5631ef3ae..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png
deleted file mode 100644
index 955a19f3bc..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 3da8775fb4..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png
deleted file mode 100644
index dd21ad490c..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png
deleted file mode 100644
index 6a3585b72f..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 3b50b616fc..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png
deleted file mode 100644
index 2dd35e6e9e..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png
deleted file mode 100644
index 256631f49b..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png
deleted file mode 100644
index fa72b549a9..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index 1418ea4994..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index aa7bdf7fe3..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 1f9ab1697d..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index 2d7e6b4542..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index e8b4668b86..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png
deleted file mode 100644
index e8d0e6773e..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 2bdaf7d73d..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png
deleted file mode 100644
index c16560e8de..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_note.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_note.png
deleted file mode 100644
index dd1e04b419..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png
deleted file mode 100644
index f1d306de12..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png
deleted file mode 100644
index 465111a6ba..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index afffd90482..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_question.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_question.png
deleted file mode 100644
index b2e19c1575..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_question.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_activate.png b/app/src/main/res/drawable-xxxhdpi/icon_local_activate.png
deleted file mode 100644
index 2de9ce9d4d..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_local_activate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_reset.png b/app/src/main/res/drawable-xxxhdpi/icon_local_reset.png
deleted file mode 100644
index ec54479149..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_local_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_actions_temptarget.png b/app/src/main/res/drawable/icon_actions_temptarget.png
deleted file mode 100644
index 39170bab37..0000000000
Binary files a/app/src/main/res/drawable/icon_actions_temptarget.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_aaps_offline.png b/app/src/main/res/drawable/icon_cp_aaps_offline.png
deleted file mode 100644
index dc50653883..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_aaps_offline.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_age_battery.png b/app/src/main/res/drawable/icon_cp_age_battery.png
deleted file mode 100644
index 6c7fc56139..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_age_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_age_canula.png b/app/src/main/res/drawable/icon_cp_age_canula.png
deleted file mode 100644
index 303ad946cd..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_age_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_age_insulin.png b/app/src/main/res/drawable/icon_cp_age_insulin.png
deleted file mode 100644
index 5cd8598faa..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_age_insulin.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_age_sensor.png b/app/src/main/res/drawable/icon_cp_age_sensor.png
deleted file mode 100644
index d312b6c572..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_age_sensor.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_announcement.png b/app/src/main/res/drawable/icon_cp_announcement.png
deleted file mode 100644
index 6e1338ac24..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_announcement.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_bgcheck.png b/app/src/main/res/drawable/icon_cp_bgcheck.png
deleted file mode 100644
index 0cb14c2f57..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_bgcheck.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_bolus_combo.png b/app/src/main/res/drawable/icon_cp_bolus_combo.png
deleted file mode 100644
index ce4d8fb9d3..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_bolus_combo.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_bolus_meal.png b/app/src/main/res/drawable/icon_cp_bolus_meal.png
deleted file mode 100644
index 54b51e126e..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_bolus_meal.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_bolus_snack.png b/app/src/main/res/drawable/icon_cp_bolus_snack.png
deleted file mode 100644
index b2ba41c27d..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_bolus_snack.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_cgm_insert.png b/app/src/main/res/drawable/icon_cp_cgm_insert.png
deleted file mode 100644
index 67c0fb1ba2..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_cgm_insert.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_cgm_profile.png b/app/src/main/res/drawable/icon_cp_cgm_profile.png
deleted file mode 100644
index e0f0a15cc8..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_cgm_profile.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_cgm_start.png b/app/src/main/res/drawable/icon_cp_cgm_start.png
deleted file mode 100644
index 14a44bc852..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_cgm_start.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_cgm_target.png b/app/src/main/res/drawable/icon_cp_cgm_target.png
deleted file mode 100644
index 86ce00442c..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_cgm_target.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_exercise.png b/app/src/main/res/drawable/icon_cp_exercise.png
deleted file mode 100644
index 1c92c0ebb5..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_exercise.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_note.png b/app/src/main/res/drawable/icon_cp_note.png
deleted file mode 100644
index 7c8663a4fe..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_pump_battery.png b/app/src/main/res/drawable/icon_cp_pump_battery.png
deleted file mode 100644
index f4dab169a8..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_pump_battery.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_pump_canula.png b/app/src/main/res/drawable/icon_cp_pump_canula.png
deleted file mode 100644
index ee512c5fef..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_pump_canula.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_pump_cartridge.png b/app/src/main/res/drawable/icon_cp_pump_cartridge.png
deleted file mode 100644
index 70a90c596f..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_pump_cartridge.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_cp_question.png b/app/src/main/res/drawable/icon_cp_question.png
deleted file mode 100644
index 5d430d9164..0000000000
Binary files a/app/src/main/res/drawable/icon_cp_question.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_local_activate.png b/app/src/main/res/drawable/icon_local_activate.png
deleted file mode 100644
index 2de9ce9d4d..0000000000
Binary files a/app/src/main/res/drawable/icon_local_activate.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_local_reset.png b/app/src/main/res/drawable/icon_local_reset.png
deleted file mode 100644
index dc9d659dd7..0000000000
Binary files a/app/src/main/res/drawable/icon_local_reset.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/icon_actions_refill.png b/core/src/main/res/drawable-hdpi/icon_actions_refill.png
deleted file mode 100644
index ace25d1558..0000000000
Binary files a/core/src/main/res/drawable-hdpi/icon_actions_refill.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/icon_danar_useropt.png b/core/src/main/res/drawable-hdpi/icon_danar_useropt.png
deleted file mode 100644
index ee3ab7725e..0000000000
Binary files a/core/src/main/res/drawable-hdpi/icon_danar_useropt.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/icon_danarhistory.png b/core/src/main/res/drawable-hdpi/icon_danarhistory.png
deleted file mode 100644
index 2de295946a..0000000000
Binary files a/core/src/main/res/drawable-hdpi/icon_danarhistory.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/icon_danarprofile.png b/core/src/main/res/drawable-hdpi/icon_danarprofile.png
deleted file mode 100644
index 31148c5647..0000000000
Binary files a/core/src/main/res/drawable-hdpi/icon_danarprofile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/icon_danarstats.png b/core/src/main/res/drawable-hdpi/icon_danarstats.png
deleted file mode 100644
index 9caa112e0e..0000000000
Binary files a/core/src/main/res/drawable-hdpi/icon_danarstats.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/icon_home_profile.png b/core/src/main/res/drawable-hdpi/icon_home_profile.png
deleted file mode 100644
index b288171332..0000000000
Binary files a/core/src/main/res/drawable-hdpi/icon_home_profile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/icon_local_save.png b/core/src/main/res/drawable-hdpi/icon_local_save.png
deleted file mode 100644
index e5c1d5cedc..0000000000
Binary files a/core/src/main/res/drawable-hdpi/icon_local_save.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/icon_danarhistory.png b/core/src/main/res/drawable-mdpi/icon_danarhistory.png
deleted file mode 100644
index 60e61d125a..0000000000
Binary files a/core/src/main/res/drawable-mdpi/icon_danarhistory.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/icon_danarprofile.png b/core/src/main/res/drawable-mdpi/icon_danarprofile.png
deleted file mode 100644
index 485eb6dc61..0000000000
Binary files a/core/src/main/res/drawable-mdpi/icon_danarprofile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/icon_danarstats.png b/core/src/main/res/drawable-mdpi/icon_danarstats.png
deleted file mode 100644
index a0fcd27008..0000000000
Binary files a/core/src/main/res/drawable-mdpi/icon_danarstats.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/icon_local_save.png b/core/src/main/res/drawable-mdpi/icon_local_save.png
deleted file mode 100644
index 843beed523..0000000000
Binary files a/core/src/main/res/drawable-mdpi/icon_local_save.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xhdpi/icon_actions_refill.png
deleted file mode 100644
index ace20f3bfe..0000000000
Binary files a/core/src/main/res/drawable-xhdpi/icon_actions_refill.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/icon_danar_useropt.png b/core/src/main/res/drawable-xhdpi/icon_danar_useropt.png
deleted file mode 100644
index 126122a570..0000000000
Binary files a/core/src/main/res/drawable-xhdpi/icon_danar_useropt.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xhdpi/icon_danarhistory.png
deleted file mode 100644
index 8dba1c6a8e..0000000000
Binary files a/core/src/main/res/drawable-xhdpi/icon_danarhistory.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xhdpi/icon_danarprofile.png
deleted file mode 100644
index 227b49a89c..0000000000
Binary files a/core/src/main/res/drawable-xhdpi/icon_danarprofile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/icon_danarstats.png b/core/src/main/res/drawable-xhdpi/icon_danarstats.png
deleted file mode 100644
index 3d525ea4e6..0000000000
Binary files a/core/src/main/res/drawable-xhdpi/icon_danarstats.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/icon_home_profile.png b/core/src/main/res/drawable-xhdpi/icon_home_profile.png
deleted file mode 100644
index 95c0ca4502..0000000000
Binary files a/core/src/main/res/drawable-xhdpi/icon_home_profile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/icon_local_save.png b/core/src/main/res/drawable-xhdpi/icon_local_save.png
deleted file mode 100644
index 0cf81430cc..0000000000
Binary files a/core/src/main/res/drawable-xhdpi/icon_local_save.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xxhdpi/icon_actions_refill.png
deleted file mode 100644
index 45cc5d3e1a..0000000000
Binary files a/core/src/main/res/drawable-xxhdpi/icon_actions_refill.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png b/core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png
deleted file mode 100644
index b2a8eb9313..0000000000
Binary files a/core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xxhdpi/icon_danarhistory.png
deleted file mode 100644
index dcd00419a3..0000000000
Binary files a/core/src/main/res/drawable-xxhdpi/icon_danarhistory.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xxhdpi/icon_danarprofile.png
deleted file mode 100644
index 7da3c045fe..0000000000
Binary files a/core/src/main/res/drawable-xxhdpi/icon_danarprofile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/icon_danarstats.png b/core/src/main/res/drawable-xxhdpi/icon_danarstats.png
deleted file mode 100644
index 254623e213..0000000000
Binary files a/core/src/main/res/drawable-xxhdpi/icon_danarstats.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/icon_home_profile.png b/core/src/main/res/drawable-xxhdpi/icon_home_profile.png
deleted file mode 100644
index 00c4de023a..0000000000
Binary files a/core/src/main/res/drawable-xxhdpi/icon_home_profile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/icon_local_save.png b/core/src/main/res/drawable-xxhdpi/icon_local_save.png
deleted file mode 100644
index 20448e4bf9..0000000000
Binary files a/core/src/main/res/drawable-xxhdpi/icon_local_save.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
deleted file mode 100644
index be3a5db708..0000000000
Binary files a/core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png b/core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png
deleted file mode 100644
index 52f952ced4..0000000000
Binary files a/core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png
deleted file mode 100644
index 1f37071514..0000000000
Binary files a/core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png
deleted file mode 100644
index ae1d615a33..0000000000
Binary files a/core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danarstats.png b/core/src/main/res/drawable-xxxhdpi/icon_danarstats.png
deleted file mode 100644
index d147295d62..0000000000
Binary files a/core/src/main/res/drawable-xxxhdpi/icon_danarstats.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxxhdpi/icon_home_profile.png b/core/src/main/res/drawable-xxxhdpi/icon_home_profile.png
deleted file mode 100644
index 80234a0f75..0000000000
Binary files a/core/src/main/res/drawable-xxxhdpi/icon_home_profile.png and /dev/null differ
diff --git a/core/src/main/res/drawable/icon_actions_profileswitch.png b/core/src/main/res/drawable/icon_actions_profileswitch.png
deleted file mode 100644
index eeae6ccfdb..0000000000
Binary files a/core/src/main/res/drawable/icon_actions_profileswitch.png and /dev/null differ
diff --git a/core/src/main/res/drawable/icon_actions_refill.png b/core/src/main/res/drawable/icon_actions_refill.png
deleted file mode 100644
index 737cca8b00..0000000000
Binary files a/core/src/main/res/drawable/icon_actions_refill.png and /dev/null differ
diff --git a/core/src/main/res/drawable/icon_danar_useropt.png b/core/src/main/res/drawable/icon_danar_useropt.png
deleted file mode 100644
index 1fadcd446b..0000000000
Binary files a/core/src/main/res/drawable/icon_danar_useropt.png and /dev/null differ
diff --git a/core/src/main/res/drawable/icon_home_profile.png b/core/src/main/res/drawable/icon_home_profile.png
deleted file mode 100644
index f689df10c6..0000000000
Binary files a/core/src/main/res/drawable/icon_home_profile.png and /dev/null differ
diff --git a/core/src/main/res/drawable/icon_local_save.png b/core/src/main/res/drawable/icon_local_save.png
deleted file mode 100644
index f2ecc45ac0..0000000000
Binary files a/core/src/main/res/drawable/icon_local_save.png and /dev/null differ