diff --git a/app/res/font/roboto_bold.ttf b/app/res/font/roboto_bold.ttf
new file mode 100644
index 0000000000..e64db796d1
Binary files /dev/null and b/app/res/font/roboto_bold.ttf differ
diff --git a/app/res/font/roboto_italic.ttf b/app/res/font/roboto_italic.ttf
new file mode 100644
index 0000000000..65498ee374
Binary files /dev/null and b/app/res/font/roboto_italic.ttf differ
diff --git a/app/res/font/roboto_medium.ttf b/app/res/font/roboto_medium.ttf
new file mode 100644
index 0000000000..0707e15c3a
Binary files /dev/null and b/app/res/font/roboto_medium.ttf differ
diff --git a/app/res/font/roboto_regular.ttf b/app/res/font/roboto_regular.ttf
new file mode 100644
index 0000000000..2d116d9205
Binary files /dev/null and b/app/res/font/roboto_regular.ttf differ
diff --git a/app/res/layout-land/activity_crash_warning.xml b/app/res/layout-land/activity_crash_warning.xml
index 92bde2be99..e49735e8ab 100644
--- a/app/res/layout-land/activity_crash_warning.xml
+++ b/app/res/layout-land/activity_crash_warning.xml
@@ -93,12 +93,12 @@
         </LinearLayout>
     </ScrollView>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         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"/>
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 </RelativeLayout>
diff --git a/app/res/layout/activity_crash_warning.xml b/app/res/layout/activity_crash_warning.xml
index 31cf7fda08..e76725fe67 100644
--- a/app/res/layout/activity_crash_warning.xml
+++ b/app/res/layout/activity_crash_warning.xml
@@ -108,12 +108,12 @@
         </LinearLayout>
     </LinearLayout>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         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"/>
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 </RelativeLayout>
diff --git a/app/res/layout/activity_mapbox_location_picker.xml b/app/res/layout/activity_mapbox_location_picker.xml
index 62f4d970d6..0427f58e45 100644
--- a/app/res/layout/activity_mapbox_location_picker.xml
+++ b/app/res/layout/activity_mapbox_location_picker.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:context="org.commcare.gis.MapboxLocationPickerActivity">
 
     <io.ona.kujaku.views.KujakuMapView
@@ -56,22 +57,25 @@
             android:maxLines="3"
             android:minLines="3" />
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             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" />
+            android:text="@string/confirm_location"
+            app:roundButtonBackgroundColor="@color/button_primary"
+            app:roundButtonTextColor="@color/white"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/cancel_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:layout_gravity="bottom"
-            style="@style/Commcare.Button.Primary"
-            android:text="@string/cancel" />
+            android:text="@string/cancel"
+            app:roundButtonBackgroundColor="@color/button_primary"
+            app:roundButtonTextColor="@color/white"/>
 
     </LinearLayout>
 
diff --git a/app/res/layout/activity_report_problem.xml b/app/res/layout/activity_report_problem.xml
index 35648f2e81..0b51b3619a 100644
--- a/app/res/layout/activity_report_problem.xml
+++ b/app/res/layout/activity_report_problem.xml
@@ -46,13 +46,15 @@
             android:lines="5"
             android:textColor="@color/black"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/ReportButton01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/ReportText01"
             android:layout_centerHorizontal="true"
-            android:text="Submit Report"/>
+            android:text="Submit Report"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
     </RelativeLayout>
 </ScrollView>
diff --git a/app/res/layout/activity_target_mismatch_error.xml b/app/res/layout/activity_target_mismatch_error.xml
index 92e6e71e06..3924a6ae13 100644
--- a/app/res/layout/activity_target_mismatch_error.xml
+++ b/app/res/layout/activity_target_mismatch_error.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:gravity="center_horizontal"
-                android:layout_height="match_parent"
-                android:layout_margin="@dimen/standard_spacer"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                tools:viewBindingIgnore="true">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center_horizontal"
+    android:layout_height="match_parent"
+    android:layout_margin="@dimen/standard_spacer"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/error_title"
@@ -38,12 +39,16 @@
             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"
+    <org.commcare.activities.components.RoundedButton
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         android:layout_marginTop="@dimen/standard_spacer_large"
         android:layout_below="@+id/error_info_container"
+        android:padding="8dp"
         android:id="@+id/install_app_button"
         android:layout_centerHorizontal="true"
-        tools:text="Install CommCare LTS"/>
+        tools:text="Install CommCare LTS"
+        app:roundButtonBackgroundColor="@color/cc_brand_color"
+        app:roundButtonTextColor="@color/cc_neutral_bg"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/layout/app_manager.xml b/app/res/layout/app_manager.xml
index a0af3a65b6..ba356f2291 100644
--- a/app/res/layout/app_manager.xml
+++ b/app/res/layout/app_manager.xml
@@ -35,8 +35,7 @@
         android:textColor="@color/darkest_grey"
         android:layout_centerHorizontal="true"
         android:gravity="center"/>
-
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/install_app_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -45,7 +44,11 @@
         android:layout_marginTop="@dimen/standard_spacer"
         android:paddingHorizontal="@dimen/standard_spacer_double"
         android:onClick="installAppClicked"
-        android:text="@string/install_app" />
+        android:text="@string/install_app"
+        app:roundButtonTextSize="10sp"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
+
 
     <ListView
         android:id="@+id/apps_list_view"
diff --git a/app/res/layout/blank_missing_multimedia_layout.xml b/app/res/layout/blank_missing_multimedia_layout.xml
index dc44bfd6f1..9278b54f56 100644
--- a/app/res/layout/blank_missing_multimedia_layout.xml
+++ b/app/res/layout/blank_missing_multimedia_layout.xml
@@ -22,16 +22,18 @@
         android:paddingStart="20px">
     </ImageView>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/skip_button_text"
         android:layout_centerHorizontal="true"
         android:layout_above="@+id/screen_multimedia_retry"
-        android:visibility="gone" />
+        android:visibility="gone"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white" />
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -39,7 +41,9 @@
         android:text="@string/retry_button_text"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 
     <ScrollView
diff --git a/app/res/layout/blue_outlined_button.xml b/app/res/layout/blue_outlined_button.xml
index 31afd53836..8cab34f1f1 100644
--- a/app/res/layout/blue_outlined_button.xml
+++ b/app/res/layout/blue_outlined_button.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+
+<org.commcare.activities.components.RoundedButton 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/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:focusable="true"
     android:padding="10dp"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    tools:viewBindingIgnore="true"
+    app:roundButtonBorderVisible="true"
+    app:roundButtonBorderColor="@color/button_primary"
+    app:roundButtonTextColor="@color/blue"/>
\ 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..9f74b86fa9 100644
--- a/app/res/layout/choice_dialog_three_panel.xml
+++ b/app/res/layout/choice_dialog_three_panel.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              tools:viewBindingIgnore="true">
+    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="match_parent"
+    tools:viewBindingIgnore="true">
 
     <include
         android:id="@+id/choice_dialog_title"
@@ -24,40 +25,49 @@
         android:layout_marginEnd="@dimen/standard_spacer_large"
         android:layout_marginStart="@dimen/standard_spacer_large">
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/choice_dialog_panel_1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
             android:drawablePadding="5dp"
             android:layout_marginRight="@dimen/standard_spacer"
             android:paddingTop="15dp"
-            android:layout_marginEnd="@dimen/standard_spacer" />
+            android:layout_marginEnd="@dimen/standard_spacer"
+            app:roundButtonBorderVisible="true"
+            app:roundButtonBorderColor="@color/cc_brand_color"
+            app:roundButtonTextColor="@color/cc_brand_color"
+            app:roundButtonBackgroundColor="@color/transparent"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/choice_dialog_panel_2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
             android:drawablePadding="5dp"
             android:layout_marginLeft="@dimen/standard_spacer"
             android:layout_marginRight="@dimen/standard_spacer"
             android:paddingTop="15dp"
             android:layout_marginStart="@dimen/standard_spacer"
-            android:layout_marginEnd="@dimen/standard_spacer" />
+            android:layout_marginEnd="@dimen/standard_spacer"
+            app:roundButtonBorderVisible="true"
+            app:roundButtonBorderColor="@color/cc_brand_color"
+            app:roundButtonTextColor="@color/cc_brand_color"
+            app:roundButtonBackgroundColor="@color/transparent"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/choice_dialog_panel_3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@android:color/transparent"
             android:drawablePadding="5dp"
             android:layout_marginLeft="@dimen/standard_spacer"
             android:paddingTop="15dp"
-            android:layout_marginStart="@dimen/standard_spacer" />
+            app:roundButtonBorderVisible="true"
+            app:roundButtonBorderColor="@color/cc_brand_color"
+            app:roundButtonTextColor="@color/cc_brand_color"
+            android:layout_marginStart="@dimen/standard_spacer"
+            app:roundButtonBackgroundColor="@color/transparent"/>
 
     </LinearLayout>
 
diff --git a/app/res/layout/choice_dialog_view.xml b/app/res/layout/choice_dialog_view.xml
index d4020842d5..8478054833 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"
+    <org.commcare.activities.components.RoundedButton
+        xmlns:android="http://schemas.android.com/apk/res/android"
             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:visibility="visible"
+        android:layout_marginEnd="@dimen/standard_spacer"
+        app:roundButtonLeftPadding="8dp"
+        app:roundButtonRightPadding="8dp"
+        app:roundButtonBackgroundColor="@color/transparent"
+        app:roundButtonTextColor="@color/dialog_button_color"/>
 
     <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..fa34b72694 100644
--- a/app/res/layout/component_entity_detail_item.xml
+++ b/app/res/layout/component_entity_detail_item.xml
@@ -41,21 +41,22 @@
             android:visibility="visible"
             android:layout_marginEnd="8dp" />
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/detail_value_phone"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="start|center_vertical"
             android:layout_marginLeft="11dp"
             android:layout_marginRight="12dp"
-            android:drawableLeft="@drawable/sym_action_call"
-            android:drawablePadding="@dimen/content_min_margin"
+            app:roundButtonIconPadding="16dp"
             android:text="555-555-5555"
-            android:typeface="monospace"
             android:visibility="gone"
             android:layout_marginEnd="12dp"
-            android:drawableStart="@drawable/sym_action_call"
-            android:layout_marginStart="11dp" />
+            android:layout_marginStart="11dp"
+            app:roundButtonIconLeftAlign="true"
+            app:roundButtonIcon="@drawable/sym_action_call"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
         <ImageButton
             android:id="@+id/detail_video_button"
@@ -105,13 +106,15 @@
                 android:drawablePadding="@dimen/content_min_margin"
                 android:text="Callout"/>
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/callout_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:drawablePadding="@dimen/content_min_margin"
-                android:text="Callout"/>
+                android:text="Callout"
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"/>
 
             <TextView
                 android:id="@+id/callout_text"
@@ -141,20 +144,24 @@
             android:paddingLeft="11dp"
             android:paddingRight="4dp"
             android:paddingTop="4dp"
-            android:visibility="gone"
+            android:visibility="visible"
             android:layout_marginEnd="8dp"
             android:paddingStart="11dp"
             android:paddingEnd="4dp">
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/detail_address_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start"
-                android:drawableLeft="@drawable/sym_action_lookup"
+                app:roundButtonIcon="@drawable/sym_action_lookup"
+                app:roundButtonIconLeftAlign="true"
                 android:drawablePadding="@dimen/content_min_margin"
                 android:text="Show Address"
-                android:drawableStart="@drawable/sym_action_lookup" />
+                android:drawableStart="@drawable/sym_action_lookup"
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"
+                />
 
             <TextView
                 android:id="@+id/detail_address_text"
diff --git a/app/res/layout/connection_diagnostic.xml b/app/res/layout/connection_diagnostic.xml
index 3e3e9631fd..ee7617d11e 100644
--- a/app/res/layout/connection_diagnostic.xml
+++ b/app/res/layout/connection_diagnostic.xml
@@ -38,13 +38,13 @@
             android:paddingRight="5dp"
             android:paddingStart="5dp"
             android:paddingEnd="5dp">
-
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/run_connection_test"
-                style="@style/ButtonBottom"
-                android:layout_width="match_parent"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="Run Connection Test"/>
+                android:text="Run Connection Test"
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"/>
 
         </RelativeLayout>
 
@@ -58,20 +58,22 @@
             android:text="Output message."
             android:visibility="invisible"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             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
+            android:visibility="visible"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/report_button"
-            style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:text="Report to CommCare"
-            android:visibility="invisible"/>
+            android:visibility="visible"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/res/layout/custom_alert_dialog.xml b/app/res/layout/custom_alert_dialog.xml
index e24d9d96c5..e27f1d02f0 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,35 +71,39 @@
             android:layout_weight="2"
             android:layout_marginBottom="@dimen/standard_spacer">
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
+            <org.commcare.activities.components.RoundedButton xmlns:android="http://schemas.android.com/apk/res/android"
                     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:visibility="visible"
                 android:layout_alignParentEnd="true"
-                android:layout_marginEnd="@dimen/standard_spacer">
-            </Button>
+                android:layout_marginEnd="@dimen/standard_spacer"
+                app:roundButtonBorderColor="@color/dialog_button_color"
+                app:roundButtonBorderVisible="true"
+                app:roundButtonBorderWidth="2dp"
+                app:roundButtonBackgroundColor="@color/transparent"
+                app:roundButtonTextColor="@color/dialog_button_color">
+            </org.commcare.activities.components.RoundedButton>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
+            <org.commcare.activities.components.RoundedButton 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>
+                app:roundButtonBorderColor="@color/dialog_button_color"
+                app:roundButtonBorderVisible="true"
+                app:roundButtonBorderWidth="2dp"
+                android:layout_toStartOf="@id/positive_button"
+                app:roundButtonBackgroundColor="@color/transparent"
+                app:roundButtonTextColor="@color/dialog_button_color">
+            </org.commcare.activities.components.RoundedButton>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
+            <org.commcare.activities.components.RoundedButton 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"
@@ -107,14 +111,16 @@
                     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"
                 android:layout_marginStart="@dimen/standard_spacer"
                 android:layout_marginEnd="@dimen/standard_spacer"
-                android:layout_toStartOf="@id/neutral_button">
-            </Button>
+                app:roundButtonBorderColor="@color/dialog_button_color"
+                app:roundButtonBorderVisible="true"
+                app:roundButtonBorderWidth="2dp"
+                android:layout_toStartOf="@id/neutral_button"
+                app:roundButtonBackgroundColor="@color/transparent"
+                app:roundButtonTextColor="@color/dialog_button_color">
+            </org.commcare.activities.components.RoundedButton>
         </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..623b17f3b9 100644
--- a/app/res/layout/dots_detail.xml
+++ b/app/res/layout/dots_detail.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -37,21 +37,26 @@
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:layout_alignParentBottom="true"
+        android:layout_marginBottom="16dp"
         android:id="@+id/dotsbuttonframe"
         android:weightSum="1">
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             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"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             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"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/res/layout/dotsdoses.xml b/app/res/layout/dotsdoses.xml
index c11b044085..9aa4ff4d76 100644
--- a/app/res/layout/dotsdoses.xml
+++ b/app/res/layout/dotsdoses.xml
@@ -61,10 +61,12 @@
             android:id="@+id/dots_dose_four"></TableRow>
     </TableLayout>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         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"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 </RelativeLayout>
diff --git a/app/res/layout/draw_layout.xml b/app/res/layout/draw_layout.xml
index 203a239874..2230264b9d 100644
--- a/app/res/layout/draw_layout.xml
+++ b/app/res/layout/draw_layout.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/draw_relative_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -17,13 +18,16 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         android:layout_alignParentBottom="true">
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/btnFinishDraw"
             android:layout_width="wrap_content"
             android:enabled="false"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            app:roundButtonBackgroundColor="@color/button_primary"
+            app:roundButtonTextColor="@color/white"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -31,15 +35,20 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true">
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/btnResetDraw"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                app:roundButtonBackgroundColor="@color/button_primary"
+                app:roundButtonTextColor="@color/white"/>
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/btnCancelDraw"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_marginLeft="8dp"
+                android:layout_height="wrap_content"
+                app:roundButtonBackgroundColor="@color/button_primary"
+                app:roundButtonTextColor="@color/white"/>
 
         </LinearLayout>
 
diff --git a/app/res/layout/entity_detail.xml b/app/res/layout/entity_detail.xml
index 38458c1a22..e0c6cae765 100644
--- a/app/res/layout/entity_detail.xml
+++ b/app/res/layout/entity_detail.xml
@@ -1,18 +1,24 @@
 <?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"
     android:focusable="false"
     android:orientation="vertical"
     tools:viewBindingIgnore="true">
-
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/entity_select_button"
-        style="@style/ScreenPinnedButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
         android:text="Continue"
-        android:layout_below="@+id/universal_frame_tile"/>
+        android:layout_below="@+id/universal_frame_tile"
+        app:roundButtonIcon="@drawable/icon_chevron_right_attnpos"
+        app:roundButtonBackgroundColor="@color/cc_attention_positive_bg"
+        app:roundButtonIconTintColor="@color/cc_attention_positive_text"
+        app:roundButtonTextColor="@color/cc_attention_positive_text"/>
+
 
     <FrameLayout
         android:id="@+id/ad_container"
diff --git a/app/res/layout/execute_recovery_measures.xml b/app/res/layout/execute_recovery_measures.xml
index 74ff5fa5c8..63ea1bbb6a 100644
--- a/app/res/layout/execute_recovery_measures.xml
+++ b/app/res/layout/execute_recovery_measures.xml
@@ -53,7 +53,7 @@
             android:visibility="gone"
             tools:text="2 out of 5 done"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/retry_button"
             android:layout_below="@id/status_tv"
             android:layout_centerHorizontal="true"
@@ -61,9 +61,11 @@
             android:layout_marginTop="@dimen/standard_spacer_large"
             android:layout_width="@dimen/center_button_width"
             android:text="@string/recovery_measure_retry"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/reinstall_button"
             android:layout_below="@id/retry_button"
             android:layout_centerHorizontal="true"
@@ -71,9 +73,11 @@
             android:layout_marginTop="@dimen/standard_spacer_large"
             android:layout_width="@dimen/center_button_width"
             android:text="@string/recovery_measure_reinstall"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/select_ccz_button"
             android:layout_below="@id/reinstall_button"
             android:layout_centerHorizontal="true"
@@ -81,7 +85,9 @@
             android:layout_marginTop="@dimen/standard_spacer_large"
             android:layout_width="@dimen/center_button_width"
             android:text="@string/recovery_measure_select_ccz"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
     </RelativeLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/res/layout/fragment_setup_enter_url.xml b/app/res/layout/fragment_setup_enter_url.xml
index 969d497871..7c59f61aba 100644
--- a/app/res/layout/fragment_setup_enter_url.xml
+++ b/app/res/layout/fragment_setup_enter_url.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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:id="@+id/screen_first_start_main"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -64,18 +65,21 @@
                         >
                     </EditText>
                 </LinearLayout>
-
-                <Button
+                <org.commcare.activities.components.RoundedButton
                     android:id="@+id/start_install"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:text="Start Install"
+                    android:nextFocusUp="@+id/edit_password"
                     android:paddingTop="@dimen/content_start"
                     android:enabled="false"
                     android:paddingBottom="@dimen/content_start"
                     android:layout_marginTop="@dimen/content_min_margin"
                     android:layout_gravity="bottom"
-                    android:text="Start Install"
-                    android:nextFocusUp="@+id/edit_password" />
+                    app:roundButtonTextSize="10sp"
+                    app:roundButtonBackgroundColor="@color/primary_button_background"
+                    app:roundButtonTextColor="@color/white"/>
+
 
             </LinearLayout>
         </LinearLayout>
diff --git a/app/res/layout/geo_progress.xml b/app/res/layout/geo_progress.xml
index 2fe494c747..70bd159ad9 100644
--- a/app/res/layout/geo_progress.xml
+++ b/app/res/layout/geo_progress.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="fill_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     tools:viewBindingIgnore="true">
 
@@ -51,20 +52,24 @@
         android:orientation="horizontal"
         android:layout_weight="1">
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/geoOK"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="Record Location"
-            android:layout_margin="@dimen/standard_spacer"/>
+            android:layout_margin="@dimen/standard_spacer"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/geoCancel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
             android:text="Cancel"
-            android:layout_margin="@dimen/standard_spacer"/>
+            android:layout_margin="@dimen/standard_spacer"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/geopoint_layout.xml b/app/res/layout/geopoint_layout.xml
index b763e71d20..9d2dc276af 100644
--- a/app/res/layout/geopoint_layout.xml
+++ b/app/res/layout/geopoint_layout.xml
@@ -33,27 +33,33 @@
             android:paddingBottom="2dip"
             android:paddingTop="2dip">
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/show_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:text="@string/go_to_location"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"/>
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/accept_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
-                android:text="@string/accept_location" />
+                android:text="@string/accept_location"
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"/>
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/cancel_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
-                android:text="@string/cancel" />
+                android:text="@string/cancel"
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"/>
         </LinearLayout>
 
         <com.google.android.gms.maps.MapView
diff --git a/app/res/layout/hierarchy_layout.xml b/app/res/layout/hierarchy_layout.xml
index 5b459716b6..5c00525bcd 100644
--- a/app/res/layout/hierarchy_layout.xml
+++ b/app/res/layout/hierarchy_layout.xml
@@ -12,11 +12,11 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 License for the specific language governing permissions and limitations under
 the License.
 -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -40,41 +40,38 @@ the License.
             android:layout_height="match_parent"
             android:layout_weight="1"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             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"/>
+            android:layout_weight="1"
+            android:textSize="12sp"
+            app:roundButtonBackgroundColor="@color/cc_core_bg"
+            app:roundButtonTextColor="@color/cc_brand_color"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             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"/>
+            android:textSize="12sp"
+            app:roundButtonBackgroundColor="@color/cc_core_bg"
+            app:roundButtonTextColor="@color/cc_brand_color"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             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"
+            android:textSize="12sp"
             style="@style/CommCare.Button.Default"
-            android:layout_weight="1"/>
+            android:layout_weight="1"
+            app:roundButtonBackgroundColor="@color/cc_core_bg"
+            app:roundButtonTextColor="@color/cc_brand_color"/>
     </LinearLayout>
 
     <ListView
diff --git a/app/res/layout/http_request_layout.xml b/app/res/layout/http_request_layout.xml
index 44cd60fc01..660ec9a3d7 100644
--- a/app/res/layout/http_request_layout.xml
+++ b/app/res/layout/http_request_layout.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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">
 
     <ScrollView
@@ -38,16 +38,16 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 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"/>
+                app:roundButtonBackgroundColor="@color/cc_brand_color"
+                app:roundButtonTextColor="@color/cc_neutral_bg"/>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/install_permission_requester.xml b/app/res/layout/install_permission_requester.xml
index 138276605d..d3a3da4e1a 100644
--- a/app/res/layout/install_permission_requester.xml
+++ b/app/res/layout/install_permission_requester.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    android:id="@+id/screen_first_start_main"
+<RelativeLayout android:id="@+id/screen_first_start_main"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@color/cc_core_bg"
     android:orientation="vertical"
-    tools:viewBindingIgnore="true">
+    tools:viewBindingIgnore="true"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -52,16 +52,16 @@
                 android:layout_marginStart="@dimen/content_min_margin"
                 android:layout_marginEnd="@dimen/content_min_margin" />
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 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"/>
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/cc_neutral_bg"/>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/layout_note_msg.xml b/app/res/layout/layout_note_msg.xml
index 7ba15d9060..2f0fcf31aa 100644
--- a/app/res/layout/layout_note_msg.xml
+++ b/app/res/layout/layout_note_msg.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:padding="@dimen/activity_vertical_margin"
     tools:viewBindingIgnore="true">
@@ -42,11 +43,13 @@
         android:text="What to do about it"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/layout_note_msg_action_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Button"
-        android:visibility="gone" />
+        android:visibility="visible"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/list_gregorian_widget.xml b/app/res/layout/list_gregorian_widget.xml
index 4aa5816ebf..1317c927c2 100644
--- a/app/res/layout/list_gregorian_widget.xml
+++ b/app/res/layout/list_gregorian_widget.xml
@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center"
     android:orientation="vertical"
     tools:viewBindingIgnore="true">
@@ -44,16 +45,16 @@
             android:layout_marginEnd="10dp"
             android:layout_marginStart="20dp">
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/dayupbtn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="+"
                 android:textSize="@dimen/text_largest"
-                android:textColor="@color/white"
-                style="@style/CommCare.Button.Default"
-                android:background="@color/bright_blue_grad_start"
-                android:elevation="@dimen/button_elevation"/>
+                android:elevation="@dimen/button_elevation"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="12sp"
+                app:roundButtonBackgroundColor="@color/bright_blue_grad_start"/>
 
             <EditText
                 android:id="@+id/day_txt_field"
@@ -67,16 +68,15 @@
                 android:selectAllOnFocus="true"
                 android:imeOptions="flagNoExtractUi"/>
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/daydownbtn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="-"
-                android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
-                android:textColor="@color/white"
-                android:background="@color/dark_blue"
-                android:elevation="@dimen/button_elevation" />
+                android:elevation="@dimen/button_elevation"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="14sp"
+                app:roundButtonBackgroundColor="@color/dark_blue"/>
 
         </LinearLayout>
 
@@ -89,18 +89,18 @@
             android:layout_marginRight="10dp"
             android:layout_marginEnd="10dp">
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/monthupbtn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:text="+"
-                android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
                 android:textColor="@color/white"
-                android:background="@color/bright_blue_grad_start"
                 android:elevation="@dimen/button_elevation"
-                android:layout_marginStart="5dp" />
+                android:layout_marginStart="5dp"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="12sp"
+                app:roundButtonBackgroundColor="@color/bright_blue_grad_start"/>
 
            <Spinner
                android:layout_width="match_parent"
@@ -108,18 +108,17 @@
                android:id="@+id/month_spinner">
            </Spinner>
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/monthdownbtn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:text="-"
-                android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
-                android:textColor="@color/white"
-                android:background="@color/dark_blue"
                 android:elevation="@dimen/button_elevation"
-                android:layout_marginStart="5dp" />
+                android:layout_marginStart="5dp"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="16sp"
+                app:roundButtonBackgroundColor="@color/dark_blue"/>
 
         </LinearLayout>
 
@@ -131,18 +130,18 @@
             android:layout_marginRight="20dp"
             android:layout_marginEnd="20dp">
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/yearupbtn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:text="+"
                 android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
-                android:textColor="@color/white"
-                android:background="@color/bright_blue_grad_start"
                 android:elevation="@dimen/button_elevation"
-                android:layout_marginStart="5dp" />
+                android:layout_marginStart="5dp"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="12sp"
+                app:roundButtonBackgroundColor="@color/bright_blue_grad_start"/>
 
             <EditText
                 android:id="@+id/year_txt_field"
@@ -159,18 +158,17 @@
                 android:imeOptions="flagNoExtractUi"
                 android:layout_marginStart="5dp" />
 
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/yeardownbtn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:text="-"
-                android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
-                android:textColor="@color/white"
-                android:background="@color/dark_blue"
                 android:elevation="@dimen/button_elevation"
-                android:layout_marginStart="5dp" />
+                android:layout_marginStart="5dp"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="16sp"
+                app:roundButtonBackgroundColor="@color/dark_blue"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/res/layout/missing_multimedia_layout.xml b/app/res/layout/missing_multimedia_layout.xml
index dbb39efe03..2d869b9650 100644
--- a/app/res/layout/missing_multimedia_layout.xml
+++ b/app/res/layout/missing_multimedia_layout.xml
@@ -21,23 +21,27 @@
         android:layout_marginEnd="20px">
     </ImageView>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/skip_button_text"
         android:layout_centerHorizontal="true"
         android:layout_above="@+id/screen_multimedia_retry"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:text="@string/retry_button_text"
         android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"/>
+        android:layout_alignParentBottom="true"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 
     <ScrollView
diff --git a/app/res/layout/multiple_apps_limit_view.xml b/app/res/layout/multiple_apps_limit_view.xml
index fe3d3d9925..c5716e2028 100644
--- a/app/res/layout/multiple_apps_limit_view.xml
+++ b/app/res/layout/multiple_apps_limit_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:viewBindingIgnore="true">
 
@@ -14,14 +16,16 @@
         android:layout_centerInParent="true"
         android:gravity="center"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/back_to_manager_button"
         android:layout_marginBottom="@dimen/standard_spacer_large"
         android:text="Go to App Manager"
-        android:textSize="19sp"
+        app:roundButtonTextSize="14sp"
         android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"/>
+        android:layout_centerHorizontal="true"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/layout/pin_screen_buttons.xml b/app/res/layout/pin_screen_buttons.xml
index 9df7a359fd..9a045aa041 100644
--- a/app/res/layout/pin_screen_buttons.xml
+++ b/app/res/layout/pin_screen_buttons.xml
@@ -3,24 +3,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_alignParentBottom="true"
     android:weightSum="2"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         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"/>
+        app:roundButtonTextSize="@dimen/font_size_dp_medium"
+        android:layout_weight="1"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_confirm_button"
-        android:textSize="@dimen/font_size_dp_medium"
+        app:roundButtonTextSize="@dimen/font_size_dp_medium"
         android:enabled="false"
-        android:layout_weight="1"/>
+        android:layout_weight="1"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/privilege_claiming_view.xml b/app/res/layout/privilege_claiming_view.xml
index 32c46f041c..353655f58d 100644
--- a/app/res/layout/privilege_claiming_view.xml
+++ b/app/res/layout/privilege_claiming_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"
     android:orientation="vertical"
     android:gravity="center"
     tools:viewBindingIgnore="true">
@@ -50,11 +51,13 @@
         android:layout_marginStart="@dimen/standard_spacer_double"
         android:layout_marginEnd="@dimen/standard_spacer_double" />
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/claim_button"
-        android:textSize="@dimen/font_size_xlarge"
-        android:text="@string/claim_privilege_button_text" />
+        app:roundButtonTextSize="@dimen/font_size_small"
+        android:text="@string/claim_privilege_button_text"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/progress_dialog_cancel_button.xml b/app/res/layout/progress_dialog_cancel_button.xml
index 4284e7a09c..8d7bafc369 100644
--- a/app/res/layout/progress_dialog_cancel_button.xml
+++ b/app/res/layout/progress_dialog_cancel_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<org.commcare.activities.components.RoundedButton 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:layout_width="wrap_content"
     android:layout_height="@dimen/min_button_height"
     android:layout_below="@+id/main_content_holder"
@@ -9,10 +10,14 @@
     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"
+    android:textAllCaps="true"
+    app:roundButtonTextColor="@color/cc_brand_color"
+    app:roundButtonBorderVisible="true"
+    app:roundButtonBorderColor="@color/cc_brand_color"
     style="@style/CommCare.Button.Default"
     android:text="STOP"
-    android:textSize="@dimen/font_size_dp_medium"
+    app:roundButtonTextSize="12sp"
+    app:roundButtonBackgroundColor="@color/transparent"
     android:visibility="gone"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/app/res/layout/prompt_view.xml b/app/res/layout/prompt_view.xml
index 614a771256..aebe0de6ee 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
@@ -35,20 +36,28 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/standard_spacer_double"
                 android:gravity="center"/>
-
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/action_button"
-                style="@style/PromptedUpdateButtonUpdate" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                app:roundButtonTextColor="@color/cc_neutral_bg"
+                app:roundButtonBackgroundColor="@color/solid_green"
+                />
 
             <ImageView
                 android:id="@+id/image_cue"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/standard_spacer_double"/>
-
-            <Button
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/do_later_button"
-                style="@style/PromptedUpdateButtonUpdateLater"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                app:roundButtonTextColor="@color/cc_neutral_bg"
+                app:roundButtonBackgroundColor="@color/cc_brand_color"
+                />
 
             <TextView
                 android:id="@+id/help_text"
diff --git a/app/res/layout/recording.xml b/app/res/layout/recording.xml
index c79de6c9eb..be17f2760f 100644
--- a/app/res/layout/recording.xml
+++ b/app/res/layout/recording.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="fill_parent"
     android:layout_height="fill_parent"
@@ -9,10 +10,12 @@
     android:layout_marginTop="10dp"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id = "@+id/startrecording"/>
+        android:id = "@+id/startrecording"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 
     <ProgressBar
@@ -23,9 +26,11 @@
         android:id = "@+id/recordingprogress"
         android:background="@color/blue"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/stoprecording"/>
+        android:id="@+id/stoprecording"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/recording_fragment.xml b/app/res/layout/recording_fragment.xml
index b43b1e2fff..972e52504e 100644
--- a/app/res/layout/recording_fragment.xml
+++ b/app/res/layout/recording_fragment.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_gravity="center_horizontal"
     android:gravity="center_horizontal"
     android:orientation="vertical"
@@ -68,7 +69,7 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/action_button"
         style="@style/Commcare.Button.Primary"
         android:layout_width="wrap_content"
@@ -82,6 +83,8 @@
         android:layout_marginTop="15dp"
         android:gravity="center"
         tools:text="Finish"
-        android:visibility="invisible" />
+        android:visibility="invisible"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 </LinearLayout>
diff --git a/app/res/layout/screen_form_dump.xml b/app/res/layout/screen_form_dump.xml
index 426e8deac2..a8ecb61579 100644
--- a/app/res/layout/screen_form_dump.xml
+++ b/app/res/layout/screen_form_dump.xml
@@ -43,24 +43,28 @@
                 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
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/screen_bulk_form_dump"
                 style="@style/ButtonBottom"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_prompt"
-                android:text="Dump Forms"/>
+                android:text="Dump Forms"
 
-            <Button
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"/>
+
+            <org.commcare.activities.components.RoundedButton
                 android:id="@+id/screen_bulk_form_submit"
                 style="@style/ButtonBottom"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_dump"
-                android:text="Submit Forms"/>
+                android:text="Submit Forms"
+                app:roundButtonBackgroundColor="@color/primary_button_background"
+                app:roundButtonTextColor="@color/white"/>
 
         </RelativeLayout>
 
diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml
index 654f1bcff1..6495f02a9e 100644
--- a/app/res/layout/screen_form_entry.xml
+++ b/app/res/layout/screen_form_entry.xml
@@ -82,28 +82,28 @@
             android:paddingEnd="@dimen/new_progressbar_button_padding" />
 
         <ProgressBar
-            android:id="@+id/nav_prog_bar"
             style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:id="@+id/nav_prog_bar"
+            android:indeterminate="false"
+            android:indeterminateOnly="false"
             android:layout_alignBottom="@id/nav_btn_prev"
             android:layout_alignParentTop="true"
             android:layout_centerInParent="true"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/content_start"
             android:layout_marginLeft="@dimen/content_start"
             android:layout_marginRight="@dimen/content_start"
+            android:layout_marginStart="@dimen/content_start"
+            android:layout_toEndOf="@id/nav_btn_prev"
             android:layout_toLeftOf="@+id/nav_btn_next"
             android:layout_toRightOf="@id/nav_btn_prev"
-            android:indeterminate="false"
-            android:indeterminateOnly="false"
+            android:layout_toStartOf="@+id/nav_btn_next"
+            android:layout_width="wrap_content"
             android:max="100"
             android:paddingBottom="@dimen/content_start"
             android:paddingTop="@dimen/content_start"
             android:progress="0"
-            android:progressDrawable="@drawable/progressbar_modern"
-            android:layout_marginStart="@dimen/content_start"
-            android:layout_marginEnd="@dimen/content_start"
-            android:layout_toStartOf="@+id/nav_btn_next"
-            android:layout_toEndOf="@id/nav_btn_prev" />
+            android:progressDrawable="@drawable/progressbar_modern" />
 
         <ImageButton
             android:rotationY="@integer/locale_mirror_flip"
@@ -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
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/multiple_intent_dispatch_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:roundButtonTextSize="12sp"
             android:text="Batch Dispatch"
-            android:visibility="gone"
-            style="@style/ScreenPinnedButtonNeutral"/>
+            android:layout_margin="16dp"
+            app:roundButtonIconTintColor="@color/cc_light_cool_accent_text"
+            app:roundButtonTextColor="@color/cc_light_cool_accent_text"
+            app:roundButtonIcon="@drawable/icon_chevron_right_brand"
+            app:roundButtonBackgroundColor="@color/cc_light_cool_accent_bg"/>
     </FrameLayout>
 
     <View
diff --git a/app/res/layout/screen_login.xml b/app/res/layout/screen_login.xml
index 2f2c7791f1..7d38ea64ed 100644
--- a/app/res/layout/screen_login.xml
+++ b/app/res/layout/screen_login.xml
@@ -5,6 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="fill_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/cc_core_bg"
     android:orientation="vertical"
     tools:viewBindingIgnore="true">
@@ -165,15 +166,17 @@
                                 android:layout_margin="@dimen/standard_spacer"
                                 android:textSize="@dimen/font_size_medium"
                                 android:visibility="gone" />
-
-                            <Button
+                            
+                            <org.commcare.activities.components.RoundedButton
                                 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" />
+                                android:paddingTop="@dimen/content_start"
+                                app:roundButtonBackgroundColor="@color/primary_button_background"
+                                app:roundButtonTextColor="@color/white"/>
+
 
                             <LinearLayout
                                 android:id="@+id/screen_login_error_view"
diff --git a/app/res/layout/screen_multimedia_inflater.xml b/app/res/layout/screen_multimedia_inflater.xml
index c5afe131c7..169082c8ba 100644
--- a/app/res/layout/screen_multimedia_inflater.xml
+++ b/app/res/layout/screen_multimedia_inflater.xml
@@ -53,7 +53,7 @@
         android:layout_below="@id/screen_multimedia_inflater_frame_location"
         android:layout_centerHorizontal="true"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/screen_multimedia_inflater_install"
         style="@style/ButtonBottom"
         android:layout_width="match_parent"
@@ -61,6 +61,8 @@
         android:layout_alignParentBottom="true"
         android:layout_gravity="bottom"
         android:paddingBottom="@dimen/content_start"
-        android:paddingTop="@dimen/content_start" />
+        android:paddingTop="@dimen/content_start"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white" />
 
 </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..cf03940544 100644
--- a/app/res/layout/screen_permission_request.xml
+++ b/app/res/layout/screen_permission_request.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:layout_margin="@dimen/activity_horizontal_margin"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -33,17 +34,21 @@
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp">
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/screen_permission_request_button_grant"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="Grant Access"/>
+            android:text="Grant Access"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:id="@+id/screen_permission_request_button_deny"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="Deny Access"/>
+            android:text="Deny Access"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
     </LinearLayout>
 
diff --git a/app/res/layout/screen_recovery.xml b/app/res/layout/screen_recovery.xml
index 62903b8099..9da0607f0c 100644
--- a/app/res/layout/screen_recovery.xml
+++ b/app/res/layout/screen_recovery.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:gravity="center"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:paddingEnd="@dimen/activity_horizontal_margin"
-                android:paddingStart="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin"
+    android:paddingStart="@dimen/activity_horizontal_margin"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -38,17 +39,20 @@
         android:visibility="gone"
         tools:text="Waiting"/>
 
-    <Button
+
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/retry_button"
+        android:layout_width="wrap_content"
         android:layout_below="@id/recovery_status"
         android:layout_centerHorizontal="true"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_spacer_double"
-        android:layout_width="wrap_content"
         android:text="@string/recovery_retry"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/app_manager_button"
         android:layout_below="@id/retry_button"
         android:layout_centerHorizontal="true"
@@ -56,6 +60,8 @@
         android:layout_marginTop="@dimen/standard_spacer_double"
         android:layout_width="wrap_content"
         android:text="@string/recovery_app_manager"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
 </RelativeLayout>
diff --git a/app/res/layout/scrolling_calendar_widget.xml b/app/res/layout/scrolling_calendar_widget.xml
index 4572612807..03770b39c1 100644
--- a/app/res/layout/scrolling_calendar_widget.xml
+++ b/app/res/layout/scrolling_calendar_widget.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:gravity="center_horizontal"
     android:paddingLeft="20dp"
@@ -134,7 +135,7 @@
             android:layout_centerVertical="true"
             android:layout_alignParentStart="true" />
 
-        <Button
+        <org.commcare.activities.components.RoundedButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@color/lightest_grey"
@@ -143,7 +144,9 @@
             android:id="@+id/today"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/standard_spacer"
-            android:layout_marginBottom="@dimen/standard_spacer"/>
+            android:layout_marginBottom="@dimen/standard_spacer"
+            app:roundButtonBackgroundColor="@color/primary_button_background"
+            app:roundButtonTextColor="@color/white"/>
 
         <ImageButton
             android:layout_width="25dp"
diff --git a/app/res/layout/single_app_view.xml b/app/res/layout/single_app_view.xml
index e0d38e1613..db5ae83197 100644
--- a/app/res/layout/single_app_view.xml
+++ b/app/res/layout/single_app_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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:gravity="center"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
@@ -36,37 +37,45 @@
         style="@style/TextAppearance.AppCompat.Body2"
         android:visibility="visible"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/uninstall_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
         android:layout_width="fill_parent"
         android:onClick="rebootAlertDialog"
-        android:text="@string/uninstall_app" />
+        android:text="@string/uninstall_app"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white" />
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/archive_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
         android:layout_width="fill_parent"
         android:onClick="toggleArchiveClicked"
-        android:text="@string/archive_app" />
+        android:text="@string/archive_app"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white" />
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:id="@+id/update_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
         android:layout_width="fill_parent"
         android:onClick="updateClicked"
-        android:text="@string/update_app" />
+        android:text="@string/update_app"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white"/>
 
-    <Button
+    <org.commcare.activities.components.RoundedButton
         android:clickable="true"
         android:id="@+id/verify_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
         android:layout_width="fill_parent"
         android:onClick="verifyResourcesClicked"
-        android:text="@string/verify_resources" />
+        android:text="@string/verify_resources"
+        app:roundButtonBackgroundColor="@color/primary_button_background"
+        app:roundButtonTextColor="@color/white" />
 
 </LinearLayout>
diff --git a/app/res/layout/single_dialog_choice_view.xml b/app/res/layout/single_dialog_choice_view.xml
index 0c9564f332..2763e3368f 100644
--- a/app/res/layout/single_dialog_choice_view.xml
+++ b/app/res/layout/single_dialog_choice_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<org.commcare.activities.components.RoundedButton 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/choice_dialog_panel"
     style="@style/CommCare.Button.Default"
     android:layout_width="wrap_content"
@@ -10,4 +11,5 @@
     android:drawablePadding="5dp"
     android:padding="12dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    tools:viewBindingIgnore="true"
+    app:roundButtonTextColor="@color/cc_neutral_text" />
\ No newline at end of file
diff --git a/app/res/layout/user_get_available_apps.xml b/app/res/layout/user_get_available_apps.xml
index 47ca892f31..45bb145635 100644
--- a/app/res/layout/user_get_available_apps.xml
+++ b/app/res/layout/user_get_available_apps.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="match_parent"
@@ -134,13 +135,15 @@
                     android:layout_marginStart="@dimen/standard_spacer_large"
                     android:layout_marginEnd="@dimen/standard_spacer_large" />
 
-                <Button
+                <org.commcare.activities.components.RoundedButton
                     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:layout_marginTop="@dimen/standard_spacer_double" />
+                    android:layout_marginTop="@dimen/standard_spacer_double"
+                    app:roundButtonBackgroundColor="@color/primary_button_background"
+                    app:roundButtonTextColor="@color/white"/>
 
                 <TextView
                     android:id="@+id/error_message"
diff --git a/app/res/values/attrs.xml b/app/res/values/attrs.xml
index 9737e24622..beb6ec4db0 100755
--- a/app/res/values/attrs.xml
+++ b/app/res/values/attrs.xml
@@ -13,7 +13,6 @@
     <attr name="drawer_pulldown_odd_row_color" format="reference"/>
     <attr name="menu_tile_title_text_color" format="reference"/>
     <attr name="entity_select_title_text_color" format="reference"/>
-
     <attr name="backgroundColor" format="reference|color"/>
     <attr name="subtitle" format="string"/>
     <attr name="img" format="reference"/>
@@ -52,5 +51,23 @@
     <declare-styleable name="FilePreference">
         <attr name="file_type" format="string"/>
     </declare-styleable>
+    <declare-styleable name="RoundedButton">
+        <attr name="roundButtonHeight" format="dimension" />
+        <attr name="roundButtonRadius" format="dimension" />
+        <attr name="roundButtonBackgroundColor" format="color" />
+        <attr name="roundButtonTextColor" format="color" />
+        <attr name="roundButtonIconTintColor" format="color" />
+        <attr name="roundButtonIcon" format="reference" />
+        <attr name="roundButtonIconLeftAlign" format="boolean" />
+        <attr name="roundButtonLeftPadding" format="dimension" />
+        <attr name="roundButtonRightPadding" format="dimension" />
+        <attr name="roundButtonFontFamily" format="reference" />
+        <attr name="roundButtonBorderVisible" format="boolean" />
+        <attr name="roundButtonBorderColor" format="color" />
+        <attr name="roundButtonBorderRadius" format="dimension" />
+        <attr name="roundButtonBorderWidth" format="dimension" />
+        <attr name="roundButtonTextSize" format="dimension" />
+        <attr name="roundButtonIconPadding" format="dimension"/>
+    </declare-styleable>
 
 </resources>
diff --git a/app/src/org/commcare/activities/components/RoundedButton.java b/app/src/org/commcare/activities/components/RoundedButton.java
new file mode 100644
index 0000000000..fdfcfc5760
--- /dev/null
+++ b/app/src/org/commcare/activities/components/RoundedButton.java
@@ -0,0 +1,189 @@
+package org.commcare.activities.components;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
+
+import org.commcare.dalvik.R;
+
+public class RoundedButton extends androidx.appcompat.widget.AppCompatButton {
+
+    private static final int DEFAULT_BUTTON_HEIGHT = 100;
+    private static final int DEFAULT_RADIUS = 30;
+    private static final int DEFAULT_BACKGROUND_COLOR = Color.parseColor("#004EBC");
+    private static final int DEFAULT_TEXT_COLOR = Color.WHITE;
+    private static final int DEFAULT_ICON_TINT_COLOR = Color.WHITE;
+    private static final int DEFAULT_PADDING = 24;
+    private static final boolean DEFAULT_ICON_LEFT_ALIGN = false;
+    private static final int DEFAULT_FONT_RES_ID = R.font.roboto_regular;
+    private static final boolean DEFAULT_BORDER_VISIBLE = false;
+    private static final int DEFAULT_BORDER_COLOR = Color.parseColor("#004EBC");
+    private static final int DEFAULT_BORDER_RADIUS = DEFAULT_RADIUS;
+    private static final int DEFAULT_BORDER_WIDTH = 1;
+    private static final int DEFAULT_TEXT_SIZE = 7;
+    private static final int DEFAULT_DISABLED_BACKGROUND_COLOR = Color.LTGRAY;
+    private int enabledBackgroundColor;
+    private int disabledBackgroundColor;
+
+    public RoundedButton(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public RoundedButton(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public RoundedButton(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, @Nullable AttributeSet attrs) {
+        if (attrs != null) {
+            TypedArray a = context.getTheme().obtainStyledAttributes(
+                    attrs,
+                    R.styleable.RoundedButton,
+                    0, 0);
+
+            try {
+                int buttonHeight = a.getDimensionPixelSize(R.styleable.RoundedButton_roundButtonHeight, DEFAULT_BUTTON_HEIGHT);
+                int radius = a.getDimensionPixelSize(R.styleable.RoundedButton_roundButtonRadius, dpToPx(DEFAULT_RADIUS));
+                int backgroundColor = a.getColor(R.styleable.RoundedButton_roundButtonBackgroundColor, DEFAULT_BACKGROUND_COLOR);
+                int textColor = a.getColor(R.styleable.RoundedButton_roundButtonTextColor, DEFAULT_TEXT_COLOR);
+                int iconTintColor = a.getColor(R.styleable.RoundedButton_roundButtonIconTintColor, DEFAULT_ICON_TINT_COLOR);
+                int leftPadding = a.getDimensionPixelSize(R.styleable.RoundedButton_roundButtonLeftPadding, dpToPx(DEFAULT_PADDING));
+                int rightPadding = a.getDimensionPixelSize(R.styleable.RoundedButton_roundButtonRightPadding, dpToPx(DEFAULT_PADDING));
+                boolean iconLeftAlign = a.getBoolean(R.styleable.RoundedButton_roundButtonIconLeftAlign, DEFAULT_ICON_LEFT_ALIGN);
+                int fontFamily = a.getResourceId(R.styleable.RoundedButton_roundButtonFontFamily, DEFAULT_FONT_RES_ID);
+                boolean borderVisible = a.getBoolean(R.styleable.RoundedButton_roundButtonBorderVisible, DEFAULT_BORDER_VISIBLE);
+                int borderColor = a.getColor(R.styleable.RoundedButton_roundButtonBorderColor, DEFAULT_BORDER_COLOR);
+                int borderRadius = a.getDimensionPixelSize(R.styleable.RoundedButton_roundButtonBorderRadius, dpToPx(DEFAULT_BORDER_RADIUS));
+                int borderWidth = a.getDimensionPixelSize(R.styleable.RoundedButton_roundButtonBorderWidth, dpToPx(DEFAULT_BORDER_WIDTH));
+                float textSize = a.getDimension(R.styleable.RoundedButton_roundButtonTextSize, spToPx(DEFAULT_TEXT_SIZE));
+                Drawable icon = a.getDrawable(R.styleable.RoundedButton_roundButtonIcon);
+
+                int iconPadding = a.getDimensionPixelSize(R.styleable.RoundedButton_roundButtonIconPadding, dpToPx(16));
+                setCompoundDrawablePadding(iconPadding);
+
+                enabledBackgroundColor = backgroundColor;
+                disabledBackgroundColor = DEFAULT_DISABLED_BACKGROUND_COLOR;
+
+                setBackgroundDrawable(radius, backgroundColor, borderVisible, borderColor, borderRadius,borderWidth);
+                setTextColor(textColor);
+                setButtonHeight(buttonHeight);
+                setPadding(leftPadding, 0, rightPadding, 0);
+                setFontFamily(fontFamily);
+                setTextSize(textSize);
+                if (icon != null) {
+                    setIcon(icon, iconTintColor, iconLeftAlign);
+                }
+
+            } finally {
+                a.recycle();
+            }
+        } else {
+            enabledBackgroundColor = DEFAULT_BACKGROUND_COLOR;
+            disabledBackgroundColor = DEFAULT_DISABLED_BACKGROUND_COLOR;
+            setBackgroundDrawable(dpToPx(DEFAULT_RADIUS), DEFAULT_BACKGROUND_COLOR, DEFAULT_BORDER_VISIBLE, DEFAULT_BORDER_COLOR, dpToPx(DEFAULT_BORDER_RADIUS), dpToPx(DEFAULT_BORDER_WIDTH));
+            setTextColor(DEFAULT_TEXT_COLOR);
+            setPadding(dpToPx(DEFAULT_PADDING), 0, dpToPx(DEFAULT_PADDING), 0);
+            setTextSize(spToPx(DEFAULT_TEXT_SIZE));
+        }
+
+        setAllCaps(false);
+
+    }
+
+    private float spToPx(float sp) {
+        float scaledDensity = getContext().getResources().getDisplayMetrics().scaledDensity;
+        return sp * scaledDensity;
+    }
+
+    public void setTextSize(float textSizeInSp) {
+        super.setTextSize(textSizeInSp);
+    }
+
+    private void setBackgroundDrawable(int radius, int backgroundColor, boolean borderVisible, int borderColor, int borderRadius,int borderWidth) {
+        RoundedButtonDrawable drawable = new RoundedButtonDrawable(radius, backgroundColor, borderVisible, borderColor, borderRadius,borderWidth);
+        setBackground(drawable);
+    }
+
+    public void setTextColor(int color) {
+        super.setTextColor(color);
+    }
+
+    public void setIcon(@DrawableRes int iconResId, int tintColor, boolean isIconLeftSide) {
+        Drawable icon = ContextCompat.getDrawable(getContext(), iconResId);
+        if (icon != null) {
+            icon.setColorFilter(tintColor, android.graphics.PorterDuff.Mode.SRC_IN);
+        }
+        if (isIconLeftSide) {
+            setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+        } else {
+            setCompoundDrawablesWithIntrinsicBounds(null, null, icon, null);
+        }
+    }
+
+    public void setIcon(Drawable icon, int tintColor, boolean isIconLeftSide) {
+        if (icon != null) {
+            icon.setColorFilter(tintColor, android.graphics.PorterDuff.Mode.SRC_IN);
+        }
+        if (isIconLeftSide) {
+            setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+        } else {
+            setCompoundDrawablesWithIntrinsicBounds(null, null, icon, null);
+        }
+    }
+
+    private int dpToPx(int dp) {
+        float density = getContext().getResources().getDisplayMetrics().density;
+        return Math.round(dp * density);
+    }
+
+    public void setButtonHeight(int heightInPx) {
+        int height = dpToPx(heightInPx);
+        ViewGroup.LayoutParams params = getLayoutParams();
+        if (params == null) {
+            params = new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    height
+            );
+        } else {
+            params.height = height;
+        }
+        if (params instanceof ConstraintLayout.LayoutParams) {
+            ConstraintLayout.LayoutParams constraintParams = (ConstraintLayout.LayoutParams) params;
+            constraintParams.height = height;
+        }
+        setLayoutParams(params);
+    }
+
+    // Method to set font family by resource ID
+    public void setFontFamily(int fontResId) {
+        Typeface typeface = ResourcesCompat.getFont(getContext(), fontResId);
+        setTypeface(typeface);
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        if (enabled) {
+            setBackgroundDrawable(dpToPx(DEFAULT_RADIUS), enabledBackgroundColor, DEFAULT_BORDER_VISIBLE, DEFAULT_BORDER_COLOR, dpToPx(DEFAULT_BORDER_RADIUS), dpToPx(DEFAULT_BORDER_WIDTH));
+        } else {
+            setBackgroundDrawable(dpToPx(DEFAULT_RADIUS), disabledBackgroundColor, DEFAULT_BORDER_VISIBLE, DEFAULT_BORDER_COLOR, dpToPx(DEFAULT_BORDER_RADIUS), dpToPx(DEFAULT_BORDER_WIDTH));
+        }
+    }
+}
+
diff --git a/app/src/org/commcare/activities/components/RoundedButtonDrawable.java b/app/src/org/commcare/activities/components/RoundedButtonDrawable.java
new file mode 100644
index 0000000000..291bf8fc16
--- /dev/null
+++ b/app/src/org/commcare/activities/components/RoundedButtonDrawable.java
@@ -0,0 +1,140 @@
+package org.commcare.activities.components;
+
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.Nullable;
+
+public class RoundedButtonDrawable extends Drawable {
+    private int backgroundColor;
+    private float cornerRadius;
+    private boolean borderVisible;
+    private int borderColor;
+    private float borderRadius;
+    private float borderWidth;
+    private Paint backgroundPaint;
+    private Paint borderPaint;
+
+    // Constructor
+    public RoundedButtonDrawable(int cornerRadius, int backgroundColor, boolean borderVisible, int borderColor, float borderRadius, float borderWidth) {
+        this.cornerRadius = cornerRadius;
+        this.backgroundColor = backgroundColor;
+        this.borderVisible = borderVisible;
+        this.borderColor = borderColor;
+        this.borderRadius = borderRadius;
+        this.borderWidth = borderWidth;
+
+        // Initialize background paint
+        backgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        backgroundPaint.setColor(backgroundColor);
+
+        // Initialize border paint if border is visible
+        if (borderVisible) {
+            borderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            borderPaint.setColor(borderColor);
+            borderPaint.setStyle(Paint.Style.STROKE);
+            borderPaint.setStrokeWidth(borderWidth);
+        }
+    }
+
+    // Method to set the background color
+    public void setBackgroundColor(int color) {
+        this.backgroundColor = color;
+        backgroundPaint.setColor(color);
+        invalidateSelf();
+    }
+
+    // Method to get the corner radius
+    public float getCornerRadius() {
+        return cornerRadius;
+    }
+
+    // Method to set the corner radius
+    public void setRadius(float radius) {
+        this.cornerRadius = radius;
+        invalidateSelf();
+    }
+
+    // Method to set border visibility
+    public void setBorderVisible(boolean visible) {
+        this.borderVisible = visible;
+        if (visible && borderPaint == null) {
+            borderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            borderPaint.setColor(borderColor);
+            borderPaint.setStyle(Paint.Style.STROKE);
+            borderPaint.setStrokeWidth(borderWidth);
+        }
+        invalidateSelf();
+    }
+
+    // Method to set border color
+    public void setBorderColor(int color) {
+        this.borderColor = color;
+        if (borderPaint != null) {
+            borderPaint.setColor(color);
+        }
+        invalidateSelf();
+    }
+
+    // Method to set border radius
+    public void setBorderRadius(float radius) {
+        this.borderRadius = radius;
+        invalidateSelf();
+    }
+
+    // Method to set border width
+    public void setBorderWidth(float width) {
+        this.borderWidth = width;
+        if (borderPaint != null) {
+            borderPaint.setStrokeWidth(width);
+        }
+        invalidateSelf();
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        // Draw the background with rounded corners
+        canvas.drawRoundRect(new RectF(getBounds()), cornerRadius, cornerRadius, backgroundPaint);
+
+        // Draw the border if visible
+        if (borderVisible && borderPaint != null) {
+            float halfStrokeWidth = borderPaint.getStrokeWidth() / 2;
+            RectF borderRect = new RectF(getBounds());
+            borderRect.inset(halfStrokeWidth, halfStrokeWidth);
+            canvas.drawRoundRect(borderRect, borderRadius, borderRadius, borderPaint);
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        backgroundPaint.setAlpha(alpha);
+        if (borderPaint != null) {
+            borderPaint.setAlpha(alpha);
+        }
+        invalidateSelf();
+    }
+
+    @Override
+    public void setColorFilter(@Nullable ColorFilter colorFilter) {
+        backgroundPaint.setColorFilter(colorFilter);
+        if (borderPaint != null) {
+            borderPaint.setColorFilter(colorFilter);
+        }
+        invalidateSelf();
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.OPAQUE;
+    }
+
+    private int dpToPx(int dp) {
+        float density = Resources.getSystem().getDisplayMetrics().density;
+        return Math.round(dp * density);
+    }
+}
diff --git a/app/src/org/commcare/views/widgets/IntentWidget.java b/app/src/org/commcare/views/widgets/IntentWidget.java
index 67f38d9f22..384ec755a3 100644
--- a/app/src/org/commcare/views/widgets/IntentWidget.java
+++ b/app/src/org/commcare/views/widgets/IntentWidget.java
@@ -20,6 +20,7 @@
 import android.widget.Toast;
 
 import org.commcare.activities.components.FormEntryConstants;
+import org.commcare.activities.components.RoundedButton;
 import org.commcare.android.javarosa.IntentCallout;
 import org.commcare.logic.PendingCalloutInterface;
 import org.commcare.utils.CompoundIntentList;
@@ -93,7 +94,7 @@ protected IntentWidget(Context context, FormEntryPrompt prompt, Intent in, Inten
         } else {
             mStringAnswer = new TextView(getContext());
         }
-        launchIntentButton = new AppCompatButton(getContext());
+        launchIntentButton = new RoundedButton(getContext());
         setupTextView();
         setupButton();
     }
@@ -124,6 +125,7 @@ private void setupButton() {
                 getButtonLabel(),
                 !mPrompt.isReadOnly());
 
+
         // launch barcode capture intent on click
         launchIntentButton.setOnClickListener(v -> performCallout());
         addView(launchIntentButton);