diff --git a/app/src/main/res/layout/message_details_header.xml b/app/src/main/res/layout/message_details_header.xml
index ab131c0e1f..e20d6e4ccb 100644
--- a/app/src/main/res/layout/message_details_header.xml
+++ b/app/src/main/res/layout/message_details_header.xml
@@ -61,17 +61,13 @@
                 app:drawableStartCompat="@drawable/ic_info_outline_message_details_24"
                 android:gravity="center_vertical" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/message_details_header_resend_button"
                 android:layout_width="wrap_content"
-                android:layout_height="38sp"
-                style="@style/InfoButton"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
+                android:layout_height="wrap_content"
+                style="@style/Signal.Widget.Button.Medium.Tonal"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_refresh_white_18dp"
+                app:icon="@drawable/ic_refresh_white_18dp"
                 android:text="@string/message_recipients_list_item__resend"
                 android:visibility="gone"
                 tools:visibility="visible" />
diff --git a/app/src/main/res/layout/message_details_recipient.xml b/app/src/main/res/layout/message_details_recipient.xml
index 93502c6b73..ff3ad90205 100644
--- a/app/src/main/res/layout/message_details_recipient.xml
+++ b/app/src/main/res/layout/message_details_recipient.xml
@@ -1,36 +1,36 @@
 <?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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     app:cardBackgroundColor="?android:attr/windowBackground"
     app:cardCornerRadius="0dp"
-    app:cardElevation="0dp"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    app:cardElevation="0dp">
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp"
         android:paddingStart="@dimen/dsl_settings_gutter"
-        android:paddingEnd="@dimen/dsl_settings_gutter">
+        android:paddingTop="12dp"
+        android:paddingEnd="@dimen/dsl_settings_gutter"
+        android:paddingBottom="12dp">
 
         <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/message_details_recipient_avatar"
-            android:foreground="@drawable/contact_photo_background"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginEnd="16dp"
-            android:cropToPadding="true"
-            tools:src="@drawable/ic_contact_picture"
             android:contentDescription="@string/SingleContactSelectionActivity_contact_photo"
-            app:layout_constraintStart_toStartOf="parent"
+            android:cropToPadding="true"
+            android:foreground="@drawable/contact_photo_background"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/message_details_recipient_name"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            tools:src="@drawable/ic_contact_picture" />
 
         <org.thoughtcrime.securesms.badges.BadgeImageView
             android:id="@+id/message_details_recipient_badge"
@@ -45,58 +45,57 @@
 
         <org.thoughtcrime.securesms.components.FromTextView
             android:id="@+id/message_details_recipient_name"
+            style="@style/Signal.Text.BodyLarge"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="4dp"
-            android:textColor="@color/signal_text_primary"
-            android:singleLine="true"
-            tools:text="Jules Bonnot"
             android:ellipsize="marquee"
-            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_avatar"
-            app:layout_constraintEnd_toStartOf="@+id/message_details_recipient_ud_indicator"
-            app:layout_constraintTop_toTopOf="parent"
+            android:singleLine="true"
+            android:textColor="@color/signal_colorOnSurface"
             app:layout_constraintBottom_toTopOf="@+id/message_details_recipient_error_description"
-            style="@style/Signal.Text.Body"/>
+            app:layout_constraintEnd_toStartOf="@+id/message_details_recipient_ud_indicator"
+            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_avatar"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Jules Bonnot" />
 
-        <TextView android:id="@+id/message_details_recipient_error_description"
+        <TextView
+            android:id="@+id/message_details_recipient_error_description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#FFF44336"
             android:visibility="gone"
-            tools:visibility="gone"
-            tools:text="New identity"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/message_details_recipient_name"
             app:layout_constraintTop_toBottomOf="@+id/message_details_recipient_name"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            tools:text="New identity"
+            tools:visibility="gone" />
 
         <TextView
             android:id="@+id/message_details_recipient_timestamp"
+            style="@style/Signal.Text.BodyMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/signal_text_secondary"
-            tools:text="1:32 pm"
-            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_conflict_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            android:textColor="@color/signal_colorSurfaceVariant"
             app:layout_constraintBottom_toBottomOf="parent"
-            style="@style/Signal.Text.Preview"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_conflict_button"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="1:32 pm" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/message_details_recipient_conflict_button"
+            style="@style/Signal.Widget.Button.Medium.Tonal"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            style="@style/ErrorButton"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
+            android:layout_height="wrap_content"
             android:drawableStart="@drawable/ic_error_white_18dp"
             android:text="@string/message_recipients_list_item__view"
+            android:textColor="@color/signal_colorOnPrimary"
             android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_ud_indicator"
-            app:layout_constraintEnd_toStartOf="@+id/message_details_recipient_timestamp"
-            app:layout_constraintTop_toTopOf="parent"
+            app:backgroundTint="@color/signal_colorError"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/message_details_recipient_timestamp"
+            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_ud_indicator"
+            app:layout_constraintTop_toTopOf="parent"
             tools:visibility="gone" />
 
         <androidx.appcompat.widget.AppCompatImageView
@@ -105,12 +104,12 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="9dp"
-            app:srcCompat="@drawable/ic_unidentified_delivery"
             android:tint="@color/signal_text_hint"
-            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_name"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/message_details_recipient_conflict_button"
+            app:layout_constraintStart_toEndOf="@+id/message_details_recipient_name"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:srcCompat="@drawable/ic_unidentified_delivery" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml
index 4313605de5..fcdb9e3d61 100644
--- a/app/src/main/res/values/signal_styles.xml
+++ b/app/src/main/res/values/signal_styles.xml
@@ -43,7 +43,6 @@
 
     <style name="Signal.Widget.Button.Medium.Primary" parent="@style/Signal.Widget.Button.Base.Primary">
         <item name="android:minHeight">40dp</item>
-        <item name="cornerRadius">8dp</item>
     </style>
 
     <style name="Signal.Widget.Button.Small.Primary" parent="Widget.Material3.Button.OutlinedButton">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf15f49438..6aa70af46f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2261,8 +2261,8 @@
     <string name="media_overview_activity__no_media">No media</string>
 
     <!-- message_recipients_list_item -->
-    <string name="message_recipients_list_item__view">VIEW</string>
-    <string name="message_recipients_list_item__resend">RESEND</string>
+    <string name="message_recipients_list_item__view">View</string>
+    <string name="message_recipients_list_item__resend">Resend</string>
 
     <!-- Displayed in a toast when user long presses an item in MyStories -->
     <string name="MyStoriesFragment__copied_sent_timestamp_to_clipboard">Copied sent timestamp to clipboard.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b62d4da5ea..17b0d26cf1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -265,21 +265,6 @@
     <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
     </style>
 
-    <style name="MaterialButton">
-        <item name="android:elevation" tools:ignore="NewApi">1dp</item>
-        <item name="android:translationZ" tools:ignore="NewApi">1dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="InfoButton" parent="@style/MaterialButton">
-        <item name="android:background">@drawable/info_round</item>
-    </style>
-
-    <style name="ErrorButton" parent="@style/MaterialButton">
-        <item name="android:background">@drawable/error_round</item>
-    </style>
-
     <style name="ComposeEditText" parent="@style/Signal.Text.Body">
         <item name="android:padding">2dp</item>
         <item name="android:background">@null</item>
@@ -310,13 +295,6 @@
            clear out android:textOn and android:textOff, to avoid the default
            text label behavior of the ToggleButton class.) -->
 
-    <style name="WebRtcCallCompoundButton">
-        <item name="android:layout_height">31dp</item>
-        <item name="android:layout_width">31dp</item>
-        <item name="android:textOn">@null</item>
-        <item name="android:textOff">@null</item>
-    </style>
-
     <style name="WebRtcCallV2CompoundButton">
         <item name="android:layout_height">@dimen/webrtc_button_size</item>
         <item name="android:layout_width">@dimen/webrtc_button_size</item>