diff --git a/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml b/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml
index 1b0e41c7f3..fc25406752 100644
--- a/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml
+++ b/app/src/main/res/layout/callee_must_accept_message_request_dialog_fragment.xml
@@ -26,9 +26,9 @@
         app:lineHeight="22sp"
         tools:text="+1234567890 will get a message request from you. You can call once your message request is accepted." />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/okay"
-        style="@style/Widget.Signal.Button.CalleeDialog"
+        style="@style/Signal.Widget.Button.Large.Tonal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/group_link_share_bottom_sheet.xml b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
index 13590c32af..2a8c5e7480 100644
--- a/app/src/main/res/layout/group_link_share_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
@@ -20,54 +20,66 @@
             android:id="@+id/group_link_bottom_sheet_hint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="@dimen/dsl_settings_gutter"
+            android:layout_marginEnd="@dimen/dsl_settings_gutter"
             android:layout_marginBottom="8dp"
             android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.Signal.Body2"
+            android:textAppearance="@style/Signal.Text.BodyMedium"
             android:textColor="@color/signal_text_secondary"
             android:visibility="gone"
             tools:text="@string/GroupLinkBottomSheet_share_hint_requiring_approval"
             tools:visibility="visible" />
 
-        <Button
+        <TextView
             android:id="@+id/group_link_bottom_sheet_share_via_signal_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
+            android:background="?selectableItemBackground"
+            android:drawablePadding="16dp"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/dsl_settings_gutter"
+            android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_share_via_signal"
+            android:textAppearance="@style/Signal.Text.BodyLarge"
             app:drawableStartCompat="@drawable/ic_message_tinted_bitmap_24" />
 
-        <Button
+        <TextView
             android:id="@+id/group_link_bottom_sheet_copy_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
+            android:background="?selectableItemBackground"
+            android:drawablePadding="16dp"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/dsl_settings_gutter"
+            android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_copy"
+            android:textAppearance="@style/Signal.Text.BodyLarge"
             app:drawableStartCompat="@drawable/ic_copy_24_tinted" />
 
-        <Button
+        <TextView
             android:id="@+id/group_link_bottom_sheet_qr_code_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
+            android:background="?selectableItemBackground"
+            android:drawablePadding="16dp"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/dsl_settings_gutter"
+            android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_qr_code"
+            android:textAppearance="@style/Signal.Text.BodyLarge"
             app:drawableStartCompat="@drawable/ic_qrcode_24_tinted" />
 
-        <Button
+        <TextView
             android:id="@+id/group_link_bottom_sheet_share_via_system_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
+            android:background="?selectableItemBackground"
+            android:drawablePadding="16dp"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/dsl_settings_gutter"
+            android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_share"
+            android:textAppearance="@style/Signal.Text.BodyLarge"
             app:drawableStartCompat="@drawable/ic_share_24_tinted" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/message_details_recipient.xml b/app/src/main/res/layout/message_details_recipient.xml
index cabd935bdc..93502c6b73 100644
--- a/app/src/main/res/layout/message_details_recipient.xml
+++ b/app/src/main/res/layout/message_details_recipient.xml
@@ -3,7 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/group_media_card"
-    style="@style/Widget.Signal.CardView.PreferenceRow"
+    app:cardBackgroundColor="?android:attr/windowBackground"
+    app:cardCornerRadius="0dp"
+    app:cardElevation="0dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/message_details_recipient_header.xml b/app/src/main/res/layout/message_details_recipient_header.xml
index 2e3c77528e..3138ee25a0 100644
--- a/app/src/main/res/layout/message_details_recipient_header.xml
+++ b/app/src/main/res/layout/message_details_recipient_header.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView 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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/group_media_card"
-    style="@style/Widget.Signal.CardView.PreferenceRow"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?android:attr/windowBackground"
+    app:cardCornerRadius="0dp"
+    app:cardElevation="0dp">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -28,8 +30,8 @@
             android:id="@+id/recipient_header_delivery_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:iconColor="@color/signal_inverse_primary"
-            android:layout_gravity="end|center_vertical" />
+            android:layout_gravity="end|center_vertical"
+            app:iconColor="@color/signal_inverse_primary" />
 
     </FrameLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index 32ffc5a5f8..bfd6d5b000 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -121,126 +121,144 @@
 
             <include layout="@layout/dsl_divider_item" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_block_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/RecipientBottomSheet_block"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_block_tinted_24"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_unblock_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/RecipientBottomSheet_unblock"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_block_tinted_24"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_remove_from_group_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/RecipientBottomSheet_remove_from_group"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_leave_tinted_24"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_make_group_admin_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/RecipientBottomSheet_make_admin"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_group_24"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_remove_group_admin_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/RecipientBottomSheet_remove_as_admin"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_group_24"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_add_to_group_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_group_24"
                 tools:text="@string/RecipientBottomSheet_add_to_a_group"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_add_contact_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/RecipientBottomSheet_add_to_contacts"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_plus_24"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_contact_details_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/ConversationSettingsFragment__contact_details"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
                 app:drawableStartCompat="@drawable/ic_profile_circle_24"
                 tools:visibility="visible" />
 
-            <Button
+            <TextView
                 android:id="@+id/rbs_view_safety_number_button"
-                style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="?selectableItemBackground"
+                android:drawablePadding="16dp"
+                android:gravity="center_vertical"
                 android:minHeight="56dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:paddingStart="@dimen/dsl_settings_gutter"
+                android:paddingEnd="@dimen/dsl_settings_gutter"
                 android:text="@string/RecipientBottomSheet_view_safety_number"
                 android:textAppearance="@style/Signal.Text.BodyLarge"
                 android:visibility="gone"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 727f009621..b62d4da5ea 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -444,40 +444,6 @@
         </attr>
     </declare-styleable>
 
-    <style name="Widget.Signal.Button.TextButton" parent="Widget.AppCompat.Button.Borderless">
-        <item name="android:textAppearance">@style/TextAppearance.Signal.Body2</item>
-    </style>
-
-    <style name="Widget.Signal.Button.TextButton.Drawable">
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:drawablePadding">20dp</item>
-        <item name="android:background">?attr/selectableItemBackground</item>
-        <item name="android:textAppearance">@style/Signal.Text.Body</item>
-    </style>
-
-    <style name="Widget.Signal.Button.TextButton.Red" >
-        <item name="android:textColor">@color/core_red</item>
-    </style>
-
-    <style name="Widget.Signal.Button.TextButton.Ultramarine" >
-        <item name="android:textColor">@color/ultramarine_text_button</item>
-    </style>
-
-    <style name="Widget.Signal.Button.TextButton.Drawable.Ultramarine" >
-        <item name="android:textColor">@color/ultramarine_text_button</item>
-    </style>
-
-    <style name="Widget.Signal.Button.CalleeDialog" parent="Widget.AppCompat.Button">
-        <item name="android:textColor">@color/core_ultramarine</item>
-        <item name="android:background">@drawable/callee_dialog_button_background</item>
-    </style>
-
-    <style name="Widget.Signal.CardView.PreferenceRow" parent="Widget.MaterialComponents.CardView">
-        <item name="cardCornerRadius">0dp</item>
-        <item name="cardElevation">0dp</item>
-        <item name="cardBackgroundColor">?android:attr/windowBackground</item>
-    </style>
-
     <style name="Widget.Signal.Button.Icon.Circular" parent="Widget.MaterialComponents.Button.Icon">
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>