diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
index 62fd9709a4..6394279141 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
@@ -25,6 +25,7 @@ import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.TextSecurePreferences.Companion.CALL_NOTIFICATIONS_ENABLED
+import org.session.libsession.utilities.ThemeUtil
 import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsession.utilities.isGroup
 import org.session.libsession.utilities.isGroupOrCommunity
@@ -83,6 +84,7 @@ class ControlMessageView : LinearLayout {
         binding.iconImageView.isGone = true
         binding.expirationTimerView.isGone = true
         binding.followSetting.isGone = true
+
         var messageBody: CharSequence = message.getDisplayBody(context)
 
         binding.root.contentDescription = null
diff --git a/app/src/main/res/layout/view_control_message.xml b/app/src/main/res/layout/view_control_message.xml
index 0165888625..710c96c63f 100644
--- a/app/src/main/res/layout/view_control_message.xml
+++ b/app/src/main/res/layout/view_control_message.xml
@@ -87,7 +87,7 @@
             android:background="@null"
             android:contentDescription="@string/AccessibilityId_disappearingMessagesFollowSetting"
             android:text="@string/disappearingMessagesFollowSetting"
-            android:textColor="?android:colorAccent"
+            android:textColor="?attr/accentText"
             android:textSize="@dimen/very_small_font_size" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1db92583a0..4638a21d5a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -170,4 +170,5 @@
         <attr name="sendOnly" format="boolean" />
     </declare-styleable>
 
+    <attr name="accentText" format="reference|color"/>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0985e4898f..4517f8262c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -208,6 +208,7 @@
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:textColorHint">@color/gray27</item>
         <item name="textColorAlert">@color/classic_dark_6</item>
+        <item name="accentText">?colorAccent</item>
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="bottomSheetDialogTheme">@style/Classic.Dark.BottomSheet</item>
         <item name="actionMenuTextColor">?android:textColorPrimary</item>
@@ -287,6 +288,7 @@
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:textColorHint">@color/gray27</item>
         <item name="textColorAlert">@color/classic_light_0</item>
+        <item name="accentText">?android:textColorPrimary</item>
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="colorCellBackground">@color/classic_light_6</item>
         <item name="colorDividerBackground">@color/classic_light_3</item>
@@ -372,6 +374,7 @@
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:textColorHint">@color/ocean_dark_5</item>
         <item name="textColorAlert">@color/ocean_dark_7</item>
+        <item name="accentText">?colorAccent</item>
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="colorCellBackground">@color/ocean_dark_3</item>
         <item name="colorDividerBackground">@color/ocean_dark_4</item>
@@ -450,6 +453,7 @@
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:textColorHint">@color/ocean_light_6</item>
         <item name="textColorAlert">@color/ocean_light_0</item>
+        <item name="accentText">?android:textColorPrimary</item>
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="colorCellBackground">@color/ocean_light_5</item>
         <item name="colorDividerBackground">@color/ocean_light_3</item>
@@ -555,6 +559,7 @@
         <item name="danger">@color/danger_dark</item>
         <item name="disabled">@color/classic_light_1</item>
         <item name="textColorAlert">@color/classic_dark_6</item>
+        <item name="accentText">?colorAccent</item>
 
         <!-- Home screen -->
         <item name="searchBackgroundColor">#1B1B1B</item>