diff --git a/app/src/main/res/layout/loop_fragment.xml b/app/src/main/res/layout/loop_fragment.xml
index 6d2215cbe8..7ad9e46c72 100644
--- a/app/src/main/res/layout/loop_fragment.xml
+++ b/app/src/main/res/layout/loop_fragment.xml
@@ -16,6 +16,7 @@
     
             <Button
                 android:id="@+id/loop_run"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/openapsma_run" />
diff --git a/app/src/main/res/layout/lowsuspend_fragment.xml b/app/src/main/res/layout/lowsuspend_fragment.xml
index 4c8085b74d..46589c487f 100644
--- a/app/src/main/res/layout/lowsuspend_fragment.xml
+++ b/app/src/main/res/layout/lowsuspend_fragment.xml
@@ -15,6 +15,7 @@
 
             <Button
                 android:id="@+id/lowsuspend_run"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/openapsma_run" />
diff --git a/app/src/main/res/layout/objectives_item.xml b/app/src/main/res/layout/objectives_item.xml
index 948ebb37f0..e3344126e4 100644
--- a/app/src/main/res/layout/objectives_item.xml
+++ b/app/src/main/res/layout/objectives_item.xml
@@ -99,6 +99,7 @@
 
             <Button
                 android:id="@+id/objectives_start"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/objectives_button_start" />
@@ -131,6 +132,7 @@
 
             <Button
                 android:id="@+id/objectives_verify"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/objectives_button_verify" />
diff --git a/app/src/main/res/layout/openapsma_fragment.xml b/app/src/main/res/layout/openapsma_fragment.xml
index d5bca73dda..58797d9889 100644
--- a/app/src/main/res/layout/openapsma_fragment.xml
+++ b/app/src/main/res/layout/openapsma_fragment.xml
@@ -21,6 +21,7 @@
 
                 <Button
                     android:id="@+id/openapsma_run"
+                    style="?android:attr/borderlessButtonStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/openapsma_run" />
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 3f53f61c61..f59e8f7d61 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -74,11 +74,12 @@
 
             <Button
                 android:id="@+id/overview_canceltemp"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="0.5"
-                android:background="@color/colorCancelTempButton"
+                android:textColor="@color/colorCancelTempButton"
                 android:text="Cancel temp basal" />
 
         </LinearLayout>
@@ -91,20 +92,22 @@
 
             <Button
                 android:id="@+id/overview_settempbasal"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="0.5"
-                android:background="@color/colorSetTempButton"
+                android:textColor="@color/colorSetTempButton"
                 android:text="TempBasal" />
 
             <Button
                 android:id="@+id/overview_extendedbolus"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="0.5"
-                android:background="@color/colorSetExtendedButton"
+                android:textColor="@color/colorSetExtendedButton"
                 android:text="Extended Bolus" />
         </LinearLayout>
 
@@ -115,20 +118,22 @@
 
             <Button
                 android:id="@+id/overview_treatment"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="0.5"
-                android:background="@color/colorTreatmentButton"
+                android:textColor="@color/colorTreatmentButton"
                 android:text="@string/overview_treatment_label" />
 
             <Button
                 android:id="@+id/overview_wizard"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:layout_weight="0.5"
-                android:background="@color/colorWizardButton"
+                android:textColor="@color/colorWizardButton"
                 android:text="@string/overview_calculator_label" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_newextendedbolus_fragment.xml b/app/src/main/res/layout/overview_newextendedbolus_fragment.xml
index 6d28a7223d..ef647dc948 100644
--- a/app/src/main/res/layout/overview_newextendedbolus_fragment.xml
+++ b/app/src/main/res/layout/overview_newextendedbolus_fragment.xml
@@ -69,6 +69,7 @@
 
     <Button
         android:id="@+id/overview_newextendedbolus_okbutton"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp"
diff --git a/app/src/main/res/layout/overview_newtempbasal_fragment.xml b/app/src/main/res/layout/overview_newtempbasal_fragment.xml
index a0e4d8af57..d686a49c3a 100644
--- a/app/src/main/res/layout/overview_newtempbasal_fragment.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_fragment.xml
@@ -98,6 +98,7 @@
 
     <Button
         android:id="@+id/overview_newtempbasal_okbutton"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp"
diff --git a/app/src/main/res/layout/overview_newtreatment_fragment.xml b/app/src/main/res/layout/overview_newtreatment_fragment.xml
index be646578dd..b51f139df4 100644
--- a/app/src/main/res/layout/overview_newtreatment_fragment.xml
+++ b/app/src/main/res/layout/overview_newtreatment_fragment.xml
@@ -56,6 +56,7 @@
 
     <Button
         android:id="@+id/treatments_newtreatment_deliverbutton"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="OK"
diff --git a/app/src/main/res/layout/overview_wizard_fragment.xml b/app/src/main/res/layout/overview_wizard_fragment.xml
index 85bc920beb..255d1aaf8e 100644
--- a/app/src/main/res/layout/overview_wizard_fragment.xml
+++ b/app/src/main/res/layout/overview_wizard_fragment.xml
@@ -317,6 +317,7 @@
 
     <Button
         android:id="@+id/treatments_wizard_deliverButton"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="SEND TO PUMP"
diff --git a/app/src/main/res/layout/treatments_fragment.xml b/app/src/main/res/layout/treatments_fragment.xml
index 1085adbc36..b3c6971ee3 100644
--- a/app/src/main/res/layout/treatments_fragment.xml
+++ b/app/src/main/res/layout/treatments_fragment.xml
@@ -52,6 +52,7 @@
             android:layout_height="wrap_content"
             android:text="Refresh treatments from Nightscout"
             android:id="@+id/treatments_reshreshfromnightscout"
+            style="?android:attr/borderlessButtonStyle"
             android:layout_gravity="center_horizontal" />
 
         <android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a6b8725213..4d2ddf901c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="AppTheme.base">
+    <style name="AppTheme" parent="android:Theme.Material">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>