diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index c9bc130905..0361eebc01 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -747,7 +747,7 @@ private fun MessageEventBubbleContent(
             }
             Box(
                 modifier = talkbackCompatModifier
-                    .border(1.dp, ElementTheme.colors.borderInteractiveSecondary, RoundedCornerShape(6.dp))
+                    .border(1.dp, ElementTheme.colors.separatorPrimary, RoundedCornerShape(6.dp))
                     .background(ElementTheme.colors.bgCanvasDefault, RoundedCornerShape(6.dp))
                     .padding(4.dp)
             ) {
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
index 15aabdcbb0..08d89e25fb 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
@@ -134,7 +134,7 @@ private fun ReplyToModeView(
         modifier
             .clip(RoundedCornerShape(6.dp))
             .background(ElementTheme.colors.bgCanvasDefault)
-            .border(1.dp, ElementTheme.colors.borderInteractiveSecondary, RoundedCornerShape(6.dp))
+            .border(1.dp, ElementTheme.colors.separatorPrimary, RoundedCornerShape(6.dp))
             .padding(4.dp)
     ) {
         InReplyToView(