diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
index 62ada1e9ed..624e38a6d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
@@ -22,8 +22,10 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
 
   protected open val withDim: Boolean = false
 
+  protected open val themeResId: Int = R.style.Theme_Signal_RoundedBottomSheet
+
   override fun onCreate(savedInstanceState: Bundle?) {
-    setStyle(STYLE_NORMAL, R.style.Theme_Signal_RoundedBottomSheet)
+    setStyle(STYLE_NORMAL, themeResId)
     super.onCreate(savedInstanceState)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
index 16c3261f3a..4974eef1c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
@@ -41,6 +41,8 @@ class StoryDirectReplyDialogFragment :
   private var isRequestingReactWithAny = false
   private var isReactClosingAfterSend = false
 
+  override val themeResId: Int = R.style.Theme_Signal_RoundedBottomSheet_Stories
+
   private val viewModel: StoryDirectReplyViewModel by viewModels(
     factoryProducer = {
       StoryDirectReplyViewModel.Factory(storyId, recipientId, StoryDirectReplyRepository(requireContext()))
diff --git a/app/src/main/res/layout/stories_reply_to_story_composer_content.xml b/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
index fff3129521..7abdd8982a 100644
--- a/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
+++ b/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/signal_background_tertiary"
+    android:background="@color/signal_colorSurface"
     android:paddingTop="12dp">
 
     <org.thoughtcrime.securesms.components.FromTextView
@@ -14,7 +14,7 @@
         android:layout_marginStart="18dp"
         android:layout_marginEnd="6dp"
         android:textAppearance="@style/Signal.Text.Caption"
-        android:textColor="@color/signal_inverse_transparent_60"
+        android:textColor="@color/signal_colorOnSurfaceVariant"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/bubble"
         app:layout_constraintEnd_toEndOf="parent"
@@ -31,7 +31,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        android:background="@drawable/rounded_rectangle_secondary_18"
+        android:background="@drawable/rounded_rectangle_surface_variant"
         android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/reply_reaction_switch"
@@ -81,6 +81,7 @@
             android:layout_marginTop="8dp"
             android:background="?selectableItemBackgroundBorderless"
             app:force_outline="true"
+            app:tint="@color/signal_colorOnSurface"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_goneMarginTop="0dp" />
@@ -104,7 +105,7 @@
             android:contentDescription="@string/StoryReplyComposer__react_to_this_story"
             android:padding="6dp"
             app:srcCompat="@drawable/ic_add_reaction_outline_24"
-            app:tint="@color/signal_icon_tint_primary" />
+            app:tint="@color/signal_colorOnSurface" />
 
         <ImageView
             android:id="@+id/reply"
@@ -114,7 +115,7 @@
             android:background="@drawable/circle_tintable"
             android:contentDescription="@string/StoryReplyComposer__react_to_this_story"
             android:padding="6dp"
-            app:backgroundTint="@color/core_ultramarine"
+            app:backgroundTint="@color/signal_light_colorPrimary"
             app:srcCompat="@drawable/ic_send_24" />
     </ViewSwitcher>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a77788acb4..d8cbdf58f8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -579,11 +579,11 @@
         <item name="mediaKeyboardBackgroundColor">@color/signal_colorSurface2</item>
         <item name="mediaKeyboardBottomBarBackgroundColor">@color/signal_colorSurface5</item>
 
-        <item name="android:textColorPrimary">@color/core_grey_05</item>
+        <item name="android:textColorPrimary">@color/signal_colorOnSurface</item>
 
-        <item name="colorAccent">@color/core_ultramarine_light</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
 
-        <item name="android:navigationBarColor" tools:ignore="NewApi">@color/signal_background_primary</item>
+        <item name="android:navigationBarColor" tools:ignore="NewApi">@color/signal_colorSurface</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
         <item name="android:statusBarColor" tools:ignore="NewApi">@color/transparent</item>
     </style>