From ef4a9672c7b00470bcac4154e8bb2efd6ce40787 Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Thu, 17 Dec 2020 16:13:46 +0100
Subject: [PATCH] fix color

---
 app/src/main/res/drawable/ic_action.xml       |  3 +--
 app/src/main/res/drawable/ic_automation.xml   |  3 +--
 app/src/main/res/drawable/ic_food.xml         |  3 +--
 app/src/main/res/drawable/ic_generic_cgm.xml  |  4 +--
 app/src/main/res/drawable/ic_generic_icon.xml |  2 +-
 app/src/main/res/drawable/ic_home.xml         |  3 +--
 .../main/res/drawable/ic_local_profile.xml    | 10 +++----
 app/src/main/res/drawable/ic_maintenance.xml  |  4 +--
 .../res/drawable/ic_nightscout_profile.xml    |  6 ++---
 .../main/res/drawable/ic_nightscout_syncs.xml |  8 +++---
 app/src/main/res/drawable/ic_nsclient_bg.xml  |  4 +--
 app/src/main/res/drawable/ic_sms.xml          |  3 +--
 app/src/main/res/drawable/ic_treatments.xml   | 16 ++++++------
 app/src/main/res/drawable/ic_watch.xml        |  3 +--
 core/src/main/res/drawable/ic_insulin.xml     | 26 +++++++++----------
 15 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/app/src/main/res/drawable/ic_action.xml b/app/src/main/res/drawable/ic_action.xml
index 4ff5718491..d8f9511303 100644
--- a/app/src/main/res/drawable/ic_action.xml
+++ b/app/src/main/res/drawable/ic_action.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M14.27,6C13.72,6.95 14.05,8.18 15,8.73c0.95,0.55 2.18,0.22 2.73,-0.73c0.55,-0.95 0.22,-2.18 -0.73,-2.73C16.05,4.72 14.82,5.05 14.27,6z"/>
diff --git a/app/src/main/res/drawable/ic_automation.xml b/app/src/main/res/drawable/ic_automation.xml
index 3829d14c8f..1b237ebe15 100644
--- a/app/src/main/res/drawable/ic_automation.xml
+++ b/app/src/main/res/drawable/ic_automation.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M17,12c-2.76,0 -5,2.24 -5,5s2.24,5 5,5c2.76,0 5,-2.24 5,-5S19.76,12 17,12zM18.65,19.35l-2.15,-2.15V14h1v2.79l1.85,1.85L18.65,19.35zM18,3h-3.18C14.4,1.84 13.3,1 12,1S9.6,1.84 9.18,3H6C4.9,3 4,3.9 4,5v15c0,1.1 0.9,2 2,2h6.11c-0.59,-0.57 -1.07,-1.25 -1.42,-2H6V5h2v3h8V5h2v5.08c0.71,0.1 1.38,0.31 2,0.6V5C20,3.9 19.1,3 18,3zM12,5c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1c0.55,0 1,0.45 1,1C13,4.55 12.55,5 12,5z"/>
diff --git a/app/src/main/res/drawable/ic_food.xml b/app/src/main/res/drawable/ic_food.xml
index b270e42db9..11e36cf01c 100644
--- a/app/src/main/res/drawable/ic_food.xml
+++ b/app/src/main/res/drawable/ic_food.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M18.06,22.99h1.66c0.84,0 1.53,-0.64 1.63,-1.46L23,5.05h-5L18,1h-1.97v4.05h-4.97l0.3,2.34c1.71,0.47 3.31,1.32 4.27,2.26 1.44,1.42 2.43,2.89 2.43,5.29v8.05zM1,21.99L1,21h15.03v0.99c0,0.55 -0.45,1 -1.01,1L2.01,22.99c-0.56,0 -1.01,-0.45 -1.01,-1zM16.03,14.99c0,-8 -15.03,-8 -15.03,0h15.03zM1.02,17h15v2h-15z"/>
diff --git a/app/src/main/res/drawable/ic_generic_cgm.xml b/app/src/main/res/drawable/ic_generic_cgm.xml
index 4f71ca6df0..9690973615 100644
--- a/app/src/main/res/drawable/ic_generic_cgm.xml
+++ b/app/src/main/res/drawable/ic_generic_cgm.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="64">
   <path
       android:pathData="M53.25,24.762c-0,-11.493 -9.331,-20.825 -20.825,-20.825l-0.85,0c-11.494,0 -20.825,9.332 -20.825,20.825l0,14.476c0,11.493 9.331,20.825 20.825,20.825l0.85,-0c11.494,-0 20.825,-9.332 20.825,-20.825l-0,-14.476Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M52.388,25.056c-0,-11.028 -8.953,-19.98 -19.98,-19.98l-0.816,-0c-11.027,-0 -19.98,8.952 -19.98,19.98l0,13.888c0,11.028 8.953,19.98 19.98,19.98l0.816,0c11.027,0 19.98,-8.952 19.98,-19.98l-0,-13.888Z">
     <aapt:attr name="android:fillColor">
@@ -29,7 +29,7 @@
       android:pathData="M27.423,51.66a4.467,4.306 0,1 0,8.934 0a4.467,4.306 0,1 0,-8.934 0z"/>
   <path
       android:pathData="M32,32m-27.5,0a27.5,27.5 0,1 1,55 0a27.5,27.5 0,1 1,-55 0"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:fillColor="#FF000000"
       android:pathData="M21.824,34.228l1.704,0.498c-0.358,1.621 -1,2.857 -1.928,3.708c-0.929,0.851 -2.063,1.277 -3.404,1.277c-1.388,-0 -2.517,-0.327 -3.387,-0.982c-0.869,-0.654 -1.531,-1.602 -1.985,-2.843c-0.454,-1.241 -0.681,-2.574 -0.681,-3.998c0,-1.553 0.257,-2.908 0.769,-4.064c0.512,-1.156 1.242,-2.034 2.187,-2.635c0.946,-0.6 1.987,-0.9 3.123,-0.9c1.288,0 2.372,0.38 3.25,1.14c0.879,0.759 1.491,1.827 1.836,3.204l-1.678,0.458c-0.298,-1.085 -0.732,-1.875 -1.3,-2.371c-0.568,-0.495 -1.282,-0.742 -2.143,-0.742c-0.99,-0 -1.817,0.275 -2.482,0.824c-0.664,0.549 -1.131,1.287 -1.401,2.212c-0.269,0.926 -0.404,1.881 -0.404,2.864c0,1.268 0.16,2.375 0.479,3.321c0.319,0.946 0.815,1.653 1.489,2.121c0.673,0.468 1.402,0.702 2.187,0.702c0.955,0 1.763,-0.319 2.425,-0.956c0.661,-0.638 1.109,-1.584 1.344,-2.838Z"
diff --git a/app/src/main/res/drawable/ic_generic_icon.xml b/app/src/main/res/drawable/ic_generic_icon.xml
index a4f3ece813..21ad8c26fa 100644
--- a/app/src/main/res/drawable/ic_generic_icon.xml
+++ b/app/src/main/res/drawable/ic_generic_icon.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="64">
   <path
       android:pathData="M34.9527,3.6697C32.9895,3.458 31.0105,3.458 29.0473,3.6697L28.2608,9.24C26.4699,9.5448 24.7219,10.0669 23.0535,10.7961L19.4324,6.543C17.6686,7.4441 16.0037,8.5334 14.4648,9.7918L16.7622,14.9098C15.4176,16.1519 14.2242,17.5533 13.2085,19.0841L7.9023,17.4981C6.898,19.227 6.0756,21.0591 5.4492,22.9644L10.1018,26.006C9.6302,27.7901 9.3704,29.6257 9.3293,31.4731L4.0231,33.0573C4.0966,35.0648 4.3783,37.0588 4.8639,39.0057L10.3931,39.0057C10.9443,40.7654 11.7011,42.4527 12.6477,44.0287L9.0266,48.2817C10.1543,49.9301 11.4509,51.4518 12.8935,52.8233L17.5453,49.7808C18.9442,50.9578 20.477,51.9602 22.1113,52.7663L21.323,58.3357C23.148,59.102 25.0473,59.6692 26.9896,60.0293L29.2861,54.9105C31.0893,55.1312 32.9108,55.1312 34.7139,54.9105L37.0104,60.0293C38.9527,59.6692 40.852,59.102 42.677,58.3357L41.8888,52.7663C43.523,51.9602 45.0558,50.9578 46.4548,49.7808L51.1065,52.8233C52.5492,51.4518 53.8457,49.9301 54.9735,48.2817L51.3523,44.0287C52.299,42.4527 53.0557,40.7654 53.6069,39.0057L59.1361,39.0057C59.6217,37.0588 59.9034,35.0648 59.9769,33.0573L54.6707,31.4731C54.6296,29.6257 54.3698,27.7901 53.8982,26.006L58.5508,22.9644C57.9244,21.0591 57.102,19.227 56.0977,17.4981L50.7915,19.0841C49.7758,17.5533 48.5825,16.1519 47.2378,14.9098L49.5352,9.7918C47.9963,8.5334 46.3314,7.4441 44.5676,6.543L40.9465,10.7961C39.2781,10.0669 37.5301,9.5448 35.7392,9.24L34.9527,3.6697ZM32,18.61C39.2624,18.61 45.1582,24.61 45.1582,31.9997C45.1582,39.3902 39.2624,45.3893 32,45.3893C24.7376,45.3893 18.8418,39.3902 18.8418,31.9997C18.8418,24.61 24.7376,18.61 32,18.61Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@android:color/white"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index 3a4c7dac9d..977dc1f183 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
diff --git a/app/src/main/res/drawable/ic_local_profile.xml b/app/src/main/res/drawable/ic_local_profile.xml
index b1b6665a83..d103cafaa7 100644
--- a/app/src/main/res/drawable/ic_local_profile.xml
+++ b/app/src/main/res/drawable/ic_local_profile.xml
@@ -1,8 +1,8 @@
 <vector android:height="36dp" android:viewportHeight="64"
     android:viewportWidth="64" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M48.433,3.365l13.803,11.632l-27.606,0l13.803,-11.632Z"/>
-    <path android:fillColor="#fff" android:pathData="M45.253,14.997h6.586v3.428h-6.586z"/>
-    <path android:fillColor="#fff" android:pathData="M38.504,14.997h6.749v12.189h-6.749z"/>
-    <path android:fillColor="#fff" android:pathData="M51.84,14.997h6.747v12.189h-6.747z"/>
-    <path android:fillColor="#fff" android:fillType="nonZero" android:pathData="M38.504,50.81c0,4.133 -7.139,7.573 -16.04,7.729c-8.901,0.156 -16.579,-3.024 -17.251,-7.145c-0.672,-4.122 5.887,-7.802 14.737,-8.269c8.85,-0.467 17.024,2.435 18.364,6.521l0.19,1.164ZM31.825,33.192c-0,4.902 -4.06,8.982 -9.121,9.167c-5.061,0.185 -9.428,-3.587 -9.81,-8.475c-0.382,-4.888 3.348,-9.253 8.38,-9.807c5.033,-0.554 9.68,2.889 10.443,7.734l0.108,1.381Z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M48.433,3.365l13.803,11.632l-27.606,0l13.803,-11.632Z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M45.253,14.997h6.586v3.428h-6.586z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M38.504,14.997h6.749v12.189h-6.749z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M51.84,14.997h6.747v12.189h-6.747z"/>
+    <path android:fillColor="@android:color/white" android:fillType="nonZero" android:pathData="M38.504,50.81c0,4.133 -7.139,7.573 -16.04,7.729c-8.901,0.156 -16.579,-3.024 -17.251,-7.145c-0.672,-4.122 5.887,-7.802 14.737,-8.269c8.85,-0.467 17.024,2.435 18.364,6.521l0.19,1.164ZM31.825,33.192c-0,4.902 -4.06,8.982 -9.121,9.167c-5.061,0.185 -9.428,-3.587 -9.81,-8.475c-0.382,-4.888 3.348,-9.253 8.38,-9.807c5.033,-0.554 9.68,2.889 10.443,7.734l0.108,1.381Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_maintenance.xml b/app/src/main/res/drawable/ic_maintenance.xml
index 9050d07e2e..12313e8445 100644
--- a/app/src/main/res/drawable/ic_maintenance.xml
+++ b/app/src/main/res/drawable/ic_maintenance.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="64">
   <path
       android:pathData="M30.342,24.318c1.366,3.679 4.175,6.646 7.729,8.193c-0.101,0.988 -0.53,1.949 -1.287,2.705l-19.957,19.958c-1.746,1.746 -4.582,1.746 -6.329,-0l-3.26,-3.26c-1.746,-1.747 -1.746,-4.583 0,-6.329l19.958,-19.957c0.868,-0.869 2.007,-1.306 3.146,-1.31ZM16.307,44.823c1.159,0 2.1,0.932 2.1,2.079c-0,1.147 -0.941,2.078 -2.1,2.078c-1.159,0 -2.099,-0.931 -2.099,-2.078c-0,-1.147 0.94,-2.079 2.099,-2.079Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M58.682,18.101c0.003,0.104 0.004,0.208 0.004,0.312c-0,7.953 -6.336,14.41 -14.14,14.41c-7.804,-0 -14.139,-6.457 -14.139,-14.41c-0,-7.952 6.335,-14.409 14.139,-14.409c3.386,0 6.495,1.215 8.93,3.241l-10.873,6.475l0,7.107l6.258,3.309l0.078,0.13l0.076,-0.048l0.091,0.048l0.024,-0.121l9.552,-6.044Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_nightscout_profile.xml b/app/src/main/res/drawable/ic_nightscout_profile.xml
index 9cce2a2ab2..43067c125e 100644
--- a/app/src/main/res/drawable/ic_nightscout_profile.xml
+++ b/app/src/main/res/drawable/ic_nightscout_profile.xml
@@ -1,10 +1,10 @@
 <vector android:height="36dp" android:viewportHeight="64"
     android:viewportWidth="64" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:fillType="nonZero" android:pathData="M38.504,50.81c0,4.133 -7.139,7.573 -16.04,7.729c-8.901,0.156 -16.579,-3.024 -17.251,-7.145c-0.672,-4.122 5.887,-7.802 14.737,-8.269c8.85,-0.467 17.024,2.435 18.364,6.521l0.19,1.164ZM31.825,33.192c-0,4.902 -4.06,8.982 -9.121,9.167c-5.061,0.185 -9.428,-3.587 -9.81,-8.475c-0.382,-4.888 3.348,-9.253 8.38,-9.807c5.033,-0.554 9.68,2.889 10.443,7.734l0.108,1.381Z"/>
+    <path android:fillColor="@android:color/white" android:fillType="nonZero" android:pathData="M38.504,50.81c0,4.133 -7.139,7.573 -16.04,7.729c-8.901,0.156 -16.579,-3.024 -17.251,-7.145c-0.672,-4.122 5.887,-7.802 14.737,-8.269c8.85,-0.467 17.024,2.435 18.364,6.521l0.19,1.164ZM31.825,33.192c-0,4.902 -4.06,8.982 -9.121,9.167c-5.061,0.185 -9.428,-3.587 -9.81,-8.475c-0.382,-4.888 3.348,-9.253 8.38,-9.807c5.033,-0.554 9.68,2.889 10.443,7.734l0.108,1.381Z"/>
     <path android:fillColor="#00000000"
         android:pathData="M48.482,34.89c1.19,0.985 11.298,-12.07 10.281,-19.108c-0.83,-5.741 -4.429,-10.197 -10.281,-10.324c-5.915,-0.129 -9.748,4.343 -10.28,10.324c-0.628,7.047 8.849,20.079 10.28,19.108Z"
-        android:strokeColor="#fff" android:strokeWidth="3.09"/>
-    <path android:fillColor="#fff" android:pathData="M53.696,23.303c-1.343,2.486 -3.174,4.943 -5.291,7.381l-1.973,-2.349c0.695,-1.242 1.452,-2.453 2.437,-3.549l4.827,-1.483ZM43.048,23.303l4.208,1.465l-1.84,2.322l-2.368,-3.787ZM49.099,16.153c-0,-1.762 1.426,-3.192 3.182,-3.192c1.756,0 3.182,1.43 3.182,3.192c0,0.526 -0.128,1.024 -0.353,1.461c0.065,0.669 -0.468,2.301 -1.44,3.533c-0.098,0.124 -0.194,0.239 -0.287,0.346c-0.331,0.912 -2.336,1.614 -4.756,1.614c-1.492,0 -2.827,-0.267 -3.708,-0.686c-0.023,-0.01 -0.046,-0.021 -0.069,-0.033c-0.393,-0.196 -0.689,-0.422 -0.86,-0.669c-0.063,-0.065 -0.126,-0.134 -0.189,-0.207c-1.263,-1.458 -2.105,-3.261 -2.117,-3.912c-0.221,-0.435 -0.346,-0.927 -0.346,-1.447c0,-1.762 1.426,-3.192 3.182,-3.192c1.757,0 3.183,1.43 3.183,3.192l-0,3.939c0.102,0.059 0.177,0.123 0.218,0.193l1.754,-0c0,-0 -0.597,-0 -0.597,-0l0,-4.132l0.021,-0ZM43.598,19.208c0.028,0.031 0.054,0.035 0.081,0.023c-0.027,-0.008 -0.054,-0.015 -0.081,-0.023ZM44.52,13.727c1.335,0 2.419,1.087 2.419,2.426c-0,1.338 -1.084,2.425 -2.419,2.425c-1.334,0 -2.418,-1.087 -2.418,-2.425c0,-1.339 1.084,-2.426 2.418,-2.426ZM52.281,13.727c1.335,0 2.418,1.087 2.418,2.426c0,1.338 -1.083,2.425 -2.418,2.425c-1.335,0 -2.419,-1.087 -2.419,-2.425c0,-1.339 1.084,-2.426 2.419,-2.426ZM44.52,14.997c0.635,0 1.151,0.518 1.151,1.156c0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.15,-0.518 -1.15,-1.155c-0,-0.638 0.515,-1.156 1.15,-1.156ZM52.281,14.997c0.635,0 1.151,0.518 1.151,1.156c-0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.151,-0.518 -1.151,-1.155c0,-0.638 0.516,-1.156 1.151,-1.156ZM44.743,9.796c0.845,-0.422 2.218,-0.696 3.766,-0.696c2.322,-0 4.249,0.617 4.596,1.423c0.319,0.337 0.568,0.719 0.77,1.103l-1.293,-0.029c-0.015,0.01 -0.03,0.019 -0.045,0.029l-1.756,0l-2.362,1.863l-2.363,-1.863l-1.574,0c-0.004,-0.002 -0.007,-0.004 -0.01,-0.006l-1.482,-0.009c0.378,-0.911 1.008,-1.501 1.741,-1.843l0.012,0.028Z"/>
+        android:strokeColor="@android:color/white" android:strokeWidth="3.09"/>
+    <path android:fillColor="@android:color/white" android:pathData="M53.696,23.303c-1.343,2.486 -3.174,4.943 -5.291,7.381l-1.973,-2.349c0.695,-1.242 1.452,-2.453 2.437,-3.549l4.827,-1.483ZM43.048,23.303l4.208,1.465l-1.84,2.322l-2.368,-3.787ZM49.099,16.153c-0,-1.762 1.426,-3.192 3.182,-3.192c1.756,0 3.182,1.43 3.182,3.192c0,0.526 -0.128,1.024 -0.353,1.461c0.065,0.669 -0.468,2.301 -1.44,3.533c-0.098,0.124 -0.194,0.239 -0.287,0.346c-0.331,0.912 -2.336,1.614 -4.756,1.614c-1.492,0 -2.827,-0.267 -3.708,-0.686c-0.023,-0.01 -0.046,-0.021 -0.069,-0.033c-0.393,-0.196 -0.689,-0.422 -0.86,-0.669c-0.063,-0.065 -0.126,-0.134 -0.189,-0.207c-1.263,-1.458 -2.105,-3.261 -2.117,-3.912c-0.221,-0.435 -0.346,-0.927 -0.346,-1.447c0,-1.762 1.426,-3.192 3.182,-3.192c1.757,0 3.183,1.43 3.183,3.192l-0,3.939c0.102,0.059 0.177,0.123 0.218,0.193l1.754,-0c0,-0 -0.597,-0 -0.597,-0l0,-4.132l0.021,-0ZM43.598,19.208c0.028,0.031 0.054,0.035 0.081,0.023c-0.027,-0.008 -0.054,-0.015 -0.081,-0.023ZM44.52,13.727c1.335,0 2.419,1.087 2.419,2.426c-0,1.338 -1.084,2.425 -2.419,2.425c-1.334,0 -2.418,-1.087 -2.418,-2.425c0,-1.339 1.084,-2.426 2.418,-2.426ZM52.281,13.727c1.335,0 2.418,1.087 2.418,2.426c0,1.338 -1.083,2.425 -2.418,2.425c-1.335,0 -2.419,-1.087 -2.419,-2.425c0,-1.339 1.084,-2.426 2.419,-2.426ZM44.52,14.997c0.635,0 1.151,0.518 1.151,1.156c0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.15,-0.518 -1.15,-1.155c-0,-0.638 0.515,-1.156 1.15,-1.156ZM52.281,14.997c0.635,0 1.151,0.518 1.151,1.156c-0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.151,-0.518 -1.151,-1.155c0,-0.638 0.516,-1.156 1.151,-1.156ZM44.743,9.796c0.845,-0.422 2.218,-0.696 3.766,-0.696c2.322,-0 4.249,0.617 4.596,1.423c0.319,0.337 0.568,0.719 0.77,1.103l-1.293,-0.029c-0.015,0.01 -0.03,0.019 -0.045,0.029l-1.756,0l-2.362,1.863l-2.363,-1.863l-1.574,0c-0.004,-0.002 -0.007,-0.004 -0.01,-0.006l-1.482,-0.009c0.378,-0.911 1.008,-1.501 1.741,-1.843l0.012,0.028Z"/>
     <path android:fillColor="#FF000000" android:pathData="M43.147,16.153a1.373,1.378 0,1 0,2.746 0a1.373,1.378 0,1 0,-2.746 0z"/>
     <path android:fillColor="#FF000000" android:pathData="M50.951,16.153a1.373,1.378 0,1 0,2.746 0a1.373,1.378 0,1 0,-2.746 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_nightscout_syncs.xml b/app/src/main/res/drawable/ic_nightscout_syncs.xml
index 540f44b54c..1558d5705b 100644
--- a/app/src/main/res/drawable/ic_nightscout_syncs.xml
+++ b/app/src/main/res/drawable/ic_nightscout_syncs.xml
@@ -1,11 +1,11 @@
 <vector android:height="36dp" android:viewportHeight="64"
     android:viewportWidth="64" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M37.022,34.973c-1.299,2.381 -3.069,4.734 -5.117,7.069l-1.908,-2.25c0.672,-1.189 1.404,-2.349 2.357,-3.399l4.668,-1.42ZM26.725,34.973l4.069,1.404l-1.779,2.223l-2.29,-3.627ZM32.576,28.124c-0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.077,1.369 3.077,3.056c0,0.505 -0.123,0.981 -0.341,1.401c0.063,0.64 -0.453,2.203 -1.393,3.383c-0.094,0.119 -0.187,0.229 -0.277,0.331c-0.32,0.874 -2.259,1.547 -4.599,1.547c-1.443,-0 -2.734,-0.256 -3.586,-0.657c-0.022,-0.011 -0.045,-0.021 -0.067,-0.033c-0.38,-0.187 -0.666,-0.404 -0.831,-0.64c-0.061,-0.062 -0.122,-0.128 -0.183,-0.198c-1.222,-1.397 -2.036,-3.124 -2.048,-3.748c-0.213,-0.416 -0.334,-0.887 -0.334,-1.386c0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.078,1.369 3.078,3.056l-0,3.774c0.098,0.056 0.171,0.117 0.211,0.184l1.696,0c0,0 -0.577,0 -0.577,0l0,-3.958l0.02,0ZM27.257,31.051c0.026,0.029 0.052,0.033 0.077,0.022c-0.026,-0.007 -0.052,-0.015 -0.077,-0.022ZM28.148,25.801c1.291,0 2.339,1.041 2.339,2.323c0,1.283 -1.048,2.323 -2.339,2.323c-1.29,0 -2.338,-1.04 -2.338,-2.323c-0,-1.282 1.048,-2.323 2.338,-2.323ZM35.653,25.801c1.291,0 2.339,1.041 2.339,2.323c-0,1.283 -1.048,2.323 -2.339,2.323c-1.291,0 -2.339,-1.04 -2.339,-2.323c0,-1.282 1.048,-2.323 2.339,-2.323ZM28.148,27.018c0.615,-0 1.113,0.496 1.113,1.106c0,0.611 -0.498,1.107 -1.113,1.107c-0.614,0 -1.112,-0.496 -1.112,-1.107c-0,-0.61 0.498,-1.106 1.112,-1.106ZM35.653,27.018c0.614,-0 1.113,0.496 1.113,1.106c-0,0.611 -0.499,1.107 -1.113,1.107c-0.614,0 -1.113,-0.496 -1.113,-1.107c0,-0.61 0.499,-1.106 1.113,-1.106ZM28.363,22.036c0.818,-0.404 2.146,-0.667 3.643,-0.667c2.245,0 4.109,0.592 4.444,1.364c0.309,0.323 0.55,0.688 0.745,1.056l-1.251,-0.028c-0.014,0.01 -0.028,0.019 -0.043,0.028l-1.698,-0l-2.285,1.785l-2.285,-1.785l-1.522,-0c-0.003,-0.002 -0.006,-0.004 -0.009,-0.006l-1.433,-0.008c0.365,-0.873 0.974,-1.438 1.683,-1.765l0.011,0.026Z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M37.022,34.973c-1.299,2.381 -3.069,4.734 -5.117,7.069l-1.908,-2.25c0.672,-1.189 1.404,-2.349 2.357,-3.399l4.668,-1.42ZM26.725,34.973l4.069,1.404l-1.779,2.223l-2.29,-3.627ZM32.576,28.124c-0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.077,1.369 3.077,3.056c0,0.505 -0.123,0.981 -0.341,1.401c0.063,0.64 -0.453,2.203 -1.393,3.383c-0.094,0.119 -0.187,0.229 -0.277,0.331c-0.32,0.874 -2.259,1.547 -4.599,1.547c-1.443,-0 -2.734,-0.256 -3.586,-0.657c-0.022,-0.011 -0.045,-0.021 -0.067,-0.033c-0.38,-0.187 -0.666,-0.404 -0.831,-0.64c-0.061,-0.062 -0.122,-0.128 -0.183,-0.198c-1.222,-1.397 -2.036,-3.124 -2.048,-3.748c-0.213,-0.416 -0.334,-0.887 -0.334,-1.386c0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.078,1.369 3.078,3.056l-0,3.774c0.098,0.056 0.171,0.117 0.211,0.184l1.696,0c0,0 -0.577,0 -0.577,0l0,-3.958l0.02,0ZM27.257,31.051c0.026,0.029 0.052,0.033 0.077,0.022c-0.026,-0.007 -0.052,-0.015 -0.077,-0.022ZM28.148,25.801c1.291,0 2.339,1.041 2.339,2.323c0,1.283 -1.048,2.323 -2.339,2.323c-1.29,0 -2.338,-1.04 -2.338,-2.323c-0,-1.282 1.048,-2.323 2.338,-2.323ZM35.653,25.801c1.291,0 2.339,1.041 2.339,2.323c-0,1.283 -1.048,2.323 -2.339,2.323c-1.291,0 -2.339,-1.04 -2.339,-2.323c0,-1.282 1.048,-2.323 2.339,-2.323ZM28.148,27.018c0.615,-0 1.113,0.496 1.113,1.106c0,0.611 -0.498,1.107 -1.113,1.107c-0.614,0 -1.112,-0.496 -1.112,-1.107c-0,-0.61 0.498,-1.106 1.112,-1.106ZM35.653,27.018c0.614,-0 1.113,0.496 1.113,1.106c-0,0.611 -0.499,1.107 -1.113,1.107c-0.614,0 -1.113,-0.496 -1.113,-1.107c0,-0.61 0.499,-1.106 1.113,-1.106ZM28.363,22.036c0.818,-0.404 2.146,-0.667 3.643,-0.667c2.245,0 4.109,0.592 4.444,1.364c0.309,0.323 0.55,0.688 0.745,1.056l-1.251,-0.028c-0.014,0.01 -0.028,0.019 -0.043,0.028l-1.698,-0l-2.285,1.785l-2.285,-1.785l-1.522,-0c-0.003,-0.002 -0.006,-0.004 -0.009,-0.006l-1.433,-0.008c0.365,-0.873 0.974,-1.438 1.683,-1.765l0.011,0.026Z"/>
     <path android:fillColor="#FF000000" android:pathData="M27.035,28.124a1.113,1.107 0,1 0,2.226 0a1.113,1.107 0,1 0,-2.226 0z"/>
     <path android:fillColor="#FF000000" android:pathData="M34.54,28.124a1.113,1.107 0,1 0,2.226 0a1.113,1.107 0,1 0,-2.226 0z"/>
     <path android:fillColor="#00000000"
         android:pathData="M31.98,46.071c1.15,0.944 10.925,-11.56 9.942,-18.302c-0.803,-5.498 -4.283,-9.766 -9.942,-9.888c-5.72,-0.123 -9.427,4.16 -9.942,9.888c-0.607,6.75 8.558,19.231 9.942,18.302Z"
-        android:strokeColor="#fff" android:strokeWidth="3.09"/>
-    <path android:fillColor="#fff" android:fillType="nonZero" android:pathData="M55.254,57.66l-3.611,-4.832c6.807,-5.403 11.187,-13.847 11.187,-23.338c0,-11.854 -6.834,-22.076 -16.694,-26.778c-1.214,2.783 -2.793,6.403 -4.302,9.861c7.648,3.102 13.057,10.732 13.057,19.654c-0,6.253 -2.658,11.87 -6.88,15.74l-3.301,-4.416l-5.98,15.838l16.524,-1.729Z"/>
-    <path android:fillColor="#fff" android:fillType="nonZero" android:pathData="M8.537,4.469l3.613,4.832c-6.811,5.403 -11.195,13.847 -11.195,23.338c0,11.855 6.839,22.076 16.706,26.778c1.214,-2.783 2.794,-6.402 4.304,-9.861c-7.653,-3.102 -13.065,-10.732 -13.065,-19.653c0,-6.253 2.659,-11.871 6.885,-15.741l3.302,4.416l5.984,-15.838l-16.534,1.729Z"/>
+        android:strokeColor="@android:color/white" android:strokeWidth="3.09"/>
+    <path android:fillColor="@android:color/white" android:fillType="nonZero" android:pathData="M55.254,57.66l-3.611,-4.832c6.807,-5.403 11.187,-13.847 11.187,-23.338c0,-11.854 -6.834,-22.076 -16.694,-26.778c-1.214,2.783 -2.793,6.403 -4.302,9.861c7.648,3.102 13.057,10.732 13.057,19.654c-0,6.253 -2.658,11.87 -6.88,15.74l-3.301,-4.416l-5.98,15.838l16.524,-1.729Z"/>
+    <path android:fillColor="@android:color/white" android:fillType="nonZero" android:pathData="M8.537,4.469l3.613,4.832c-6.811,5.403 -11.195,13.847 -11.195,23.338c0,11.855 6.839,22.076 16.706,26.778c1.214,-2.783 2.794,-6.402 4.304,-9.861c-7.653,-3.102 -13.065,-10.732 -13.065,-19.653c0,-6.253 2.659,-11.871 6.885,-15.741l3.302,4.416l5.984,-15.838l-16.534,1.729Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_nsclient_bg.xml b/app/src/main/res/drawable/ic_nsclient_bg.xml
index 6571c1f164..21b7076454 100644
--- a/app/src/main/res/drawable/ic_nsclient_bg.xml
+++ b/app/src/main/res/drawable/ic_nsclient_bg.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="64">
   <path
       android:pathData="M26.974,28.633c2.447,-4.486 5.781,-8.918 9.638,-13.317l3.594,4.239c-1.265,2.24 -2.645,4.425 -4.439,6.402l-8.793,2.676ZM46.37,28.633l-7.664,-2.644l3.351,-4.189l4.313,6.833ZM35.349,41.533c-0,3.178 -2.597,5.758 -5.797,5.758c-3.199,-0 -5.796,-2.58 -5.796,-5.758c-0,-0.951 0.232,-1.848 0.643,-2.638c-0.118,-1.207 0.853,-4.15 2.623,-6.373c0.178,-0.224 0.353,-0.432 0.522,-0.624c0.604,-1.645 4.255,-2.912 8.664,-2.912c2.719,-0 5.149,0.482 6.755,1.237c0.042,0.019 0.084,0.039 0.126,0.061c0.715,0.352 1.254,0.761 1.565,1.206c0.115,0.118 0.23,0.242 0.345,0.374c2.301,2.631 3.834,5.883 3.857,7.058c0.402,0.784 0.629,1.671 0.629,2.611c0,3.178 -2.597,5.758 -5.796,5.758c-3.199,-0 -5.797,-2.58 -5.797,-5.758l0,-7.108c-0.186,-0.106 -0.322,-0.221 -0.397,-0.347l-3.196,-0c0,-0 1.087,-0 1.087,-0l-0,7.455l-0.037,-0ZM45.369,36.021c-0.051,-0.056 -0.098,-0.063 -0.147,-0.042c0.049,0.014 0.098,0.028 0.147,0.042ZM43.689,45.909c-2.432,-0 -4.406,-1.961 -4.406,-4.376c0,-2.415 1.974,-4.376 4.406,-4.376c2.431,0 4.405,1.961 4.405,4.376c0,2.415 -1.974,4.376 -4.405,4.376ZM29.552,45.909c-2.431,-0 -4.405,-1.961 -4.405,-4.376c-0,-2.415 1.974,-4.376 4.405,-4.376c2.432,0 4.406,1.961 4.406,4.376c-0,2.415 -1.974,4.376 -4.406,4.376ZM43.689,43.618c-1.157,-0 -2.096,-0.935 -2.096,-2.085c-0,-1.151 0.939,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c-0,1.15 -0.939,2.085 -2.096,2.085ZM29.552,43.618c-1.156,-0 -2.096,-0.935 -2.096,-2.085c0,-1.151 0.94,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c0,1.15 -0.939,2.085 -2.096,2.085ZM43.284,53.001c-1.541,0.761 -4.041,1.256 -6.862,1.256c-4.229,0 -7.739,-1.114 -8.37,-2.568c-0.582,-0.608 -1.036,-1.296 -1.404,-1.99l2.356,0.052c0.027,-0.017 0.054,-0.034 0.081,-0.052l3.199,0l4.304,-3.361l4.303,3.361l2.868,0c0.006,0.004 0.012,0.008 0.018,0.012l2.699,0.015c-0.688,1.644 -1.835,2.709 -3.171,3.325l-0.021,-0.05Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M36.472,7.728c-2.167,-1.778 -20.58,21.776 -18.727,34.474c1.511,10.356 8.067,18.397 18.727,18.626c10.775,0.231 17.757,-7.836 18.727,-18.626c1.144,-12.715 -16.12,-36.225 -18.727,-34.474Z"
       android:strokeWidth="3.09"
@@ -13,5 +13,5 @@
       android:strokeColor="#fff"/>
   <path
       android:pathData="M15.033,3.173c0.86,-0.187 3.831,4.041 5.767,7.976c1.97,4.005 -1.144,9.071 -5.767,9.169c-3.916,0.084 -8.031,-5.067 -5.515,-9.774c1.298,-2.429 4.076,-7.057 5.515,-7.371ZM13.751,9.511c-1.167,-0.437 -3.511,2.215 -2.886,4.685c0.582,2.301 2.948,4.824 3.5,4.626c1.44,-0.517 -1.41,-3.828 -1.541,-5.219c-0.174,-1.834 1.591,-3.843 0.927,-4.092Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_sms.xml b/app/src/main/res/drawable/ic_sms.xml
index ab72164d25..2ec87c9e5e 100644
--- a/app/src/main/res/drawable/ic_sms.xml
+++ b/app/src/main/res/drawable/ic_sms.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM9,11L7,11L7,9h2v2zM13,11h-2L11,9h2v2zM17,11h-2L15,9h2v2z"/>
diff --git a/app/src/main/res/drawable/ic_treatments.xml b/app/src/main/res/drawable/ic_treatments.xml
index 63b74bbc91..a9880c927d 100644
--- a/app/src/main/res/drawable/ic_treatments.xml
+++ b/app/src/main/res/drawable/ic_treatments.xml
@@ -5,26 +5,26 @@
     android:viewportHeight="64">
   <path
       android:pathData="M15.781,51.823l0,-37.292c0,-2.609 2.118,-4.727 4.727,-4.727l23.484,-0c2.609,-0 4.727,2.118 4.727,4.727l0,37.292c0,2.609 -2.118,4.727 -4.727,4.727l-23.484,-0c-2.609,-0 -4.727,-2.118 -4.727,-4.727ZM32.25,43.601l0.246,-0c6.347,-0 11.5,-5.152 11.5,-11.5c0,-6.347 -5.153,-11.5 -11.5,-11.5c-0.041,-0 -0.082,0.001 -0.123,0.001c-0.041,-0 -0.082,-0.001 -0.123,-0.001c-6.347,-0 -11.5,5.153 -11.5,11.5c0,6.348 5.153,11.5 11.5,11.5Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M41.141,34.705l0,-5.207l-17.291,-0l0,5.207l17.291,-0Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M29.894,40.747l5.207,-0.001l-0.002,-17.291l-5.207,0.001l0.002,17.291Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M52.196,25.072l-0,-1.617l-3.037,0l0,1.617l3.037,0Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M52.196,40.746l-0,-1.617l-3.037,0l0,1.617l3.037,0Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M54.099,24.651c0,0.66 -1.612,1.852 -1.71,1.196c-0.116,-0.774 -1.047,-1.157 -1.711,-1.196c-0.941,-0.054 0.767,-1.195 1.711,-1.195c0.944,-0 1.71,0.536 1.71,1.195Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M54.099,39.129l0,-14.056l-1.904,-0l0,14.056l1.904,-0Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M54.099,39.484c0,0.697 -0.766,1.263 -1.71,1.263c-0.944,0 -2.611,-1.051 -1.711,-1.263c0.524,-0.124 1.639,-0.308 1.711,-1.263c0.051,-0.696 1.71,0.566 1.71,1.263Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_watch.xml b/app/src/main/res/drawable/ic_watch.xml
index e242792f1f..533dd8723a 100644
--- a/app/src/main/res/drawable/ic_watch.xml
+++ b/app/src/main/res/drawable/ic_watch.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,12c0,-2.54 -1.19,-4.81 -3.04,-6.27L16,0H8l-0.95,5.73C5.19,7.19 4,9.45 4,12s1.19,4.81 3.05,6.27L8,24h8l0.96,-5.73C18.81,16.81 20,14.54 20,12zM6,12c0,-3.31 2.69,-6 6,-6s6,2.69 6,6 -2.69,6 -6,6 -6,-2.69 -6,-6z"/>
diff --git a/core/src/main/res/drawable/ic_insulin.xml b/core/src/main/res/drawable/ic_insulin.xml
index 99e053b232..14f6c0634b 100644
--- a/core/src/main/res/drawable/ic_insulin.xml
+++ b/core/src/main/res/drawable/ic_insulin.xml
@@ -5,26 +5,26 @@
     android:viewportHeight="64">
   <path
       android:pathData="M40.644,18.931l-17.75,-0l4.224,-4.292l9.595,-0l3.931,4.292Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="M45.819,52.79c0,2.613 -2.244,4.628 -4.733,4.734c-5.822,0.248 -11.887,0.316 -18.408,-0c-2.715,-0.132 -4.735,-2.121 -4.735,-4.734l0,-30.713c0.687,-2.545 4.794,-4.453 6.303,-4.733l14.905,0c2.03,-0.013 5.653,2.356 6.668,4.733l0,3.536l-17.079,0l0,22.04l17.079,-0l0,5.137Z"
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="M27.061,11.374h9.853v3.277h-9.853z"
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="M39.992,7.46c-0,-0.72 -0.585,-1.305 -1.305,-1.305l-13.374,0c-0.72,0 -1.305,0.585 -1.305,1.305l0,2.61c0,0.72 0.585,1.304 1.305,1.304l13.374,0c0.72,0 1.305,-0.584 1.305,-1.304l-0,-2.61Z"
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M45.819,52.79c0,2.613 -2.244,4.628 -4.733,4.734c-5.822,0.248 -11.887,0.316 -18.408,-0c-2.715,-0.132 -4.735,-2.121 -4.735,-4.734l0,-30.713c0.687,-2.545 4.794,-4.453 6.303,-4.733l14.905,0c2.03,-0.013 5.653,2.356 6.668,4.733l0,3.536l-17.079,0l0,22.04l17.079,-0l0,5.137Z"
       android:fillColor="#fff"/>
   <path
       android:pathData="M27.061,11.374h9.853v3.277h-9.853z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M39.992,7.46c-0,-0.72 -0.585,-1.305 -1.305,-1.305l-13.374,0c-0.72,0 -1.305,0.585 -1.305,1.305l0,2.61c0,0.72 0.585,1.304 1.305,1.304l13.374,0c0.72,0 1.305,-0.584 1.305,-1.304l-0,-2.61Z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="M45.819,52.79c0,2.613 -2.244,4.628 -4.733,4.734c-5.822,0.248 -11.887,0.316 -18.408,-0c-2.715,-0.132 -4.735,-2.121 -4.735,-4.734l0,-30.713c0.687,-2.545 4.794,-4.453 6.303,-4.733l14.905,0c2.03,-0.013 5.653,2.356 6.668,4.733l0,3.536l-17.079,0l0,22.04l17.079,-0l0,5.137Z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="M27.061,11.374h9.853v3.277h-9.853z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="M39.992,7.46c-0,-0.72 -0.585,-1.305 -1.305,-1.305l-13.374,0c-0.72,0 -1.305,0.585 -1.305,1.305l0,2.61c0,0.72 0.585,1.304 1.305,1.304l13.374,0c0.72,0 1.305,-0.584 1.305,-1.304l-0,-2.61Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
   <path
       android:pathData="M40.644,18.931l-17.75,-0l4.224,-4.292l9.595,-0l3.931,4.292Z"
-      android:fillColor="#fff"/>
+      android:fillColor="@android:color/white"/>
 </vector>