diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
index 4b7a56771a..2e2360daf3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
@@ -77,7 +77,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.lastboluscompared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.getMinutes())
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_bolus)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_bolus)
 
     override fun duplicate(): Trigger = TriggerBolusAgo(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 a5d21ba956..320cf82112 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
@@ -775,7 +775,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
             overview_sensitivity_icon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
         } else {
-            overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert_48px_green)
+            overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert)
         }
 
         overview_sensitivity?.text =
diff --git a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
index da158703a1..913b1b9aeb 100644
--- a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
+++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
@@ -1,7 +1,6 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
@@ -11,6 +10,9 @@
       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:pathData="M1.972,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C2.228,12.333 2.1,12.381 1.972,12.381z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M7.486,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146L1.618,6.721c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C7.743,12.333 7.614,12.381 7.486,12.381z"
       android:fillColor="#FEAF05"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_actions_starttempbasal.xml b/app/src/main/res/drawable/ic_actions_starttempbasal.xml
new file mode 100644
index 0000000000..1b7781daed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_starttempbasal.xml
@@ -0,0 +1,9 @@
+<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="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#CF8BFE"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cancelbasal.xml b/app/src/main/res/drawable/ic_cancelbasal.xml
new file mode 100644
index 0000000000..76640a4534
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cancelbasal.xml
@@ -0,0 +1,10 @@
+<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.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_end.xml b/app/src/main/res/drawable/ic_cp_basal_end.xml
new file mode 100644
index 0000000000..76640a4534
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_end.xml
@@ -0,0 +1,10 @@
+<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.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
+</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
index 71abd83757..840a639f9c 100644
--- a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
@@ -1,8 +1,9 @@
-<vector
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
-    android:viewportHeight="24"
+    android:height="48dp"
     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"/>
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.517,11.496h15.717v1.009h-15.717z"
+      android:fillColor="#CF8BFE"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_start.xml b/app/src/main/res/drawable/ic_cp_basal_start.xml
new file mode 100644
index 0000000000..1b7781daed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_start.xml
@@ -0,0 +1,9 @@
+<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="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#CF8BFE"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
index 140ba3ad92..1b7781daed 100644
--- a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
@@ -1,8 +1,9 @@
-<vector
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
-    android:viewportHeight="24"
+    android:height="48dp"
     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"/>
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#CF8BFE"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
index 53ce1c5c6c..9f3d94563f 100644
--- a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
@@ -1,8 +1,9 @@
-<vector
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
-    android:viewportHeight="24"
+    android:height="48dp"
     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"/>
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.871,18.026l0,-11.042l-8.354,0l0,-1.009l9.363,0l0,11.041l3.698,0l0,-11.041l2.655,0l0,1.009l-1.645,0l0,11.042z"
+      android:fillColor="#CF8BFE"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_correction.xml b/app/src/main/res/drawable/ic_cp_bolus_correction.xml
new file mode 100644
index 0000000000..e14bb7c14f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_correction.xml
@@ -0,0 +1,12 @@
+<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="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#E93057"/>
+  <path
+      android:pathData="M2.852,13.946c-0.248,0 -0.498,-0.123 -0.74,-0.366c-0.49,-0.49 -0.492,-0.986 -0.004,-1.474l3.125,-3.125C5.106,8.737 5.048,8.435 5.048,8.136c0,-1.336 1.172,-2.508 2.508,-2.508c0.282,0 0.572,0.055 0.864,0.163c0.186,0.069 0.347,0.148 0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046,-1.116l0.374,-0.374c0.171,0.154 0.25,0.315 0.319,0.501c0.108,0.292 0.163,0.583 0.163,0.864c0,0.67 -0.261,1.3 -0.734,1.773c-0.473,0.474 -1.103,0.734 -1.773,0.735c-0.298,0 -0.6,-0.058 -0.898,-0.173l-3.072,3.113C3.346,13.824 3.099,13.946 2.852,13.946zM7.556,6.237c-0.507,0 -0.984,0.198 -1.342,0.556C5.855,7.152 5.657,7.629 5.657,8.136c0,0.153 0.024,0.313 0.076,0.5c0.046,0.168 0.114,0.326 0.2,0.47l0.022,0.037c0,0 -0.139,0.115 -0.168,0.146l-3.249,3.248c-0.26,0.26 -0.227,0.381 0.004,0.612c0.134,0.134 0.219,0.186 0.304,0.186c0.085,0 0.184,-0.058 0.308,-0.182l3.249,-3.249c0.03,-0.03 0.104,-0.12 0.104,-0.12l0.078,-0.026c0.146,0.087 0.304,0.155 0.471,0.2c0.186,0.052 0.344,0.076 0.499,0.076c1.009,0 1.896,-0.887 1.898,-1.898c0,-0.134 -0.018,-0.274 -0.054,-0.43L8.342,8.872C8.284,8.929 8.208,8.961 8.126,8.961c-0.081,0 -0.158,-0.032 -0.215,-0.089L6.82,7.78c-0.119,-0.119 -0.119,-0.313 0,-0.431l1.143,-1.142C7.886,6.235 7.807,6.241 7.729,6.241C7.67,6.241 7.556,6.237 7.556,6.237z"
+      android:fillColor="#E93057"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_x_swap_vert.xml b/app/src/main/res/drawable/ic_x_swap_vert.xml
new file mode 100644
index 0000000000..f5182fe7b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_x_swap_vert.xml
@@ -0,0 +1,10 @@
+<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="#008585" android:pathData="M19.375,17.01V10h-2v7.01h-3l4,3.99l4,-3.99H19.375zM12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+    <path android:fillColor="#008585" android:pathData="M2.756,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708L3.11,15.124C3.012,15.222 2.884,15.271 2.756,15.271z"/>
+    <path android:fillColor="#008585" android:pathData="M8.271,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146L2.403,9.61c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C8.527,15.222 8.399,15.271 8.271,15.271z"/>
+</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
deleted file mode 100644
index 9484c2cd6f..0000000000
--- a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector
-    android:tint="#008585"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportHeight="24"
-    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"/>
-</vector>
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index ce86d871ea..9b126fb8d1 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -60,7 +60,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_starttempbasal"
+                android:drawableTop="@drawable/ic_actions_starttempbasal"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/overview_tempbasal_button"
@@ -75,7 +75,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_cancelbasal"
+                android:drawableTop="@drawable/ic_cancelbasal"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/canceltemp"
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 1f2da353da..44d5f957f0 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -138,7 +138,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_correction"
+                        android:drawableTop="@drawable/ic_cp_bolus_correction"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_correctionbolus"
@@ -166,7 +166,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_correction"
+                        android:drawableTop="@drawable/ic_cp_bolus_correction"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_combobolus"
@@ -180,7 +180,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_basal_start"
+                        android:drawableTop="@drawable/ic_cp_basal_start"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_tempbasalstart"
@@ -194,7 +194,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_basal_end"
+                        android:drawableTop="@drawable/ic_cp_basal_end"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_tempbasalend"
diff --git a/app/src/main/res/layout/omnipod_fragment.xml b/app/src/main/res/layout/omnipod_fragment.xml
index e5e450c141..f6d13171ce 100644
--- a/app/src/main/res/layout/omnipod_fragment.xml
+++ b/app/src/main/res/layout/omnipod_fragment.xml
@@ -618,7 +618,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_cp_bolus_correction"
+                    android:drawableTop="@drawable/ic_cp_bolus_correction"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_read_pulse_log_short"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
index a1400ae55f..b1aefd5b3a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
@@ -79,6 +79,6 @@ class TriggerBolusAgoTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_bolus), TriggerBolusAgo(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_bolus), TriggerBolusAgo(injector).icon())
     }
 }
\ No newline at end of file
diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg
index 5c5b4070cb..98c7fa503b 100644
--- a/icons/actions_cancelextbolus.svg
+++ b/icons/actions_cancelextbolus.svg
@@ -15,7 +15,11 @@
 			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>
+		<path fill="#FEAF05" d="M1.972,12.381c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C2.228,12.333,2.1,12.381,1.972,12.381z"/>
+		<path fill="#FEAF05" d="M7.486,12.381c-0.128,0-0.256-0.049-0.354-0.146L1.618,6.721c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C7.743,12.333,7.614,12.381,7.486,12.381z"/>
+	</g>
 </g>
 </svg>
diff --git a/icons/cp_basal_end.svg b/icons/cp_basal_end.svg
new file mode 100644
index 0000000000..f510137ad0
--- /dev/null
+++ b/icons/cp_basal_end.svg
@@ -0,0 +1,16 @@
+<?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="cp_x5F_basal_x5F_end">
+	<g>
+		<path fill="#CF8BFE" d="M3.923,12.021c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C4.179,11.972,4.051,12.021,3.923,12.021z"/>
+		<path fill="#CF8BFE" d="M9.438,12.021c-0.128,0-0.256-0.049-0.354-0.146L3.569,6.361c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C9.694,11.972,9.566,12.021,9.438,12.021z"/>
+	</g>
+	<polygon fill="#CF8BFE" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 11.871,17.016 
+		11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg
index 392131c288..198afcf383 100644
--- a/icons/cp_basal_no_tbr.svg
+++ b/icons/cp_basal_no_tbr.svg
@@ -5,6 +5,6 @@
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <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"/>
+	<rect x="3.517" y="11.496" fill="#CF8BFE" width="15.717" height="1.009"/>
 </g>
 </svg>
diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg
index ab4c194894..eaa4f986ff 100644
--- a/icons/cp_basal_tbr_high.svg
+++ b/icons/cp_basal_tbr_high.svg
@@ -5,7 +5,7 @@
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <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 	"/>
+	<polygon fill="#CF8BFE" points="16.578,18.033 16.578,6.99 12.88,6.99 12.88,18.033 3.517,18.033 3.517,17.023 11.871,17.023 
+		11.871,5.982 17.588,5.982 17.588,17.023 19.233,17.023 19.233,18.033 	"/>
 </g>
 </svg>
diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg
index 4b2fe0df38..d591a1941f 100644
--- a/icons/cp_basal_tbr_low.svg
+++ b/icons/cp_basal_tbr_low.svg
@@ -5,7 +5,7 @@
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <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 	"/>
+	<polygon fill="#CF8BFE" points="11.871,18.026 11.871,6.984 3.517,6.984 3.517,5.975 12.88,5.975 12.88,17.016 16.578,17.016 
+		16.578,5.975 19.233,5.975 19.233,6.984 17.588,6.984 17.588,18.026 	"/>
 </g>
 </svg>
diff --git a/icons/cp_bolus_correction.svg b/icons/cp_bolus_correction.svg
new file mode 100644
index 0000000000..1ccec87132
--- /dev/null
+++ b/icons/cp_bolus_correction.svg
@@ -0,0 +1,21 @@
+<?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="cp_x5F_bolus_x5F_correction">
+	<polygon fill="#E93057" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 11.871,17.016 
+		11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+	<path fill="#E93057" d="M2.852,13.946c-0.248,0-0.498-0.123-0.74-0.366c-0.49-0.49-0.492-0.986-0.004-1.474l3.125-3.125
+		C5.106,8.737,5.048,8.435,5.048,8.136c0-1.336,1.172-2.508,2.508-2.508c0.282,0,0.572,0.055,0.864,0.163
+		c0.186,0.069,0.347,0.148,0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046-1.116l0.374-0.374
+		c0.171,0.154,0.25,0.315,0.319,0.501c0.108,0.292,0.163,0.583,0.163,0.864c0,0.67-0.261,1.3-0.734,1.773
+		c-0.473,0.474-1.103,0.734-1.773,0.735c-0.298,0-0.6-0.058-0.898-0.173l-3.072,3.113C3.346,13.824,3.099,13.946,2.852,13.946z
+		 M7.556,6.237c-0.507,0-0.984,0.198-1.342,0.556C5.855,7.152,5.657,7.629,5.657,8.136c0,0.153,0.024,0.313,0.076,0.5
+		c0.046,0.168,0.114,0.326,0.2,0.47l0.022,0.037c0,0-0.139,0.115-0.168,0.146l-3.249,3.248c-0.26,0.26-0.227,0.381,0.004,0.612
+		c0.134,0.134,0.219,0.186,0.304,0.186c0.085,0,0.184-0.058,0.308-0.182l3.249-3.249c0.03-0.03,0.104-0.12,0.104-0.12l0.078-0.026
+		c0.146,0.087,0.304,0.155,0.471,0.2c0.186,0.052,0.344,0.076,0.499,0.076c1.009,0,1.896-0.887,1.898-1.898
+		c0-0.134-0.018-0.274-0.054-0.43L8.342,8.872C8.284,8.929,8.208,8.961,8.126,8.961c-0.081,0-0.158-0.032-0.215-0.089L6.82,7.78
+		c-0.119-0.119-0.119-0.313,0-0.431l1.143-1.142C7.886,6.235,7.807,6.241,7.729,6.241C7.67,6.241,7.556,6.237,7.556,6.237z"/>
+</g>
+</svg>
diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg
index 9a9087c413..6af56d0df4 100644
--- a/icons/x_swap_vert.svg
+++ b/icons/x_swap_vert.svg
@@ -1,10 +1,16 @@
 <?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" id="Layer_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">
-<path d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-<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 "/>
+<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">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#008585" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<g>
+		<path fill="#008585" d="M2.756,15.271c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708L3.11,15.124C3.012,15.222,2.884,15.271,2.756,15.271z"/>
+		<path fill="#008585" d="M8.271,15.271c-0.128,0-0.256-0.049-0.354-0.146L2.403,9.61c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C8.527,15.222,8.399,15.271,8.271,15.271z"/>
+	</g>
+</g>
 </svg>