diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
index a3529d5ccb..6351835216 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
@@ -97,14 +97,11 @@ fun MessageEventBubble(
         }
     }
 
-    val backgroundBubbleColor = if (state.isHighlighted) {
-        ElementTheme.legacyColors.messageHighlightedBackground
+    // Ignore state.isHighlighted for now, we need a design decision on it.
+    val backgroundBubbleColor = if (state.isMine) {
+        ElementTheme.legacyColors.messageFromMeBackground
     } else {
-        if (state.isMine) {
-            ElementTheme.legacyColors.messageFromMeBackground
-        } else {
-            ElementTheme.legacyColors.messageFromOtherBackground
-        }
+        ElementTheme.legacyColors.messageFromOtherBackground
     }
     val bubbleShape = bubbleShape()
     Box(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt
index 1a3ee7894f..4bb66f0eac 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt
@@ -41,18 +41,15 @@ private val CORNER_RADIUS = 8.dp
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun MessageStateEventContainer(
-    isHighlighted: Boolean,
+    @Suppress("UNUSED_PARAMETER") isHighlighted: Boolean,
     interactionSource: MutableInteractionSource,
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
     onLongClick: () -> Unit = {},
     content: @Composable () -> Unit = {},
 ) {
-    val backgroundColor = if (isHighlighted) {
-        ElementTheme.legacyColors.messageHighlightedBackground
-    } else {
-        Color.Companion.Transparent
-    }
+    // Ignore isHighlighted for now, we need a design decision on it.
+    val backgroundColor = Color.Transparent
     val shape = RoundedCornerShape(CORNER_RADIUS)
     Surface(
         modifier = modifier
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
index 68e35abd94..f79778c42f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
@@ -38,7 +38,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -49,15 +48,12 @@ private val CORNER_RADIUS = 8.dp
 fun GroupHeaderView(
     text: String,
     isExpanded: Boolean,
-    isHighlighted: Boolean,
+    @Suppress("UNUSED_PARAMETER") isHighlighted: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val backgroundColor = if (isHighlighted) {
-        ElementTheme.legacyColors.messageHighlightedBackground
-    } else {
-        Color.Companion.Transparent
-    }
+    // Ignore isHighlighted for now, we need a design decision on it.
+    val backgroundColor = Color.Companion.Transparent
     val shape = RoundedCornerShape(CORNER_RADIUS)
 
     Box(
diff --git a/libraries/theme/src/main/kotlin/io/element/android/libraries/theme/ElementColors.kt b/libraries/theme/src/main/kotlin/io/element/android/libraries/theme/ElementColors.kt
index b8ed8e32d5..e3130a8e4d 100644
--- a/libraries/theme/src/main/kotlin/io/element/android/libraries/theme/ElementColors.kt
+++ b/libraries/theme/src/main/kotlin/io/element/android/libraries/theme/ElementColors.kt
@@ -39,7 +39,6 @@ import io.element.android.libraries.theme.compound.generated.SemanticColors
 class ElementColors(
     messageFromMeBackground: Color,
     messageFromOtherBackground: Color,
-    messageHighlightedBackground: Color,
     quaternary: Color,
     quinary: Color,
     gray300: Color,
@@ -51,8 +50,6 @@ class ElementColors(
         private set
     var messageFromOtherBackground by mutableStateOf(messageFromOtherBackground)
         private set
-    var messageHighlightedBackground by mutableStateOf(messageHighlightedBackground)
-        private set
 
     var quaternary by mutableStateOf(quaternary)
         private set
@@ -75,7 +72,6 @@ class ElementColors(
     fun copy(
         messageFromMeBackground: Color = this.messageFromMeBackground,
         messageFromOtherBackground: Color = this.messageFromOtherBackground,
-        messageHighlightedBackground: Color = this.messageHighlightedBackground,
         quaternary: Color = this.quaternary,
         quinary: Color = this.quinary,
         gray300: Color = this.gray300,
@@ -85,7 +81,6 @@ class ElementColors(
     ) = ElementColors(
         messageFromMeBackground = messageFromMeBackground,
         messageFromOtherBackground = messageFromOtherBackground,
-        messageHighlightedBackground = messageHighlightedBackground,
         quaternary = quaternary,
         quinary = quinary,
         gray300 = gray300,
@@ -97,7 +92,6 @@ class ElementColors(
     fun updateColorsFrom(other: ElementColors) {
         messageFromMeBackground = other.messageFromMeBackground
         messageFromOtherBackground = other.messageFromOtherBackground
-        messageHighlightedBackground = other.messageHighlightedBackground
         quaternary = other.quaternary
         quinary = other.quinary
         gray300 = other.gray300
@@ -110,7 +104,6 @@ class ElementColors(
 internal fun elementColorsLight() = ElementColors(
     messageFromMeBackground = SystemGrey5Light,
     messageFromOtherBackground = SystemGrey6Light,
-    messageHighlightedBackground = Azure,
     quaternary = Gray_100,
     quinary = Gray_50,
     gray300 = LightDesignTokens.colorGray300,
@@ -122,7 +115,6 @@ internal fun elementColorsLight() = ElementColors(
 internal fun elementColorsDark() = ElementColors(
     messageFromMeBackground = SystemGrey5Dark,
     messageFromOtherBackground = SystemGrey6Dark,
-    messageHighlightedBackground = Azure,
     quaternary = Gray_400,
     quinary = Gray_450,
     gray300 = DarkDesignTokens.colorGray300,