diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
index 61dccb0b73..ff9ecb0148 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
@@ -1,12 +1,14 @@
 package org.thoughtcrime.securesms.mediasend.v2.review
 
 import android.content.DialogInterface
+import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.ContextThemeWrapper
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.ViewCompat
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
@@ -226,6 +228,9 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
 
     Recipient.live(recipientId).observe(viewLifecycleOwner) { recipient ->
       this.recipient = recipient
+
+      val confirmButton = requireView().findViewById<View>(R.id.confirm_button)
+      ViewCompat.setBackgroundTintList(confirmButton, ColorStateList.valueOf(recipient.chatColors.asSingleColor()))
       mentionsViewModel.onRecipientChange(recipient)
 
       binding.content.addAMessageInput.setMentionValidator { annotations ->
diff --git a/app/src/main/res/drawable/v2_media_add_a_message_check.xml b/app/src/main/res/drawable/v2_media_add_a_message_check.xml
deleted file mode 100644
index 80db8d1b45..0000000000
--- a/app/src/main/res/drawable/v2_media_add_a_message_check.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="32dp"
-                android:height="32dp" />
-            <solid android:color="@color/core_ultramarine" />
-            <padding
-                android:bottom="4dp"
-                android:left="4dp"
-                android:right="4dp"
-                android:top="4dp" />
-        </shape>
-    </item>
-    <item android:drawable="@drawable/symbol_check_white_24" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml b/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml
index 0c21ec5c5b..6d1da65a75 100644
--- a/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml
+++ b/app/src/main/res/layout/v2_media_add_message_dialog_fragment_content.xml
@@ -110,18 +110,21 @@
         tools:text="50"
         tools:visibility="visible" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/confirm_button"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="2dp"
-        android:padding="6dp"
+        android:background="@color/signal_colorSecondaryContainer"
         android:contentDescription="@string/MediaReviewFragment__finish_adding_a_message_accessibility_label"
+        android:padding="6dp"
+        android:scaleType="centerInside"
         app:layout_constraintBottom_toTopOf="@id/emoji_drawer_stub"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/input_barrier"
-        app:srcCompat="@drawable/v2_media_add_a_message_check" />
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
+        app:srcCompat="@drawable/symbol_check_white_24" />
 
     <ViewStub
         android:id="@+id/emoji_drawer_stub"