diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index 05b8d272a1..ba57435c7c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -159,7 +159,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     RecyclerView notificationsView;
     LinearLayoutManager llm;
 
-    LinearLayout cancelTempLayout;
     LinearLayout acceptTempLayout;
     Button cancelTempButton;
     Button treatmentButton;
@@ -242,7 +241,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         calibrationButton = (Button) view.findViewById(R.id.overview_calibrationbutton);
         calibrationButton.setOnClickListener(this);
 
-        cancelTempLayout = (LinearLayout) view.findViewById(R.id.overview_canceltemplayout);
         acceptTempLayout = (LinearLayout) view.findViewById(R.id.overview_accepttemplayout);
 
         showPredictionView = (CheckBox) view.findViewById(R.id.overview_showprediction);
@@ -896,12 +894,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         TempBasal activeTemp = pump.getTempBasal();
         if (pump.isTempBasalInProgress()) {
-            cancelTempLayout.setVisibility(View.VISIBLE);
-            cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + ": " + activeTemp.toString());
+            cancelTempButton.setVisibility(View.VISIBLE);
+            cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + "\n" + activeTemp.toStringShort());
             runningTempView.setVisibility(View.VISIBLE);
             runningTempView.setText(activeTemp.toString());
         } else {
-            cancelTempLayout.setVisibility(View.GONE);
+            cancelTempButton.setVisibility(View.GONE);
             runningTempView.setVisibility(View.GONE);
         }
 
@@ -950,7 +948,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         QuickWizard.QuickWizardEntry quickWizardEntry = getPlugin().quickWizard.getActive();
         if (quickWizardEntry != null && lastBG != null && pump.isInitialized() && !pump.isSuspended()) {
             quickWizardButton.setVisibility(View.VISIBLE);
-            String text = MainApp.sResources.getString(R.string.bolus) + ": " + quickWizardEntry.buttonText() + " " + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
+            String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
             BolusWizard wizard = new BolusWizard();
             wizard.doCalc(profile.getDefaultProfile(), quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(profile.getUnits()), 0d, true, true, false, false);
             text += " " + DecimalFormatter.to2Decimal(wizard.calculatedTotalInsulin) + "U";
diff --git a/app/src/main/res/drawable/bread.png b/app/src/main/res/drawable/bread.png
deleted file mode 100644
index aa18f4f1d9..0000000000
Binary files a/app/src/main/res/drawable/bread.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_bolus.png b/app/src/main/res/drawable/icon_bolus.png
new file mode 100644
index 0000000000..e0d0204a22
Binary files /dev/null and b/app/src/main/res/drawable/icon_bolus.png differ
diff --git a/app/src/main/res/drawable/icon_calculator.png b/app/src/main/res/drawable/icon_calculator.png
new file mode 100644
index 0000000000..b327e69327
Binary files /dev/null and b/app/src/main/res/drawable/icon_calculator.png differ
diff --git a/app/src/main/res/drawable/icon_calibration.png b/app/src/main/res/drawable/icon_calibration.png
new file mode 100644
index 0000000000..8a6db6f8d1
Binary files /dev/null and b/app/src/main/res/drawable/icon_calibration.png differ
diff --git a/app/src/main/res/drawable/icon_cancelbasal.png b/app/src/main/res/drawable/icon_cancelbasal.png
new file mode 100644
index 0000000000..55a39b40e5
Binary files /dev/null and b/app/src/main/res/drawable/icon_cancelbasal.png differ
diff --git a/app/src/main/res/drawable/icon_quickwizard.png b/app/src/main/res/drawable/icon_quickwizard.png
new file mode 100644
index 0000000000..0487ee2ac1
Binary files /dev/null and b/app/src/main/res/drawable/icon_quickwizard.png differ
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 45c57e0107..7fc4661be5 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -37,7 +37,7 @@
             android:layout_marginTop="3dp"
             android:layout_weight="0.5"
             android:text="@string/careportal_temporarytarget"
-            android:textColor="@color/colorWizardButton" />
+            android:textColor="@color/colorCalculatorButton" />
 
         <Button
             android:id="@+id/actions_settempbasal"
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 03e768c382..2f56efeda4 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -314,8 +314,8 @@
             android:id="@+id/overview_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_alignParentBottom="true">
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/overview_accepttemplayout"
@@ -329,35 +329,12 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
                     android:layout_marginTop="3dp"
                     android:layout_weight="0.5"
                     android:text="Accept new temp\n0.25U/h"
                     android:textColor="@color/colorAcceptTempButton" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/overview_canceltemplayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/overview_canceltempbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
-                    android:layout_weight="0.5"
-                    android:text="Cancel temp basal"
-                    android:textColor="@color/colorCancelTempButton" />
-
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -366,63 +343,74 @@
                 <Button
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    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_bolus_label"
-                    android:textColor="@color/colorTreatmentButton" />
+                    android:textColor="@color/colorTreatmentButton"
+                    android:textSize="10sp" />
 
                 <Button
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="0dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    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/colorWizardButton" />
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp" />
 
                 <Button
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="0dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    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" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                    android:textColor="@color/colorCalibrationButton"
+                    android:textSize="10sp" />
 
                 <Button
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableLeft="@drawable/bread"
+                    android:drawableTop="@drawable/icon_quickwizard"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="Quick wizard"
-                    android:textColor="@color/colorCancelTempButton" />
+                    android:textColor="@color/colorQuickWizardButton"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/overview_canceltempbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_cancelbasal"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="Cancel temp basal"
+                    android:textColor="@color/colorCancelTempButton"
+                    android:textSize="10sp" />
 
             </LinearLayout>
+
         </LinearLayout>
     </RelativeLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index dbcf6bca9d..37e42d1e6b 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -24,10 +24,10 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                card_view:srcCompat="@drawable/bread"
-                android:scaleType="fitStart"
+                android:adjustViewBounds="false"
                 android:cropToPadding="false"
-                android:adjustViewBounds="false" />
+                android:scaleType="fitStart"
+                card_view:srcCompat="@drawable/icon_quickwizard" />
 
             <LinearLayout
                 android:orientation="vertical"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 553d7b1593..c6edf50845 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -26,14 +26,15 @@
     <color name="linearBlockBackground">#3e3d3d</color>
 
     <color name="colorAcceptTempButton">#f4d700</color>
-    <color name="colorTreatmentButton">#FFB347</color>
-    <color name="colorWizardButton">#77dd77</color>
-    <color name="colorCancelTempButton">#47c8ff</color>
+    <color name="colorTreatmentButton">#67dfe8</color>
+    <color name="colorCalibrationButton">#e93057</color>
+    <color name="colorCalculatorButton">#67e86a</color>
+    <color name="colorQuickWizardButton">#ffae01</color>
+    <color name="colorCancelTempButton">#d08cff</color>
     <color name="colorSetTempButton">#FF478EFF</color>
     <color name="colorSetExtendedButton">#FFDD7792</color>
     <color name="colorProfileSwitchButton">#ca77dd</color>
     <color name="colorTempTargetButton">#d43429</color>
-    <color name="colorCalibrationButton">#ceb812</color>
 
     <color name="colorInProgress">#c45026</color>
     <color name="colorAffectingIOB">#830400</color>