diff --git a/app/src/main/res/drawable/icon_insulin_carbs.xml b/app/src/main/res/drawable/icon_insulin_carbs.xml
new file mode 100644
index 0000000000..6dcd511598
--- /dev/null
+++ b/app/src/main/res/drawable/icon_insulin_carbs.xml
@@ -0,0 +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" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 4997e12874..64fccac3af 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -401,7 +401,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
+                    android:drawableTop="@drawable/icon_insulin_carbs"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_treatment_label"
@@ -409,21 +409,6 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.utils.SingleClickButton
-                    android:id="@+id/overview_wizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calculator_label"
-                    android:textColor="@color/colorCalculatorButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
@@ -454,6 +439,21 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
+                <info.nightscout.utils.SingleClickButton
+                    android:id="@+id/overview_wizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calculator"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/overview_calculator_label"
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"
@@ -481,7 +481,8 @@
                     android:paddingRight="0dp"
                     android:text="@string/overview_cgm"
                     android:textColor="@color/colorCalibrationButton"
-                    android:textSize="10sp"/>
+                    android:textSize="10sp"
+                    android:visibility="gone" />
 
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient.xml b/app/src/main/res/layout/overview_fragment_nsclient.xml
index efb4e9f3b2..de7483c063 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient.xml
@@ -606,13 +606,42 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
+                    android:drawableTop="@drawable/icon_insulin_carbs"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_treatment_label"
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
+                <info.nightscout.utils.SingleClickButton
+                    android:id="@+id/overview_insulinbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_bolus"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/overview_insulin_label"
+                    android:textColor="@color/colorInsulinButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.utils.SingleClickButton
+                    android:id="@+id/overview_carbsbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/overview_carbs_label"
+                    android:textColor="@color/colorCarbsButton"
+                    android:textSize="10sp" />
+
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
@@ -644,35 +673,6 @@
                     android:visibility="gone" />
 
 
-                <info.nightscout.utils.SingleClickButton
-                    android:id="@+id/overview_insulinbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_insulin_label"
-                    android:textColor="@color/colorInsulinButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
-                <info.nightscout.utils.SingleClickButton
-                    android:id="@+id/overview_carbsbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_carbs_label"
-                    android:textColor="@color/colorCarbsButton"
-                    android:textSize="10sp" />
-
             </LinearLayout>
 
         </LinearLayout>
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 1f1528ea12..83d2cbabdb 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -704,28 +704,13 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
+                    android:drawableTop="@drawable/icon_insulin_carbs"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_treatment_label"
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.utils.SingleClickButton
-                    android:id="@+id/overview_wizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calculator_label"
-                    android:textColor="@color/colorCalculatorButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
@@ -753,36 +738,23 @@
                     android:paddingRight="0dp"
                     android:text="@string/overview_carbs_label"
                     android:textColor="@color/colorCarbsButton"
-                    android:textSize="10sp" />
-
-                <info.nightscout.utils.SingleClickButton
-                    android:id="@+id/overview_calibrationbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calibration"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calibration"
-                    android:textColor="@color/colorCalibrationButton"
                     android:textSize="10sp"
                     android:visibility="gone" />
 
                 <info.nightscout.utils.SingleClickButton
-                    android:id="@+id/overview_cgmbutton"
+                    android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_xdrip"
+                    android:drawableTop="@drawable/icon_calculator"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/overview_cgm"
-                    android:textColor="@color/colorCalibrationButton"
-                    android:textSize="10sp"/>
+                    android:text="@string/overview_calculator_label"
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
 
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
diff --git a/app/src/main/res/layout/overview_fragment_smallheight.xml b/app/src/main/res/layout/overview_fragment_smallheight.xml
index 5e303cd3c8..604687de82 100644
--- a/app/src/main/res/layout/overview_fragment_smallheight.xml
+++ b/app/src/main/res/layout/overview_fragment_smallheight.xml
@@ -389,28 +389,13 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
+                    android:drawableTop="@drawable/icon_insulin_carbs"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_treatment_label"
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.utils.SingleClickButton
-                    android:id="@+id/overview_wizardbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="0px"
-                    android:layout_height="fill_parent"
-                    android:layout_marginRight="-4dp"
-                    android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/overview_calculator_label"
-                    android:textColor="@color/colorCalculatorButton"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
@@ -440,6 +425,21 @@
                     android:textColor="@color/colorCarbsButton"
                     android:textSize="10sp" />
 
+                <info.nightscout.utils.SingleClickButton
+                    android:id="@+id/overview_wizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calculator"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/overview_calculator_label"
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"