From 059e58c640b2ef700218a213e55320f32c50bd89 Mon Sep 17 00:00:00 2001
From: PoweRGbg <roumen_georgiev@yahoo.com>
Date: Fri, 21 Jul 2017 12:17:37 +0300
Subject: [PATCH 1/2] Files renamed

---
 ...extbolus.png => icon_actions_cancelextbolus.png} | Bin
 ...ileswitch.png => icon_actions_profileswitch.png} | Bin
 ...n_actions-refill.png => icon_actions_refill.png} | Bin
 ...textbolus.png => icon_actions_startextbolus.png} | Bin
 ...empbasal.png => icon_actions_starttempbasal.png} | Bin
 ...s-temptarget.png => icon_actions_temptarget.png} | Bin
 ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin
 ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin
 ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin
 ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin
 ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin
 ...cp-announcement.png => icon_cp_announcement.png} | Bin
 ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin
 ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin
 .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png}    | Bin
 ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin
 ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin
 ...-correction.png => icon_cp_bolus_correction.png} | Bin
 ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin
 ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin
 ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin
 ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin
 ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin
 ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin
 .../{icon_cp-exercise.png => icon_cp_exercise.png}  | Bin
 .../{icon_cp-note.png => icon_cp_note.png}          | Bin
 ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin
 ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin
 ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin
 .../{icon_cp-question.png => icon_cp_question.png}  | Bin
 .../{icon_home-loop.png => icon_home_loop.png}      | Bin
 ...{icon_home-profile.png => icon_home_profile.png} | Bin
 .../{icon_home-target.png => icon_home_target.png}  | Bin
 ...extbolus.png => icon_actions_cancelextbolus.png} | Bin
 ...ileswitch.png => icon_actions_profileswitch.png} | Bin
 ...n_actions-refill.png => icon_actions_refill.png} | Bin
 ...textbolus.png => icon_actions_startextbolus.png} | Bin
 ...empbasal.png => icon_actions_starttempbasal.png} | Bin
 ...s-temptarget.png => icon_actions_temptarget.png} | Bin
 ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin
 ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin
 ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin
 ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin
 ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin
 ...cp-announcement.png => icon_cp_announcement.png} | Bin
 ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin
 ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin
 .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png}    | Bin
 ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin
 ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin
 ...-correction.png => icon_cp_bolus_correction.png} | Bin
 ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin
 ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin
 ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin
 ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin
 ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin
 ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin
 .../{icon_cp-exercise.png => icon_cp_exercise.png}  | Bin
 .../{icon_cp-note.png => icon_cp_note.png}          | Bin
 ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin
 ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin
 ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin
 .../{icon_cp-question.png => icon_cp_question.png}  | Bin
 .../{icon_home-loop.png => icon_home_loop.png}      | Bin
 ...{icon_home-profile.png => icon_home_profile.png} | Bin
 .../{icon_home-target.png => icon_home_target.png}  | Bin
 ...extbolus.png => icon_actions_cancelextbolus.png} | Bin
 ...ileswitch.png => icon_actions_profileswitch.png} | Bin
 ...n_actions-refill.png => icon_actions_refill.png} | Bin
 ...textbolus.png => icon_actions_startextbolus.png} | Bin
 ...empbasal.png => icon_actions_starttempbasal.png} | Bin
 ...s-temptarget.png => icon_actions_temptarget.png} | Bin
 ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin
 ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin
 ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin
 ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin
 ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin
 ...cp-announcement.png => icon_cp_announcement.png} | Bin
 ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin
 ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin
 .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png}    | Bin
 ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin
 ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin
 ...-correction.png => icon_cp_bolus_correction.png} | Bin
 ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin
 ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin
 ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin
 ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin
 ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin
 ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin
 .../{icon_cp-exercise.png => icon_cp_exercise.png}  | Bin
 .../{icon_cp-note.png => icon_cp_note.png}          | Bin
 ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin
 ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin
 ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin
 .../{icon_cp-question.png => icon_cp_question.png}  | Bin
 .../{icon_home-loop.png => icon_home_loop.png}      | Bin
 ...{icon_home-profile.png => icon_home_profile.png} | Bin
 .../{icon_home-target.png => icon_home_target.png}  | Bin
 ...extbolus.png => icon_actions_cancelextbolus.png} | Bin
 ...ileswitch.png => icon_actions_profileswitch.png} | Bin
 ...n_actions-refill.png => icon_actions_refill.png} | Bin
 ...textbolus.png => icon_actions_startextbolus.png} | Bin
 ...empbasal.png => icon_actions_starttempbasal.png} | Bin
 ...s-temptarget.png => icon_actions_temptarget.png} | Bin
 ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin
 ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin
 ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin
 ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin
 ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin
 ...cp-announcement.png => icon_cp_announcement.png} | Bin
 ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin
 ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin
 .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png}    | Bin
 ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin
 ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin
 ...-correction.png => icon_cp_bolus_correction.png} | Bin
 ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin
 ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin
 ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin
 ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin
 ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin
 ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin
 .../{icon_cp-exercise.png => icon_cp_exercise.png}  | Bin
 .../{icon_cp-note.png => icon_cp_note.png}          | Bin
 ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin
 ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin
 ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin
 .../{icon_cp-question.png => icon_cp_question.png}  | Bin
 .../{icon_home-loop.png => icon_home_loop.png}      | Bin
 ...{icon_home-profile.png => icon_home_profile.png} | Bin
 .../{icon_home-target.png => icon_home_target.png}  | Bin
 ...extbolus.png => icon_actions_cancelextbolus.png} | Bin
 ...ileswitch.png => icon_actions_profileswitch.png} | Bin
 ...n_actions-refill.png => icon_actions_refill.png} | Bin
 ...textbolus.png => icon_actions_startextbolus.png} | Bin
 ...empbasal.png => icon_actions_starttempbasal.png} | Bin
 ...s-temptarget.png => icon_actions_temptarget.png} | Bin
 ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin
 ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin
 ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin
 ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin
 ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin
 ...cp-announcement.png => icon_cp_announcement.png} | Bin
 ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin
 ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin
 .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png}    | Bin
 ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin
 ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin
 ...-correction.png => icon_cp_bolus_correction.png} | Bin
 ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin
 ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin
 ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin
 ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin
 ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin
 ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin
 .../{icon_cp-exercise.png => icon_cp_exercise.png}  | Bin
 .../{icon_cp-note.png => icon_cp_note.png}          | Bin
 ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin
 ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin
 ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin
 .../{icon_cp-question.png => icon_cp_question.png}  | Bin
 .../{icon_home-loop.png => icon_home_loop.png}      | Bin
 ...{icon_home-profile.png => icon_home_profile.png} | Bin
 .../{icon_home-target.png => icon_home_target.png}  | Bin
 ...extbolus.png => icon_actions_cancelextbolus.png} | Bin
 ...ileswitch.png => icon_actions_profileswitch.png} | Bin
 ...n_actions-refill.png => icon_actions_refill.png} | Bin
 ...textbolus.png => icon_actions_startextbolus.png} | Bin
 ...empbasal.png => icon_actions_starttempbasal.png} | Bin
 ...s-temptarget.png => icon_actions_temptarget.png} | Bin
 ...cp-aaps-offline.png => icon_cp_aaps_offline.png} | Bin
 ...n_cp-age-battery.png => icon_cp_age_battery.png} | Bin
 ...con_cp-age-canula.png => icon_cp_age_canula.png} | Bin
 ...n_cp-age-insulin.png => icon_cp_age_insulin.png} | Bin
 ...con_cp-age-sensor.png => icon_cp_age_sensor.png} | Bin
 ...cp-announcement.png => icon_cp_announcement.png} | Bin
 ...{icon_cp-basal-end.png => icon_cp_basal_end.png} | Bin
 ...n_cp-basal-start.png => icon_cp_basal_start.png} | Bin
 .../{icon_cp-bgcheck.png => icon_cp_bgcheck.png}    | Bin
 ...n_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} | Bin
 ...n_cp-bolus-combo.png => icon_cp_bolus_combo.png} | Bin
 ...-correction.png => icon_cp_bolus_correction.png} | Bin
 ...con_cp-bolus-meal.png => icon_cp_bolus_meal.png} | Bin
 ...n_cp-bolus-snack.png => icon_cp_bolus_snack.png} | Bin
 ...con_cp-cgm-insert.png => icon_cp_cgm_insert.png} | Bin
 ...n_cp-cgm-profile.png => icon_cp_cgm_profile.png} | Bin
 ...{icon_cp-cgm-start.png => icon_cp_cgm_start.png} | Bin
 ...con_cp-cgm-target.png => icon_cp_cgm_target.png} | Bin
 .../{icon_cp-exercise.png => icon_cp_exercise.png}  | Bin
 .../drawable/{icon_cp-note.png => icon_cp_note.png} | Bin
 ...cp-pump-battery.png => icon_cp_pump_battery.png} | Bin
 ...n_cp-pump-canula.png => icon_cp_pump_canula.png} | Bin
 ...ump-cartridge.png => icon_cp_pump_cartridge.png} | Bin
 .../{icon_cp-question.png => icon_cp_question.png}  | Bin
 .../{icon_home-loop.png => icon_home_loop.png}      | Bin
 ...{icon_home-profile.png => icon_home_profile.png} | Bin
 .../{icon_home-target.png => icon_home_target.png}  | Bin
 app/src/main/res/values/strings.xml                 |   1 -
 199 files changed, 1 deletion(-)
 rename app/src/main/res/drawable-hdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-note.png => icon_cp_note.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_cp-question.png => icon_cp_question.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_home-loop.png => icon_home_loop.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_home-profile.png => icon_home_profile.png} (100%)
 rename app/src/main/res/drawable-hdpi/{icon_home-target.png => icon_home_target.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-note.png => icon_cp_note.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_cp-question.png => icon_cp_question.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_home-loop.png => icon_home_loop.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_home-profile.png => icon_home_profile.png} (100%)
 rename app/src/main/res/drawable-mdpi/{icon_home-target.png => icon_home_target.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-note.png => icon_cp_note.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_cp-question.png => icon_cp_question.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_home-loop.png => icon_home_loop.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_home-profile.png => icon_home_profile.png} (100%)
 rename app/src/main/res/drawable-xhdpi/{icon_home-target.png => icon_home_target.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-note.png => icon_cp_note.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_cp-question.png => icon_cp_question.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_home-loop.png => icon_home_loop.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_home-profile.png => icon_home_profile.png} (100%)
 rename app/src/main/res/drawable-xxhdpi/{icon_home-target.png => icon_home_target.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_actions-refill.png => icon_actions_refill.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-announcement.png => icon_cp_announcement.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-exercise.png => icon_cp_exercise.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-note.png => icon_cp_note.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_cp-question.png => icon_cp_question.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_home-loop.png => icon_home_loop.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_home-profile.png => icon_home_profile.png} (100%)
 rename app/src/main/res/drawable-xxxhdpi/{icon_home-target.png => icon_home_target.png} (100%)
 rename app/src/main/res/drawable/{icon_actions-cancelextbolus.png => icon_actions_cancelextbolus.png} (100%)
 rename app/src/main/res/drawable/{icon_actions-profileswitch.png => icon_actions_profileswitch.png} (100%)
 rename app/src/main/res/drawable/{icon_actions-refill.png => icon_actions_refill.png} (100%)
 rename app/src/main/res/drawable/{icon_actions-startextbolus.png => icon_actions_startextbolus.png} (100%)
 rename app/src/main/res/drawable/{icon_actions-starttempbasal.png => icon_actions_starttempbasal.png} (100%)
 rename app/src/main/res/drawable/{icon_actions-temptarget.png => icon_actions_temptarget.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-aaps-offline.png => icon_cp_aaps_offline.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-age-battery.png => icon_cp_age_battery.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-age-canula.png => icon_cp_age_canula.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-age-insulin.png => icon_cp_age_insulin.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-age-sensor.png => icon_cp_age_sensor.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-announcement.png => icon_cp_announcement.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-basal-end.png => icon_cp_basal_end.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-basal-start.png => icon_cp_basal_start.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-bgcheck.png => icon_cp_bgcheck.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-bolus-carbs.png => icon_cp_bolus_carbs.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-bolus-combo.png => icon_cp_bolus_combo.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-bolus-correction.png => icon_cp_bolus_correction.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-bolus-meal.png => icon_cp_bolus_meal.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-bolus-snack.png => icon_cp_bolus_snack.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-cgm-insert.png => icon_cp_cgm_insert.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-cgm-profile.png => icon_cp_cgm_profile.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-cgm-start.png => icon_cp_cgm_start.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-cgm-target.png => icon_cp_cgm_target.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-exercise.png => icon_cp_exercise.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-note.png => icon_cp_note.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-pump-battery.png => icon_cp_pump_battery.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-pump-canula.png => icon_cp_pump_canula.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-pump-cartridge.png => icon_cp_pump_cartridge.png} (100%)
 rename app/src/main/res/drawable/{icon_cp-question.png => icon_cp_question.png} (100%)
 rename app/src/main/res/drawable/{icon_home-loop.png => icon_home_loop.png} (100%)
 rename app/src/main/res/drawable/{icon_home-profile.png => icon_home_profile.png} (100%)
 rename app/src/main/res/drawable/{icon_home-target.png => icon_home_target.png} (100%)

diff --git a/app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png
rename to app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png
rename to app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-refill.png b/app/src/main/res/drawable-hdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_actions-refill.png
rename to app/src/main/res/drawable-hdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png
rename to app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png
rename to app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-hdpi/icon_actions_temptarget.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_actions-temptarget.png
rename to app/src/main/res/drawable-hdpi/icon_actions_temptarget.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-aaps-offline.png
rename to app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-age-battery.png
rename to app/src/main/res/drawable-hdpi/icon_cp_age_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-age-canula.png
rename to app/src/main/res/drawable-hdpi/icon_cp_age_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-age-insulin.png
rename to app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-age-sensor.png
rename to app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-announcement.png b/app/src/main/res/drawable-hdpi/icon_cp_announcement.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-announcement.png
rename to app/src/main/res/drawable-hdpi/icon_cp_announcement.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_end.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-basal-end.png
rename to app/src/main/res/drawable-hdpi/icon_cp_basal_end.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_start.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-basal-start.png
rename to app/src/main/res/drawable-hdpi/icon_cp_basal_start.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png
rename to app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-carbs.png
rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-combo.png
rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png
rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-meal.png
rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-bolus-snack.png
rename to app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-insert.png
rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-profile.png
rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-start.png
rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-cgm-target.png
rename to app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-exercise.png b/app/src/main/res/drawable-hdpi/icon_cp_exercise.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-exercise.png
rename to app/src/main/res/drawable-hdpi/icon_cp_exercise.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-note.png b/app/src/main/res/drawable-hdpi/icon_cp_note.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-note.png
rename to app/src/main/res/drawable-hdpi/icon_cp_note.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-pump-battery.png
rename to app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-pump-canula.png
rename to app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-pump-cartridge.png
rename to app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png
diff --git a/app/src/main/res/drawable-hdpi/icon_cp-question.png b/app/src/main/res/drawable-hdpi/icon_cp_question.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_cp-question.png
rename to app/src/main/res/drawable-hdpi/icon_cp_question.png
diff --git a/app/src/main/res/drawable-hdpi/icon_home-loop.png b/app/src/main/res/drawable-hdpi/icon_home_loop.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_home-loop.png
rename to app/src/main/res/drawable-hdpi/icon_home_loop.png
diff --git a/app/src/main/res/drawable-hdpi/icon_home-profile.png b/app/src/main/res/drawable-hdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_home-profile.png
rename to app/src/main/res/drawable-hdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-hdpi/icon_home-target.png b/app/src/main/res/drawable-hdpi/icon_home_target.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_home-target.png
rename to app/src/main/res/drawable-hdpi/icon_home_target.png
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png
rename to app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png
rename to app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-refill.png b/app/src/main/res/drawable-mdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_actions-refill.png
rename to app/src/main/res/drawable-mdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png
rename to app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png
rename to app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-mdpi/icon_actions_temptarget.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_actions-temptarget.png
rename to app/src/main/res/drawable-mdpi/icon_actions_temptarget.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-aaps-offline.png
rename to app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-age-battery.png
rename to app/src/main/res/drawable-mdpi/icon_cp_age_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-age-canula.png
rename to app/src/main/res/drawable-mdpi/icon_cp_age_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-age-insulin.png
rename to app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-age-sensor.png
rename to app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-announcement.png b/app/src/main/res/drawable-mdpi/icon_cp_announcement.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-announcement.png
rename to app/src/main/res/drawable-mdpi/icon_cp_announcement.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_end.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-basal-end.png
rename to app/src/main/res/drawable-mdpi/icon_cp_basal_end.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_start.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-basal-start.png
rename to app/src/main/res/drawable-mdpi/icon_cp_basal_start.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png
rename to app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-carbs.png
rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-combo.png
rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png
rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-meal.png
rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-bolus-snack.png
rename to app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-insert.png
rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-profile.png
rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-start.png
rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-cgm-target.png
rename to app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-exercise.png b/app/src/main/res/drawable-mdpi/icon_cp_exercise.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-exercise.png
rename to app/src/main/res/drawable-mdpi/icon_cp_exercise.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-note.png b/app/src/main/res/drawable-mdpi/icon_cp_note.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-note.png
rename to app/src/main/res/drawable-mdpi/icon_cp_note.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-pump-battery.png
rename to app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-pump-canula.png
rename to app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-pump-cartridge.png
rename to app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png
diff --git a/app/src/main/res/drawable-mdpi/icon_cp-question.png b/app/src/main/res/drawable-mdpi/icon_cp_question.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_cp-question.png
rename to app/src/main/res/drawable-mdpi/icon_cp_question.png
diff --git a/app/src/main/res/drawable-mdpi/icon_home-loop.png b/app/src/main/res/drawable-mdpi/icon_home_loop.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_home-loop.png
rename to app/src/main/res/drawable-mdpi/icon_home_loop.png
diff --git a/app/src/main/res/drawable-mdpi/icon_home-profile.png b/app/src/main/res/drawable-mdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_home-profile.png
rename to app/src/main/res/drawable-mdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-mdpi/icon_home-target.png b/app/src/main/res/drawable-mdpi/icon_home_target.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_home-target.png
rename to app/src/main/res/drawable-mdpi/icon_home_target.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png
rename to app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_actions-profileswitch.png
rename to app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xhdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_actions-refill.png
rename to app/src/main/res/drawable-xhdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png
rename to app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png
rename to app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png
rename to app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-aaps-offline.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-age-battery.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-age-canula.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-age-insulin.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-age-sensor.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-announcement.png b/app/src/main/res/drawable-xhdpi/icon_cp_announcement.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-announcement.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_announcement.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-basal-start.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-carbs.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-combo.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-meal.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-bolus-snack.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-insert.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-profile.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-start.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-cgm-target.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xhdpi/icon_cp_exercise.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-exercise.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_exercise.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-note.png b/app/src/main/res/drawable-xhdpi/icon_cp_note.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-note.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_note.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-pump-battery.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-pump-canula.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-pump-cartridge.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp-question.png b/app/src/main/res/drawable-xhdpi/icon_cp_question.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_cp-question.png
rename to app/src/main/res/drawable-xhdpi/icon_cp_question.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_home-loop.png b/app/src/main/res/drawable-xhdpi/icon_home_loop.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_home-loop.png
rename to app/src/main/res/drawable-xhdpi/icon_home_loop.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_home-profile.png b/app/src/main/res/drawable-xhdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_home-profile.png
rename to app/src/main/res/drawable-xhdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_home-target.png b/app/src/main/res/drawable-xhdpi/icon_home_target.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_home-target.png
rename to app/src/main/res/drawable-xhdpi/icon_home_target.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png
rename to app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_actions-profileswitch.png
rename to app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xxhdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_actions-refill.png
rename to app/src/main/res/drawable-xxhdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png
rename to app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png
rename to app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_actions-temptarget.png
rename to app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-aaps-offline.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-battery.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-canula.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-insulin.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-age-sensor.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-announcement.png b/app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-announcement.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-basal-end.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-basal-start.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-carbs.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-combo.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-meal.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-bolus-snack.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-insert.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-profile.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-start.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-cgm-target.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-note.png b/app/src/main/res/drawable-xxhdpi/icon_cp_note.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-note.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_note.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-pump-battery.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-pump-canula.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-pump-cartridge.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp-question.png b/app/src/main/res/drawable-xxhdpi/icon_cp_question.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_cp-question.png
rename to app/src/main/res/drawable-xxhdpi/icon_cp_question.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxhdpi/icon_home_loop.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_home-loop.png
rename to app/src/main/res/drawable-xxhdpi/icon_home_loop.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-profile.png b/app/src/main/res/drawable-xxhdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_home-profile.png
rename to app/src/main/res/drawable-xxhdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-target.png b/app/src/main/res/drawable-xxhdpi/icon_home_target.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_home-target.png
rename to app/src/main/res/drawable-xxhdpi/icon_home_target.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png
rename to app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-profileswitch.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_actions-profileswitch.png
rename to app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png
rename to app/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png
rename to app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png
rename to app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png
rename to app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-aaps-offline.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-battery.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-canula.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-insulin.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-age-sensor.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-end.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-basal-end.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bgcheck.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bgcheck.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-combo.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-meal.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-snack.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-insert.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-profile.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-start.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-target.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-exercise.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-exercise.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-note.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_note.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-note.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_note.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-pump-battery.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-pump-canula.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png
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
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-pump-cartridge.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp-question.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_question.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_cp-question.png
rename to app/src/main/res/drawable-xxxhdpi/icon_cp_question.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxxhdpi/icon_home_loop.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_home-loop.png
rename to app/src/main/res/drawable-xxxhdpi/icon_home_loop.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-profile.png b/app/src/main/res/drawable-xxxhdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_home-profile.png
rename to app/src/main/res/drawable-xxxhdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-target.png b/app/src/main/res/drawable-xxxhdpi/icon_home_target.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_home-target.png
rename to app/src/main/res/drawable-xxxhdpi/icon_home_target.png
diff --git a/app/src/main/res/drawable/icon_actions-cancelextbolus.png b/app/src/main/res/drawable/icon_actions_cancelextbolus.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions-cancelextbolus.png
rename to app/src/main/res/drawable/icon_actions_cancelextbolus.png
diff --git a/app/src/main/res/drawable/icon_actions-profileswitch.png b/app/src/main/res/drawable/icon_actions_profileswitch.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions-profileswitch.png
rename to app/src/main/res/drawable/icon_actions_profileswitch.png
diff --git a/app/src/main/res/drawable/icon_actions-refill.png b/app/src/main/res/drawable/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions-refill.png
rename to app/src/main/res/drawable/icon_actions_refill.png
diff --git a/app/src/main/res/drawable/icon_actions-startextbolus.png b/app/src/main/res/drawable/icon_actions_startextbolus.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions-startextbolus.png
rename to app/src/main/res/drawable/icon_actions_startextbolus.png
diff --git a/app/src/main/res/drawable/icon_actions-starttempbasal.png b/app/src/main/res/drawable/icon_actions_starttempbasal.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions-starttempbasal.png
rename to app/src/main/res/drawable/icon_actions_starttempbasal.png
diff --git a/app/src/main/res/drawable/icon_actions-temptarget.png b/app/src/main/res/drawable/icon_actions_temptarget.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions-temptarget.png
rename to app/src/main/res/drawable/icon_actions_temptarget.png
diff --git a/app/src/main/res/drawable/icon_cp-aaps-offline.png b/app/src/main/res/drawable/icon_cp_aaps_offline.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-aaps-offline.png
rename to app/src/main/res/drawable/icon_cp_aaps_offline.png
diff --git a/app/src/main/res/drawable/icon_cp-age-battery.png b/app/src/main/res/drawable/icon_cp_age_battery.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-age-battery.png
rename to app/src/main/res/drawable/icon_cp_age_battery.png
diff --git a/app/src/main/res/drawable/icon_cp-age-canula.png b/app/src/main/res/drawable/icon_cp_age_canula.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-age-canula.png
rename to app/src/main/res/drawable/icon_cp_age_canula.png
diff --git a/app/src/main/res/drawable/icon_cp-age-insulin.png b/app/src/main/res/drawable/icon_cp_age_insulin.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-age-insulin.png
rename to app/src/main/res/drawable/icon_cp_age_insulin.png
diff --git a/app/src/main/res/drawable/icon_cp-age-sensor.png b/app/src/main/res/drawable/icon_cp_age_sensor.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-age-sensor.png
rename to app/src/main/res/drawable/icon_cp_age_sensor.png
diff --git a/app/src/main/res/drawable/icon_cp-announcement.png b/app/src/main/res/drawable/icon_cp_announcement.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-announcement.png
rename to app/src/main/res/drawable/icon_cp_announcement.png
diff --git a/app/src/main/res/drawable/icon_cp-basal-end.png b/app/src/main/res/drawable/icon_cp_basal_end.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-basal-end.png
rename to app/src/main/res/drawable/icon_cp_basal_end.png
diff --git a/app/src/main/res/drawable/icon_cp-basal-start.png b/app/src/main/res/drawable/icon_cp_basal_start.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-basal-start.png
rename to app/src/main/res/drawable/icon_cp_basal_start.png
diff --git a/app/src/main/res/drawable/icon_cp-bgcheck.png b/app/src/main/res/drawable/icon_cp_bgcheck.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-bgcheck.png
rename to app/src/main/res/drawable/icon_cp_bgcheck.png
diff --git a/app/src/main/res/drawable/icon_cp-bolus-carbs.png b/app/src/main/res/drawable/icon_cp_bolus_carbs.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-bolus-carbs.png
rename to app/src/main/res/drawable/icon_cp_bolus_carbs.png
diff --git a/app/src/main/res/drawable/icon_cp-bolus-combo.png b/app/src/main/res/drawable/icon_cp_bolus_combo.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-bolus-combo.png
rename to app/src/main/res/drawable/icon_cp_bolus_combo.png
diff --git a/app/src/main/res/drawable/icon_cp-bolus-correction.png b/app/src/main/res/drawable/icon_cp_bolus_correction.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-bolus-correction.png
rename to app/src/main/res/drawable/icon_cp_bolus_correction.png
diff --git a/app/src/main/res/drawable/icon_cp-bolus-meal.png b/app/src/main/res/drawable/icon_cp_bolus_meal.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-bolus-meal.png
rename to app/src/main/res/drawable/icon_cp_bolus_meal.png
diff --git a/app/src/main/res/drawable/icon_cp-bolus-snack.png b/app/src/main/res/drawable/icon_cp_bolus_snack.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-bolus-snack.png
rename to app/src/main/res/drawable/icon_cp_bolus_snack.png
diff --git a/app/src/main/res/drawable/icon_cp-cgm-insert.png b/app/src/main/res/drawable/icon_cp_cgm_insert.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-cgm-insert.png
rename to app/src/main/res/drawable/icon_cp_cgm_insert.png
diff --git a/app/src/main/res/drawable/icon_cp-cgm-profile.png b/app/src/main/res/drawable/icon_cp_cgm_profile.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-cgm-profile.png
rename to app/src/main/res/drawable/icon_cp_cgm_profile.png
diff --git a/app/src/main/res/drawable/icon_cp-cgm-start.png b/app/src/main/res/drawable/icon_cp_cgm_start.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-cgm-start.png
rename to app/src/main/res/drawable/icon_cp_cgm_start.png
diff --git a/app/src/main/res/drawable/icon_cp-cgm-target.png b/app/src/main/res/drawable/icon_cp_cgm_target.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-cgm-target.png
rename to app/src/main/res/drawable/icon_cp_cgm_target.png
diff --git a/app/src/main/res/drawable/icon_cp-exercise.png b/app/src/main/res/drawable/icon_cp_exercise.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-exercise.png
rename to app/src/main/res/drawable/icon_cp_exercise.png
diff --git a/app/src/main/res/drawable/icon_cp-note.png b/app/src/main/res/drawable/icon_cp_note.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-note.png
rename to app/src/main/res/drawable/icon_cp_note.png
diff --git a/app/src/main/res/drawable/icon_cp-pump-battery.png b/app/src/main/res/drawable/icon_cp_pump_battery.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-pump-battery.png
rename to app/src/main/res/drawable/icon_cp_pump_battery.png
diff --git a/app/src/main/res/drawable/icon_cp-pump-canula.png b/app/src/main/res/drawable/icon_cp_pump_canula.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-pump-canula.png
rename to app/src/main/res/drawable/icon_cp_pump_canula.png
diff --git a/app/src/main/res/drawable/icon_cp-pump-cartridge.png b/app/src/main/res/drawable/icon_cp_pump_cartridge.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-pump-cartridge.png
rename to app/src/main/res/drawable/icon_cp_pump_cartridge.png
diff --git a/app/src/main/res/drawable/icon_cp-question.png b/app/src/main/res/drawable/icon_cp_question.png
similarity index 100%
rename from app/src/main/res/drawable/icon_cp-question.png
rename to app/src/main/res/drawable/icon_cp_question.png
diff --git a/app/src/main/res/drawable/icon_home-loop.png b/app/src/main/res/drawable/icon_home_loop.png
similarity index 100%
rename from app/src/main/res/drawable/icon_home-loop.png
rename to app/src/main/res/drawable/icon_home_loop.png
diff --git a/app/src/main/res/drawable/icon_home-profile.png b/app/src/main/res/drawable/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable/icon_home-profile.png
rename to app/src/main/res/drawable/icon_home_profile.png
diff --git a/app/src/main/res/drawable/icon_home-target.png b/app/src/main/res/drawable/icon_home_target.png
similarity index 100%
rename from app/src/main/res/drawable/icon_home-target.png
rename to app/src/main/res/drawable/icon_home_target.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b22b5f160c..1db0151f51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -688,4 +688,3 @@
     <string name="wear_overviewnotifications_summary">Pass the Overview Notifications through as wear confirmation messages.</string>
     <string name="ns_localbroadcasts">Enable loacal broadcasts to other apps (like xDrip).</string>
     <string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
-</resources>

From 31fcf34a2dcd67cb73d803663221a98cfabc504c Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Fri, 21 Jul 2017 11:59:36 +0200
Subject: [PATCH 2/2] Fix after merge-conflict cleanup

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1db0151f51..cbde9f5520 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -688,3 +688,4 @@
     <string name="wear_overviewnotifications_summary">Pass the Overview Notifications through as wear confirmation messages.</string>
     <string name="ns_localbroadcasts">Enable loacal broadcasts to other apps (like xDrip).</string>
     <string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
+</resources>
\ No newline at end of file