diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
index 28998c8d7..5a01f67b3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
@@ -10,7 +10,6 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -69,15 +68,15 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
   private TextView                 fullName;
   private TextView                 about;
   private TextView                 usernameNumber;
-  private Button                   blockButton;
-  private Button                   unblockButton;
-  private Button                   addContactButton;
-  private Button                   contactDetailsButton;
-  private Button                   addToGroupButton;
-  private Button                   viewSafetyNumberButton;
-  private Button                   makeGroupAdminButton;
-  private Button                   removeAdminButton;
-  private Button                   removeFromGroupButton;
+  private TextView                 blockButton;
+  private TextView                 unblockButton;
+  private TextView                 addContactButton;
+  private TextView                 contactDetailsButton;
+  private TextView                 addToGroupButton;
+  private TextView                 viewSafetyNumberButton;
+  private TextView                 makeGroupAdminButton;
+  private TextView                 removeAdminButton;
+  private TextView                 removeFromGroupButton;
   private ProgressBar              adminActionBusy;
   private View                     noteToSelfDescription;
   private View                     buttonStrip;
diff --git a/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml b/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
index 7e24938bd..b75355a87 100644
--- a/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
@@ -14,7 +14,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsLearnMore_legacy_vs_new_groups"
-        android:textAppearance="@style/TextAppearance.Signal.Title2.Bold"
+        android:textAppearance="@style/Signal.Text.TitleLarge"
         android:textColor="@color/signal_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1_header"
         app:layout_constraintEnd_toEndOf="parent"
@@ -30,7 +30,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsLearnMore_what_are_legacy_groups"
-        android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
+        android:textAppearance="@style/Signal.Text.TitleSmall"
         android:textColor="@color/signal_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +46,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsLearnMore_paragraph_1"
-        android:textAppearance="@style/TextAppearance.Signal.Body2"
+        android:textAppearance="@style/Signal.Text.BodyMedium"
         android:textColor="@color/signal_text_secondary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_header"
         app:layout_constraintEnd_toEndOf="parent"
@@ -62,7 +62,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsLearnMore_can_i_upgrade_a_legacy_group"
-        android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
+        android:textAppearance="@style/Signal.Text.TitleSmall"
         android:textColor="@color/signal_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_a"
         app:layout_constraintEnd_toEndOf="parent"
@@ -78,7 +78,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsLearnMore_paragraph_2"
-        android:textAppearance="@style/TextAppearance.Signal.Body2"
+        android:textAppearance="@style/Signal.Text.BodyMedium"
         android:textColor="@color/signal_text_secondary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_b"
         app:layout_constraintEnd_toEndOf="parent"
@@ -94,7 +94,7 @@
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsLearnMore_paragraph_3"
-        android:textAppearance="@style/TextAppearance.Signal.Body2"
+        android:textAppearance="@style/Signal.Text.BodyMedium"
         android:textColor="@color/signal_text_secondary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1"
         app:layout_constraintEnd_toEndOf="parent"
@@ -104,9 +104,9 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/lbs_ok_button"
-        style="@style/Signal.Widget.Button.Large.Primary"
+        style="@style/Signal.Widget.Button.Large.Tonal"
         android:layout_width="match_parent"
-        android:layout_height="64dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:layout_marginTop="48dp"
         android:layout_marginEnd="32dp"
diff --git a/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml b/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
index b46f2ab4d..d63622d34 100644
--- a/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
+++ b/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsV1MigrationInitiation_upgrade_to_new_group"
-        android:textAppearance="@style/TextAppearance.Signal.Title1"
+        android:textAppearance="@style/Signal.Text.HeadlineMedium"
         android:textColor="@color/signal_text_primary"
         android:gravity="center" />
 
@@ -48,7 +48,7 @@
                     android:layout_marginStart="20dp"
                     android:layout_marginEnd="14dp"
                     android:text="@string/GroupsV1MigrationInitiation_new_groups_have_features_like_mentions"
-                    android:textAppearance="@style/TextAppearance.Signal.Body1"
+                    android:textAppearance="@style/Signal.Text.BodyLarge"
                     android:textColor="@color/signal_text_primary" />
 
             </LinearLayout>
@@ -71,7 +71,7 @@
                     android:layout_marginStart="20dp"
                     android:layout_marginEnd="14dp"
                     android:text="@string/GroupsV1MigrationInitiation_all_message_history_and_media_will_be_kept"
-                    android:textAppearance="@style/TextAppearance.Signal.Body1"
+                    android:textAppearance="@style/Signal.Text.BodyLarge"
                     android:textColor="@color/signal_text_primary" />
 
             </LinearLayout>
@@ -109,7 +109,7 @@
                         android:id="@+id/gv1_migrate_invite_title"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
-                        android:textAppearance="@style/TextAppearance.Signal.Body1"
+                        android:textAppearance="@style/Signal.Text.BodyLarge"
                         android:textColor="@color/signal_text_primary"
                         tools:text="Plurized string for invited members." />
 
@@ -150,7 +150,7 @@
                         android:id="@+id/gv1_migrate_ineligible_title"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
-                        android:textAppearance="@style/TextAppearance.Signal.Body1"
+                        android:textAppearance="@style/Signal.Text.BodyLarge"
                         android:textColor="@color/signal_text_primary"
                         tools:text="Plurized string for ineligible members." />
 
@@ -170,8 +170,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:padding="20dp"
-                style="@style/Signal.Widget.Button.Large.Primary"
+                style="@style/Signal.Widget.Button.Large.Tonal"
                 android:text="@string/GroupsV1MigrationInitiation_upgrade_this_group" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml b/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml
index a9b4e19d3..20cc2168b 100644
--- a/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/groupsv1_migration_learn_more_bottom_sheet.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsV1MigrationLearnMore_what_are_new_groups"
-        android:textAppearance="@style/TextAppearance.Signal.Title1"
+        android:textAppearance="@style/Signal.Text.HeadlineMedium"
         android:textColor="@color/signal_text_primary"
         android:gravity="center" />
 
@@ -48,7 +48,7 @@
                     android:layout_marginStart="20dp"
                     android:layout_marginEnd="14dp"
                     android:text="@string/GroupsV1MigrationLearnMore_new_groups_have_features_like_mentions"
-                    android:textAppearance="@style/TextAppearance.Signal.Body1"
+                    android:textAppearance="@style/Signal.Text.BodyLarge"
                     android:textColor="@color/signal_text_primary" />
 
             </LinearLayout>
@@ -71,7 +71,7 @@
                     android:layout_marginStart="20dp"
                     android:layout_marginEnd="14dp"
                     android:text="@string/GroupsV1MigrationLearnMore_all_message_history_and_media_has_been_kept"
-                    android:textAppearance="@style/TextAppearance.Signal.Body1"
+                    android:textAppearance="@style/Signal.Text.BodyLarge"
                     android:textColor="@color/signal_text_primary" />
 
             </LinearLayout>
@@ -102,7 +102,7 @@
                         android:id="@+id/gv1_learn_more_pending_title"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
-                        android:textAppearance="@style/TextAppearance.Signal.Body1"
+                        android:textAppearance="@style/Signal.Text.BodyLarge"
                         android:textColor="@color/signal_text_primary"
                         tools:text="Plurized string for pending members." />
 
@@ -143,7 +143,7 @@
                         android:id="@+id/gv1_learn_more_dropped_title"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
-                        android:textAppearance="@style/TextAppearance.Signal.Body1"
+                        android:textAppearance="@style/Signal.Text.BodyLarge"
                         android:textColor="@color/signal_text_primary"
                         tools:text="Plurized string for ineligible members." />
 
@@ -163,8 +163,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:padding="20dp"
-                style="@style/Signal.Widget.Button.Large.Primary"
+                style="@style/Signal.Widget.Button.Large.Tonal"
                 android:text="@android:string/ok" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/show_admin_bottom_sheet.xml b/app/src/main/res/layout/show_admin_bottom_sheet.xml
index 3486f841c..c30040f7c 100644
--- a/app/src/main/res/layout/show_admin_bottom_sheet.xml
+++ b/app/src/main/res/layout/show_admin_bottom_sheet.xml
@@ -25,7 +25,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:text="@string/ConversationActivity_message_an_admin"
-        style="@style/Signal.Text.Title.BottomSheet"
+        style="@style/Signal.Text.TitleSmall"
         app:layout_constraintTop_toBottomOf="@id/show_admin_handle" />
 
     <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
diff --git a/app/src/main/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml
index 11333987f..6cf024754 100644
--- a/app/src/main/res/values/text_styles.xml
+++ b/app/src/main/res/values/text_styles.xml
@@ -116,16 +116,6 @@
         <item name="android:shadowRadius">0</item>
     </style>
 
-    <style name="Signal.Text.Caption.MessageReceived">
-        <item name="android:textColor">@color/conversation_item_sent_text_secondary_color</item>
-        <item name="android:shadowRadius">0</item>
-        <item name="android:alpha">0.7</item>
-    </style>
-
-    <style name="Signal.Text.Caption.MessageImageOverlay">
-        <item name="android:textColor">@color/core_white</item>
-    </style>
-
     <style name="Signal.Text.Giant" parent="@style/TextAppearance.AppCompat.Display1">
         <item name="android:textSize">48sp</item>
         <item name="android:textColor">@color/signal_text_primary</item>
@@ -265,13 +255,6 @@
     <style name="Signal.Text.Title.SettingsBio">
     </style>
 
-    <style name="Signal.Text.Title.BottomSheet" parent="">
-        <item name="android:textSize">16sp</item>
-        <item name="android:lineSpacingExtra">4sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:letterSpacing" tools:ignore="NewApi">0.01</item>
-    </style>
-
     <!-- endregion -->
 
 </resources>
\ No newline at end of file