diff --git a/app/res/drawable/button_green_background.xml b/app/res/drawable/button_green_background.xml
index 7c1d045bc2..bdf260cce5 100644
--- a/app/res/drawable/button_green_background.xml
+++ b/app/res/drawable/button_green_background.xml
@@ -5,4 +5,5 @@
     <item android:drawable="@color/green_900" android:state_pressed="true" />
     <item android:drawable="@color/green_500" />
 
+
 </selector>
\ No newline at end of file
diff --git a/app/res/drawable/rounded_button.xml b/app/res/drawable/rounded_button.xml
new file mode 100644
index 0000000000..b8647d59d6
--- /dev/null
+++ b/app/res/drawable/rounded_button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled State -->
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="22dp" />
+            <solid android:color="#A5B8D8" /> <!-- Light blue for disabled -->
+        </shape>
+    </item>
+    <!-- Default State -->
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="22dp" />
+            <solid android:color="#004EBC" /> <!-- Blue background -->
+        </shape>
+    </item>
+</selector>
diff --git a/app/res/layout-land/activity_crash_warning.xml b/app/res/layout-land/activity_crash_warning.xml
index 92bde2be99..a609c98889 100644
--- a/app/res/layout-land/activity_crash_warning.xml
+++ b/app/res/layout-land/activity_crash_warning.xml
@@ -93,12 +93,11 @@
         </LinearLayout>
     </ScrollView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/RestartCommCare"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/content_min_margin"
-        android:background="@color/cc_brand_color"
-        android:textColor="@color/cc_neutral_bg"/>
+        android:layout_margin="@dimen/content_min_margin"/>
 </RelativeLayout>
diff --git a/app/res/layout/activity_crash_warning.xml b/app/res/layout/activity_crash_warning.xml
index c6cc992e65..10c229f44c 100644
--- a/app/res/layout/activity_crash_warning.xml
+++ b/app/res/layout/activity_crash_warning.xml
@@ -108,12 +108,11 @@
         </LinearLayout>
     </LinearLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/RestartCommCare"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/content_min_margin"
-        android:background="@color/cc_brand_color"
-        android:textColor="@color/cc_neutral_bg"/>
+        android:layout_margin="@dimen/content_min_margin"/>
 </RelativeLayout>
diff --git a/app/res/layout/activity_drawing_boundary.xml b/app/res/layout/activity_drawing_boundary.xml
index 89f742fdee..5c3c235b3b 100644
--- a/app/res/layout/activity_drawing_boundary.xml
+++ b/app/res/layout/activity_drawing_boundary.xml
@@ -44,32 +44,36 @@
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
-        <Button
-            style="@style/MapButtonGreen"
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
+            android:backgroundTint="@color/green_500"
             android:id="@+id/start_tracking_button"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:visibility="gone"
             android:layout_width="0dp" />
 
-        <Button
-            style="@style/MapButtonRed"
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/stop_tracking_button"
+            android:backgroundTint="@color/red_500"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:visibility="gone" />
 
-        <Button
-            style="@style/MapButtonOrange"
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
+            android:backgroundTint="@color/orange_500"
             android:id="@+id/redo_tracking_button"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:visibility="gone" />
 
-        <Button
-            style="@style/MapButtonGreen"
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
+            android:backgroundTint="@color/green_500"
             android:id="@+id/ok_tracking_button"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/app/res/layout/activity_mapbox_location_picker.xml b/app/res/layout/activity_mapbox_location_picker.xml
index 62f4d970d6..8908726002 100644
--- a/app/res/layout/activity_mapbox_location_picker.xml
+++ b/app/res/layout/activity_mapbox_location_picker.xml
@@ -56,21 +56,21 @@
             android:maxLines="3"
             android:minLines="3" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/confirm_location_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:enabled="false"
-            style="@style/Commcare.Button.Primary"
             android:text="@string/confirm_location" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/cancel_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            style="@style/Commcare.Button.Primary"
             android:text="@string/cancel" />
 
     </LinearLayout>
diff --git a/app/res/layout/activity_report_problem.xml b/app/res/layout/activity_report_problem.xml
index a9b473fd4e..36879a55ec 100644
--- a/app/res/layout/activity_report_problem.xml
+++ b/app/res/layout/activity_report_problem.xml
@@ -8,6 +8,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
+        android:layout_margin="16dp"
         android:layout_height="wrap_content">
 
         <ImageView
@@ -46,7 +47,8 @@
             android:lines="5"
             android:textColor="@color/black"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/ReportButton01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/activity_target_mismatch_error.xml b/app/res/layout/activity_target_mismatch_error.xml
index 92e6e71e06..c07529487a 100644
--- a/app/res/layout/activity_target_mismatch_error.xml
+++ b/app/res/layout/activity_target_mismatch_error.xml
@@ -38,8 +38,10 @@
             tools:text="In order to install CommCare LTS, Please click on install button below. Then try installing your app again."/>
     </LinearLayout>
 
-    <Button
-        style="@style/PromptedUpdateButtonUpdateLater"
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_spacer_large"
         android:layout_below="@+id/error_info_container"
         android:id="@+id/install_app_button"
diff --git a/app/res/layout/app_manager.xml b/app/res/layout/app_manager.xml
index 1b0afd6861..05f250c334 100644
--- a/app/res/layout/app_manager.xml
+++ b/app/res/layout/app_manager.xml
@@ -36,7 +36,8 @@
         android:layout_centerHorizontal="true"
         android:gravity="center"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/install_app_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/blank_missing_multimedia_layout.xml b/app/res/layout/blank_missing_multimedia_layout.xml
index dc44bfd6f1..d18acdb6c6 100644
--- a/app/res/layout/blank_missing_multimedia_layout.xml
+++ b/app/res/layout/blank_missing_multimedia_layout.xml
@@ -22,7 +22,8 @@
         android:paddingStart="20px">
     </ImageView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -31,7 +32,8 @@
         android:layout_above="@+id/screen_multimedia_retry"
         android:visibility="gone" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/blue_outlined_button.xml b/app/res/layout/blue_outlined_button.xml
index 31afd53836..b00f0fa415 100644
--- a/app/res/layout/blue_outlined_button.xml
+++ b/app/res/layout/blue_outlined_button.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/CustomButtonStyleOutline"
+    app:strokeColor="@color/primary_button_background"
     android:id="@+id/blue_outlined_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="right"
     android:textColor="@color/blue"
     android:visibility="gone"
-    style="@style/CommCare.Button.Default"
-    android:background="@drawable/blue_outlined_view"
     android:padding="10dp"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/app/res/layout/choice_dialog_three_panel.xml b/app/res/layout/choice_dialog_three_panel.xml
index a5e7ba852d..38e32b2d86 100644
--- a/app/res/layout/choice_dialog_three_panel.xml
+++ b/app/res/layout/choice_dialog_three_panel.xml
@@ -24,7 +24,8 @@
         android:layout_marginEnd="@dimen/standard_spacer_large"
         android:layout_marginStart="@dimen/standard_spacer_large">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/choice_dialog_panel_1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -35,7 +36,8 @@
             android:paddingTop="15dp"
             android:layout_marginEnd="@dimen/standard_spacer" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/choice_dialog_panel_2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -48,7 +50,8 @@
             android:layout_marginStart="@dimen/standard_spacer"
             android:layout_marginEnd="@dimen/standard_spacer" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/choice_dialog_panel_3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/choice_dialog_view.xml b/app/res/layout/choice_dialog_view.xml
index d4020842d5..3616816ae5 100644
--- a/app/res/layout/choice_dialog_view.xml
+++ b/app/res/layout/choice_dialog_view.xml
@@ -25,19 +25,19 @@
         android:layout_marginEnd="@dimen/standard_spacer_large">
     </ListView>
 
-    <Button xmlns:android="http://schemas.android.com/apk/res/android"
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyleOutline"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        app:strokeColor="@color/primary_button_background"
             android:id="@+id/optional_button"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/min_button_height"
             android:padding="@dimen/standard_spacer"
             android:layout_gravity="end"
             android:layout_marginRight="@dimen/standard_spacer"
-            android:background="@android:color/transparent"
             android:textSize="@dimen/font_size_dp_medium"
-            android:textColor="@color/dialog_button_color"
             android:visibility="gone"
-        android:layout_marginEnd="@dimen/standard_spacer">
-    </Button>
+        android:layout_marginEnd="@dimen/standard_spacer"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/res/layout/component_entity_detail_item.xml b/app/res/layout/component_entity_detail_item.xml
index 9d83e2da4b..325fff9f48 100644
--- a/app/res/layout/component_entity_detail_item.xml
+++ b/app/res/layout/component_entity_detail_item.xml
@@ -41,7 +41,8 @@
             android:visibility="visible"
             android:layout_marginEnd="8dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/detail_value_phone"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -105,7 +106,8 @@
                 android:drawablePadding="@dimen/content_min_margin"
                 android:text="Callout"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/callout_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -146,7 +148,8 @@
             android:paddingStart="11dp"
             android:paddingEnd="4dp">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/detail_address_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/app/res/layout/connection_diagnostic.xml b/app/res/layout/connection_diagnostic.xml
index 61e4b88bf9..b35c2ddf4b 100644
--- a/app/res/layout/connection_diagnostic.xml
+++ b/app/res/layout/connection_diagnostic.xml
@@ -39,10 +39,11 @@
             android:paddingStart="5dp"
             android:paddingEnd="5dp">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/run_connection_test"
-                style="@style/ButtonBottom"
                 android:layout_width="match_parent"
+                android:layout_margin="10dp"
                 android:layout_height="wrap_content"
                 android:text="Run Connection Test"/>
 
@@ -58,17 +59,17 @@
             android:text="Output message."
             android:visibility="invisible"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/settings_button"
-            style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Go to Settings"
             android:visibility="invisible"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/report_button"
-            style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Report to CommCare"
diff --git a/app/res/layout/custom_alert_dialog.xml b/app/res/layout/custom_alert_dialog.xml
index e24d9d96c5..102bb9635c 100755
--- a/app/res/layout/custom_alert_dialog.xml
+++ b/app/res/layout/custom_alert_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -71,50 +71,48 @@
             android:layout_weight="2"
             android:layout_marginBottom="@dimen/standard_spacer">
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/positive_button"
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyleOutline"
+                app:strokeColor="@color/primary_button_background"
+                android:id="@+id/positive_button"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/min_button_height"
                     android:padding="@dimen/standard_spacer"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="@dimen/standard_spacer"
-                    android:background="@android:color/transparent"
                     android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
                     android:visibility="gone"
                 android:layout_alignParentEnd="true"
-                android:layout_marginEnd="@dimen/standard_spacer">
-            </Button>
+                android:layout_marginEnd="@dimen/standard_spacer"/>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/neutral_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_toLeftOf="@id/positive_button"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
-                android:layout_toStartOf="@id/positive_button">
-            </Button>
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyleOutline"
+                app:strokeColor="@color/primary_button_background"
+                android:id="@+id/neutral_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                android:layout_toLeftOf="@id/positive_button"
+                android:textSize="@dimen/font_size_dp_medium"
+                android:text="@string/access_error"
+                android:visibility="gone"
+                android:layout_toStartOf="@id/positive_button"/>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/negative_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_toLeftOf="@id/neutral_button"
-                    android:layout_marginRight="@dimen/standard_spacer"
-                    android:layout_marginLeft="@dimen/standard_spacer"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyleOutline"
+                android:id="@+id/negative_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                app:strokeColor="@color/primary_button_background"
+                android:layout_toLeftOf="@id/neutral_button"
+                android:layout_marginRight="@dimen/standard_spacer"
+                android:layout_marginLeft="@dimen/standard_spacer"
+                android:textSize="@dimen/font_size_dp_medium"
+                android:visibility="gone"
                 android:layout_marginStart="@dimen/standard_spacer"
                 android:layout_marginEnd="@dimen/standard_spacer"
-                android:layout_toStartOf="@id/neutral_button">
-            </Button>
+                android:layout_toStartOf="@id/neutral_button"/>
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/dots_detail.xml b/app/res/layout/dots_detail.xml
index f29952483e..5e4ba46ad4 100644
--- a/app/res/layout/dots_detail.xml
+++ b/app/res/layout/dots_detail.xml
@@ -40,18 +40,20 @@
         android:id="@+id/dotsbuttonframe"
         android:weightSum="1">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:text="Save Details"
             android:id="@+id/btn_dots_detail_ok"
-            android:layout_weight="0.5"></Button>
+            android:layout_weight="0.5"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/btn_dots_detail_cancel"
             android:text="Cancel"
-            android:layout_weight="0.5"></Button>
+            android:layout_weight="0.5"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/res/layout/dotsdoses.xml b/app/res/layout/dotsdoses.xml
index c11b044085..d71a563174 100644
--- a/app/res/layout/dotsdoses.xml
+++ b/app/res/layout/dotsdoses.xml
@@ -61,10 +61,11 @@
             android:id="@+id/dots_dose_four"></TableRow>
     </TableLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:id="@+id/btn_dots_doses_done"
         android:text="Done"
-        android:layout_alignParentBottom="true"></Button>
+        android:layout_alignParentBottom="true"/>
 </RelativeLayout>
diff --git a/app/res/layout/draw_layout.xml b/app/res/layout/draw_layout.xml
index 203a239874..a4ff50b4da 100644
--- a/app/res/layout/draw_layout.xml
+++ b/app/res/layout/draw_layout.xml
@@ -19,7 +19,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/btnFinishDraw"
             android:layout_width="wrap_content"
             android:enabled="false"
@@ -31,12 +32,14 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/btnResetDraw"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/btnCancelDraw"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
diff --git a/app/res/layout/entity_detail.xml b/app/res/layout/entity_detail.xml
index 38458c1a22..1f0b406e3d 100644
--- a/app/res/layout/entity_detail.xml
+++ b/app/res/layout/entity_detail.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/entity_detail"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -8,10 +9,17 @@
     android:orientation="vertical"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        app:backgroundTint="@color/cc_attention_positive_bg"
+        android:textColor="@color/cc_attention_positive_text"
         android:id="@+id/entity_select_button"
-        style="@style/ScreenPinnedButton"
+        android:drawableRight="@drawable/icon_chevron_right_attnpos"
+        android:drawableTint="@color/cc_attention_positive_text"
         android:text="Continue"
+        android:textSize="@dimen/text_large"
         android:layout_below="@+id/universal_frame_tile"/>
 
     <FrameLayout
diff --git a/app/res/layout/execute_recovery_measures.xml b/app/res/layout/execute_recovery_measures.xml
index 74ff5fa5c8..532e9218b3 100644
--- a/app/res/layout/execute_recovery_measures.xml
+++ b/app/res/layout/execute_recovery_measures.xml
@@ -53,7 +53,8 @@
             android:visibility="gone"
             tools:text="2 out of 5 done"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/retry_button"
             android:layout_below="@id/status_tv"
             android:layout_centerHorizontal="true"
@@ -63,7 +64,8 @@
             android:text="@string/recovery_measure_retry"
             android:visibility="gone"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/reinstall_button"
             android:layout_below="@id/retry_button"
             android:layout_centerHorizontal="true"
@@ -73,7 +75,8 @@
             android:text="@string/recovery_measure_reinstall"
             android:visibility="gone"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/select_ccz_button"
             android:layout_below="@id/reinstall_button"
             android:layout_centerHorizontal="true"
diff --git a/app/res/layout/fragment_setup_enter_url.xml b/app/res/layout/fragment_setup_enter_url.xml
index 969d497871..135909a721 100644
--- a/app/res/layout/fragment_setup_enter_url.xml
+++ b/app/res/layout/fragment_setup_enter_url.xml
@@ -65,7 +65,8 @@
                     </EditText>
                 </LinearLayout>
 
-                <Button
+                <com.google.android.material.button.MaterialButton
+                    style="@style/CustomButtonStyle"
                     android:id="@+id/start_install"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
diff --git a/app/res/layout/geo_progress.xml b/app/res/layout/geo_progress.xml
index 2fe494c747..7947bcc00a 100644
--- a/app/res/layout/geo_progress.xml
+++ b/app/res/layout/geo_progress.xml
@@ -51,7 +51,8 @@
         android:orientation="horizontal"
         android:layout_weight="1">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/geoOK"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -59,7 +60,8 @@
             android:text="Record Location"
             android:layout_margin="@dimen/standard_spacer"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/geoCancel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/geopoint_layout.xml b/app/res/layout/geopoint_layout.xml
index b763e71d20..fae6b984b2 100644
--- a/app/res/layout/geopoint_layout.xml
+++ b/app/res/layout/geopoint_layout.xml
@@ -33,7 +33,8 @@
             android:paddingBottom="2dip"
             android:paddingTop="2dip">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/show_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
@@ -41,14 +42,16 @@
                 android:text="@string/go_to_location"
                 android:visibility="gone"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/accept_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:text="@string/accept_location" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/cancel_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
diff --git a/app/res/layout/hierarchy_layout.xml b/app/res/layout/hierarchy_layout.xml
index 5b459716b6..392bab1a46 100644
--- a/app/res/layout/hierarchy_layout.xml
+++ b/app/res/layout/hierarchy_layout.xml
@@ -40,40 +40,34 @@ the License.
             android:layout_height="match_parent"
             android:layout_weight="1"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/jumpPreviousButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/jump_to_previous"
             android:padding="12dp"
             android:textSize="@dimen/text_medium"
-            android:textColor="@color/cc_brand_color"
-            android:background="@color/cc_core_bg"
-            style="@style/CommCare.Button.Default"
             android:layout_weight="1"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/jumpBeginningButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/jump_to_beginning"
             android:padding="12dp"
             android:textSize="@dimen/text_medium"
-            android:textColor="@color/cc_brand_color"
-            android:background="@color/cc_core_bg"
-            style="@style/CommCare.Button.Default"
             android:layout_weight="1"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/jumpEndButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/jump_to_end"
             android:padding="12dp"
             android:textSize="@dimen/text_medium"
-            android:textColor="@color/cc_brand_color"
-            android:background="@color/cc_core_bg"
-            style="@style/CommCare.Button.Default"
             android:layout_weight="1"/>
     </LinearLayout>
 
diff --git a/app/res/layout/http_request_layout.xml b/app/res/layout/http_request_layout.xml
index 44cd60fc01..ab782d8a88 100644
--- a/app/res/layout/http_request_layout.xml
+++ b/app/res/layout/http_request_layout.xml
@@ -38,16 +38,15 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/request_button"
-                style="@style/ButtonBottom"
+                android:layout_margin="10dp"
                 android:layout_width="wrap_content"
                 android:layout_gravity="center"
                 android:layout_height="wrap_content"
-                android:background="@color/cc_brand_color"
                 android:paddingBottom="@dimen/content_start"
-                android:paddingTop="@dimen/content_start"
-                android:textColor="@color/cc_neutral_bg"/>
+                android:paddingTop="@dimen/content_start" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/install_permission_requester.xml b/app/res/layout/install_permission_requester.xml
index 138276605d..88345cfb99 100644
--- a/app/res/layout/install_permission_requester.xml
+++ b/app/res/layout/install_permission_requester.xml
@@ -52,16 +52,15 @@
                 android:layout_marginStart="@dimen/content_min_margin"
                 android:layout_marginEnd="@dimen/content_min_margin" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/get_perms_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:background="@color/cc_brand_color"
                 android:nextFocusUp="@+id/edit_password"
                 android:paddingBottom="@dimen/content_start"
-                android:paddingTop="@dimen/content_start"
-                android:textColor="@color/cc_neutral_bg"/>
+                android:paddingTop="@dimen/content_start" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/layout_note_msg.xml b/app/res/layout/layout_note_msg.xml
index 7ba15d9060..d7e2f73b79 100644
--- a/app/res/layout/layout_note_msg.xml
+++ b/app/res/layout/layout_note_msg.xml
@@ -42,7 +42,8 @@
         android:text="What to do about it"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/layout_note_msg_action_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/missing_multimedia_layout.xml b/app/res/layout/missing_multimedia_layout.xml
index dbb39efe03..a9cdc634e8 100644
--- a/app/res/layout/missing_multimedia_layout.xml
+++ b/app/res/layout/missing_multimedia_layout.xml
@@ -21,7 +21,8 @@
         android:layout_marginEnd="20px">
     </ImageView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -30,7 +31,8 @@
         android:layout_above="@+id/screen_multimedia_retry"
         android:visibility="gone"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/multiple_apps_limit_view.xml b/app/res/layout/multiple_apps_limit_view.xml
index fe3d3d9925..6af742738c 100644
--- a/app/res/layout/multiple_apps_limit_view.xml
+++ b/app/res/layout/multiple_apps_limit_view.xml
@@ -14,7 +14,8 @@
         android:layout_centerInParent="true"
         android:gravity="center"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/back_to_manager_button"
diff --git a/app/res/layout/pin_screen_buttons.xml b/app/res/layout/pin_screen_buttons.xml
index 9df7a359fd..1b754d7e4b 100644
--- a/app/res/layout/pin_screen_buttons.xml
+++ b/app/res/layout/pin_screen_buttons.xml
@@ -8,14 +8,16 @@
     android:weightSum="2"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_cancel_button"
         android:textSize="@dimen/font_size_dp_medium"
         android:layout_weight="1"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_confirm_button"
diff --git a/app/res/layout/privilege_claiming_view.xml b/app/res/layout/privilege_claiming_view.xml
index 32c46f041c..c165e62b46 100644
--- a/app/res/layout/privilege_claiming_view.xml
+++ b/app/res/layout/privilege_claiming_view.xml
@@ -50,7 +50,8 @@
         android:layout_marginStart="@dimen/standard_spacer_double"
         android:layout_marginEnd="@dimen/standard_spacer_double" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/claim_button"
diff --git a/app/res/layout/progress_dialog_cancel_button.xml b/app/res/layout/progress_dialog_cancel_button.xml
index 4284e7a09c..12d5e38085 100644
--- a/app/res/layout/progress_dialog_cancel_button.xml
+++ b/app/res/layout/progress_dialog_cancel_button.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton
+    style="@style/CustomButtonStyle"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/min_button_height"
@@ -9,9 +11,7 @@
     android:layout_marginEnd="@dimen/standard_spacer_large"
     android:layout_marginRight="@dimen/standard_spacer_large"
     android:layout_marginBottom="@dimen/standard_spacer"
-    android:background="@android:color/transparent"
     android:padding="@dimen/standard_spacer"
-    style="@style/CommCare.Button.Default"
     android:text="STOP"
     android:textSize="@dimen/font_size_dp_medium"
     android:visibility="gone"
diff --git a/app/res/layout/prompt_view.xml b/app/res/layout/prompt_view.xml
index 614a771256..c209db639d 100644
--- a/app/res/layout/prompt_view.xml
+++ b/app/res/layout/prompt_view.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -36,9 +37,14 @@
                 android:layout_margin="@dimen/standard_spacer_double"
                 android:gravity="center"/>
 
-            <Button
-                android:id="@+id/action_button"
-                style="@style/PromptedUpdateButtonUpdate" />
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
+                android:layout_height="wrap_content"
+                app:backgroundTint="@color/solid_green"
+                android:textSize="@dimen/font_size_xlargest"
+                android:layout_margin="16dp"
+                android:layout_width="wrap_content"
+                android:id="@+id/action_button"/>
 
             <ImageView
                 android:id="@+id/image_cue"
@@ -46,9 +52,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/standard_spacer_double"/>
 
-            <Button
-                android:id="@+id/do_later_button"
-                style="@style/PromptedUpdateButtonUpdateLater"/>
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/font_size_xlarge"
+                android:layout_margin="16dp"
+                android:layout_width="wrap_content"
+                android:paddingHorizontal="24dp"
+                android:id="@+id/do_later_button" />
 
             <TextView
                 android:id="@+id/help_text"
diff --git a/app/res/layout/recording.xml b/app/res/layout/recording.xml
index c79de6c9eb..e49dc2dcc7 100644
--- a/app/res/layout/recording.xml
+++ b/app/res/layout/recording.xml
@@ -9,7 +9,8 @@
     android:layout_marginTop="10dp"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id = "@+id/startrecording"/>
@@ -23,7 +24,8 @@
         android:id = "@+id/recordingprogress"
         android:background="@color/blue"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/stoprecording"/>
diff --git a/app/res/layout/recording_fragment.xml b/app/res/layout/recording_fragment.xml
index b43b1e2fff..b276f1362e 100644
--- a/app/res/layout/recording_fragment.xml
+++ b/app/res/layout/recording_fragment.xml
@@ -68,9 +68,9 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/action_button"
-        style="@style/Commcare.Button.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -82,6 +82,6 @@
         android:layout_marginTop="15dp"
         android:gravity="center"
         tools:text="Finish"
-        android:visibility="invisible" />
+        android:visibility="visible" />
 
 </LinearLayout>
diff --git a/app/res/layout/screen_form_dump.xml b/app/res/layout/screen_form_dump.xml
index 426e8deac2..3b4d35b4f5 100644
--- a/app/res/layout/screen_form_dump.xml
+++ b/app/res/layout/screen_form_dump.xml
@@ -43,20 +43,21 @@
                 android:layout_centerHorizontal="true"
                 android:layout_margin="10dp"
                 android:gravity="center"
-                android:layout_below="@+id/screen_multimedia_inflater_filefetch"
                 android:text="From here you can dump your forms to an SD card or submit the forms on your SD card"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/screen_bulk_form_dump"
-                style="@style/ButtonBottom"
                 android:layout_width="match_parent"
+                android:layout_margin="10dp"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_prompt"
                 android:text="Dump Forms"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
+                style="@style/CustomButtonStyle"
                 android:id="@+id/screen_bulk_form_submit"
-                style="@style/ButtonBottom"
+                android:layout_margin="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_dump"
diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml
index 654f1bcff1..ffb75f67d3 100644
--- a/app/res/layout/screen_form_entry.xml
+++ b/app/res/layout/screen_form_entry.xml
@@ -237,11 +237,17 @@
         android:layout_height="wrap_content"
         android:id="@+id/multiple_intent_dispatch_pane"
         android:layout_above="@+id/screen_form_entry_bottom_anchor">
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/multiple_intent_dispatch_button"
             android:text="Batch Dispatch"
+            android:drawableRight="@drawable/icon_chevron_right_brand"
             android:visibility="gone"
-            style="@style/ScreenPinnedButtonNeutral"/>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/cc_light_cool_accent_bg"
+            android:textColor="@color/cc_light_cool_accent_text"
+           />
     </FrameLayout>
 
     <View
diff --git a/app/res/layout/screen_login.xml b/app/res/layout/screen_login.xml
index 2f2c7791f1..d02f58568f 100644
--- a/app/res/layout/screen_login.xml
+++ b/app/res/layout/screen_login.xml
@@ -166,14 +166,14 @@
                                 android:textSize="@dimen/font_size_medium"
                                 android:visibility="gone" />
 
-                            <Button
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/CustomButtonStyle"
                                 android:id="@+id/login_button"
                                 android:layout_width="fill_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="bottom"
                                 android:nextFocusUp="@+id/edit_password"
-                                android:paddingBottom="@dimen/content_start"
-                                android:paddingTop="@dimen/content_start" />
+                               />
 
                             <LinearLayout
                                 android:id="@+id/screen_login_error_view"
@@ -203,7 +203,6 @@
                                         android:id="@+id/btn_view_notifications"
                                         android:layout_width="match_parent"
                                         android:layout_height="@dimen/rectangle_button_height"
-
                                         RectangleButtonWithText:backgroundColor="@color/cc_attention_negative_bg"
                                         RectangleButtonWithText:img="@drawable/ic_list_error"
                                         RectangleButtonWithText:textColor="@color/cc_attention_negative_text" />
diff --git a/app/res/layout/screen_multimedia_inflater.xml b/app/res/layout/screen_multimedia_inflater.xml
index c5afe131c7..92e17019cd 100644
--- a/app/res/layout/screen_multimedia_inflater.xml
+++ b/app/res/layout/screen_multimedia_inflater.xml
@@ -53,14 +53,14 @@
         android:layout_below="@id/screen_multimedia_inflater_frame_location"
         android:layout_centerHorizontal="true"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/screen_multimedia_inflater_install"
-        style="@style/ButtonBottom"
         android:layout_width="match_parent"
+        android:layout_margin="10dp"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_gravity="bottom"
-        android:paddingBottom="@dimen/content_start"
-        android:paddingTop="@dimen/content_start" />
+        android:paddingVertical="8dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/layout/screen_permission_request.xml b/app/res/layout/screen_permission_request.xml
index 6cc1f74851..0b94d6185f 100644
--- a/app/res/layout/screen_permission_request.xml
+++ b/app/res/layout/screen_permission_request.xml
@@ -33,13 +33,15 @@
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/screen_permission_request_button_grant"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="Grant Access"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:id="@+id/screen_permission_request_button_deny"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/screen_recovery.xml b/app/res/layout/screen_recovery.xml
index 62903b8099..8b8d8b3aad 100644
--- a/app/res/layout/screen_recovery.xml
+++ b/app/res/layout/screen_recovery.xml
@@ -38,7 +38,8 @@
         android:visibility="gone"
         tools:text="Waiting"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/retry_button"
         android:layout_below="@id/recovery_status"
         android:layout_centerHorizontal="true"
@@ -48,7 +49,8 @@
         android:text="@string/recovery_retry"
         android:visibility="gone"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/app_manager_button"
         android:layout_below="@id/retry_button"
         android:layout_centerHorizontal="true"
diff --git a/app/res/layout/scrolling_calendar_widget.xml b/app/res/layout/scrolling_calendar_widget.xml
index 4572612807..cf01006cfb 100644
--- a/app/res/layout/scrolling_calendar_widget.xml
+++ b/app/res/layout/scrolling_calendar_widget.xml
@@ -134,12 +134,11 @@
             android:layout_centerVertical="true"
             android:layout_alignParentStart="true" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            style="@style/CustomButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/lightest_grey"
             android:text="Today"
-            android:textStyle="bold"
             android:id="@+id/today"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/standard_spacer"
diff --git a/app/res/layout/single_app_view.xml b/app/res/layout/single_app_view.xml
index e0d38e1613..fe60604d85 100644
--- a/app/res/layout/single_app_view.xml
+++ b/app/res/layout/single_app_view.xml
@@ -36,7 +36,8 @@
         style="@style/TextAppearance.AppCompat.Body2"
         android:visibility="visible"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/uninstall_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -44,7 +45,8 @@
         android:onClick="rebootAlertDialog"
         android:text="@string/uninstall_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/archive_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -52,7 +54,8 @@
         android:onClick="toggleArchiveClicked"
         android:text="@string/archive_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:id="@+id/update_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -60,7 +63,8 @@
         android:onClick="updateClicked"
         android:text="@string/update_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:clickable="true"
         android:id="@+id/verify_button"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/single_dialog_choice_view.xml b/app/res/layout/single_dialog_choice_view.xml
index 0c9564f332..827a7f6c06 100644
--- a/app/res/layout/single_dialog_choice_view.xml
+++ b/app/res/layout/single_dialog_choice_view.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton
+    style="@style/CustomButtonStyle"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/choice_dialog_panel"
-    style="@style/CommCare.Button.Default"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/standard_spacer"
-    android:background="@drawable/selector_button_press"
     android:drawablePadding="5dp"
     android:padding="12dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
diff --git a/app/res/layout/user_get_available_apps.xml b/app/res/layout/user_get_available_apps.xml
index 47ca892f31..381084c9b0 100644
--- a/app/res/layout/user_get_available_apps.xml
+++ b/app/res/layout/user_get_available_apps.xml
@@ -134,12 +134,13 @@
                     android:layout_marginStart="@dimen/standard_spacer_large"
                     android:layout_marginEnd="@dimen/standard_spacer_large" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
+                    style="@style/CustomButtonStyle"
                     android:id="@+id/get_apps_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/see_available_apps"
-                    android:paddingHorizontal="@dimen/standard_spacer_double"
+                    android:paddingHorizontal="@dimen/standard_spacer_large"
                     android:layout_marginTop="@dimen/standard_spacer_double" />
 
                 <TextView
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 5f9214660f..0c287373b1 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -146,4 +146,9 @@
     <!-- Button colors -->
     <color name="button_primary">#005ab2</color>
     <color name="button_disabled">#d0e3ff</color>
+
+
+    <color name="button_primary_color"> #3A42C7</color>
+
+
 </resources>
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index b0d745bb15..9e3d78f16f 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -305,4 +305,32 @@
         <item name="android:windowBackground">"@color/black"</item>
         <item name="android:navigationBarColor">@color/black</item>
     </style>
+
+        <style name="CustomButtonStyle" parent="Widget.MaterialComponents.Button">
+            <item name="background">@color/button_primary_color</item>
+            <item name="android:textColor">@color/white</item>
+            <item name="android:textSize">16sp</item>
+            <item name="android:gravity">center</item>
+            <item name="android:padding">12dp</item>
+            <item name="height">40dp</item>
+            <item name="cornerRadius">22dp</item>
+            <item name="iconPadding">8dp</item>
+            <item name="android:textAllCaps">false</item>
+            <item name="android:textStyle">bold</item>
+        </style>
+    
+    <style name="CustomButtonStyleOutline" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="shapeAppearanceOverlay">@style/MyShapeAppearance</item>
+    </style>
+    <style name="MyShapeAppearance" parent="">
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerFamilyBottomLeft">rounded</item>
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerFamilyBottomRight">rounded</item>
+        <item name="cornerSize">22dp</item>
+        <item name="strokeColor">@color/button_primary_color</item>
+        <item name="strokeWidth">2dp</item>
+        <item name="textColor">@color/button_primary_color</item>
+    </style>
+
 </resources>
diff --git a/app/src/org/commcare/views/widgets/IntentWidget.java b/app/src/org/commcare/views/widgets/IntentWidget.java
index 67f38d9f22..47ea4d96d9 100644
--- a/app/src/org/commcare/views/widgets/IntentWidget.java
+++ b/app/src/org/commcare/views/widgets/IntentWidget.java
@@ -19,8 +19,11 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.android.javarosa.IntentCallout;
+import org.commcare.dalvik.R;
 import org.commcare.logic.PendingCalloutInterface;
 import org.commcare.utils.CompoundIntentList;
 import org.javarosa.core.model.FormDef;
@@ -93,7 +96,7 @@ protected IntentWidget(Context context, FormEntryPrompt prompt, Intent in, Inten
         } else {
             mStringAnswer = new TextView(getContext());
         }
-        launchIntentButton = new AppCompatButton(getContext());
+        launchIntentButton = new MaterialButton(getContext());
         setupTextView();
         setupButton();
     }
@@ -119,6 +122,9 @@ protected void setupTextView() {
 
     private void setupButton() {
         setOrientation(LinearLayout.VERTICAL);
+        launchIntentButton.setBackgroundResource(R.drawable.rounded_button);
+        launchIntentButton.setTextColor(getResources().getColor(R.color.white));
+        launchIntentButton.setGravity(Gravity.CENTER);
 
         WidgetUtils.setupButton(launchIntentButton,
                 getButtonLabel(),