diff --git a/app/res/layout-land/home_screen.xml b/app/res/layout-land/home_screen.xml
index c75d3d91b..7c9904756 100644
--- a/app/res/layout-land/home_screen.xml
+++ b/app/res/layout-land/home_screen.xml
@@ -1,75 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    style="@style/MainPane"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/MainPane"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
+    android:layout_alignParentStart="true"
     android:layout_alignParentLeft="true"
-    android:layout_alignParentRight="true"
     android:layout_alignParentTop="true"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_alignParentBottom="true"
     android:background="@color/white"
-    android:paddingLeft="@dimen/content_start"
-    android:paddingRight="@dimen/content_start"
+    android:orientation="vertical"
     android:paddingStart="@dimen/content_start"
-    android:layout_alignParentEnd="true"
+    android:paddingLeft="@dimen/content_start"
     android:paddingEnd="@dimen/content_start"
-    android:layout_alignParentStart="true"
+    android:paddingRight="@dimen/content_start"
     tools:viewBindingIgnore="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.cardview.widget.CardView
         android:id="@+id/connect_alert_tile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginStart="5dp"
-        android:padding="10dp"
-        android:layout_marginEnd="5dp"
-        android:background="@drawable/dots_rect_back"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="2dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:shadowColor="@color/connect_light_grey_transparent"
+        android:shadowDx="30"
+        android:shadowDy="30"
+        android:shadowRadius="50"
         android:visibility="gone"
-        >
-        <ImageView
-            android:id="@+id/connect_secondary_phone_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:src="@drawable/phone_heart"
-            />
-        <org.commcare.views.connect.connecttextview.ConnectRegularTextView
-            android:id="@+id/connect_phone_label"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:textSize="16dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
-            app:layout_constraintEnd_toEndOf="parent"
-            />
-        <org.commcare.views.connect.connecttextview.ConnectMediumTextView
-            android:id="@+id/connect_phone_yes_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="10dp"
-            android:textSize="18sp"
-            android:textColor="@color/blue"
-            android:text="@string/connect_payment_confirm_yes"/>
-        <org.commcare.views.connect.connecttextview.ConnectMediumTextView
-            android:id="@+id/connect_phone_no_button"
-            android:layout_width="wrap_content"
+        app:cardBackgroundColor="@color/white"
+        app:cardCornerRadius="10dp"
+        app:cardElevation="5dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="18sp"
-            app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
-            app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
-            android:layout_marginEnd="40dp"
-            android:textColor="@color/blue"
-            android:text="@string/connect_payment_confirm_no"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:padding="10dp"
+            android:visibility="visible">
+
+            <ImageView
+                android:id="@+id/connect_secondary_phone_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/phone_heart"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/black" />
+
+            <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+                android:id="@+id/connect_phone_label"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <org.commcare.views.connect.RoundedButton
+                android:id="@+id/connect_phone_yes_button"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/connect_payment_confirm_yes"
+                android:textColor="@color/blue"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
+                app:roundButtonBackgroundColor="@color/connect_blue_color"
+                app:roundButtonBorderRadius="@dimen/dp48"
+                app:roundButtonIconLeftAlign="false"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="5.0sp" />
+
+            <org.commcare.views.connect.RoundedButton
+                android:id="@+id/connect_phone_no_button"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="@string/connect_payment_confirm_no"
+                android:textColor="@color/blue"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
+                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
+                app:roundButtonBorderColor="@color/connect_blue_color"
+                app:roundButtonBorderVisible="true"
+                app:roundButtonBorderWidth="0.5dp"
+                app:roundButtonIconTintColor="@color/white"
+                app:roundButtonTextColor="@color/connect_blue_color"
+                app:roundButtonTextSize="5.0sp" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -95,44 +127,44 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_marginBottom="15dp"
                     android:orientation="horizontal"
                     android:paddingStart="15dp"
                     android:paddingTop="35dp"
-                    android:layout_marginBottom="15dp"
                     android:paddingEnd="15dp">
 
                     <org.commcare.views.connect.connecttextview.ConnectMediumTextView
                         android:id="@+id/tvConnectMessage"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/connect_job_tile_daily_limit_description"
                         android:layout_marginEnd="10dp"
+                        android:text="@string/connect_job_tile_daily_limit_description"
                         android:textColor="@color/connect_warning_color"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-<!--                    <org.commcare.views.connect.RoundedButton-->
-<!--                        android:id="@+id/btnOverLimit"-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="30dp"-->
-<!--                        android:text="@string/connect_job_tile_daily_limit"-->
-<!--                        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                        app:layout_constraintEnd_toEndOf="parent"-->
-<!--                        app:layout_constraintTop_toTopOf="parent"-->
-<!--                        app:roundButtonTextSize="4sp" />-->
+                    <!--                    <org.commcare.views.connect.RoundedButton-->
+                    <!--                        android:id="@+id/btnOverLimit"-->
+                    <!--                        android:layout_width="wrap_content"-->
+                    <!--                        android:layout_height="30dp"-->
+                    <!--                        android:text="@string/connect_job_tile_daily_limit"-->
+                    <!--                        app:layout_constraintBottom_toBottomOf="parent"-->
+                    <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+                    <!--                        app:layout_constraintTop_toTopOf="parent"-->
+                    <!--                        app:roundButtonTextSize="4sp" />-->
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.cardview.widget.CardView>
 
             <include
-                layout="@layout/view_progress_job_card"
                 android:id="@+id/viewJobCard"
+                layout="@layout/view_progress_job_card"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:layout_marginEnd="10dp"
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="10dp"
-                android:layout_width="match_parent" />
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/home_gridview_buttons"
diff --git a/app/res/layout/fragment_connect_delivery_progress.xml b/app/res/layout/fragment_connect_delivery_progress.xml
index 41325c62e..8ad4218f1 100644
--- a/app/res/layout/fragment_connect_delivery_progress.xml
+++ b/app/res/layout/fragment_connect_delivery_progress.xml
@@ -49,55 +49,89 @@
                     app:layout_constraintEnd_toStartOf="@id/connect_delivery_refresh"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+
+                <androidx.cardview.widget.CardView
                     android:id="@+id/connect_delivery_progress_alert_tile"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginEnd="5dp"
-                    android:background="@drawable/dots_rect_back"
-                    android:visibility="gone"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginBottom="2dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:shadowColor="@color/connect_light_grey_transparent"
+                    android:shadowDx="30"
+                    android:shadowDy="30"
+                    android:shadowRadius="50"
+                    app:cardBackgroundColor="@color/white"
+                    app:cardCornerRadius="10dp"
+                    app:cardElevation="5dp"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/connect_delivery_refresh">
 
-                    <ImageView
-                        android:id="@+id/connect_payment_confirm_icon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/monetary_support"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/connect_payment_confirm_label"
-                        android:layout_width="0dp"
-                        android:textColor="@color/black"
-                        android:layout_height="match_parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@id/connect_payment_confirm_icon"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/connect_payment_confirm_yes_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/connect_payment_confirm_yes"
-                        android:textColor="@color/blue"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/connect_payment_confirm_label" />
-
-                    <TextView
-                        android:id="@+id/connect_payment_confirm_no_button"
-                        android:layout_width="wrap_content"
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="40dp"
-                        android:text="@string/connect_payment_confirm_no"
-                        android:textColor="@color/blue"
-                        app:layout_constraintEnd_toStartOf="@id/connect_payment_confirm_yes_button"
-                        app:layout_constraintTop_toBottomOf="@id/connect_payment_confirm_label" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        android:layout_marginStart="5dp"
+                        android:layout_marginTop="2dp"
+                        android:layout_marginEnd="5dp"
+                        android:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@id/connect_delivery_refresh">
+
+                        <ImageView
+                            android:id="@+id/connect_payment_confirm_icon"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/monetary_support"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+                            android:id="@+id/connect_payment_confirm_label"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:textColor="@color/black"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@id/connect_payment_confirm_icon"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <org.commcare.views.connect.RoundedButton
+                            android:id="@+id/connect_payment_confirm_yes_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="35dp"
+                            android:layout_marginTop="10dp"
+                            android:text="@string/connect_payment_confirm_yes"
+                            android:textColor="@color/blue"
+                            android:textSize="18sp"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/connect_payment_confirm_label"
+                            app:roundButtonBackgroundColor="@color/connect_blue_color"
+                            app:roundButtonBorderRadius="@dimen/dp48"
+                            app:roundButtonIconLeftAlign="false"
+                            app:roundButtonTextColor="@color/white"
+                            app:roundButtonTextSize="5.0sp" />
+
+                        <org.commcare.views.connect.RoundedButton
+                            android:id="@+id/connect_payment_confirm_no_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="35dp"
+                            android:layout_marginTop="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:text="@string/connect_payment_confirm_no"
+                            android:textColor="@color/blue"
+                            android:textSize="18sp"
+                            app:layout_constraintEnd_toStartOf="@id/connect_payment_confirm_yes_button"
+                            app:layout_constraintTop_toBottomOf="@id/connect_payment_confirm_label"
+                            app:roundButtonBorderColor="@color/connect_blue_color"
+                            app:roundButtonBorderVisible="true"
+                            app:roundButtonBorderWidth="0.5dp"
+                            app:roundButtonIconTintColor="@color/white"
+                            app:roundButtonTextColor="@color/connect_blue_color"
+                            app:roundButtonTextSize="5.0sp" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.cardview.widget.CardView>
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -119,18 +153,18 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
+                            android:layout_marginBottom="15dp"
                             android:orientation="horizontal"
                             android:paddingStart="15dp"
                             android:paddingTop="35dp"
-                            android:layout_marginBottom="15dp"
                             android:paddingEnd="15dp">
 
                             <org.commcare.views.connect.connecttextview.ConnectMediumTextView
                                 android:id="@+id/tvConnectMessage"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:text="@string/connect_job_tile_daily_limit_description"
                                 android:layout_marginEnd="10dp"
+                                android:text="@string/connect_job_tile_daily_limit_description"
                                 android:textColor="@color/connect_warning_color"
                                 android:textSize="14sp"
                                 app:layout_constraintStart_toStartOf="parent"
@@ -153,10 +187,10 @@
                         layout="@layout/view_job_card"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginEnd="10dp"
                         android:layout_marginStart="10dp"
-                        android:layout_marginTop="10dp" />
+                        android:layout_marginTop="10dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="10dp" />
                 </RelativeLayout>
             </LinearLayout>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
@@ -165,11 +199,11 @@
             android:id="@+id/connect_delivery_progress_tabs"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
+            android:background="@color/connect_background_color"
             app:tabGravity="fill"
             app:tabIndicator="@drawable/ic_connect_pager_indicator"
             app:tabIndicatorColor="@color/connect_blue_color"
             app:tabInlineLabel="true"
-            android:background="@color/connect_background_color"
             app:tabMode="fixed"
             app:tabSelectedTextColor="@color/connect_blue_color"
             app:tabTextAppearance="@style/TabTextStyle"
diff --git a/app/res/layout/fragment_connect_jobs_list.xml b/app/res/layout/fragment_connect_jobs_list.xml
index 4331f45ca..05625b379 100644
--- a/app/res/layout/fragment_connect_jobs_list.xml
+++ b/app/res/layout/fragment_connect_jobs_list.xml
@@ -4,16 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/connect_fragment_jobs_list"
     android:layout_width="match_parent"
-    android:background="@color/connect_background_color"
     android:layout_height="match_parent"
+    android:background="@color/connect_background_color"
     tools:context="org.commcare.fragments.connect.ConnectJobsListsFragment">
 
     <ImageView
         android:id="@+id/connect_jobs_refresh"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:layout_marginEnd="10dp"
         android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
         android:contentDescription="@string/refresh"
         android:src="@drawable/cloud_backup"
         app:layout_constraintEnd_toEndOf="parent"
@@ -29,79 +29,107 @@
         app:layout_constraintEnd_toStartOf="@id/connect_jobs_refresh"
         app:layout_constraintTop_toTopOf="@+id/connect_jobs_refresh" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.cardview.widget.CardView
         android:id="@+id/connect_alert_tile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="10dp"
-        android:padding="10dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="2dp"
-        android:background="@drawable/dots_rect_back"
-        android:visibility="visible"
+        android:clickable="true"
+        android:focusable="true"
+        android:shadowColor="@color/connect_light_grey_transparent"
+        android:shadowDx="30"
+        android:shadowDy="30"
+        android:shadowRadius="50"
+        app:cardBackgroundColor="@color/white"
+        app:cardCornerRadius="10dp"
+        app:cardElevation="5dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update">
 
-        <ImageView
-            android:id="@+id/connect_secondary_phone_icon"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:src="@drawable/phone_heart"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:padding="10dp"
+            android:visibility="visible">
 
-        <org.commcare.views.connect.connecttextview.ConnectRegularTextView
-            android:id="@+id/connect_phone_label"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:textSize="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
-            app:layout_constraintTop_toTopOf="parent" />
+            <ImageView
+                android:id="@+id/connect_secondary_phone_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/phone_heart"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/black" />
 
-        <org.commcare.views.connect.connecttextview.ConnectMediumTextView
-            android:id="@+id/connect_phone_yes_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:text="@string/connect_payment_confirm_yes"
-            android:textSize="18sp"
-            android:textColor="@color/blue"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
+            <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+                android:id="@+id/connect_phone_label"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <org.commcare.views.connect.connecttextview.ConnectMediumTextView
-            android:id="@+id/connect_phone_no_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:layout_marginEnd="40dp"
-            android:text="@string/connect_payment_confirm_no"
-            android:textColor="@color/blue"
-            app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
-            app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <org.commcare.views.connect.RoundedButton
+                android:id="@+id/connect_phone_yes_button"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:text="@string/connect_payment_confirm_yes"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/blue"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
+                app:roundButtonBackgroundColor="@color/connect_blue_color"
+                app:roundButtonBorderRadius="@dimen/dp48"
+                app:roundButtonIconLeftAlign="false"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="5.0sp" />
+
+            <org.commcare.views.connect.RoundedButton
+                android:id="@+id/connect_phone_no_button"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="@string/connect_payment_confirm_no"
+                android:textColor="@color/blue"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
+                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
+                app:roundButtonBorderColor="@color/connect_blue_color"
+                app:roundButtonBorderVisible="true"
+                app:roundButtonBorderWidth="0.5dp"
+                app:roundButtonIconTintColor="@color/white"
+                app:roundButtonTextColor="@color/connect_blue_color"
+                app:roundButtonTextSize="5.0sp" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
 
     <org.commcare.views.connect.connecttextview.ConnectMediumTextView
         android:id="@+id/connect_no_jobs_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="18sp"
-        android:textAlignment="center"
         android:layout_margin="40dp"
         android:text="@string/connect_no_jobs"
+        android:textAlignment="center"
         android:textColor="@color/blue"
+        android:textSize="18sp"
         android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/connect_alert_tile"/>
+        app:layout_constraintTop_toBottomOf="@id/connect_alert_tile" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvJobList"
-        android:layout_marginTop="10dp"
         android:layout_width="match_parent"
-        tools:listitem="@layout/item_login_connect_home_apps"
         android:layout_height="0dp"
+        android:layout_marginTop="10dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/connect_alert_tile" />
+        app:layout_constraintTop_toBottomOf="@id/connect_alert_tile"
+        tools:listitem="@layout/item_login_connect_home_apps" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/res/layout/home_screen.xml b/app/res/layout/home_screen.xml
index 8cb6ef496..747b4d7ed 100644
--- a/app/res/layout/home_screen.xml
+++ b/app/res/layout/home_screen.xml
@@ -9,58 +9,88 @@
     android:padding="4dp"
     tools:viewBindingIgnore="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.cardview.widget.CardView
         android:id="@+id/connect_alert_tile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
-        android:layout_marginTop="2dp"
-        android:padding="10dp"
-        android:layout_marginEnd="5dp"
-        android:background="@drawable/dots_rect_back"
-        android:visibility="visible">
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="2dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:shadowColor="@color/connect_light_grey_transparent"
+        android:shadowDx="30"
+        android:shadowDy="30"
+        android:shadowRadius="50"
+        app:cardBackgroundColor="@color/white"
+        app:cardCornerRadius="10dp"
+        app:cardElevation="5dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update">
 
-        <ImageView
-            android:id="@+id/connect_secondary_phone_icon"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:contentDescription="@null"
-            android:src="@drawable/phone_heart"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:padding="10dp"
+            android:visibility="visible">
 
-        <org.commcare.views.connect.connecttextview.ConnectRegularTextView
-            android:id="@+id/connect_phone_label"
-            android:layout_width="0dp"
-            android:textSize="16dp"
-            android:layout_height="match_parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
-            app:layout_constraintTop_toTopOf="parent" />
+            <ImageView
+                android:id="@+id/connect_secondary_phone_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/phone_heart"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/black" />
 
-        <org.commcare.views.connect.connecttextview.ConnectMediumTextView
-            android:id="@+id/connect_phone_yes_button"
-            android:layout_width="wrap_content"
-            android:textSize="18sp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:text="@string/connect_payment_confirm_yes"
-            android:textColor="@color/blue"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
+            <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+                android:id="@+id/connect_phone_label"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <org.commcare.views.connect.connecttextview.ConnectMediumTextView
-            android:id="@+id/connect_phone_no_button"
-            android:textSize="18sp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="40dp"
-            android:text="@string/connect_payment_confirm_no"
-            android:textColor="@color/blue"
-            app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
-            app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <org.commcare.views.connect.RoundedButton
+                android:id="@+id/connect_phone_yes_button"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:text="@string/connect_payment_confirm_yes"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/blue"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
+                app:roundButtonBackgroundColor="@color/connect_blue_color"
+                app:roundButtonBorderRadius="@dimen/dp48"
+                app:roundButtonIconLeftAlign="false"
+                app:roundButtonTextColor="@color/white"
+                app:roundButtonTextSize="5.0sp" />
+
+            <org.commcare.views.connect.RoundedButton
+                android:id="@+id/connect_phone_no_button"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="@string/connect_payment_confirm_no"
+                android:textColor="@color/blue"
+                android:textSize="18sp"
+                app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
+                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
+                app:roundButtonBorderColor="@color/connect_blue_color"
+                app:roundButtonBorderVisible="true"
+                app:roundButtonBorderWidth="0.5dp"
+                app:roundButtonIconTintColor="@color/white"
+                app:roundButtonTextColor="@color/connect_blue_color"
+                app:roundButtonTextSize="5.0sp" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/org/commcare/connect/ConnectManager.java b/app/src/org/commcare/connect/ConnectManager.java
index c1ddb0799..7efaa2cf4 100644
--- a/app/src/org/commcare/connect/ConnectManager.java
+++ b/app/src/org/commcare/connect/ConnectManager.java
@@ -57,6 +57,7 @@
 import org.commcare.tasks.templates.CommCareTaskConnector;
 import org.commcare.utils.BiometricsHelper;
 import org.commcare.utils.CrashUtil;
+import org.commcare.views.connect.RoundedButton;
 import org.commcare.views.connect.connecttextview.ConnectMediumTextView;
 import org.commcare.views.connect.connecttextview.ConnectRegularTextView;
 import org.commcare.views.dialogs.StandardAlertDialog;
@@ -293,7 +294,7 @@ public static boolean shouldShowSecondaryPhoneConfirmationTile(Context context)
         return show;
     }
 
-    public static void updateSecondaryPhoneConfirmationTile(Context context, ConstraintLayout tile, boolean show, View.OnClickListener listener) {
+    public static void updateSecondaryPhoneConfirmationTile(Context context, View tile, boolean show, View.OnClickListener listener) {
         tile.setVisibility(show ? View.VISIBLE : View.GONE);
 
         if (show) {
@@ -304,10 +305,10 @@ public static void updateSecondaryPhoneConfirmationTile(Context context, Constra
             ConnectRegularTextView view = tile.findViewById(R.id.connect_phone_label);
             view.setText(message);
 
-            ConnectMediumTextView yesButton = tile.findViewById(R.id.connect_phone_yes_button);
+            RoundedButton yesButton = tile.findViewById(R.id.connect_phone_yes_button);
             yesButton.setOnClickListener(listener);
 
-            ConnectMediumTextView noButton = tile.findViewById(R.id.connect_phone_no_button);
+            RoundedButton noButton = tile.findViewById(R.id.connect_phone_no_button);
             noButton.setOnClickListener(v -> {
                 tile.setVisibility(View.GONE);
             });
diff --git a/app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java b/app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java
index 13a09cd5c..4b89355ee 100644
--- a/app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java
+++ b/app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java
@@ -27,6 +27,7 @@
 import org.commcare.connect.network.ConnectNetworkHelper;
 import org.commcare.dalvik.R;
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
+import org.commcare.views.connect.RoundedButton;
 import org.commcare.views.connect.connecttextview.ConnectBoldTextView;
 import org.commcare.views.connect.connecttextview.ConnectMediumTextView;
 import org.commcare.views.connect.connecttextview.ConnectRegularTextView;
@@ -46,7 +47,7 @@ public class ConnectDeliveryProgressFragment extends Fragment {
     private TextView updateText;
 
     private ConstraintLayout paymentAlertTile;
-    private TextView paymentAlertText;
+    private ConnectRegularTextView paymentAlertText;
     private ConnectJobPaymentRecord paymentToConfirm = null;
     private boolean showLearningLaunch = true;
     private boolean showDeliveryLaunch = true;
@@ -93,13 +94,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         paymentAlertTile = view.findViewById(R.id.connect_delivery_progress_alert_tile);
         paymentAlertText = view.findViewById(R.id.connect_payment_confirm_label);
-        TextView paymentAlertNoButton = view.findViewById(R.id.connect_payment_confirm_no_button);
+        RoundedButton paymentAlertNoButton = view.findViewById(R.id.connect_payment_confirm_no_button);
         paymentAlertNoButton.setOnClickListener(v -> {
             updatePaymentConfirmationTile(getContext(), true);
             FirebaseAnalyticsUtil.reportCccPaymentConfirmationInteraction(false);
         });
 
-        TextView paymentAlertYesButton = view.findViewById(R.id.connect_payment_confirm_yes_button);
+        RoundedButton paymentAlertYesButton = view.findViewById(R.id.connect_payment_confirm_yes_button);
         paymentAlertYesButton.setOnClickListener(v -> {
             final ConnectJobPaymentRecord payment = paymentToConfirm;
             //Dismiss the tile
diff --git a/app/src/org/commcare/fragments/connect/ConnectJobsListsFragment.java b/app/src/org/commcare/fragments/connect/ConnectJobsListsFragment.java
index a6fe048cd..2b36b3634 100644
--- a/app/src/org/commcare/fragments/connect/ConnectJobsListsFragment.java
+++ b/app/src/org/commcare/fragments/connect/ConnectJobsListsFragment.java
@@ -19,6 +19,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.NavDirections;
@@ -61,7 +62,7 @@
  * @author dviggiano
  */
 public class ConnectJobsListsFragment extends Fragment {
-    private ConstraintLayout connectTile;
+    private CardView connectTile;
     private TextView updateText;
     private IConnectAppLauncher launcher;
     ArrayList<ConnectLoginJobListModel> jobList;