diff --git a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
index 840a639f9c..e9385125b6 100644
--- a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M3.517,11.496h15.717v1.009h-15.717z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/basalNoTbrColor"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_start.xml b/app/src/main/res/drawable/ic_cp_basal_start.xml
index 1b7781daed..d8b927366e 100644
--- a/app/src/main/res/drawable/ic_cp_basal_start.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_start.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/basalstartColor"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
index 1b7781daed..dba9f794d9 100644
--- a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/basalHighColor"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
index 9f3d94563f..bcac9407aa 100644
--- a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M11.871,18.026l0,-11.042l-8.354,0l0,-1.009l9.363,0l0,11.041l3.698,0l0,-11.041l2.655,0l0,1.009l-1.645,0l0,11.042z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/basalLowColor"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml b/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml
index f78eaede2c..e5dc16a43e 100644
--- a/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml
+++ b/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml
@@ -1,4 +1,4 @@
-<vector android:height="48dp" android:tint="#008585"
+<vector android:height="48dp" android:tint="?attr/sensColor"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z"/>
diff --git a/app/src/main/res/drawable/ic_x_swap_vert.xml b/app/src/main/res/drawable/ic_x_swap_vert.xml
index f5182fe7b4..3d6735ae12 100644
--- a/app/src/main/res/drawable/ic_x_swap_vert.xml
+++ b/app/src/main/res/drawable/ic_x_swap_vert.xml
@@ -4,7 +4,8 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#008585" android:pathData="M19.375,17.01V10h-2v7.01h-3l4,3.99l4,-3.99H19.375zM12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-    <path android:fillColor="#008585" android:pathData="M2.756,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708L3.11,15.124C3.012,15.222 2.884,15.271 2.756,15.271z"/>
-    <path android:fillColor="#008585" android:pathData="M8.271,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146L2.403,9.61c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C8.527,15.222 8.399,15.271 8.271,15.271z"/>
+    <path android:fillColor="?attr/sensColor"
+        android:pathData="M19.375,17.01V10h-2v7.01h-3l4,3.99l4,-3.99H19.375zM12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+    <path android:fillColor="?attr/sensColor" android:pathData="M2.756,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708L3.11,15.124C3.012,15.222 2.884,15.271 2.756,15.271z"/>
+    <path android:fillColor="?attr/sensColor" android:pathData="M8.271,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146L2.403,9.61c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C8.527,15.222 8.399,15.271 8.271,15.271z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_stats.xml b/core/src/main/res/drawable/ic_cp_stats.xml
index 81b3952eb4..a95eef3884 100644
--- a/core/src/main/res/drawable/ic_cp_stats.xml
+++ b/core/src/main/res/drawable/ic_cp_stats.xml
@@ -7,24 +7,24 @@
       android:pathData="M5.719,19.125L5.719,11.828"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M9.792,19.125L9.792,8.01"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M13.865,19.125L13.865,9.51"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M17.938,19.125L17.938,4.594"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_temptarget_high.xml b/core/src/main/res/drawable/ic_temptarget_high.xml
index ae0e9799ca..38c1f04bb7 100644
--- a/core/src/main/res/drawable/ic_temptarget_high.xml
+++ b/core/src/main/res/drawable/ic_temptarget_high.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24">
   <path
       android:pathData="M7.242,17.689c-0.005,0 -0.011,0 -0.017,0c-0.695,-0.013 -1.318,-0.829 -1.709,-2.24c-0.285,-1.029 -0.542,-2.103 -0.792,-3.141c-0.156,-0.65 -0.313,-1.301 -0.476,-1.945L4.14,9.929c-0.369,-1.486 -0.75,-3.024 -1.746,-3.197c-0.116,-0.02 -0.193,-0.13 -0.173,-0.246s0.129,-0.189 0.246,-0.173C3.735,6.534 4.15,8.208 4.552,9.827l0.108,0.432c0.164,0.646 0.321,1.298 0.478,1.951c0.249,1.035 0.506,2.104 0.789,3.127c0.322,1.163 0.834,1.92 1.307,1.929c0.002,0 0.005,0 0.008,0c0.443,0 0.905,-0.656 1.269,-1.804c0.188,-0.592 0.349,-1.229 0.504,-1.847l0.124,-0.487c0.138,-0.536 0.268,-1.08 0.398,-1.624c0.267,-1.114 0.542,-2.265 0.878,-3.332c0.373,-1.182 0.928,-1.836 1.565,-1.842c0.003,0 0.005,0 0.008,0c0.639,0 1.208,0.65 1.603,1.832c0.278,0.833 0.514,1.729 0.74,2.598l0.177,0.671c0.147,0.553 0.288,1.112 0.43,1.672c0.24,0.956 0.489,1.945 0.769,2.879c0.229,0.77 0.619,1.26 1.017,1.28c0.356,0.043 0.729,-0.362 1.011,-1.041c0.271,-0.651 0.521,-1.41 0.761,-2.318c0.333,-1.265 0.648,-2.547 0.964,-3.829c0.146,-0.592 0.291,-1.184 0.438,-1.773c0.281,-1.125 0.812,-1.774 1.62,-1.983c0.111,-0.028 0.229,0.04 0.259,0.153c0.029,0.114 -0.039,0.229 -0.153,0.259c-0.652,0.168 -1.069,0.7 -1.313,1.674c-0.147,0.589 -0.293,1.181 -0.438,1.772c-0.316,1.284 -0.633,2.568 -0.966,3.836c-0.245,0.928 -0.5,1.704 -0.779,2.374c-0.487,1.17 -1.097,1.32 -1.426,1.302c-0.59,-0.03 -1.114,-0.622 -1.402,-1.584c-0.281,-0.941 -0.531,-1.936 -0.773,-2.896c-0.14,-0.558 -0.28,-1.115 -0.427,-1.666l-0.178,-0.673c-0.225,-0.861 -0.458,-1.751 -0.731,-2.57c-0.323,-0.966 -0.772,-1.541 -1.201,-1.541c-0.001,0 -0.002,0 -0.004,0c-0.425,0.003 -0.86,0.581 -1.164,1.544c-0.331,1.052 -0.605,2.196 -0.87,3.303c-0.131,0.546 -0.262,1.092 -0.399,1.63l-0.124,0.486c-0.158,0.623 -0.32,1.268 -0.512,1.871C8.367,17.32 7.706,17.689 7.242,17.689z"
-      android:fillColor="?attr/bgInRange"/>
+      android:fillColor="?attr/tempTargetbgInRange"/>
   <path
       android:pathData="M21.569,12.709h-4.772c-0.392,0 -0.709,-0.317 -0.709,-0.709V9.177H7.927l0,2.823c0,0.392 -0.317,0.709 -0.708,0.709H2.431c-0.392,0 -0.708,-0.317 -0.708,-0.709s0.317,-0.708 0.708,-0.708H6.51l0,-2.823c0,-0.392 0.317,-0.708 0.708,-0.708h9.578c0.392,0 0.709,0.317 0.709,0.708v2.823h4.063c0.392,0 0.709,0.317 0.709,0.708S21.961,12.709 21.569,12.709z"
       android:fillColor="?attr/tempTargetConfirmation"/>
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index 56c54d9d6e..a75dfe6902 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -92,6 +92,7 @@
     <color name="calibration">#E83258</color>
     <color name="bolusDataPointColor">#00FFFF</color>
     <color name="profileSwitch">#00FFFF</color>
+    <color name="sens">#008585</color>
 
     <color name="ribbonDefault">#5a595b</color>
     <color name="daySelected">#D000FF00</color>
@@ -217,6 +218,7 @@
     <color name="question">#FEAF05</color>
     <color name="pumpHistory">#67DFE8</color>
     <color name="userOption">#6AE86D</color>
+    <color name="stats">#FEAF05</color>
 
     <!-- Gray colors -->
     <color name="darkgray">#323232</color>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 33786a51d6..f7b6521c01 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -49,6 +49,8 @@
         <item name="cardItemBackgroundColor">@color/cardColorBackground</item>
         <!-- Exercise -->
         <item name="exerciseColor">@color/exercise</item>
+        <!-- Stats  -->
+        <item name="statsColor">@color/stats</item>
         <!-- BG low -->
         <item name="lowColor">@color/low</item>
         <!-- Treatments -->
@@ -171,6 +173,7 @@
         <item name="carbsColor">@color/carbs</item>
         <!-- Temp Target -->
         <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
+        <item name="tempTargetbgInRange">@color/tempTargetConfirmation</item>
         <!---Loop Icon-->
         <!---Loop Paused Icon Color-->
         <item name="loopPaused">@color/loopSuspended</item>
@@ -189,6 +192,9 @@
         <item name="extBolusStopColor">@color/extBolusStop</item>
         <item name="basalstartColor">@color/actionBasal</item>
         <item name="basalCancelColor">@color/actionBasal</item>
+        <item name="basalNoTbrColor">@color/actionBasal</item>
+        <item name="basalHighColor">@color/actionBasal</item>
+        <item name="basalLowColor">@color/actionBasal</item>
         <item name="pumpCanulaColor">@color/pumpCanula</item>
         <item name="cgmInsertColor">@color/cgmInsert</item>
         <item name="pumpBatteryColor">@color/pumpBattery</item>
@@ -197,6 +203,7 @@
         <item name="questionColor">@color/question</item>
         <item name="pumpHistoryColor">@color/pumpHistory</item>
         <item name="userOptionColor">@color/userOption</item>
+        <item name="sensColor">@color/sens</item>
         <!---Graph data glucose value point colors-->
         <item name="cobColor">@color/cob</item>
         <item name="uamColor">@color/uam</item>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index a035d32fa4..e6c81ff89f 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -19,6 +19,7 @@
     <attr name="lowColor" format="reference|color" />
     <!-- Temp Target -->
     <attr name="tempTargetConfirmation" format="reference|color" />
+    <attr name="tempTargetbgInRange" format="reference|color" />
     <!-- Treatments -->
     <attr name="setExtendedButtonColor" format="reference|color" />
     <!-- Carbs Button -->
@@ -37,6 +38,8 @@
     <attr name="calibrationButtonColor" format="reference|color" />
     <!-- QuickWizard Button -->
     <attr name="quickWizardButtonColor" format="reference|color" />
+    <!-- Stats  -->
+    <attr name="statsColor" format="reference|color" />
     <!-- Pump -->
     <attr name="pumpStatusBackground" format="reference|color" />
     <!-- Objectives -->
@@ -165,6 +168,9 @@
     <attr name="extBolusStopColor" format="reference|color" />
     <attr name="basalstartColor" format="reference|color" />
     <attr name="basalCancelColor" format="reference|color" />
+    <attr name="basalNoTbrColor" format="reference|color" />
+    <attr name="basalHighColor" format="reference|color" />
+    <attr name="basalLowColor" format="reference|color" />
     <attr name="pumpCanulaColor" format="reference|color" />
     <attr name="cgmInsertColor" format="reference|color" />
     <attr name="pumpBatteryColor" format="reference|color" />
@@ -173,6 +179,7 @@
     <attr name="questionColor" format="reference|color" />
     <attr name="pumpHistoryColor" format="reference|color" />
     <attr name="userOptionColor" format="reference|color" />
+    <attr name="sensColor" format="reference|color" />
     <!---Glucose Value Color-->
     <attr name="cobColor" format="reference|color" />
     <attr name="uamColor" format="reference|color" />
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 87d70d7b3e..3210d91495 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -95,6 +95,7 @@
     <color name="profileSwitch">#00FFFF</color>
     <color name="red">#FF0000</color>
     <color name="blue">#0000FF</color>
+    <color name="sens">#008585</color>
 
     <color name="ribbonDefault">#8C8C8C</color>
     <color name="daySelected">#D000FF00</color>
@@ -220,6 +221,7 @@
     <color name="question">#FEAF05</color>
     <color name="pumpHistory">#42A5F5</color>
     <color name="userOption">#66BB6A</color>
+    <color name="stats">#FEAF05</color>
 
     <!-- Gray colors -->
     <color name="darkgray">#323232</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 5dc2179216..d945378321 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -54,6 +54,8 @@
         <item name="cardItemBackgroundColor">?attr/colorSurface</item>
         <!-- Exercise -->
         <item name="exerciseColor">@color/exercise</item>
+        <!-- Stats  -->
+        <item name="statsColor">@color/stats</item>
         <!-- BG low -->
         <item name="lowColor">@color/low</item>
         <!-- Treatments -->
@@ -174,6 +176,7 @@
         <item name="carbsColor">@color/carbs</item>
         <!-- Temp Target -->
         <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
+        <item name="tempTargetbgInRange">@color/tempTargetConfirmation</item>
         <!---Loop Icon-->
         <!---Loop Paused Icon Color-->
         <item name="loopPaused">@color/loopSuspended</item>
@@ -192,6 +195,9 @@
         <item name="extBolusStopColor">@color/extBolusStop</item>
         <item name="basalstartColor">@color/actionBasal</item>
         <item name="basalCancelColor">@color/actionBasal</item>
+        <item name="basalNoTbrColor">@color/actionBasal</item>
+        <item name="basalHighColor">@color/actionBasal</item>
+        <item name="basalLowColor">@color/actionBasal</item>
         <item name="pumpCanulaColor">@color/pumpCanula</item>
         <item name="cgmInsertColor">@color/cgmInsert</item>
         <item name="pumpBatteryColor">@color/pumpBattery</item>
@@ -200,6 +206,7 @@
         <item name="questionColor">@color/question</item>
         <item name="pumpHistoryColor">@color/pumpHistory</item>
         <item name="userOptionColor">@color/userOption</item>
+        <item name="sensColor">@color/sens</item>
         <!---Graph data glucose value point colors-->
         <item name="cobColor">@color/cob</item>
         <item name="uamColor">@color/uam</item>