diff --git a/app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png
new file mode 100644
index 0000000000..95761084a9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_actions-cancelextbolus.png 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
new file mode 100644
index 0000000000..4b36a0cc23
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_actions-profileswitch.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-refill.png b/app/src/main/res/drawable-hdpi/icon_actions-refill.png
new file mode 100644
index 0000000000..ace25d1558
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_actions-refill.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png
new file mode 100644
index 0000000000..a67d52838c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_actions-startextbolus.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png
new file mode 100644
index 0000000000..8772df62a4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_actions-starttempbasal.png 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
new file mode 100644
index 0000000000..f839a6894b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_actions-temptarget.png 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
new file mode 100644
index 0000000000..0fe1cd628b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-aaps-offline.png 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
new file mode 100644
index 0000000000..abc626901a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-age-battery.png 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
new file mode 100644
index 0000000000..ecccc39426
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-age-canula.png 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
new file mode 100644
index 0000000000..ab4d345881
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-age-insulin.png 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
new file mode 100644
index 0000000000..30d5d02de0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-age-sensor.png 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
new file mode 100644
index 0000000000..23c9a9847d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-announcement.png differ
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
new file mode 100644
index 0000000000..b9cdf5cc1f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-basal-end.png differ
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
new file mode 100644
index 0000000000..d79ca15f86
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-basal-start.png 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
new file mode 100644
index 0000000000..56569a264a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-bgcheck.png differ
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
new file mode 100644
index 0000000000..ed6be099aa
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-bolus-carbs.png 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
new file mode 100644
index 0000000000..98c076905c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-bolus-combo.png differ
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
new file mode 100644
index 0000000000..8ad7864406
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-bolus-correction.png 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
new file mode 100644
index 0000000000..97dd4e2ed8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-bolus-meal.png 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
new file mode 100644
index 0000000000..710bf6e0da
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-bolus-snack.png 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
new file mode 100644
index 0000000000..699be54792
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-cgm-insert.png 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
new file mode 100644
index 0000000000..8887e60f27
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-cgm-profile.png 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
new file mode 100644
index 0000000000..e917402c48
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-cgm-start.png 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
new file mode 100644
index 0000000000..2cf826dad1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-cgm-target.png 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
new file mode 100644
index 0000000000..e9aee1ac8a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-exercise.png 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
new file mode 100644
index 0000000000..b6b752e150
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-note.png 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
new file mode 100644
index 0000000000..b4a4f2923a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-pump-battery.png 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
new file mode 100644
index 0000000000..e75d9ed81d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-pump-canula.png 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
new file mode 100644
index 0000000000..f780c23e37
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-pump-cartridge.png 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
new file mode 100644
index 0000000000..65102f2abf
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp-question.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_home-loop.png b/app/src/main/res/drawable-hdpi/icon_home-loop.png
new file mode 100644
index 0000000000..b0f9f6ea29
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_home-loop.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_home-profile.png b/app/src/main/res/drawable-hdpi/icon_home-profile.png
new file mode 100644
index 0000000000..b288171332
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_home-profile.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_home-target.png b/app/src/main/res/drawable-hdpi/icon_home-target.png
new file mode 100644
index 0000000000..0b2f2b166a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_home-target.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png
new file mode 100644
index 0000000000..4ad378e374
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_actions-cancelextbolus.png 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
new file mode 100644
index 0000000000..eeae6ccfdb
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_actions-profileswitch.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-refill.png b/app/src/main/res/drawable-mdpi/icon_actions-refill.png
new file mode 100644
index 0000000000..737cca8b00
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_actions-refill.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png
new file mode 100644
index 0000000000..338df773c2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_actions-startextbolus.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png
new file mode 100644
index 0000000000..18fbd8c111
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_actions-starttempbasal.png 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
new file mode 100644
index 0000000000..39170bab37
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_actions-temptarget.png 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
new file mode 100644
index 0000000000..dc50653883
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-aaps-offline.png 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
new file mode 100644
index 0000000000..6c7fc56139
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-age-battery.png 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
new file mode 100644
index 0000000000..303ad946cd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-age-canula.png 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
new file mode 100644
index 0000000000..5cd8598faa
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-age-insulin.png 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
new file mode 100644
index 0000000000..d312b6c572
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-age-sensor.png 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
new file mode 100644
index 0000000000..6e1338ac24
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-announcement.png differ
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
new file mode 100644
index 0000000000..be8474f002
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-basal-end.png differ
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
new file mode 100644
index 0000000000..34cd31f14b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-basal-start.png 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
new file mode 100644
index 0000000000..0cb14c2f57
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-bgcheck.png differ
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
new file mode 100644
index 0000000000..561703fb06
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-bolus-carbs.png 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
new file mode 100644
index 0000000000..ce4d8fb9d3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-bolus-combo.png differ
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
new file mode 100644
index 0000000000..582472dc92
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-bolus-correction.png 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
new file mode 100644
index 0000000000..54b51e126e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-bolus-meal.png 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
new file mode 100644
index 0000000000..b2ba41c27d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-bolus-snack.png 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
new file mode 100644
index 0000000000..67c0fb1ba2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-cgm-insert.png 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
new file mode 100644
index 0000000000..e0f0a15cc8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-cgm-profile.png 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
new file mode 100644
index 0000000000..14a44bc852
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-cgm-start.png 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
new file mode 100644
index 0000000000..86ce00442c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-cgm-target.png 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
new file mode 100644
index 0000000000..1c92c0ebb5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-exercise.png 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
new file mode 100644
index 0000000000..7c8663a4fe
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-note.png 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
new file mode 100644
index 0000000000..f4dab169a8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-pump-battery.png 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
new file mode 100644
index 0000000000..ee512c5fef
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-pump-canula.png 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
new file mode 100644
index 0000000000..70a90c596f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-pump-cartridge.png 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
new file mode 100644
index 0000000000..5d430d9164
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp-question.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_home-loop.png b/app/src/main/res/drawable-mdpi/icon_home-loop.png
new file mode 100644
index 0000000000..5240cc85db
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_home-loop.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_home-profile.png b/app/src/main/res/drawable-mdpi/icon_home-profile.png
new file mode 100644
index 0000000000..f689df10c6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_home-profile.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_home-target.png b/app/src/main/res/drawable-mdpi/icon_home-target.png
new file mode 100644
index 0000000000..9fc7086e9d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_home-target.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png
new file mode 100644
index 0000000000..8c4ee82d1e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_actions-cancelextbolus.png 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
new file mode 100644
index 0000000000..57864f6ed5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_actions-profileswitch.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xhdpi/icon_actions-refill.png
new file mode 100644
index 0000000000..ace20f3bfe
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_actions-refill.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png
new file mode 100644
index 0000000000..0e59f6ec36
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_actions-startextbolus.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png
new file mode 100644
index 0000000000..1deb6f3ca8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_actions-starttempbasal.png 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
new file mode 100644
index 0000000000..c484837e53
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_actions-temptarget.png 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
new file mode 100644
index 0000000000..4239e40ba7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-aaps-offline.png 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
new file mode 100644
index 0000000000..3d75b9dc7a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-age-battery.png 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
new file mode 100644
index 0000000000..8629a7998d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-age-canula.png 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
new file mode 100644
index 0000000000..2e88ec9ad4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-age-insulin.png 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
new file mode 100644
index 0000000000..a3577da118
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-age-sensor.png 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
new file mode 100644
index 0000000000..472b51d775
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-announcement.png differ
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
new file mode 100644
index 0000000000..c92af22df3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-basal-end.png differ
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
new file mode 100644
index 0000000000..5e694ba89c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-basal-start.png 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
new file mode 100644
index 0000000000..030099f910
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-bgcheck.png differ
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
new file mode 100644
index 0000000000..64815bc8f0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-carbs.png 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
new file mode 100644
index 0000000000..908f33ccd8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-combo.png differ
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
new file mode 100644
index 0000000000..0fe89d5f8b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-correction.png 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
new file mode 100644
index 0000000000..52ef734adf
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-meal.png 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
new file mode 100644
index 0000000000..8d2e9690fc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-bolus-snack.png 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
new file mode 100644
index 0000000000..af93321e3a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-cgm-insert.png 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
new file mode 100644
index 0000000000..e4c50f2667
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-cgm-profile.png 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
new file mode 100644
index 0000000000..ce23d1cf54
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-cgm-start.png 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
new file mode 100644
index 0000000000..fbd5880490
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-cgm-target.png 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
new file mode 100644
index 0000000000..90cc102c07
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-exercise.png 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
new file mode 100644
index 0000000000..cf821a9d1f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-note.png 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
new file mode 100644
index 0000000000..15af2af396
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-pump-battery.png 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
new file mode 100644
index 0000000000..84ae19c4a3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-pump-canula.png 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
new file mode 100644
index 0000000000..d40a8540e6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-pump-cartridge.png 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
new file mode 100644
index 0000000000..43df04ef81
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp-question.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_home-loop.png b/app/src/main/res/drawable-xhdpi/icon_home-loop.png
new file mode 100644
index 0000000000..09ebbed57f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_home-loop.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_home-profile.png b/app/src/main/res/drawable-xhdpi/icon_home-profile.png
new file mode 100644
index 0000000000..95c0ca4502
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_home-profile.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_home-target.png b/app/src/main/res/drawable-xhdpi/icon_home-target.png
new file mode 100644
index 0000000000..545ff5db79
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_home-target.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png
new file mode 100644
index 0000000000..d223d16d8f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_actions-cancelextbolus.png 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
new file mode 100644
index 0000000000..29e28afe02
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_actions-profileswitch.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xxhdpi/icon_actions-refill.png
new file mode 100644
index 0000000000..45cc5d3e1a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_actions-refill.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png
new file mode 100644
index 0000000000..e33b5e0a64
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_actions-startextbolus.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png
new file mode 100644
index 0000000000..9e4aca67e2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_actions-starttempbasal.png 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
new file mode 100644
index 0000000000..4fa88421ae
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_actions-temptarget.png 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
new file mode 100644
index 0000000000..1b4603bafc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-aaps-offline.png 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
new file mode 100644
index 0000000000..d32a7791e1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-age-battery.png 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
new file mode 100644
index 0000000000..715682129b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-age-canula.png 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
new file mode 100644
index 0000000000..79a21cea45
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-age-insulin.png 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
new file mode 100644
index 0000000000..bb269c3af9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-age-sensor.png 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
new file mode 100644
index 0000000000..e287fa15d4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-announcement.png differ
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
new file mode 100644
index 0000000000..08acae3012
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-basal-end.png differ
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
new file mode 100644
index 0000000000..1b6d970b95
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-basal-start.png 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
new file mode 100644
index 0000000000..4e68c25d70
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-bgcheck.png differ
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
new file mode 100644
index 0000000000..a110276120
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-carbs.png 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
new file mode 100644
index 0000000000..c91b515001
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-combo.png differ
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
new file mode 100644
index 0000000000..d0c7a40613
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-correction.png 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
new file mode 100644
index 0000000000..e13a420bad
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-meal.png 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
new file mode 100644
index 0000000000..6a9fb42088
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-bolus-snack.png 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
new file mode 100644
index 0000000000..f1a791b702
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-insert.png 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
new file mode 100644
index 0000000000..d40cba3c46
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-profile.png 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
new file mode 100644
index 0000000000..47d5de66a1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-start.png 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
new file mode 100644
index 0000000000..13fc303aa2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-cgm-target.png 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
new file mode 100644
index 0000000000..4fb54d3703
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-exercise.png 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
new file mode 100644
index 0000000000..c1881112b7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-note.png 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
new file mode 100644
index 0000000000..1a6d44bba0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-pump-battery.png 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
new file mode 100644
index 0000000000..6021f928ed
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-pump-canula.png 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
new file mode 100644
index 0000000000..c7a8897a52
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-pump-cartridge.png 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
new file mode 100644
index 0000000000..09455d09fd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp-question.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxhdpi/icon_home-loop.png
new file mode 100644
index 0000000000..c33f090311
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_home-loop.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-profile.png b/app/src/main/res/drawable-xxhdpi/icon_home-profile.png
new file mode 100644
index 0000000000..00c4de023a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_home-profile.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_home-target.png b/app/src/main/res/drawable-xxhdpi/icon_home-target.png
new file mode 100644
index 0000000000..70fd9ebc27
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_home-target.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png
new file mode 100644
index 0000000000..f5b57a9bc9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_actions-cancelextbolus.png 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
new file mode 100644
index 0000000000..d5631ef3ae
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_actions-profileswitch.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png
new file mode 100644
index 0000000000..be3a5db708
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_actions-refill.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png
new file mode 100644
index 0000000000..89b44ea201
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_actions-startextbolus.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png
new file mode 100644
index 0000000000..7be2e32dfe
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_actions-starttempbasal.png 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
new file mode 100644
index 0000000000..955a19f3bc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_actions-temptarget.png 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
new file mode 100644
index 0000000000..3da8775fb4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-aaps-offline.png 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
new file mode 100644
index 0000000000..dd21ad490c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-battery.png 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
new file mode 100644
index 0000000000..6a3585b72f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-canula.png 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
new file mode 100644
index 0000000000..3b50b616fc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-insulin.png 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
new file mode 100644
index 0000000000..2dd35e6e9e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-age-sensor.png 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
new file mode 100644
index 0000000000..256631f49b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-announcement.png differ
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
new file mode 100644
index 0000000000..a57ceb3b8a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-end.png differ
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
new file mode 100644
index 0000000000..d36b0b711c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-basal-start.png 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
new file mode 100644
index 0000000000..fa72b549a9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-bgcheck.png differ
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
new file mode 100644
index 0000000000..4dab75558b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-carbs.png 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
new file mode 100644
index 0000000000..1418ea4994
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-combo.png differ
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
new file mode 100644
index 0000000000..ccc3d0e39c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-correction.png 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
new file mode 100644
index 0000000000..aa7bdf7fe3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-meal.png 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
new file mode 100644
index 0000000000..1f9ab1697d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-bolus-snack.png 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
new file mode 100644
index 0000000000..2d7e6b4542
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-insert.png 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
new file mode 100644
index 0000000000..e8b4668b86
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-profile.png 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
new file mode 100644
index 0000000000..e8d0e6773e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-start.png 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
new file mode 100644
index 0000000000..2bdaf7d73d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-cgm-target.png 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
new file mode 100644
index 0000000000..c16560e8de
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-exercise.png 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
new file mode 100644
index 0000000000..dd1e04b419
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-note.png 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
new file mode 100644
index 0000000000..f1d306de12
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-pump-battery.png 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
new file mode 100644
index 0000000000..465111a6ba
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-pump-canula.png 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
new file mode 100644
index 0000000000..afffd90482
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-pump-cartridge.png 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
new file mode 100644
index 0000000000..b2e19c1575
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp-question.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-loop.png b/app/src/main/res/drawable-xxxhdpi/icon_home-loop.png
new file mode 100644
index 0000000000..a59d73e2b4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_home-loop.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-profile.png b/app/src/main/res/drawable-xxxhdpi/icon_home-profile.png
new file mode 100644
index 0000000000..80234a0f75
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_home-profile.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home-target.png b/app/src/main/res/drawable-xxxhdpi/icon_home-target.png
new file mode 100644
index 0000000000..c1a4d99087
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_home-target.png differ
diff --git a/app/src/main/res/drawable/icon_actions-cancelextbolus.png b/app/src/main/res/drawable/icon_actions-cancelextbolus.png
new file mode 100644
index 0000000000..4ad378e374
Binary files /dev/null and b/app/src/main/res/drawable/icon_actions-cancelextbolus.png differ
diff --git a/app/src/main/res/drawable/icon_actions-profileswitch.png b/app/src/main/res/drawable/icon_actions-profileswitch.png
new file mode 100644
index 0000000000..eeae6ccfdb
Binary files /dev/null and b/app/src/main/res/drawable/icon_actions-profileswitch.png differ
diff --git a/app/src/main/res/drawable/icon_actions-refill.png b/app/src/main/res/drawable/icon_actions-refill.png
new file mode 100644
index 0000000000..737cca8b00
Binary files /dev/null and b/app/src/main/res/drawable/icon_actions-refill.png differ
diff --git a/app/src/main/res/drawable/icon_actions-startextbolus.png b/app/src/main/res/drawable/icon_actions-startextbolus.png
new file mode 100644
index 0000000000..338df773c2
Binary files /dev/null and b/app/src/main/res/drawable/icon_actions-startextbolus.png differ
diff --git a/app/src/main/res/drawable/icon_actions-starttempbasal.png b/app/src/main/res/drawable/icon_actions-starttempbasal.png
new file mode 100644
index 0000000000..18fbd8c111
Binary files /dev/null and b/app/src/main/res/drawable/icon_actions-starttempbasal.png differ
diff --git a/app/src/main/res/drawable/icon_actions-temptarget.png b/app/src/main/res/drawable/icon_actions-temptarget.png
new file mode 100644
index 0000000000..39170bab37
Binary files /dev/null and b/app/src/main/res/drawable/icon_actions-temptarget.png 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
new file mode 100644
index 0000000000..dc50653883
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-aaps-offline.png 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
new file mode 100644
index 0000000000..6c7fc56139
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-age-battery.png 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
new file mode 100644
index 0000000000..303ad946cd
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-age-canula.png 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
new file mode 100644
index 0000000000..5cd8598faa
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-age-insulin.png 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
new file mode 100644
index 0000000000..d312b6c572
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-age-sensor.png differ
diff --git a/app/src/main/res/drawable/icon_cp-announcement.png b/app/src/main/res/drawable/icon_cp-announcement.png
new file mode 100644
index 0000000000..6e1338ac24
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-announcement.png differ
diff --git a/app/src/main/res/drawable/icon_cp-basal-end.png b/app/src/main/res/drawable/icon_cp-basal-end.png
new file mode 100644
index 0000000000..be8474f002
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-basal-end.png differ
diff --git a/app/src/main/res/drawable/icon_cp-basal-start.png b/app/src/main/res/drawable/icon_cp-basal-start.png
new file mode 100644
index 0000000000..34cd31f14b
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-basal-start.png differ
diff --git a/app/src/main/res/drawable/icon_cp-bgcheck.png b/app/src/main/res/drawable/icon_cp-bgcheck.png
new file mode 100644
index 0000000000..0cb14c2f57
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-bgcheck.png differ
diff --git a/app/src/main/res/drawable/icon_cp-bolus-carbs.png b/app/src/main/res/drawable/icon_cp-bolus-carbs.png
new file mode 100644
index 0000000000..561703fb06
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-bolus-carbs.png 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
new file mode 100644
index 0000000000..ce4d8fb9d3
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-bolus-combo.png differ
diff --git a/app/src/main/res/drawable/icon_cp-bolus-correction.png b/app/src/main/res/drawable/icon_cp-bolus-correction.png
new file mode 100644
index 0000000000..582472dc92
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-bolus-correction.png 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
new file mode 100644
index 0000000000..54b51e126e
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-bolus-meal.png 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
new file mode 100644
index 0000000000..b2ba41c27d
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-bolus-snack.png 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
new file mode 100644
index 0000000000..67c0fb1ba2
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-cgm-insert.png 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
new file mode 100644
index 0000000000..e0f0a15cc8
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-cgm-profile.png 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
new file mode 100644
index 0000000000..14a44bc852
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-cgm-start.png 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
new file mode 100644
index 0000000000..86ce00442c
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-cgm-target.png differ
diff --git a/app/src/main/res/drawable/icon_cp-exercise.png b/app/src/main/res/drawable/icon_cp-exercise.png
new file mode 100644
index 0000000000..1c92c0ebb5
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-exercise.png differ
diff --git a/app/src/main/res/drawable/icon_cp-note.png b/app/src/main/res/drawable/icon_cp-note.png
new file mode 100644
index 0000000000..7c8663a4fe
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-note.png 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
new file mode 100644
index 0000000000..f4dab169a8
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-pump-battery.png 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
new file mode 100644
index 0000000000..ee512c5fef
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-pump-canula.png 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
new file mode 100644
index 0000000000..70a90c596f
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-pump-cartridge.png differ
diff --git a/app/src/main/res/drawable/icon_cp-question.png b/app/src/main/res/drawable/icon_cp-question.png
new file mode 100644
index 0000000000..5d430d9164
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp-question.png differ
diff --git a/app/src/main/res/drawable/icon_home-loop.png b/app/src/main/res/drawable/icon_home-loop.png
new file mode 100644
index 0000000000..5240cc85db
Binary files /dev/null and b/app/src/main/res/drawable/icon_home-loop.png differ
diff --git a/app/src/main/res/drawable/icon_home-profile.png b/app/src/main/res/drawable/icon_home-profile.png
new file mode 100644
index 0000000000..f689df10c6
Binary files /dev/null and b/app/src/main/res/drawable/icon_home-profile.png differ
diff --git a/app/src/main/res/drawable/icon_home-target.png b/app/src/main/res/drawable/icon_home-target.png
new file mode 100644
index 0000000000..9fc7086e9d
Binary files /dev/null and b/app/src/main/res/drawable/icon_home-target.png differ