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-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-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-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/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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.107,7.852c-1.11,-2.694 -3.265,-4.849 -5.959,-5.959C14.869,1.365 13.468,1.074 12,1.074c-1.468,0 -2.869,0.292 -4.148,0.819c-2.694,1.11 -4.849,3.265 -5.959,5.959C1.365,9.131 1.074,10.532 1.074,12c0,1.468 0.292,2.869 0.819,4.148c1.11,2.694 3.265,4.849 5.959,5.959c1.28,0.527 2.681,0.819 4.148,0.819c1.468,0 2.869,-0.292 4.148,-0.819c2.694,-1.11 4.849,-3.265 5.959,-5.959c0.527,-1.28 0.819,-2.681 0.819,-4.148C22.926,10.532 22.635,9.131 22.107,7.852zM18.837,7.97c-0.694,-1.216 -1.645,-2.172 -2.852,-2.866c-0.527,-0.303 -1.079,-0.539 -1.658,-0.71c-0.638,-0.188 -1.274,0.312 -1.274,0.977v0c0,0.449 0.3,0.831 0.727,0.969c0.386,0.125 0.755,0.293 1.108,0.503c0.874,0.523 1.564,1.236 2.068,2.139c0.504,0.904 0.756,1.916 0.756,3.037c0,1.122 -0.252,2.134 -0.756,3.037c-0.504,0.903 -1.193,1.611 -2.068,2.125c-0.236,0.138 -0.481,0.253 -0.732,0.354v-4.045c0,-0.32 -0.104,-0.584 -0.311,-0.791c-0.208,-0.207 -0.471,-0.311 -0.792,-0.311c-0.302,0 -0.561,0.104 -0.778,0.311c-0.217,0.208 -0.325,0.471 -0.325,0.791v5.246c0,0.302 0.108,0.561 0.325,0.778c0.217,0.217 0.476,0.325 0.778,0.325c0.171,0 0.325,-0.033 0.464,-0.096c0.558,-0.131 1.091,-0.322 1.598,-0.581c1.027,-0.523 1.872,-1.24 2.538,-2.153v1.711c0,0.174 0.031,0.33 0.092,0.468c-1.576,1.262 -3.574,2.018 -5.745,2.018c-5.077,0 -9.208,-4.131 -9.208,-9.208S6.923,2.792 12,2.792S21.208,6.923 21.208,12c0,1.742 -0.486,3.372 -1.33,4.762V12.02C19.878,10.537 19.531,9.187 18.837,7.97z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M10.847,4.131c-0.135,0 -0.26,0.024 -0.378,0.066C9.559,4.353 8.705,4.649 7.914,5.104C6.707,5.798 5.756,6.754 5.062,7.97c-0.694,1.217 -1.041,2.567 -1.041,4.05c0,1.483 0.337,2.829 1.012,4.035c0.675,1.208 1.597,2.158 2.766,2.852c0.545,0.324 1.12,0.571 1.725,0.742c0.661,0.188 1.321,-0.302 1.321,-0.989c0,-0.459 -0.309,-0.849 -0.746,-0.989c-0.383,-0.122 -0.751,-0.285 -1.103,-0.489c-0.884,-0.514 -1.578,-1.222 -2.082,-2.125C6.412,14.154 6.16,13.142 6.16,12.02c0,-1.122 0.252,-2.134 0.756,-3.037C7.42,8.08 8.114,7.367 8.998,6.844c0.241,-0.142 0.491,-0.26 0.746,-0.363v3.999c0,0.302 0.108,0.561 0.325,0.778c0.217,0.217 0.476,0.325 0.778,0.325c0.32,0 0.584,-0.108 0.792,-0.325c0.207,-0.216 0.311,-0.475 0.311,-0.778V5.233c0,-0.32 -0.104,-0.584 -0.311,-0.791C11.431,4.235 11.167,4.131 10.847,4.131z"
+      android:fillColor="@color/white"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.937,8.998c0,0.712 -0.092,1.6 -0.132,1.889c-0.115,0.816 -0.32,1.61 -0.578,2.391c-0.335,1.015 -0.758,1.992 -1.27,2.931c-0.314,0.576 -0.643,1.144 -1.002,1.692c-0.388,0.592 -0.799,1.166 -1.236,1.723c-0.415,0.529 -0.837,1.05 -1.282,1.555c-0.145,0.164 -0.298,0.322 -0.444,0.485c-0.283,0.316 -0.531,0.575 -0.858,0.849c-0.712,0.67 -1.759,0.616 -2.378,-0.081c-0.469,-0.458 -0.911,-0.94 -1.341,-1.436c-0.531,-0.613 -1.037,-1.245 -1.521,-1.896c-0.718,-0.966 -1.362,-1.978 -1.933,-3.036c-0.41,-0.758 -0.755,-1.549 -1.041,-2.362c-0.386,-1.097 -0.69,-2.215 -0.799,-3.381c-0.013,-0.143 -0.059,-0.71 -0.059,-1.319c0,-0.647 0.067,-1.158 0.096,-1.358C4.27,6.89 4.52,6.182 4.846,5.499C5.113,4.94 5.45,4.426 5.845,3.944C6.226,3.479 6.65,3.061 7.12,2.693C7.636,2.288 8.198,1.95 8.805,1.69c0.667,-0.285 1.353,-0.494 2.075,-0.586c0.127,-0.016 0.598,-0.062 1.166,-0.062c0.728,0 1.44,0.108 1.764,0.184c0.732,0.172 1.428,0.44 2.086,0.812c0.93,0.526 1.725,1.21 2.383,2.046c0.473,0.601 0.853,1.26 1.128,1.976c0.193,0.503 0.347,1.016 0.434,1.551C19.871,7.8 19.937,8.371 19.937,8.998zM12.052,2.302c-0.311,-0.005 -0.618,0.035 -0.926,0.068C10.484,2.439 9.876,2.628 9.29,2.888c-1.007,0.447 -1.839,1.12 -2.525,1.983c-0.477,0.6 -0.832,1.261 -1.083,1.98C5.545,7.245 5.455,7.654 5.399,8.066C5.354,8.405 5.324,8.752 5.336,9.091c0.014,0.41 0.027,0.796 0.086,1.192c0.058,0.386 0.103,0.775 0.19,1.154c0.247,1.084 0.608,2.131 1.076,3.14c0.409,0.88 0.883,1.723 1.413,2.535c0.534,0.817 1.113,1.601 1.734,2.355c0.563,0.683 1.143,1.349 1.772,1.972c0.234,0.232 0.548,0.228 0.784,0c0.628,-0.608 1.529,-1.669 1.956,-2.191c0.395,-0.484 0.769,-0.983 1.125,-1.497c0.456,-0.659 0.881,-1.336 1.263,-2.041c0.43,-0.793 0.818,-1.604 1.123,-2.454c0.27,-0.754 0.479,-1.521 0.62,-2.311c0.105,-0.586 0.16,-1.175 0.194,-1.767c0.02,-0.349 -0.023,-0.696 -0.063,-1.044c-0.074,-0.652 -0.247,-1.277 -0.519,-1.87c-0.386,-0.841 -0.91,-1.583 -1.602,-2.208c-0.514,-0.464 -1.077,-0.844 -1.703,-1.136C13.919,2.516 13.006,2.318 12.052,2.302z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M11.403,10.462c0,0.495 0.002,0.99 -0.001,1.485c-0.001,0.242 0.102,0.353 0.33,0.33c0.175,-0.017 0.352,-0.003 0.529,-0.003c0.287,0 0.337,-0.049 0.337,-0.329c0,-0.967 -0.024,-1.935 0.007,-2.901c0.027,-0.853 0.404,-1.541 1.159,-1.975c0.782,-0.449 1.606,-0.458 2.409,-0.08c0.674,0.317 1.073,0.88 1.242,1.612c0.145,0.629 0.02,1.233 -0.129,1.837c-0.184,0.747 -0.541,1.413 -1.022,2.005c-0.729,0.896 -1.653,1.5 -2.772,1.819c-0.644,0.184 -1.296,0.239 -1.952,0.191c-1.02,-0.075 -1.944,-0.434 -2.775,-1.04c-0.64,-0.467 -1.149,-1.049 -1.544,-1.727c-0.295,-0.506 -0.493,-1.056 -0.597,-1.636c-0.056,-0.315 -0.111,-0.63 -0.102,-0.951c0.028,-1.103 0.777,-2.126 1.932,-2.325c0.66,-0.114 1.28,-0.031 1.85,0.314c0.551,0.334 0.885,0.834 1.031,1.461c0.048,0.208 0.073,0.418 0.07,0.633C11.398,9.608 11.403,10.035 11.403,10.462zM15.047,7.016c-1.149,-0.005 -2.089,0.928 -2.103,2.061c-0.015,1.185 0.931,2.132 2.085,2.129c1.187,-0.004 2.088,-0.909 2.101,-2.077C17.145,7.951 16.2,7.034 15.047,7.016zM11.061,9.097c-0.006,-1.146 -0.964,-2.049 -2.002,-2.079C7.781,6.982 6.872,7.985 6.87,9.095c-0.002,1.185 0.922,2.103 2.085,2.11C10.098,11.211 11.045,10.32 11.061,9.097z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M16.472,5.843c-0.192,-0.021 -0.365,-0.097 -0.549,-0.135c-1.148,-0.239 -2.208,-0.059 -3.16,0.649c-0.259,0.193 -0.482,0.425 -0.656,0.695c-0.099,0.154 -0.155,0.074 -0.213,-0.009c-0.116,-0.167 -0.248,-0.32 -0.396,-0.458c-0.558,-0.521 -1.215,-0.832 -1.972,-0.934C8.936,5.572 8.353,5.602 7.782,5.786C7.714,5.808 7.647,5.834 7.579,5.855C7.564,5.859 7.545,5.852 7.504,5.847c1.186,-1.6 2.768,-2.406 4.734,-2.334C14.013,3.579 15.429,4.395 16.472,5.843z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M12.002,20.169c-0.383,-0.408 -0.749,-0.812 -1.096,-1.233c-0.146,-0.177 -0.292,-0.353 -0.434,-0.533c-0.05,-0.063 -0.058,-0.094 -0.006,-0.167c0.466,-0.65 0.907,-1.317 1.304,-2.013c0.088,-0.154 0.179,-0.307 0.259,-0.466c0.038,-0.076 0.083,-0.102 0.168,-0.106c1.054,-0.05 2.056,-0.298 2.982,-0.816c0.329,-0.184 0.647,-0.385 0.959,-0.607C15.124,16.459 13.679,18.388 12.002,20.169z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M7.861,14.231c0.421,0.291 0.845,0.562 1.303,0.779c0.483,0.229 0.985,0.403 1.51,0.5c0.144,0.027 0.126,0.072 0.075,0.155c-0.277,0.449 -0.546,0.903 -0.848,1.336c-0.076,0.109 -0.152,0.217 -0.238,0.34C8.965,16.352 8.354,15.329 7.861,14.231z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M15.032,8.211c0.475,-0.065 0.935,0.407 0.92,0.924c-0.013,0.432 -0.413,0.897 -0.925,0.891c-0.474,-0.005 -0.915,-0.445 -0.903,-0.948C14.134,8.626 14.579,8.147 15.032,8.211z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M9.866,9.095c0.053,0.502 -0.439,0.935 -0.908,0.931c-0.483,-0.005 -0.915,-0.417 -0.908,-0.94c0.006,-0.404 0.373,-0.92 0.985,-0.884C9.424,8.224 9.917,8.615 9.866,9.095z"
+      android:fillColor="#FFFFFF"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.969,9.711c0.189,0.189 0.415,0.284 0.678,0.284c0.279,0 0.509,-0.094 0.69,-0.284c0.181,-0.188 0.271,-0.414 0.271,-0.678V6.026c0,-0.279 -0.091,-0.509 -0.271,-0.69c-0.181,-0.181 -0.411,-0.271 -0.69,-0.271c-0.118,0 -0.227,0.021 -0.33,0.057C8.524,5.258 7.78,5.517 7.09,5.913C6.038,6.518 5.209,7.351 4.605,8.411C4,9.472 3.697,10.649 3.697,11.941s0.294,2.465 0.882,3.517c0.588,1.053 1.392,1.881 2.411,2.486c0.475,0.282 0.976,0.497 1.504,0.647c0.576,0.163 1.152,-0.263 1.152,-0.862c0,-0.4 -0.269,-0.74 -0.651,-0.862c-0.334,-0.107 -0.655,-0.249 -0.961,-0.427c-0.77,-0.448 -1.376,-1.065 -1.815,-1.852c-0.439,-0.787 -0.659,-1.669 -0.659,-2.648c0,-0.978 0.219,-1.86 0.659,-2.648c0.439,-0.787 1.044,-1.408 1.815,-1.864c0.21,-0.124 0.428,-0.227 0.65,-0.317v1.921C8.685,9.297 8.78,9.523 8.969,9.711z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M13.023,15.193c0,0.297 -0.241,0.538 -0.538,0.538l0,0c-0.297,0 -0.538,-0.241 -0.538,-0.538l0,0c0,-0.297 0.241,-0.538 0.538,-0.538l0,0C12.782,14.655 13.023,14.896 13.023,15.193L13.023,15.193z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M12.753,14.028c-0.094,-0.02 -0.182,-0.051 -0.287,-0.051c-0.091,0 -0.17,0.03 -0.254,0.047l0.272,0.272L12.753,14.028z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M18.849,7.116c-0.766,-1.342 -1.815,-2.397 -3.147,-3.163c-0.581,-0.334 -1.191,-0.595 -1.829,-0.783c-0.704,-0.208 -1.406,0.344 -1.406,1.078v0c0,0.495 0.331,0.916 0.802,1.069c0.426,0.138 0.834,0.323 1.222,0.555c0.965,0.578 1.725,1.364 2.281,2.36c0.556,0.997 0.834,2.114 0.834,3.351c0,1.238 -0.278,2.355 -0.834,3.351c-0.556,0.996 -1.317,1.777 -2.281,2.344c-0.26,0.153 -0.531,0.279 -0.808,0.39v-2.476c0,-0.353 -0.115,-0.644 -0.343,-0.873c-0.161,-0.161 -0.364,-0.245 -0.587,-0.293l-0.268,0.268c0.496,0 0.897,0.402 0.897,0.897s-0.402,0.897 -0.897,0.897s-0.897,-0.402 -0.897,-0.897s0.402,-0.897 0.897,-0.897l-0.272,-0.272c-0.223,0.046 -0.431,0.13 -0.604,0.296c-0.239,0.229 -0.359,0.52 -0.359,0.873v3.802c0,0.333 0.119,0.619 0.359,0.858c0.239,0.24 0.525,0.359 0.858,0.359c0.189,0 0.359,-0.037 0.512,-0.105c0.616,-0.144 1.204,-0.356 1.764,-0.641c1.133,-0.577 2.066,-1.369 2.801,-2.376v1.888c0,0.357 0.115,0.645 0.346,0.865c0.231,0.22 0.524,0.331 0.881,0.331c0.357,0 0.65,-0.115 0.881,-0.346c0.231,-0.231 0.346,-0.513 0.346,-0.849v-7.395C19.998,9.947 19.615,8.458 18.849,7.116z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M12.009,1.074c-6.039,0 -10.935,4.896 -10.935,10.935c0,6.039 4.896,10.935 10.935,10.935c6.039,0 10.935,-4.896 10.935,-10.935C22.944,5.969 18.048,1.074 12.009,1.074zM12.009,22.125c-5.587,0 -10.116,-4.529 -10.116,-10.116c0,-5.587 4.529,-10.116 10.116,-10.116c5.587,0 10.116,4.529 10.116,10.116C22.125,17.596 17.595,22.125 12.009,22.125z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M13.424,13.601c-0.061,0 -0.122,-0.022 -0.169,-0.067c-0.423,-0.406 -1.118,-0.406 -1.541,0c-0.096,0.093 -0.251,0.091 -0.345,-0.007c-0.093,-0.098 -0.09,-0.252 0.008,-0.346c0.606,-0.581 1.61,-0.581 2.216,0c0.097,0.094 0.101,0.248 0.008,0.346C13.553,13.576 13.488,13.601 13.424,13.601z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M14.322,12.703c-0.062,0 -0.123,-0.022 -0.17,-0.069c-0.901,-0.877 -2.431,-0.877 -3.333,0c-0.096,0.096 -0.251,0.092 -0.345,-0.004c-0.094,-0.096 -0.092,-0.251 0.005,-0.345c0.542,-0.529 1.255,-0.82 2.007,-0.82s1.465,0.291 2.007,0.82c0.097,0.094 0.099,0.249 0.005,0.345C14.449,12.679 14.385,12.703 14.322,12.703z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
index b655d741e6..5c8da5df78 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
deleted file mode 100644
index 8229a9a64c..0000000000
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_notif_aaps">
+    <path fill="#FFFFFF" d="M22.107,7.852c-1.11-2.694-3.265-4.849-5.959-5.959C14.869,1.365,13.468,1.074,12,1.074
+        c-1.468,0-2.869,0.292-4.148,0.819c-2.694,1.11-4.849,3.265-5.959,5.959C1.365,9.131,1.074,10.532,1.074,12
+        c0,1.468,0.292,2.869,0.819,4.148c1.11,2.694,3.265,4.849,5.959,5.959c1.28,0.527,2.681,0.819,4.148,0.819
+        c1.468,0,2.869-0.292,4.148-0.819c2.694-1.11,4.849-3.265,5.959-5.959c0.527-1.28,0.819-2.681,0.819-4.148
+        C22.926,10.532,22.635,9.131,22.107,7.852z M18.837,7.97c-0.694-1.216-1.645-2.172-2.852-2.866
+        c-0.527-0.303-1.079-0.539-1.658-0.71c-0.638-0.188-1.274,0.312-1.274,0.977v0c0,0.449,0.3,0.831,0.727,0.969
+        c0.386,0.125,0.755,0.293,1.108,0.503c0.874,0.523,1.564,1.236,2.068,2.139c0.504,0.904,0.756,1.916,0.756,3.037
+        c0,1.122-0.252,2.134-0.756,3.037c-0.504,0.903-1.193,1.611-2.068,2.125c-0.236,0.138-0.481,0.253-0.732,0.354v-4.045
+        c0-0.32-0.104-0.584-0.311-0.791c-0.208-0.207-0.471-0.311-0.792-0.311c-0.302,0-0.561,0.104-0.778,0.311
+        c-0.217,0.208-0.325,0.471-0.325,0.791v5.246c0,0.302,0.108,0.561,0.325,0.778c0.217,0.217,0.476,0.325,0.778,0.325
+        c0.171,0,0.325-0.033,0.464-0.096c0.558-0.131,1.091-0.322,1.598-0.581c1.027-0.523,1.872-1.24,2.538-2.153v1.711
+        c0,0.174,0.031,0.33,0.092,0.468c-1.576,1.262-3.574,2.018-5.745,2.018c-5.077,0-9.208-4.131-9.208-9.208S6.923,2.792,12,2.792
+        S21.208,6.923,21.208,12c0,1.742-0.486,3.372-1.33,4.762V12.02C19.878,10.537,19.531,9.187,18.837,7.97z"/>
+    <path fill="#FFFFFF" d="M10.847,4.131c-0.135,0-0.26,0.024-0.378,0.066C9.559,4.353,8.705,4.649,7.914,5.104
+        C6.707,5.798,5.756,6.754,5.062,7.97c-0.694,1.217-1.041,2.567-1.041,4.05c0,1.483,0.337,2.829,1.012,4.035
+        c0.675,1.208,1.597,2.158,2.766,2.852c0.545,0.324,1.12,0.571,1.725,0.742c0.661,0.188,1.321-0.302,1.321-0.989
+        c0-0.459-0.309-0.849-0.746-0.989c-0.383-0.122-0.751-0.285-1.103-0.489c-0.884-0.514-1.578-1.222-2.082-2.125
+        C6.412,14.154,6.16,13.142,6.16,12.02c0-1.122,0.252-2.134,0.756-3.037C7.42,8.08,8.114,7.367,8.998,6.844
+        c0.241-0.142,0.491-0.26,0.746-0.363v3.999c0,0.302,0.108,0.561,0.325,0.778c0.217,0.217,0.476,0.325,0.778,0.325
+        c0.32,0,0.584-0.108,0.792-0.325c0.207-0.216,0.311-0.475,0.311-0.778V5.233c0-0.32-0.104-0.584-0.311-0.791
+        C11.431,4.235,11.167,4.131,10.847,4.131z"/>
+</g>
+</svg>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_notif_nsclient">
+    <path fill="#FFFFFF" d="M19.937,8.998c0,0.712-0.092,1.6-0.132,1.889c-0.115,0.816-0.32,1.61-0.578,2.391
+        c-0.335,1.015-0.758,1.992-1.27,2.931c-0.314,0.576-0.643,1.144-1.002,1.692c-0.388,0.592-0.799,1.166-1.236,1.723
+        c-0.415,0.529-0.837,1.05-1.282,1.555c-0.145,0.164-0.298,0.322-0.444,0.485c-0.283,0.316-0.531,0.575-0.858,0.849
+        c-0.712,0.67-1.759,0.616-2.378-0.081c-0.469-0.458-0.911-0.94-1.341-1.436c-0.531-0.613-1.037-1.245-1.521-1.896
+        c-0.718-0.966-1.362-1.978-1.933-3.036c-0.41-0.758-0.755-1.549-1.041-2.362c-0.386-1.097-0.69-2.215-0.799-3.381
+        c-0.013-0.143-0.059-0.71-0.059-1.319c0-0.647,0.067-1.158,0.096-1.358C4.27,6.89,4.52,6.182,4.846,5.499
+        C5.113,4.94,5.45,4.426,5.845,3.944C6.226,3.479,6.65,3.061,7.12,2.693C7.636,2.288,8.198,1.95,8.805,1.69
+        c0.667-0.285,1.353-0.494,2.075-0.586c0.127-0.016,0.598-0.062,1.166-0.062c0.728,0,1.44,0.108,1.764,0.184
+        c0.732,0.172,1.428,0.44,2.086,0.812c0.93,0.526,1.725,1.21,2.383,2.046c0.473,0.601,0.853,1.26,1.128,1.976
+        c0.193,0.503,0.347,1.016,0.434,1.551C19.871,7.8,19.937,8.371,19.937,8.998z M12.052,2.302c-0.311-0.005-0.618,0.035-0.926,0.068
+        C10.484,2.439,9.876,2.628,9.29,2.888c-1.007,0.447-1.839,1.12-2.525,1.983c-0.477,0.6-0.832,1.261-1.083,1.98
+        C5.545,7.245,5.455,7.654,5.399,8.066C5.354,8.405,5.324,8.752,5.336,9.091c0.014,0.41,0.027,0.796,0.086,1.192
+        c0.058,0.386,0.103,0.775,0.19,1.154c0.247,1.084,0.608,2.131,1.076,3.14c0.409,0.88,0.883,1.723,1.413,2.535
+        c0.534,0.817,1.113,1.601,1.734,2.355c0.563,0.683,1.143,1.349,1.772,1.972c0.234,0.232,0.548,0.228,0.784,0
+        c0.628-0.608,1.529-1.669,1.956-2.191c0.395-0.484,0.769-0.983,1.125-1.497c0.456-0.659,0.881-1.336,1.263-2.041
+        c0.43-0.793,0.818-1.604,1.123-2.454c0.27-0.754,0.479-1.521,0.62-2.311c0.105-0.586,0.16-1.175,0.194-1.767
+        c0.02-0.349-0.023-0.696-0.063-1.044c-0.074-0.652-0.247-1.277-0.519-1.87c-0.386-0.841-0.91-1.583-1.602-2.208
+        c-0.514-0.464-1.077-0.844-1.703-1.136C13.919,2.516,13.006,2.318,12.052,2.302z"/>
+    <path fill="#FFFFFF" d="M11.403,10.462c0,0.495,0.002,0.99-0.001,1.485c-0.001,0.242,0.102,0.353,0.33,0.33
+        c0.175-0.017,0.352-0.003,0.529-0.003c0.287,0,0.337-0.049,0.337-0.329c0-0.967-0.024-1.935,0.007-2.901
+        c0.027-0.853,0.404-1.541,1.159-1.975c0.782-0.449,1.606-0.458,2.409-0.08c0.674,0.317,1.073,0.88,1.242,1.612
+        c0.145,0.629,0.02,1.233-0.129,1.837c-0.184,0.747-0.541,1.413-1.022,2.005c-0.729,0.896-1.653,1.5-2.772,1.819
+        c-0.644,0.184-1.296,0.239-1.952,0.191c-1.02-0.075-1.944-0.434-2.775-1.04c-0.64-0.467-1.149-1.049-1.544-1.727
+        c-0.295-0.506-0.493-1.056-0.597-1.636c-0.056-0.315-0.111-0.63-0.102-0.951c0.028-1.103,0.777-2.126,1.932-2.325
+        c0.66-0.114,1.28-0.031,1.85,0.314c0.551,0.334,0.885,0.834,1.031,1.461c0.048,0.208,0.073,0.418,0.07,0.633
+        C11.398,9.608,11.403,10.035,11.403,10.462z M15.047,7.016c-1.149-0.005-2.089,0.928-2.103,2.061
+        c-0.015,1.185,0.931,2.132,2.085,2.129c1.187-0.004,2.088-0.909,2.101-2.077C17.145,7.951,16.2,7.034,15.047,7.016z M11.061,9.097
+        c-0.006-1.146-0.964-2.049-2.002-2.079C7.781,6.982,6.872,7.985,6.87,9.095c-0.002,1.185,0.922,2.103,2.085,2.11
+        C10.098,11.211,11.045,10.32,11.061,9.097z"/>
+    <path fill="#FFFFFF" d="M16.472,5.843c-0.192-0.021-0.365-0.097-0.549-0.135c-1.148-0.239-2.208-0.059-3.16,0.649
+        c-0.259,0.193-0.482,0.425-0.656,0.695c-0.099,0.154-0.155,0.074-0.213-0.009c-0.116-0.167-0.248-0.32-0.396-0.458
+        c-0.558-0.521-1.215-0.832-1.972-0.934C8.936,5.572,8.353,5.602,7.782,5.786C7.714,5.808,7.647,5.834,7.579,5.855
+        C7.564,5.859,7.545,5.852,7.504,5.847c1.186-1.6,2.768-2.406,4.734-2.334C14.013,3.579,15.429,4.395,16.472,5.843z"/>
+    <path fill="#FFFFFF" d="M12.002,20.169c-0.383-0.408-0.749-0.812-1.096-1.233c-0.146-0.177-0.292-0.353-0.434-0.533
+        c-0.05-0.063-0.058-0.094-0.006-0.167c0.466-0.65,0.907-1.317,1.304-2.013c0.088-0.154,0.179-0.307,0.259-0.466
+        c0.038-0.076,0.083-0.102,0.168-0.106c1.054-0.05,2.056-0.298,2.982-0.816c0.329-0.184,0.647-0.385,0.959-0.607
+        C15.124,16.459,13.679,18.388,12.002,20.169z"/>
+    <path fill="#FFFFFF" d="M7.861,14.231c0.421,0.291,0.845,0.562,1.303,0.779c0.483,0.229,0.985,0.403,1.51,0.5
+        c0.144,0.027,0.126,0.072,0.075,0.155c-0.277,0.449-0.546,0.903-0.848,1.336c-0.076,0.109-0.152,0.217-0.238,0.34
+        C8.965,16.352,8.354,15.329,7.861,14.231z"/>
+    <path fill="#FFFFFF" d="M15.032,8.211c0.475-0.065,0.935,0.407,0.92,0.924c-0.013,0.432-0.413,0.897-0.925,0.891
+        c-0.474-0.005-0.915-0.445-0.903-0.948C14.134,8.626,14.579,8.147,15.032,8.211z"/>
+    <path fill="#FFFFFF" d="M9.866,9.095c0.053,0.502-0.439,0.935-0.908,0.931c-0.483-0.005-0.915-0.417-0.908-0.94
+        c0.006-0.404,0.373-0.92,0.985-0.884C9.424,8.224,9.917,8.615,9.866,9.095z"/>
+</g>
+</svg>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_notif_pumpcontrol">
+    <path fill="#FFFFFF" d="M8.969,9.711c0.189,0.189,0.415,0.284,0.678,0.284c0.279,0,0.509-0.094,0.69-0.284
+        c0.181-0.188,0.271-0.414,0.271-0.678V6.026c0-0.279-0.091-0.509-0.271-0.69c-0.181-0.181-0.411-0.271-0.69-0.271
+        c-0.118,0-0.227,0.021-0.33,0.057C8.524,5.258,7.78,5.517,7.09,5.913C6.038,6.518,5.209,7.351,4.605,8.411
+        C4,9.472,3.697,10.649,3.697,11.941s0.294,2.465,0.882,3.517c0.588,1.053,1.392,1.881,2.411,2.486
+        c0.475,0.282,0.976,0.497,1.504,0.647c0.576,0.163,1.152-0.263,1.152-0.862c0-0.4-0.269-0.74-0.651-0.862
+        c-0.334-0.107-0.655-0.249-0.961-0.427c-0.77-0.448-1.376-1.065-1.815-1.852c-0.439-0.787-0.659-1.669-0.659-2.648
+        c0-0.978,0.219-1.86,0.659-2.648c0.439-0.787,1.044-1.408,1.815-1.864c0.21-0.124,0.428-0.227,0.65-0.317v1.921
+        C8.685,9.297,8.78,9.523,8.969,9.711z"/>
+    <path fill="#FFFFFF" d="M13.023,15.193c0,0.297-0.241,0.538-0.538,0.538l0,0c-0.297,0-0.538-0.241-0.538-0.538l0,0
+        c0-0.297,0.241-0.538,0.538-0.538l0,0C12.782,14.655,13.023,14.896,13.023,15.193L13.023,15.193z"/>
+    <path fill="#FFFFFF" d="M12.753,14.028c-0.094-0.02-0.182-0.051-0.287-0.051c-0.091,0-0.17,0.03-0.254,0.047l0.272,0.272
+        L12.753,14.028z"/>
+    <path fill="#FFFFFF" d="M18.849,7.116c-0.766-1.342-1.815-2.397-3.147-3.163c-0.581-0.334-1.191-0.595-1.829-0.783
+        c-0.704-0.208-1.406,0.344-1.406,1.078v0c0,0.495,0.331,0.916,0.802,1.069c0.426,0.138,0.834,0.323,1.222,0.555
+        c0.965,0.578,1.725,1.364,2.281,2.36c0.556,0.997,0.834,2.114,0.834,3.351c0,1.238-0.278,2.355-0.834,3.351
+        c-0.556,0.996-1.317,1.777-2.281,2.344c-0.26,0.153-0.531,0.279-0.808,0.39v-2.476c0-0.353-0.115-0.644-0.343-0.873
+        c-0.161-0.161-0.364-0.245-0.587-0.293l-0.268,0.268c0.496,0,0.897,0.402,0.897,0.897s-0.402,0.897-0.897,0.897
+        s-0.897-0.402-0.897-0.897s0.402-0.897,0.897-0.897l-0.272-0.272c-0.223,0.046-0.431,0.13-0.604,0.296
+        c-0.239,0.229-0.359,0.52-0.359,0.873v3.802c0,0.333,0.119,0.619,0.359,0.858c0.239,0.24,0.525,0.359,0.858,0.359
+        c0.189,0,0.359-0.037,0.512-0.105c0.616-0.144,1.204-0.356,1.764-0.641c1.133-0.577,2.066-1.369,2.801-2.376v1.888
+        c0,0.357,0.115,0.645,0.346,0.865c0.231,0.22,0.524,0.331,0.881,0.331c0.357,0,0.65-0.115,0.881-0.346
+        c0.231-0.231,0.346-0.513,0.346-0.849v-7.395C19.998,9.947,19.615,8.458,18.849,7.116z"/>
+    <path fill="#FFFFFF" d="M12.009,1.074c-6.039,0-10.935,4.896-10.935,10.935c0,6.039,4.896,10.935,10.935,10.935
+        c6.039,0,10.935-4.896,10.935-10.935C22.944,5.969,18.048,1.074,12.009,1.074z M12.009,22.125
+        c-5.587,0-10.116-4.529-10.116-10.116c0-5.587,4.529-10.116,10.116-10.116c5.587,0,10.116,4.529,10.116,10.116
+        C22.125,17.596,17.595,22.125,12.009,22.125z"/>
+    <path fill="#FFFFFF" d="M13.424,13.601c-0.061,0-0.122-0.022-0.169-0.067c-0.423-0.406-1.118-0.406-1.541,0
+        c-0.096,0.093-0.251,0.091-0.345-0.007c-0.093-0.098-0.09-0.252,0.008-0.346c0.606-0.581,1.61-0.581,2.216,0
+        c0.097,0.094,0.101,0.248,0.008,0.346C13.553,13.576,13.488,13.601,13.424,13.601z"/>
+    <path fill="#FFFFFF" d="M14.322,12.703c-0.062,0-0.123-0.022-0.17-0.069c-0.901-0.877-2.431-0.877-3.333,0
+        c-0.096,0.096-0.251,0.092-0.345-0.004c-0.094-0.096-0.092-0.251,0.005-0.345c0.542-0.529,1.255-0.82,2.007-0.82
+        s1.465,0.291,2.007,0.82c0.097,0.094,0.099,0.249,0.005,0.345C14.449,12.679,14.385,12.703,14.322,12.703z"/>
+</g>
+</svg>