diff --git a/app/src/main/res/layout/loop_fragment.xml b/app/src/main/res/layout/loop_fragment.xml
index 7ad9e46c72..7ffe12e7f8 100644
--- a/app/src/main/res/layout/loop_fragment.xml
+++ b/app/src/main/res/layout/loop_fragment.xml
@@ -16,7 +16,7 @@
     
             <Button
                 android:id="@+id/loop_run"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 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 46589c487f..6c881a4e4f 100644
--- a/app/src/main/res/layout/lowsuspend_fragment.xml
+++ b/app/src/main/res/layout/lowsuspend_fragment.xml
@@ -15,7 +15,7 @@
 
             <Button
                 android:id="@+id/lowsuspend_run"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 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 e3344126e4..5062258da5 100644
--- a/app/src/main/res/layout/objectives_item.xml
+++ b/app/src/main/res/layout/objectives_item.xml
@@ -99,7 +99,7 @@
 
             <Button
                 android:id="@+id/objectives_start"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/objectives_button_start" />
@@ -132,7 +132,7 @@
 
             <Button
                 android:id="@+id/objectives_verify"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 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 58797d9889..0febab74cb 100644
--- a/app/src/main/res/layout/openapsma_fragment.xml
+++ b/app/src/main/res/layout/openapsma_fragment.xml
@@ -21,7 +21,7 @@
 
                 <Button
                     android:id="@+id/openapsma_run"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="?android:attr/buttonStyle"
                     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 f59e8f7d61..eacda11f70 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -74,7 +74,7 @@
 
             <Button
                 android:id="@+id/overview_canceltemp"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
@@ -92,7 +92,7 @@
 
             <Button
                 android:id="@+id/overview_settempbasal"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
@@ -102,7 +102,7 @@
 
             <Button
                 android:id="@+id/overview_extendedbolus"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
@@ -118,7 +118,7 @@
 
             <Button
                 android:id="@+id/overview_treatment"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
@@ -128,7 +128,7 @@
 
             <Button
                 android:id="@+id/overview_wizard"
-                style="?android:attr/borderlessButtonStyle"
+                style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
diff --git a/app/src/main/res/layout/overview_newextendedbolus_fragment.xml b/app/src/main/res/layout/overview_newextendedbolus_fragment.xml
index ef647dc948..61c9020b0e 100644
--- a/app/src/main/res/layout/overview_newextendedbolus_fragment.xml
+++ b/app/src/main/res/layout/overview_newextendedbolus_fragment.xml
@@ -69,7 +69,7 @@
 
     <Button
         android:id="@+id/overview_newextendedbolus_okbutton"
-        style="?android:attr/borderlessButtonStyle"
+        style="?android:attr/buttonStyle"
         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 d686a49c3a..e1dcd9d122 100644
--- a/app/src/main/res/layout/overview_newtempbasal_fragment.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_fragment.xml
@@ -98,7 +98,7 @@
 
     <Button
         android:id="@+id/overview_newtempbasal_okbutton"
-        style="?android:attr/borderlessButtonStyle"
+        style="?android:attr/buttonStyle"
         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 b51f139df4..f90b059713 100644
--- a/app/src/main/res/layout/overview_newtreatment_fragment.xml
+++ b/app/src/main/res/layout/overview_newtreatment_fragment.xml
@@ -56,7 +56,7 @@
 
     <Button
         android:id="@+id/treatments_newtreatment_deliverbutton"
-        style="?android:attr/borderlessButtonStyle"
+        style="?android:attr/buttonStyle"
         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 255d1aaf8e..efea953295 100644
--- a/app/src/main/res/layout/overview_wizard_fragment.xml
+++ b/app/src/main/res/layout/overview_wizard_fragment.xml
@@ -317,7 +317,7 @@
 
     <Button
         android:id="@+id/treatments_wizard_deliverButton"
-        style="?android:attr/borderlessButtonStyle"
+        style="?android:attr/buttonStyle"
         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 b3c6971ee3..547259110b 100644
--- a/app/src/main/res/layout/treatments_fragment.xml
+++ b/app/src/main/res/layout/treatments_fragment.xml
@@ -52,7 +52,7 @@
             android:layout_height="wrap_content"
             android:text="Refresh treatments from Nightscout"
             android:id="@+id/treatments_reshreshfromnightscout"
-            style="?android:attr/borderlessButtonStyle"
+            style="?android:attr/buttonStyle"
             android:layout_gravity="center_horizontal" />
 
         <android.support.v7.widget.RecyclerView