diff --git a/app/src/main/res/drawable-hdpi-v11/ic_settings.png b/app/src/main/res/drawable-hdpi-v11/ic_settings.png
deleted file mode 100644
index 8a55c0221f..0000000000
Binary files a/app/src/main/res/drawable-hdpi-v11/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi-v9/ic_settings.png b/app/src/main/res/drawable-hdpi-v9/ic_settings.png
deleted file mode 100644
index 23b7ef3529..0000000000
Binary files a/app/src/main/res/drawable-hdpi-v9/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/bad.png b/app/src/main/res/drawable-hdpi/bad.png
deleted file mode 100644
index 139bf1ddee..0000000000
Binary files a/app/src/main/res/drawable-hdpi/bad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/good.png b/app/src/main/res/drawable-hdpi/good.png
deleted file mode 100644
index 05723ff4ea..0000000000
Binary files a/app/src/main/res/drawable-hdpi/good.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_error.png b/app/src/main/res/drawable-hdpi/ic_error.png
deleted file mode 100644
index 5b57c7458f..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_exit_to_app.png b/app/src/main/res/drawable-hdpi/ic_exit_to_app.png
deleted file mode 100644
index f028ac5539..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_exit_to_app.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_maintenance.png b/app/src/main/res/drawable-hdpi/ic_maintenance.png
deleted file mode 100644
index 60f34eb201..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notif_aaps.png b/app/src/main/res/drawable-hdpi/ic_notif_aaps.png
deleted file mode 100644
index 453ed7b382..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notif_aaps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-hdpi/ic_notif_nsclient.png
deleted file mode 100644
index e6d52996a6..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notif_nsclient.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-hdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index 5562fef378..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notif_pumpcontrol.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_reminder.png b/app/src/main/res/drawable-hdpi/ic_reminder.png
deleted file mode 100644
index b45924d4eb..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
deleted file mode 100644
index 20d9681376..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_warning.png b/app/src/main/res/drawable-hdpi/ic_warning.png
deleted file mode 100644
index d7aa344bca..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_warning.png and /dev/null 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
deleted file mode 100644
index b0f9f6ea29..0000000000
Binary files a/app/src/main/res/drawable-hdpi/icon_home_loop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/soso.png b/app/src/main/res/drawable-hdpi/soso.png
deleted file mode 100644
index f7a9be577e..0000000000
Binary files a/app/src/main/res/drawable-hdpi/soso.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_settings.png b/app/src/main/res/drawable-mdpi-v11/ic_settings.png
deleted file mode 100644
index 9053263239..0000000000
Binary files a/app/src/main/res/drawable-mdpi-v11/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi-v11/refresh.xml b/app/src/main/res/drawable-mdpi-v11/refresh.xml
deleted file mode 100644
index 677809a8c2..0000000000
--- a/app/src/main/res/drawable-mdpi-v11/refresh.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable-mdpi-v9/ic_settings.png b/app/src/main/res/drawable-mdpi-v9/ic_settings.png
deleted file mode 100644
index 3c39ceb390..0000000000
Binary files a/app/src/main/res/drawable-mdpi-v9/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/bad.png b/app/src/main/res/drawable-mdpi/bad.png
deleted file mode 100644
index 9210154195..0000000000
Binary files a/app/src/main/res/drawable-mdpi/bad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/good.png b/app/src/main/res/drawable-mdpi/good.png
deleted file mode 100644
index a15f82c2b2..0000000000
Binary files a/app/src/main/res/drawable-mdpi/good.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_error.png b/app/src/main/res/drawable-mdpi/ic_error.png
deleted file mode 100644
index 68a4b0e48c..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_exit_to_app.png b/app/src/main/res/drawable-mdpi/ic_exit_to_app.png
deleted file mode 100644
index d2531b3e46..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_exit_to_app.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_maintenance.png b/app/src/main/res/drawable-mdpi/ic_maintenance.png
deleted file mode 100644
index 728313d9e7..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notif_aaps.png b/app/src/main/res/drawable-mdpi/ic_notif_aaps.png
deleted file mode 100644
index c483ada178..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notif_aaps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-mdpi/ic_notif_nsclient.png
deleted file mode 100644
index 0e55ac39eb..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notif_nsclient.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-mdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index 3feb5d6248..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notif_pumpcontrol.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_reminder.png b/app/src/main/res/drawable-mdpi/ic_reminder.png
deleted file mode 100644
index 2c269d5530..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
deleted file mode 100644
index 60b53e614e..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_warning.png b/app/src/main/res/drawable-mdpi/ic_warning.png
deleted file mode 100644
index 1ff44a152a..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_warning.png and /dev/null 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
deleted file mode 100644
index 5240cc85db..0000000000
Binary files a/app/src/main/res/drawable-mdpi/icon_home_loop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/soso.png b/app/src/main/res/drawable-mdpi/soso.png
deleted file mode 100644
index 91d9bd7ddf..0000000000
Binary files a/app/src/main/res/drawable-mdpi/soso.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_settings.png b/app/src/main/res/drawable-xhdpi-v11/ic_settings.png
deleted file mode 100644
index e433609716..0000000000
Binary files a/app/src/main/res/drawable-xhdpi-v11/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_settings.png b/app/src/main/res/drawable-xhdpi-v9/ic_settings.png
deleted file mode 100644
index 8caf4ecbdd..0000000000
Binary files a/app/src/main/res/drawable-xhdpi-v9/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/bad.png b/app/src/main/res/drawable-xhdpi/bad.png
deleted file mode 100644
index 46dca7155f..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/bad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/good.png b/app/src/main/res/drawable-xhdpi/good.png
deleted file mode 100644
index 08946fed3e..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/good.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_error.png b/app/src/main/res/drawable-xhdpi/ic_error.png
deleted file mode 100644
index dee2d5af82..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png
deleted file mode 100644
index d35a1f0d4e..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_maintenance.png b/app/src/main/res/drawable-xhdpi/ic_maintenance.png
deleted file mode 100644
index 303e1780f9..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notif_aaps.png b/app/src/main/res/drawable-xhdpi/ic_notif_aaps.png
deleted file mode 100644
index 56c4049e84..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notif_aaps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-xhdpi/ic_notif_nsclient.png
deleted file mode 100644
index 0ec8b219b6..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notif_nsclient.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-xhdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index e5eb24b9da..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notif_pumpcontrol.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_reminder.png b/app/src/main/res/drawable-xhdpi/ic_reminder.png
deleted file mode 100644
index 904a608285..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
deleted file mode 100644
index 58099b4ce7..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_warning.png b/app/src/main/res/drawable-xhdpi/ic_warning.png
deleted file mode 100644
index 652a1bb1d9..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_warning.png and /dev/null 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
deleted file mode 100644
index 09ebbed57f..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/icon_home_loop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/soso.png b/app/src/main/res/drawable-xhdpi/soso.png
deleted file mode 100644
index 8e19db274b..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/soso.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_settings.png b/app/src/main/res/drawable-xxhdpi-v11/ic_settings.png
deleted file mode 100644
index 4130b7aa9f..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi-v11/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi-v9/ic_settings.png b/app/src/main/res/drawable-xxhdpi-v9/ic_settings.png
deleted file mode 100644
index 4f61e7d059..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi-v9/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/bad.png b/app/src/main/res/drawable-xxhdpi/bad.png
deleted file mode 100644
index b7a3201d60..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/bad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/good.png b/app/src/main/res/drawable-xxhdpi/good.png
deleted file mode 100644
index 9f5c243b04..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/good.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_error.png b/app/src/main/res/drawable-xxhdpi/ic_error.png
deleted file mode 100644
index cf389b5d96..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png
deleted file mode 100644
index 884eb3b242..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_maintenance.png b/app/src/main/res/drawable-xxhdpi/ic_maintenance.png
deleted file mode 100644
index 952e7b9ef3..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notif_aaps.png b/app/src/main/res/drawable-xxhdpi/ic_notif_aaps.png
deleted file mode 100644
index 6ef4df1823..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notif_aaps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-xxhdpi/ic_notif_nsclient.png
deleted file mode 100644
index ce7eb909ff..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notif_nsclient.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-xxhdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index 12bf9fd364..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notif_pumpcontrol.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_reminder.png b/app/src/main/res/drawable-xxhdpi/ic_reminder.png
deleted file mode 100644
index e918305ba0..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png
deleted file mode 100644
index 8f3d91a45a..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning.png b/app/src/main/res/drawable-xxhdpi/ic_warning.png
deleted file mode 100644
index 7ab70f77c2..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_warning.png and /dev/null 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
deleted file mode 100644
index c33f090311..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/icon_home_loop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/soso.png b/app/src/main/res/drawable-xxhdpi/soso.png
deleted file mode 100644
index 6caac0cc05..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/soso.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bad.png b/app/src/main/res/drawable-xxxhdpi/bad.png
deleted file mode 100644
index 484bd8fd0b..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/bad.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/good.png b/app/src/main/res/drawable-xxxhdpi/good.png
deleted file mode 100644
index eb81a2b978..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/good.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error.png b/app/src/main/res/drawable-xxxhdpi/ic_error.png
deleted file mode 100644
index b8743474f7..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png
deleted file mode 100644
index 903a7230fd..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png b/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png
deleted file mode 100644
index 1046459dc3..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_reminder.png b/app/src/main/res/drawable-xxxhdpi/ic_reminder.png
deleted file mode 100644
index 6aa4e934d0..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_warning.png b/app/src/main/res/drawable-xxxhdpi/ic_warning.png
deleted file mode 100644
index 607e14b7d2..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_warning.png and /dev/null 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
deleted file mode 100644
index a59d73e2b4..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/icon_home_loop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/soso.png b/app/src/main/res/drawable-xxxhdpi/soso.png
deleted file mode 100644
index 50b8f3fa5c..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/soso.png and /dev/null differ
diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml
deleted file mode 100644
index 9f5b7f5fab..0000000000
--- a/app/src/main/res/drawable/circle.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000000..fe665ee185
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_exit_to_app.xml b/app/src/main/res/drawable/ic_exit_to_app.xml
new file mode 100644
index 0000000000..37a6c7d058
--- /dev/null
+++ b/app/src/main/res/drawable/ic_exit_to_app.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml b/app/src/main/res/drawable/ic_keyboard_capslock.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml
rename to app/src/main/res/drawable/ic_keyboard_capslock.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml b/app/src/main/res/drawable/ic_keyboard_tab.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml
rename to app/src/main/res/drawable/ic_keyboard_tab.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_location_on.xml b/app/src/main/res/drawable/ic_location_on.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_location_on.xml
rename to app/src/main/res/drawable/ic_location_on.xml
diff --git a/app/src/main/res/drawable/ic_maintenance.xml b/app/src/main/res/drawable/ic_maintenance.xml
new file mode 100644
index 0000000000..7f606d8b44
--- /dev/null
+++ b/app/src/main/res/drawable/ic_maintenance.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_network_wifi.xml b/app/src/main/res/drawable/ic_network_wifi.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_network_wifi.xml
rename to app/src/main/res/drawable/ic_network_wifi.xml
diff --git a/app/src/main/res/drawable/ic_notif_aaps.png b/app/src/main/res/drawable/ic_notif_aaps.png
deleted file mode 100644
index 453ed7b382..0000000000
Binary files a/app/src/main/res/drawable/ic_notif_aaps.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_notif_aaps.xml b/app/src/main/res/drawable/ic_notif_aaps.xml
new file mode 100644
index 0000000000..a9b241c1f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notif_aaps.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_notif_nsclient.xml b/app/src/main/res/drawable/ic_notif_nsclient.xml
new file mode 100644
index 0000000000..e51e9152c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notif_nsclient.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_notif_pumpcontrol.png b/app/src/main/res/drawable/ic_notif_pumpcontrol.png
deleted file mode 100644
index 5562fef378..0000000000
Binary files a/app/src/main/res/drawable/ic_notif_pumpcontrol.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_notif_pumpcontrol.xml b/app/src/main/res/drawable/ic_notif_pumpcontrol.xml
new file mode 100644
index 0000000000..db51861565
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notif_pumpcontrol.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
similarity index 71%
rename from app/src/main/res/drawable-anydpi/ic_notifications.xml
rename to app/src/main/res/drawable/ic_notifications.xml
index b655d741e6..5c8da5df78 100644
--- a/app/src/main/res/drawable-anydpi/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -1,8 +1,8 @@
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_reminder2.xml b/app/src/main/res/drawable/ic_reminder.xml
similarity index 92%
rename from app/src/main/res/drawable/ic_reminder2.xml
rename to app/src/main/res/drawable/ic_reminder.xml
index 35c3148df5..b2d8e7ee7a 100644
--- a/app/src/main/res/drawable/ic_reminder2.xml
+++ b/app/src/main/res/drawable/ic_reminder.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000..8b7d553260
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
new file mode 100644
index 0000000000..484c065ece
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/icon_home_loop.png b/app/src/main/res/drawable/icon_home_loop.png
deleted file mode 100644
index 5240cc85db..0000000000
Binary files a/app/src/main/res/drawable/icon_home_loop.png and /dev/null differ
diff --git a/app/src/main/res/drawable/notif_icon2.xml b/app/src/main/res/drawable/notif_icon2.xml
new file mode 100644
index 0000000000..c36ee9e75c
--- /dev/null
+++ b/app/src/main/res/drawable/notif_icon2.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/icons/ic_error.svg b/icons/ic_error.svg
new file mode 100644
index 0000000000..ce9df53b43
--- /dev/null
+++ b/icons/ic_error.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/icons/ic_exit_to_app.svg b/icons/ic_exit_to_app.svg
new file mode 100644
index 0000000000..c834b1afed
--- /dev/null
+++ b/icons/ic_exit_to_app.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/icons/ic_home_loop.svg b/icons/ic_home_loop.svg
new file mode 100644
index 0000000000..5524013992
--- /dev/null
+++ b/icons/ic_home_loop.svg
@@ -0,0 +1,15 @@
+
+
diff --git a/icons/ic_maintenance.svg b/icons/ic_maintenance.svg
new file mode 100644
index 0000000000..cc3d228360
--- /dev/null
+++ b/icons/ic_maintenance.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/icons/ic_notif_aaps.svg b/icons/ic_notif_aaps.svg
new file mode 100644
index 0000000000..fcc139f344
--- /dev/null
+++ b/icons/ic_notif_aaps.svg
@@ -0,0 +1,27 @@
+
+
diff --git a/icons/ic_notif_nsclient.svg b/icons/ic_notif_nsclient.svg
new file mode 100644
index 0000000000..808d4e233b
--- /dev/null
+++ b/icons/ic_notif_nsclient.svg
@@ -0,0 +1,50 @@
+
+
diff --git a/icons/ic_notif_pumpcontrol.svg b/icons/ic_notif_pumpcontrol.svg
new file mode 100644
index 0000000000..ae63c364eb
--- /dev/null
+++ b/icons/ic_notif_pumpcontrol.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/icons/ic_warning.svg b/icons/ic_warning.svg
new file mode 100644
index 0000000000..6ec4720d84
--- /dev/null
+++ b/icons/ic_warning.svg
@@ -0,0 +1,8 @@
+
+