diff --git a/app/src/main/res/drawable/ic_target_eatingsoon.xml b/app/src/main/res/drawable/ic_target_eatingsoon.xml
index 54b6162546..ec35d67c48 100644
--- a/app/src/main/res/drawable/ic_target_eatingsoon.xml
+++ b/app/src/main/res/drawable/ic_target_eatingsoon.xml
@@ -5,13 +5,13 @@
     android:viewportHeight="24">
   <path
       android:pathData="M21.107,18.396h-0.515c-0.23,-3.231 -2.587,-5.897 -5.66,-6.605c-0.089,-0.819 -0.777,-1.462 -1.62,-1.462c-0.843,0 -1.531,0.642 -1.62,1.462c-3.073,0.708 -5.429,3.374 -5.66,6.605H5.518c-0.221,0 -0.4,0.179 -0.4,0.4c0,0.221 0.179,0.4 0.4,0.4h15.59c0.221,0 0.4,-0.179 0.4,-0.4C21.507,18.575 21.328,18.396 21.107,18.396zM13.313,10.943c0.461,0 0.836,0.311 0.964,0.73c-0.317,-0.043 -0.637,-0.072 -0.964,-0.072c-0.327,0 -0.648,0.03 -0.965,0.072C12.477,11.254 12.852,10.943 13.313,10.943zM13.313,12.401c3.391,0 6.212,2.654 6.479,5.995H6.834C7.101,15.056 9.922,12.401 13.313,12.401z"
-      android:fillColor="@color/carbs"/>
+      android:fillColor="?attr/carbsColor"/>
   <path
       android:pathData="M15.428,13.489c-0.588,-0.271 -1.415,-0.457 -2.268,-0.509c-0.221,-0.014 -0.411,0.154 -0.424,0.375c-0.014,0.221 0.154,0.411 0.375,0.424c0.746,0.046 1.487,0.209 1.981,0.437c0.047,0.021 0.095,0.033 0.143,0.036c0.16,0.01 0.317,-0.078 0.388,-0.232C15.717,13.82 15.629,13.582 15.428,13.489z"
-      android:fillColor="@color/carbs"/>
+      android:fillColor="?attr/carbsColor"/>
   <path
       android:pathData="M8.051,17.801c-0.029,0.001 -0.061,-0.003 -0.095,-0.011c-0.188,-0.047 -0.304,-0.239 -0.257,-0.427c0.43,-1.726 1.665,-3.196 3.304,-3.933c0.043,-0.019 0.088,-0.029 0.135,-0.031c0.143,-0.004 0.273,0.078 0.331,0.208c0.039,0.086 0.042,0.182 0.008,0.271c-0.034,0.088 -0.099,0.158 -0.185,0.196c-1.444,0.649 -2.531,1.942 -2.909,3.458C8.346,17.687 8.209,17.797 8.051,17.801z"
-      android:fillColor="@color/carbs"/>
+      android:fillColor="?attr/carbsColor"/>
   <path
       android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
       android:fillColor="@color/inrange"/>
diff --git a/app/src/main/res/drawable/ic_xdrip.xml b/app/src/main/res/drawable/ic_xdrip.xml
index 54f88823ba..bf2ee9b482 100644
--- a/app/src/main/res/drawable/ic_xdrip.xml
+++ b/app/src/main/res/drawable/ic_xdrip.xml
@@ -4,5 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B92929" android:pathData="M12.143,3.619c1.326,1.335 2.613,2.639 3.908,3.934c0.86,0.86 1.735,1.695 2.294,2.811c1.242,2.477 0.847,5.53 -1.039,7.698c-1.763,2.026 -4.813,2.845 -7.35,1.973c-4.996,-1.716 -6.424,-7.776 -2.71,-11.543C8.837,6.878 10.458,5.294 12.143,3.619zM12.08,6.135c-1.258,1.251 -2.447,2.427 -3.628,3.61c-1.148,1.149 -1.65,2.542 -1.541,4.158c0.177,2.618 2.665,4.888 5.169,4.688C12.08,14.471 12.08,10.35 12.08,6.135z"/>
+    <path android:fillColor="?attr/icCalibrationColor"
+        android:pathData="M12.143,3.619c1.326,1.335 2.613,2.639 3.908,3.934c0.86,0.86 1.735,1.695 2.294,2.811c1.242,2.477 0.847,5.53 -1.039,7.698c-1.763,2.026 -4.813,2.845 -7.35,1.973c-4.996,-1.716 -6.424,-7.776 -2.71,-11.543C8.837,6.878 10.458,5.294 12.143,3.619zM12.08,6.135c-1.258,1.251 -2.447,2.427 -3.628,3.61c-1.148,1.149 -1.65,2.542 -1.541,4.158c0.177,2.618 2.665,4.888 5.169,4.688C12.08,14.471 12.08,10.35 12.08,6.135z"/>
 </vector>
diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml
index 872963859e..d4142c46b1 100644
--- a/app/src/main/res/layout/overview_buttons_layout.xml
+++ b/app/src/main/res/layout/overview_buttons_layout.xml
@@ -45,7 +45,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/icon_insulin_carbs"
             android:text="@string/overview_treatment_label"
-            android:textColor="?attr/treatmentButton"
+            android:textColor="?attr/icTreatmentColor"
             android:textSize="10sp"
             android:visibility="gone"
             tools:ignore="SmallSp" />
@@ -59,7 +59,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_bolus"
             android:text="@string/overview_insulin_label"
-            android:textColor="?attr/insulinButtonColor"
+            android:textColor="?attr/icBolusColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
@@ -72,7 +72,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_cp_bolus_carbs"
             android:text="@string/treatments_wizard_carbs_label"
-            android:textColor="?attr/carbsButtonColor"
+            android:textColor="?attr/icBolusCarbsColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
@@ -85,7 +85,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_calculator"
             android:text="@string/overview_calculator_label"
-            android:textColor="?attr/calculatorButtonColor"
+            android:textColor="?attr/icCalculatorColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
@@ -98,7 +98,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_calibration"
             android:text="@string/overview_calibration"
-            android:textColor="?attr/calibrationButtonColor"
+            android:textColor="?attr/icCalibrationColor"
             android:textSize="10sp"
             android:visibility="gone"
             tools:ignore="SmallSp" />
@@ -112,7 +112,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_xdrip"
             android:text="@string/overview_cgm"
-            android:textColor="?attr/calibrationButtonColor"
+            android:textColor="?attr/icCalibrationColor"
             android:textSize="10sp"
             android:visibility="gone"
             tools:ignore="SmallSp" />
@@ -127,7 +127,7 @@
             android:drawableTop="@drawable/ic_quick_wizard"
             android:text="@string/quickwizard"
             android:hint="@string/quickwizard"
-            android:textColor="?attr/quickWizardButtonColor"
+            android:textColor="?attr/icQuickWizardColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index d39ac7a4ea..39187564ca 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -135,7 +135,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:background="@color/pumpStatusBackground"
+            android:background="?attr/pumpStatusBackground"
             android:gravity="center_vertical|center_horizontal"
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
diff --git a/core/src/main/res/drawable-hdpi/background_total.xml b/core/src/main/res/drawable-hdpi/background_total.xml
index 0a84006dee..e37fbd2035 100644
--- a/core/src/main/res/drawable-hdpi/background_total.xml
+++ b/core/src/main/res/drawable-hdpi/background_total.xml
@@ -3,6 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="?attr/totalBackground"/>
-    <stroke android:width="1dp" android:color="?attr/colorOnSecondary"/>
+    <stroke android:width="1dp" android:color="?attr/colorControlNormal"/>
     <corners android:radius="4dp" />
 </shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable-hdpi/border_gray.xml b/core/src/main/res/drawable-hdpi/border_gray.xml
index 7635f80234..a67f54bf90 100644
--- a/core/src/main/res/drawable-hdpi/border_gray.xml
+++ b/core/src/main/res/drawable-hdpi/border_gray.xml
@@ -3,7 +3,7 @@
     <item android:bottom="0dp">
         <shape
             android:shape="rectangle">
-            <stroke android:width="1dp" android:color="?attr/colorOnSecondary"/>
+            <stroke android:width="1dp" android:color="?attr/colorControlNormal"/>
             <solid android:color="@android:color/white" />
             <corners android:radius="0dp" />
         </shape>
diff --git a/core/src/main/res/drawable/ic_bolus.xml b/core/src/main/res/drawable/ic_bolus.xml
index 6bbe19f3fc..83b67c9989 100644
--- a/core/src/main/res/drawable/ic_bolus.xml
+++ b/core/src/main/res/drawable/ic_bolus.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#67DFE8"
+        android:fillColor="?attr/icBolusColor"
         android:pathData="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092,-0.07 -0.212,-0.09 -0.323,-0.055L5.115,5.89L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116 0.047,0.226 0.14,0.296l9.895,7.502l-0.428,0.564c-0.26,0.343 -0.193,0.832 0.15,1.092s0.832,0.193 1.092,-0.15l1.653,-2.18l2.219,1.683l-0.719,0.948c-0.26,0.343 -0.193,0.832 0.15,1.092c0.343,0.26 0.832,0.193 1.092,-0.15l2.379,-3.138c0.26,-0.343 0.193,-0.832 -0.15,-1.092c-0.343,-0.26 -0.832,-0.193 -1.092,0.15l-0.719,0.948l-2.219,-1.683l1.653,-2.18c0.26,-0.343 0.193,-0.832 -0.15,-1.092S18.762,11.659 18.501,12.002zM5.458,6.524l2.44,-0.783l9.748,7.39L17.26,13.64l-5.754,-4.362c-0.091,-0.069 -0.221,-0.053 -0.293,0.035L9.087,11.91l-0.67,-0.508l1.526,-1.833c0.002,-0.002 0.004,-0.005 0.006,-0.008c0.068,-0.09 0.054,-0.219 -0.033,-0.291c-0.09,-0.075 -0.224,-0.063 -0.299,0.027l-1.538,1.848l-0.769,-0.583l1.526,-1.833c0.002,-0.002 0.004,-0.005 0.006,-0.008c0.068,-0.09 0.054,-0.219 -0.033,-0.291c-0.09,-0.075 -0.224,-0.063 -0.299,0.027L6.97,10.305L6.201,9.721l1.526,-1.833C7.728,7.886 7.731,7.882 7.732,7.88c0.068,-0.09 0.054,-0.219 -0.033,-0.291C7.609,7.513 7.475,7.526 7.4,7.616L5.861,9.464L5.362,9.085L5.458,6.524z" />
 </vector>
diff --git a/core/src/main/res/drawable/ic_calculator.xml b/core/src/main/res/drawable/ic_calculator.xml
index 300e971bf4..3bd3d2e78d 100644
--- a/core/src/main/res/drawable/ic_calculator.xml
+++ b/core/src/main/res/drawable/ic_calculator.xml
@@ -4,11 +4,12 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#67E86A" android:pathData="M17.625,15.345h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292c0,0.063 0.051,0.113 0.113,0.113h4.083c0.063,0 0.113,-0.051 0.113,-0.113v-1.292C17.738,15.396 17.688,15.345 17.625,15.345z"/>
-    <path android:fillColor="#67E86A" android:pathData="M16.343,14.036c0,-0.063 -0.051,-0.113 -0.113,-0.113h-1.292c-0.063,0 -0.113,0.051 -0.113,0.113v1.016h1.519V14.036z"/>
-    <path android:fillColor="#67E86A" android:pathData="M14.824,18.119c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.017h-1.519V18.119z"/>
-    <path android:fillColor="#67E86A" android:pathData="M19.836,1.96h-15.1c-0.344,0 -0.624,0.279 -0.624,0.624v18.375c0,0.345 0.279,0.624 0.624,0.624h15.1c0.345,0 0.624,-0.279 0.624,-0.624V2.583C20.46,2.239 20.181,1.96 19.836,1.96zM19.212,20.334H5.36V7.04h13.852V20.334zM19.212,5.793H5.36V3.207h13.852V5.793z"/>
-    <path android:fillColor="#67E86A" android:pathData="M13.542,11.363h4.083c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C13.429,11.313 13.479,11.363 13.542,11.363z"/>
-    <path android:fillColor="#67E86A" android:pathData="M7.042,11.363h1.283v1.282c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.282h1.283c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113H9.842V8.563c0,-0.063 -0.051,-0.113 -0.113,-0.113H8.438c-0.063,0 -0.113,0.051 -0.113,0.113v1.283H7.042c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C6.928,11.313 6.979,11.363 7.042,11.363z"/>
-    <path android:fillColor="#67E86A" android:pathData="M10.157,16.078l0.907,-0.907c0.021,-0.021 0.033,-0.05 0.033,-0.08s-0.012,-0.059 -0.033,-0.08l-0.914,-0.913c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.907,0.907l-0.907,-0.907c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.913,0.913c-0.044,0.044 -0.044,0.116 0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044 -0.044,0.116 0,0.16l0.913,0.914c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.907,-0.907l0.907,0.907c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.914,-0.914c0.044,-0.044 0.044,-0.116 0,-0.16L10.157,16.078z"/>
+    <path android:fillColor="?attr/icCalculatorColor"
+        android:pathData="M17.625,15.345h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292c0,0.063 0.051,0.113 0.113,0.113h4.083c0.063,0 0.113,-0.051 0.113,-0.113v-1.292C17.738,15.396 17.688,15.345 17.625,15.345z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M16.343,14.036c0,-0.063 -0.051,-0.113 -0.113,-0.113h-1.292c-0.063,0 -0.113,0.051 -0.113,0.113v1.016h1.519V14.036z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M14.824,18.119c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.017h-1.519V18.119z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M19.836,1.96h-15.1c-0.344,0 -0.624,0.279 -0.624,0.624v18.375c0,0.345 0.279,0.624 0.624,0.624h15.1c0.345,0 0.624,-0.279 0.624,-0.624V2.583C20.46,2.239 20.181,1.96 19.836,1.96zM19.212,20.334H5.36V7.04h13.852V20.334zM19.212,5.793H5.36V3.207h13.852V5.793z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M13.542,11.363h4.083c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C13.429,11.313 13.479,11.363 13.542,11.363z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M7.042,11.363h1.283v1.282c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.282h1.283c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113H9.842V8.563c0,-0.063 -0.051,-0.113 -0.113,-0.113H8.438c-0.063,0 -0.113,0.051 -0.113,0.113v1.283H7.042c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C6.928,11.313 6.979,11.363 7.042,11.363z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M10.157,16.078l0.907,-0.907c0.021,-0.021 0.033,-0.05 0.033,-0.08s-0.012,-0.059 -0.033,-0.08l-0.914,-0.913c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.907,0.907l-0.907,-0.907c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.913,0.913c-0.044,0.044 -0.044,0.116 0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044 -0.044,0.116 0,0.16l0.913,0.914c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.907,-0.907l0.907,0.907c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.914,-0.914c0.044,-0.044 0.044,-0.116 0,-0.16L10.157,16.078z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_calibration.xml b/core/src/main/res/drawable/ic_calibration.xml
index cf3f592a41..3a1b98bcd4 100644
--- a/core/src/main/res/drawable/ic_calibration.xml
+++ b/core/src/main/res/drawable/ic_calibration.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M7.305,4.482c1.782,2.914 4.332,5.382 3.916,9.05c-0.256,2.254 -2.529,3.635 -4.783,3.199c-2.145,-0.415 -3.625,-2.546 -3.171,-4.728C3.858,9.168 5.537,6.894 7.305,4.482zM5.08,10.061c-0.212,0.638 -0.489,1.262 -0.621,1.916c-0.205,1.017 -0.065,1.994 0.764,2.731c0.297,0.264 0.68,0.354 1.038,0.077c0.242,-0.187 0.269,-0.46 0.096,-0.692C5.468,12.903 5.032,11.589 5.08,10.061z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/icCalibrationColor"/>
   <path
       android:pathData="M17.959,4.566c1.073,1.453 2.073,2.837 2.489,4.535c0.28,1.143 -0.069,2.1 -1.037,2.763c-0.943,0.645 -1.961,0.655 -2.904,0.009c-0.967,-0.662 -1.318,-1.635 -1.041,-2.769C15.88,7.408 16.875,6.019 17.959,4.566z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/icCalibrationColor"/>
   <path
       android:pathData="M14.82,14.425c0.797,1.094 1.535,2.104 1.819,3.355c0.188,0.826 -0.096,1.498 -0.784,1.965c-0.669,0.454 -1.393,0.467 -2.067,0.014c-0.688,-0.462 -0.985,-1.13 -0.8,-1.959C13.272,16.531 14.004,15.503 14.82,14.425z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/icCalibrationColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_bolus_carbs.xml b/core/src/main/res/drawable/ic_cp_bolus_carbs.xml
index e21b236b4e..dc22cbd2b5 100644
--- a/core/src/main/res/drawable/ic_cp_bolus_carbs.xml
+++ b/core/src/main/res/drawable/ic_cp_bolus_carbs.xml
@@ -4,5 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FEAD01" android:pathData="M16.074,14.883c-0.332,0.416 -0.691,0.722 -1.09,0.993c-0.378,0.257 -0.843,0.39 -1.203,0.468c-0.688,0.125 -0.25,0.188 0.096,0.657c-1.247,1.781 -3.348,1.9 -5.102,0.991c-0.141,-0.073 -0.272,-0.165 -0.403,-0.255c-0.276,-0.19 -0.398,-0.236 -0.63,0.004c-0.187,0.193 -0.628,0.618 -0.852,0.838L6.4,18.047c0.241,-0.219 0.518,-0.491 0.718,-0.678c0.435,-0.408 0.336,-0.458 -0.011,-0.955c-1.205,-1.725 -0.836,-3.976 0.859,-5.236c0.722,0.462 0.566,0.353 0.801,-0.327c0.251,-0.726 0.677,-1.345 1.325,-1.777c0.659,0.582 0.549,0.316 0.814,-0.351c0.286,-0.721 0.734,-1.309 1.353,-1.806c0.695,0.458 1.014,0.966 1.252,1.538c0.273,0.656 0.379,0.435 0.858,-0.03c1.023,-0.992 2.273,-1.385 3.491,-1.087c0.287,1.586 -0.39,3.005 -1.859,3.932c0.771,0.208 1.5,0.625 2.215,1.468c-0.439,0.643 -1.213,1.259 -1.993,1.39C15.105,14.317 15.734,14.359 16.074,14.883zM17.184,8.469c0.013,-0.442 -0.128,-0.559 -0.51,-0.508c-1.244,0.167 -2.413,1.284 -2.621,2.504c-0.072,0.422 0.15,0.648 0.571,0.551c0.267,-0.062 0.538,-0.144 0.783,-0.265C16.39,10.263 17,9.484 17.184,8.469zM13.259,10.211c0.011,-0.699 -0.231,-1.258 -0.566,-1.784c-0.322,-0.506 -0.546,-0.505 -0.868,-0.011c-0.744,1.138 -0.442,2.461 0.152,3.433c0.19,0.311 0.445,0.313 0.669,0.011C13.017,11.357 13.273,10.801 13.259,10.211zM10.925,17.86c0.517,0 1.245,-0.233 1.618,-0.515c0.317,-0.24 0.344,-0.436 0.03,-0.652c-1.164,-0.802 -2.354,-0.977 -3.585,-0.119c-0.414,0.289 -0.391,0.523 0.063,0.79C9.629,17.703 10.26,17.846 10.925,17.86zM11.109,12.297c0.02,-0.666 -0.231,-1.243 -0.569,-1.786c-0.316,-0.507 -0.532,-0.495 -0.854,0.026c-0.622,1.004 -0.57,2.408 0.126,3.37c0.241,0.334 0.449,0.355 0.707,0.03C10.896,13.459 11.123,12.916 11.109,12.297zM15.068,13.639c0.661,-0.003 1.381,-0.217 1.756,-0.502c0.32,-0.244 0.329,-0.403 0.036,-0.66c-0.936,-0.82 -2.634,-0.874 -3.605,-0.113c-0.351,0.275 -0.358,0.527 0.019,0.737C13.85,13.423 14.46,13.658 15.068,13.639zM7.124,14.258c-0.023,0.548 0.124,1.116 0.447,1.633c0.305,0.489 0.569,0.494 0.893,0.036c0.704,-0.995 0.645,-2.507 -0.135,-3.438c-0.254,-0.303 -0.471,-0.302 -0.713,0.03C7.253,13.017 7.116,13.587 7.124,14.258zM12.831,13.928c-0.667,-0.031 -1.25,0.192 -1.77,0.589c-0.26,0.198 -0.271,0.416 -0.005,0.636c0.852,0.704 2.692,0.765 3.599,0.114c0.367,-0.263 0.376,-0.482 0.005,-0.726C14.106,14.175 13.512,13.911 12.831,13.928z"/>
+    <path android:fillColor="?attr/icBolusCarbsColor"
+        android:pathData="M16.074,14.883c-0.332,0.416 -0.691,0.722 -1.09,0.993c-0.378,0.257 -0.843,0.39 -1.203,0.468c-0.688,0.125 -0.25,0.188 0.096,0.657c-1.247,1.781 -3.348,1.9 -5.102,0.991c-0.141,-0.073 -0.272,-0.165 -0.403,-0.255c-0.276,-0.19 -0.398,-0.236 -0.63,0.004c-0.187,0.193 -0.628,0.618 -0.852,0.838L6.4,18.047c0.241,-0.219 0.518,-0.491 0.718,-0.678c0.435,-0.408 0.336,-0.458 -0.011,-0.955c-1.205,-1.725 -0.836,-3.976 0.859,-5.236c0.722,0.462 0.566,0.353 0.801,-0.327c0.251,-0.726 0.677,-1.345 1.325,-1.777c0.659,0.582 0.549,0.316 0.814,-0.351c0.286,-0.721 0.734,-1.309 1.353,-1.806c0.695,0.458 1.014,0.966 1.252,1.538c0.273,0.656 0.379,0.435 0.858,-0.03c1.023,-0.992 2.273,-1.385 3.491,-1.087c0.287,1.586 -0.39,3.005 -1.859,3.932c0.771,0.208 1.5,0.625 2.215,1.468c-0.439,0.643 -1.213,1.259 -1.993,1.39C15.105,14.317 15.734,14.359 16.074,14.883zM17.184,8.469c0.013,-0.442 -0.128,-0.559 -0.51,-0.508c-1.244,0.167 -2.413,1.284 -2.621,2.504c-0.072,0.422 0.15,0.648 0.571,0.551c0.267,-0.062 0.538,-0.144 0.783,-0.265C16.39,10.263 17,9.484 17.184,8.469zM13.259,10.211c0.011,-0.699 -0.231,-1.258 -0.566,-1.784c-0.322,-0.506 -0.546,-0.505 -0.868,-0.011c-0.744,1.138 -0.442,2.461 0.152,3.433c0.19,0.311 0.445,0.313 0.669,0.011C13.017,11.357 13.273,10.801 13.259,10.211zM10.925,17.86c0.517,0 1.245,-0.233 1.618,-0.515c0.317,-0.24 0.344,-0.436 0.03,-0.652c-1.164,-0.802 -2.354,-0.977 -3.585,-0.119c-0.414,0.289 -0.391,0.523 0.063,0.79C9.629,17.703 10.26,17.846 10.925,17.86zM11.109,12.297c0.02,-0.666 -0.231,-1.243 -0.569,-1.786c-0.316,-0.507 -0.532,-0.495 -0.854,0.026c-0.622,1.004 -0.57,2.408 0.126,3.37c0.241,0.334 0.449,0.355 0.707,0.03C10.896,13.459 11.123,12.916 11.109,12.297zM15.068,13.639c0.661,-0.003 1.381,-0.217 1.756,-0.502c0.32,-0.244 0.329,-0.403 0.036,-0.66c-0.936,-0.82 -2.634,-0.874 -3.605,-0.113c-0.351,0.275 -0.358,0.527 0.019,0.737C13.85,13.423 14.46,13.658 15.068,13.639zM7.124,14.258c-0.023,0.548 0.124,1.116 0.447,1.633c0.305,0.489 0.569,0.494 0.893,0.036c0.704,-0.995 0.645,-2.507 -0.135,-3.438c-0.254,-0.303 -0.471,-0.302 -0.713,0.03C7.253,13.017 7.116,13.587 7.124,14.258zM12.831,13.928c-0.667,-0.031 -1.25,0.192 -1.77,0.589c-0.26,0.198 -0.271,0.416 -0.005,0.636c0.852,0.704 2.692,0.765 3.599,0.114c0.367,-0.263 0.376,-0.482 0.005,-0.726C14.106,14.175 13.512,13.911 12.831,13.928z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_quick_wizard.xml b/core/src/main/res/drawable/ic_quick_wizard.xml
index b2d1f2569b..8e5d42cd3e 100644
--- a/core/src/main/res/drawable/ic_quick_wizard.xml
+++ b/core/src/main/res/drawable/ic_quick_wizard.xml
@@ -4,9 +4,10 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FEAF05" android:pathData="M10.751,6.59c-0.561,0.69 -0.796,1.057 -1.25,1.797c-2.517,0.238 -3.932,2.751 -3.379,4.664c0.244,0.843 0.779,1.476 1.498,1.958c2.348,1.573 6.243,1.429 8.487,-0.306c1.187,-0.918 1.723,-2.084 1.334,-3.576c-0.412,-1.58 -1.445,-2.585 -3.039,-2.87c-1.112,-0.199 -1.973,0.37 -2.558,1.313c-0.494,0.796 -0.72,1.616 -1.628,2.345c-0.389,-0.431 -0.458,-0.961 -0.483,-1.481c-0.12,-2.486 2.019,-4.439 4.595,-4.213c2.365,0.207 4.466,1.956 5.114,4.256c0.611,2.172 -0.226,4.432 -2.19,5.909c-2.995,2.253 -7.895,2.327 -10.943,0.165c-2.057,-1.459 -2.88,-3.881 -2.099,-6.18C5.023,7.978 7.368,6.304 9.77,6.4C10.072,6.412 10.365,6.459 10.751,6.59z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M7.141,13.406c0.526,-0.103 1.178,-0.22 1.665,-0.322c1.522,-0.319 2.625,-1.229 3.273,-2.678c0.289,-0.647 0.702,-1.125 1.448,-1.42c0.418,0.811 0.454,1.641 0.223,2.493c-0.284,1.049 -0.889,1.863 -1.819,2.429c-0.616,0.376 -1.284,0.638 -1.966,0.867C8.814,15.163 7.797,14.773 7.141,13.406z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M12.313,14.203c0.734,-0.537 1.25,-1.089 1.469,-1.612c0.894,0.159 1.92,0.314 2.804,0.471C16.036,14.799 13.922,15.203 12.313,14.203z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M2.377,13.882c0.179,-0.123 0.756,-0.189 1.192,-0.123c0.259,0.631 0.587,1.225 1.108,1.923c-0.572,0.116 -1.037,0.253 -1.567,0.224c-0.493,-0.027 -0.993,-0.353 -1.063,-0.989C2.013,14.61 2.047,14.109 2.377,13.882z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M19.143,15.22c0.196,-0.497 0.362,-0.961 0.561,-1.411c0.235,-0.531 0.618,-0.76 1.121,-0.681c0.419,0.066 0.575,0.376 0.644,0.756c0.098,0.541 -0.078,0.989 -0.529,1.213C20.38,15.377 19.787,15.293 19.143,15.22z"/>
+    <path android:fillColor="?attr/icQuickWizardColor"
+        android:pathData="M10.751,6.59c-0.561,0.69 -0.796,1.057 -1.25,1.797c-2.517,0.238 -3.932,2.751 -3.379,4.664c0.244,0.843 0.779,1.476 1.498,1.958c2.348,1.573 6.243,1.429 8.487,-0.306c1.187,-0.918 1.723,-2.084 1.334,-3.576c-0.412,-1.58 -1.445,-2.585 -3.039,-2.87c-1.112,-0.199 -1.973,0.37 -2.558,1.313c-0.494,0.796 -0.72,1.616 -1.628,2.345c-0.389,-0.431 -0.458,-0.961 -0.483,-1.481c-0.12,-2.486 2.019,-4.439 4.595,-4.213c2.365,0.207 4.466,1.956 5.114,4.256c0.611,2.172 -0.226,4.432 -2.19,5.909c-2.995,2.253 -7.895,2.327 -10.943,0.165c-2.057,-1.459 -2.88,-3.881 -2.099,-6.18C5.023,7.978 7.368,6.304 9.77,6.4C10.072,6.412 10.365,6.459 10.751,6.59z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M7.141,13.406c0.526,-0.103 1.178,-0.22 1.665,-0.322c1.522,-0.319 2.625,-1.229 3.273,-2.678c0.289,-0.647 0.702,-1.125 1.448,-1.42c0.418,0.811 0.454,1.641 0.223,2.493c-0.284,1.049 -0.889,1.863 -1.819,2.429c-0.616,0.376 -1.284,0.638 -1.966,0.867C8.814,15.163 7.797,14.773 7.141,13.406z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M12.313,14.203c0.734,-0.537 1.25,-1.089 1.469,-1.612c0.894,0.159 1.92,0.314 2.804,0.471C16.036,14.799 13.922,15.203 12.313,14.203z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M2.377,13.882c0.179,-0.123 0.756,-0.189 1.192,-0.123c0.259,0.631 0.587,1.225 1.108,1.923c-0.572,0.116 -1.037,0.253 -1.567,0.224c-0.493,-0.027 -0.993,-0.353 -1.063,-0.989C2.013,14.61 2.047,14.109 2.377,13.882z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M19.143,15.22c0.196,-0.497 0.362,-0.961 0.561,-1.411c0.235,-0.531 0.618,-0.76 1.121,-0.681c0.419,0.066 0.575,0.376 0.644,0.756c0.098,0.541 -0.078,0.989 -0.529,1.213C20.38,15.377 19.787,15.293 19.143,15.22z"/>
 </vector>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 9adb3ad930..9814347521 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -169,6 +169,13 @@
         <item name="dummyBackground">@color/dummy_background</item>
         <!-- Icon Colors -->
         <item name="icCheckboxTrendColor">@color/white</item>
+        <!-- Overview Buttons -->
+        <item name="icBolusColor">@color/colorInsulinButton</item>
+        <item name="icBolusCarbsColor">@color/colorCarbsButton</item>
+        <item name="icCalculatorColor">@color/colorCalculatorButton</item>
+        <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
+        <item name="icCalibrationColor">@color/colorCalibrationButton</item>
+        <item name="icTreatmentColor">@color/colorTreatmentButton</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 853fbb245c..9c2f6300a2 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -143,4 +143,11 @@
     <attr name="dummyBackground" format="reference|color" />
     <!-- Icon Colors -->
     <attr name="icCheckboxTrendColor" format="reference|color" />
+    <!-- Overview Buttons -->
+    <attr name="icBolusColor" format="reference|color" />
+    <attr name="icBolusCarbsColor" format="reference|color" />
+    <attr name="icCalculatorColor" format="reference|color" />
+    <attr name="icQuickWizardColor" format="reference|color" />
+    <attr name="icCalibrationColor" format="reference|color" />
+    <attr name="icTreatmentColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index a7771698e2..0d2df61682 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -48,7 +48,7 @@
 
 
     <!--    Fragments-->
-    <color name="pumpStatusBackground">#505050</color>
+    <color name="pumpStatusBackground">#CCCCCC</color>
 
     <!--    Dialogs-->
     <color name="dialog_title_background">#CCCCCC</color>
@@ -149,7 +149,7 @@
 
     <color name="ribbonWarning">#f4d700</color>
     <color name="ribbonCritical">#ff0400</color>
-    <color name="ribbonTextDefault">#000000</color>
+    <color name="ribbonTextDefault">#FFFFFF</color>
     <color name="ribbonTextWarning">#303030</color>
     <color name="tempTargetConfirmation">#77dd77</color>
 
@@ -182,13 +182,13 @@
 
     <color name="cardObjectiveText">#779ECB</color>
 
-    <color name="colorAcceptTempButton">#f4d700</color>
+    <color name="colorAcceptTempButton">#ffffbb33</color>
     <color name="colorTreatmentButton">#67dfe8</color>
     <color name="colorInsulinButton">#67dfe8</color>
-    <color name="colorCarbsButton">#ffae01</color>
+    <color name="colorCarbsButton">#E19701</color>
     <color name="colorCalibrationButton">#e93057</color>
-    <color name="colorCalculatorButton">#67e86a</color>
-    <color name="colorQuickWizardButton">#ffae01</color>
+    <color name="colorCalculatorButton">#66BB6A</color>
+    <color name="colorQuickWizardButton">#E19701</color>
     <color name="colorSetTempButton">#FF478EFF</color>
     <color name="colorSetExtendedButton">#FFDD7792</color>
     <color name="colorProfileSwitchButton">#ca77dd</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index bc6a94884d..1cfff0322c 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -171,7 +171,15 @@
         <item name="dummyBackground">@color/dummy_background</item>
         <!-- Icon Colors -->
         <!-- Trend Arrow -->
-        <item name="icCheckboxTrendColor">@color/black</item>
+        <item name="icCheckboxTrendColor">@color/plastic_grey</item>
+        <!-- Overview Buttons -->
+        <item name="icBolusColor">@color/bolus</item>
+        <item name="icBolusCarbsColor">@color/colorCarbsButton</item>
+        <item name="icCalculatorColor">@color/colorCalculatorButton</item>
+        <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
+        <item name="icCalibrationColor">@color/colorCalibrationButton</item>
+        <item name="icTreatmentColor">@color/bolus</item>
+
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>