diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
index 82aa8cd6f1..6d07ef1188 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
@@ -77,7 +77,7 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.cobcompared, resourceHelper.gs(comparator.value.stringRes), cob.value)
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_cp_bolus_carbs)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bolus_carbs)
 
     override fun duplicate(): Trigger = TriggerCOB(injector, this)
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index be9370d27c..a5d21ba956 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -679,9 +679,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             ?: resourceHelper.gc(R.color.defaulttextcolor))
 
         if (activeTemp != null)
-            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
+            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.ic_cp_basal_tbr_high else R.drawable.ic_cp_basal_tbr_low)
         else
-            overview_basebasal_icon.setImageResource(R.drawable.icon_cp_basal_no_tbr)
+            overview_basebasal_icon.setImageResource(R.drawable.ic_cp_basal_no_tbr)
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
diff --git a/app/src/main/res/drawable/anim_carbs.xml b/app/src/main/res/drawable/anim_carbs.xml
index 28ae262b46..f3b7c5cc7f 100644
--- a/app/src/main/res/drawable/anim_carbs.xml
+++ b/app/src/main/res/drawable/anim_carbs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:oneshot="false">
-    <item android:drawable="@drawable/icon_cp_bolus_carbs" android:duration="1200" />
-    <item android:drawable="@drawable/icon_cp_bolus_carbs_red" android:duration="1200" />
+    <item android:drawable="@drawable/ic_cp_bolus_carbs" android:duration="1200" />
+    <item android:drawable="@drawable/ic_cp_bolus_carbs_red" android:duration="1200" />
 </animation-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
new file mode 100644
index 0000000000..da158703a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
@@ -0,0 +1,16 @@
+<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="M20.164,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.312c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C23.218,10.989 22.001,8.909 20.164,7.697zM16.448,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S19.63,19.119 16.448,19.119z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M16.45,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C20.983,10.85 18.95,8.816 16.45,8.814z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M4.729,9.857l-2.346,2.346l-0.733,-0.733l2.346,-2.346l-2.346,-2.346l0.733,-0.733l2.346,2.346l2.346,-2.346l0.733,0.733l-2.345,2.346l2.345,2.346l-0.733,0.733z"
+      android:fillColor="#FEAF05"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_actions_startextbolus.xml b/app/src/main/res/drawable/ic_actions_startextbolus.xml
new file mode 100644
index 0000000000..6436cad1d7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_startextbolus.xml
@@ -0,0 +1,9 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#67DFE8" android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
+    <path android:fillColor="#67DFE8" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bolus.xml b/app/src/main/res/drawable/ic_bolus.xml
new file mode 100644
index 0000000000..752e99ce35
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bolus.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#67DFE8" 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/app/src/main/res/drawable/ic_calculator.xml b/app/src/main/res/drawable/ic_calculator.xml
new file mode 100644
index 0000000000..300e971bf4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calculator.xml
@@ -0,0 +1,14 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    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"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_calibration.xml b/app/src/main/res/drawable/ic_calibration.xml
new file mode 100644
index 0000000000..26511d7cbf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calibration.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    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="#E83258"/>
+  <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="#E83258"/>
+  <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="#E83258"/>
+</vector>
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
new file mode 100644
index 0000000000..71abd83757
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M3.667,11.646h15.417v0.709h-15.417z"/>
+</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
new file mode 100644
index 0000000000..140ba3ad92
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M19.083,17.896l-2.354,0l0,-11.042l-4,0l0,11.042l-9.062,0l0,-0.708l8.354,0l0,-11.042l5.417,0l0,11.042l1.645,0z"/>
+</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
new file mode 100644
index 0000000000..53ce1c5c6c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M17.438,17.854l-5.417,0l0,-11.041l-8.354,0l0,-0.709l9.062,0l0,11.042l4,0l0,-11.042l2.354,0l0,0.709l-1.645,0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_carbs.xml b/app/src/main/res/drawable/ic_cp_bolus_carbs.xml
new file mode 100644
index 0000000000..e21b236b4e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_carbs.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    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"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml b/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml
new file mode 100644
index 0000000000..c6206204cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#F20606" 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/app/src/main/res/drawable/ic_quickwizard.xml b/app/src/main/res/drawable/ic_quickwizard.xml
new file mode 100644
index 0000000000..b2d1f2569b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_quickwizard.xml
@@ -0,0 +1,12 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    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"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
index b094d56057..9484c2cd6f 100644
--- a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
+++ b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
@@ -6,5 +6,4 @@
     android:viewportWidth="24" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" 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="#FF000000" android:pathData="M5.438,12.733l-2.346,2.346l-0.734,-0.733l2.346,-2.346l-2.346,-2.346l0.734,-0.733l2.346,2.346l2.345,-2.346l0.734,0.733l-2.346,2.346l2.346,2.346l-0.734,0.733z"/>
-    <path android:fillColor="#FF000000" android:pathData="M8.375,9.654L7.783,9.063l-2.346,2.346L3.092,9.063L2.5,9.654L4.846,12L2.5,14.346l0.592,0.592l2.346,-2.346l2.346,2.346l0.592,-0.592L6.029,12L8.375,9.654z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_xdrip.xml b/app/src/main/res/drawable/ic_xdrip.xml
new file mode 100644
index 0000000000..54f88823ba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_xdrip.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    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"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_insulin_carbs.xml b/app/src/main/res/drawable/icon_insulin_carbs.xml
index 6dcd511598..5268a2eb70 100644
--- a/app/src/main/res/drawable/icon_insulin_carbs.xml
+++ b/app/src/main/res/drawable/icon_insulin_carbs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_cp_bolus_carbs" />
-    <item android:drawable="@drawable/icon_bolus" />
+    <item android:drawable="@drawable/ic_cp_bolus_carbs" />
+    <item android:drawable="@drawable/ic_bolus" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 0290c1cf8a..ce86d871ea 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -91,7 +91,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_startextbolus"
+                android:drawableTop="@drawable/ic_actions_startextbolus"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/overview_extendedbolus_button"
@@ -106,7 +106,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_cancelextbolus"
+                android:drawableTop="@drawable/ic_actions_cancelextbolus"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/overview_extendedbolus_cancel_button"
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index d4f79965a5..1f2da353da 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -152,7 +152,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                        android:drawableTop="@drawable/ic_cp_bolus_carbs"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_carbscorrection"
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 1dbd83bd40..5cf87640eb 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/overview_calibration"
-                android:src="@drawable/icon_calibration" />
+                android:src="@drawable/ic_calibration" />
 
             <TextView
                 android:id="@+id/actions_care_title"
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index fdf83cff5b..1a4d722517 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/carbs"
-                android:src="@drawable/icon_cp_bolus_carbs" />
+                android:src="@drawable/ic_cp_bolus_carbs" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 26c15117a7..4fde69c44b 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/virtualpump_extendedbolus_label"
-                android:src="@drawable/icon_actions_startextbolus" />
+                android:src="@drawable/ic_actions_startextbolus" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml
index 5c97104159..f16ab04176 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_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_bolus"
+            android:drawableTop="@drawable/ic_bolus"
             android:text="@string/overview_insulin_label"
             android:textColor="@color/colorInsulinButton"
             android:textSize="10sp" />
@@ -57,7 +57,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_cp_bolus_carbs"
+            android:drawableTop="@drawable/ic_cp_bolus_carbs"
             android:text="@string/overview_carbs_label"
             android:textColor="@color/colorCarbsButton"
             android:textSize="10sp" />
@@ -69,7 +69,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_calculator"
+            android:drawableTop="@drawable/ic_calculator"
             android:text="@string/overview_calculator_label"
             android:textColor="@color/colorCalculatorButton"
             android:textSize="10sp" />
@@ -81,7 +81,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_calibration"
+            android:drawableTop="@drawable/ic_calibration"
             android:text="@string/overview_calibration"
             android:textColor="@color/colorCalibrationButton"
             android:textSize="10sp"
@@ -94,7 +94,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_xdrip"
+            android:drawableTop="@drawable/ic_xdrip"
             android:text="@string/overview_cgm"
             android:textColor="@color/colorCalibrationButton"
             android:textSize="10sp"
@@ -107,7 +107,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_quickwizard"
+            android:drawableTop="@drawable/ic_quickwizard"
             android:text="@string/quickwizard"
             android:textColor="@color/colorQuickWizardButton"
             android:textSize="10sp" />
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 5c4340eea6..85920acfd0 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -512,7 +512,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                    android:drawableTop="@drawable/ic_cp_bolus_carbs"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_carbs_label"
@@ -527,7 +527,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
+                    android:drawableTop="@drawable/ic_calculator"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_calculator_label"
@@ -542,7 +542,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_quickwizard"
+                    android:drawableTop="@drawable/ic_quickwizard"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="Quick wizard"
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 2d1adfc257..ecc5ee7183 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -112,7 +112,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/icon_bolus" />
+            android:src="@drawable/ic_bolus" />
 
         <TextView
             android:id="@+id/overview_iob"
@@ -170,7 +170,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/icon_cp_basal_start" />
+            android:src="@drawable/ic_cp_basal_no_tbr" />
 
         <TextView
             android:id="@+id/overview_basebasal"
@@ -198,7 +198,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/icon_actions_startextbolus" />
+            android:src="@drawable/ic_actions_startextbolus" />
 
         <TextView
             android:id="@+id/overview_extendedbolus"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
index b864e0aed8..0c2a942a3e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
@@ -70,7 +70,7 @@ class TriggerCOBTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_cp_bolus_carbs), TriggerCOB(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_cp_bolus_carbs), TriggerCOB(injector).icon())
     }
 
     fun generateCobInfo(): CobInfo {
diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg
new file mode 100644
index 0000000000..39c3677207
--- /dev/null
+++ b/icons/actions_cancelextbolus.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="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.89
+		L1.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.564
+		c-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.948
+		c-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.092
+		c-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.092
+		S18.762,11.659,18.501,12.002z M5.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.035
+		L9.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.291
+		c-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.008
+		c0.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.833
+		C7.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.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="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.664
+		c0.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.576
+		c-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.345
+		c-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.256
+		c0.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.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="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.678
+		c0.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.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="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.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="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.923
+		c-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 display="inline" fill="#FEAF06" d="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.681
+		c0.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"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,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"/>
+	<g display="inline">
+		<path fill="#67E86A" d="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.519
+			V14.036z"/>
+		<path fill="#67E86A" d="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.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,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.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-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 display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.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.842
+		V8.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.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="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.08
+		l-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.913
+		c-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.914
+		c0.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.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="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.468
+		c-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.255
+		c-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.678
+		c0.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.327
+		c0.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.806
+		c0.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.087
+		c0.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.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-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.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.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.011
+		c-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.211z
+		 M10.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.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-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.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.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.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.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.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.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.636
+		c0.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"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<g>
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<polygon fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 4.729,8.391 7.075,6.045 
+		7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
+</g>
+</svg>
diff --git a/icons/actions_startextbolus.svg b/icons/actions_startextbolus.svg
new file mode 100644
index 0000000000..5b5b57d634
--- /dev/null
+++ b/icons/actions_startextbolus.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="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.89
+		L1.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.564
+		c-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.948
+		c-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.092
+		c-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.092
+		S18.762,11.659,18.501,12.002z M5.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.035
+		L9.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.291
+		c-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.008
+		c0.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.833
+		C7.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.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="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.664
+		c0.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.576
+		c-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.345
+		c-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.256
+		c0.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.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="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.678
+		c0.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.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="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.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="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.923
+		c-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 display="inline" fill="#FEAF06" d="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.681
+		c0.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"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,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"/>
+	<g display="inline">
+		<path fill="#67E86A" d="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.519
+			V14.036z"/>
+		<path fill="#67E86A" d="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.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,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.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-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 display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.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.842
+		V8.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.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="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.08
+		l-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.913
+		c-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.914
+		c0.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.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="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.468
+		c-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.255
+		c-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.678
+		c0.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.327
+		c0.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.806
+		c0.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.087
+		c0.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.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-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.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.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.011
+		c-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.211z
+		 M10.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.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-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.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.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.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.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.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.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.636
+		c0.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"/>
+</g>
+<g id="actions_x5F_startextbolus">
+	<path fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+		l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+		h-2.313c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+		c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119
+		c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198c0,0.08,0.029,0.157,0.083,0.217
+		l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001c0.08,0,0.157-0.029,0.217-0.083
+		c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="Layer_10" display="none">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.716,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598C7.6,7.303,5.23,10.053,5.23,13.35c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.77,10.989,17.553,8.909,15.716,7.697z M12,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		S8.819,7.58,12,7.58s5.77,2.588,5.77,5.77S15.182,19.119,12,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12.002,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.535,10.85,14.502,8.816,12.002,8.814z"/>
+</g>
+</svg>
diff --git a/icons/bolus.svg b/icons/bolus.svg
new file mode 100644
index 0000000000..7afcbe0dfa
--- /dev/null
+++ b/icons/bolus.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Layer_5">
+	<path fill="#67DFE8" d="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.501
+		L4.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.092
+		s0.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.092
+		c0.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.15
+		l-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.002z M5.458,6.524l2.44-0.783
+		l9.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.833
+		c0.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.848
+		l-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.291
+		c-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.88
+		c0.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"/>
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+</svg>
diff --git a/icons/calculator.svg b/icons/calculator.svg
new file mode 100644
index 0000000000..51033925b5
--- /dev/null
+++ b/icons/calculator.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="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.89
+		L1.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.564
+		c-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.948
+		c-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.092
+		c-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.092
+		S18.762,11.659,18.501,12.002z M5.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.035
+		L9.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.291
+		c-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.008
+		c0.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.833
+		C7.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.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="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.664
+		c0.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.576
+		c-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.345
+		c-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.256
+		c0.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.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="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.678
+		c0.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.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="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.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="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.923
+		c-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 display="inline" fill="#FEAF06" d="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.681
+		c0.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"/>
+</g>
+<g id="calculator">
+	<path display="none" fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#67E86A" d="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.083
+		c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g>
+		<path fill="#67E86A" d="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.519
+			V14.036z"/>
+		<path fill="#67E86A" d="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.519
+			V18.119z"/>
+	</g>
+	<path fill="#67E86A" d="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.1
+		c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z M19.212,20.334H5.36V7.04h13.852V20.334z
+		 M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path fill="#67E86A" d="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.083
+		c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path fill="#67E86A" d="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.282
+		h1.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.438
+		c-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 fill="#67E86A" d="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.913
+		c-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.913
+		c-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.914
+		c0.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.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+</svg>
diff --git a/icons/calibration.svg b/icons/calibration.svg
new file mode 100644
index 0000000000..75d9d9be9a
--- /dev/null
+++ b/icons/calibration.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="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.89
+		L1.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.564
+		c-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.948
+		c-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.092
+		c-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.092
+		S18.762,11.659,18.501,12.002z M5.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.035
+		L9.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.291
+		c-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.008
+		c0.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.833
+		C7.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.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="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.664
+		c0.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.576
+		c-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.345
+		c-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.256
+		c0.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.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="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.678
+		c0.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.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="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.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="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.923
+		c-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 display="inline" fill="#FEAF06" d="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.681
+		c0.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"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,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"/>
+	<g display="inline">
+		<path fill="#67E86A" d="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.519
+			V14.036z"/>
+		<path fill="#67E86A" d="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.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,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.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-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 display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.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.842
+		V8.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.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="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.08
+		l-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.913
+		c-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.914
+		c0.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.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="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.468
+		c-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.255
+		c-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.678
+		c0.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.327
+		c0.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.806
+		c0.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.087
+		c0.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.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-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.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.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.011
+		c-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.211z
+		 M10.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.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-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.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.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.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.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.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.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.636
+		c0.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"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<g display="inline">
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<polygon display="inline" fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 
+		4.729,8.391 7.075,6.045 7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
+</g>
+<g id="xdrip" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#B92929" d="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.811
+		c1.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.543
+		C8.837,6.878,10.458,5.294,12.143,3.619z M12.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.158
+		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
+</g>
+<g id="calibration">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#E83258" d="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.199
+		c-2.145-0.415-3.625-2.546-3.171-4.728C3.858,9.168,5.537,6.894,7.305,4.482z M5.08,10.061c-0.212,0.638-0.489,1.262-0.621,1.916
+		c-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.692
+		C5.468,12.903,5.032,11.589,5.08,10.061z"/>
+	<path fill="#E83258" d="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.763
+		c-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"/>
+	<path fill="#E83258" d="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.965
+		c-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"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg
new file mode 100644
index 0000000000..970cede3cd
--- /dev/null
+++ b/icons/cp_basal_no_tbr.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr">
+	<path fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg
new file mode 100644
index 0000000000..de6ff777ce
--- /dev/null
+++ b/icons/cp_basal_tbr_high.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 3.667,17.896 3.667,17.188 
+		12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg
new file mode 100644
index 0000000000..c7459314a8
--- /dev/null
+++ b/icons/cp_basal_tbr_low.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 12.729,17.146 
+		16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_carbs.svg b/icons/cp_bolus_carbs.svg
new file mode 100644
index 0000000000..867515d55a
--- /dev/null
+++ b/icons/cp_bolus_carbs.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="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.89
+		L1.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.564
+		c-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.948
+		c-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.092
+		c-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.092
+		S18.762,11.659,18.501,12.002z M5.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.035
+		L9.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.291
+		c-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.008
+		c0.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.833
+		C7.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.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="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.664
+		c0.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.576
+		c-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.345
+		c-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.256
+		c0.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.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="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.678
+		c0.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.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="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.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="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.923
+		c-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 display="inline" fill="#FEAF06" d="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.681
+		c0.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"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,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"/>
+	<g display="inline">
+		<path fill="#67E86A" d="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.519
+			V14.036z"/>
+		<path fill="#67E86A" d="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.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,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.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-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 display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.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.842
+		V8.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.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="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.08
+		l-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.913
+		c-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.914
+		c0.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.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#FEAD01" d="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.468
+		c-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.255
+		c-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.678
+		c0.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.327
+		c0.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.806
+		c0.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.087
+		c0.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.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-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.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.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.011
+		c-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.211z
+		 M10.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.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-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.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.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.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.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.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.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.636
+		c0.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"/>
+</g>
+</svg>
diff --git a/icons/quickwizard.svg b/icons/quickwizard.svg
new file mode 100644
index 0000000000..e84fda2d37
--- /dev/null
+++ b/icons/quickwizard.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="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.89
+		L1.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.564
+		c-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.948
+		c-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.092
+		c-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.092
+		S18.762,11.659,18.501,12.002z M5.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.035
+		L9.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.291
+		c-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.008
+		c0.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.833
+		C7.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.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="Layer_6">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#FEAF05" d="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.664
+		c0.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.576
+		c-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.345
+		c-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.256
+		c0.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.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path fill="#FEAF06" d="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.678
+		c0.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.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path fill="#FEAF06" d="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.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path fill="#FEAF06" d="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.923
+		c-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 fill="#FEAF06" d="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.681
+		c0.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"/>
+</g>
+</svg>
diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg
index a09d1324a4..9a9087c413 100644
--- a/icons/x_swap_vert.svg
+++ b/icons/x_swap_vert.svg
@@ -7,6 +7,4 @@
 <path fill="none" d="M0,0h24v24H0V0z"/>
 <polygon points="5.438,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.438,11.267 7.783,8.921 8.517,9.654 
 	6.171,12 8.517,14.346 7.783,15.079 "/>
-<path d="M8.375,9.654L7.783,9.063l-2.346,2.346L3.092,9.063L2.5,9.654L4.846,12L2.5,14.346l0.592,0.592l2.346-2.346l2.346,2.346
-	l0.592-0.592L6.029,12L8.375,9.654z"/>
 </svg>
diff --git a/icons/xdrip.svg b/icons/xdrip.svg
new file mode 100644
index 0000000000..a0b9c3ecdd
--- /dev/null
+++ b/icons/xdrip.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="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.89
+		L1.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.564
+		c-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.948
+		c-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.092
+		c-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.092
+		S18.762,11.659,18.501,12.002z M5.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.035
+		L9.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.291
+		c-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.008
+		c0.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.833
+		C7.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.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="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.664
+		c0.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.576
+		c-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.345
+		c-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.256
+		c0.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.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="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.678
+		c0.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.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="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.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="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.923
+		c-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 display="inline" fill="#FEAF06" d="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.681
+		c0.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"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,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"/>
+	<g display="inline">
+		<path fill="#67E86A" d="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.519
+			V14.036z"/>
+		<path fill="#67E86A" d="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.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,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.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-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 display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.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.842
+		V8.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.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="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.08
+		l-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.913
+		c-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.914
+		c0.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.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="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.468
+		c-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.255
+		c-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.678
+		c0.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.327
+		c0.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.806
+		c0.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.087
+		c0.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.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-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.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.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.011
+		c-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.211z
+		 M10.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.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-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.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.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.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.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.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.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.636
+		c0.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"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<g display="inline">
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<polygon display="inline" fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 
+		4.729,8.391 7.075,6.045 7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
+</g>
+<g id="xdrip">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#B92929" d="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.811
+		c1.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.543
+		C8.837,6.878,10.458,5.294,12.143,3.619z M12.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.158
+		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
+</g>
+</svg>