diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt
index 9f6c1eb28d..b8922be78c 100644
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/timeline/components/MessageEventBubble.kt
@@ -30,13 +30,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.dp
 import io.element.android.features.messages.timeline.model.MessagesItemGroupPosition
-import io.element.android.libraries.designsystem.LocalIsDarkTheme
-import io.element.android.libraries.designsystem.MessageHighlightDark
-import io.element.android.libraries.designsystem.MessageHighlightLight
-import io.element.android.libraries.designsystem.SystemGrey5Dark
-import io.element.android.libraries.designsystem.SystemGrey5Light
-import io.element.android.libraries.designsystem.SystemGrey6Dark
-import io.element.android.libraries.designsystem.SystemGrey6Light
+import io.element.android.libraries.designsystem.LocalExtendedColors
 
 private val BUBBLE_RADIUS = 16.dp
 
@@ -88,24 +82,12 @@ fun MessageEventBubble(
     }
 
     val backgroundBubbleColor = if (isHighlighted) {
-        if (LocalIsDarkTheme.current) {
-            MessageHighlightDark
-        } else {
-            MessageHighlightLight
-        }
+        LocalExtendedColors.current.messageHighlightedBackground
     } else {
         if (isMine) {
-            if (LocalIsDarkTheme.current) {
-                SystemGrey5Dark
-            } else {
-                SystemGrey5Light
-            }
+            LocalExtendedColors.current.messageFromMeBackground
         } else {
-            if (LocalIsDarkTheme.current) {
-                SystemGrey6Dark
-            } else {
-                SystemGrey6Light
-            }
+            LocalExtendedColors.current.messageFromOtherBackground
         }
     }
     val bubbleShape = bubbleShape()
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt
index 936f102a85..279b38fdd1 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt
@@ -52,10 +52,4 @@ val ElementGreen = Color(0xFF0DBD8B)
 val ElementOrange = Color(0xFFD9B072)
 val Vermilion = Color(0xFFFF5B55)
 
-// TODO Update color
-val MessageHighlightLight = Azure
-
-// TODO Update color
-val MessageHighlightDark = Azure
-
 val LinkColor = Color(0xFF054F6E)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ExtendedColors.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ExtendedColors.kt
new file mode 100644
index 0000000000..9cdda9cb73
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ExtendedColors.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.designsystem
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Color
+
+@Immutable
+data class ExtendedColors(
+    val messageFromMeBackground: Color,
+    val messageFromOtherBackground: Color,
+    val messageHighlightedBackground: Color,
+)
+
+internal val extendedColorsLight = ExtendedColors(
+    messageFromMeBackground = SystemGrey5Light,
+    messageFromOtherBackground = SystemGrey6Light,
+    messageHighlightedBackground = Azure,
+)
+
+internal val extendedColorsDark = ExtendedColors(
+    messageFromMeBackground = SystemGrey5Dark,
+    messageFromOtherBackground = SystemGrey6Dark,
+    messageHighlightedBackground = Azure,
+)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt
index d2168f644e..09bb595599 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Theme.kt
@@ -27,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
@@ -64,9 +65,18 @@ private val LightColorScheme = lightColorScheme(
     onSurface = Color(0xFF1C1B1F),
      */
 )
+
 @Suppress("CompositionLocalAllowlist")
 val LocalIsDarkTheme = compositionLocalOf<Boolean> { error("Not defined") }
 
+val LocalExtendedColors = staticCompositionLocalOf {
+    ExtendedColors(
+        messageFromMeBackground = Color.Unspecified,
+        messageFromOtherBackground = Color.Unspecified,
+        messageHighlightedBackground = Color.Unspecified,
+    )
+}
+
 @Composable
 fun ElementXTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
@@ -95,7 +105,12 @@ fun ElementXTheme(
         )
     }
 
-    CompositionLocalProvider(LocalIsDarkTheme provides darkTheme) {
+    val extendedColors = if (darkTheme) extendedColorsDark else extendedColorsLight
+
+    CompositionLocalProvider(
+        LocalIsDarkTheme provides darkTheme,
+        LocalExtendedColors provides extendedColors,
+    ) {
         MaterialTheme(
             colorScheme = colorScheme,
             typography = Typography,