diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
index 0a67a630f3..99a7931b35 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
@@ -218,6 +218,7 @@ public final class SpanUtil {
       public void updateDrawState(@NonNull TextPaint ds) {
         super.updateDrawState(ds);
         ds.setUnderlineText(false);
+        ds.setColor(context.getResources().getColor(R.color.signal_accent_primary));
       }
     }, start, start + clickable.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 148de0f597..398fb526eb 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -150,6 +150,7 @@
 
         <!-- Material 3 -->
         <item name="colorPrimary">@color/signal_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/signal_colorPrimary</item>
         <item name="colorPrimaryContainer">@color/signal_colorPrimaryContainer</item>
         <item name="colorSecondary">@color/signal_colorSecondary</item>
         <item name="colorSecondaryContainer">@color/signal_colorSecondaryContainer</item>
@@ -164,6 +165,10 @@
         <item name="colorOnSurfaceVariant">@color/signal_colorOnSurfaceVariant</item>
         <item name="colorOnBackground">@color/signal_colorOnBackground</item>
         <item name="colorOutline">@color/signal_colorOutline</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
+        <item name="colorControlActivated">@color/signal_colorPrimary</item>
+        <item name="colorControlHighlight">@color/transparent_black_10</item>
+
         <item name="textAppearanceBodyMedium">@style/Signal.Text.BodyMedium</item>
         <item name="textAppearanceBodyLarge">@style/Signal.Text.BodyLarge</item>
         <item name="textAppearanceLabelLarge">@style/Signal.Text.LabelLarge</item>
@@ -190,10 +195,6 @@
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_light_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light_theme</item>
-        <item name="colorPrimaryDark">@color/signal_colorPrimary</item>
-        <item name="colorAccent">@color/signal_colorPrimary</item>
-        <item name="colorControlActivated">@color/signal_colorPrimary</item>
-        <item name="colorControlHighlight">@color/transparent_black_10</item>
         <item name="android:windowBackground">@color/signal_colorBackground</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
@@ -242,6 +243,7 @@
 
         <!-- Material 3 -->
         <item name="colorPrimary">@color/signal_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/signal_colorPrimary</item>
         <item name="colorPrimaryContainer">@color/signal_colorPrimaryContainer</item>
         <item name="colorSecondary">@color/signal_colorSecondary</item>
         <item name="colorSecondaryContainer">@color/signal_colorSecondaryContainer</item>
@@ -256,6 +258,10 @@
         <item name="colorOnSurfaceVariant">@color/signal_colorOnSurfaceVariant</item>
         <item name="colorOnBackground">@color/signal_colorOnBackground</item>
         <item name="colorOutline">@color/signal_colorOutline</item>
+        <item name="colorAccent">@color/signal_colorPrimary</item>
+        <item name="colorControlActivated">@color/signal_colorPrimary</item>
+        <item name="colorControlHighlight">@color/transparent_white_10</item>
+
         <item name="textAppearanceBodyMedium">@style/Signal.Text.BodyMedium</item>
         <item name="textAppearanceBodyLarge">@style/Signal.Text.BodyLarge</item>
         <item name="textAppearanceLabelLarge">@style/Signal.Text.LabelLarge</item>
@@ -279,9 +285,6 @@
         <item name="actionModeStyle">@style/TextSecure.ActionModeStyle</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
-        <item name="colorAccent">@color/signal_colorPrimary</item>
-        <item name="colorControlActivated">@color/signal_colorPrimary</item>
-        <item name="colorControlHighlight">@color/transparent_white_10</item>
         <item name="android:colorControlHighlight" tools:ignore="NewApi">@color/transparent_white_10</item>
         <item name="android:windowBackground">@color/signal_colorBackground</item>
         <item name="android:windowContentOverlay">@null</item>